Update according changes in db package

CHANGELOG.md

@@ -51,6 +51,7 @@
 - Enh #415: Support column's collation (@Tigrov)
 - New #421: Add `Connection::getColumnBuilderClass()` method (@Tigrov)
 - New #420: Implement `ArrayMergeBuilder`, `LongestBuilder` and `ShortestBuilder` classes (@Tigrov)
+- Enh #423: Refactor `DMLQueryBuilder::upsert()` method (@Tigrov)
 
 ## 1.2.0 March 21, 2024
 

src/DMLQueryBuilder.php

@@ -6,15 +6,16 @@
 
 use InvalidArgumentException;
 use Yiisoft\Db\Exception\NotSupportedException;
-use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Query\QueryInterface;
 use Yiisoft\Db\QueryBuilder\AbstractDMLQueryBuilder;
 use Yiisoft\Db\Schema\TableSchema;
 
 use function array_combine;
 use function array_diff;
+use function array_fill_keys;
 use function array_intersect;
+use function array_intersect_key;
 use function array_key_exists;
 use function array_keys;
 use function array_map;
@@ -74,15 +75,8 @@ public function upsert(
             return $this->insert($table, $insertColumns, $params);
         }
 
-        if ($updateColumns === true) {
-            $updateColumns = [];
-            /** @psalm-var string[] $updateNames */
-            foreach ($updateNames as $name) {
-                $updateColumns[$name] = new Expression('EXCLUDED.' . $this->quoter->quoteSimpleColumnName($name));
-            }
-        }
-
-        if (empty($updateColumns)) {
+        if (empty($updateColumns) || $updateNames === []) {
+            /** there are no columns to update */
             $insertSql = $this->insert($table, $insertColumns, $params);
             return 'INSERT IGNORE' . substr($insertSql, 6);
         }
@@ -92,21 +86,15 @@ public function upsert(
         $quotedNames = array_map($this->quoter->quoteColumnName(...), $names);
 
         if (!empty($placeholders)) {
-            $selectValues = [];
-
-            foreach ($placeholders as $i => $placeholder) {
-                $selectValues[] = "$placeholder AS $quotedNames[$i]";
-            }
-
-            $values = 'SELECT ' . implode(', ', $selectValues);
+            $values = $this->buildSimpleSelect(array_combine($names, $placeholders));
         }
 
         $fields = implode(', ', $quotedNames);
 
         $insertSql = 'INSERT INTO ' . $this->quoter->quoteTableName($table)
             . " ($fields) SELECT $fields FROM ($values) AS EXCLUDED";
 
-        $updates = $this->prepareUpdateSets($table, $updateColumns, $params);
+        $updates = $this->prepareUpsertSets($table, $updateColumns, $updateNames, $params);
 
         return $insertSql . ' ON DUPLICATE KEY UPDATE ' . implode(', ', $updates);
     }
@@ -140,13 +128,8 @@ public function upsertReturning(
 
         if (empty($uniqueColumns)) {
             $returnValues = $this->prepareColumnValues($tableSchema, $returnColumns, $insertColumns, $params);
-            $selectValues = [];
-
-            foreach ($returnValues as $name => $value) {
-                $selectValues[] = $value . ' AS ' . $quoter->quoteSimpleColumnName($name);
-            }
 
-            return $upsertSql . ';SELECT ' . implode(', ', $selectValues);
+            return $upsertSql . ';' . $this->buildSimpleSelect($returnValues);
         }
 
         if (is_array($updateColumns) && !empty(array_intersect($uniqueColumns, array_keys($updateColumns)))) {
@@ -172,13 +155,9 @@ public function upsertReturning(
         $uniqueValues = $this->prepareColumnValues($tableSchema, $uniqueColumns, $insertColumns, $params);
 
         if (empty(array_diff($returnColumns, array_keys($uniqueValues)))) {
-            $selectValues = [];
-
-            foreach ($returnColumns as $name) {
-                $selectValues[] = $uniqueValues[$name] . ' AS ' . $quoter->quoteSimpleColumnName($name);
-            }
+            $selectValues = array_intersect_key($uniqueValues, array_fill_keys($returnColumns, null));
 
-            return $upsertSql . ';SELECT ' . implode(', ', $selectValues);
+            return $upsertSql . ';' . $this->buildSimpleSelect($selectValues);
         }
 
         $conditions = [];

tests/Provider/QueryBuilderProvider.php

@@ -63,7 +63,7 @@ public static function upsert(): array
                 3 => 'INSERT INTO `T_upsert` (`email`, `address`, `status`, `profile_id`)'
                     . ' SELECT `email`, `address`, `status`, `profile_id`'
                     . ' FROM (SELECT :qp0 AS `email`, :qp1 AS `address`, :qp2 AS `status`, :qp3 AS `profile_id`) AS EXCLUDED'
-                    . ' ON DUPLICATE KEY UPDATE `address`=:qp4, `status`=:qp5, `orders`=T_upsert.orders + 1',
+                    . ' ON DUPLICATE KEY UPDATE `address`=:qp4, `status`=2, `orders`=T_upsert.orders + 1',
             ],
             'regular values without update part' => [
                 3 => 'INSERT IGNORE INTO `T_upsert` (`email`, `address`, `status`, `profile_id`) VALUES (:qp0, :qp1, :qp2, :qp3)',
@@ -76,7 +76,7 @@ public static function upsert(): array
             'query with update part' => [
                 3 => 'INSERT INTO `T_upsert` (`email`, `status`) SELECT `email`, `status`'
                     . ' FROM (SELECT `email`, 2 AS `status` FROM `customer` WHERE `name` = :qp0 LIMIT 1) AS EXCLUDED'
-                    . ' ON DUPLICATE KEY UPDATE `address`=:qp1, `status`=:qp2, `orders`=T_upsert.orders + 1',
+                    . ' ON DUPLICATE KEY UPDATE `address`=:qp1, `status`=2, `orders`=T_upsert.orders + 1',
             ],
             'query without update part' => [
                 3 => 'INSERT IGNORE INTO `T_upsert` (`email`, `status`) SELECT `email`, 2 AS `status` FROM `customer`'
@@ -98,7 +98,7 @@ public static function upsert(): array
             'query, values and expressions with update part' => [
                 3 => 'INSERT INTO {{%T_upsert}} (`email`, [[ts]]) SELECT `email`, [[ts]]'
                     . ' FROM (SELECT :phEmail AS `email`, CURRENT_TIMESTAMP AS [[ts]]) AS EXCLUDED'
-                    . ' ON DUPLICATE KEY UPDATE `ts`=:qp1, `orders`=T_upsert.orders + 1',
+                    . ' ON DUPLICATE KEY UPDATE `ts`=0, `orders`=T_upsert.orders + 1',
             ],
             'query, values and expressions without update part' => [
                 3 => 'INSERT IGNORE INTO `T_upsert` (`email`, [[ts]]) SELECT :phEmail AS `email`, CURRENT_TIMESTAMP AS [[ts]]',

tests/QueryBuilderTest.php

@@ -573,7 +573,7 @@ public function testUpdate(
         array|string $condition,
         array $params,
         string $expectedSql,
-        array $expectedParams,
+        array $expectedParams = [],
     ): void {
         parent::testUpdate($table, $columns, $condition, $params, $expectedSql, $expectedParams);
     }