[2.0] Some code reordering, changes. Removed classMetadata from...

[2.0] Some code reordering, changes. Removed classMetadata from RangeVariableDeclaration, since it is against AST concept.

lib/Doctrine/ORM/Query/AST/RangeVariableDeclaration.php

@@ -34,14 +34,12 @@ namespace Doctrine\ORM\Query\AST;
  */
 class RangeVariableDeclaration extends Node
 {
-    public $classMetadata;
     public $abstractSchemaName;
     public $aliasIdentificationVariable;
 
-    public function __construct($classMetadata, $aliasIdentificationVar)
+    public function __construct($abstractSchemaName, $aliasIdentificationVar)
     {
-        $this->classMetadata = $classMetadata;
-        $this->abstractSchemaName = $classMetadata->name;
+        $this->abstractSchemaName = $abstractSchemaName;
         $this->aliasIdentificationVariable = $aliasIdentificationVar;
     }    
     

lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php

@@ -67,7 +67,7 @@ class MultiTableDeleteExecutor extends AbstractSqlExecutor
         $this->_insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ')'
                 . ' SELECT t0.' . implode(', t0.', $idColumnNames);
         $sqlWalker->setSqlTableAlias($primaryClass->primaryTable['name'] . $primaryDqlAlias, 't0');
-        $rangeDecl = new AST\RangeVariableDeclaration($primaryClass, $primaryDqlAlias);
+        $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $primaryDqlAlias);
         $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array())));
         $this->_insertSql .= $sqlWalker->walkFromClause($fromClause);
         

lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php

@@ -70,7 +70,7 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor
         $this->_insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ')'
                 . ' SELECT t0.' . implode(', t0.', $idColumnNames);
         $sqlWalker->setSqlTableAlias($primaryClass->primaryTable['name'] . $updateClause->aliasIdentificationVariable, 't0');
-        $rangeDecl = new AST\RangeVariableDeclaration($primaryClass, $updateClause->aliasIdentificationVariable);
+        $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $updateClause->aliasIdentificationVariable);
         $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array())));
         $this->_insertSql .= $sqlWalker->walkFromClause($fromClause);
 

lib/Doctrine/ORM/Query/Parser.php

@@ -601,11 +601,7 @@ class Parser
         $token = ($token) ?: $this->_lexer->lookahead;
     
         if ( ! isset($this->_queryComponents[$identVariable])) {
-            echo '[Query Components: ' . var_export($this->_queryComponents, true) . ']';
-        
-            $this->semanticalError(
-                "'$idVariable' is not defined", $token
-            );
+            $this->semanticalError("'$idVariable' is not defined", $token);
         }
         
         // Validate if identification variable nesting level is lower or equal than the current one
@@ -1402,9 +1398,7 @@ class Parser
         );
         $this->_queryComponents[$aliasIdentificationVariable] = $queryComponent;
 
-        return new AST\RangeVariableDeclaration(
-            $classMetadata, $aliasIdentificationVariable
-        );
+        return new AST\RangeVariableDeclaration($abstractSchemaName, $aliasIdentificationVariable);
     }
 
     /**