Changeset 1255 for trunk/system/libraries/ORM.php

Timestamp:

11/24/2007 07:11:57 PM (12 months ago)

Author:

Shadowhand

Message:

Changes to core:

• Added system/controllers/template.php, for auto-rendering templates
  
• Updated ORM with some new syntax, adding select() and where(), and optimizing find()
  

These changes may break things in ORM that currently work, more testing is required.

Files:

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

trunk/system/libraries/ORM.php

@@ -20 +20 @@
         protected $table;
 
-        // This object
+        // SQL building status
+        protected $select = FALSE;
+        protected $where = FALSE;
+
+        // Currently loaded object
         protected $object;
 
@@ -26 +30 @@
         protected $changed = array();
 
-        // Relationships
+        // Object Relationships
         protected $has_one = array();
         protected $has_many = array();
@@ -46 +50 @@
                         // Insert db into this object
                         self::$db = Kohana::instance()->db;
-                }
-
-                // Define ALL
-                defined('ALL') or define('ALL', 100);
+
+                        // Define ALL
+                        defined('ALL') or define('ALL', 100);
+                }
 
                 // Fetch table name
@@ -71 +75 @@
                 else
                 {
-                        // Load the object
-                        $this->find($id);
+                        if (empty($id))
+                        {
+                                // Load an empty object
+                                $this->load_result(array());
+                        }
+                        else
+                        {
+                                // Query and load object
+                                $this->where($id);
+                                $this->find();
+                        }
                 }
         }
@@ -159 +172 @@
                         $model = $this->load_model($table);
 
-                        if (in_array($table, $this->has_and_belongs_to_many))
-                        {
-                                // Execute joins for many<>many
+                        if (in_array($table, $this->has_one))
+                        {
+                                // Find one<>one relationships
+                                $model->find(array($this->class.'_id' => $this->object->id));
+                                return $model;
+                        }
+                        elseif (in_array($table, $this->has_many))
+                        {
+                                // Find one<>many relationships
+                                self::$db->where($this->class.'_id', $this->object->id);
+                        }
+                        elseif (in_array($table, $this->has_and_belongs_to_many))
+                        {
+                                // Find many<>many relationships, via a JOIN
                                 $this->related_join($table);
-                        }
-                        else
-                        {
-                                // Add this object id to WHERE
-                                self::$db->where($this->class.'_id', $this->object->id);
                         }
 
@@ -276 +295 @@
 
         /**
+         * Select 
+         */
+        public function select()
+        {
+                // Return all the objects in the table
+                if (func_num_args() === 0)
+                {
+                        self::$db->select($this->table.'.*');
+                }
+                else
+                {
+                        $args = func_get_args();
+
+                        if (count($args) === 1)
+                        {
+                                self::$db->select(current($args));
+                        }
+                        else
+                        {
+                                self::$db->select($args);
+                        }
+                }
+
+                // SELECT has been set
+                $this->select = TRUE;
+
+                return $this;
+        }
+
+        /**
+         * Method: where
+         *  Generate a WHERE array.
+         */
+        public function where()
+        {
+                switch(func_num_args())
+                {
+                        case 1:
+                                $id = func_get_arg(0);
+                                if ( ! empty($id))
+                                {
+                                        self::$db->where(is_array($id) ? $id : array('id' => $id));
+
+                                        // WHERE has been set
+                                        $this->where = TRUE;
+                                }
+                        break;
+                        case 2:
+                                $key = func_get_arg(0);
+                                $val = func_get_arg(1);
+
+                                if (is_array($key))
+                                {
+                                        // Choose the OR method to use
+                                        $or = (strpos($val, '%') === FALSE) ? 'orwhere' : 'orlike';
+
+                                        foreach ($key as $k)
+                                        {
+                                                // Use OR WHERE/LIKE
+                                                self::$db->$or($k, $val);
+                                        }
+                                }
+                                else
+                                {
+                                        self::$db->where(array($key => $val));
+                                }
+
+                                // WHERE has been set
+                                $this->where = TRUE;
+                        break;
+                }
+
+                return $this;
+        }
+
+        /**
          * Method: find
          *  Find and load this object data.
@@ -287 +382 @@
          *  Array of objects if where is an array
          */
-        public function find($where = FALSE, $limit = 1)
-        {
-                if ($limit === ALL OR is_array($where) OR $where = $this->where($where))
-                {
-                        // Use limit
-                        ($limit === ALL) or self::$db->limit($limit);
-
-                        // Use where
-                        empty($where) or self::$db->where($where);
-
-                        $query = self::$db
-                                ->select($this->table.'.*')
-                                ->from($this->table)
-                                ->get();
-
-                        if ($limit > 1)
-                        {
-                                $model = get_class($this);
-
-                                // Construct an array of objects
-                                $objects = array();
-                                foreach($query as $result)
-                                {
-                                        $objects[] = new $model($result);
-                                }
-                                return $objects;
-                        }
-
-                        if (count($query) === 1)
-                        {
-                                // Fetch the first result
-                                $this->object = $query->current();
-                        }
-                }
-
-                if (empty($this->object))
-                {
-                        // Create a new object
-                        $this->object = new StdClass();
-
-                        // Fill the fields
-                        foreach(self::$fields[$this->table] as $field)
-                        {
-                                $this->object->$field = '';
-                        }
-                }
-
-                // Reset changed
-                $this->changed = array();
-
-                // Return true if something was actually loaded
-                return ($this->object->id != 0);
+        public function find($limit = 1, $offset = FALSE)
+        {
+                // SELECT
+                ($this->select == FALSE) and $this->select();
+                // WHERE
+                ($this->where == FALSE) and $this->where();
+                // LIMIT
+                ($limit !== ALL) and self::$db->limit($limit, $offset);
+
+                // Perform the query
+                $query = self::$db
+                        ->from($this->table)
+                        ->get();
+
+                // Load the query result
+                return $this->load_result($query);
         }
 
@@ -421 +480 @@
 
         /**
-         * Method: where
-         *  Generate a WHERE array.
+         * Loads a database object result.
          *
          * Parameters:
-         *  id - id or array of id's
-         *
-         * Returns:
-         *  FALSE or Array
-         */
-        protected function where($id)
-        {
-                if (empty($id))
-                        return FALSE;
-
-                if (is_array($id))
-                        return $id;
-
-                if (ctype_digit((string) $id))
-                        return array('id' => $id);
+         *  result - database result object
+         *
+         * Return:
+         *  boolean - TRUE for single result, FALSE for an empty result
+         *  array   - Multiple row result set
+         */
+        protected function load_result($result)
+        {
+                if (count($result) > 0)
+                {
+                        if (count($result) > 1)
+                        {
+                                // Model class name
+                                $class = get_class($this);
+
+                                $array = array();
+                                foreach($result as $row)
+                                {
+                                        // Add object to the array
+                                        $array[] = new $class($row);
+                                }
+
+                                // Return an array of all the objects
+                                return $array;
+                        }
+                        else
+                        {
+                                // Clear the changed keys, a new object has been loaded
+                                $this->changed = array();
+
+                                // Fetch the first result
+                                $this->object = $result->current();
+                        }
+                }
+                else
+                {
+                        // Create an empty object
+                        $this->object = new StdClass();
+
+                        // Empty the object
+                        foreach(self::$fields[$this->table] as $field)
+                        {
+                                $this->object->$field = '';
+                        }
+                }
+
+                // Return this object
+                return $this;
         }