Fixes for Quoter (#144)

* Fixes for Quoter.
yiisoft · Sep 2, 2022 · 56e58f0 · 56e58f0
1 parent 5f608f5
commit 56e58f0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/ConnectionPDO.php b/src/ConnectionPDO.php
@@ -10,6 +10,7 @@
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
+use Yiisoft\Db\Schema\Quoter;
 use Yiisoft\Db\Schema\QuoterInterface;
 use Yiisoft\Db\Schema\SchemaInterface;
 use Yiisoft\Db\Transaction\TransactionInterface;
@@ -62,7 +63,7 @@ public function getQueryBuilder(): QueryBuilderInterface
     public function getQuoter(): QuoterInterface
     {
         if ($this->quoter === null) {
-            $this->quoter = new Quoter('`', '`', $this->getTablePrefix());
+            $this->quoter = new Quoter('`', '`', $this->getTablePrefix(), $this->getActivePDO());
         }
 
         return $this->quoter;

diff --git a/src/Quoter.php b/src/Quoter.php
@@ -4,10 +4,14 @@
 
 namespace Yiisoft\Db\Mysql;
 
+use PDO;
 use Yiisoft\Db\Schema\Quoter as BaseQuoter;
-use Yiisoft\Db\Schema\QuoterInterface;
 
-final class Quoter extends BaseQuoter implements QuoterInterface
+/**
+ * @todo Remove or use? Where is question
+ * Temporary not used. Need add more tests for many charset
+ */
+final class Quoter extends BaseQuoter
 {
     /**
      * @psalm-param string[]|string $columnQuoteCharacter
@@ -16,9 +20,10 @@ final class Quoter extends BaseQuoter implements QuoterInterface
     public function __construct(
         array|string $columnQuoteCharacter,
         array|string $tableQuoteCharacter,
-        string $tablePrefix = ''
+        string $tablePrefix = '',
+        protected PDO|null $pdo = null
     ) {
-        parent::__construct($columnQuoteCharacter, $tableQuoteCharacter, $tablePrefix);
+        parent::__construct($columnQuoteCharacter, $tableQuoteCharacter, $tablePrefix, $pdo);
     }
 
     public function quoteValue(mixed $value): mixed
@@ -27,6 +32,10 @@ public function quoteValue(mixed $value): mixed
             return $value;
         }
 
-        return "'" . preg_replace('~[\x00\x0A\x0D\x1A\x22\x25\x27\x5C]~u', '\\\$0', $value) . "'";
+        return "'" . str_replace(
+            ['\\', "\x00", "\n", "\r", "'", '"', "\x1a"],
+            ['\\\\', '\\0', '\\n', '\\r', "\'", '\"', '\\Z'],
+            $value
+        ) . "'";
     }
 }
diff --git a/tests/Fixture/mysql.sql b/tests/Fixture/mysql.sql
@@ -12,6 +12,7 @@ DROP TABLE IF EXISTS `order_with_null_fk` CASCADE;
 DROP TABLE IF EXISTS `category` CASCADE;
 DROP TABLE IF EXISTS `customer` CASCADE;
 DROP TABLE IF EXISTS `profile` CASCADE;
+DROP TABLE IF EXISTS `quoter` CASCADE;
 DROP TABLE IF EXISTS `null_values` CASCADE;
 DROP TABLE IF EXISTS `negative_default_values` CASCADE;
 DROP TABLE IF EXISTS `type` CASCADE;
@@ -47,6 +48,13 @@ CREATE TABLE `profile` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `quoter` (
+   `id` int(11) NOT NULL AUTO_INCREMENT,
+   `name` varchar(16) NOT NULL,
+   `description` varchar(128) NOT NULL,
+   PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 CREATE TABLE `customer` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `email` varchar(128) NOT NULL,