Fixes for Quoter (#112)

Fixes for Quoter.
yiisoft · Sep 2, 2022 · 0917a84 · 0917a84
1 parent e888a23
commit 0917a84
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/ConnectionPDO.php b/src/ConnectionPDO.php
@@ -68,7 +68,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,13 +4,13 @@
 
 namespace Yiisoft\Db\Mssql;
 
+use PDO;
 use Yiisoft\Db\Schema\Quoter as BaseQuoter;
-use Yiisoft\Db\Schema\QuoterInterface;
 
 use function preg_match;
 use function preg_match_all;
 
-final class Quoter extends BaseQuoter implements QuoterInterface
+final class Quoter extends BaseQuoter
 {
     /**
      * @psalm-param string[] $columnQuoteCharacter
@@ -19,9 +19,10 @@ final class Quoter extends BaseQuoter implements QuoterInterface
     public function __construct(
         array $columnQuoteCharacter,
         array $tableQuoteCharacter,
-        string $tablePrefix = ''
+        string $tablePrefix = '',
+        protected PDO|null $pdo = null,
     ) {
-        parent::__construct($columnQuoteCharacter, $tableQuoteCharacter, $tablePrefix);
+        parent::__construct($columnQuoteCharacter, $tableQuoteCharacter, $tablePrefix, $pdo);
     }
 
     public function quoteColumnName(string $name): string

diff --git a/tests/Fixture/mssql.sql b/tests/Fixture/mssql.sql
@@ -7,6 +7,7 @@ IF OBJECT_ID('[dbo].[order_with_null_fk]', 'U') IS NOT NULL DROP TABLE [dbo].[or
 IF OBJECT_ID('[dbo].[category]', 'U') IS NOT NULL DROP TABLE [dbo].[category];
 IF OBJECT_ID('[dbo].[customer]', 'U') IS NOT NULL DROP TABLE [dbo].[customer];
 IF OBJECT_ID('[dbo].[profile]', 'U') IS NOT NULL DROP TABLE [dbo].[profile];
+IF OBJECT_ID('[dbo].[quoter]', 'U') IS NOT NULL DROP TABLE [dbo].[quoter];
 IF OBJECT_ID('[dbo].[type]', 'U') IS NOT NULL DROP TABLE [dbo].[type];
 IF OBJECT_ID('[dbo].[null_values]', 'U') IS NOT NULL DROP TABLE [dbo].[null_values];
 IF OBJECT_ID('[dbo].[test_trigger]', 'U') IS NOT NULL DROP TABLE [dbo].[test_trigger];
@@ -37,6 +38,11 @@ CREATE TABLE [dbo].[profile] (
     ) ON [PRIMARY]
 );
 
+CREATE TABLE [dbo].[quoter] (
+    [name] [varchar](16) NOT NULL,
+    [description] [nvarchar](256) NOT NULL,
+);
+
 CREATE TABLE [dbo].[customer] (
     [id] [int] IDENTITY NOT NULL,
     [email] [varchar](128) NOT NULL,