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

fixed Parser which incorrectly treated ((( as function

Browse Source
This commit is contained in:
Stefan Klug 2012-09-18 11:57:39 +02:00
parent d344407636
commit 6ccf7a7ac7
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,13 +507,14 @@ class Parser
*/ */
private function isFunction() private function isFunction()
{ {
$peek = $this->lexer->peek(); $lookaheadType = $this->lexer->lookahead['type'];
$nextpeek = $this->lexer->peek(); $peek = $this->lexer->peek();
$nextpeek = $this->lexer->peek();
$this->lexer->resetPeek(); $this->lexer->resetPeek();
// We deny the COUNT(SELECT * FROM User u) here. COUNT won't be considered a function // We deny the COUNT(SELECT * FROM User u) here. COUNT won't be considered a function
return ($peek['type'] === Lexer::T_OPEN_PARENTHESIS && $nextpeek['type'] !== Lexer::T_SELECT); return ($lookaheadType >= Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_OPEN_PARENTHESIS && $nextpeek['type'] !== Lexer::T_SELECT);
} }
/** /**
@ -1786,9 +1787,10 @@ class Parser
public function ScalarExpression() public function ScalarExpression()
{ {
$lookahead = $this->lexer->lookahead['type']; $lookahead = $this->lexer->lookahead['type'];
$peek = $this->lexer->glimpse();
switch ($lookahead) { switch (true) {
case Lexer::T_IDENTIFIER: case ($lookahead === Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_DOT):
$this->lexer->peek(); // lookahead => '.' $this->lexer->peek(); // lookahead => '.'
$this->lexer->peek(); // lookahead => token after '.' $this->lexer->peek(); // lookahead => token after '.'
$peek = $this->lexer->peek(); // lookahead => token after the token after the '.' $peek = $this->lexer->peek(); // lookahead => token after the token after the '.'
@ -1800,47 +1802,55 @@ class Parser
return $this->StateFieldPathExpression(); return $this->StateFieldPathExpression();
case Lexer::T_INTEGER: case ($lookahead === Lexer::T_INTEGER):
case Lexer::T_FLOAT: case ($lookahead === Lexer::T_FLOAT):
return $this->SimpleArithmeticExpression(); return $this->SimpleArithmeticExpression();
case Lexer::T_STRING: case ($lookahead === Lexer::T_STRING):
return $this->StringPrimary(); return $this->StringPrimary();
case Lexer::T_TRUE: case ($lookahead === Lexer::T_TRUE):
case Lexer::T_FALSE: case ($lookahead === Lexer::T_FALSE):
$this->match($lookahead); $this->match($lookahead);
return new AST\Literal(AST\Literal::BOOLEAN, $this->lexer->token['value']); return new AST\Literal(AST\Literal::BOOLEAN, $this->lexer->token['value']);
case Lexer::T_INPUT_PARAMETER: case ($lookahead === Lexer::T_INPUT_PARAMETER):
return $this->InputParameter(); return $this->InputParameter();
case Lexer::T_CASE: case ($lookahead === Lexer::T_CASE):
case Lexer::T_COALESCE: case ($lookahead === Lexer::T_COALESCE):
case 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 if before check for FunctionDeclaration
return $this->CaseExpression(); return $this->CaseExpression();
default: case ($this->isFunction()):
if ( ! ($this->isFunction() || $this->isAggregateFunction($lookahead))) {
$this->syntaxError();
}
// We may be in an ArithmeticExpression (find the matching ")" and inspect for Math operator)
$this->lexer->peek(); // "(" $this->lexer->peek(); // "("
$peek = $this->peekBeyondClosingParenthesis();
if ($this->isMathOperator($peek)) { switch (true) {
return $this->SimpleArithmeticExpression(); case ($this->isMathOperator($this->peekBeyondClosingParenthesis())):
// SUM(u.id) + COUNT(u.id)
return $this->SimpleArithmeticExpression();
break;
case ($this->isAggregateFunction($this->lexer->lookahead['type'])):
return $this->AggregateExpression();
break;
default:
// IDENTITY(u)
return $this->FunctionDeclaration();
break;
} }
if ($this->isAggregateFunction($this->lexer->lookahead['type'])) { break;
return $this->AggregateExpression();
}
return $this->FunctionDeclaration(); case ($lookahead === Lexer::T_OPEN_PARENTHESIS):
return $this->SimpleArithmeticExpression();
default:
$this->syntaxError();
} }
} }