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

[svn at limb-project.com]

Author: serega
Date: 2008-05-20 11:53:33 +0400 (Tue, 20 May 2008)
New Revision: 7030
URL: http://fisheye.limb-project.com/changelog/limb/?cs=7030

Modified:
   3.x/trunk/limb/active_record/src/lmbARRecordSetDecorator.class.php
   3.x/trunk/limb/active_record/src/lmbActiveRecord.class.php
   3.x/trunk/limb/active_record/tests/cases/lmbActiveRecordTest.class.php
Log:
-- added lmbARRecordSetDecorator :: getIds() method.

Modified: 3.x/trunk/limb/active_record/src/lmbARRecordSetDecorator.class.php
===================================================================
--- 3.x/trunk/limb/active_record/src/lmbARRecordSetDecorator.class.php	2008-05-19 09:55:50 UTC (rev 7029)
+++ 3.x/trunk/limb/active_record/src/lmbARRecordSetDecorator.class.php	2008-05-20 07:53:33 UTC (rev 7030)
@@ -62,6 +62,14 @@
 
     return self :: createObjectFromRecord($record, $this->class_path, $this->conn);
   }
+  
+  function getIds()
+  {
+    $result = array();
+    foreach($this->getArray() as $record)
+      $result[] = $record->getId();
+    return $result;
+  }
 }
 
 

Modified: 3.x/trunk/limb/active_record/src/lmbActiveRecord.class.php
===================================================================
--- 3.x/trunk/limb/active_record/src/lmbActiveRecord.class.php	2008-05-19 09:55:50 UTC (rev 7029)
+++ 3.x/trunk/limb/active_record/src/lmbActiveRecord.class.php	2008-05-20 07:53:33 UTC (rev 7030)
@@ -1879,7 +1879,7 @@
    *  @param string wrapper class name
    *  @param object database connection object
    */
-  function decorateRecordSet($rs, $class, $conn = null)
+  static function decorateRecordSet($rs, $class, $conn = null)
   {
     if(!is_object($conn))
       $conn = self :: getDefaultConnection();

Modified: 3.x/trunk/limb/active_record/tests/cases/lmbActiveRecordTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbActiveRecordTest.class.php	2008-05-19 09:55:50 UTC (rev 7029)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbActiveRecordTest.class.php	2008-05-20 07:53:33 UTC (rev 7030)
@@ -701,6 +701,8 @@
     $this->assertEqual($object1->getId(), $rs->current()->getId());
     $rs->next();
     $this->assertFalse($rs->valid());
+    
+    $this->assertEqual($rs->getIds(), array($object2->getId(), $object1->getId()));
 
     //testing convenient alias
     $rs = TestOneTableObject :: findBySql('select * from ' . lmbActiveRecord::getDefaultConnection()->quoteIdentifier("test_one_table_object") . ' order by ' . lmbActiveRecord::getDefaultConnection()->quoteIdentifier("id") . ' desc');