Changeset 251 for trunk

Timestamp:

08/26/06 10:27:55 (6 years ago)

Author:

john

Message:

move database_settings[] and active_connections[] to AR out of Trax class to make AR more generic for standalone version

Location:

trunk/trax/vendor/trax

Files:

• active_record.php (modified) (7 diffs)
• trax.php (modified) (3 diffs)

trunk/trax/vendor/trax/active_record.php

@@ -139 +139 @@
     
     /**
-     *  Index into the Trax::$active_record_connections array
+     *  Index into the $active_connections array
      *
      *  Name of the index to use to return or set the current db connection
@@ -147 +147 @@
      */    
     public $connection_name = TRAX_ENV;
+
+    /**
+     * Stores the database settings
+     */
+    public static $database_settings = array();
+    
+    /**
+     * Stores the active connections
+     */
+    public static $active_connections = array();
 
     /**
@@ -1267 +1277 @@
         
                 # Set number of total pages in result set  
-                if($count = $this->count_all("*", $conditions, $joins)) {
+                if($count = $this->count_all($this->primary_keys[0], $conditions, $joins)) {
                     $this->pagination_count = $count;
                     $this->pages = (
@@ -2310 +2320 @@
      *
      *  The name of the database normally comes from
-     *  Trax::$database_settings which is set in {@link
+     *  $database_settings which is set in {@link
      *  environment.php} by reading file config/database.ini. The
      *  database name may be overridden by assigning a different name
@@ -2316 +2326 @@
      *  
      *  If there is a connection now open, as indicated by the saved
-     *  value of a DB object in Trax::$active_record_connections[$connection_name], and
+     *  value of a MDB2 object in $active_connections[$connection_name], and
      *  {@link force_reconnect} is not true, then set the database
      *  fetch mode and return.
      *
      *  If there is no connection, open one and save a reference to
-     *  it in Trax::$active_record_connections[$connection_name].
+     *  it in $active_connections[$connection_name].
      *
      *  @uses $db
      *  @uses $database_name
      *  @uses $force_reconnect
-     *  @uses Trax::$active_record_connections
+     *  @uses $active_connections
      *  @uses is_error()
      *  @throws {@link ActiveRecordError}
      */
     function establish_connection() {
-        $connection =& Trax::$active_record_connections[$this->connection_name];
+        $connection =& self::$active_connections[$this->connection_name];
         if(!is_object($connection) || $this->force_reconnect) {
-            if(array_key_exists($this->connection_name, Trax::$database_settings)) {
+            if(array_key_exists($this->connection_name, self::$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']];
+                if(array_key_exists("use", self::$database_settings[$this->connection_name])) {
+                    $connection_settings = self::$database_settings[self::$database_settings[$this->connection_name]['use']];
                 } else {
                     # Custom defined db settings in database.ini 
-                    $connection_settings = Trax::$database_settings[$this->connection_name];
+                    $connection_settings = self::$database_settings[$this->connection_name];
                 }
             } else {
@@ -2346 +2356 @@
                 # 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];
+                $connection_settings = self::$database_settings[TRAX_ENV];
             }
             # Override database name if param is set
@@ -2361 +2371 @@
         }
         if(!$this->is_error($connection)) {
-            Trax::$active_record_connections[$this->connection_name] =& $connection;
+            self::$active_connections[$this->connection_name] =& $connection;
             self::$db =& $connection;
         } else {

trunk/trax/vendor/trax/trax.php

@@ -48 +48 @@
         $vendor_path = null,
         $public_path = null,
-        $database_settings = array(), 
         $url_prefix = null,
         $views_extension = 'phtml',
         $path_seperator = ":", # default is Unix
-        $active_record_connections = array(),
         $current_controller_path = null,
         $current_controller_name = null,
@@ -92 +90 @@
             ini_set("display_errors", "Off");
         }
-        
-        # Make sure database settings are cleared out
-        self::$database_settings = array();
-        if(file_exists(self::$config_path."/database.ini")) {
-            # Load databse settings 
-            self::$database_settings = parse_ini_file(self::$config_path."/database.ini",true);
-        }
-        
+                
         # Set the include_path
         ini_set("include_path",
@@ -119 +110 @@
         include_once("dispatcher.php");
         include_once("router.php");
+
+        # Make sure database settings are cleared out
+        ActiveRecord::$database_settings = array();
+        if(file_exists(self::$config_path."/database.ini")) {
+            # Load databse settings 
+            ActiveRecord::$database_settings = parse_ini_file(self::$config_path."/database.ini", true);
+        }
                    
     }