RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #144 from craue/patch-3

Browse Source 
switched 2nd and 3rd argument for SelectExpression's constructor, making the 3rd one optional to keep its signature compatible to previous versions
This commit is contained in:
Guilherme Blanco 2011-10-10 05:21:41 -07:00
commit 15877e1443
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
{
public $expression;
public $hiddenAliasResultVariable;
public $fieldIdentificationVariable;
public $hiddenAliasResultVariable;
public function __construct($expression, $hiddenAliasResultVariable, $fieldIdentificationVariable)
public function __construct($expression, $fieldIdentificationVariable, $hiddenAliasResultVariable = false)
{
$this->expression = $expression;
$this->hiddenAliasResultVariable = $hiddenAliasResultVariable;
$this->fieldIdentificationVariable = $fieldIdentificationVariable;
$this->hiddenAliasResultVariable = $hiddenAliasResultVariable;
}
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) {
$this->_identVariableExpressions[$identVariable] = $expr;