Improve

Author: Tigrov

src/Command.php

@@ -27,31 +27,44 @@ final class Command extends AbstractPdoCommand
 {
     public function insertWithReturningPks(string $table, array|QueryInterface $columns): array|false
     {
+        $tableSchema = $this->db->getSchema()->getTableSchema($table);
+        $primaryKeys = $tableSchema?->getPrimaryKey() ?? [];
+        $tableColumns = $tableSchema?->getColumns() ?? [];
+
+        foreach ($primaryKeys as $name) {
+            /** @var ColumnInterface $column */
+            $column = $tableColumns[$name];
+
+            if ($column->isAutoIncrement()) {
+                continue;
+            }
+
+            if ($columns instanceof QueryInterface) {
+                throw new NotSupportedException(
+                    __METHOD__ . '() is not supported by Sqlite for tables without auto increment when inserting sub-query.'
+                );
+            }
+
+            break;
+        }
+
         $params = [];
-        $sql = $this->db->getQueryBuilder()->insert($table, $columns, $params);
-        $this->setSql($sql)->bindValues($params);
+        $insertSql = $this->db->getQueryBuilder()->insert($table, $columns, $params);
+        $this->setSql($insertSql)->bindValues($params);
 
         if ($this->execute() === 0) {
             return false;
         }
 
-        $tableSchema = $this->db->getSchema()->getTableSchema($table);
-        $tablePrimaryKeys = $tableSchema?->getPrimaryKey() ?? [];
-
-        if (empty($tablePrimaryKeys)) {
+        if (empty($primaryKeys)) {
             return [];
         }
 
-        if ($columns instanceof QueryInterface) {
-            throw new NotSupportedException(__METHOD__ . '() not supported for QueryInterface by SQLite.');
-        }
-
         $result = [];
 
-        /** @var TableSchema $tableSchema */
-        foreach ($tablePrimaryKeys as $name) {
+        foreach ($primaryKeys as $name) {
             /** @var ColumnInterface $column */
-            $column = $tableSchema->getColumn($name);
+            $column = $tableColumns[$name];
 
             if ($column->isAutoIncrement()) {
                 $value = $this->db->getLastInsertId();

tests/CommandTest.php

@@ -10,6 +10,7 @@
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
+use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Sqlite\Tests\Support\TestTrait;
 use Yiisoft\Db\Tests\Common\CommonCommandTest;
 
@@ -326,6 +327,21 @@ public function testGetRawSql(string $sql, array $params, string $expectedRawSql
         parent::testGetRawSql($sql, $params, $expectedRawSql);
     }
 
+    public function testInsertWithReturningPksWithSubqueryAndNoAutoincrement(): void
+    {
+        $db = $this->getConnection(true);
+        $command = $db->createCommand();
+
+        $query = (new Query($db))->select(['order_id' => 1, 'item_id' => 2, 'quantity' => 3, 'subtotal' => 4]);
+
+        $this->expectException(NotSupportedException::class);
+        $this->expectExceptionMessage(
+            'Yiisoft\Db\Sqlite\Command::insertWithReturningPks() is not supported by Sqlite for tables without auto increment when inserting sub-query.'
+        );
+
+        $command->insertWithReturningPks('order_item', $query);
+    }
+
     /**
      * @throws Throwable
      * @throws InvalidConfigException