Simplify insertEx (#178)

darkdef · web-flow · commit 94498ba8dee0 · 2022-12-11T22:35:03.000+03:00
diff --git a/src/CommandPDO.php b/src/CommandPDO.php
@@ -13,36 +13,6 @@
 
 final class CommandPDO extends AbstractCommandPDO
 {
-    /**
-     * @inheritDoc
-     */
-    public function insertEx(string $table, array $columns): bool|array
-    {
-        $params = [];
-        $sql = $this->db->getQueryBuilder()->insertEx($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 queryBuilder(): QueryBuilderInterface
     {
         return $this->db->getQueryBuilder();
diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -399,7 +399,12 @@ public function testInsertEx(
         string $expectedSQL,
         array $expectedParams
     ): void {
-        parent::testInsertEx($table, $columns, $params, $expectedSQL, $expectedParams);
+        $this->expectException(NotSupportedException::class);
+        $this->expectExceptionMessage('Yiisoft\Db\QueryBuilder\DMLQueryBuilder::insertEx() is not supported by this DBMS.');
+
+        $db = $this->getConnection(true);
+        $qb = $db->getQueryBuilder();
+        $qb->insertEx($table, $columns, $params);
     }
 
     /**
