Merge branch 'master' into fix-94

Author: rustamwin

CHANGELOG.md

@@ -54,8 +54,9 @@
 - Enh #383: Refactor `TableSchema` and `Schema` classes (@Tigrov)
 - Enh #386: Support column's collation (@Tigrov)
 - New #391: Add `Connection::getColumnBuilderClass()` method (@Tigrov)
-- New #390: Implement `ArrayMergeBuilder`, `GreatestBuilder`, `LeastBuilder`, `LengthBuilder`, `LongestBuilder`
+- New #390, #396: Implement `ArrayMergeBuilder`, `GreatestBuilder`, `LeastBuilder`, `LengthBuilder`, `LongestBuilder`
   and `ShortestBuilder` classes (@Tigrov)
+- Enh #393: Refactor `DMLQueryBuilder::upsert()` method (@Tigrov)
 
 ## 1.2.0 March 21, 2024
 

src/Builder/ArrayMergeBuilder.php

@@ -42,9 +42,10 @@ protected function buildFromExpression(MultiOperandFunction $expression, array &
         }
 
         $unions = implode(' UNION ', $selects);
+        $orderBy = $expression->getOrdered() ? ' WITHIN GROUP (ORDER BY value)' : '';
 
         return <<<SQL
-            (SELECT '[' + STRING_AGG('"' + STRING_ESCAPE(value, 'json') + '"', ',') + ']' AS value FROM ($unions) AS t)
+            (SELECT '[' + STRING_AGG('"' + STRING_ESCAPE(value, 'json') + '"', ',')$orderBy + ']' AS value FROM ($unions) AS t)
             SQL;
     }
 }

src/DMLQueryBuilder.php

@@ -9,7 +9,6 @@
 use InvalidArgumentException;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
-use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Query\QueryInterface;
 use Yiisoft\Db\QueryBuilder\AbstractDMLQueryBuilder;
 
@@ -213,7 +212,7 @@ private function prepareUpsertParts(
 
             foreach ($columnNames as $name) {
                 $quotedName = $this->quoter->quoteColumnName($name);
-                $constraintCondition[] = "$quotedTableName.$quotedName=[EXCLUDED].$quotedName";
+                $constraintCondition[] = "$quotedTableName.$quotedName=EXCLUDED.$quotedName";
             }
 
             $onCondition[] = $constraintCondition;
@@ -227,18 +226,18 @@ private function prepareUpsertParts(
 
         $mergeSql = 'MERGE ' . $quotedTableName . ' WITH (HOLDLOCK) USING ('
             . (!empty($placeholders) ? 'VALUES (' . implode(', ', $placeholders) . ')' : $values)
-            . ') AS [EXCLUDED] (' . implode(', ', $quotedInsertNames) . ') ' . "ON ($on)";
+            . ') AS EXCLUDED (' . implode(', ', $quotedInsertNames) . ') ' . "ON ($on)";
 
         $insertValues = [];
 
         foreach ($quotedInsertNames as $quotedName) {
-            $insertValues[] = '[EXCLUDED].' . $quotedName;
+            $insertValues[] = 'EXCLUDED.' . $quotedName;
         }
 
         $insertSql = 'INSERT (' . implode(', ', $quotedInsertNames) . ')'
             . ' VALUES (' . implode(', ', $insertValues) . ')';
 
-        if ($updateColumns === false || $updateNames === []) {
+        if (empty($updateColumns) || $updateNames === []) {
             /** there are no columns to update */
             return [
                 $mergeSql,
@@ -247,16 +246,7 @@ private function prepareUpsertParts(
             ];
         }
 
-        if ($updateColumns === true) {
-            $updateColumns = [];
-
-            /** @psalm-var string[] $updateNames */
-            foreach ($updateNames as $name) {
-                $updateColumns[$name] = new Expression('[EXCLUDED].' . $this->quoter->quoteColumnName($name));
-            }
-        }
-
-        $updates = $this->prepareUpdateSets($table, $updateColumns, $params);
+        $updates = $this->prepareUpsertSets($table, $updateColumns, $updateNames, $params);
 
         return [
             $mergeSql,