Changeset 2255

Timestamp:

03/09/2008 11:07:35 PM (10 months ago)

Author:

Shadowhand

Message:

Fixing #406, thanks sbeattie!

Files:

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

trunk/system/libraries/ORM.php

@@ -77 +77 @@
                         // Preloaded object
                         $this->object = $id;
+
+                        // Convert the value to the correct type
+                        $this->load_object_types();
                 }
                 else
@@ -618 +621 @@
                 }
 
+                // Convert the value to the correct type
+                $this->load_object_types();
+
                 // Reset object status
                 $this->changed = array();
@@ -673 +679 @@
                                 // Load the first result, if there is only one result
                                 $this->object = $result->current();
+
+                                // Convert the value to the correct type
+                                $this->load_object_types();
                         }
                         else
@@ -700 +709 @@
                 // Create and return the object
                 return ORM::factory(inflector::singular($table));
+        }
+
+        /**
+         * Converts the loaded object values to correct types.
+         *
+         * @return void
+         */
+        protected function load_object_types()
+        {
+                foreach (self::$fields[$this->table] as $field => $data)
+                {
+                        if (isset($this->object->$field))
+                        {
+                                if ( ! empty($data['binary']) AND ! empty($data['exact']) AND $data['length'] == 1)
+                                {
+                                        // Use boolean for an binary(1) field
+                                        $data['type'] = 'boolean';
+                                }
+
+                                switch ($data['type'])
+                                {
+                                        case 'int':
+                                                $this->object->$field = (int) $this->object->$field;
+                                        break;
+                                        case 'float':
+                                                $this->object->$field = (float) $this->object->$field;
+                                        break;
+                                        case 'boolean':
+                                                $this->object->$field = (bool) $this->object->$field;
+                                        break;
+                                }
+                        }
+                }
         }