Fix escaping database name for SqlServerAdapter::dropDatabase (cakeph…

…p#2287)
CakeDC · Jun 5, 2024 · ef38e41 · ef38e41
1 parent b1e128c
commit ef38e41
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/Phinx/Db/Adapter/SqlServerAdapter.php b/src/Phinx/Db/Adapter/SqlServerAdapter.php
@@ -211,7 +211,7 @@ public function quoteTableName(string $tableName): string
      */
     public function quoteColumnName(string $columnName): string
     {
-        return '[' . str_replace(']', '\]', $columnName) . ']';
+        return '[' . str_replace(']', ']]', $columnName) . ']';
     }
 
     /**
@@ -1176,7 +1176,7 @@ public function createDatabase(string $name, array $options = []): void
     {
         $databaseName = $this->quoteColumnName($name);
         if (isset($options['collation'])) {
-            $this->execute(sprintf('CREATE DATABASE %s COLLATE [%s]', $databaseName, $options['collation']));
+            $this->execute(sprintf('CREATE DATABASE %s COLLATE %s', $databaseName, $options['collation']));
         } else {
             $this->execute(sprintf('CREATE DATABASE %s', $databaseName));
         }
@@ -1204,12 +1204,13 @@ public function hasDatabase(string $name): bool
      */
     public function dropDatabase(string $name): void
     {
-        $sql = <<<SQL
-USE master;
-IF EXISTS(select * from sys.databases where name=N'$name')
-ALTER DATABASE [$name] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
-DROP DATABASE [$name];
-SQL;
+        $sql = sprintf(
+            'USE master;
+            IF EXISTS(select * from sys.databases where name=N\'' . $name . '\')
+            ALTER DATABASE %1$s SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
+            DROP DATABASE %1$s;',
+            $this->quoteColumnName($name),
+        );
         $this->execute($sql);
         $this->createdTables = [];
     }

diff --git a/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php b/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php
@@ -129,9 +129,20 @@ public function testQuoteTableName()
         $this->assertEquals('[test_table]', $this->adapter->quoteTableName('test_table'));
     }
 
-    public function testQuoteColumnName()
+    public function columnNameDataProvider(): array
     {
-        $this->assertEquals('[test_column]', $this->adapter->quoteColumnName('test_column'));
+        return [
+            ['test_column', '[test_column]'],
+            ['test_col[u]mn', '[test_col[u]]mn]'],
+        ];
+    }
+
+    /**
+     * @dataProvider columnNameDataProvider
+     */
+    public function testQuoteColumnName(string $columnName, string $expected)
+    {
+        $this->assertEquals($expected, $this->adapter->quoteColumnName($columnName));
     }
 
     public function testCreateTable()