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

Timestamp:

08/22/06 03:18:53 (6 years ago)

Author:

john

Message:

fixes to AR delete

Files:

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

trunk/trax/vendor/trax/active_record.php

@@ -452 +452 @@
                 $this->save_associations[$association_type][] = $value;
                 if($association_type == "belongs_to") {
-                    $foreign_key = Inflector::singularize($value->table_name)."_id";
-                    $this->$foreign_key = $value->id; 
+                    $primary_key = $value->primary_keys[0];
+                    $foreign_key = Inflector::singularize($value->table_name)."_".$primary_key;
+                    $this->$foreign_key = $value->$primary_key; 
                 }
             }
@@ -463 +464 @@
         }         
         
-    //  Assignment to something else, do it
+        //  Assignment to something else, do it
         $this->$key = $value;
     }
@@ -649 +650 @@
      */
     private function find_all_has_many($other_table_name, $parameters = null) {
-
+        $additional_conditions = null;
         # Use any passed-in parameters
         if (is_array($parameters)) {
@@ -704 +705 @@
             
             $foreign_key_value = $this->$this_primary_key;
-            $conditions = is_numeric($foreign_key_value) ? 
+            $conditions = (is_numeric($foreign_key_value) ? 
                 "$foreign_key = {$foreign_key_value}" : 
-                "$foreign_key = '{$foreign_key_value}'" . $additional_conditions; 
+                "$foreign_key = '{$foreign_key_value}'") . $additional_conditions; 
         }
                          
@@ -722 +723 @@
      */
     private function find_one_has_one($other_object_name, $parameters = null) {
-
+        
+        $additional_conditions = null;
         # Use any passed-in parameters
         if (is_array($parameters)) {
@@ -757 +759 @@
 
         $foreign_key_value = $this->$this_primary_key;
-        $conditions = is_numeric($foreign_key_value) ? 
+        $conditions = (is_numeric($foreign_key_value) ? 
             "{$foreign_key} = {$foreign_key_value}" : 
-            "{$foreign_key} = '{$foreign_key_value}'"; 
+            "{$foreign_key} = '{$foreign_key_value}'") . $additional_conditions; 
         
         # Get the list of other_class_name objects
@@ -782 +784 @@
     private function find_one_belongs_to($other_object_name, $parameters = null) {
 
+        $additional_conditions = null;
         # Use any passed-in parameters
         if (is_array($parameters)) {
             //echo "<pre>";print_r($parameters);
             if(@array_key_exists("conditions", $parameters)) {
-                $additional_conditions = $parameters['conditions'];
+                $additional_conditions = " AND (".$parameters['conditions'].")";
             } elseif($parameters[0] != "") {
-                $additional_conditions = $parameters[0];
+                $additional_conditions = " AND (".$parameters[0].")";
             }
             if(@array_key_exists("order", $parameters)) {
@@ -816 +819 @@
         
         $other_primary_key_value = $this->$foreign_key;
-        $conditions = is_numeric($other_primary_key_value) ? 
+        $conditions = (is_numeric($other_primary_key_value) ? 
             "{$other_primary_key} = {$other_primary_key_value}" : 
-            "{$other_primary_key} = '{$other_primary_key_value}'";
+            "{$other_primary_key} = '{$other_primary_key_value}'") . $additional_conditions;
         
         # Get the list of other_class_name objects
@@ -1129 +1132 @@
         $offset = null;
         $per_page = null;
+        $select = null;
 
         # this is if they passed in an associative array to emulate
@@ -1150 +1154 @@
             $sql = $conditions;
         } else {
+
+            # If select fields not specified just do a SELECT *
+            if(is_null($select)) {
+                $select = "*";
+            }
+
             # SQL will be built from specifications in argument
-            $sql  = "SELECT * FROM ".$this->table_name." ";         
+            $sql  = "SELECT {$select} FROM {$this->table_name} ";         
             
             # If join specified, include it
             if(!is_null($joins)) {
-                if(substr($joins,0,4) != "LEFT") $sql .= ",";
                 $sql .= " $joins ";
             }
@@ -1219 +1228 @@
             $object = new $class_name();
             $object->new_record = false;
+            $objects_key = null;
             foreach($row as $field => $value) {
                 $object->$field = $value;
@@ -1227 +1237 @@
             $objects[$objects_key] = $object;
             unset($object);
-            unset($objects_key);
         }
         return $objects;
@@ -1326 +1335 @@
      *  @throws {@link ActiveRecordError}
      */
-    function find_first($conditions, $order = null, $limit = null, $joins = null) {
+    function find_first($conditions = null, $order = null, $limit = null, $joins = null) {
         if(is_array($conditions)) {
             $options = $conditions;    
@@ -1542 +1551 @@
         } else {
             $habtm_result = true;
-            $this->id = $this->get_insert_id();
-            if($this->id > 0) {
+            $primary_key = $this->primary_keys[0];
+            $primary_key_value = $this->get_insert_id();
+             $this->$primary_key = $primary_key_value;
+            if($primary_key_value > 0) {
                 if($this->auto_save_habtm) {
-                    $habtm_result = $this->add_habtm_records($this->id);
+                    $habtm_result = $this->add_habtm_records($primary_key_value);
                 }
                 $this->save_associations();
@@ -1578 +1589 @@
         $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<br>";
         //error_log("update_record: SQL: $sql<br>");
         $result = $this->query($sql);
@@ -1585 +1597 @@
         } else {
             $habtm_result = true;
-            if($this->id > 0) {
+            $primary_key = $this->primary_keys[0];
+            $primary_key_value = $this->$primary_key;
+            if($primary_key_value > 0) { 
                 if($this->auto_save_habtm) {
-                    $habtm_result = $this->update_habtm_records($this->id);
+                    $habtm_result = $this->update_habtm_records($primary_key_value);
                 }
                 $this->save_associations();
@@ -1625 +1639 @@
         }
         if(is_string($this->has_one)) {
-            if(preg_match("/\b$association_name/\b", $this->has_one)) {
+            if(preg_match("/\b$association_name\b/", $this->has_one)) {
                 $type = "has_one";     
             }
@@ -1687 +1701 @@
                 case "has_many":
                 case "has_one":
-                    $foreign_key = Inflector::singularize($this->table_name)."_id";
-                    $object->$foreign_key = $this->id; 
-                    //echo "fk:$foreign_key = $this->id<br>";
+                    $primary_key = $this->primary_keys[0];
+                    $foreign_key = Inflector::singularize($this->table_name)."_".$primary_key;
+                    $object->$foreign_key = $this->$primary_key; 
+                    //echo "fk:$foreign_key = ".$this->$primary_key."<br>";
                     break;
             }
@@ -1705 +1720 @@
      */
     function delete($id = null) {
-        if($this->id > 0 && is_null($id)) {
-            $id = $this->id;
-        }
-
+
+        $primary_key_value = null;
+        $primary_key = $this->primary_keys[0];
         if(is_null($id)) {
-            $this->errors[] = "No id specified to delete on.";
+            # Primary key's where clause from already loaded values
+            $conditions = $this->get_primary_key_conditions();
+            $primary_key_value = $this->$primary_key;
+        } elseif(!is_array($id)) { 
+            $primary_key_value = $id;         
+            $id = is_numeric($id) ? $id : "'".$id."'";
+            $conditions = "{$primary_key} = $id";
+        } elseif(is_array($id)) {
+            //$ids = ($this->attribute_is_string($primary_key)) ? "'".implode("','", $id)."'" : implode(',', $id);
+            //$conditions = "{$primary_key} IN ($ids)";
+        }
+
+        if(is_null($conditions)) {
+            $this->errors[] = "No conditions specified to delete on.";
             return false;
         }
 
-        $this->before_delete();
-        $result = $this->delete_all("id IN ($id)");
-        if($this->auto_delete_habtm) {
+        $this->before_delete(); 
+        $result = $this->delete_all($conditions);
+        if($this->auto_delete_habtm && $primary_key_value != '') {
             if(is_string($this->has_and_belongs_to_many)) {
                 $habtms = explode(",", $this->has_and_belongs_to_many);
                 foreach($habtms as $other_table_name) {
-                    $this->delete_all_habtm_records(trim($other_table_name), $id);                             
+                    $this->delete_all_habtm_records(trim($other_table_name), $primary_key_value);                             
                 }
             } elseif(is_array($this->has_and_belongs_to_many)) {
                 foreach($this->has_and_belongs_to_many as $other_table_name => $values) {
-                    $this->delete_all_habtm_records($other_table_name, $id);                             
+                    $this->delete_all_habtm_records($other_table_name, $primary_key_value);                             
                 }
             } 
@@ -1778 +1805 @@
                 if(is_array($habtm_array)) {
                     if(is_string($this->has_and_belongs_to_many)) {
-                        if(preg_match("/$key/", $this->has_and_belongs_to_many)) {
+                        if(preg_match("/\b$key\b/", $this->has_and_belongs_to_many)) {
                             $this->habtm_attributes[$key] = $habtm_array;
                         }
@@ -1969 +1996 @@
                     $this->save_associations[$association_type][] = $value;
                     if($association_type == "belongs_to") {
-                        $foreign_key = Inflector::singularize($value->table_name)."_id";
-                        $this->$foreign_key = $value->id; 
+                        $primary_key = $value->primary_keys[0];
+                        $foreign_key = Inflector::singularize($value->table_name)."_".$primary_key;
+                        $this->$foreign_key = $value->$primary_key; 
                     }
                 }
@@ -2130 +2158 @@
             # run through our fields and join them with their values
             foreach($attributes as $key => $value) {
-                if($key && $value && !in_array($key, $this->primary_keys)) {
+                if($key && ($value || is_numeric($value)) && !in_array($key, $this->primary_keys)) {
                     $updates[] = "$key = $value";
                 }