From 8a9ff110306650d64b6a2915d1affed68fa8e911 Mon Sep 17 00:00:00 2001 From: Josh Salway Date: Wed, 1 Apr 2026 13:52:41 +1000 Subject: [PATCH 1/2] Use standard SQL escaping for column comments in MySqlGrammar Co-Authored-By: Claude Opus 4.6 (1M context) --- src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php | 2 +- tests/Database/DatabaseMariaDbSchemaGrammarTest.php | 2 +- tests/Database/DatabaseMySqlSchemaGrammarTest.php | 2 +- 3 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 30b559eb6e65..b60469eb9f09 100755 --- a/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php +++ b/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php @@ -1401,7 +1401,7 @@ protected function modifyAfter(Blueprint $blueprint, Fluent $column) protected function modifyComment(Blueprint $blueprint, Fluent $column) { if (! is_null($column->comment)) { - return " comment '".addslashes($column->comment)."'"; + return " comment '".str_replace("'", "''", $column->comment)."'"; } } diff --git a/tests/Database/DatabaseMariaDbSchemaGrammarTest.php b/tests/Database/DatabaseMariaDbSchemaGrammarTest.php index 878539d1dab4..aefdebf2bc3e 100755 --- a/tests/Database/DatabaseMariaDbSchemaGrammarTest.php +++ b/tests/Database/DatabaseMariaDbSchemaGrammarTest.php @@ -1374,7 +1374,7 @@ public function testAddingComment() $statements = $blueprint->toSql(); $this->assertCount(1, $statements); - $this->assertSame("alter table `users` add `foo` varchar(255) not null comment 'Escape \\' when using words like it\\'s'", $statements[0]); + $this->assertSame("alter table `users` add `foo` varchar(255) not null comment 'Escape '' when using words like it''s'", $statements[0]); } public function testCreateDatabase() diff --git a/tests/Database/DatabaseMySqlSchemaGrammarTest.php b/tests/Database/DatabaseMySqlSchemaGrammarTest.php index e446c2a913a4..631ff5ad469b 100755 --- a/tests/Database/DatabaseMySqlSchemaGrammarTest.php +++ b/tests/Database/DatabaseMySqlSchemaGrammarTest.php @@ -1379,7 +1379,7 @@ public function testAddingComment() $statements = $blueprint->toSql(); $this->assertCount(1, $statements); - $this->assertSame("alter table `users` add `foo` varchar(255) not null comment 'Escape \\' when using words like it\\'s'", $statements[0]); + $this->assertSame("alter table `users` add `foo` varchar(255) not null comment 'Escape '' when using words like it''s'", $statements[0]); } public function testAddingVector() From e84232cc043b49248aa668ab2422496812ef020b Mon Sep 17 00:00:00 2001 From: Josh Salway Date: Wed, 1 Apr 2026 14:18:21 +1000 Subject: [PATCH 2/2] retry CI