[doctrineGH-4645] Fix SQLServerPlatform::quoteIdentifier()

morozov · May 13, 2021 · 8809142 · 8809142
1 parent b728198
commit 8809142
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php b/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
@@ -1610,7 +1610,7 @@ protected function getReservedKeywordsClass()
      */
     public function quoteSingleIdentifier($str)
     {
-        return '[' . str_replace(']', '][', $str) . ']';
+        return '[' . str_replace(']', ']]', $str) . ']';
     }
 
     /**

diff --git a/tests/Doctrine/Tests/DBAL/Functional/Platform/QuotingTest.php b/tests/Doctrine/Tests/DBAL/Functional/Platform/QuotingTest.php
@@ -4,6 +4,8 @@
 
 use Doctrine\Tests\DbalFunctionalTestCase;
 
+use function key;
+
 class QuotingTest extends DbalFunctionalTestCase
 {
     /**
@@ -29,4 +31,30 @@ public static function stringLiteralProvider(): iterable
             'single-quote' => ["'"],
         ];
     }
+
+    /**
+     * @dataProvider identifierProvider
+     */
+    public function testQuoteIdentifier(string $identifier): void
+    {
+        $platform = $this->connection->getDatabasePlatform();
+        $query    = $platform->getDummySelectSQL(
+            'NULL AS ' . $platform->quoteIdentifier($identifier)
+        );
+
+        self::assertSame($identifier, key($this->connection->fetchAssociative($query)));
+    }
+
+    /**
+     * @return iterable<string,array{0:string}>
+     */
+    public static function identifierProvider(): iterable
+    {
+        return [
+            '[' => ['['],
+            ']' => [']'],
+            '"' => ['"'],
+            '`' => ['`'],
+        ];
+    }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Platforms/AbstractSQLServerPlatformTestCase.php b/tests/Doctrine/Tests/DBAL/Platforms/AbstractSQLServerPlatformTestCase.php
@@ -545,14 +545,14 @@ public function testModifyLimitSubquerySimple(): void
 
     public function testQuoteIdentifier(): void
     {
-        self::assertEquals('[fo][o]', $this->platform->quoteIdentifier('fo]o'));
+        self::assertEquals('[fo]]o]', $this->platform->quoteIdentifier('fo]o'));
         self::assertEquals('[test]', $this->platform->quoteIdentifier('test'));
         self::assertEquals('[test].[test]', $this->platform->quoteIdentifier('test.test'));
     }
 
     public function testQuoteSingleIdentifier(): void
     {
-        self::assertEquals('[fo][o]', $this->platform->quoteSingleIdentifier('fo]o'));
+        self::assertEquals('[fo]]o]', $this->platform->quoteSingleIdentifier('fo]o'));
         self::assertEquals('[test]', $this->platform->quoteSingleIdentifier('test'));
         self::assertEquals('[test.test]', $this->platform->quoteSingleIdentifier('test.test'));
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1610,7 +1610,7 @@ protected function getReservedKeywordsClass() @@
          */
         public function quoteSingleIdentifier($str)
         {
-            return '[' . str_replace(']', '][', $str) . ']';
+            return '[' . str_replace(']', ']]', $str) . ']';
         }
         /**
@@ Expand Down @@