laravel · hafezdivandari · Feb 20, 2024
diff --git a/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php b/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
@@ -203,14 +203,14 @@ protected function compileCreateTable($blueprint, $command, $connection)
     {
         $tableStructure = $this->getColumns($blueprint);
 
-        if ($primaryKey = $this->getCommandByName($blueprint, 'primary')) {
-            $tableStructure[] = sprintf(
-                'primary key %s(%s)',
-                $primaryKey->algorithm ? 'using '.$primaryKey->algorithm : '',
-                $this->columnize($primaryKey->columns)
-            );
+        foreach (['index', 'fulltext', 'spatialIndex', 'primary', 'unique'] as $index) {
+            foreach ($this->getCommandsByName($blueprint, $index) as $command) {
+                $method = 'compile'.ucfirst($index);
+
+                $tableStructure[] = $this->$method($blueprint, $command);
 
-            $primaryKey->shouldBeSkipped = true;
+                $command->shouldBeSkipped = true;
+            }
         }
 
         return sprintf('%s table %s (%s)',
@@ -383,11 +383,9 @@ public function compileChange(Blueprint $blueprint, Fluent $command, Connection
      */
     public function compilePrimary(Blueprint $blueprint, Fluent $command)
     {
-        return sprintf('alter table %s add primary key %s(%s)',
-            $this->wrapTable($blueprint),
-            $command->algorithm ? 'using '.$command->algorithm : '',
-            $this->columnize($command->columns)
-        );
+        $command->index(null);
+
+        return $this->compileKey($blueprint, $command, 'primary key');
     }
 
     /**
@@ -448,11 +446,11 @@ public function compileSpatialIndex(Blueprint $blueprint, Fluent $command)
      */
     protected function compileKey(Blueprint $blueprint, Fluent $command, $type)
     {
-        return sprintf('alter table %s add %s %s%s(%s)',
-            $this->wrapTable($blueprint),
+        return sprintf('%s%s%s %s(%s)',
+            $blueprint->creating() ? '' : 'alter table '.$this->wrapTable($blueprint).' add ',
             $type,
-            $this->wrap($command->index),
-            $command->algorithm ? ' using '.$command->algorithm : '',
+            $command->index ? ' '.$this->wrap($command->index) : '',
+            $command->algorithm ? 'using '.$command->algorithm : '',
             $this->columnize($command->columns)
         );
     }

diff --git a/tests/Database/DatabaseMariaDbSchemaGrammarTest.php b/tests/Database/DatabaseMariaDbSchemaGrammarTest.php
@@ -365,7 +365,7 @@ public function testAddingUniqueKey()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `users` add unique `bar`(`foo`)', $statements[0]);
+        $this->assertSame('alter table `users` add unique `bar` (`foo`)', $statements[0]);
     }
 
     public function testAddingIndex()
@@ -375,7 +375,7 @@ public function testAddingIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `users` add index `baz`(`foo`, `bar`)', $statements[0]);
+        $this->assertSame('alter table `users` add index `baz` (`foo`, `bar`)', $statements[0]);
     }
 
     public function testAddingIndexWithAlgorithm()
@@ -395,7 +395,7 @@ public function testAddingFulltextIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `users` add fulltext `users_body_fulltext`(`body`)', $statements[0]);
+        $this->assertSame('alter table `users` add fulltext `users_body_fulltext` (`body`)', $statements[0]);
     }
 
     public function testAddingSpatialIndex()
@@ -405,7 +405,7 @@ public function testAddingSpatialIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `geo` add spatial index `geo_coordinates_spatialindex`(`coordinates`)', $statements[0]);
+        $this->assertSame('alter table `geo` add spatial index `geo_coordinates_spatialindex` (`coordinates`)', $statements[0]);
     }
 
     public function testAddingFluentSpatialIndex()
@@ -415,7 +415,7 @@ public function testAddingFluentSpatialIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(2, $statements);
-        $this->assertSame('alter table `geo` add spatial index `geo_coordinates_spatialindex`(`coordinates`)', $statements[1]);
+        $this->assertSame('alter table `geo` add spatial index `geo_coordinates_spatialindex` (`coordinates`)', $statements[1]);
     }
 
     public function testAddingRawIndex()
@@ -425,7 +425,48 @@ public function testAddingRawIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `users` add index `raw_index`((function(column)))', $statements[0]);
+        $this->assertSame('alter table `users` add index `raw_index` ((function(column)))', $statements[0]);
+    }
+
+    public function testAddingIndexesOnCreate()
+    {
+        $blueprint = new Blueprint('users');
+        $blueprint->create();
+        $blueprint->integer('col1');
+        $blueprint->integer('col2');
+        $blueprint->integer('col3');
+        $blueprint->string('col4');
+        $blueprint->geometry('col5');
+        $blueprint->primary('col1');
+        $blueprint->unique('col2');
+        $blueprint->index('col3');
+        $blueprint->fullText('col4');
+        $blueprint->spatialIndex('col5');
+
+        $conn = $this->getConnection();
+        $conn->shouldReceive('getConfig')->andReturn(null);
+
+        $statements = $blueprint->toSql($conn, $this->getGrammar());
+
+        $this->assertEquals(['create table `users` (`col1` int not null, `col2` int not null, `col3` int not null, `col4` varchar(255) not null, `col5` geometry not null, index `users_col3_index` (`col3`), fulltext `users_col4_fulltext` (`col4`), spatial index `users_col5_spatialindex` (`col5`), primary key (`col1`), unique `users_col2_unique` (`col2`))'], $statements);
+    }
+
+    public function testFluentAddingIndexesOnCreate()
+    {
+        $blueprint = new Blueprint('users');
+        $blueprint->create();
+        $blueprint->integer('col1')->primary();
+        $blueprint->integer('col2')->unique();
+        $blueprint->integer('col3')->index();
+        $blueprint->string('col4')->fulltext();
+        $blueprint->geometry('col5')->spatialIndex();
+
+        $conn = $this->getConnection();
+        $conn->shouldReceive('getConfig')->andReturn(null);
+
+        $statements = $blueprint->toSql($conn, $this->getGrammar());
+
+        $this->assertEquals(['create table `users` (`col1` int not null, `col2` int not null, `col3` int not null, `col4` varchar(255) not null, `col5` geometry not null, index `users_col3_index` (`col3`), fulltext `users_col4_fulltext` (`col4`), spatial index `users_col5_spatialindex` (`col5`), primary key (`col1`), unique `users_col2_unique` (`col2`))'], $statements);
     }
 
     public function testAddingForeignKey()

diff --git a/tests/Database/DatabaseMySqlSchemaGrammarTest.php b/tests/Database/DatabaseMySqlSchemaGrammarTest.php
@@ -365,7 +365,7 @@ public function testAddingUniqueKey()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `users` add unique `bar`(`foo`)', $statements[0]);
+        $this->assertSame('alter table `users` add unique `bar` (`foo`)', $statements[0]);
     }
 
     public function testAddingIndex()
@@ -375,7 +375,7 @@ public function testAddingIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `users` add index `baz`(`foo`, `bar`)', $statements[0]);
+        $this->assertSame('alter table `users` add index `baz` (`foo`, `bar`)', $statements[0]);
     }
 
     public function testAddingIndexWithAlgorithm()
@@ -395,7 +395,7 @@ public function testAddingFulltextIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `users` add fulltext `users_body_fulltext`(`body`)', $statements[0]);
+        $this->assertSame('alter table `users` add fulltext `users_body_fulltext` (`body`)', $statements[0]);
     }
 
     public function testAddingSpatialIndex()
@@ -405,7 +405,7 @@ public function testAddingSpatialIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `geo` add spatial index `geo_coordinates_spatialindex`(`coordinates`)', $statements[0]);
+        $this->assertSame('alter table `geo` add spatial index `geo_coordinates_spatialindex` (`coordinates`)', $statements[0]);
     }
 
     public function testAddingFluentSpatialIndex()
@@ -415,7 +415,7 @@ public function testAddingFluentSpatialIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(2, $statements);
-        $this->assertSame('alter table `geo` add spatial index `geo_coordinates_spatialindex`(`coordinates`)', $statements[1]);
+        $this->assertSame('alter table `geo` add spatial index `geo_coordinates_spatialindex` (`coordinates`)', $statements[1]);
     }
 
     public function testAddingRawIndex()
@@ -425,7 +425,48 @@ public function testAddingRawIndex()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertCount(1, $statements);
-        $this->assertSame('alter table `users` add index `raw_index`((function(column)))', $statements[0]);
+        $this->assertSame('alter table `users` add index `raw_index` ((function(column)))', $statements[0]);
+    }
+
+    public function testAddingIndexesOnCreate()
+    {
+        $blueprint = new Blueprint('users');
+        $blueprint->create();
+        $blueprint->integer('col1');
+        $blueprint->integer('col2');
+        $blueprint->integer('col3');
+        $blueprint->string('col4');
+        $blueprint->geometry('col5');
+        $blueprint->primary('col1');
+        $blueprint->unique('col2');
+        $blueprint->index('col3');
+        $blueprint->fullText('col4');
+        $blueprint->spatialIndex('col5');
+
+        $conn = $this->getConnection();
+        $conn->shouldReceive('getConfig')->andReturn(null);
+
+        $statements = $blueprint->toSql($conn, $this->getGrammar());
+
+        $this->assertEquals(['create table `users` (`col1` int not null, `col2` int not null, `col3` int not null, `col4` varchar(255) not null, `col5` geometry not null, index `users_col3_index` (`col3`), fulltext `users_col4_fulltext` (`col4`), spatial index `users_col5_spatialindex` (`col5`), primary key (`col1`), unique `users_col2_unique` (`col2`))'], $statements);
+    }
+
+    public function testFluentAddingIndexesOnCreate()
+    {
+        $blueprint = new Blueprint('users');
+        $blueprint->create();
+        $blueprint->integer('col1')->primary();
+        $blueprint->integer('col2')->unique();
+        $blueprint->integer('col3')->index();
+        $blueprint->string('col4')->fulltext();
+        $blueprint->geometry('col5')->spatialIndex();
+
+        $conn = $this->getConnection();
+        $conn->shouldReceive('getConfig')->andReturn(null);
+
+        $statements = $blueprint->toSql($conn, $this->getGrammar());
+
+        $this->assertEquals(['create table `users` (`col1` int not null, `col2` int not null, `col3` int not null, `col4` varchar(255) not null, `col5` geometry not null, index `users_col3_index` (`col3`), fulltext `users_col4_fulltext` (`col4`), spatial index `users_col5_spatialindex` (`col5`), primary key (`col1`), unique `users_col2_unique` (`col2`))'], $statements);
     }
 
     public function testAddingForeignKey()

diff --git a/tests/Database/DatabaseSchemaBlueprintTest.php b/tests/Database/DatabaseSchemaBlueprintTest.php
@@ -278,7 +278,7 @@ public function testDefaultUsingIdMorph()
 
         $this->assertEquals([
             'alter table `comments` add `commentable_type` varchar(255) not null, add `commentable_id` bigint unsigned not null',
-            'alter table `comments` add index `comments_commentable_type_commentable_id_index`(`commentable_type`, `commentable_id`)',
+            'alter table `comments` add index `comments_commentable_type_commentable_id_index` (`commentable_type`, `commentable_id`)',
         ], $blueprint->toSql($connection, new MySqlGrammar));
     }
 
@@ -294,7 +294,7 @@ public function testDefaultUsingNullableIdMorph()
 
         $this->assertEquals([
             'alter table `comments` add `commentable_type` varchar(255) null, add `commentable_id` bigint unsigned null',
-            'alter table `comments` add index `comments_commentable_type_commentable_id_index`(`commentable_type`, `commentable_id`)',
+            'alter table `comments` add index `comments_commentable_type_commentable_id_index` (`commentable_type`, `commentable_id`)',
         ], $blueprint->toSql($connection, new MySqlGrammar));
     }
 
@@ -312,7 +312,7 @@ public function testDefaultUsingUuidMorph()
 
         $this->assertEquals([
             'alter table `comments` add `commentable_type` varchar(255) not null, add `commentable_id` char(36) not null',
-            'alter table `comments` add index `comments_commentable_type_commentable_id_index`(`commentable_type`, `commentable_id`)',
+            'alter table `comments` add index `comments_commentable_type_commentable_id_index` (`commentable_type`, `commentable_id`)',
         ], $blueprint->toSql($connection, new MySqlGrammar));
     }
 
@@ -330,7 +330,7 @@ public function testDefaultUsingNullableUuidMorph()
 
         $this->assertEquals([
             'alter table `comments` add `commentable_type` varchar(255) null, add `commentable_id` char(36) null',
-            'alter table `comments` add index `comments_commentable_type_commentable_id_index`(`commentable_type`, `commentable_id`)',
+            'alter table `comments` add index `comments_commentable_type_commentable_id_index` (`commentable_type`, `commentable_id`)',
         ], $blueprint->toSql($connection, new MySqlGrammar));
     }
 
@@ -348,7 +348,7 @@ public function testDefaultUsingUlidMorph()
 
         $this->assertEquals([
             'alter table `comments` add `commentable_type` varchar(255) not null, add `commentable_id` char(26) not null',
-            'alter table `comments` add index `comments_commentable_type_commentable_id_index`(`commentable_type`, `commentable_id`)',
+            'alter table `comments` add index `comments_commentable_type_commentable_id_index` (`commentable_type`, `commentable_id`)',
         ], $blueprint->toSql($connection, new MySqlGrammar));
     }
 
@@ -366,7 +366,7 @@ public function testDefaultUsingNullableUlidMorph()
 
         $this->assertEquals([
             'alter table `comments` add `commentable_type` varchar(255) null, add `commentable_id` char(26) null',
-            'alter table `comments` add index `comments_commentable_type_commentable_id_index`(`commentable_type`, `commentable_id`)',
+            'alter table `comments` add index `comments_commentable_type_commentable_id_index` (`commentable_type`, `commentable_id`)',
         ], $blueprint->toSql($connection, new MySqlGrammar));
     }
 

diff --git a/tests/Integration/Database/DatabaseSchemaBlueprintTest.php b/tests/Integration/Database/DatabaseSchemaBlueprintTest.php
@@ -406,7 +406,7 @@ public function testAddUniqueIndexWithoutNameWorks()
 
         $expected = [
             'alter table `users` modify `name` varchar(255) null',
-            'alter table `users` add unique `users_name_unique`(`name`)',
+            'alter table `users` add unique `users_name_unique` (`name`)',
         ];
 
         $this->assertEquals($expected, $queries);
@@ -470,7 +470,7 @@ public function testAddUniqueIndexWithNameWorks()
 
         $expected = [
             'alter table `users` modify `name` varchar(255) null',
-            'alter table `users` add unique `index1`(`name`)',
+            'alter table `users` add unique `index1` (`name`)',
         ];
 
         $this->assertEquals($expected, $queries);

diff --git a/tests/Integration/Database/SchemaBuilderTest.php b/tests/Integration/Database/SchemaBuilderTest.php
@@ -148,6 +148,23 @@ public function testCompoundPrimaryWithAutoIncrement()
         $this->assertTrue(Schema::hasIndex('test', ['id', 'uuid'], 'primary'));
     }
 
+    public function testNonPrimaryAutoIncrementColumn()
+    {
+        if ($this->driver === 'sqlite') {
+            $this->markTestSkipped('non-primary auto-increment column is not supported on SQLite.');
+        }
+
+        Schema::create('test', function (Blueprint $table) {
+            $table->uuid()->primary();
+            $table->id()->unique();
+        });
+
+        $this->assertTrue(collect(Schema::getColumns('test'))->firstWhere('name', 'id')['auto_increment']);
+        $this->assertTrue(Schema::hasIndex('test', ['uuid'], 'primary'));
+        $this->assertTrue(Schema::hasIndex('test', ['id'], 'unique'));
+        $this->assertTrue(Schema::hasIndex('test', 'test_id_unique', 'unique'));
+    }
+
     public function testModifyingAutoIncrementColumn()
     {
         if ($this->driver === 'sqlsrv') {