[limb-svn] r5982 - in 3.x/trunk/limb/active_record/tests/cases: . .fixture

[svn at limb-project.com]

Author: pachanga
Date: 2007-06-09 17:31:55 +0400 (Sat, 09 Jun 2007)
New Revision: 5982
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5982

Added:
   3.x/trunk/limb/active_record/tests/cases/.fixture/init_tests.sqlite
Modified:
   3.x/trunk/limb/active_record/tests/cases/lmbActiveRecordTest.class.php
Log:
-- sqlite tests support added

Added: 3.x/trunk/limb/active_record/tests/cases/.fixture/init_tests.sqlite
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/.fixture/init_tests.sqlite	                        (rev 0)
+++ 3.x/trunk/limb/active_record/tests/cases/.fixture/init_tests.sqlite	2007-06-09 13:31:55 UTC (rev 5982)
@@ -0,0 +1,92 @@
+
+DROP TABLE "test_one_table_object";
+CREATE TABLE "test_one_table_object" (
+  "id" INTEGER PRIMARY KEY,
+  "annotation" text,
+  "content" text,
+  "news_date" date default NULL,
+  "ordr" int(11) NULL
+);
+
+DROP TABLE "test_auto_times_object";
+CREATE TABLE "test_auto_times_object" (
+  "id" INTEGER PRIMARY KEY,
+  "content" text,
+  "ctime" int(11) NULL,
+  "utime" int(11) NULL
+);
+
+DROP TABLE "test_one_table_typed_object";
+CREATE TABLE "test_one_table_typed_object" (
+  "id" INTEGER PRIMARY KEY,
+  "title" varchar(255) default NULL,
+  "kind" varchar(255) NOT NULL
+);
+
+DROP TABLE "course_for_typed_test";
+CREATE TABLE "course_for_typed_test" (
+ "id" INTEGER PRIMARY KEY,
+ "title" varchar(255) default NULL
+);
+
+DROP TABLE "lecture_for_typed_test";
+CREATE TABLE "lecture_for_typed_test" (
+  "id" INTEGER PRIMARY KEY,
+  "title" varchar(255) default NULL,
+  "course_id" bigint(20) default NULL,
+  "kind" varchar(255) NOT NULL
+);
+
+
+DROP TABLE "social_security_for_test";
+CREATE TABLE "social_security_for_test" (
+"id" INTEGER PRIMARY KEY,
+"code" varchar(255) default NULL
+);
+
+DROP TABLE "person_for_test";
+CREATE TABLE "person_for_test" (
+"id" INTEGER PRIMARY KEY,
+"name" varchar(255) default NULL,
+"ss_id" bigint(20) default NULL
+);
+
+DROP TABLE "course_for_test";
+CREATE TABLE "course_for_test" (
+ "id" INTEGER PRIMARY KEY,
+ "title" varchar(255) default NULL
+);
+
+DROP TABLE "lecture_for_test";
+CREATE TABLE "lecture_for_test" (
+  "id" INTEGER PRIMARY KEY,
+  "title" varchar(255) default NULL,
+  "course_id" bigint(20) default NULL,
+  "alt_course_id" bigint(20) default NULL
+);
+
+DROP TABLE "lesson_for_test";
+CREATE TABLE "lesson_for_test" (
+  "id" INTEGER PRIMARY KEY,
+  "date_start" bigint(20) default NULL,
+  "date_end" bigint(20) default NULL
+);
+
+DROP TABLE "group_for_test";
+CREATE TABLE "group_for_test" (
+  "id" INTEGER PRIMARY KEY,
+  "title" varchar(255) default NULL
+);
+
+DROP TABLE "user_for_test";
+CREATE TABLE "user_for_test" (
+  "id" INTEGER PRIMARY KEY,
+  "first_name" varchar(255) default NULL
+);
+
+DROP TABLE "user2group_for_test";
+CREATE TABLE "user2group_for_test" (
+ "id" INTEGER PRIMARY KEY,
+ "user_id" bigint(20) default NULL,
+ "group_id" bigint(20) default NULL
+);

Modified: 3.x/trunk/limb/active_record/tests/cases/lmbActiveRecordTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbActiveRecordTest.class.php	2007-06-09 13:31:17 UTC (rev 5981)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbActiveRecordTest.class.php	2007-06-09 13:31:55 UTC (rev 5982)
@@ -570,7 +570,9 @@
     $object2 = $this->_initActiveRecordWithDataAndSave(new TestOneTableObject());
     $object3 = $this->_initActiveRecordWithDataAndSave(new TestOneTableObject());
 
-    $rs = lmbActiveRecord :: findByIds($this->class_name, array($object1->getId(), $object3->getId()));
+    $rs = lmbActiveRecord :: findByIds($this->class_name,
+                                       array($object1->getId(), $object3->getId()),
+                                       array('sort' => array('id' => 'asc')));
     $rs->rewind();
     $this->assertEqual($object1->getId(), $rs->current()->getId());
     $rs->next();