Ticket #40: find_and_include_should_return_unrelated_items.patch

test/unit/lib/AkActiveRecord/AkHasMany.php

@@ -8 +8 @@
-require_once(dirname(__FILE__).'/../../../fixtures/config/config.php');
-
-
-UnitTestCase
+AkUnitTest 
-{
-
-    function test_start()
@@ -56 +56 @@
-
-        $this->assertNull($Property->pictures[0]->get('property_id'));
-
-        //$Property->dbug();
-        $MountainViews =& new Picture(array('title'=>'Mountain views'));
-        $this->assertTrue($MountainViews->isNewRecord());
-        $Property->picture->add($MountainViews);
@@ -132 +131 @@
-        $Property =& $Property->find('first');
-        $this->assertIdentical($Property->picture->count(), 0);
-
-
-
+
+
+
-        $Picture =& new Picture();
-        $Alicia =& $Picture->create(array('title'=>'Alicia'));
-        $Bermi =& $Picture->create(array('title'=>'Bermi'));
@@ -212 +212 @@
-
-        $this->assertEqual($VillaAltea->pictures[0]->get('title'), 'Garden');
-    }
-
+
-    /**/
-
-    function test_clean_up_dependencies()
-    {
-        $Property =& new Property(array('description'=>'Ruins in Matamon'));
-        $this->assertTrue($Property->save());
-
+
-        $South =& $Property->picture->create(array('title'=>'South views'));
-        $this->assertReference($South, $Property->pictures[0]);
-        $this->assertFalse($South->isNewRecord());
-
+
-        $pic_id = $South->getId();
-
-        $Property =& new Property($Property->getId());
-        $this->assertTrue($Property->destroy());
-
+
-        $Picture =& new Picture();
-
-        $this->assertFalse($Picture->find($pic_id));
+
+    }
+
+    function _test_should_not_die_on_unincluded_model()
+    {
+        $this->installAndIncludeModels(array('Post'));
+        $Post =& new Post();
+        $Post->dbug();
+        $Post->find('all', array('include' => array('comments')));
+    }
+
+    function test_should_find_owner_even_if_it_has_no_relations()
+    {
+        $this->installAndIncludeModels(array('Post', 'Comment'));
-        
+        $Post =& new Post(array('title' => 'Post for unit testing', 'body' => 'This is a post for testing the model'));
+
+        $Post->save();
+        $Post->reload();
+        
+        $expected_id = $Post->getId();
+
+        $this->assertTrue($Result =& $Post->find($expected_id, array('include' => array('comments'))));
+        $this->assertEqual($Result->getId(), $expected_id);
-    }
-
+    function test_should_find_owner_using_related_conditions()
+    {
+        $this->installAndIncludeModels(array('Post', 'Comment'));
+        
+        $Post =& new Post(array('title' => 'Post for unit testing', 'body' => 'This is a post for testing the model'));
+        $Post->comment->create(array('body' => 'hello', 'name' => 'Aditya'));
+        $Post->save();
+        $Post->reload();
+
+        $expected_id = $Post->getId();
+
+        $this->assertTrue($Result =& $Post->find($expected_id, array('include' => array('comments'), 'conditions' => "name = 'Aditya'")));
+
+        $this->assertEqual($Result->comments[0]->get('name'), 'Aditya');
+    }
-}
-
-ak_test('test_AkActiveRecord_hasMany_Associations', true);

test/fixtures/app/installers/comment_installer.php

@@ +1 @@
+<?php
+class CommentInstaller extends AkInstaller
+{
+    function up_1()
+    {
+        $this->createTable('comments', "id,name,body,post_id,created_at");
+    }
+
+    function up_2()
+    {
+        $this->addColumn('comments', 'name');
+    }
+
+    function down_1()
+    {
+        $this->dropTable('comments');
+    }
+    
+    function down_2()
+    {
+        $this->removeColumn('comments', 'name');
+    }
+}
+
+?>

test/fixtures/app/models/comment.php

@@ +1 @@
+<?php
+
+class Comment extends ActiveRecord 
+{
+    var $belongs_to = 'post';
+}
+
+?>

test/fixtures/app/models/post.php

@@ -2 +2 @@
-
-class Post extends ActiveRecord
-{
+    var $has_many = 'comments';
-}
-
-?>

lib/AkActiveRecord/AkHasAndBelongsToMany.php

@@ -761 +761 @@
-        static $ModelInstance;
-        if(empty($ModelInstance)){
-            $class_name = $this->getOption($this->association_id, 'class_name');
+            Ak::import($class_name);
-            $ModelInstance =& new $class_name();
-        }
-        return $ModelInstance;

lib/AkActiveRecord/AkHasMany.php

@@ -565 +565 @@
-
-        $finder_options['selection'] = trim($finder_options['selection'], ', ');
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
-        return $finder_options;
-    }
-
@@ -614 +602 @@
-        static $ModelInstance;
-        if(empty($ModelInstance)){
-            $class_name = $this->getOption($this->association_id, 'class_name');
+            Ak::import($class_name);
-            $ModelInstance =& new $class_name();
-        }
-        return $ModelInstance;

lib/AkActiveRecord/AkAssociatedActiveRecord.php

@@ -418 +418 @@
-                            $objects[$i]->$association_id->build($attributes, false);
-                            $objects[$i]->$association_id->_newRecord = false;
-                        }
-
-                        /**
-                     * @todo FIXME This is a dirty hack for sqlite table joins which are not exclusive as they are on MySql
-                     *       this makes table joins behave the same way as they do on MySql
-                     */
-                    }elseif (in_array($association_id, $included_associations) && $this->_getDatabaseType() == 'sqlite'){
-                        $false = false; 
-                        return $false;
-                    }
-                }
-

lib/AkActiveRecord.php

@@ -2673 +2673 @@
-            $this->_columns = $this->getColumnSettings();
-        }
-
-
+(array)
-    }
-
-    function getColumnSettings()
@@ -2704 +2704 @@
-            !$this->_runCurrentModelInstallerIfExists($column_objects)){
-                trigger_error(Ak::t('Ooops! Could not fetch details for the table %table_name.', array('%table_name'=>$this->getTableName())), E_USER_ERROR);
-                return false;
-
+
+
+
+
-                foreach (array_keys($column_objects) as $k){
-                    $this->setColumnSettings($column_objects[$k]->name, $column_objects[$k]);
-                }