Doctrine

Timestamp:

12/19/08 00:24:28 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Fixes regression in resultset cache (closes #1768) and (addresses #1636 again)

Location:

branches

Files:

• 1.0/lib/Doctrine/Query/Abstract.php (modified) (1 diff)
• 1.0/tests/Ticket/1768TestCase.php (added)
• 1.1/lib/Doctrine/Query/Abstract.php (modified) (2 diffs)
• 1.1/tests/Ticket/1768TestCase.php (added)

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

@@ -935 +935 @@
     {
         $dql = $this->getDql();
+        $params = $this->getParams($params);
         $conn = $this->getConnection();
         $hash = md5($conn->getName() . $conn->getOption('dsn') . $dql . var_export($params, true));

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

@@ -997 +997 @@
     {
         $dql = $this->getDql();
+        $params = $this->getParams($params);
         $conn = $this->getConnection();
         $hash = md5($conn->getName() . $conn->getOption('dsn') . $dql . var_export($params, true));
@@ -1073 +1074 @@
 
         $stmt = $this->_conn->execute($query, $params);
+
+        $this->_params['exec'] = array();
 
         return $stmt;