Skip to content

Update tests according changes in db #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2025
Merged

Update tests according changes in db #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d304ff5
Update tests according changes in `db`
Tigrov Oct 12, 2025
a0d9826
Apply fixes from StyleCI
StyleCIBot Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions tests/Provider/QueryBuilderProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Yiisoft\Db\Constant\PseudoType;
use Yiisoft\Db\Expression\Expression;
use Yiisoft\Db\Expression\Function\ArrayMerge;
use Yiisoft\Db\Expression\Value\ArrayValue;
use Yiisoft\Db\Expression\Value\Param;
use Yiisoft\Db\Query\Query;
use Yiisoft\Db\QueryBuilder\Condition\In;
Expand Down Expand Up @@ -442,25 +443,30 @@ public static function multiOperandFunctionBuilder(): array
...$data,
'ArrayMerge with 1 operand' => [
ArrayMerge::class,
["'[1,2,3]'"],
"('[1,2,3]')",
[[1, 2, 3]],
'(:qp0)',
[1, 2, 3],
[':qp0' => new Param('[1,2,3]', DataType::STRING)],
],
'ArrayMerge with 2 operands' => [
ArrayMerge::class,
["'[1,2,3]'", $stringParam],
"(SELECT json_group_array(value) AS value FROM (SELECT value FROM json_each('[1,2,3]') UNION SELECT value FROM json_each(:qp0)))",
[[1, 2, 3], $stringParam],
'(SELECT json_group_array(value) AS value FROM (SELECT value FROM json_each(:qp0) UNION SELECT value FROM json_each(:qp1)))',
[1, 2, 3, 4, 5],
[':qp0' => $stringParam],
[
':qp0' => new Param('[1,2,3]', DataType::STRING),
':qp1' => $stringParam,
],
],
'ArrayMerge with 4 operands' => [
ArrayMerge::class,
["'[1,2,3]'", [5,6,7], $stringParam, $intQuery],
"(SELECT json_group_array(value) AS value FROM (SELECT value FROM json_each('[1,2,3]') UNION SELECT value FROM json_each(:qp0) UNION SELECT value FROM json_each(:qp1) UNION SELECT value FROM json_each($intQuerySql)))",
[[1, 2, 3], new ArrayValue([5, 6, 7]), $stringParam, $intQuery],
"(SELECT json_group_array(value) AS value FROM (SELECT value FROM json_each(:qp0) UNION SELECT value FROM json_each(:qp1) UNION SELECT value FROM json_each(:qp2) UNION SELECT value FROM json_each($intQuerySql)))",
[1, 2, 3, 4, 5, 6, 7, 10],
[
':qp0' => new Param('[5,6,7]', DataType::STRING),
':qp1' => $stringParam,
':qp0' => new Param('[1,2,3]', DataType::STRING),
':qp1' => new Param('[5,6,7]', DataType::STRING),
':qp2' => $stringParam,
],
],
];
Expand Down
17 changes: 9 additions & 8 deletions tests/QueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,27 +770,28 @@ public function testArrayMergeWithOrdering(): void

$stringParam = new Param('[4,3,5]', DataType::STRING);
$arrayMerge = (new ArrayMerge(
"'[2,1,3]'",
[6, 5, 7],
[2, 1, 3],
new ArrayValue([6, 5, 7]),
$stringParam,
self::getDb()->select(new ArrayValue([10, 9])),
))->ordered();
$params = [];

$this->assertSame(
'(SELECT json_group_array(value) AS value FROM ('
. "SELECT value FROM json_each('[2,1,3]')"
. ' UNION SELECT value FROM json_each(:qp0)'
. 'SELECT value FROM json_each(:qp0)'
. ' UNION SELECT value FROM json_each(:qp1)'
. ' UNION SELECT value FROM json_each((SELECT :qp2))'
. ' UNION SELECT value FROM json_each(:qp2)'
. ' UNION SELECT value FROM json_each((SELECT :qp3))'
. ' ORDER BY value))',
$qb->buildExpression($arrayMerge, $params)
);
Assert::arraysEquals(
[
':qp0' => new Param('[6,5,7]', DataType::STRING),
':qp1' => $stringParam,
':qp2' => new Param('[10,9]', DataType::STRING),
':qp0' => new Param('[2,1,3]', DataType::STRING),
':qp1' => new Param('[6,5,7]', DataType::STRING),
':qp2' => $stringParam,
':qp3' => new Param('[10,9]', DataType::STRING),
],
$params,
);
Expand Down