New "Cache Clearing" code wasn't clearing enough properties!

Updated Dump output to bypass local property cache

Author: Nik Barham

src/Automatorm/Orm/Dump.php

@@ -44,7 +44,7 @@ public function _dump(Model $model)
                 if (substr($method, 0, 10) == '_property_')
                 {
                     $key = substr($method, 10);
-                    $value = $this->$key;
+                    $value = $this->$method();
                     $output .= "    " . \Automatorm\Orm\Dump::format($key, $value, $seen);
                     $seen[$key] = true;
                 }
@@ -61,7 +61,7 @@ public function _dump(Model $model)
             $output .= "    <span><strong>1-1</strong></span> =>\n";
             if ($schema['one-to-one']) foreach ($schema['one-to-one'] as $key => $contents)
             {
-                $value = $this->$key;
+                $value = $this->_data->$key;
 
                 $output .= "      " . \Automatorm\Orm\Dump::format($key, $value, $seen);
                 $seen[$key] = true;
@@ -70,7 +70,7 @@ public function _dump(Model $model)
             $output .= "    <span><strong>*-1</strong></span> =>\n";
             if ($schema['many-to-one']) foreach ($schema['many-to-one'] as $key => $contents)
             {
-                $value = $this->$key;
+                $value = $this->_data->$key;
 
                 $output .= "      " . \Automatorm\Orm\Dump::format($key, $value, $seen);
                 $seen[$key] = true;
@@ -79,7 +79,7 @@ public function _dump(Model $model)
             $output .= "    <span><strong>1-*</strong></span> =>\n";
             if ($schema['one-to-many']) foreach ($schema['one-to-many'] as $key => $contents)
             {
-                $value = $this->$key;
+                $value = $this->_data->$key;
 
                 $output .= "      " . \Automatorm\Orm\Dump::format($key, $value, $seen);
                 $seen[$key] = true;
@@ -88,7 +88,7 @@ public function _dump(Model $model)
             $output .= "    <span><strong>*-*</strong></span> =>\n";
             if ($schema['many-to-many']) foreach ($schema['many-to-many'] as $key => $contents)
             {
-                $value = $this->$key;
+                $value = $this->_data->$key;
 
                 $output .= "      " . \Automatorm\Orm\Dump::format($key, $value, $seen);
                 $seen[$key] = true;

src/Automatorm/Orm/Model.php

@@ -369,10 +369,43 @@ final public function dataUpdate(Data $db)
     final public function dataClearCache()
     {
         $modelschema = $this->_data->getModel();
+        
+        // Clean out cached column data
         foreach ($modelschema['columns'] as $column => $type)
         {
             if ($column != 'id') unset($this->{$column});
         }
+        
+        // Clean out cached "dynamic property" data
+        foreach (get_class_methods(get_called_class()) as $methodname)
+        {
+            if (substr($methodname,0,10) == '_property_')
+            {
+                $column = substr($methodname,10);
+                unset($this->{$column});
+            }
+        }
+        
+        // Clean out cached external data
+        foreach ($modelschema['one-to-one'] as $column => $value)
+        {
+            if ($column != 'id') unset($this->{$column});
+        }
+        
+        foreach ($modelschema['one-to-many'] as $column => $value)
+        {
+            if ($column != 'id') unset($this->{$column});
+        }
+
+        foreach ($modelschema['many-to-many'] as $column => $value)
+        {
+            if ($column != 'id') unset($this->{$column});
+        }
+
+        foreach ($modelschema['many-to-one'] as $column => $value)
+        {
+            if ($column != 'id') unset($this->{$column});
+        }
     }
 
     // Grab a clean version of the Data object based on the current state in the database.