RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

DDC-2827 Added support for AggregateExpressions in NullComparisonExpression.

Browse source
This commit is contained in:
Guilherme Blanco 2014-04-17 04:39:26 +00:00
parent ceada41b83
commit 841bdd5ca5
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/en/reference/dql-doctrine-query-language.rst
View file

@ -1647,7 +1647,7 @@ QUANTIFIED/BETWEEN/COMPARISON/LIKE/NULL/EXISTS
InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (InstanceOfParameter | "(" InstanceOfParameter {"," InstanceOfParameter}* ")") InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (InstanceOfParameter | "(" InstanceOfParameter {"," InstanceOfParameter}* ")")
InstanceOfParameter ::= AbstractSchemaName | InputParameter InstanceOfParameter ::= AbstractSchemaName | InputParameter
LikeExpression ::= StringExpression ["NOT"] "LIKE" StringPrimary ["ESCAPE" char] LikeExpression ::= StringExpression ["NOT"] "LIKE" StringPrimary ["ESCAPE" char]
NullComparisonExpression ::= (InputParameter | NullIfExpression | CoalesceExpression | SingleValuedPathExpression | ResultVariable) "IS" ["NOT"] "NULL" NullComparisonExpression ::= (InputParameter | NullIfExpression | CoalesceExpression | AggregateExpression | FunctionDeclaration | IdentificationVariable | SingleValuedPathExpression | ResultVariable) "IS" ["NOT"] "NULL"
ExistsExpression ::= ["NOT"] "EXISTS" "(" Subselect ")" ExistsExpression ::= ["NOT"] "EXISTS" "(" Subselect ")"
ComparisonOperator ::= "=" | "<" | "<=" | "<>" | ">" | ">=" | "!=" ComparisonOperator ::= "=" | "<" | "<=" | "<>" | ">" | ">=" | "!="

6
lib/Doctrine/ORM/Query/Parser.php
View file

@ -3131,7 +3131,7 @@ class Parser
} }
/** /**
* NullComparisonExpression ::= (InputParameter | NullIfExpression | CoalesceExpression | SingleValuedPathExpression | ResultVariable) "IS" ["NOT"] "NULL" * NullComparisonExpression ::= (InputParameter | NullIfExpression | CoalesceExpression | AggregateExpression | FunctionDeclaration | IdentificationVariable | SingleValuedPathExpression | ResultVariable) "IS" ["NOT"] "NULL"
* *
* @return \Doctrine\ORM\Query\AST\NullComparisonExpression * @return \Doctrine\ORM\Query\AST\NullComparisonExpression
*/ */
@ -3151,6 +3151,10 @@ class Parser
case $this->lexer->isNextToken(Lexer::T_COALESCE): case $this->lexer->isNextToken(Lexer::T_COALESCE):
$expr = $this->CoalesceExpression(); $expr = $this->CoalesceExpression();
break; break;
case $this->isAggregateFunction($this->lexer->lookahead['type']):
$expr = $this->AggregateExpression();
break;
case $this->isFunction(): case $this->isFunction():
$expr = $this->FunctionDeclaration(); $expr = $this->FunctionDeclaration();

5
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View file

@ -2062,6 +2062,11 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
'SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING u.username IS NULL', 'SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING u.username IS NULL',
'SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING c0_.username IS NULL' 'SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING c0_.username IS NULL'
); );
$this->assertSqlGeneration(
'SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING MAX(u.name) IS NULL',
'SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING MAX(c0_.name) IS NULL'
);
} }
/** /**