Merge pull request #28514 from JacksonIV/5.8

[5.8] Fix the collation bug when changing columns in a migration.
laravel · May 14, 2019 · e459f37 · e459f37
2 parents fab75c7 + 12e82c5
commit e459f37
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php b/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php
@@ -82,7 +82,10 @@ protected static function getTableWithColumnChanges(Blueprint $blueprint, Table
                 if (! is_null($option = static::mapFluentOptionToDoctrine($key))) {
                     if (method_exists($column, $method = 'set'.ucfirst($option))) {
                         $column->{$method}(static::mapFluentValueToDoctrine($option, $value));
+                        continue;
                     }
+
+                    $column->setCustomSchemaOption($option, static::mapFluentValueToDoctrine($option, $value));
                 }
             }
         }

diff --git a/tests/Database/DatabaseSchemaBlueprintIntegrationTest.php b/tests/Database/DatabaseSchemaBlueprintIntegrationTest.php
@@ -73,6 +73,43 @@ public function testRenamingAndChangingColumnsWork()
         $this->assertEquals($expected, $queries);
     }
 
+    public function testChangingColumnWithCollationWorks()
+    {
+        $this->db->connection()->getSchemaBuilder()->create('users', function ($table) {
+            $table->string('age');
+        });
+
+        $blueprint = new Blueprint('users', function ($table) {
+            $table->integer('age')->collation('RTRIM')->change();
+        });
+
+        $blueprint2 = new Blueprint('users', function ($table) {
+            $table->integer('age')->collation('NOCASE')->change();
+        });
+
+        $queries = $blueprint->toSql($this->db->connection(), new SQLiteGrammar);
+        $queries2 = $blueprint2->toSql($this->db->connection(), new SQLiteGrammar);
+
+        $expected = [
+            'CREATE TEMPORARY TABLE __temp__users AS SELECT age FROM users',
+            'DROP TABLE users',
+            'CREATE TABLE users (age INTEGER NOT NULL COLLATE RTRIM)',
+            'INSERT INTO users (age) SELECT age FROM __temp__users',
+            'DROP TABLE __temp__users',
+        ];
+
+        $expected2 = [
+            'CREATE TEMPORARY TABLE __temp__users AS SELECT age FROM users',
+            'DROP TABLE users',
+            'CREATE TABLE users (age INTEGER NOT NULL COLLATE NOCASE)',
+            'INSERT INTO users (age) SELECT age FROM __temp__users',
+            'DROP TABLE __temp__users',
+        ];
+
+        $this->assertEquals($expected, $queries);
+        $this->assertEquals($expected2, $queries2);
+    }
+
     public function testRenameIndexWorks()
     {
         $this->db->connection()->getSchemaBuilder()->create('users', function ($table) {