RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 22:56:04 +03:00
Code Issues Projects Releases Wiki Activity

cleanup ScalarExpression

Browse Source 
_isFunction doesn't exclude subselects anymore
This commit is contained in:
Stefan Klug 2012-09-22 17:23:49 +02:00
parent 6ccf7a7ac7
commit 1e1f34f9cb
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Doctrine/ORM/Query/Parser.php
View File

@ -513,8 +513,7 @@ class Parser
$this->lexer->resetPeek(); $this->lexer->resetPeek();
// We deny the COUNT(SELECT * FROM User u) here. COUNT won't be considered a function return ($lookaheadType >= Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_OPEN_PARENTHESIS);
return ($lookaheadType >= Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_OPEN_PARENTHESIS && $nextpeek['type'] !== Lexer::T_SELECT);
} }
/** /**
@ -1790,18 +1789,6 @@ class Parser
$peek = $this->lexer->glimpse(); $peek = $this->lexer->glimpse();
switch (true) { switch (true) {
case ($lookahead === Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_DOT):
$this->lexer->peek(); // lookahead => '.'
$this->lexer->peek(); // lookahead => token after '.'
$peek = $this->lexer->peek(); // lookahead => token after the token after the '.'
$this->lexer->resetPeek();
if ($this->isMathOperator($peek)) {
return $this->SimpleArithmeticExpression();
}
return $this->StateFieldPathExpression();
case ($lookahead === Lexer::T_INTEGER): case ($lookahead === Lexer::T_INTEGER):
case ($lookahead === Lexer::T_FLOAT): case ($lookahead === Lexer::T_FLOAT):
return $this->SimpleArithmeticExpression(); return $this->SimpleArithmeticExpression();
@ -1822,9 +1809,13 @@ class Parser
case ($lookahead === Lexer::T_COALESCE): case ($lookahead === Lexer::T_COALESCE):
case ($lookahead === Lexer::T_NULLIF): case ($lookahead === Lexer::T_NULLIF):
// Since NULLIF and COALESCE can be identified as a function, // Since NULLIF and COALESCE can be identified as a function,
// we need to check if before check for FunctionDeclaration // we need to check these before checking for FunctionDeclaration
return $this->CaseExpression(); return $this->CaseExpression();
case ($lookahead === Lexer::T_OPEN_PARENTHESIS):
return $this->SimpleArithmeticExpression();
//this check must be done before checking for a filed path expression
case ($this->isFunction()): case ($this->isFunction()):
$this->lexer->peek(); // "(" $this->lexer->peek(); // "("
@ -1832,22 +1823,28 @@ class Parser
case ($this->isMathOperator($this->peekBeyondClosingParenthesis())): case ($this->isMathOperator($this->peekBeyondClosingParenthesis())):
// SUM(u.id) + COUNT(u.id) // SUM(u.id) + COUNT(u.id)
return $this->SimpleArithmeticExpression(); return $this->SimpleArithmeticExpression();
break;
case ($this->isAggregateFunction($this->lexer->lookahead['type'])): case ($this->isAggregateFunction($this->lexer->lookahead['type'])):
return $this->AggregateExpression(); return $this->AggregateExpression();
break;
default: default:
// IDENTITY(u) // IDENTITY(u)
return $this->FunctionDeclaration(); return $this->FunctionDeclaration();
break;
} }
break; break;
//it is no function, so it must be a field path
case ($lookahead === Lexer::T_IDENTIFIER):
$this->lexer->peek(); // lookahead => '.'
$this->lexer->peek(); // lookahead => token after '.'
$peek = $this->lexer->peek(); // lookahead => token after the token after the '.'
$this->lexer->resetPeek();
case ($lookahead === Lexer::T_OPEN_PARENTHESIS): if ($this->isMathOperator($peek)) {
return $this->SimpleArithmeticExpression(); return $this->SimpleArithmeticExpression();
}
return $this->StateFieldPathExpression();
default: default:
$this->syntaxError(); $this->syntaxError();