Doctrine

Timestamp:

12/17/08 22:56:14 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Fixed issue with limit subquery algorithm queries beind cached when they should not be (closes #1726)

Location:

branches

Files:

• 1.0/lib/Doctrine/Query.php (modified) (1 diff)
• 1.0/lib/Doctrine/Query/Abstract.php (modified) (1 diff)
• 1.1/lib/Doctrine/Query.php (modified) (1 diff)
• 1.1/lib/Doctrine/Query/Abstract.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Query.php

@@ -1129 +1129 @@
                 switch (strtolower($this->_conn->getDriverName())) {
                     case 'mysql':
+                        $this->useQueryCache(false);
                         // mysql doesn't support LIMIT in subqueries
                         $list = $this->_conn->execute($subquery, $params)->fetchAll(Doctrine::FETCH_COLUMN);

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

@@ -960 +960 @@
                 } else {
                     $query = $this->getSqlQuery($params);
-                    $serializedQuery = $this->getCachedForm($query);
-                    $queryCacheDriver->save($hash, $serializedQuery, $this->getQueryCacheLifeSpan());
+                    // Check again because getSqlQuery() above could have flipped the _queryCache flag
+                    // if this query contains the limit sub query algorithm we don't need to cache it
+                    if ($this->_queryCache !== false && ($this->_queryCache || $this->_conn->getAttribute(Doctrine::ATTR_QUERY_CACHE))) {
+                        $serializedQuery = $this->getCachedForm($query);
+                        $queryCacheDriver->save($hash, $serializedQuery, $this->getQueryCacheLifeSpan());
+                    }
                 }
             } else {

branches/1.1/lib/Doctrine/Query.php

@@ -1210 +1210 @@
             switch (strtolower($this->_conn->getDriverName())) {
                 case 'mysql':
+                    $this->useQueryCache(false);
                     // mysql doesn't support LIMIT in subqueries
                     $list = $this->_conn->execute($subquery, $this->_execParams)->fetchAll(Doctrine::FETCH_COLUMN);

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

@@ -1042 +1042 @@
                     // Generate SQL or pick already processed one
                     $query = $this->getSqlQuery($params);
-                    
-                    // Convert query into a serialized form
-                    $serializedQuery = $this->getCachedForm($query);
-                    
-                    // Save cached query
-                    $queryCacheDriver->save($hash, $serializedQuery, $this->getQueryCacheLifeSpan());
+
+                    // Check again because getSqlQuery() above could have flipped the _queryCache flag
+                    // if this query contains the limit sub query algorithm we don't need to cache it
+                    if ($this->_queryCache !== false && ($this->_queryCache || $this->_conn->getAttribute(Doctrine::ATTR_QUERY_CACHE))) {
+                        // Convert query into a serialized form
+                        $serializedQuery = $this->getCachedForm($query);
+
+                        // Save cached query
+                        $queryCacheDriver->save($hash, $serializedQuery, $this->getQueryCacheLifeSpan());
+                    }
                 }
             } else {