Changeset 294 for trunk/trax/vendor/trax

Timestamp:

05/13/08 04:11:08 (4 years ago)

Author:

john

Message:

Took out referrences to Trax in AR in prep to make it standalone

Location:

trunk/trax/vendor/trax

Files:

• active_record.php (modified) (5 diffs)
• trax.php (modified) (1 diff)

trunk/trax/vendor/trax/active_record.php

@@ -154 +154 @@
      *  @var string
      */    
-    public $connection_name = TRAX_ENV;
+    public $connection_name = null;
+
+    /**
+     * What environment to run in.
+     */
+    public static $environment = 'development';
 
     /**
@@ -2503 +2508 @@
      */
     function establish_connection() {
+        $this->set_connection_name();
         $connection =& self::$active_connections[$this->connection_name];
         if(!is_object($connection) || $this->force_reconnect) {
@@ -2516 +2522 @@
                 }
             } 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
+                # Just use the current environment's db settings
+                # $this->connection_name's default value is 'development' so
+                # if should never really get here unless you override $this->connection_name
                 # and you define a custom db section in database.ini and it can't find it.
-                $connection_settings = self::$database_settings[TRAX_ENV];
+                $connection_settings = self::$database_settings[$this->connection_name];
             }
             # Override database name if param is set
@@ -2551 +2557 @@
         }      
         return self::$db;
+    }
+
+    /**
+     *  Set the name of the database connection to use. 
+     */    
+    function set_connection_name() {
+        $connection_name = null;
+        if(!is_null($this->connection_name)) {
+            $connection_name = $this->connection_name;      
+        } else {
+            $connection_name = self::$environment ? self::$environment : 'development';
+        }  
+        $this->connection_name = $connection_name;
     }
 
@@ -3223 +3242 @@
      *  @param string SQL to be logged
      */
-    function log_query($query) {
-        if(TRAX_ENV == "development" && $query) {
+    function log_query($query) {    
+        if(self::$environment == 'development' && $query) {
             self::$query_log[] = $query;       
         }    

trunk/trax/vendor/trax/trax.php

@@ -125 +125 @@
             ActiveRecord::$database_settings = parse_ini_file(self::$config_path."/database.ini", true);
         }
+        ActiveRecord::$environment = TRAX_ENV;
 
     }