feat: use rows value to delete inserted row if primary key is filled

Author: JesusTheHun

src/Codeception/Module/Db.php

@@ -801,8 +801,13 @@ private function addInsertedRow(string $table, array $row, $id): void
         $primaryKey = $this->_getDriver()->getPrimaryKey($table);
         $primary = [];
         if ($primaryKey !== []) {
-            if ($id && count($primaryKey) === 1) {
-                $primary [$primaryKey[0]] = $id;
+            $filledKeys = array_intersect($primaryKey, array_keys($row));
+            $primaryKeyIsFilled = count($filledKeys) === count($primaryKey);
+
+            if ($primaryKeyIsFilled) {
+                $primary = array_intersect_key($row, array_flip($primaryKey));
+            } elseif ($id && count($primaryKey) === 1) {
+                $primary[$primaryKey[0]] = $id;
             } else {
                 foreach ($primaryKey as $column) {
                     if (isset($row[$column])) {

tests/data/dumps/mysql.sql

@@ -94,8 +94,18 @@ CREATE TABLE `no_pk` (
   `status` varchar(255) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `auto_increment_not_on_pk` (
+    `id` int(11) NOT NULL,
+    `counter` int(11) NOT NULL,
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE INDEX counter ON `auto_increment_not_on_pk` (counter);
+ALTER TABLE `auto_increment_not_on_pk`
+    MODIFY counter int AUTO_INCREMENT;
+
 CREATE TABLE `empty_table` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `field` varchar(255),
   PRIMARY KEY(`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

tests/unit/Codeception/Module/Db/MySqlDbTest.php

@@ -101,4 +101,16 @@ public function testGrabColumnFromDatabase()
             ],
             $emails);
     }
+
+    public function testHaveInDatabaseAutoIncrementOnANonPrimaryKey()
+    {
+        $testData = [
+            'id' => 777,
+        ];
+        $this->module->haveInDatabase('auto_increment_not_on_pk', $testData);
+        $this->module->seeInDatabase('auto_increment_not_on_pk', $testData);
+        $this->module->_after(Stub::makeEmpty(TestInterface::class));
+
+        $this->module->dontSeeInDatabase('auto_increment_not_on_pk', $testData);
+    }
 }