Doctrine

Timestamp:

12/17/08 22:44:51 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Fixing issue with resultset cache and joined records (closes #1636)

Location:

branches

Files:

• 1.0/lib/Doctrine/Query/Abstract.php (modified) (2 diffs)
• 1.0/lib/Doctrine/Record.php (modified) (3 diffs)
• 1.0/tests/Ticket/1636TestCase.php (added)
• 1.1/lib/Doctrine/Query/Abstract.php (modified) (2 diffs)
• 1.1/lib/Doctrine/Record.php (modified) (3 diffs)
• 1.1/tests/Ticket/1636TestCase.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));
@@ -1201 +1200 @@
         }
 
+        if ($customComponent instanceof Doctrine_Collection) {
+            foreach ($customComponent as $record) {
+                $record->serializeReferences(true);
+            }
+        }
+
         return serialize(array($customComponent, $componentInfo, $this->getTableAliasMap()));
     }

branches/1.0/lib/Doctrine/Record.php

@@ -153 +153 @@
 
     /**
+     * Whether or not to serialize references when a Doctrine_Record is serialized
+     *
+     * @var boolean
+     */
+    protected $_serializeReferences = false;
+
+    /**
      * @var integer $index                  this index is used for creating object identifiers
      */
@@ -227 +234 @@
 
         $this->construct();
+    }
+
+    /**
+     * Set whether or not to serialize references.
+     * This is used by caching since we want to serialize references when caching
+     * but not when just normally serializing a instance
+     *
+     * @param boolean $bool
+     * @return boolean $bool
+     */
+    public function serializeReferences($bool = null)
+    {
+        if ( ! is_null($bool)) {
+            $this->_serializeReferences = $bool;
+        }
+        return $this->_serializeReferences;
     }
 
@@ -653 +676 @@
         $vars = get_object_vars($this);
 
-        unset($vars['_references']);
+        if ( ! $this->serializeReferences()) {
+            unset($vars['_references']);
+        }
         unset($vars['_table']);
         unset($vars['_errorStack']);

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));
@@ -1303 +1302 @@
         }
 
+        if ($customComponent instanceof Doctrine_Collection) {
+            foreach ($customComponent as $record) {
+                $record->serializeReferences(true);
+            }
+        }
+
         return serialize(array($customComponent, $componentInfo, $this->getTableAliasMap()));
     }

branches/1.1/lib/Doctrine/Record.php

@@ -170 +170 @@
 
     /**
+     * Whether or not to serialize references when a Doctrine_Record is serialized
+     *
+     * @var boolean
+     */
+    protected $_serializeReferences = false;
+
+    /**
      * @var integer $index                  this index is used for creating object identifiers
      */
@@ -248 +255 @@
 
         $this->construct();
+    }
+
+    /**
+     * Set whether or not to serialize references.
+     * This is used by caching since we want to serialize references when caching
+     * but not when just normally serializing a instance
+     *
+     * @param boolean $bool
+     * @return boolean $bool
+     */
+    public function serializeReferences($bool = null)
+    {
+        if ( ! is_null($bool)) {
+            $this->_serializeReferences = $bool;
+        }
+        return $this->_serializeReferences;
     }
 
@@ -704 +727 @@
         $vars = get_object_vars($this);
 
-        unset($vars['_references']);
+        if ( ! $this->serializeReferences()) {
+            unset($vars['_references']);
+        }
         unset($vars['_table']);
         unset($vars['_errorStack']);