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

Timestamp:

05/26/06 04:46:01 (6 years ago)

Author:

john

Message:

AR Bug fixes and fixed scaffold index template

Files:

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

trunk/trax/vendor/trax/active_record.php

@@ -117 +117 @@
      */
     public $database_name = null;
+    
+    /**
+     *  Index into the Trax::$active_record_connections array
+     *
+     *  Name of the index to use to return or set the current db connection
+     *  Mainly used if you want to connect to different databases between
+     *  different models.
+     *  @var string
+     */    
+    public $connection_name = TRAX_ENV;
 
     /**
@@ -134 +144 @@
      */
     public $force_reconnect = false; # should we force a connection everytime
+    
     public $index_on = "id"; # find_all returns an array of objects each object index is off of this field
+    
+    public $lock_optimistically = true; # page 222 Rails books
 
     # Table associations
@@ -316 +329 @@
     /**
      *  Transactions (only use if your db supports it)
-     *  <b>FIXME: static should be after private</b>
-     */
-    static private $begin_executed = false; # this is for transactions only to let query() know that a 'BEGIN' has been executed
-
-    /**
-     *  <b>FIXME: static should be after public</b>
-     */
-    static public $use_transactions = false; # this will issue a rollback command if any sql fails
+     */
+    private static $begin_executed = false; # this is for transactions only to let query() know that a 'BEGIN' has been executed
+
+    /**
+     *  Transactions (only use if your db supports it)
+     */
+    public static $use_transactions = false; # this will issue a rollback command if any sql fails
 
     /**
@@ -643 +655 @@
         # customers has_many contacts, then we'll need a Contact
         # object, and the customer_id field name.
-        $other_class_name = Inflector::camelize($other_object_name);
+        $other_  = Inflector::camelize($other_object_name);
         if(@array_key_exists("foreign_key", $parameters))
             $foreign_key = $parameters['foreign_key'];
@@ -800 +812 @@
      */
     function send($column) {
-        if($this->column_attribute_exists($column)) {
+        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 id='$this->id'";
+            $sql = "SELECT $column FROM $this->table_name WHERE $conditions";
             $this->log_query($sql);
             $result = self::$db->getOne($sql);
@@ -1050 +1062 @@
         $objects = array();
         while($row = $rs->fetchRow()) {
-            #$class = get_class($this);
-            $class = Inflector::classify($this->table_name);
+            $class = get_class($this);
+            #$class = Inflector::classify($this->table_name);
             $object = new $class();
             $object->new_record = false;
@@ -1329 +1341 @@
      *  @uses is_error()
      *  @uses query()
-     *  @uses quoted_attributes()
+     *  @uses get_inserts()
      *  @uses raise()
      *  @uses $table_name
@@ -1340 +1352 @@
      */
     private function add_record() {
-        $attributes = $this->quoted_attributes();
+        $attributes = $this->get_inserts();
         $fields = @implode(', ', array_keys($attributes));
         $values = @implode(', ', array_values($attributes));
@@ -1349 +1361 @@
             $this->raise($results->getMessage());
         } else {
+            $habtm_result = true;
             $this->id = $this->get_insert_id();
             if($this->id > 0) {
@@ -1391 +1404 @@
             $this->raise($results->getMessage());
         } else {
+            $habtm_result = true;
             if($this->id > 0) {
                 if($this->auto_save_habtm) {
@@ -1851 +1865 @@
         foreach ($attributes as $key => $value) {
             $value = $this->check_datetime($key, $value);
-            # If the value isn't a function or null quote it.
-            if(!(preg_match('/^\w+\(.*\)$/U', $value)) && !(strcasecmp($value, 'NULL') == 0)) {
+            # If the value isn't a function, null, or numeric quote it.
+            if(!(preg_match('/^\w+\(.*\)$/U', $value)) 
+               && !(strcasecmp($value, 'NULL') == 0) 
+               && !is_numeric($value)) {
                 $value = str_replace("\\\"","\"",$value);
                 $value = str_replace("\'","'",$value);
@@ -1863 +1879 @@
         }
         return $return;
+    }
+
+    /**
+     *  Return column values for SQL insert statement
+     *
+     *  Return an array containing the column names and values of this
+     *  object, filtering out the primary keys, which are not set.
+     *
+     *  @uses $primary_keys
+     *  @uses quoted_attributes()
+     */
+    function get_inserts() {
+        $attributes = $this->quoted_attributes();
+        $inserts = array();
+        foreach($attributes as $key => $value) {
+            if(!in_array($key, $this->primary_keys) || ($value != "''")) {
+                $inserts[$key] = $value;
+            }
+        }
+        return $inserts;
     }
 
@@ -1889 +1925 @@
             foreach($attributes as $key => $value) {
                 if(in_array($key, $this->primary_keys)) {
-                    if(!is_numeric($value) && !strstr($value, "'")) {
-                        $conditions[] = "$key = '$value'";
-                    } else {
-                        $conditions[] = "$key = $value";    
-                    }
+                    $conditions[] = "$key = $value";    
                 }
             }
@@ -2001 +2033 @@
      *  @uses $database_name
      *  @uses $force_reconnect
+     *  @uses Trax::$active_record_connections
      *  @uses is_error()
      *  @throws {@link ActiveRecordError}
      */
     function establish_connection() {
-        # Connect to the database and throw an error if the connect fails.
-        if(!is_object(Trax::$active_record_connection) || $this->force_reconnect) {
-            if(array_key_exists("use", Trax::$database_settings[TRAX_ENV])) {
-                $connection_settings = Trax::$database_settings[Trax::$database_settings[TRAX_ENV]['use']];
+        $connection = Trax::$active_record_connections[$this->connection_name];
+        if(!is_object($connection) || $this->force_reconnect) {
+            if(array_key_exists($this->connection_name, Trax::$database_settings)) {
+                 # Use a different custom sections settings ?
+                if(array_key_exists("use", Trax::$database_settings[$this->connection_name])) {
+                    $connection_settings = Trax::$database_settings[Trax::$database_settings[$this->connection_name]['use']];
+                } else {
+                    # Custom defined db settings in database.ini 
+                    $connection_settings = Trax::$database_settings[$this->connection_name];
+                }
             } else {
+                # Just use the current TRAX_ENV's environment db settings
+                # $this->connection_name's default value is TRAX_ENV so
+                # if should never really get here unless override $this->connection_name
+                # and you define a custom db section in database.ini and it can't find it.
                 $connection_settings = Trax::$database_settings[TRAX_ENV];
             }
@@ -2020 +2063 @@
                 $connection_options['persistent'] = $connection_settings['persistent'];
             }
-            Trax::$active_record_connection =& DB::Connect($connection_settings, $connection_options);
-        }
-        if(!$this->is_error(Trax::$active_record_connection)) {
-            self::$db = Trax::$active_record_connection;
+            # Connect to the database and throw an error if the connect fails.
+            $connection =& DB::Connect($connection_settings, $connection_options);
+        }
+        if(!$this->is_error($connection)) {
+            Trax::$active_record_connections[$this->connection_name] =& $connection;
+            self::$db =& $connection;
         } else {
-            $this->raise(Trax::$active_record_connection->getMessage());
+            $this->raise($connection->getMessage());
         }
         self::$db->setFetchMode($this->fetch_mode);