Changeset 578

Timestamp:

05/04/08 14:10:40 (4 months ago)

Author:

bermiferrer

Message:

Adding support for using string lists for finder 'include' params

Files:

• trunk/lib/AkActiveRecord/AkAssociatedActiveRecord.php (modified) (2 diffs)
• trunk/test/unit/lib/AkActiveRecord/_AkActiveRecord_finders.php (modified) (2 diffs)

trunk/lib/AkActiveRecord/AkAssociatedActiveRecord.php

@@ -232 +232 @@
-    {
-        $result = false;
-is_array($options['include']) ? $options['include'] : a
+Ak::toA
-        $options['order'] = empty($options['order']) ? '' : $this->_addTableAliasesToAssociatedSql('__owner', $options['order']);
-        $options['conditions'] = empty($options['conditions']) ? '' : $this->_addTableAliasesToAssociatedSql('__owner', $options['conditions']);
@@ -246 +246 @@
-            }
-        }
-
+
-        $available_associated_options = array('order'=>array(), 'conditions'=>array(), 'joins'=>array(), 'selection'=>array());
-

trunk/test/unit/lib/AkActiveRecord/_AkActiveRecord_finders.php

@@ -16 +16 @@
-        @Ak::file_delete(AK_MODELS_DIR.DS.'post_tag.php');
-    }
-
+
-    function test_should_find_using_id_and_options()
-    {
@@ -60 +60 @@
-    }
-
+    function test_should_parse_include_as_array()
+    {
+        $Post =& new Post(array('title' => 'PHP Frameworks'));
+        $Post->comment->create(array('name'=>'Comment 1'));
+        $Post->comment->create(array('name'=>'Comment 2'));
+        $Post->tag->create(array('name'=>'Tag 1'));
+        $Post->tag->create(array('name'=>'Tag 2'));
+
+        $this->assertTrue($Post->save());
+        
+        $this->assertTrue($Post =& $this->Post->find($Post->getId(), array('include'=>'comments,tags')));
+        
+        $this->assertEqual($Post->tags[0]->name, 'Tag 1');
+        $this->assertEqual($Post->tags[1]->name, 'Tag 2');
+
+        $this->assertEqual($Post->comments[0]->name, 'Comment 1');
+        $this->assertEqual($Post->comments[1]->name, 'Comment 2');
+    }
+
-
-}
-
-
+//
-
-?>