lib/Doctrine/Query.php

@@ -40,12 +40,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable
      * @param boolean $needsSubquery
      */
     protected $needsSubquery    = false;
-    /**
-     * @param boolean $limitSubqueryUsed
-     */
-    protected $limitSubqueryUsed = false;
 
-    
     protected $_status         = array('needsSubquery' => true);
     /**
      * @param boolean $isSubquery           whether or not this query object is a subquery of another 
@@ -53,8 +48,6 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable
      */
     protected $isSubquery;
 
-    protected $isDistinct        = false;
-
     protected $neededTables      = array();
     /**
      * @var array $pendingFields
@@ -65,15 +58,6 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable
      *                                      they cannot be parsed directly (some queries might be correlated)
      */
     protected $pendingSubqueries = array();
-    /**
-     * @var boolean $subqueriesProcessed    Whether or not pending subqueries have already been processed.
-     *                                      Consequent calls to getQuery would result badly constructed queries
-     *                                      without this variable
-     *
-     *                                      Since subqueries can be correlated, they can only be processed when 
-     *                                      the main query is fully constructed
-     */
-    protected $subqueriesProcessed = false;
     /** 
      * @var array $_parsers                 an array of parser objects
      */
@@ -173,15 +157,6 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable
         
         return null;
     }
-
-    public function isDistinct($distinct = null)
-    {
-        if(isset($distinct))
-            $this->isDistinct = (bool) $distinct;
-
-        return $this->isDistinct;
-    }
-
     /**
      * getParser
      * parser lazy-loader
@@ -355,10 +330,6 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable
     }
     public function processPendingSubqueries() 
     {
-    	if ($this->subqueriesProcessed === true) {
-            return false;
-    	}
-
     	foreach ($this->pendingSubqueries as $value) {
             list($dql, $alias) = $value;
 
@@ -371,15 +342,13 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable
             $tableAlias = $this->getTableAlias($componentAlias);
 
             $sqlAlias = $tableAlias . '__' . count($this->aggregateMap);
-    
+
             $this->parts['select'][] = '(' . $sql . ') AS ' . $sqlAlias;
-    
+
             $this->aggregateMap[$alias] = $sqlAlias;
             $this->subqueryAggregates[$componentAlias][] = $alias;
         }
-        $this->subqueriesProcessed = true;
+        $this->pendingSubqueries = array();
-        
-        return true;
     }
     public function processPendingAggregates($componentAlias)
     {
@@ -530,7 +499,6 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable
 
         if ( ! empty($this->parts['limit']) && $this->needsSubquery && $table->getAttribute(Doctrine::ATTR_QUERY_LIMIT) == Doctrine::LIMIT_RECORDS) {
             $needsSubQuery = true;
-            $this->limitSubqueryUsed = true;
         }
 
         // process all pending SELECT part subqueries
@@ -1050,15 +1018,6 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable
 
 		return (int) $this->getConnection()->fetchOne($q, $params);
 	}
-    /**
-     * isLimitSubqueryUsed
-     * whether or not limit subquery algorithm is used
-     *
-     * @return boolean
-     */
-    public function isLimitSubqueryUsed() {
-        return $this->limitSubqueryUsed;
-    }
 
     /**
      * query

lib/Doctrine/RawSql.php

@@ -61,9 +61,10 @@ class Doctrine_RawSql extends Doctrine_Hydrate
     }
     /**
      * parseQuery
+     * parses an sql query and adds the parts to internal array
      *
-     * @param string $query
+     * @param string $query         query to be parsed
-     * @return Doctrine_RawSql
+     * @return Doctrine_RawSql      this object
      */
     public function parseQuery($query)
     {
@@ -118,9 +119,9 @@ class Doctrine_RawSql extends Doctrine_Hydrate
     }
     /**
      * getQuery
+     * builds the sql query from the given query parts
      *
-     *
+     * @return string       the built sql query
-     * @return string
      */
     public function getQuery()
     {
@@ -130,7 +131,7 @@ class Doctrine_RawSql extends Doctrine_Hydrate
                 throw new Doctrine_RawSql_Exception('All selected fields in Sql query must be in format tableAlias.fieldName');
             }
             // try to auto-add component
-            if ( ! $this->aliasHandler->getComponentAlias($e[0])) {
+            if ( ! $this->aliasHandler->hasAlias($e[0])) {
                 try {
                     $this->addComponent($e[0], ucwords($e[0]));
                 } catch(Doctrine_Exception $exception) {
@@ -139,7 +140,9 @@ class Doctrine_RawSql extends Doctrine_Hydrate
             }
 
             if ($e[1] == '*') {
-                foreach ($this->tables[$e[0]]->getColumnNames() as $name) {
+                $componentAlias = $this->aliasHandler->getComponentAlias($e[0]);
+
+                foreach ($this->_aliasMap[$componentAlias]['table']->getColumnNames() as $name) {
                     $field = $e[0] . '.' . $name;
                     $this->parts['select'][$field] = $field . ' AS ' . $e[0] . '__' . $name;
                 }
@@ -151,11 +154,14 @@ class Doctrine_RawSql extends Doctrine_Hydrate
 
         // force-add all primary key fields
 
-        foreach ($this->tableAliases as $alias) {
+        foreach ($this->aliasHandler->getAliases() as $tableAlias => $componentAlias) {
-            foreach ($this->tables[$alias]->getPrimaryKeys() as $key) {
+            $map = $this->_aliasMap[$componentAlias];
-                $field = $alias . '.' . $key;
+
+            foreach ($map['table']->getPrimaryKeys() as $key) {
+                $field = $tableAlias . '.' . $key;
+
                 if ( ! isset($this->parts['select'][$field])) {
-                    $this->parts['select'][$field] = $field . ' AS ' . $alias . '__' . $key;
+                    $this->parts['select'][$field] = $field . ' AS ' . $tableAlias . '__' . $key;
                 }
             }
         }
@@ -184,8 +190,9 @@ class Doctrine_RawSql extends Doctrine_Hydrate
     }
     /**
      * getFields
+     * returns the fields associated with this parser
      *
-     * @return array
+     * @return array    all the fields associated with this parser
      */
     public function getFields()
     {
@@ -209,22 +216,21 @@ class Doctrine_RawSql extends Doctrine_Hydrate
         $fullLength = strlen($fullPath);
 
         $table = null;
-        
+
+        $currPath = '';
+
         if (isset($this->_aliasMap[$e[0]])) {
             $table = $this->_aliasMap[$e[0]]['table'];
 
-            $prevPath = $parent = array_shift($e);
+            $currPath = $parent = array_shift($e);
         }
 
-
-        $currPath = '';
-
         foreach ($e as $k => $component) {
             // get length of the previous path
             $length = strlen($currPath);
 
             // build the current component path
-            $prevPath = ($currPath) ? $currPath . '.' . $component : $component;
+            $currPath = ($currPath) ? $currPath . '.' . $component : $component;
 
             $delimeter = substr($fullPath, $length, 1);
 
@@ -236,22 +242,20 @@ class Doctrine_RawSql extends Doctrine_Hydrate
             }
             if ( ! isset($table)) {
                 $conn = Doctrine_Manager::getInstance()
-                        ->getConnectionForComponent($name);
+                        ->getConnectionForComponent($component);
                         
                 $table = $conn->getTable($component);
                 $this->_aliasMap[$componentAlias] = array('table' => $table);
             } else {
-                $relation = $table->getRelation($name);
+                $relation = $table->getRelation($component);
 
                 $this->_aliasMap[$componentAlias] = array('table'    => $relation->getTable(),
                                                           'parent'   => $parent,
                                                           'relation' => $relation);
             }
-            $this->aliasHandler->addAlias($componentAlias, $tableAlias);
+            $this->aliasHandler->addAlias($tableAlias, $componentAlias);
 
-            $this->tableAliases[$currPath]  = $alias;
+            $parent = $currPath;
-            
-            $parent = $prevPath;
         }
 
         return $this;