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

Merge pull request #505 from BenMorel/fix-errors

Browse Source 
Fix errors in JoinClassPathExpression and SqlWalker
This commit is contained in:
Guilherme Blanco 2012-11-05 16:12:31 -08:00
commit 6949a95782
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Query/AST/JoinClassPathExpression.php
View File

@ -40,6 +40,6 @@ class JoinClassPathExpression extends Node
public function dispatch($walker) public function dispatch($walker)
{ {
return $sqlWalker->walkJoinPathExpression($this); return $walker->walkJoinPathExpression($this);
} }
} }

4
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -1172,7 +1172,7 @@ class SqlWalker implements TreeWalker
switch (true) { switch (true) {
case ($expr instanceof AST\PathExpression): case ($expr instanceof AST\PathExpression):
if ($expr->type !== AST\PathExpression::TYPE_STATE_FIELD) { if ($expr->type !== AST\PathExpression::TYPE_STATE_FIELD) {
throw QueryException::invalidPathExpression($expr->type); throw QueryException::invalidPathExpression($expr);
} }
$fieldName = $expr->field; $fieldName = $expr->field;
@ -1213,7 +1213,6 @@ class SqlWalker implements TreeWalker
case ($expr instanceof AST\SimpleArithmeticExpression): case ($expr instanceof AST\SimpleArithmeticExpression):
case ($expr instanceof AST\ArithmeticTerm): case ($expr instanceof AST\ArithmeticTerm):
case ($expr instanceof AST\ArithmeticFactor): case ($expr instanceof AST\ArithmeticFactor):
case ($expr instanceof AST\ArithmeticPrimary):
case ($expr instanceof AST\Literal): case ($expr instanceof AST\Literal):
case ($expr instanceof AST\NullIfExpression): case ($expr instanceof AST\NullIfExpression):
case ($expr instanceof AST\CoalesceExpression): case ($expr instanceof AST\CoalesceExpression):
@ -1513,7 +1512,6 @@ class SqlWalker implements TreeWalker
case ($expr instanceof AST\SimpleArithmeticExpression): case ($expr instanceof AST\SimpleArithmeticExpression):
case ($expr instanceof AST\ArithmeticTerm): case ($expr instanceof AST\ArithmeticTerm):
case ($expr instanceof AST\ArithmeticFactor): case ($expr instanceof AST\ArithmeticFactor):
case ($expr instanceof AST\ArithmeticPrimary):
case ($expr instanceof AST\Literal): case ($expr instanceof AST\Literal):
case ($expr instanceof AST\NullIfExpression): case ($expr instanceof AST\NullIfExpression):
case ($expr instanceof AST\CoalesceExpression): case ($expr instanceof AST\CoalesceExpression):