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

Timestamp:

01/11/06 16:00:15 (6 years ago)

Author:

john

Message:

added to AR database_name and force_reconnect vars

Files:

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

trunk/trax/vendor/trax/active_record.php

@@ -28 +28 @@
 class ActiveRecord {
 
-    static private $db = null;              # Reference to Pear db object
-    static protected $inflector = null;     # object to do class inflection
-    public $content_columns = null;         # info about each column in the table
-    public $table_name = null;
+    static private $db = null; # Reference to Pear db object
+    static protected $inflector = null; # object to do class inflection
+    public $content_columns = null; # info about each column in the table
+    public $table_name = null; # if you want to override table name set this in your model
+    public $database_name = null; # if you want to override database name set this in your model
     public $fetch_mode = DB_FETCHMODE_ASSOC;
+    public $force_reconnect = false; # should we force a connection everytime
 
     # Table associations
@@ -994 +996 @@
     function establish_connection() {
         # Connect to the database and throw an error if the connect fails.
-        if(!is_object($GLOBALS['ACTIVE_RECORD_DB'])) {
+        if(!is_object($GLOBALS['ACTIVE_RECORD_DB']) || $this->force_reconnect) {
             if(array_key_exists("use", $GLOBALS['TRAX_DB_SETTINGS'][TRAX_MODE])) {
                 $connection_settings = $GLOBALS['TRAX_DB_SETTINGS'][$GLOBALS['TRAX_DB_SETTINGS'][TRAX_MODE]['use']];
@@ -1000 +1002 @@
                 $connection_settings = $GLOBALS['TRAX_DB_SETTINGS'][TRAX_MODE];
             }
+            # Override database name if param is set
+            if($this->database_name) {
+                $connection_settings['database'] = $this->database_name;               
+            }            
             # Set optional Pear parameters
             if(isset($connection_settings['persistent'])) {