Fix lastInsertId implementation

last_insert_id returns autoincrement column values
vimeo · Mar 29, 2021 · c688105 · c688105
1 parent 9afb99f
commit c688105
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Processor/InsertProcessor.php b/src/Processor/InsertProcessor.php
@@ -78,17 +78,17 @@ public static function process(
                 $column = $table_definition->columns[$column_name];
 
                 if ($column instanceof IntegerColumn && $column->isAutoIncrement()) {
-                    $conn->getServer()->addAutoIncrementMinValue(
+                    $last_incremented_value = $conn->getServer()->addAutoIncrementMinValue(
                         $database,
                         $table_name,
                         $column_name,
                         $value
                     );
-                }
-            }
 
-            if (\count($table_definition->primaryKeyColumns) === 1 && $conn->lastInsertId() === "0") {
-                $conn->setLastInsertId((string) $row[$table_definition->primaryKeyColumns[0]]);
+                    if ($conn->lastInsertId() === "0") {
+                        $conn->setLastInsertId((string)$last_incremented_value);
+                    }
+                }
             }
 
             $table[] = $row;

diff --git a/src/Server.php b/src/Server.php
@@ -241,7 +241,7 @@ public function addAutoIncrementMinValue(
         string $table_name,
         string $column_name,
         int $value
-    ) : void {
+    ) : int {
         $table_definition = $this->getTableDefinition($database_name, $table_name);
         $table = $this->databases[$database_name][$table_name] ?? null;
 
@@ -253,7 +253,7 @@ public function addAutoIncrementMinValue(
             $table = $this->databases[$database_name][$table_name] = new TableData();
         }
 
-        $table->autoIncrementCursors[$column_name] = max(
+        return $table->autoIncrementCursors[$column_name] = max(
             $table->autoIncrementCursors[$column_name] ?? 0,
             $value
         );