Changeset 1665

Timestamp:

01/02/2008 05:16:56 PM (12 months ago)

Author:

Shadowhand

Message:

Reverting ORM::find back to find($id, $return = FALSE).

A couple of small optimizations added.

Files:

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

trunk/system/libraries/ORM.php

@@ -106 +106 @@
                         {
                                 // Query and load object
-                                $this->find($id, FALSE);
+                                $this->find($id);
                         }
                 }
@@ -242 +242 @@
                         }
 
-                        // Find requested objects
-                        if (isset($all)) 
-                        {
-                                // return array of results
+                        if (isset($all))
+                        {
+                                // Array of results
                                 return $this->load_result(TRUE); 
                         }
                         else
                         {
-                                $this->find(NULL, FALSE);
-                                // maintain chainability
-                                return $this;
+                                // Allow chains
+                                return $this->find();
                         }
                 }
@@ -343 +341 @@
 
                                         // Load the related object
-                                        $model->find(current($args), FALSE);
+                                        $model->find(current($args));
                                 }
                         }
@@ -465 +463 @@
          * @return  array    if ALL is used
          */
-        public function find($id = FALSE, $return = TRUE)
+        public function find($id = FALSE, $return = FALSE)
         {
                 // Allows the use of find(ALL)
@@ -646 +644 @@
         {
                 // Make sure there is something to select
-                ($this->select == FALSE) and self::$db->select($this->table.'.*');
+                $this->select or self::$db->select($this->table.'.*');
 
                 // Fetch the query result
-                $result = self::$db
-                        ->from($this->table)
-                        ->get()
-                        ->result(TRUE);
+                $result = self::$db->get($this->table)->result(TRUE);
 
                 if (count($result) > 0)
@@ -718 +713 @@
         protected function load_model($table)
         {
-                // Get model name
-                $model= ucfirst(inflector::singular($table)).'_Model';
-
-                // Create a new model
-                return new $model();
+                // Create and return the object
+                return ORM::factory(inflector::singular($table));
         }
 
@@ -755 +747 @@
         protected function related_join($table)
         {
-                $join_table = $this->related_table($table);
+                $join = $this->related_table($table);
 
                 // Primary and foreign keys
@@ -765 +757 @@
 
                 // Execute the join
-                self::$db
-                        ->where("$join_table.$primary", $this->object->id)
-                        ->join($join_table, "$join_table.$foreign = $table.id");
+                self::$db->where("$join.$primary", $this->object->id)->join($join, "$join.$foreign = $table.id");
         }