From a17a52390b4e223a790cf0d3191548152d30a21d Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 30 Aug 2025 12:42:48 +0700 Subject: [PATCH 1/2] Rearrange expression namespaces --- src/Builder/LengthBuilder.php | 2 +- src/Column/BinaryColumn.php | 2 +- tests/ColumnTest.php | 2 +- tests/Provider/CommandProvider.php | 2 +- tests/Provider/QueryBuilderProvider.php | 4 ++-- tests/QueryBuilderTest.php | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Builder/LengthBuilder.php b/src/Builder/LengthBuilder.php index 48fc2988..cf198f74 100644 --- a/src/Builder/LengthBuilder.php +++ b/src/Builder/LengthBuilder.php @@ -4,7 +4,7 @@ namespace Yiisoft\Db\Mssql\Builder; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\Length; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Column/BinaryColumn.php b/src/Column/BinaryColumn.php index 1611a5ce..a9d0653d 100644 --- a/src/Column/BinaryColumn.php +++ b/src/Column/BinaryColumn.php @@ -5,7 +5,7 @@ namespace Yiisoft\Db\Mssql\Column; use Yiisoft\Db\Expression\Expression; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Schema\Column\BinaryColumn as BaseBinaryColumn; use Yiisoft\Db\Schema\Data\StringableStream; diff --git a/tests/ColumnTest.php b/tests/ColumnTest.php index 369bbdd4..4010d70b 100644 --- a/tests/ColumnTest.php +++ b/tests/ColumnTest.php @@ -10,7 +10,7 @@ use PHPUnit\Framework\Attributes\DataProviderExternal; use Yiisoft\Db\Connection\ConnectionInterface; use Yiisoft\Db\Expression\Expression; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Mssql\Column\BinaryColumn; use Yiisoft\Db\Mssql\Tests\Provider\ColumnProvider; use Yiisoft\Db\Mssql\Tests\Support\TestTrait; diff --git a/tests/Provider/CommandProvider.php b/tests/Provider/CommandProvider.php index ece1cd11..e0519285 100644 --- a/tests/Provider/CommandProvider.php +++ b/tests/Provider/CommandProvider.php @@ -5,7 +5,7 @@ namespace Yiisoft\Db\Mssql\Tests\Provider; use PDO; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Mssql\Column\ColumnBuilder; use Yiisoft\Db\Mssql\IndexMethod; use Yiisoft\Db\Mssql\IndexType; diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php index 3ef6c4eb..79a85f2b 100644 --- a/tests/Provider/QueryBuilderProvider.php +++ b/tests/Provider/QueryBuilderProvider.php @@ -8,10 +8,10 @@ use Yiisoft\Db\Constant\PseudoType; use Yiisoft\Db\Constant\ReferentialAction; use Yiisoft\Db\Constraint\ForeignKey; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Expression\Expression; use Yiisoft\Db\Expression\Function\ArrayMerge; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Mssql\Column\ColumnBuilder; use Yiisoft\Db\Mssql\Tests\Support\TestTrait; use Yiisoft\Db\Query\Query; diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index 2fa72352..0653f6d2 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -10,12 +10,12 @@ use Yiisoft\Db\Exception\IntegrityException; use InvalidArgumentException; use Yiisoft\Db\Exception\NotSupportedException; -use Yiisoft\Db\Expression\ArrayExpression; -use Yiisoft\Db\Expression\CaseExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; +use Yiisoft\Db\Expression\Statement\CaseExpression; use Yiisoft\Db\Expression\Expression; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\ArrayMerge; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Mssql\Column\ColumnBuilder; use Yiisoft\Db\Mssql\Tests\Provider\QueryBuilderProvider; use Yiisoft\Db\Mssql\Tests\Support\TestTrait; From 5cb5db0e93b833781fca06e475e5a36e424fbc22 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 30 Aug 2025 13:17:28 +0700 Subject: [PATCH 2/2] Add line to CHANGELOG.md [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3aa09dd..d936fb3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ - New #390, #396: Implement `ArrayMergeBuilder`, `GreatestBuilder`, `LeastBuilder`, `LengthBuilder`, `LongestBuilder` and `ShortestBuilder` classes (@Tigrov) - Enh #393: Refactor `DMLQueryBuilder::upsert()` method (@Tigrov) +- Chg #398: Update expression namespaces according to changes in `yiisoft/db` package (@Tigrov) ## 1.2.0 March 21, 2024