Merge branch 'fzhan-master'

Author: jamierumbelow

core/MY_Model.php

@@ -462,6 +462,11 @@ public function with($relationship)
 
     public function relate($row)
     {
+		if (empty($row))
+        {
+		    return $row;
+        }
+		
         foreach ($this->belongs_to as $key => $value)
         {
             if (is_string($value))
@@ -477,14 +482,15 @@ public function relate($row)
 
             if (in_array($relationship, $this->_with))
             {
-                $this->load->model($options['model']);
+                $this->load->model($options['model'], $relationship . '_model');
+
                 if (is_object($row))
                 {
-                    $row->{$relationship} = $this->{$options['model']}->get($row->{$options['primary_key']});
+                    $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
                 }
                 else
                 {
-                    $row[$relationship] = $this->{$options['model']}->get($row[$options['primary_key']]);
+                    $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
                 }
             }
         }
@@ -504,14 +510,15 @@ public function relate($row)
 
             if (in_array($relationship, $this->_with))
             {
-                $this->load->model($options['model']);
+                $this->load->model($options['model'], $relationship . '_model');
+
                 if (is_object($row))
                 {
-                    $row->{$relationship} = $this->{$options['model']}->get_many_by($options['primary_key'], $row->{$this->primary_key});
+                    $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
                 }
                 else
                 {
-                    $row[$relationship] = $this->{$options['model']}->get_many_by($options['primary_key'], $row[$this->primary_key]);
+                    $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
                 }
             }
         }

tests/MY_Model_test.php

@@ -449,7 +449,7 @@ public function test_belongs_to()
         $this->model->_database->expects($this->once())->method('row')->will($this->returnValue($object));
         $author_model->_database->expects($this->once())->method('row')->will($this->returnValue($author_object));
 
-        $this->model->load->expects($this->once())->method('model')->with('author_model')
+        $this->model->load->expects($this->once())->method('model')->with('author_model', 'author_model')
                           ->will($this->returnCallback(function() use ($self, $author_model){
                               $self->model->author_model = $author_model;
                           }));
@@ -485,9 +485,9 @@ public function test_has_many()
         $this->model->_database->expects($this->once())->method('row')->will($this->returnValue($object));
         $comment_model->_database->expects($this->once())->method('result')->will($this->returnValue(array( $comment_object, $comment_object_2 )));
 
-        $this->model->load->expects($this->once())->method('model')->with('comment_model')
+        $this->model->load->expects($this->once())->method('model')->with('comment_model', 'comments_model')
                           ->will($this->returnCallback(function() use ($self, $comment_model){
-                              $self->model->comment_model = $comment_model;
+                              $self->model->comments_model = $comment_model;
                           }));
 
         $this->assertEquals($expected_object, $this->model->with('comments')->get(1));