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

switched 2nd and 3rd argument for SelectExpression's constructor, making the 3rd one optional to keep its signature compatible to previous versions

Browse Source
This commit is contained in:
Christian Raue 2011-10-10 14:04:55 +02:00
parent f3b6ed03f3
commit 1681d8a893
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Query/AST/SelectExpression.php
View File

@ -36,14 +36,14 @@ namespace Doctrine\ORM\Query\AST;
class SelectExpression extends Node class SelectExpression extends Node
{ {
public $expression; public $expression;
public $hiddenAliasResultVariable;
public $fieldIdentificationVariable; public $fieldIdentificationVariable;
public $hiddenAliasResultVariable;
public function __construct($expression, $hiddenAliasResultVariable, $fieldIdentificationVariable) public function __construct($expression, $fieldIdentificationVariable, $hiddenAliasResultVariable = false)
{ {
$this->expression = $expression; $this->expression = $expression;
$this->hiddenAliasResultVariable = $hiddenAliasResultVariable;
$this->fieldIdentificationVariable = $fieldIdentificationVariable; $this->fieldIdentificationVariable = $fieldIdentificationVariable;
$this->hiddenAliasResultVariable = $hiddenAliasResultVariable;
} }
public function dispatch($sqlWalker) public function dispatch($sqlWalker)

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

@ -1921,7 +1921,7 @@ class Parser
} }
} }
$expr = new AST\SelectExpression($expression, $hiddenAliasResultVariable, $fieldAliasIdentificationVariable); $expr = new AST\SelectExpression($expression, $fieldAliasIdentificationVariable, $hiddenAliasResultVariable);
if ( ! $supportsAlias) { if ( ! $supportsAlias) {
$this->_identVariableExpressions[$identVariable] = $expr; $this->_identVariableExpressions[$identVariable] = $expr;