Skip to content
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

Jump to bottom

[DDC-2234] FUNCTION() IS NULL comparison #551

Merged
merged 3 commits into from Jan 20, 2013
Merged

[DDC-2234] FUNCTION() IS NULL comparison #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dcd5a1
Fix DDC-2234
FabioBatSilva Jan 19, 2013
1d42a53
test NOT EXISTS expression
FabioBatSilva Jan 19, 2013
93fba51
keep braces
FabioBatSilva Jan 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
149 changes: 92 additions & 57 deletions lib/Doctrine/ORM/Query/Parser.php
View file
Open in desktop
Expand Up @@ -2400,76 +2400,92 @@ public function ConditionalPrimary()
*/
public function SimpleConditionalExpression()
{
$token = $this->lexer->lookahead;
if ($this->lexer->isNextToken(Lexer::T_EXISTS)) {
return $this->ExistsExpression();
}

$token = $this->lexer->lookahead;
$peek = $this->lexer->glimpse();
$lookahead = $token;

if ($this->lexer->isNextToken(Lexer::T_NOT)) {
$token = $this->lexer->glimpse();
}

if ($token['type'] === Lexer::T_EXISTS) {
return $this->ExistsExpression();
}

$peek = $this->lexer->glimpse();
if ($token['type'] === Lexer::T_IDENTIFIER || $token['type'] === Lexer::T_INPUT_PARAMETER || $this->isFunction()) {
// Peek beyond the matching closing paranthesis.
$beyond = $this->lexer->peek();

if ($token['type'] === Lexer::T_IDENTIFIER || $token['type'] === Lexer::T_INPUT_PARAMETER) {
if ($peek['value'] == '(') {
// Peek beyond the matching closing paranthesis ')'
$this->lexer->peek();
$token = $this->peekBeyondClosingParenthesis(false);
switch ($peek['value']) {
case '(':
//Peeks beyond the matched closing parenthesis.
$token = $this->peekBeyondClosingParenthesis(false);

if ($token['type'] === Lexer::T_NOT) {
$token = $this->lexer->peek();
}
if ($token['type'] === Lexer::T_NOT) {
$token = $this->lexer->peek();
}

$this->lexer->resetPeek();
} else {
// Peek beyond the PathExpression (or InputParameter)
$peek = $this->lexer->peek();
if ($token['type'] === Lexer::T_IS) {
$lookahead = $this->lexer->peek();
}
break;

while ($peek['value'] === '.') {
$this->lexer->peek();
$peek = $this->lexer->peek();
}
default:
// Peek beyond the PathExpression or InputParameter.
$token = $beyond;

// Also peek beyond a NOT if there is one
if ($peek['type'] === Lexer::T_NOT) {
$peek = $this->lexer->peek();
}
while ($token['value'] === '.') {
$this->lexer->peek();

$token = $peek;
$token = $this->lexer->peek();
}

// We need to go even further in case of IS (differenciate between NULL and EMPTY)
$lookahead = $this->lexer->peek();
// Also peek beyond a NOT if there is one.
if ($token['type'] === Lexer::T_NOT) {
$token = $this->lexer->peek();
}

// Also peek beyond a NOT if there is one
if ($lookahead['type'] === Lexer::T_NOT) {
// We need to go even further in case of IS (differenciate between NULL and EMPTY)
$lookahead = $this->lexer->peek();
}
}

$this->lexer->resetPeek();
// Also peek beyond a NOT if there is one.
if ($lookahead['type'] === Lexer::T_NOT) {
$lookahead = $this->lexer->peek();
}

$this->lexer->resetPeek();
}

switch ($token['type']) {
case Lexer::T_BETWEEN:
return $this->BetweenExpression();
case Lexer::T_LIKE:
return $this->LikeExpression();
case Lexer::T_IN:
return $this->InExpression();
case Lexer::T_INSTANCE:
return $this->InstanceOfExpression();
case Lexer::T_IS:
if ($lookahead['type'] == Lexer::T_NULL) {
return $this->NullComparisonExpression();
}
return $this->EmptyCollectionComparisonExpression();
case Lexer::T_MEMBER:
return $this->CollectionMemberExpression();
default:
return $this->ComparisonExpression();
if ($token['type'] === Lexer::T_BETWEEN) {
return $this->BetweenExpression();
}

if ($token['type'] === Lexer::T_LIKE) {
return $this->LikeExpression();
}

if ($token['type'] === Lexer::T_IN) {
return $this->InExpression();
}

if ($token['type'] === Lexer::T_INSTANCE) {
return $this->InstanceOfExpression();
}

if ($token['type'] === Lexer::T_MEMBER) {
return $this->CollectionMemberExpression();
}

if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_NULL) {
return $this->NullComparisonExpression();
}

if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
return $this->EmptyCollectionComparisonExpression();
}

return $this->ComparisonExpression();
}

/**
Expand Down Expand Up @@ -3085,24 +3101,43 @@ public function LikeExpression()
}

/**
* NullComparisonExpression ::= (SingleValuedPathExpression | InputParameter) "IS" ["NOT"] "NULL"
* NullComparisonExpression ::= (InputParameter | NullIfExpression | CoalesceExpression | SingleValuedPathExpression) "IS" ["NOT"] "NULL"
*
* @return \Doctrine\ORM\Query\AST\NullComparisonExpression
*/
public function NullComparisonExpression()
{
if ($this->lexer->isNextToken(Lexer::T_INPUT_PARAMETER)) {
$this->match(Lexer::T_INPUT_PARAMETER);
$expr = new AST\InputParameter($this->lexer->token['value']);
} else {
$expr = $this->SingleValuedPathExpression();
switch (true) {
case $this->lexer->isNextToken(Lexer::T_INPUT_PARAMETER):
$this->match(Lexer::T_INPUT_PARAMETER);

$expr = new AST\InputParameter($this->lexer->token['value']);
break;

case $this->lexer->isNextToken(Lexer::T_NULLIF):
$expr = $this->NullIfExpression();
break;

case $this->lexer->isNextToken(Lexer::T_COALESCE):
$expr = $this->CoalesceExpression();
break;

case $this->isFunction():
$expr = $this->FunctionDeclaration();
break;

default:
$expr = $this->SingleValuedPathExpression();
break;
}

$nullCompExpr = new AST\NullComparisonExpression($expr);

$this->match(Lexer::T_IS);

if ($this->lexer->isNextToken(Lexer::T_NOT)) {
$this->match(Lexer::T_NOT);

$nullCompExpr->not = true;
}

Expand Down
18 changes: 7 additions & 11 deletions lib/Doctrine/ORM/Query/SqlWalker.php
View file
Open in desktop
Expand Up @@ -1874,20 +1874,16 @@ public function walkEmptyCollectionComparisonExpression($emptyCollCompExpr)
*/
public function walkNullComparisonExpression($nullCompExpr)
{
$sql = '';
$innerExpr = $nullCompExpr->expression;
$expression = $nullCompExpr->expression;
$comparison = ' IS' . ($nullCompExpr->not ? ' NOT' : '') . ' NULL';

if ($innerExpr instanceof AST\InputParameter) {
$dqlParamKey = $innerExpr->name;
$this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
$sql .= ' ?';
} else {
$sql .= $this->walkPathExpression($innerExpr);
}
if ($expression instanceof AST\InputParameter) {
$this->parserResult->addParameterMapping($expression->name, $this->sqlParamIndex++);

$sql .= ' IS' . ($nullCompExpr->not ? ' NOT' : '') . ' NULL';
return '?' . $comparison;
}

return $sql;
return $expression->dispatch($this) . $comparison;
}

/**
Expand Down
49 changes: 49 additions & 0 deletions tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View file
Open in desktop
Expand Up @@ -119,6 +119,14 @@ public function testSupportsSelectForAllNestedField()
);
}

public function testNotExistsExpression()
{
$this->assertSqlGeneration(
'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE NOT EXISTS (SELECT p.phonenumber FROM Doctrine\Tests\Models\CMS\CmsPhonenumber p WHERE p.phonenumber = 1234)',
'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE NOT EXISTS (SELECT c1_.phonenumber FROM cms_phonenumbers c1_ WHERE c1_.phonenumber = 1234)'
);
}

public function testSupportsSelectForMultipleColumnsOfASingleComponent()
{
$this->assertSqlGeneration(
Expand Down Expand Up @@ -1654,6 +1662,47 @@ public function testSupportsNewOperator()

}

/**
* @group DDC-2234
*/
public function testWhereFunctionIsNullComparisonExpression()
{
$this->assertSqlGeneration(
"SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE IDENTITY(u.email) IS NULL",
"SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.email_id IS NULL"
);

$this->assertSqlGeneration(
"SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE NULLIF(u.name, 'FabioBatSilva') IS NULL AND IDENTITY(u.email) IS NOT NULL",
"SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE NULLIF(c0_.name, 'FabioBatSilva') IS NULL AND c0_.email_id IS NOT NULL"
);

$this->assertSqlGeneration(
"SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE IDENTITY(u.email) IS NOT NULL",
"SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.email_id IS NOT NULL"
);

$this->assertSqlGeneration(
"SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE NULLIF(u.name, 'FabioBatSilva') IS NOT NULL",
"SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE NULLIF(c0_.name, 'FabioBatSilva') IS NOT NULL"
);

$this->assertSqlGeneration(
"SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE COALESCE(u.name, u.id) IS NOT NULL",
"SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE COALESCE(c0_.name, c0_.id) IS NOT NULL"
);

$this->assertSqlGeneration(
"SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE COALESCE(u.id, IDENTITY(u.email)) IS NOT NULL",
"SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE COALESCE(c0_.id, c0_.email_id) IS NOT NULL"
);

$this->assertSqlGeneration(
"SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE COALESCE(IDENTITY(u.email), NULLIF(u.name, 'FabioBatSilva')) IS NOT NULL",
"SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE COALESCE(c0_.email_id, NULLIF(c0_.name, 'FabioBatSilva')) IS NOT NULL"
);
}

public function testCustomTypeValueSql()
{
if (DBALType::hasType('negative_to_positive')) {
Expand Down