Merge pull request #717 from jharder/4.x

Handle database with escapable identifiers in name
cakephp · May 9, 2024 · 830e480 · 830e480
2 parents 8c4d3e1 + 9521d4b
commit 830e480
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/Db/Adapter/MysqlAdapter.php b/src/Db/Adapter/MysqlAdapter.php
@@ -107,7 +107,7 @@ public function connect(): void
      */
     public function setConnection(Connection $connection): AdapterInterface
     {
-        $connection->execute(sprintf('USE %s', $this->getOption('database')));
+        $connection->execute(sprintf('USE %s', $this->quoteTableName($this->getOption('database'))));
 
         return parent::setConnection($connection);
     }
@@ -1242,15 +1242,15 @@ public function createDatabase(string $name, array $options = []): void
 
         if (isset($options['collation'])) {
             $this->execute(sprintf(
-                'CREATE DATABASE `%s` DEFAULT CHARACTER SET `%s` COLLATE `%s`',
-                $name,
+                'CREATE DATABASE %s DEFAULT CHARACTER SET `%s` COLLATE `%s`',
+                $this->quoteTableName($name),
                 $charset,
                 $options['collation']
             ));
         } else {
-            $this->execute(sprintf('CREATE DATABASE `%s` DEFAULT CHARACTER SET `%s`', $name, $charset));
+            $this->execute(sprintf('CREATE DATABASE %s DEFAULT CHARACTER SET `%s`', $this->quoteTableName($name), $charset));
         }
-        $this->execute(sprintf('USE %s', $name));
+        $this->execute(sprintf('USE %s', $this->quoteTableName($name)));
     }
 
     /**
@@ -1279,7 +1279,7 @@ public function hasDatabase(string $name): bool
      */
     public function dropDatabase(string $name): void
     {
-        $this->execute(sprintf('DROP DATABASE IF EXISTS `%s`', $name));
+        $this->execute(sprintf('DROP DATABASE IF EXISTS %s', $this->quoteTableName($name)));
         $this->createdTables = [];
     }
 

diff --git a/tests/TestCase/Db/Adapter/MysqlAdapterTest.php b/tests/TestCase/Db/Adapter/MysqlAdapterTest.php
@@ -104,6 +104,14 @@ public function testSchemaTableIsCreatedWithPrimaryKey()
         $this->assertTrue($this->adapter->hasIndex($this->adapter->getSchemaTableName(), ['version']));
     }
 
+    public function testDatabaseNameWithEscapedCharacter()
+    {
+        $this->adapter->dropDatabase($this->config['database'] . '-test');
+        $this->adapter->createDatabase($this->config['database'] . '-test', ['charset' => 'utf8mb4']);
+        $this->assertTrue($this->adapter->hasDatabase($this->config['database'] . '-test'));
+        $this->adapter->dropDatabase($this->config['database'] . '-test');
+    }
+
     public function testQuoteTableName()
     {
         $this->assertEquals('`test_table`', $this->adapter->quoteTableName('test_table'));