Changeset 2300

Timestamp:

03/13/2008 02:05:10 AM (10 months ago)

Author:

Shadowhand

Message:

Using $query->count() instead of count($query) for a bit more optimization.

Files:

• trunk/system/libraries/ORM.php (modified) (5 diffs)

trunk/system/libraries/ORM.php

@@ -498 +498 @@
                                 {
                                         // Find the many<>many relationship
-                                        return (bool) count
-                                        (
-                                                self::$db
+                                        return (bool) self::$db
                                                 ->select($primary)
                                                 ->from($this->related_table($table))
                                                 ->where($relationship)
                                                 ->limit(1)
-                                                ->get()
-                                        );
+                                                ->get()->count();
                                 }
 
@@ -515 +512 @@
                                 {
                                         // Attempt to delete the many<>many relationship
-                                        return (bool) count(self::$db->delete($this->related_table($table), $relationship));
+                                        return (bool) self::$db->delete($this->related_table($table), $relationship)->count();
                                 }
                                 elseif ($model->$primary === $this->object->id)
@@ -613 +610 @@
                         $query = self::$db->insert($this->table, $data);
 
-                        if (count($query) === 1)
+                        if ($query->count() === 1)
                         {
                                 // Set current object id by the insert id
@@ -625 +622 @@
                 }
 
-                if (count($query) === 1)
+                if ($query->count() === 1)
                 {
                         // Reset changed data
@@ -676 +673 @@
 
                 // Return the number of rows deleted
-                return count(self::$db->delete($this->table, $where));
+                return self::$db->delete($this->table, $where)->count();
         }