upsert updateFields

Author: asika32764

packages/database/src/Manager/WriterManager.php

@@ -220,6 +220,7 @@ public function upsert(
         string $table,
         array|object $data,
         array|string $keys,
+        array|null $updateFields = null,
         array $options = [],
     ): StatementInterface {
         $keys = (array) $keys;
@@ -236,10 +237,13 @@ public function upsert(
         $table = (string) $query->quoteName($table);
         $data = TypeCast::toArray($data);
         $allFields = array_keys($data);
-        $valueFields = array_filter($allFields, fn($field) => !in_array($field, $keys, true));
+        // $valueFields = array_filter($allFields, fn($field) => !in_array($field, $keys, true));
 
+        $updateFields ??= array_filter($allFields, fn($field) => !in_array($field, $keys, true));
+
+        $quotedUpdateFields = $query->qnMultiple($updateFields);
         $quotedFields = $query->qnMultiple($allFields);
-        $quotedValueFields = $query->qnMultiple($valueFields);
+        // $quotedValueFields = $query->qnMultiple($valueFields);
         $quotedKeys = $query->qnMultiple($keys);
 
         $columns = $query->clause('()', $quotedFields, ',');
@@ -256,39 +260,39 @@ public function upsert(
 
         switch ($platformName) {
             case AbstractPlatform::MYSQL:
-                $dupKeys = $query->clause('', [], ',');
+                $updateActions = $query->clause('', [], ',');
 
-                foreach ($quotedValueFields as $key) {
-                    $dupKeys->append("$key = VALUES($key)");
+                foreach ($quotedUpdateFields as $key) {
+                    $updateActions->append("$key = VALUES($key)");
                 }
 
                 $query->sql(
                     <<<SQL
                     INSERT INTO $table $columns
                     VALUES $values
                     ON DUPLICATE KEY UPDATE
-                        $dupKeys
+                        $updateActions
                     SQL
                 );
                 break;
 
             case AbstractPlatform::POSTGRESQL:
-                $dupKeys = $query->clause('()', [], ',');
+                $updateActions = $query->clause('()', [], ',');
 
                 foreach ($quotedKeys as $key) {
-                    $dupKeys->append($key);
+                    $updateActions->append($key);
                 }
 
                 $excludeKeys = $query->clause('', [], ',');
 
-                foreach ($quotedValueFields as $key) {
+                foreach ($quotedUpdateFields as $key) {
                     $excludeKeys->append("$key = EXCLUDED.$key");
                 }
 
                 $query->sql(
                     <<<SQL
                     INSERT INTO $table $columns
-                    VALUES $values ON CONFLICT $dupKeys DO UPDATE SET
+                    VALUES $values ON CONFLICT $updateActions DO UPDATE SET
                         $excludeKeys
                     SQL
                 );
@@ -318,7 +322,7 @@ public function upsert(
 
                 $updateSet = $query->clause('', [], ',');
 
-                foreach ($valueFields as $k) {
+                foreach ($updateFields as $k) {
                     $v = $data[$k];
 
                     if ($v instanceof RawWrapper) {

packages/orm/src/EntityMapper.php

@@ -997,6 +997,7 @@ function () use ($initData, $data, $item, $options, $condFields, $conditions) {
     public function upsert(
         array|object $item,
         array|string|null $condFields = null,
+        array|null $updateFields = null,
         ORMOptions $options = new ORMOptions()
     ): ?StatementInterface {
         if ($item === []) {
@@ -1043,6 +1044,7 @@ public function upsert(
                 $metadata->getTableName(),
                 $data,
                 $condFields,
+                $updateFields,
                 [
                     'updateNulls' => $updateNulls,
                 ]

packages/orm/src/ORMProxyTrait.php

@@ -385,9 +385,10 @@ public function upsert(
         string $entityClass,
         array|object $item,
         array|string|null $condFields = null,
+        array|null $updateFields = null,
         ORMOptions $options = new ORMOptions()
     ): ?StatementInterface {
-        return $this->mapper($entityClass)->upsert($item, $condFields, $options);
+        return $this->mapper($entityClass)->upsert($item, $condFields, $updateFields, $options);
     }
 
     /**