Bugfix for insertEx (#414)

darkdef · web-flow · commit e0d4746dcad7 · 2022-12-11T23:19:50.000+03:00
diff --git a/src/Command/Command.php b/src/Command/Command.php
@@ -409,33 +409,6 @@ public function insert(string $table, QueryInterface|array $columns): static
         return $this->setSql($sql)->bindValues($params);
     }
 
-    public function insertEx(string $table, array $columns): bool|array
-    {
-        $params = [];
-        $sql = $this->db->getQueryBuilder()->insert($table, $columns, $params);
-        $this->setSql($sql)->bindValues($params);
-
-        if (!$this->execute()) {
-            return false;
-        }
-
-        $tableSchema = $this->db->getSchema()->getTableSchema($table);
-        $tablePrimaryKeys = $tableSchema?->getPrimaryKey() ?? [];
-
-        $result = [];
-        foreach ($tablePrimaryKeys as $name) {
-            if ($tableSchema?->getColumn($name)?->isAutoIncrement()) {
-                $result[$name] = $this->db->getLastInsertID((string) $tableSchema?->getSequenceName());
-                continue;
-            }
-
-            /** @psalm-var mixed */
-            $result[$name] = $columns[$name] ?? $tableSchema?->getColumn($name)?->getDefaultValue();
-        }
-
-        return $result;
-    }
-
     public function noCache(): static
     {
         $this->queryCacheDuration = -1;
diff --git a/src/Driver/PDO/CommandPDO.php b/src/Driver/PDO/CommandPDO.php
@@ -101,6 +101,33 @@ public function bindValues(array $values): static
         return $this;
     }
 
+    public function insertEx(string $table, array $columns): bool|array
+    {
+        $params = [];
+        $sql = $this->db->getQueryBuilder()->insert($table, $columns, $params);
+        $this->setSql($sql)->bindValues($params);
+
+        if (!$this->execute()) {
+            return false;
+        }
+
+        $tableSchema = $this->db->getSchema()->getTableSchema($table);
+        $tablePrimaryKeys = $tableSchema?->getPrimaryKey() ?? [];
+
+        $result = [];
+        foreach ($tablePrimaryKeys as $name) {
+            if ($tableSchema?->getColumn($name)?->isAutoIncrement()) {
+                $result[$name] = $this->db->getLastInsertID((string) $tableSchema?->getSequenceName());
+                continue;
+            }
+
+            /** @psalm-var mixed */
+            $result[$name] = $columns[$name] ?? $tableSchema?->getColumn($name)?->getDefaultValue();
+        }
+
+        return $result;
+    }
+
     /**
      * @throws Exception|InvalidConfigException|PDOException
      */
diff --git a/tests/QueryBuilder/QueryBuilderTest.php b/tests/QueryBuilder/QueryBuilderTest.php
@@ -112,7 +112,7 @@ public function testInsertEx(
 
         $this->expectException(NotSupportedException::class);
         $this->expectExceptionMessage(
-            'Yiisoft\Db\Tests\Support\Stub\Schema::loadTableSchema is not supported by this DBMS.'
+            'Yiisoft\Db\QueryBuilder\DMLQueryBuilder::insertEx() is not supported by this DBMS.'
         );
 
         $qb->insertEx($table, $columns, $params);
