Merge remote-tracking branch 'origin/master' into allow-columninterfa…

…ce-as-type
yiisoft · Nov 10, 2023 · 61959fe · 61959fe
2 parents 0424b52 + b92cf1d
commit 61959fe
Show file tree

Hide file tree

Showing 12 changed files with 201 additions and 166 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## 1.1.2 under development
 
+- Enh #746: Refactor `AbstractDMLQueryBuilder` (@Tigrov)
+- Bug #746: Fix `AbstractDMLQueryBuilder::upsert()` when unique index is not at the first position of inserted values (@Tigrov)
+- Bug #746: Typecast values in `AbstractDMLQueryBuilder::batchInsert()` if column names with table name and brackets (@Tigrov)
+- Bug #746, #61: Typecast values in `AbstractDMLQueryBuilder::batchInsert()` if values with string keys (@Tigrov)
+- Enh #746: Enhanced documentation of `batchInsert()` and `update()` methods of `DMLQueryBuilderInterface` interface (@Tigrov)
 - Bug #751: Fix collected debug actions (@xepozz)
 - Chg #755: Deprecate `TableSchemaInterface::compositeForeignKey()` (@Tigrov) 
 - Enh #756: Refactor `Quoter` (@Tigrov) 
@@ -10,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/psalm.xml b/psalm.xml
@@ -14,4 +14,7 @@
         <directory name="vendor" />
     </ignoreFiles>
   </projectFiles>
+  <issueHandlers>
+    <MixedAssignment errorLevel="suppress" />
+  </issueHandlers>
 </psalm>
diff --git a/src/Command/CommandInterface.php b/src/Command/CommandInterface.php
@@ -177,6 +177,8 @@ public function alterColumn(string $table, string $column, ColumnInterface|strin
      * @throws Exception
      * @throws InvalidArgumentException
      *
+     * @psalm-param iterable<array-key, array<array-key, mixed>> $rows
+     *
      * Note: The method will quote the `table` and `column` parameters before using them in the generated SQL.
      */
     public function batchInsert(string $table, array $columns, iterable $rows): static;
@@ -821,6 +823,8 @@ public function update(string $table, array $columns, array|string $condition =
      * @throws JsonException
      * @throws NotSupportedException
      *
+     * @psalm-param array<string, mixed>|QueryInterface $insertColumns
+     *
      * Note: The method will quote the `table` and `insertColumns`, `updateColumns` parameters before using it in the
      * generated SQL.
      */

diff --git 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