From fd28f74224c02c8c9ce9e9e49f131d94c625ba85 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 30 Aug 2025 12:47:47 +0700 Subject: [PATCH 1/2] Rearrange expression namespaces --- src/Column/BinaryColumn.php | 2 +- tests/ColumnTest.php | 2 +- tests/Provider/CommandProvider.php | 2 +- tests/Provider/QueryBuilderProvider.php | 4 ++-- tests/QueryBuilderTest.php | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Column/BinaryColumn.php b/src/Column/BinaryColumn.php index 424dc0f..a08391f 100644 --- a/src/Column/BinaryColumn.php +++ b/src/Column/BinaryColumn.php @@ -5,7 +5,7 @@ namespace Yiisoft\Db\Oracle\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 975966b..8cd0dcc 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\Oracle\Column\BinaryColumn; use Yiisoft\Db\Oracle\Column\ColumnBuilder; use Yiisoft\Db\Oracle\Column\JsonColumn; diff --git a/tests/Provider/CommandProvider.php b/tests/Provider/CommandProvider.php index a89788f..ceb3ac7 100644 --- a/tests/Provider/CommandProvider.php +++ b/tests/Provider/CommandProvider.php @@ -6,7 +6,7 @@ use JsonException; use PDO; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Oracle\Column\ColumnBuilder; use Yiisoft\Db\Oracle\IndexType; use Yiisoft\Db\Oracle\Tests\Support\TestTrait; diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php index 864105d..5570836 100644 --- a/tests/Provider/QueryBuilderProvider.php +++ b/tests/Provider/QueryBuilderProvider.php @@ -10,10 +10,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\Oracle\Column\ColumnBuilder; use Yiisoft\Db\Oracle\Tests\Support\TestTrait; use Yiisoft\Db\Query\Query; diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index ff87aba..d7a6009 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -11,11 +11,11 @@ use Yiisoft\Db\Exception\Exception; 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\ExpressionInterface; use Yiisoft\Db\Expression\Function\ArrayMerge; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Oracle\Tests\Provider\QueryBuilderProvider; use Yiisoft\Db\Oracle\Tests\Support\TestTrait; use Yiisoft\Db\Query\Query; From f0f87abff2ae9ec17bdb72cb46d433093c136b4d Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 30 Aug 2025 13:18:01 +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 d8c25cd..2fc86ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,6 +60,7 @@ - New #358: Add `Connection::getColumnBuilderClass()` method (@Tigrov) - New #357, #363: Implement `ArrayMergeBuilder`, `LongestBuilder` and `ShortestBuilder` classes (@Tigrov) - Enh #360: Refactor `DMLQueryBuilder::upsert()` method (@Tigrov) +- Chg #365: Update expression namespaces according to changes in `yiisoft/db` package (@Tigrov) ## 1.3.0 March 21, 2024