Changeset 273 for trunk/trax/vendor

Timestamp:

01/21/07 21:58:59 (5 years ago)

Author:

john

Message:

added schema_search_path to AR for postgres schemas

Files:

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

trunk/trax/vendor/trax/active_record.php

@@ -80 +80 @@
      *  <p>Retrieved from the RDBMS by {@link set_content_columns()}.
      *  See {@link 
-     *  http://pear.php.net/manual/en/package.database.db.db-common.tableinfo.php
+     *  http://pear.php.net/package/MDB2/docs/2.3.0/MDB2/MDB2_Driver_Reverse_Common.html#methodtableInfo
      *  DB_common::tableInfo()} for the format.  <b>NOTE:</b> Some
      *  RDBMS's don't return all values.</p>
@@ -164 +164 @@
      * Stores the active connections. Indexed on $connection_name.
      */
-    public static $active_connections = array();
+    protected static $active_connections = array();
 
     /**
@@ -170 +170 @@
      *
      *  See {@link
-     *  http://pear.php.net/manual/en/package.database.db.db-common.setfetchmode.php
-     *  the relevant PEAR DB class documentation}
+     *  http://pear.php.net/package/MDB2/docs/2.3.0/MDB2/MDB2_Driver_Common.html#methodsetFetchMode
+     *  the relevant PEAR MDB2 class documentation}
      *  @var integer
      */
@@ -241 +241 @@
     
     /**
-     *  @todo Document this property
+     *  Whether or not to auto save defined associations if set
      *  @var boolean
      */
-    public $auto_save_associations = true; # where or not to auto save defined associations if set
+    public $auto_save_associations = true;
 
     /**
@@ -342 +342 @@
 
     /**
-     *  @todo Document this variable
-     */
-    public $display = 10; # Pagination how many numbers in the list << < 1 2 3 4 > >>
+     *  Pagination how many numbers in the list << < 1 2 3 4 > >>
+     */
+    public $display = 10;
 
     /**
@@ -401 +401 @@
         'validates_uniqueness_of'
     );
-    
-    /**
-     * An array of all the builtin validation function to validate on a save/create/update.
-     */      
-    public $builtins_to_validate = array();
 
     /**
@@ -417 +412 @@
 
     /**
-     *  @todo Document this variable
-     */
-    public $auto_save_habtm = true; # auto insert / update $has_and_belongs_to_many tables
-
-    /**
-     *  @todo Document this variable
+     *  Auto insert / update $has_and_belongs_to_many tables
+     */
+    public $auto_save_habtm = true;
+
+    /**
+     *  Auto delete $has_and_belongs_to_many associations
      */    
-    public $auto_delete_habtm = true; # auto delete $has_and_belongs_to_many associations
+    public $auto_delete_habtm = true; 
 
     /**
      *  Transactions (only use if your db supports it)
-     */
-    private static $begin_executed = false; # this is for transactions only to let query() know that a 'BEGIN' has been executed
+     *  This is for transactions only to let query() know that a 'BEGIN' has been executed
+     */
+    private static $begin_executed = false;
 
     /**
      *  Transactions (only use if your db supports it)
-     */
-    public static $use_transactions = false; # this will issue a rollback command if any sql fails
+     *  This will issue a rollback command if any sql fails.
+     */
+    public static $use_transactions = false; 
     
     /**
@@ -2533 +2530 @@
             $connection =& MDB2::Connect($connection_settings, $connection_options);
             //static $connect_cnt;  $connect_cnt++; error_log("connection #".$connect_cnt);
+            
+            # For Postgres schemas (http://www.postgresql.org/docs/8.0/interactive/ddl-schemas.html)
+            if(isset($connection_settings['schema_search_path'])){
+                if(!$this->is_error($connection)) {
+                    # Set the schema search path to a string of comma-separated schema names.
+                    # First strip out all the whitespace
+                    self::$connection->query('SET search_path TO '.preg_replace('/\s+/', '', $connection_settings['schema_search_path']));
+                }
+            } 
         }
         if(!$this->is_error($connection)) {
             self::$active_connections[$this->connection_name] =& $connection;
             self::$db =& $connection;
+            self::$db->setFetchMode($this->fetch_mode);
         } else {
             $this->raise($connection->getMessage());
-        }
-        self::$db->setFetchMode($this->fetch_mode);
+        }      
         return self::$db;
     }