Support table name in update columns (#1065)

Tigrov · web-flow · commit 5427028e208f · 2025-09-30T10:37:39.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -157,6 +157,7 @@
 - Chg #1063: `AbstractConnection::createBatchQueryResult()` passes parameters `indexBy` and `resultCallback` to
   `BatchQueryResult` being created (@vjik)
 - Enh #1064: Remove duplicate code in favor of the `DbArrayHelper::normalizeExpressions()` method (@rustamwin)
+- Enh #1065: Allow to use table name as a column prefix in update queries (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 
diff --git a/src/QueryBuilder/AbstractDMLQueryBuilder.php b/src/QueryBuilder/AbstractDMLQueryBuilder.php
@@ -406,15 +406,27 @@ protected function prepareInsertValues(string $table, array|QueryInterface $colu
      *
      * @return string[]
      */
-    protected function prepareUpdateSets(string $table, array $columns, array &$params, bool $forUpsert = false): array
-    {
+    protected function prepareUpdateSets(
+        string $table,
+        array $columns,
+        array &$params,
+        bool $forUpsert = false,
+        bool $useTableName = false,
+    ): array {
         $sets = [];
         $columns = $this->normalizeColumnNames($columns);
         $tableColumns = $this->schema->getTableSchema($table)?->getColumns() ?? [];
         $typecastColumns = $this->typecasting ? $tableColumns : [];
         $queryBuilder = $this->queryBuilder;
         $quoter = $this->quoter;
 
+        if ($useTableName) {
+            $quotedTableName = $quoter->quoteTableName($table);
+            $columnPrefix = "$quotedTableName.";
+        } else {
+            $columnPrefix = '';
+        }
+
         foreach ($columns as $name => $value) {
             if (isset($typecastColumns[$name])) {
                 $value = $typecastColumns[$name]->dbTypecast($value);
@@ -436,7 +448,7 @@ protected function prepareUpdateSets(string $table, array $columns, array &$para
                 $builtValue = $queryBuilder->buildValue($value, $params);
             }
 
-            $sets[] = "$quotedName=$builtValue";
+            $sets[] = "$columnPrefix$quotedName=$builtValue";
         }
 
         return $sets;
diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php
@@ -1233,7 +1233,7 @@ public static function update(): array
                     ':qp0' => new Param('{{test}}', DataType::STRING),
                 ],
             ],
-            [
+            'from table' => [
                 '{{table}}',
                 ['name' => '{{tmp}}.{{name}}'],
                 [],
@@ -1248,7 +1248,7 @@ public static function update(): array
                     ':qp0' => new Param('{{tmp}}.{{name}}', DataType::STRING),
                 ],
             ],
-            [
+            'from array' => [
                 '{{table}}',
                 ['name' => '{{tmp}}.{{name}}'],
                 [],
@@ -1263,7 +1263,7 @@ public static function update(): array
                     ':qp0' => new Param('{{tmp}}.{{name}}', DataType::STRING),
                 ],
             ],
-            [
+            'from table w/ condition' => [
                 '{{table}}',
                 ['name' => '{{tmp}}.{{name}}'],
                 ['id' => 1],
@@ -1278,7 +1278,7 @@ public static function update(): array
                     ':qp0' => new Param('{{tmp}}.{{name}}', DataType::STRING),
                 ],
             ],
-            [
+            'from expression' => [
                 '{{table}}',
                 ['name' => '{{tmp}}.{{name}}'],
                 [],
@@ -1293,7 +1293,7 @@ public static function update(): array
                     ':qp0' => new Param('{{tmp}}.{{name}}', DataType::STRING),
                 ],
             ],
-            [
+            'from query' => [
                 '{{table}}',
                 ['name' => '{{tmp}}.{{name}}'],
                 [],
@@ -1308,7 +1308,7 @@ public static function update(): array
                     ':qp0' => new Param('{{tmp}}.{{name}}', DataType::STRING),
                 ],
             ],
-            [
+            'from query w/ alias' => [
                 '{{table}}',
                 ['name' => '{{tmp}}'],
                 [],
