Fix upsert

Author: asika32764

packages/database/src/Manager/WriterManager.php

@@ -229,7 +229,11 @@ public function upsert(
 
         $table = (string) $query->quoteName($table);
         $data = TypeCast::toArray($data);
-        $quotedFields = $query->qnMultiple(array_keys($data));
+        $allFields = array_keys($data);
+        $valueFields = array_filter($allFields, fn($field) => !in_array($field, $keys, true));
+
+        $quotedFields = $query->qnMultiple($allFields);
+        $quotedValueFields = $query->qnMultiple($valueFields);
         $quotedKeys = $query->qnMultiple($keys);
 
         $columns = $query->clause('()', $quotedFields, ',');
@@ -248,7 +252,7 @@ public function upsert(
             case AbstractPlatform::MYSQL:
                 $dupKeys = $query->clause('', [], ',');
 
-                foreach ($quotedKeys as $key) {
+                foreach ($quotedValueFields as $key) {
                     $dupKeys->append("$key = VALUES($key)");
                 }
 
@@ -266,12 +270,12 @@ public function upsert(
                 $dupKeys = $query->clause('()', [], ',');
 
                 foreach ($quotedKeys as $key) {
-                    $dupKeys->append("$key = VALUES($key)");
+                    $dupKeys->append($key);
                 }
 
                 $excludeKeys = $query->clause('', [], ',');
 
-                foreach ($quotedKeys as $key) {
+                foreach ($quotedValueFields as $key) {
                     $excludeKeys->append("$key = EXCLUDED.$key");
                 }
 
@@ -308,7 +312,9 @@ public function upsert(
 
                 $updateSet = $query->clause('', [], ',');
 
-                foreach ($data as $k => $v) {
+                foreach ($valueFields as $k) {
+                    $v = $data[$k];
+
                     if ($v instanceof RawWrapper) {
                         $updateSet->append($query->quoteName($k) . '=' . $v());
                     } else {

packages/orm/src/EntityMapper.php

@@ -1005,6 +1005,8 @@ public function upsert(
 
         $metadata = $this->getMetadata();
 
+        $updateNulls = true;
+
         // $updateNulls = $options->updateNulls;
         // if ($this->metadata::isEntity($item)) {
         //     $updateNulls = true;