fix(MigrateDumpCommand): Correct sorting trimmed constraints when multiple blocks of constraints.

Author: Paul Rogers

src/Commands/MigrateDumpCommand.php

@@ -177,8 +177,15 @@ public static function trimUnderscoresFromForeign(string $sql) : string
         );
 
         // Reorder constraints for consistency since dump put underscored first.
-        if (preg_match_all('/(?:^|,)\s*CONSTRAINT\s+.*?(?:,|\)\s*\))/imu', $trimmed, $m)) {
-            $constraints_original = implode(PHP_EOL, $m[0]);
+        $offset = 0;
+        // Sort each adjacent block of constraints.
+        while (preg_match('/((?:^|,)?\s*CONSTRAINT\s+.*?(?:,|\)\s*\)))+/imu', $trimmed, $m, PREG_OFFSET_CAPTURE, $offset)) {
+            // Bump offset to avoid unintentionally reprocessing already sorted.
+            $offset = $m[count($m) - 1][1] + strlen($m[count($m) - 1][0]);
+            $constraints_original = $m[0][0];
+            if (! preg_match_all('/(?:^|,)\s*CONSTRAINT\s+.*?(?:,|\)\s*\))/imu', $constraints_original, $m)) {
+                continue;
+            }
             $constraints_array = $m[0];
             foreach ($constraints_array as &$constraint) {
                 $constraint = trim($constraint, ",\r\n");

tests/Mysql/MigrateDumpTest.php

@@ -34,12 +34,20 @@ public function test_trimUnderscoresFromForeign()
         $sql = "KEY z_index,
   CONSTRAINT `__b_fk` FOREIGN KEY (`b`) REFERENCES `b` ON(`b`),
   CONSTRAINT `a_fk` FOREIGN KEY (`a`) REFERENCES `a` ON(`a`)
+);
+...KEY z2_index,
+  CONSTRAINT `__d_fk` FOREIGN KEY (`d`) REFERENCES `d` ON(`d`),
+  CONSTRAINT `c_fk` FOREIGN KEY (`c`) REFERENCES `c` ON(`c`)
 );";
         $trimmed = MigrateDumpCommand::trimUnderscoresFromForeign($sql);
         $this->assertEquals(
             "KEY z_index,
   CONSTRAINT `a_fk` FOREIGN KEY (`a`) REFERENCES `a` ON(`a`),
   CONSTRAINT `b_fk` FOREIGN KEY (`b`) REFERENCES `b` ON(`b`)
+);
+...KEY z2_index,
+  CONSTRAINT `c_fk` FOREIGN KEY (`c`) REFERENCES `c` ON(`c`),
+  CONSTRAINT `d_fk` FOREIGN KEY (`d`) REFERENCES `d` ON(`d`)
 );",
             $trimmed
         );