[ORM] upsert() should ignore id or ai primay key #1317

Author: asika32764

packages/orm/src/EntityMapper.php

@@ -1041,12 +1041,13 @@ public function upsert(
         $returningIdField = null;
 
         if ($aiColumn = $metadata->getAutoIncrementColumn()) {
-            // Todo: MySQL no need to strip ai column, waiting pgsql test
-            // if (!in_array($aiColumn->getName(), $condFields, true)) {
-            //     unset($data[$aiColumn->getName()]);
-            // }
+            $aiColumnName = $aiColumn->getName();
 
-            $returningIdField = $aiColumn->getName();
+            if (!in_array($aiColumnName, $condFields, true)) {
+                unset($data[$aiColumnName]);
+            }
+
+            $returningIdField = $aiColumnName;
         }
 
         if ($data !== []) {

packages/query/src/Bounded/BoundedHelper.php

@@ -118,6 +118,10 @@ public static function emulatePrepared(mixed $escaper, string $sql, array $bound
                 }
             }
 
+            if ($v === null && $param['dataType'] === ParamType::NULL) {
+                $v = 'NULL';
+            }
+
             $values[] = $v;
         }