Changeset 2268

Timestamp:

03/10/2008 09:11:45 AM (9 months ago)

Author:

Shadowhand

Message:

Fixing broken ORM, thanks alexsancho and zeelot.

Files:

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

trunk/system/libraries/ORM.php

@@ -219 +219 @@
                 }
 
-                if (substr($method, 0, 8) === 'find_by_' OR ($all = substr($method, 0, 12)) === 'find_all_by_')
-                {
-                        $method = isset($all) ? substr($method, 12) : substr($method, 8);
-
+                if (substr($method, 0, 8) === 'find_by_' OR substr($method, 0, 12) === 'find_all_by_')
+                {
                         // Make a find_by call
                         return $this->call_find_by($method, $args);
@@ -230 +228 @@
                 {
                         // Make a find_related call
-                        return $this->call_find_related(substr($method, 13));
+                        return $this->call_find_related($method, $args);
                 }
 
                 if (preg_match('/^(has|add|remove)_(.+)/', $method, $matches))
                 {
-                        $action = $matches[1];
-                        $model  = is_object(current($args)) ? current($args) : $this->load_model($matches[2]);
-
                         // Make a has/add/remove call
-                        return $this->call_has_add_remove($action, $model);
+                        return $this->call_has_add_remove($method, $args, $matches);
                 }
 
@@ -278 +273 @@
          * __call: find_by_*, find_all_by_*
          *
-         * @param   string  column names to find by
+         * @param   string  method
          * @param   array   arguments
          * @return  object
@@ -284 +279 @@
         protected function call_find_by($method, $args)
         {
+                // Use ALL
+                $ALL = (substr($method, 0, 12) === 'find_all_by_');
+
+                // Method args
+                $method = $ALL ? substr($method, 12) : substr($method, 8);
+
                 // WHERE is manually set
                 $this->where = TRUE;
@@ -319 +320 @@
                 }
 
-                if (isset($all))
+                if ($ALL)
                 {
                         // Array of results
@@ -334 +335 @@
          * __call: find_related_*
          *
-         * @param   string  table name
+         * @param   string   method name
+         * @param   array    arguments
          * @return  object
          */
-        protected function call_find_related($table)
-        {
+        protected function call_find_related($method, $args)
+        {
+                // Extract table name
+                $table = substr($method, 13)
+
                 // Construct a new model
                 $model = $this->load_model($table);
@@ -388 +393 @@
          * __call: has_*, add_*, remove_*
          *
-         * @param   string   action: has, add, remove
-         * @param   object   model
+         * @param   string   method
+         * @param   array    arguments
+         * @param   array    action matches
          * @return  boolean
          */
-        protected function call_has_add_remove($action, $model)
-        {
+        protected function call_has_add_remove($method, $args, $matches)
+        {
+                $action = $matches[1];
+                $model  = is_object(current($args)) ? current($args) : $this->load_model($matches[2]);
+
                 // Real foreign table name
                 $table = $model->table_name;
@@ -907 +916 @@
         public function __construct($class, $result)
         {
+                // Class name
                 $this->class = $class;
+
+                // Database result
                 $this->result = $result;
         }
@@ -936 +948 @@
         public function range($start, $end)
         {
+                // Array of objects
                 $array = array();
 
@@ -948 +961 @@
                         for ($i = $start; $i < $end; $i++)
                         {
+                                // Insert each object in the range
                                 $array[] = new $class($this->result->offsetGet($i));
                         }
@@ -971 +985 @@
                 $class = $this->class;
 
-                return $this->result->offsetExists(0) ? new $class($this->result->offsetGet(0)) : FALSE;
+                return ($row = $this->result->current()) ? new $class($row) : FALSE;
         }