Added in new syntax for PartialResults.

Does not yet support filtering

Author: Nik Barham

src/Automatorm/Orm/Data.php

@@ -315,6 +315,16 @@ public static function groupJoinCount(Collection $collection, $var, $where = [])
             return $data['count'];
         }        
     }
+    
+    public function hasForeignKey($var)
+    {
+        return (bool) (
+            key_exists($var, (array) $this->model['one-to-one'])
+            or key_exists($var, (array) $this->model['one-to-many'])
+            or key_exists($var, (array) $this->model['many-to-one'])
+            or key_exists($var, (array) $this->model['many-to-many'])
+        );
+    }
 
     public function join($var, array $where = [])
     {

src/Automatorm/Orm/Model.php

@@ -272,7 +272,9 @@ final protected function __construct(Data $data)
 
     // Dynamic object properties - Prefer properties set on the model object over column data from the db (Model_Data object)
     public function __get($var)
-    {        
+    {
+        if ($var == '_') return new PartialResult($this);
+        
         // If the property actually exists, then return it rather than looking at the Model_Data object.
         if (property_exists($this, $var)) return $this->{$var};
 

src/Automatorm/Orm/PartialResult.php

@@ -15,6 +15,7 @@ class PartialResult
     protected $database;
     protected $route;
     protected $multiresult = false;
+    protected $resolution = null;
 
     public function __construct(Model $source)
     {
@@ -25,8 +26,18 @@ public function __construct(Model $source)
         $this->database = $source->_data->getDatabase();
     }
 
+    public function __call($var, $args)
+    {
+        $obj = $this->resolve();
+        
+        return call_user_func_array(array($obj, $var), $args);
+    }
+    
     public function __get($var)
     {
+        if ($this->resolution) return $this->resolution->{$var};
+        if ($var == '_') return $this->resolve();
+        
         if (array_key_exists($var, $this->currentSchema['columns']))
         {
             // We have column data, resolve!
@@ -53,26 +64,31 @@ public function __get($var)
 
     public function resolve($var = null)
     {
-        // Resolve down to a real Model object, then call __get on it.
-        $ids = $this->resolveState();
-        
-        $results = Model::factoryObjectCache($ids, $this->currentTable, $this->database);
-        
-        if ($this->multiresult && !$results instanceof Collection)
+        if (!$this->resolution)
         {
-            $results = new Collection([$results]);
+            // Resolve down to a real Model object, then call __get on it.
+            $ids = $this->resolveState();
+            
+            $results = Model::factoryObjectCache($ids, $this->currentTable, $this->database);
+            
+            if ($this->multiresult && !$results instanceof Collection)
+            {
+                $results = new Collection([$results]);
+            }
+            
+            if (!$this->multiresult && $results instanceof Collection && $results->count() == 1)
+            {
+                $results = $results[0];
+            }
+            
+            $this->resolution = $results;
         }
 
-        if (!$this->multiresult && $results instanceof Collection && $results->count() == 1)
-        {
-            $results = $results[0];
-        }
-
         if (!is_null($var))
         {
-            return $results->{$var};    
+            return $this->resolution->{$var};    
         }
-        return $results;
+        return $this->resolution;
     }
 
     protected $joinCount = 0;
@@ -138,8 +154,6 @@ public function pushM2M($col, $target)
         $key2 = 'join_' . ++$this->joinCount;
         $key2a = $key2 . 'a';
 
-        var_dump($target);
-        
         $this->route[] =
             'Join `' . Schema::underscoreCase($target['pivot']) . '` as ' . $key2a . ' on ' . $key . '.id = ' . $key2a . '.`' . $target['id'] . '` ';
         ;