Fix Command::insertWithReturningPks() (yiisoft#250)

Co-authored-by: Alexey Rogachev <[email protected]>
Tigrov · Dec 21, 2023 · 0b28ffb · 0b28ffb
1 parent 1ae3f3d
commit 0b28ffb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.2.1 under development
 
 - Enh #248: Change property `Schema::$typeMap` to constant `Schema::TYPE_MAP` (@Tigrov)
+- Bug #250: Fix `Command::insertWithReturningPks()` method for table without primary keys (@Tigrov)
 
 ## 1.2.0 November 12, 2023
 

diff --git a/src/Command.php b/src/Command.php
@@ -22,14 +22,21 @@ final class Command extends AbstractPdoCommand
 {
     public function insertWithReturningPks(string $table, array $columns): bool|array
     {
+        $tableSchema = $this->db->getSchema()->getTableSchema($table);
+        $returnColumns = $tableSchema?->getPrimaryKey() ?? [];
+
+        if ($returnColumns === []) {
+            if ($this->insert($table, $columns)->execute() === 0) {
+                return false;
+            }
+
+            return [];
+        }
+
         $params = [];
         $sql = $this->getQueryBuilder()->insert($table, $columns, $params);
 
-        $tableSchema = $this->db->getSchema()->getTableSchema($table);
-
-        $returnColumns = $tableSchema?->getPrimaryKey() ?? [];
         $columnSchemas = $tableSchema?->getColumns() ?? [];
-
         $returnParams = [];
         $returning = [];