[10.x] Guess table name correctly in migrations if column's name have…

… ('to', 'from' and/or 'in') terms (#48437) * Match table name that not includes ('to', 'from' and 'in') * Add test cases that cover the case of having "to" in column name during migration creation * Simplify the regex
laravel · Sep 18, 2023 · 8e319c0 · 8e319c0
1 parent f0ef58d
commit 8e319c0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Console/Migrations/TableGuesser.php b/src/Illuminate/Database/Console/Migrations/TableGuesser.php
@@ -10,8 +10,8 @@ class TableGuesser
     ];
 
     const CHANGE_PATTERNS = [
-        '/_(to|from|in)_(\w+)_table$/',
-        '/_(to|from|in)_(\w+)$/',
+        '/.+_(to|from|in)_(\w+)_table$/',
+        '/.+_(to|from|in)_(\w+)$/',
     ];
 
     /**

diff --git a/tests/Database/TableGuesserTest.php b/tests/Database/TableGuesserTest.php
@@ -17,6 +17,10 @@ public function testMigrationIsProperlyParsed()
         $this->assertSame('users', $table);
         $this->assertFalse($create);
 
+        [$table, $create] = TableGuesser::guess('add_is_sent_to_crm_column_to_users_table');
+        $this->assertSame('users', $table);
+        $this->assertFalse($create);
+
         [$table, $create] = TableGuesser::guess('change_status_column_in_users_table');
         $this->assertSame('users', $table);
         $this->assertFalse($create);
@@ -36,6 +40,10 @@ public function testMigrationIsProperlyParsedWithoutTableSuffix()
         $this->assertSame('users', $table);
         $this->assertFalse($create);
 
+        [$table, $create] = TableGuesser::guess('add_is_sent_to_crm_column_column_to_users');
+        $this->assertSame('users', $table);
+        $this->assertFalse($create);
+
         [$table, $create] = TableGuesser::guess('change_status_column_in_users');
         $this->assertSame('users', $table);
         $this->assertFalse($create);