Changeset 334

Timestamp:

04/19/10 04:22:07 (22 months ago)

Author:

john

Message:

added unset() and isset() to ActiveRecord?

Files:

• trunk/trax/vendor/trax/active_record.php (modified) (6 diffs)

trunk/trax/vendor/trax/active_record.php

@@ -108 +108 @@
      *  @see __get()
      *  @see __set()
+     *  @see __unset()
+     *  @see __isset()  
      */ 
     private $attributes = array();
@@ -578 +580 @@
         }
 
-        # initialize the internal attributes array to all nulls
-        $this->reset_attributes();
-
         # If $attributes array is passed in update the class with its contents
         if(!is_null($attributes)) {
@@ -612 +611 @@
             return $this->attributes[$key];
         } elseif($association_type = $this->get_association_type($key)) {
-            error_log("get key:$key association_type:$association_type");
+            #error_log("get key:$key association_type:$association_type");
             switch($association_type) {
                 case "has_many":
@@ -675 +674 @@
         //echo "setting: $key = $value<br>";
         if(array_key_exists($key, (array)$this->content_columns)) {
-            if(array_key_exists($key, $this->attributes)) {
-                if(array_key_exists($key, $this->changed_attributes)) {
-                    if($this->changed_attributes[$key]['original'] != $value) {
-                        $this->changed_attributes[$key]['modified'] = $value;
-                    } else {
-                        unset($this->changed_attributes[$key]);
-                    }   
+            if(array_key_exists($key, $this->changed_attributes)) {
+                if($this->changed_attributes[$key]['original'] != $value) {
+                    $this->changed_attributes[$key]['modified'] = $value;
                 } else {
-                    $this->changed_attributes[$key] = array(
-                        'original' => $this->attributes[$key], 
-                        'modified' => $value
-                    );
-                }               
-            }
+                    unset($this->changed_attributes[$key]);
+                }   
+            } else {
+                $this->changed_attributes[$key] = array(
+                    'original' => $this->attributes[$key], 
+                    'modified' => $value
+                );
+            }               
             $this->attributes[$key] = $value;
             return;
@@ -712 +709 @@
         //  Assignment to something else, do it
         $this->$key = $value;
+    }
+
+    /**
+     *  Unsets an attribute or class member 
+     *
+     *  @uses $attributes
+     */
+    function __unset($key) {
+        //echo "Unsetting '$key'\n";
+        if(array_key_exists($key, $this->attributes)) {
+            unset($this->attributes[$key]);
+        } else {
+            unset($this->$key);
+        }
+    }
+
+    /**
+     *  Checks if an attribute or class member is set
+     *
+     *  @uses $attributes
+     */
+    function __isset($key) {
+        //echo "Is '$key' set?\n";
+        if(array_key_exists($key, $this->attributes)) {
+            return isset($this->attributes[$key]);
+        } else {
+            return isset($this->$key);
+        }
     }
 
@@ -2838 +2863 @@
         }
     }
-
-    /**
-     *  Resets the attributes array to keys of the columns from the database
-     *  and sets all the values to null
-     *
-     *  @uses $content_columns
-     *  @uses $attributes
-     */
-    function reset_attributes() {
-        if(is_array($this->content_columns)) {
-            $this->attributes = array();
-            #error_log("resetting attributes to null");
-            foreach($this->content_columns as $column_name => $column) {
-                $this->attributes[$column_name] = null;
-            }
-        }       
-    }
 
     /**