Skip to content

Improve ArrayMergeBuilder #431

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Improve ArrayMergeBuilder #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions src/Builder/ArrayMergeBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,17 @@ final class ArrayMergeBuilder extends MultiOperandFunctionBuilder
protected function buildFromExpression(MultiOperandFunction $expression, array &$params): string
{
$operandType = $this->buildOperandType($expression->getType());
$selects = [];
$builtOperands = [];

foreach ($expression->getOperands() as $operand) {
$builtOperand = $this->buildOperand($operand, $params);

$selects[] = "SELECT value FROM JSON_TABLE($builtOperand, '$[*]' COLUMNS(value $operandType PATH '$')) AS t";
$builtOperands[] = $this->buildOperand($operand, $params);
}

$unions = implode(' UNION ', $selects);

if ($expression->getOrdered()) {
$unions .= ' ORDER BY value';
}
$orderBy = $expression->getOrdered() ? ' ORDER BY value' : '';

return '(SELECT JSON_ARRAYAGG(value) AS value FROM (' . $unions . ') AS t)';
return "(SELECT JSON_ARRAYAGG(DISTINCT value$orderBy) AS value"
. ' FROM JSON_TABLE(JSON_MERGE_PRESERVE(' . implode(', ', $builtOperands) . '),'
. " '$[*]' COLUMNS(value $operandType PATH '$')) AS t)";
}

private function buildOperandType(string|ColumnInterface $type): string
Expand Down
15 changes: 5 additions & 10 deletions tests/Provider/QueryBuilderProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,8 @@ public static function multiOperandFunctionBuilder(): array
$data['ArrayMerge with 2 operands'] = [
ArrayMerge::class,
["'[1,2,3]'", $stringParam],
'(SELECT JSON_ARRAYAGG(value) AS value FROM ('
. "SELECT value FROM JSON_TABLE('[1,2,3]', '$[*]' COLUMNS(value json PATH '$')) AS t"
. " UNION SELECT value FROM JSON_TABLE(:qp0, '$[*]' COLUMNS(value json PATH '$')) AS t"
. ') AS t)',
'(SELECT JSON_ARRAYAGG(DISTINCT value) AS value'
. " FROM JSON_TABLE(JSON_MERGE_PRESERVE('[1,2,3]', :qp0), '$[*]' COLUMNS(value json PATH '$')) AS t)",
[1, 2, 3, 4, 5],
[':qp0' => $stringParam],
];
Expand All @@ -373,12 +371,9 @@ public static function multiOperandFunctionBuilder(): array
$data['ArrayMerge with 4 operands'] = [
ArrayMerge::class,
["'[1,2,3]'", [5, 6, 7], $stringParam, self::getDb()->select(new ArrayValue([9, 10]))],
'(SELECT JSON_ARRAYAGG(value) AS value FROM ('
. "SELECT value FROM JSON_TABLE('[1,2,3]', '$[*]' COLUMNS(value json PATH '$')) AS t"
. " UNION SELECT value FROM JSON_TABLE(:qp0, '$[*]' COLUMNS(value json PATH '$')) AS t"
. " UNION SELECT value FROM JSON_TABLE(:qp1, '$[*]' COLUMNS(value json PATH '$')) AS t"
. " UNION SELECT value FROM JSON_TABLE((SELECT :qp2), '$[*]' COLUMNS(value json PATH '$')) AS t"
. ') AS t)',
'(SELECT JSON_ARRAYAGG(DISTINCT value) AS value'
. " FROM JSON_TABLE(JSON_MERGE_PRESERVE('[1,2,3]', :qp0, :qp1, (SELECT :qp2)),"
. " '$[*]' COLUMNS(value json PATH '$')) AS t)",
[1, 2, 3, 4, 5, 6, 7, 9, 10],
[
':qp0' => new Param('[5,6,7]', DataType::STRING),
Expand Down
8 changes: 3 additions & 5 deletions tests/QueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,11 +835,9 @@ public function testArrayMergeWithTypeWithOrdering(
$params = [];

$this->assertSame(
'(SELECT JSON_ARRAYAGG(value) AS value FROM ('
. "SELECT value FROM JSON_TABLE('[2,1,3]', '$[*]' COLUMNS(value $operandType PATH '$')) AS t"
. " UNION SELECT value FROM JSON_TABLE(:qp0, '$[*]' COLUMNS(value $operandType PATH '$')) AS t"
. " UNION SELECT value FROM JSON_TABLE(:qp1, '$[*]' COLUMNS(value $operandType PATH '$')) AS t"
. ' ORDER BY value) AS t)',
'(SELECT JSON_ARRAYAGG(DISTINCT value ORDER BY value) AS value'
. " FROM JSON_TABLE(JSON_MERGE_PRESERVE('[2,1,3]', :qp0, :qp1),"
. " '$[*]' COLUMNS(value $operandType PATH '$')) AS t)",
$qb->buildExpression($arrayMerge, $params)
);
Assert::arraysEquals(
Expand Down
Loading