Merge branch 'master' into batchInsert-empty-columns

yiisoft · Jan 3, 2024 · 250e0f2 · 250e0f2
2 parents e300961 + 65497c3
commit 250e0f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.1.1 under development
 
 - Enh #312: Change property `Schema::$typeMap` to constant `Schema::TYPE_MAP` (@Tigrov)
+- Bug #314: Fix `Command::insertWithReturningPks()` method for empty values (@Tigrov)
 
 ## 1.1.0 November 12, 2023
 

diff --git a/src/Command.php b/src/Command.php
@@ -18,11 +18,12 @@ public function insertWithReturningPks(string $table, array $columns): bool|arra
         $sql = $this->db->getQueryBuilder()->insert($table, $columns, $params);
         $this->setSql($sql)->bindValues($params);
 
+        $tableSchema = $this->db->getSchema()->getTableSchema($table);
+
         if (!$this->execute()) {
             return false;
         }
 
-        $tableSchema = $this->db->getSchema()->getTableSchema($table);
         $tablePrimaryKeys = $tableSchema?->getPrimaryKey() ?? [];
         $result = [];