Doctrine

Timestamp:

08/23/08 11:20:10 (11 months ago)

Author:

romanb

Message:

limit-subquery and query cache adjustments.

Location:

branches/1.0

Files:

• lib/Doctrine/Query.php (modified) (3 diffs)
• lib/Doctrine/Query/Abstract.php (modified) (2 diffs)
• tests/Query/CacheTestCase.php (modified) (1 diff)
• tests/Query/LimitTestCase.php (modified) (2 diffs)

branches/1.0/lib/Doctrine/Query.php

@@ -176 +176 @@
     protected $_sql;
 
-
     /**
      * create
@@ -424 +423 @@
     {
         $tableAlias = $this->getTableAlias($componentAlias);
-        $table      = $this->_queryComponents[$componentAlias]['table'];
+        $table = $this->_queryComponents[$componentAlias]['table'];
 
         if ( ! isset($this->_pendingFields[$componentAlias])) {
@@ -1069 +1068 @@
         if ( ! empty($this->_sqlParts['limit']) && $this->_needsSubquery &&
                 $table->getAttribute(Doctrine::ATTR_QUERY_LIMIT) == Doctrine::LIMIT_RECORDS) {
-            $this->_isLimitSubqueryUsed = true;
-            $needsSubQuery = true;
+            // We do not need a limit-subquery if only fields from the root component are
+            // selected and DISTINCT is used (i.e. DQL: SELECT DISTINCT u.id FROM User u LEFT JOIN u.phonenumbers LIMIT 5).
+            if (count($this->_pendingFields) > 1 || ! isset($this->_pendingFields[$this->getRootAlias()])
+                    || ! $this->_sqlParts['distinct']) {
+                $this->_isLimitSubqueryUsed = true;
+                $needsSubQuery = true;
+            }
         }
 

branches/1.0/lib/Doctrine/Query/Abstract.php

@@ -898 +898 @@
 
         if ( ! $this->_view) {
-            if ($this->_queryCache || $this->_conn->getAttribute(Doctrine::ATTR_QUERY_CACHE)) {
+            if ($this->_queryCache !== false && ($this->_queryCache || $this->_conn->getAttribute(Doctrine::ATTR_QUERY_CACHE))) {
                 $queryCacheDriver = $this->getQueryCacheDriver();
                 // calculate hash for dql query
@@ -1651 +1651 @@
      * @return Doctrine_Hydrate         this object
      */
-    public function useQueryCache(Doctrine_Cache_Interface $driver, $timeToLive = null)
-    {
+    public function useQueryCache($driver = true, $timeToLive = null)
+    {
+        if ($driver !== null && $driver !== true && $driver !== false && ! ($driver instanceOf Doctrine_Cache_Interface)) {
+            $msg = 'First argument should be instance of Doctrine_Cache_Interface or null.';
+            throw new Doctrine_Query_Exception($msg);
+        }
         $this->_queryCache = $driver;
+        
         return $this->setQueryCacheLifeSpan($timeToLive);
     }

branches/1.0/tests/Query/CacheTestCase.php

@@ -227 +227 @@
     }
     
+    public function testQueryCacheCanBeDisabledForSingleQuery()
+    {
+        $cache = new Doctrine_Cache_Array();
+        $q = new Doctrine_Query();
+        $q->select('u.name')->from('User u')->leftJoin('u.Phonenumber p')->where('u.name = ?', 'walhala')
+                ->useQueryCache(false);
+        
+        $coll = $q->execute();
+        
+        $this->assertEqual($cache->count(), 0);
+        $this->assertEqual(count($coll), 0);
+
+        $coll = $q->execute();
+
+        $this->assertEqual($cache->count(), 0);
+        $this->assertEqual(count($coll), 0);
+    }
+    
 }

branches/1.0/tests/Query/LimitTestCase.php

@@ -136 +136 @@
     {
         $q = new Doctrine_Query();
-        $q->select('User.name')->from('User')->where("User.Phonenumber.phonenumber LIKE '%123%'")->orderby('User.Email.address')->limit(5);
+        $q->select('User.name')->distinct()->from('User')->where("User.Phonenumber.phonenumber LIKE '%123%'")->orderby('User.Email.address')->limit(5);
         
 
@@ -302 +302 @@
         $this->assertEqual($q->getSql(), "SELECT p.id AS p__id, p.name AS p__name, t.id AS t__id, t.tag AS t__tag FROM photo p LEFT JOIN phototag p2 ON p.id = p2.photo_id LEFT JOIN tag t ON t.id = p2.tag_id WHERE p.id IN (SELECT DISTINCT p3.id FROM photo p3 LEFT JOIN phototag p4 ON p3.id = p4.photo_id LEFT JOIN tag t2 ON t2.id = p4.tag_id ORDER BY t2.id DESC LIMIT 10) ORDER BY t.id DESC");
     }
+    
+    public function testLimitSubqueryNotNeededIfSelectSingleFieldDistinct()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id')->distinct()->from('User u LEFT JOIN u.Phonenumber p');
+        $q->where('u.name = ?');
+        $q->limit(5);
+
+        $users = $q->execute(array('zYne'));
+        $this->assertEqual(1, $users->count());
+        
+        $this->assertEqual($q->getSql(), "SELECT DISTINCT e.id AS e__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE e.name = ? AND (e.type = 0) LIMIT 5");
+    }
 }