From cec9e981a52f9a4e2c2b823dc45d2ce66fb7404c Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 20 Dec 2023 08:23:33 -0600 Subject: [PATCH] Revert "[10.x] Drop the primary key if it exists when adding a new primary key (#49392)" (#49448) This reverts commit be24812761ab23deaea9b8fe1b28933589e89a07. --- src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php | 2 +- tests/Database/DatabaseMySqlSchemaGrammarTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php b/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php index aaafa322860f..1f64a7c25aa7 100755 --- a/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php +++ b/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php @@ -406,7 +406,7 @@ public function compileChange(Blueprint $blueprint, Fluent $command, Connection */ public function compilePrimary(Blueprint $blueprint, Fluent $command) { - return sprintf('alter table %s drop index if exists `PRIMARY`, add primary key %s(%s)', + return sprintf('alter table %s add primary key %s(%s)', $this->wrapTable($blueprint), $command->algorithm ? 'using '.$command->algorithm : '', $this->columnize($command->columns) diff --git a/tests/Database/DatabaseMySqlSchemaGrammarTest.php b/tests/Database/DatabaseMySqlSchemaGrammarTest.php index 7898be1b1d1e..bbe69fb2d466 100755 --- a/tests/Database/DatabaseMySqlSchemaGrammarTest.php +++ b/tests/Database/DatabaseMySqlSchemaGrammarTest.php @@ -345,7 +345,7 @@ public function testAddingPrimaryKey() $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); $this->assertCount(1, $statements); - $this->assertSame('alter table `users` drop index if exists `PRIMARY`, add primary key (`foo`)', $statements[0]); + $this->assertSame('alter table `users` add primary key (`foo`)', $statements[0]); } public function testAddingPrimaryKeyWithAlgorithm() @@ -355,7 +355,7 @@ public function testAddingPrimaryKeyWithAlgorithm() $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); $this->assertCount(1, $statements); - $this->assertSame('alter table `users` drop index if exists `PRIMARY`, add primary key using hash(`foo`)', $statements[0]); + $this->assertSame('alter table `users` add primary key using hash(`foo`)', $statements[0]); } public function testAddingUniqueKey()