Changeset 851

Timestamp:

10/19/2007 12:19:31 AM (14 months ago)

Author:

Shadowhand

Message:

Small changes:

• Fixed a reference to num_rows in Mysql_Result
  
• Added ORM::save()
  

Location:

trunk

Files:

• modules/orm/controllers/orm.php (modified) (1 diff)
• modules/orm/libraries/ORM.php (modified) (2 diffs)
• system/libraries/drivers/Database_Mysql.php (modified) (1 diff)

trunk/modules/orm/controllers/orm.php

@@ -9 +9 @@
                 $user = new User_Model(1);
 
-                $user->first_name = 'Fred';
+                $user->first_name = 'Woody';
 
-                print "user: ".Kohana::debug_output($user->data());
+                print "user: ".Kohana::debug_output($user->save());
 
                 print Kohana::lang('core.stats_footer');

trunk/modules/orm/libraries/ORM.php

@@ -139 +139 @@
                         }
 
+                        // Reset changed variables
+                        $this->_changed = array();
+
                         if ( ! empty($this->_relationships['has_one']))
                         {
@@ -172 +175 @@
 
         /**
+         * Save an object
+         *
+         * @access public
+         * @return boolean
+         */
+        public function save()
+        {
+                if (empty($this->_where))
+                {
+                        // Do an insert
+                        if ($id = self::$db->insert($this->_table, $this->data())->insert_id())
+                        {
+                                $this->id = $id;
+                                $this->_where = array('id' => $id);
+
+                                return TRUE;
+                        }
+                }
+                elseif (empty($this->_changed))
+                {
+                        // No data has changed
+                        return TRUE;
+                }
+                else
+                {
+                        // Fetch data
+                        $data = $this->data();
+
+                        // Remove id, to prevent updates
+                        unset($data['id']);
+
+                        // Do an update
+                        if (count(self::$db->update($this->_table, $data, $this->_where)) > 0)
+                        {
+                                return TRUE;
+                        }
+                }
+
+                return FALSE;
+        }
+
+        /**
          * Return object data
          *

trunk/system/libraries/drivers/Database_Mysql.php

@@ -408 +408 @@
                         else // Its an DELETE, INSERT, REPLACE, or UPDATE query
                         {
-                                $this->insert_id = mysql_insert_id($link);
-                                $this->num_rows  = mysql_affected_rows($link);
+                                $this->insert_id  = mysql_insert_id($link);
+                                $this->total_rows = mysql_affected_rows($link);
                         }
                 }