Changeset 3417

Timestamp:

09/07/2008 09:17:16 AM (2 months ago)

Author:

Geert

Message:

A few fixes and optimizations for the ORM library.

Files:

• trunk/system/classes/orm.php (modified) (5 diffs)

trunk/system/classes/orm.php

@@ -198 +198 @@
                                 // We use switch here to manually call the database methods. This is
                                 // done for speed: call_user_func_array can take over 300% longer to
-                                // make calls. Mose database methods are 4 arguments or less, so this
+                                // make calls. Most database methods are 4 arguments or less, so this
                                 // avoids almost any calls to call_user_func_array.
 
@@ -814 +814 @@
                         {
                                 // Remove LIMIT from the SQL
-                                $sql = preg_replace('/\bLIMIT\s+[^a-z]+/i', '', $sql);
+                                $sql = preg_replace('/\sLIMIT\s+[^a-z]+/i', ' ', $sql);
                         }
 
@@ -820 +820 @@
                         {
                                 // Remove OFFSET from the SQL
-                                $sql = preg_replace('/\bOFFSET\s+\d+/i', '', $sql);
+                                $sql = preg_replace('/\sOFFSET\s+\d+/i', '', $sql);
                         }
 
@@ -830 +830 @@
                         );
 
-                        if ($result->count())
-                        {
-                                // Return the total number of rows from the query
-                                return (int) $result->current()->total_rows;
-                        }
+                        // Return the total number of rows from the query
+                        return (int) $result->current()->total_rows;
                 }
 
@@ -991 +988 @@
                 {
                         case 'int':
-                                $value = ($value === '' AND ! empty($data['null'])) ? NULL : (int) $value;
+                                $value = ($value === '' AND ! empty($column['null'])) ? NULL : (int) $value;
                         break;
                         case 'float':