Changeset 4714 for branches

Timestamp:

07/26/08 20:44:54 (6 months ago)

Author:

guilhermeblanco

Message:

Fixes #1195.

Location:

branches

Files:

• 0.11/lib/Doctrine/Query.php (modified) (1 diff)
• 0.11/lib/Doctrine/RawSql.php (modified) (4 diffs)
• 0.11/tests/run.php (modified) (1 diff)
• 0.11/tests/Ticket/1195TestCase.php (added)
• 1.0/lib/Doctrine/RawSql.php (modified) (2 diffs)
• 1.0/tests/Ticket/1195TestCase.php (added)

branches/0.11/lib/Doctrine/Query.php

@@ -1176 +1176 @@
                     case 'pgsql':
                         // pgsql needs special nested LIMIT subquery
-                        $subquery = 'SELECT doctrine_subquery_alias.' . $idColumnName . ' FROM (' . $subquery . ') AS doctrine_subquery_alias';
+                        $subquery = 'SELECT '
+                            . $this->_conn->quoteIdentifier('doctrine_subquery_alias.' . $idColumnName)
+                            . ' FROM (' . $subquery . ') AS ' 
+                            . $this->_conn->quoteIdentifier('doctrine_subquery_alias');
                         break;
                 }

branches/0.11/lib/Doctrine/RawSql.php

@@ -73 +73 @@
             return $this;
         }
-        if ( ! isset($this->parts[$queryPartName])) {
+        if ( ! isset($this->_sqlParts[$queryPartName])) {
             $this->_sqlParts[$queryPartName] = array();
         }
@@ -221 +221 @@
         }
         
+        $q = 'SELECT ';
+
+        if ($this->_sqlParts['distinct'] == true) {
+            $q .= 'DISTINCT ';
+        }
+
         // first add the fields of the root component
         reset($this->_queryComponents);
         $componentAlias = key($this->_queryComponents);
 
-        $q = 'SELECT ' . implode(', ', $select[$componentAlias]);
+        $q .= implode(', ', $select[$componentAlias]);
         unset($select[$componentAlias]);
 
@@ -235 +241 @@
 
         $string = $this->getInheritanceCondition($this->getRootAlias());
+
         if ( ! empty($string)) {
             $this->_sqlParts['where'][] = $string;
         }
-        $copy = $this->_sqlParts;
-        unset($copy['select']);
 
         $q .= ( ! empty($this->_sqlParts['from']))?    ' FROM '     . implode(' ', $this->_sqlParts['from']) : '';
@@ -253 +258 @@
         }
         return $q;
+    }
+    
+    /**
+     * getCountQuery
+     * builds the count query.
+     *
+     * @return string       the built sql query
+     */
+        public function getCountQuery($params = array())
+    {
+        //Doing COUNT( DISTINCT rootComponent.id )
+        //This is not correct, if the result is not hydrated by doctrine, but it mimics the behaviour of Doctrine_Query::getCountQuery
+        reset($this->_queryComponents);
+        $componentAlias = key($this->_queryComponents);
+        $tableAlias = $this->getSqlTableAlias($componentAlias);
+        $fields = array();
+
+        foreach ((array) $this->_queryComponents[$componentAlias]['table']->getIdentifierColumnNames() as $key) {
+                $fields[] = $tableAlias . '.' . $key;
+        }
+
+        $q = 'SELECT COUNT( DISTINCT '.implode(',',$fields).') as num_results';
+
+        $string = $this->getInheritanceCondition($this->getRootAlias());
+        if ( ! empty($string)) {
+            $this->_sqlParts['where'][] = $string;
+        }
+
+        $q .= ( ! empty($this->_sqlParts['from']))?    ' FROM '     . implode(' ', $this->_sqlParts['from']) : '';
+        $q .= ( ! empty($this->_sqlParts['where']))?   ' WHERE '    . implode(' AND ', $this->_sqlParts['where']) : '';
+        $q .= ( ! empty($this->_sqlParts['groupby']))? ' GROUP BY ' . implode(', ', $this->_sqlParts['groupby']) : '';
+        $q .= ( ! empty($this->_sqlParts['having']))?  ' HAVING '   . implode(' AND ', $this->_sqlParts['having']) : '';
+
+        if ( ! empty($string)) {
+            array_pop($this->_sqlParts['where']);
+        }
+
+        return $q;
+    }
+
+        /**
+     * count
+     * fetches the count of the query
+     *
+     * This method executes the main query without all the
+     * selected fields, ORDER BY part, LIMIT part and OFFSET part.
+     *
+     * This is an exact copy of the Dql Version
+     *
+     * @see Doctrine_Query::count()
+     * @param array $params        an array of prepared statement parameters
+     * @return integer             the count of this query
+     */
+    public function count($params = array())
+    {
+        $q = $this->getCountQuery();
+
+        if ( ! is_array($params)) {
+            $params = array($params);
+        }
+
+        $params = array_merge($this->_params['join'], $this->_params['where'], $this->_params['having'], $params);
+
+        $params = $this->convertEnums($params);
+
+        $results = $this->getConnection()->fetchAll($q, $params);
+
+        if (count($results) > 1) {
+            $count = count($results);
+        } else {
+            if (isset($results[0])) {
+                $results[0] = array_change_key_case($results[0], CASE_LOWER);
+                $count = $results[0]['num_results'];
+            } else {
+                $count = 0;
+            }
+        }
+
+        return (int) $count;
     }
 

branches/0.11/tests/run.php

@@ -87 +87 @@
 $tickets->addTestCase(new Doctrine_Ticket_1175_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1192_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1195_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1205_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1206_TestCase());

branches/1.0/lib/Doctrine/RawSql.php

@@ -222 +222 @@
         
         $q = 'SELECT ';
-        if($this->_sqlParts['distinct'] == true) $q .= 'DISTINCT ';
+
+        if ($this->_sqlParts['distinct'] == true) {
+            $q .= 'DISTINCT ';
+        }
 
         // first add the fields of the root component
         reset($this->_queryComponents);
         $componentAlias = key($this->_queryComponents);
+        
         $q .= implode(', ', $select[$componentAlias]);
         unset($select[$componentAlias]);
@@ -237 +241 @@
 
         $string = $this->getInheritanceCondition($this->getRootAlias());
+
         if ( ! empty($string)) {
             $this->_sqlParts['where'][] = $string;