ACPT-773: Fixing insertOnDuplicate doesn't use array keys for columns like insertMultiple

JacobBrownAustin · JacobBrownAustin · commit 810402b6b345 · 2022-09-27T21:17:20.000-05:00
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -1994,7 +1994,11 @@ public function insertOnDuplicate($table, array $data, array $fields = [])
                 if (array_diff($cols, array_keys($row))) {
                     throw new \Zend_Db_Exception('Invalid data for insert');
                 }
-                $values[] = $this->_prepareInsertData($row, $bind);
+                $line = [];
+                foreach ($cols as $field) {
+                    $line[] = $row[$field];
+                }
+                $values[] = $this->_prepareInsertData($line, $bind);
             }
             unset($row);
         } else { // Column-value pairs

Original file line number	Diff line number	Diff line change
`@@ -1994,7 +1994,11 @@ public function insertOnDuplicate($table, array $data, array $fields = [])`
`1994`	`1994`	`if (array_diff($cols, array_keys($row))) {`
`1995`	`1995`	`throw new \Zend_Db_Exception('Invalid data for insert');`
`1996`	`1996`	`}`
`1997`		`- $values[] = $this->_prepareInsertData($row, $bind);`
	`1997`	`+ $line = [];`
	`1998`	`+ foreach ($cols as $field) {`
	`1999`	`+ $line[] = $row[$field];`
	`2000`	`+ }`
	`2001`	`+ $values[] = $this->_prepareInsertData($line, $bind);`
`1998`	`2002`	`}`
`1999`	`2003`	`unset($row);`
`2000`	`2004`	`} else { // Column-value pairs`