Add ability to pass FROM clause to UPDATE command

CHANGELOG.md

@@ -137,6 +137,8 @@
 - Chg #1037: Change result type of `QueryBuilderInterface::getExpressionBuilder()` and
   `DQLQueryBuilderInterface::getExpressionBuilder()` methods to `ExpressionBuilderInterface` (@vjik)
 - New #1029, #1048: Add functions as expressions (@Tigrov)
+- Enh #1038: Add ability to pass `FROM` clause to `CommandInterface::update()` and `DMLQueryBuilderInterface::update()` methods (@rustamwin)
+- Enh #1038: Allow passing `ExpressionInterface` as condition in `CommandInterface::update()` and `DMLQueryBuilderInterface::update()` methods (@rustamwin)
 - Enh #1042: Refactor `AbstractDMLQueryBuilder` class to `upsert()` method (@Tigrov)
 - New #1040, #1043: Add `DateTimeValue` class (@vjik, @Tigrov)
 - Enh #1045: Support multi-operand functions in `CommandInterface::upsert()` and `DMLQueryBuilderInterface::upsert()` 

src/Command/AbstractCommand.php

@@ -8,6 +8,7 @@
 use Throwable;
 use Yiisoft\Db\Connection\ConnectionInterface;
 use Yiisoft\Db\Exception\Exception;
+use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\Value\Param;
 use Yiisoft\Db\Query\DataReaderInterface;
 use Yiisoft\Db\Query\QueryInterface;
@@ -510,9 +511,14 @@ public function truncateTable(string $table): static
         return $this->setSql($sql);
     }
 
-    public function update(string $table, array $columns, array|string $condition = '', array $params = []): static
-    {
-        $sql = $this->getQueryBuilder()->update($table, $columns, $condition, $params);
+    public function update(
+        string $table,
+        array $columns,
+        array|ExpressionInterface|string $condition = '',
+        array|ExpressionInterface|string|null $from = null,
+        array $params = []
+    ): static {
+        $sql = $this->getQueryBuilder()->update($table, $columns, $condition, $from, $params);
         return $this->setSql($sql)->bindValues($params);
     }
 

src/Command/CommandInterface.php

@@ -829,18 +829,26 @@ public function truncateTable(string $table): static;
      *
      * @param string $table The name of the table to update.
      * @param array $columns The column data (name => value) to update.
-     * @param array|string $condition The condition to put in the WHERE part. Please refer to
-     * {@see QueryInterface::where()} on how to specify condition.
+     * @param array|ExpressionInterface|string $condition The condition to put in the WHERE part. Please refer to
+     * {@see QueryPartsInterface::where()} on how to specify condition.
+     * @param array|ExpressionInterface|string|null $from The FROM part. Please refer to {@see QueryPartsInterface::from()}
+     * on how to specify FROM part.
      * @param array $params The parameters to bind to the command.
      *
+     * @psalm-param ParamsType $params
+     *
      * @throws Exception
      * @throws InvalidArgumentException
      *
-     * @psalm-param ParamsType $params
-     *
      * Note: The method will quote the `table` and `columns` parameter before using it in the generated SQL.
      */
-    public function update(string $table, array $columns, array|string $condition = '', array $params = []): static;
+    public function update(
+        string $table,
+        array $columns,
+        array|ExpressionInterface|string $condition = '',
+        array|ExpressionInterface|string|null $from = null,
+        array $params = []
+    ): static;
 
     /**
      * Creates a command to insert rows into a database table if they don't already exist (matching unique constraints)

src/Debug/CommandInterfaceProxy.php

@@ -7,6 +7,7 @@
 use Closure;
 use Throwable;
 use Yiisoft\Db\Command\CommandInterface;
+use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Query\DataReaderInterface;
 use Yiisoft\Db\Query\QueryInterface;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
@@ -481,8 +482,13 @@ public function truncateTable(string $table): static
     /**
      * @psalm-suppress MixedArgument
      */
-    public function update(string $table, array $columns, array|string $condition = '', array $params = []): static
-    {
+    public function update(
+        string $table,
+        array $columns,
+        array|ExpressionInterface|string $condition = '',
+        array|ExpressionInterface|string|null $from = null,
+        array $params = []
+    ): static {
         return new self($this->decorated->{__FUNCTION__}(...func_get_args()), $this->collector);
     }
 

src/QueryBuilder/AbstractDMLQueryBuilder.php

@@ -8,6 +8,7 @@
 use IteratorAggregate;
 use Traversable;
 use Yiisoft\Db\Connection\ConnectionInterface;
+use Yiisoft\Db\Constant\GettypeResult;
 use Yiisoft\Db\Constraint\Index;
 use Yiisoft\Db\Exception\Exception;
 use InvalidArgumentException;
@@ -136,12 +137,21 @@ public function resetSequence(string $table, int|string|null $value = null): str
         throw new NotSupportedException(__METHOD__ . '() is not supported by this DBMS.');
     }
 
-    public function update(string $table, array $columns, array|string $condition, array &$params = []): string
-    {
+    public function update(
+        string $table,
+        array $columns,
+        array|ExpressionInterface|string $condition,
+        array|ExpressionInterface|string|null $from = null,
+        array &$params = []
+    ): string {
         $updates = $this->prepareUpdateSets($table, $columns, $params);
 
         $sql = 'UPDATE ' . $this->quoter->quoteTableName($table) . ' SET ' . implode(', ', $updates);
         $where = $this->queryBuilder->buildWhere($condition, $params);
+        if ($from !== null) {
+            $fromClause = $this->queryBuilder->buildFrom($this->prepareFromTables($from), $params);
+            $sql .=  $fromClause === '' ? '' : ' ' . $fromClause;
+        }
 
         return $where === '' ? $sql : $sql . ' ' . $where;
     }
@@ -493,6 +503,19 @@ protected function prepareUpsertColumns(
         return [$uniqueNames, $insertNames, null];
     }
 
+    protected function prepareFromTables(array|ExpressionInterface|string $from): array
+    {
+        /**
+         * @var array
+         * @psalm-suppress PossiblyInvalidArgument
+         */
+        return match (gettype($from)) {
+            GettypeResult::ARRAY => $from,
+            GettypeResult::STRING => preg_split('/\s*,\s*/', trim($from), -1, PREG_SPLIT_NO_EMPTY),
+            default => [$from],
+        };
+    }
+
     /**
      * Returns all column names belonging to constraints enforcing uniqueness (`PRIMARY KEY`, `UNIQUE INDEX`, etc.)
      * for the named table removing constraints which didn't cover the specified column list.

src/QueryBuilder/AbstractQueryBuilder.php

@@ -575,9 +575,14 @@ public function truncateTable(string $table): string
         return $this->ddlBuilder->truncateTable($table);
     }
 
-    public function update(string $table, array $columns, array|string $condition, array &$params = []): string
-    {
-        return $this->dmlBuilder->update($table, $columns, $condition, $params);
+    public function update(
+        string $table,
+        array $columns,
+        array|ExpressionInterface|string $condition,
+        array|ExpressionInterface|string|null $from = null,
+        array &$params = []
+    ): string {
+        return $this->dmlBuilder->update($table, $columns, $condition, $from, $params);
     }
 
     public function upsert(

src/QueryBuilder/DMLQueryBuilderInterface.php

@@ -10,6 +10,7 @@
 use InvalidArgumentException;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
+use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Query\QueryInterface;
 
 /**
@@ -177,8 +178,10 @@ public function resetSequence(string $table, int|string|null $value = null): str
      *
      * @param string $table The table to update.
      * @param array $columns The column data (name => value) to update the table.
-     * @param array|string $condition The condition to put in the `WHERE` part. Please refer to
-     * {@see Query::where()} On how to specify condition.
+     * @param array|ExpressionInterface|string $condition The condition to put in the `WHERE` part. Please refer to
+     * {@see QueryPartsInterface::where()} On how to specify condition.
+     * @param array|ExpressionInterface|string|null $from The FROM part. Please refer to
+     * {@see QueryPartsInterface::from()} On how to specify FROM part.
      * @param array $params The binding parameters that will be modified by this method so that they can be bound to
      * DB command later.
      *
@@ -191,7 +194,13 @@ public function resetSequence(string $table, int|string|null $value = null): str
      *
      * Note: The method will escape the table and column names.
      */
-    public function update(string $table, array $columns, array|string $condition, array &$params = []): string;
+    public function update(
+        string $table,
+        array $columns,
+        array|ExpressionInterface|string $condition,
+        array|ExpressionInterface|string|null $from = null,
+        array &$params = []
+    ): string;
 
     /**
      * Creates an SQL statement to insert rows into a database table if they don't already exist (matching unique

tests/AbstractQueryBuilderTest.php

@@ -2223,6 +2223,8 @@ public function testSetSeparator(): void
             $sql,
         );
         $this->assertEmpty($params);
+
+        $db->close();
     }
 
     public function testTruncateTable(): void
@@ -2251,25 +2253,30 @@ public function testTruncateTable(): void
             ),
             $sql,
         );
+
+        $db->close();
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'update')]
     public function testUpdate(
         string $table,
         array $columns,
-        array|string $condition,
+        array|ExpressionInterface|string $condition,
+        array|ExpressionInterface|string|null $from,
         array $params,
         string $expectedSql,
         array $expectedParams = [],
     ): void {
         $db = $this->getConnection();
         $qb = $db->getQueryBuilder();
 
-        $sql = $qb->update($table, $columns, $condition, $params);
+        $sql = $qb->update($table, $columns, $condition, $from, $params);
         $sql = $db->getQuoter()->quoteSql($sql);
 
         $this->assertSame($expectedSql, $sql);
         $this->assertEquals($expectedParams, $params);
+
+        $db->close();
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'upsert')]
@@ -2299,6 +2306,8 @@ public function testUpsert(
         $this->assertSame(1, $countAfter - $countBefore);
 
         $db->createCommand($sql, $params)->execute();
+
+        $db->close();
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'upsertReturning')]
@@ -2329,6 +2338,8 @@ public function testUpsertReturning(
         $this->assertSame(1, $countAfter - $countBefore);
 
         $db->createCommand($sql, $params)->execute();
+
+        $db->close();
     }
 
     public function testOverrideParameters1(): void
@@ -2352,6 +2363,8 @@ public function testOverrideParameters1(): void
             static::replaceQuotes('SELECT * FROM [[animal]] WHERE (id = 1 AND type = \'test\') AND ([[type]] = \'test1\')'),
             $command->getRawSql()
         );
+
+        $db->close();
     }
 
     public function testOverrideParameters2(): void
@@ -2375,6 +2388,8 @@ public function testOverrideParameters2(): void
             static::replaceQuotes('SELECT * FROM [[animal]] WHERE (id = 1) AND ([[type]] = \'test2\')'),
             $command->getRawSql()
         );
+
+        $db->close();
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'buildColumnDefinition')]

tests/Common/CommonCommandTest.php

@@ -1689,15 +1689,16 @@ public function testTruncateTable(): void
     public function testUpdate(
         string $table,
         array $columns,
-        array|string $conditions,
+        array|ExpressionInterface|string $conditions,
+        array|ExpressionInterface|string|null $from,
         array $params,
         array $expectedValues,
         int $expectedCount,
     ): void {
         $db = $this->getConnection(true);
 
         $command = $db->createCommand();
-        $count = $command->update($table, $columns, $conditions, $params)->execute();
+        $count = $command->update($table, $columns, $conditions, $from, $params)->execute();
 
         $this->assertSame($expectedCount, $count);
 

tests/Common/CommonQueryBuilderTest.php

@@ -174,7 +174,7 @@ public function testUpdateWithoutTypecasting(): void
         ];
 
         $params = [];
-        $qb->update('{{type}}', $values, [], $params);
+        $qb->update('{{type}}', $values, [], null, $params);
 
         $expectedParams = [':qp0' => new Param('test', DataType::STRING)];
 
@@ -185,14 +185,16 @@ public function testUpdateWithoutTypecasting(): void
         Assert::arraysEquals($expectedParams, $params);
 
         $params = [];
-        $qb->withTypecasting(false)->update('{{type}}', $values, [], $params);
+        $qb->withTypecasting(false)->update('{{type}}', $values, [], null, $params);
 
         Assert::arraysEquals([
             ':qp0' => new Param('1', DataType::STRING),
             ':qp1' => new Param('test', DataType::STRING),
             ':qp2' => new Param('3.14', DataType::STRING),
             ':qp3' => new Param('1', DataType::STRING),
         ], $params);
+
+        $db->close();
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'caseXBuilder')]

tests/Common/CommonQueryTest.php

@@ -20,6 +20,8 @@ public function testAllEmpty(): void
         $query = (new Query($db))->from('customer')->where(['id' => 0]);
 
         $this->assertSame([], $query->all());
+
+        $db->close();
     }
 
     public function testAllWithIndexBy(): void
@@ -154,6 +156,8 @@ public function testLikeDefaultCaseSensitive(): void
 
 
         $this->assertSame('user1', $result);
+
+        $db->close();
     }
 
     public static function dataLikeCaseSensitive(): iterable
@@ -174,6 +178,8 @@ public function testLikeCaseSensitive(mixed $expected, string $value): void
             ->scalar();
 
         $this->assertSame($expected, $result);
+
+        $db->close();
     }
 
     public static function dataLikeCaseInsensitive(): iterable
@@ -194,6 +200,8 @@ public function testLikeCaseInsensitive(mixed $expected, string $value): void
             ->scalar();
 
         $this->assertSame($expected, $result);
+
+        $db->close();
     }
 
     public function testBatchWithResultCallback(): void
@@ -224,6 +232,8 @@ public function testBatchWithResultCallback(): void
             ],
             $results,
         );
+
+        $db->close();
     }
 
     public function testBatchWithIndexBy(): void
@@ -249,5 +259,7 @@ public function testBatchWithIndexBy(): void
             ],
             $results,
         );
+
+        $db->close();
     }
 }

tests/Db/QueryBuilder/QueryBuilderTest.php

@@ -243,19 +243,22 @@ public function testResetSequence(): void
     public function testUpdate(
         string $table,
         array $columns,
-        array|string $condition,
+        array|ExpressionInterface|string $condition,
+        array|ExpressionInterface|string|null $from,
         array $params,
         string $expectedSql,
         array $expectedParams = [],
     ): void {
         $db = $this->getConnection();
         $qb = $db->getQueryBuilder();
 
-        $sql = $qb->update($table, $columns, $condition, $params);
+        $sql = $qb->update($table, $columns, $condition, $from, $params);
         $sql = $db->getQuoter()->quoteSql($sql);
 
         $this->assertSame($expectedSql, $sql);
         $this->assertEquals($expectedParams, $params);
+
+        $db->close();
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'upsert')]