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

Timestamp:

05/25/06 02:58:10 (6 years ago)

Author:

john

Message:

Major changes to environment added boot.php and Trax class to hold framwork config

Files:

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

trunk/trax/vendor/trax/active_record.php

@@ -2006 +2006 @@
     function establish_connection() {
         # Connect to the database and throw an error if the connect fails.
-      if(!array_key_exists('ACTIVE_RECORD_DB',$GLOBALS)
-     || !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']];
+        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']];
             } else {
-                $connection_settings = $GLOBALS['TRAX_DB_SETTINGS'][TRAX_MODE];
+                $connection_settings = Trax::$database_settings[TRAX_ENV];
             }
             # Override database name if param is set
@@ -2020 +2018 @@
             # Set optional Pear parameters
             if(isset($connection_settings['persistent'])) {
-                $connection_options['persistent'] =
-                    $connection_settings['persistent'];
-            }
-            $GLOBALS['ACTIVE_RECORD_DB'] =& DB::Connect($connection_settings, $connection_options);
-        }
-        if(!$this->is_error($GLOBALS['ACTIVE_RECORD_DB'])) {
-            self::$db = $GLOBALS['ACTIVE_RECORD_DB'];
+                $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;
         } else {
-            $this->raise($GLOBALS['ACTIVE_RECORD_DB']->getMessage());
+            $this->raise(Trax::$active_record_connection->getMessage());
         }
         self::$db->setFetchMode($this->fetch_mode);
@@ -2325 +2322 @@
      */
     function log_query($sql) {
-        if(TRAX_MODE == "development" && $sql) {
+        if(TRAX_ENV == "development" && $sql) {
             $GLOBALS['ACTIVE_RECORD_SQL_LOG'][] = $sql;       
         }