Merge branch 'DBAL-149' into 2.0.x

doctrine · Aug 29, 2011 · 8bda3e9 · 8bda3e9
2 parents 22f88e0 + 71e4ae5
commit 8bda3e9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php b/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
@@ -1002,7 +1002,7 @@ public function quoteIdentifier($str)
     {
         $c = $this->getIdentifierQuoteCharacter();
 
-        return $c . $str . $c;
+        return $c . str_replace($c, $c.$c, $str) . $c;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php b/lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php
@@ -786,6 +786,6 @@ public function getForUpdateSQL()
      */
     public function quoteIdentifier($str)
     {
-        return "[" . $str . "]";
+        return "[" . str_replace("]", "][", $str) . "]";
     }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php b/tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
@@ -16,6 +16,16 @@ public function setUp()
         $this->_platform = $this->createPlatform();
     }
 
+    public function testQuoteIdentifier()
+    {
+        if ($this->_platform->getName() == "mssql") {
+            $this->markTestSkipped('Not working this way on mssql.');
+        }
+
+        $c = $this->_platform->getIdentifierQuoteCharacter();
+        $this->assertEquals(str_repeat($c, 4), $this->_platform->quoteIdentifier($c));
+    }
+
     public function testGetInvalidtForeignKeyReferentialActionSQL()
     {
         $this->setExpectedException('InvalidArgumentException');

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/MsSqlPlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/MsSqlPlatformTest.php
@@ -171,4 +171,8 @@ public function testModifyLimitQueryWithDescOrderBy()
         $this->assertEquals('SELECT TOP 10 * FROM user ORDER BY username DESC', $sql);
     }
 
+    public function testQuoteIdentifier()
+    {
+        $this->assertEquals('[fo][o]', $this->_platform->quoteIdentifier('fo]o'));
+    }
 }