Changeset 2299

Timestamp:

03/13/2008 01:53:08 AM (8 months ago)

Author:

Shadowhand

Message:

Changes to ORM:

• Added Database::from() detection
  
• Optimized cal() for has/add/remove
  
• Other small optimizations
  

Files:

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

trunk/system/libraries/ORM.php

@@ -32 +32 @@
         protected $select = FALSE;
         protected $where = FALSE;
+        protected $from = FALSE;
 
         // Currently loaded object
@@ -233 +234 @@
                 if (preg_match('/^(has|add|remove)_(.+)/', $method, $matches))
                 {
+                        if (empty($this->object->id))
+                        {
+                                // many<>many relationships only work when the object has been saved
+                                return FALSE;
+                        }
+
                         // Make a has/add/remove call
                         return $this->call_has_add_remove($method, $args, $matches);
@@ -247 +254 @@
                                 $this->select = TRUE;
                         }
-                        elseif (preg_match('/where|like|regex/', $method))
+                        elseif (preg_match('/where|like|in|regex/', $method))
                         {
                                 $this->where = TRUE;
+                        }
+                        elseif ($method === 'from')
+                        {
+                                $this->from = TRUE;
                         }
 
@@ -703 +714 @@
                 // Reset object status
                 $this->changed = array();
-                $this->select  = FALSE;
-                $this->where   = FALSE;
+                $this->select = $this->where = $this->from = FALSE;
 
                 return $this;
@@ -738 +748 @@
                 $this->select or self::$db->select($this->table.'.*');
 
+                // Make sure there is a table to select from
+                $this->from or self::$db->from($this->table);
+
                 // Fetch the query result
-                $result = self::$db->get($this->table)->result(TRUE);
+                $result = self::$db->get()->result(TRUE);
 
                 if ($array === TRUE)
@@ -771 +784 @@
                 // Clear the changed keys, a new object has been loaded
                 $this->changed = array();
-                $this->select = FALSE;
-                $this->where = FALSE;
+                $this->select = $this->where = $this->from = FALSE;
 
                 // Return this object