Merge branch 'bpo/2.8/#3330' into 2.8

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -36,7 +36,6 @@ use function func_num_args;
 use function implode;
 use function preg_match;
 use function sprintf;
-use function str_replace;
 use function strlen;
 use function strpos;
 use function strtoupper;
@@ -1180,14 +1179,4 @@ END;';
     {
         return 'BLOB';
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function quoteStringLiteral($str)
-    {
-        $str = str_replace('\\', '\\\\', $str); // Oracle requires backslashes to be escaped aswell.
-
-        return parent::quoteStringLiteral($str);
-    }
 }

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -42,7 +42,6 @@ use function is_array;
 use function is_bool;
 use function is_numeric;
 use function is_string;
-use function str_replace;
 use function strpos;
 use function strtolower;
 use function trim;
@@ -1205,16 +1204,6 @@ class PostgreSqlPlatform extends AbstractPlatform
         return 'BYTEA';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function quoteStringLiteral($str)
-    {
-        $str = str_replace('\\', '\\\\', $str); // PostgreSQL requires backslashes to be escaped aswell.
-
-        return parent::quoteStringLiteral($str);
-    }
-
     /**
      * {@inheritdoc}
      */

tests/Doctrine/Tests/DBAL/Functional/Platform/QuotingTest.php

+<?php
+
+namespace Doctrine\Tests\DBAL\Functional\Platform;
+
+use Doctrine\Tests\DbalFunctionalTestCase;
+
+class QuotingTest extends DbalFunctionalTestCase
+{
+    /**
+     * @dataProvider stringLiteralProvider
+     */
+    public function testQuoteStringLiteral(string $string) : void
+    {
+        $platform = $this->_conn->getDatabasePlatform();
+        $query    = $platform->getDummySelectSQL(
+            $platform->quoteStringLiteral($string)
+        );
+
+        self::assertSame($string, $this->_conn->fetchColumn($query));
+    }
+
+    /**
+     * @return mixed[][]
+     */
+    public static function stringLiteralProvider() : iterable
+    {
+        return [
+            'backslash' => ['\\'],
+            'single-quote' => ["'"],
+        ];
+    }
+}

tests/Doctrine/Tests/DBAL/Platforms/AbstractPostgreSqlPlatformTestCase.php

@@ -922,7 +922,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
      */
     public function testQuotesTableNameInListTableForeignKeysSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableForeignKeysSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableForeignKeysSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -931,7 +931,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
     public function testQuotesSchemaNameInListTableForeignKeysSQL()
     {
         self::assertContains(
-            "'Foo''Bar\\\\'",
+            "'Foo''Bar\\'",
             $this->_platform->getListTableForeignKeysSQL("Foo'Bar\\.baz_table"),
             '',
             true
@@ -943,7 +943,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
      */
     public function testQuotesTableNameInListTableConstraintsSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableConstraintsSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableConstraintsSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -951,7 +951,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
      */
     public function testQuotesTableNameInListTableIndexesSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableIndexesSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableIndexesSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -960,7 +960,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
     public function testQuotesSchemaNameInListTableIndexesSQL()
     {
         self::assertContains(
-            "'Foo''Bar\\\\'",
+            "'Foo''Bar\\'",
             $this->_platform->getListTableIndexesSQL("Foo'Bar\\.baz_table"),
             '',
             true
@@ -972,7 +972,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
      */
     public function testQuotesTableNameInListTableColumnsSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableColumnsSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableColumnsSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -981,7 +981,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
     public function testQuotesSchemaNameInListTableColumnsSQL()
     {
         self::assertContains(
-            "'Foo''Bar\\\\'",
+            "'Foo''Bar\\'",
             $this->_platform->getListTableColumnsSQL("Foo'Bar\\.baz_table"),
             '',
             true
@@ -994,7 +994,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
     public function testQuotesDatabaseNameInCloseActiveDatabaseConnectionsSQL()
     {
         self::assertContains(
-            "'Foo''Bar\\\\'",
+            "'Foo''Bar\\'",
             $this->_platform->getCloseActiveDatabaseConnectionsSQL("Foo'Bar\\"),
             '',
             true

tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php

@@ -845,7 +845,7 @@ EOD;
      */
     public function testQuotesDatabaseNameInListSequencesSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListSequencesSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListSequencesSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -853,7 +853,7 @@ EOD;
      */
     public function testQuotesTableNameInListTableIndexesSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableIndexesSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableIndexesSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -861,7 +861,7 @@ EOD;
      */
     public function testQuotesTableNameInListTableForeignKeysSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableForeignKeysSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableForeignKeysSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -869,7 +869,7 @@ EOD;
      */
     public function testQuotesTableNameInListTableConstraintsSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableConstraintsSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableConstraintsSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -877,7 +877,7 @@ EOD;
      */
     public function testQuotesTableNameInListTableColumnsSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableColumnsSQL("Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableColumnsSQL("Foo'Bar\\"), '', true);
     }
 
     /**
@@ -885,6 +885,6 @@ EOD;
      */
     public function testQuotesDatabaseNameInListTableColumnsSQL()
     {
-        self::assertContains("'Foo''Bar\\\\'", $this->_platform->getListTableColumnsSQL('foo_table', "Foo'Bar\\"), '', true);
+        self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableColumnsSQL('foo_table', "Foo'Bar\\"), '', true);
     }
 }