Move quoter->setTablePrefix() to AbstractPdoConnection

yiisoft · Jan 30, 2024 · 7042f71 · 7042f71
1 parent 277c97e
commit 7042f71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Connection/AbstractConnection.php b/src/Connection/AbstractConnection.php
@@ -9,7 +9,6 @@
 use Yiisoft\Db\Query\BatchQueryResult;
 use Yiisoft\Db\Query\BatchQueryResultInterface;
 use Yiisoft\Db\Query\QueryInterface;
-use Yiisoft\Db\Schema\QuoterInterface;
 use Yiisoft\Db\Schema\TableSchemaInterface;
 use Yiisoft\Db\Transaction\TransactionInterface;
 
@@ -22,7 +21,6 @@
 abstract class AbstractConnection implements ConnectionInterface
 {
     protected TransactionInterface|null $transaction = null;
-    protected QuoterInterface|null $quoter = null;
     private bool $enableSavepoint = true;
     private string $tablePrefix = '';
 
@@ -73,7 +71,6 @@ public function setEnableSavepoint(bool $value): void
     public function setTablePrefix(string $value): void
     {
         $this->tablePrefix = $value;
-        $this->quoter?->setTablePrefix($value);
     }
 
     public function transaction(Closure $closure, string $isolationLevel = null): mixed

diff --git a/src/Driver/Pdo/AbstractPdoConnection.php b/src/Driver/Pdo/AbstractPdoConnection.php
@@ -19,6 +19,7 @@
 use Yiisoft\Db\Profiler\ProfilerAwareInterface;
 use Yiisoft\Db\Profiler\ProfilerAwareTrait;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
+use Yiisoft\Db\Schema\QuoterInterface;
 use Yiisoft\Db\Schema\SchemaInterface;
 use Yiisoft\Db\Transaction\TransactionInterface;
 
@@ -44,6 +45,7 @@ abstract class AbstractPdoConnection extends AbstractConnection implements PdoCo
     protected string $serverVersion = '';
     protected bool|null $emulatePrepare = null;
     protected QueryBuilderInterface|null $queryBuilder = null;
+    protected QuoterInterface|null $quoter = null;
     protected SchemaInterface|null $schema = null;
 
     public function __construct(protected PdoDriverInterface $driver, protected SchemaCache $schemaCache)
@@ -196,6 +198,12 @@ public function setEmulatePrepare(bool $value): void
         $this->emulatePrepare = $value;
     }
 
+    public function setTablePrefix(string $value): void
+    {
+        $this->tablePrefix = $value;
+        $this->quoter?->setTablePrefix($value);
+    }
+
     /**
      * Initializes the DB connection.
      *