Changeset 131 for trunk/trax/vendor/trax/active_record.php

Timestamp:

02/13/06 12:15:03 (6 years ago)

Author:

john

Message:

fixed a bunch of helpers

Files:

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

trunk/trax/vendor/trax/active_record.php

@@ -83 +83 @@
     # contents from the database.
     function __get($key) {
-
         if(is_string($this->has_many)) {
             if(preg_match("/$key/", $this->has_many)) {
@@ -92 +91 @@
                 $this->$key = $this->find_all_has_many($key, $this->has_many[$key]);
             }
-        } elseif(is_string($this->has_one)) {
+        }
+        if(is_string($this->has_one)) {
             if(preg_match("/$key/", $this->has_one)) {
                 $this->$key = $this->find_one_has_one($key);
@@ -100 +100 @@
                 $this->$key = $this->find_one_has_one($key, $this->has_one[$key]);
             }
-        } elseif(is_string($this->belongs_to)) {
+        }
+        if(is_string($this->belongs_to)) { 
             if(preg_match("/$key/", $this->belongs_to)) {
                 $this->$key = $this->find_one_belongs_to($key);
@@ -108 +109 @@
                 $this->$key = $this->find_one_belongs_to($key, $this->belongs_to[$key]);
             }
-        } elseif(is_string($this->has_and_belongs_to_many)) {
+        }
+        if(is_string($this->has_and_belongs_to_many)) {
             if(preg_match("/$key/", $this->has_and_belongs_to_many)) {
                 $this->$key = $this->find_all_habtm($key);
@@ -149 +151 @@
                     $result = $this->find_all_has_many($method_name, $parameters);
                 }
-            } elseif(is_string($this->has_one)) {
+            } 
+            if(is_string($this->has_one)) {
                 if(preg_match("/$method_name/", $this->has_one)) {
                     $result = $this->find_one_has_one($method_name, $parameters);
@@ -157 +160 @@
                     $result = $this->find_one_has_one($method_name, $parameters);
                 }
-            } elseif(is_string($this->belongs_to)) {
+            } 
+            if(is_string($this->belongs_to)) {
                 if(preg_match("/$method_name/", $this->belongs_to)) {
                     $result = $this->find_one_belongs_to($method_name, $parameters);
@@ -165 +169 @@
                     $result = $this->find_one_belongs_to($method_name, $parameters);
                 }
-            } elseif(is_string($this->has_and_belongs_to_many)) {
+            } 
+            if(is_string($this->has_and_belongs_to_many)) {
                 if(preg_match("/$method_name/", $this->has_and_belongs_to_many)) {
                     $result = $this->find_all_habtm($method_name, $parameters);
@@ -175 +180 @@
             }
             # check for the [count,sum,avg,etc...]_all magic functions
-            elseif(substr($method_name, -4) == "_all" && in_array(substr($method_name, 0, -4),$this->aggregrations)) {
+            if(substr($method_name, -4) == "_all" && in_array(substr($method_name, 0, -4),$this->aggregrations)) {
                 //echo "calling method: $method_name<br>";
                 $result = $this->aggregrate_all($method_name, $parameters);
@@ -214 +219 @@
     #
     # Parameters: $this_table_name:  The name of the database table that has the
-    #                                one row you are interested in.  E.g. `genres`
+    #                                one row you are interested in.  E.g. genres
     #             $other_table_name: The name of the database table that has the
-    #                                many rows you are interested in.  E.g. `movies`
+    #                                many rows you are interested in.  E.g. movies
     # Returns: An array of ActiveRecord objects. (e.g. Movie objects)
     function find_all_habtm($other_table_name, $parameters = null) {
@@ -228 +233 @@
         $other_foreign_key = Inflector::singularize($other_table_name)."_id";
         # Set up the SQL segments
-        $conditions = "`{$join_table}`.`{$this_foreign_key}`={$this->id}";
+        $conditions = "{$join_table}.{$this_foreign_key}={$this->id}";
         $orderings = null;
         $limit = null;
-        $joins = "LEFT JOIN `{$join_table}` ON `{$other_table_name}`.id = `{$other_foreign_key}`";
+        $joins = "LEFT JOIN {$join_table} ON {$other_table_name}.id = {$other_foreign_key}";
 
         # Use any passed-in parameters
@@ -280 +285 @@
 
         $other_class_name = Inflector::classify($other_table_name);
-        $conditions = "`{$foreign_key}`=$this->id";
+        $conditions = "{$foreign_key}=$this->id";
 
         # Use any passed-in parameters
@@ -334 +339 @@
             $foreign_key = Inflector::singularize($this->table_name)."_id";
 
-        $conditions = "`$foreign_key`='{$this->id}'";
+        $conditions = "$foreign_key='{$this->id}'";
         # Instantiate an object to access find_all
         $results = new $other_class_name();
@@ -381 +386 @@
         $aggregrate_type = strtoupper(substr($aggregrate_type, 0, -4));
         ($parameters[0]) ? $field = $parameters[0] : $field = "*";
-        $sql = "SELECT $aggregrate_type($field) AS agg_result FROM `$this->table_name` ";
+        $sql = "SELECT $aggregrate_type($field) AS agg_result FROM $this->table_name ";
 
         # Use any passed-in parameters
@@ -389 +394 @@
         }
 
-        if(!empty($joins)) $sql .= ",`$joins` ";
+        if(!empty($joins)) $sql .= ",$joins ";
         if(!empty($conditions)) $sql .= "WHERE $conditions ";
 
@@ -418 +423 @@
         return null;
     }
+    
+    # checks if a column exists or not in the table
+    function column_attribute_exists($attribute) {
+        if(is_array($this->content_columns)) {
+            foreach($this->content_columns as $column) {
+                if($column['name'] == $attribute) {
+                    return true;
+                }
+            }
+        } 
+        return false;     
+    }
 
     # Returns PEAR result set of one record with only the passed in column in the result set.
     function send($column) {
-        if($column != "") {
+        if($this->column_attribute_exists($column)) {
             # Run the query to grab a specific columns value.
-            $result = self::$db->getOne("SELECT `$column` FROM `$this->table_name` WHERE id='$this->id'");
+            $result = self::$db->getOne("SELECT $column FROM $this->table_name WHERE id='$this->id'");
             if($this->is_error($result)) {
                 $this->raise($result->getMessage());
@@ -480 +497 @@
             $sql = $conditions;
         } else {
-            $sql  = "SELECT * FROM `".$this->table_name."` ";
+            $sql  = "SELECT * FROM ".$this->table_name." ";
             if(!is_null($joins)) {
                 if(substr($joins,0,4) != "LEFT") $sql .= ",";
@@ -646 +663 @@
     #   $model->update_all("category = 'cooldude', approved = 1", "author = 'John'");
     function update_all($updates, $conditions = null) {
-        $sql = "UPDATE `$this->table_name` SET $updates WHERE $conditions";
+        $sql = "UPDATE $this->table_name SET $updates WHERE $conditions";
         $result = $this->query($sql);
         if ($this->is_error($result)) {
@@ -695 +712 @@
         $fields = @implode(', ', array_keys($attributes));
         $values = @implode(', ', array_values($attributes));
-        $sql = "INSERT INTO `$this->table_name` ($fields) VALUES ($values)";
+        $sql = "INSERT INTO $this->table_name ($fields) VALUES ($values)";
         //echo "add_record: SQL: $sql<br>";
 
@@ -715 +732 @@
         $updates = $this->get_updates_sql();
         $conditions = $this->get_primary_key_conditions();
-        $sql = "UPDATE `$this->table_name` SET $updates WHERE $conditions";
+        $sql = "UPDATE $this->table_name SET $updates WHERE $conditions";
         //echo "update_record: SQL: $sql<br>";
         $result = $this->query($sql);
@@ -759 +776 @@
 
         # Delete the record(s)
-        if($this->is_error($rs = $this->query("DELETE FROM `$this->table_name` WHERE $conditions"))) {
+        if($this->is_error($rs = $this->query("DELETE FROM $this->table_name WHERE $conditions"))) {
             $this->raise($rs->getMessage());
         }
@@ -918 +935 @@
                 $return[$key] = $value;
             }
-            # quoteSmart is quoting the primary key need to fix this
-            # for now just use the above to quote fields
-            # $return[$key] = self::$db->quoteSmart($value);
+            //$return[$key] = self::$db->quoteSmart($value);
         }
         return $return;
@@ -937 +952 @@
             # run through our fields and join them with their values
             foreach($attributes as $key => $value) {
-                if(in_array($key,$this->primary_keys)) {
-                    $conditions[] = "$key = $value";
+                if(in_array($key, $this->primary_keys)) {
+                    if(!is_numeric($value) && !strstr($value, "'")) {
+                        $conditions[] = "$key = '$value'";
+                    } else {
+                        $conditions[] = "$key = $value";    
+                    }
                 }
             }