[limb-svn] r6705 - in 3.x/trunk/limb: active_record/tests/cases dbal/src/drivers dbal/tests/cases/non-driver
svn at limb-project.com
svn at limb-project.com
Fri Jan 18 17:28:35 MSK 2008
Author: pachanga
Date: 2008-01-18 17:28:35 +0300 (Fri, 18 Jan 2008)
New Revision: 6705
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6705
Modified:
3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php
3.x/trunk/limb/dbal/src/drivers/lmbAuditDbConnection.class.php
3.x/trunk/limb/dbal/tests/cases/non-driver/lmbAuditDbConnectionTest.class.php
Log:
-- renaming resetQueries into resetStats
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-18 11:39:49 UTC (rev 6704)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php 2008-01-18 14:28:35 UTC (rev 6705)
@@ -35,7 +35,7 @@
$person1 = $this->creator->createPerson();
$person2 = $this->creator->createPerson();
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('PersonForTest', $this->conn);
$query->join('social_security');
@@ -47,7 +47,7 @@
//make sure we really eager fetching
$this->db->delete('social_security_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'PersonForTest');
$this->assertEqual($arr[0]->getName(), $person1->getName());
@@ -69,7 +69,7 @@
$person2 = $this->creator->createPerson();
$ss2 = $person2->getSocialSecurity();
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('SocialSecurityForTest', $this->conn);
$query->join('person');
@@ -81,7 +81,7 @@
//make sure we really eager fetching
$this->db->delete('person_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'SocialSecurityForTest');
$this->assertEqual($arr[0]->getCode(), $ss1->getCode());
@@ -104,7 +104,7 @@
$lecture2 = $this->creator->createLecture($course1);
$lecture3 = $this->creator->createLecture($course2);
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('LectureForTest', $this->conn);
$query->join('course');
@@ -116,7 +116,7 @@
//make sure we really eager fetching
$this->db->delete('course_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'LectureForTest');
$this->assertEqual($arr[0]->getTitle(), $lecture1->getTitle());
@@ -141,7 +141,7 @@
$person1 = $this->creator->createPerson();
$person2 = $this->creator->createPerson();
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('PersonForTest', $this->conn);
// note attach() has the same effect as join() but workds is a different way - it produces another sql request
@@ -153,7 +153,7 @@
//make sure we really eager fetching
$this->db->delete('social_security_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'PersonForTest');
$this->assertEqual($arr[0]->getName(), $person1->getName());
@@ -177,7 +177,7 @@
$this->db->delete('person_for_test', 'id = ' . $id);
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('SocialSecurityForTest', $this->conn);
// note attach() has the same effect as join() but workds is a different way - it produces another sql request
@@ -188,7 +188,7 @@
//make sure we really eager fetching
$this->db->delete('person_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'SocialSecurityForTest');
$this->assertEqual($arr[0]->getCode(), $person1->getSocialSecurity()->getCode());
@@ -214,7 +214,7 @@
$lecture2 = $this->creator->createLecture($course, $alt_course2);
$lecture3 = $this->creator->createLecture($course, $alt_course1);
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('LectureForTest', $this->conn);
$arr = $query->attach('course')->attach('alt_course')->fetch()->getArray();
@@ -224,7 +224,7 @@
//make sure we really eager fetching
$this->db->delete('course_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'LectureForTest');
$this->assertEqual($arr[0]->getTitle(), $lecture1->getTitle());
@@ -260,7 +260,7 @@
$lecture3 = $this->creator->createLecture($course1, null, 'AAA');
$lecture4 = $this->creator->createLecture($course1, null, 'BBB');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('CourseForTest', $this->conn);
$arr = $query->attach('lectures', array('sort' => array('title' => 'ASC')))->fetch()->getArray();
@@ -270,7 +270,7 @@
//make sure we really eager fetching
$this->db->delete('lecture_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'CourseForTest');
$this->assertEqual($arr[0]->getTitle(), $course1->getTitle());
@@ -306,7 +306,7 @@
$group2->setUsers(array($user2));
$group3->setUsers(array($user1));
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('UserForTest', $this->conn);
$arr = $query->attach('groups', array('sort' => array('title' => 'DESC')))->fetch()->getArray();
@@ -317,7 +317,7 @@
$this->db->delete('group_for_test');
$this->db->delete('user2group_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'UserForTest');
$this->assertEqual($arr[0]->getFirstName(), $user1->getFirstName());
@@ -353,7 +353,7 @@
$lecture3 = $this->creator->createLecture($course1, $alt_course2);
$lecture4 = $this->creator->createLecture($course1, $alt_course1);
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('CourseForTest', $this->conn);
$query->where(lmbSQLCriteria :: in('id', array($course1->getId(), $course2->getId())));
@@ -365,7 +365,7 @@
$this->db->delete('lecture_for_test');
$this->db->delete('course_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'CourseForTest');
$this->assertEqual($arr[0]->getTitle(), $course1->getTitle());
@@ -407,7 +407,7 @@
$lecture7 = $this->creator->createLecture($alt_course2);
$lecture8 = $this->creator->createLecture($alt_course1);
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('LectureForTest', $this->conn);
$query->where(lmbSQLCriteria :: equal('course_id', $course1->getId()));
@@ -420,7 +420,7 @@
$this->db->delete('lecture_for_test');
$this->db->delete('course_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'LectureForTest');
$this->assertEqual($arr[0]->getTitle(), $lecture1->getTitle());
@@ -463,7 +463,7 @@
$lecture7 = $this->creator->createLecture($alt_course2);
$lecture8 = $this->creator->createLecture($alt_course1);
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('CourseForTest', $this->conn);
$query->where(lmbSQLCriteria :: in('id', array($course1->getId(), $course2->getId())));
@@ -475,7 +475,7 @@
$this->db->delete('lecture_for_test');
$this->db->delete('course_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'CourseForTest');
$this->assertEqual($arr[0]->getTitle(), $course1->getTitle());
@@ -522,7 +522,7 @@
$lecture1 = $this->creator->createLecture($course1);
$lecture2 = $this->creator->createLecture($course2);
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('LectureForTest', $this->conn);
$iterator = $query->join('course', array('join' => 'program'))->fetch();
@@ -535,7 +535,7 @@
$this->db->delete('course_for_test');
$this->db->delete('program_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'LectureForTest');
$this->assertEqual($arr[0]->getTitle(), $lecture1->getTitle());
@@ -567,7 +567,7 @@
$lecture7 = $this->creator->createLecture($course3);
$lecture8 = $this->creator->createLecture($course4);
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$query = new lmbARQuery('ProgramForTest', $this->conn);
$iterator = $query->attach('courses', array('attach' => 'lectures'))->fetch();
@@ -581,7 +581,7 @@
$this->db->delete('course_for_test');
$this->db->delete('program_for_test');
- $this->conn->resetQueries();
+ $this->conn->resetStats();
$this->assertIsA($arr[0], 'ProgramForTest');
$this->assertEqual($arr[0]->getTitle(), $program1->getTitle());
Modified: 3.x/trunk/limb/dbal/src/drivers/lmbAuditDbConnection.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/lmbAuditDbConnection.class.php 2008-01-18 11:39:49 UTC (rev 6704)
+++ 3.x/trunk/limb/dbal/src/drivers/lmbAuditDbConnection.class.php 2008-01-18 14:28:35 UTC (rev 6705)
@@ -39,7 +39,7 @@
return sizeof($this->queries);
}
- function resetQueries()
+ function resetStats()
{
$this->queries = array();
}
Modified: 3.x/trunk/limb/dbal/tests/cases/non-driver/lmbAuditDbConnectionTest.class.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/non-driver/lmbAuditDbConnectionTest.class.php 2008-01-18 11:39:49 UTC (rev 6704)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/lmbAuditDbConnectionTest.class.php 2008-01-18 14:28:35 UTC (rev 6705)
@@ -41,7 +41,7 @@
$this->assertEqual($this->connection->countQueries(), 2);
- $this->connection->resetQueries();
+ $this->connection->resetStats();
$this->assertEqual($this->connection->countQueries(), 0);
}
More information about the limb-svn
mailing list