From 735b456f2b1863b52dedd8a2f26b24faad8bef91 Mon Sep 17 00:00:00 2001
From: Sergei Tigrov <rrr-r@ya.ru>
Date: Tue, 7 Nov 2023 17:47:48 +0700
Subject: [PATCH 1/2] Move methods from `Command` to `AbstractPdoCommand` class
 (#770)

* Move methods from `Command` to `AbstractPdoCommand` class
---
 CHANGELOG.md                          |  1 +
 src/Driver/Pdo/AbstractPdoCommand.php | 37 ++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34e983ff2..e92f048da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Bug #756: Fix `Quoter::quoteTableName()` for sub-query with alias (@Tigrov)
 - Bug #761: Quote aliases of CTE in `WITH` queries (@Tigrov)
 - Chg #765: Deprecate `SchemaInterface::TYPE_JSONB` (@Tigrov)
+- Enh #770: Move methods from concrete `Command` class to `AbstractPdoCommand` class (@Tigrov)
 
 ## 1.1.1 August 16, 2023
 
diff --git a/src/Driver/Pdo/AbstractPdoCommand.php b/src/Driver/Pdo/AbstractPdoCommand.php
index bce283a53..c8348f832 100644
--- a/src/Driver/Pdo/AbstractPdoCommand.php
+++ b/src/Driver/Pdo/AbstractPdoCommand.php
@@ -14,12 +14,14 @@
 use Yiisoft\Db\Command\AbstractCommand;
 use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Command\ParamInterface;
+use Yiisoft\Db\Exception\ConvertException;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidParamException;
 use Yiisoft\Db\Profiler\Context\CommandContext;
 use Yiisoft\Db\Profiler\ProfilerAwareInterface;
 use Yiisoft\Db\Profiler\ProfilerAwareTrait;
 use Yiisoft\Db\Query\Data\DataReader;
+use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 
 /**
  * Represents a database command that can be executed using a PDO (PHP Data Object) database connection.
@@ -161,6 +163,11 @@ protected function bindPendingParams(): void
         }
     }
 
+    protected function getQueryBuilder(): QueryBuilderInterface
+    {
+        return $this->db->getQueryBuilder();
+    }
+
     protected function getQueryMode(int $queryMode): string
     {
         return match ($queryMode) {
@@ -184,7 +191,35 @@ protected function getQueryMode(int $queryMode): string
      * @throws Exception
      * @throws Throwable
      */
-    abstract protected function internalExecute(string|null $rawSql): void;
+    protected function internalExecute(string|null $rawSql): void
+    {
+        $attempt = 0;
+
+        while (true) {
+            try {
+                if (
+                    ++$attempt === 1
+                    && $this->isolationLevel !== null
+                    && $this->db->getTransaction() === null
+                ) {
+                    $this->db->transaction(
+                        fn () => $this->internalExecute($rawSql),
+                        $this->isolationLevel
+                    );
+                } else {
+                    $this->pdoStatement?->execute();
+                }
+                break;
+            } catch (PDOException $e) {
+                $rawSql = $rawSql ?: $this->getRawSql();
+                $e = (new ConvertException($e, $rawSql))->run();
+
+                if ($this->retryHandler === null || !($this->retryHandler)($e, $attempt)) {
+                    throw $e;
+                }
+            }
+        }
+    }
 
     /**
      * @throws InvalidParamException

From b92cf1d51884bb055c69f6b5be811c7127076dd4 Mon Sep 17 00:00:00 2001
From: Sergei Tigrov <rrr-r@ya.ru>
Date: Fri, 10 Nov 2023 00:58:27 +0700
Subject: [PATCH 2/2] Deprecate `$withColumn` argument of
 `Quoter::getTableNamesParts()` method (#768)

---
 src/Schema/QuoterInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Schema/QuoterInterface.php b/src/Schema/QuoterInterface.php
index a3f504f57..f51e446cc 100644
--- a/src/Schema/QuoterInterface.php
+++ b/src/Schema/QuoterInterface.php
@@ -30,7 +30,7 @@ public function cleanUpTableNames(array $tableNames): array;
      * Splits full table name into parts.
      *
      * @param string $name The full name of the table.
-     * @param bool $withColumn For cases when full name has as last prat name of column.
+     * @param bool $withColumn Deprecated. Will be removed in version 2.0.0.
      *
      * @return string[] The table name parts.
      */