Skip to content

Fix aggregate function on litteral #543

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
Feb 12, 2024
Merged

Fix aggregate function on litteral #543

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
42c4b04
Handle aggregate function on litteral
VincentLanglet Feb 11, 2024
9c3f7ae
Simplify
VincentLanglet Feb 12, 2024
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
17 changes: 17 additions & 0 deletions src/Type/Doctrine/Query/QueryResultTypeWalker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,12 +933,29 @@ public function walkAggregateExpression($aggExpression): string
switch ($aggExpression->functionName) {
case 'MAX':
case 'MIN':
$type = $this->unmarshalType(
$this->walkSimpleArithmeticExpression($aggExpression->pathExpression)
);

return $this->marshalType(TypeCombinator::addNull($type));

case 'AVG':
$type = $this->unmarshalType(
$this->walkSimpleArithmeticExpression($aggExpression->pathExpression)
);

$type = TypeCombinator::union($type, $type->toFloat());
$type = TypeUtils::generalizeType($type, GeneralizePrecision::lessSpecific());

return $this->marshalType(TypeCombinator::addNull($type));

case 'SUM':
$type = $this->unmarshalType(
$this->walkSimpleArithmeticExpression($aggExpression->pathExpression)
);

$type = TypeUtils::generalizeType($type, GeneralizePrecision::lessSpecific());

return $this->marshalType(TypeCombinator::addNull($type));

case 'COUNT':
Expand Down
76 changes: 76 additions & 0 deletions tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,82 @@ public function getTestData(): iterable
',
];

yield 'aggregate on literal' => [
$this->constantArray([
[
new ConstantIntegerType(1),
TypeCombinator::union(
new ConstantStringType('1'),
new ConstantIntegerType(1),
new NullType()
),
],
[
new ConstantIntegerType(2),
TypeCombinator::union(
new ConstantStringType('0'),
new ConstantIntegerType(0),
new ConstantStringType('1'),
new ConstantIntegerType(1),
new NullType()
),
],
[
new ConstantIntegerType(3),
TypeCombinator::union(
new ConstantStringType('1'),
new ConstantIntegerType(1),
new NullType()
),
],
[
new ConstantIntegerType(4),
TypeCombinator::union(
new ConstantStringType('0'),
new ConstantIntegerType(0),
new ConstantStringType('1'),
new ConstantIntegerType(1),
new NullType()
),
],
[
new ConstantIntegerType(5),
TypeCombinator::union(
$this->intStringified(),
new FloatType(),
new NullType()
),
],
[
new ConstantIntegerType(6),
TypeCombinator::union(
$this->intStringified(),
new FloatType(),
new NullType()
),
],
[
new ConstantIntegerType(7),
TypeCombinator::addNull($this->intStringified()),
],
[
new ConstantIntegerType(8),
TypeCombinator::addNull($this->intStringified()),
],
]),
'
SELECT MAX(1),
MAX(CASE WHEN m.intColumn = 0 THEN 1 ELSE 0 END),
MIN(1),
MIN(CASE WHEN m.intColumn = 0 THEN 1 ELSE 0 END),
AVG(1),
AVG(CASE WHEN m.intColumn = 0 THEN 1 ELSE 0 END),
SUM(1),
SUM(CASE WHEN m.intColumn = 0 THEN 1 ELSE 0 END)
FROM QueryResult\Entities\Many m
',
];

yield 'literal' => [
$this->constantArray([
[
Expand Down