Changeset 249 for trunk/trax/vendor/trax

Timestamp:

08/24/06 13:18:40 (6 years ago)

Author:

john

Message:

fixed some logic errors with determining field types

Location:

trunk/trax/vendor/trax

Files:

• active_record.php (modified) (11 diffs)
• templates/error.phtml (modified) (1 diff)

trunk/trax/vendor/trax/active_record.php

@@ -370 +370 @@
      */
     public static $use_transactions = false; # this will issue a rollback command if any sql fails
+    
+    /**
+     *  Keep a log of queries executed if in development env
+     */    
+    public static $query_log = array();
 
     /**
@@ -635 +640 @@
             
             # Primary key value
-            $this_primary_key_value = $this->attribute_is_string($this_primary_key) ? 
-                "'".$this->$this_primary_key."'" : 
-                $this->$this_primary_key;
+            if($this->attribute_is_string($this_primary_key)) {
+                $this_primary_key_value = "'".$this->$this_primary_key."'";                    
+            } elseif(is_numeric($this->$this_primary_key)) {
+                $this_primary_key_value = $this->$this_primary_key;
+            } else {
+                $this_primary_key_value = 0;
+            }
 
             # Set up the SQL segments
@@ -712 +721 @@
             
             $foreign_key_value = $this->$this_primary_key;
-            $conditions = ($other_class_object->attribute_is_string($foreign_key) ? 
-                "$foreign_key = '{$foreign_key_value}'" : 
-                "$foreign_key = {$foreign_key_value}") . $additional_conditions; 
+            if($other_class_object->attribute_is_string($foreign_key)) {
+                $conditions = "{$foreign_key} = '{$foreign_key_value}'";                    
+            } elseif(is_numeric($foreign_key_value)) {
+                $conditions = "{$foreign_key} = {$foreign_key_value}";
+            } else {
+                $conditions = "{$foreign_key} = 0";
+            }            
+            $conditions .= $additional_conditions; 
         }
                          
@@ -765 +779 @@
 
         $foreign_key_value = $this->$this_primary_key;
-        $conditions = ($other_class_object->attribute_is_string($foreign_key) ? 
-            "{$foreign_key} = '{$foreign_key_value}'" : 
-            "{$foreign_key} = {$foreign_key_value}") . $additional_conditions; 
+        if($other_class_object->attribute_is_string($foreign_key)) {
+            $conditions = "{$foreign_key} = '{$foreign_key_value}'";                    
+        } elseif(is_numeric($foreign_key_value)) {
+            $conditions = "{$foreign_key} = {$foreign_key_value}";
+        } else {
+            $conditions = "{$foreign_key} = 0";
+        }
+
+        $conditions .= $additional_conditions; 
         
         # Get the list of other_class_name objects
@@ -822 +842 @@
         
         $other_primary_key_value = $this->$foreign_key;
-        $conditions = ($other_class_object->attribute_is_string($other_primary_key) ? 
-            "{$other_primary_key} = '{$other_primary_key_value}'" : 
-            "{$other_primary_key} = {$other_primary_key_value}") . $additional_conditions;
+        if($other_class_object->attribute_is_string($other_primary_key)) {
+            $conditions = "{$other_primary_key} = '{$other_primary_key_value}'";                    
+        } elseif(is_numeric($other_primary_key_value)) {
+            $conditions = "{$other_primary_key} = {$other_primary_key_value}";
+        } else {
+            $conditions = "{$other_primary_key} = 0";
+        }
+        $conditions .= $additional_conditions;
         
         # Get the list of other_class_name objects
@@ -962 +987 @@
         if($this->column_attribute_exists($column) && ($conditions = $this->get_primary_key_conditions())) {
             # Run the query to grab a specific columns value.
-            $sql = "SELECT $column FROM $this->table_name WHERE $conditions";
+            $sql = "SELECT {$column} FROM {$this->table_name} WHERE {$conditions}";
             $this->log_query($sql);
             $result = self::$db->getOne($sql);
@@ -2095 +2120 @@
                && !(strcasecmp($value, 'NULL') == 0) 
                && $this->attribute_is_string($key)) {
+               //&& !is_numeric($value)) {
                 $value = str_replace("\\\"","\"", $value);
                 $value = str_replace("\'","'", $value);
@@ -2120 +2146 @@
         $inserts = array();
         foreach($attributes as $key => $value) {
-            if(!in_array($key, $this->primary_keys) || ($value != "''")) {
+            if(!in_array($key, $this->primary_keys) || ($value != "''" && isset($value))) {
                 $inserts[$key] = $value;
             }
@@ -2150 +2176 @@
             # run through our fields and join them with their values
             foreach($attributes as $key => $value) {
-                if(in_array($key, $this->primary_keys)) {
+                if(in_array($key, $this->primary_keys) && isset($value) && $value != "''") {
                     $conditions[] = "$key = $value";    
                 }
@@ -2356 +2382 @@
      */
     function add_error($error, $key = null) {
-        if(!is_null($key)) 
+        if(!is_null($key)) {
             $this->errors[$key] = $error;
-        else
+        } else {
             $this->errors[] = $error;
+        }
     }
 
@@ -2628 +2655 @@
      *  Log SQL query in development mode
      *
-     *  If running in development mode, log the query to $GLOBAL
+     *  If running in development mode, log the query to self::$query_log
      *  @param string SQL to be logged
      */
-    function log_query($sql) {
-        if(TRAX_ENV == "development" && $sql) {
-            $GLOBALS['ACTIVE_RECORD_SQL_LOG'][] = $sql;       
+    function log_query($query) {
+        if(TRAX_ENV == "development" && $query) {
+            self::$query_log[] = $query;       
         }    
     }

trunk/trax/vendor/trax/templates/error.phtml

@@ -49 +49 @@
 <?php endif; ?>
 
-<?php if(array_key_exists('ACTIVE_RECORD_SQL_LOG',$GLOBALS)
-     && count($GLOBALS['ACTIVE_RECORD_SQL_LOG'])): ?>
+<?php if(count(ActiveRecord::$query_log)): ?>
 <p><a href="#" onclick="expandContract('sql_trace')">Show SQL trace</a>
 <pre id="sql_trace" style="display:none">
 <code style="word-wrap: break-word;">
 <?php $i = 0 ?>    
-<?php foreach(array_reverse($GLOBALS['ACTIVE_RECORD_SQL_LOG']) as $sql): ?>
-#<?php echo $i++ ?> <?php echo trim($sql) ?>
+<?php foreach(array_reverse(ActiveRecord::$query_log) as $query): ?>
+#<?php echo $i++ ?> <?php echo $query."\n" ?>
 <?php endforeach; ?>        
 </code>