[limb-svn] r6754 - in 3.x/trunk/limb/active_record: src tests/cases

[svn at limb-project.com]

Author: serega
Date: 2008-01-28 10:30:37 +0300 (Mon, 28 Jan 2008)
New Revision: 6754
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6754

Modified:
   3.x/trunk/limb/active_record/src/lmbARQuery.class.php
   3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php
Log:
-- changed lmbARQueryTest to use eagerJoin() and eagerAttach() instead of joinRelation() and attachRelation()

Modified: 3.x/trunk/limb/active_record/src/lmbARQuery.class.php
===================================================================
--- 3.x/trunk/limb/active_record/src/lmbARQuery.class.php	2008-01-28 05:36:34 UTC (rev 6753)
+++ 3.x/trunk/limb/active_record/src/lmbARQuery.class.php	2008-01-28 07:30:37 UTC (rev 6754)
@@ -196,9 +196,9 @@
     foreach($join as $relation_name=> $params_or_relation_name)
     {
       if(is_numeric($relation_name))
-        $query->joinRelation(trim($params_or_relation_name));
+        $query->eagerJoin(trim($params_or_relation_name));
       else
-        $query->joinRelation(trim($relation_name), $params_or_relation_name);
+        $query->eagerJoin(trim($relation_name), $params_or_relation_name);
     }
 
     $attach = (isset($params['attach']) && $params['attach']) ? $params['attach'] : array();
@@ -208,9 +208,9 @@
     foreach($attach as $relation_name => $params_or_relation_name)
     {
       if(is_numeric($relation_name))
-        $query->attachRelation(trim($params_or_relation_name));
+        $query->eagerAttach(trim($params_or_relation_name));
       else
-        $query->attachRelation(trim($relation_name), $params_or_relation_name);
+        $query->eagerAttach(trim($relation_name), $params_or_relation_name);
     }
     
     return $query;

Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php	2008-01-28 05:36:34 UTC (rev 6753)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php	2008-01-28 07:30:37 UTC (rev 6754)
@@ -55,7 +55,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('PersonForTest', array(), $this->conn);
-    $query->joinRelation('social_security');
+    $query->eagerJoin('social_security');
     $iterator = $query->fetch();
     $arr = $iterator->getArray();
     
@@ -89,7 +89,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('SocialSecurityForTest', array(), $this->conn);
-    $query->joinRelation('person');
+    $query->eagerJoin('person');
     $iterator = $query->fetch();
     $arr = $iterator->getArray();
 
@@ -124,7 +124,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('LectureForTest', array(), $this->conn);
-    $query->joinRelation('course');
+    $query->eagerJoin('course');
     $iterator = $query->fetch();
     $arr = $iterator->getArray();
     
@@ -162,7 +162,7 @@
     
     $query = lmbARQuery :: create('PersonForTest', array(), $this->conn);
     // note attach() has the same effect as join() but workds is a different way - it produces another sql request 
-    $iterator = $query->attachRelation('social_security')->fetch();
+    $iterator = $query->eagerAttach('social_security')->fetch();
     $arr = $iterator->getArray();
     
     $this->assertEqual($this->conn->countQueries(), 2);
@@ -198,7 +198,7 @@
     
     $query = lmbARQuery :: create('SocialSecurityForTest', array(), $this->conn);
     // note attach() has the same effect as join() but workds is a different way - it produces another sql request 
-    $arr = $query->attachRelation('person')->fetch()->getArray();
+    $arr = $query->eagerAttach('person')->fetch()->getArray();
 
     $this->assertEqual($this->conn->countQueries(), 2);
     
@@ -234,7 +234,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('LectureForTest', array(), $this->conn);
-    $arr = $query->attachRelation('course')->attachRelation('alt_course')->fetch()->getArray();
+    $arr = $query->eagerAttach('course')->eagerAttach('alt_course')->fetch()->getArray();
     
     $this->assertEqual($this->conn->countQueries(), 3);
     
@@ -280,7 +280,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('CourseForTest', array(), $this->conn);
-    $arr = $query->attachRelation('lectures', array('sort' => array('title' => 'ASC')))->fetch()->getArray();
+    $arr = $query->eagerAttach('lectures', array('sort' => array('title' => 'ASC')))->fetch()->getArray();
     
     $this->assertEqual($this->conn->countQueries(), 2);
     
@@ -326,7 +326,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('UserForTest', array(), $this->conn);
-    $arr = $query->attachRelation('groups', array('sort' => array('title' => 'DESC')))->fetch()->getArray();
+    $arr = $query->eagerAttach('groups', array('sort' => array('title' => 'DESC')))->fetch()->getArray();
     
     $this->assertEqual($this->conn->countQueries(), 2);
     
@@ -374,7 +374,7 @@
     
     $query = lmbARQuery :: create('CourseForTest', array(), $this->conn);
     $query->where(lmbSQLCriteria :: in('id', array($course1->getId(), $course2->getId())));
-    $rs = $query->attachRelation('lectures', array('join' => 'alt_course'))->fetch();
+    $rs = $query->eagerAttach('lectures', array('join' => 'alt_course'))->fetch();
     $arr = $rs->getArray();
     
     $this->assertEqual($this->conn->countQueries(), 2);
@@ -429,7 +429,7 @@
 
     $query = lmbARQuery :: create('LectureForTest', array(), $this->conn);
     $query->where(lmbSQLCriteria :: equal('course_id', $course1->getId()));
-    $iterator = $query->joinRelation('alt_course', array('attach' => 'lectures'))->fetch();
+    $iterator = $query->eagerJoin('alt_course', array('attach' => 'lectures'))->fetch();
     $arr = $iterator->getArray();
     
     $this->assertEqual($this->conn->countQueries(), 2);
@@ -485,7 +485,7 @@
     
     $query = lmbARQuery :: create('CourseForTest', array(), $this->conn);
     $query->where(lmbSQLCriteria :: in('id', array($course1->getId(), $course2->getId())));
-    $arr = $query->attachRelation('lectures', array('join' => array('alt_course' => array('attach' => 'lectures'))))->fetch()->getArray();
+    $arr = $query->eagerAttach('lectures', array('join' => array('alt_course' => array('attach' => 'lectures'))))->fetch()->getArray();
 
     $this->assertEqual($this->conn->countQueries(), 3);
     
@@ -543,7 +543,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('LectureForTest', array(), $this->conn);
-    $iterator = $query->joinRelation('course', array('join' => 'program'))->fetch();
+    $iterator = $query->eagerJoin('course', array('join' => 'program'))->fetch();
     $arr = $iterator->getArray();
     
     $this->assertEqual($this->conn->countQueries(), 1);
@@ -588,7 +588,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('ProgramForTest', array(), $this->conn);
-    $iterator = $query->attachRelation('courses', array('attach' => 'lectures'))->fetch();
+    $iterator = $query->eagerAttach('courses', array('attach' => 'lectures'))->fetch();
     
     $arr = $iterator->getArray();
 
@@ -640,7 +640,7 @@
     $course2 = $this->creator->createCourse();
     
     $query = lmbARQuery :: create('CourseForTest', array(), $this->conn);
-    $arr = $query->joinRelation('program')->fetch()->getArray();
+    $arr = $query->eagerJoin('program')->fetch()->getArray();
     
     $this->assertEqual($arr[0]->getProgram()->getTitle(), $program->getTitle());
     $this->assertNull($arr[1]->getProgram());
@@ -654,7 +654,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('ProgramForTest', array(), $this->conn);
-    $arr = $query->attachRelation('courses')->fetch()->getArray();
+    $arr = $query->eagerAttach('courses')->fetch()->getArray();
 
     $this->assertEqual($this->conn->countQueries(), 2);
 
@@ -674,7 +674,7 @@
     $program2 = $this->creator->createProgram();
     
     $query = lmbARQuery :: create('ProgramForTest', array(), $this->conn);
-    $query->joinRelation('courses');
+    $query->eagerJoin('courses');
     try
     {
       $it = $query->fetch();
@@ -694,7 +694,7 @@
     $this->conn->resetStats();
     
     $query = lmbARQuery :: create('CourseForTest', array(), $this->conn);
-    $arr = $query->attachRelation('program')->fetch()->getArray();
+    $arr = $query->eagerAttach('program')->fetch()->getArray();
 
     $this->assertEqual($this->conn->countQueries(), 2);