Fixes for Quoter (#355)

darkdef · web-flow · commit 57007d7ef7ba · 2022-09-02T09:19:40.000-04:00
* Fixes for Quoter.
diff --git a/src/Driver/PDO/ConnectionPDO.php b/src/Driver/PDO/ConnectionPDO.php
@@ -119,7 +119,7 @@ public function getEmulatePrepare(): ?bool
         return $this->emulatePrepare;
     }
 
-    public function getPdo(): ?PDO
+    public function getPDO(): ?PDO
     {
         return $this->pdo;
     }
diff --git a/src/Schema/Quoter.php b/src/Schema/Quoter.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Db\Schema;
 
+use PDO;
 use function addcslashes;
 use function explode;
 use function implode;
@@ -24,7 +25,8 @@ public function __construct(
         private array|string $columnQuoteCharacter,
         /** @psalm-var string[]|string */
         private array|string $tableQuoteCharacter,
-        private string $tablePrefix = ''
+        private string $tablePrefix = '',
+        protected PDO|null $pdo = null
     ) {
     }
 
@@ -134,6 +136,10 @@ public function quoteValue(mixed $value): mixed
             return $value;
         }
 
+        if ($this->pdo && ($value = $this->pdo->quote($value)) !== false) {
+            return $value;
+        }
+
         return '\'' . str_replace('\'', '\'\'', addcslashes($value, "\000\032")) . '\'';
     }
 
diff --git a/src/TestSupport/TestSchemaTrait.php b/src/TestSupport/TestSchemaTrait.php
@@ -346,6 +346,69 @@ public function testGetColumnNoExist(): void
         $this->assertNull($table->getColumn('no_exist'));
     }
 
+    public function testQuoterEscapingValue()
+    {
+        $db = $this->getConnection(true);
+        $quoter = $db->getQuoter();
+
+        $db->createCommand('delete from {{quoter}}')->execute();
+        $data = $this->generateQuoterEscapingValues();
+
+        foreach ($data as $index => $value) {
+            $quotedName = $quoter->quoteValue('testValue_' . $index);
+            $quoteValue = $quoter->quoteValue($value);
+
+            $db->createCommand('insert into {{quoter}}([[name]], [[description]]) values(' . $quotedName . ', ' . $quoteValue . ')')->execute();
+            $result = $db->createCommand('select * from {{quoter}} where [[name]]=' . $quotedName)->queryOne();
+            $this->assertEquals($value, $result['description']);
+        }
+    }
+
+    public function generateQuoterEscapingValues()
+    {
+        $result = [];
+        $stringLength = 16;
+        for ($i = 1; $i < 128 - $stringLength; $i += $stringLength) {
+            $str = '';
+            for ($symbol = $i; $symbol < $i + $stringLength; $symbol++) {
+                $str .= mb_chr($symbol, 'UTF-8');
+            }
+            $result[] = $str;
+
+            $str = '';
+            for ($symbol = $i; $symbol < $i + $stringLength; $symbol++) {
+                $str .= mb_chr($symbol, 'UTF-8') . mb_chr($symbol, 'UTF-8');
+            }
+            $result[] = $str;
+        }
+
+        return $result;
+    }
+
+    public function testQuoterEscapingValueFull()
+    {
+        $this->markTestSkipped('Very long test - only for check quoteValue');
+        $template = 'aaaaa{1}aaa{1}aaaabbbbb{2}bbbb{2}bbbb';
+
+        $db = $this->getConnection(true);
+        $quoter = $db->getQuoter();
+
+        $db->createCommand('delete from {{quoter}}')->execute();
+
+        for ($symbol1 = 1; $symbol1 <= 127; $symbol1++) {
+            for ($symbol2 = 1; $symbol2 <= 127; $symbol2++) {
+                $quotedName = $quoter->quoteValue('test_' . $symbol1 . '_' . $symbol2);
+                $testString = str_replace(['{1}', '{2}',], [chr($symbol1), chr($symbol2)], $template);
+
+                $quoteValue = $quoter->quoteValue($testString);
+
+                $db->createCommand('insert into {{quoter}}([[name]], [[description]]) values(' . $quotedName . ', ' . $quoteValue . ')')->execute();
+                $result = $db->createCommand('select * from {{quoter}} where [[name]]=' . $quotedName)->queryOne();
+                $this->assertEquals($testString, $result['description']);
+            }
+        }
+    }
+
     private function assertMetadataEquals($expected, $actual): void
     {
         switch (strtolower(gettype($expected))) {

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function getEmulatePrepare(): ?bool`
`119`	`119`	`return $this->emulatePrepare;`
`120`	`120`	`}`
`121`	`121`
`122`		`- public function getPdo(): ?PDO`
	`122`	`+ public function getPDO(): ?PDO`
`123`	`123`	`{`
`124`	`124`	`return $this->pdo;`
`125`	`125`	`}`