Changeset 250 for trunk/trax/vendor

Timestamp:

08/25/06 09:56:48 (6 years ago)

Author:

john

Message:

Converted AR to use MDB2 - DB is now deprecated

Location:

trunk/trax/vendor/trax

Files:

• action_view/helpers/active_record_helper.php (modified) (1 diff)
• active_record.php (modified) (21 diffs)

trunk/trax/vendor/trax/action_view/helpers/active_record_helper.php

@@ -466 +466 @@
      *  @uses attribute_name
      *  @uses object()
-     *  @uses ActiveRecord::column_for_attribute()
+     *  @uses ActiveRecord::column_type()
      */
     function column_type() {
-        $column = $this->object()->column_for_attribute($this->attribute_name);
-        return $column['type'];
+        return $this->object()->column_type($this->attribute_name);
     }
     

trunk/trax/vendor/trax/active_record.php

@@ -35 +35 @@
 
 /**
- *  Load the {@link http://pear.php.net/manual/en/package.database.db.php PEAR DB package}
+ *  Load the {@link http://pear.php.net/manual/en/package.database.mdb2.php PEAR MDB2 package}
+ *  PEAR::DB is now deprecated.
+ *  (This package(DB) been superseded by MDB2 but is still maintained for bugs and security fixes)
  */
-require_once('DB.php');
+require_once('MDB2.php');
 
 /**
@@ -66 +68 @@
      *
      *  Reference to the database object returned by
-     *  {@link http://pear.php.net/manual/en/package.database.db.db.connect.php  PEAR DB::Connect()}
+     *  {@link http://pear.php.net/manual/en/package.database.mdb2.intro-connect.php  PEAR MDB2::Connect()}
      *  @var object DB
      *  see
-     *  {@link http://pear.php.net/manual/en/package.database.db.php PEAR DB}
+     *  {@link http://pear.php.net/manual/en/package.database.mdb2.php PEAR MDB2}
      */
     private static $db = null;
@@ -154 +156 @@
      *  @var integer
      */
-    public $fetch_mode = DB_FETCHMODE_ASSOC;
+    public $fetch_mode = MDB2_FETCHMODE_ASSOC;
 
     /**
@@ -951 +953 @@
         return null;
     }
+
+   /**
+    *  get the columns  data type.
+    *  @uses column_for_attribute()
+    *  @todo Document this API
+    */    
+    function column_type($attribute) {
+        $column = $this->column_for_attribute($attribute);
+        if(isset($column['type'])) {
+            return $column['type'];    
+        }            
+        return null;
+    }
     
     /**
@@ -989 +1004 @@
             $sql = "SELECT {$column} FROM {$this->table_name} WHERE {$conditions}";
             $this->log_query($sql);
-            $result = self::$db->getOne($sql);
+            $result = self::$db->queryOne($sql);
             if($this->is_error($result)) {
                 $this->raise($result->getMessage());
@@ -1033 +1048 @@
      *
      *  @param string $sql  SQL for the query command
-     *  @return DB_result {@link http://pear.php.net/manual/en/package.database.db.db-result.php}
+     *  @return $mdb2->query {@link http://pear.php.net/manual/en/package.database.mdb2.intro-query.php}
      *    Result set from query
      *  @uses $db
@@ -1043 +1058 @@
         # Run the query
         $this->log_query($sql);
-        $rs = self::$db->query($sql);
+        $rs =& self::$db->query($sql);
         if ($this->is_error($rs)) {
             if(self::$use_transactions && self::$begin_executed) {
@@ -1581 +1596 @@
      */
     private function add_record() {
+        self::$db->loadModule('Extended', null, true);                
+        # $primary_key_value may either be a quoted integer or php null
+        $primary_key_value = self::$db->getBeforeID($this->table_name, $this->primary_keys[0]);
+        if($this->is_error($primary_key_value)) {
+            $this->raise($primary_key_value->getMessage());
+        }
+
         $attributes = $this->get_inserts();
         $fields = @implode(', ', array_keys($attributes));
         $values = @implode(', ', array_values($attributes));
-        $sql = "INSERT INTO $this->table_name ($fields) VALUES ($values)";
+        $sql = "INSERT INTO {$this->table_name} ($fields) VALUES ($values)";
         //echo "add_record: SQL: $sql<br>";
+        error_log("add_record: SQL: $sql");
         $result = $this->query($sql);
+        
         if($this->is_error($result)) {
             $this->raise($results->getMessage());
@@ -1592 +1616 @@
             $habtm_result = true;
             $primary_key = $this->primary_keys[0];
-            $primary_key_value = $this->get_insert_id();
-             $this->$primary_key = $primary_key_value;
+            # $id is now equivalent to the value in the id field that was inserted
+            $primary_key_value = self::$db->getAfterID($primary_key_value, $this->table_name, $this->primary_keys[0]);
+            if($this->is_error($primary_key_value)) {
+                $this->raise($primary_key_value->getMessage());
+            }            
+            $this->$primary_key = $primary_key_value;
             if($primary_key_value != '') {
                 if($this->auto_save_habtm) {
@@ -1631 +1659 @@
         $sql = "UPDATE {$this->table_name} SET {$updates} WHERE {$conditions}";
         //echo "update_record:$sql<br>";
-        //error_log("update_record: SQL: $sql<br>");
+        error_log("update_record: SQL: $sql");
         $result = $this->query($sql);
         if($this->is_error($result)) {
@@ -1962 +1990 @@
                                 return date($format);
                             } elseif($this->preserve_null_dates && is_null($value) && !stristr($field_info['flags'], "not_null")) {
-                                return 'NULL';    
+                                return null;    
                             }
                         } elseif(!$this->new_record) {
@@ -1968 +1996 @@
                                 return date($format);
                             } elseif($this->preserve_null_dates && is_null($value) && !stristr($field_info['flags'], "not_null")) {
-                                return 'NULL';    
+                                return null;    
                             }
                         }
@@ -2114 +2142 @@
         }
         $return = array();
-        foreach ($attributes as $key => $value) {
+        foreach($attributes as $key => $value) {
             $value = $this->check_datetime($key, $value);
-            # If the value isn't a function, null, or numeric quote it.
-            if(!(preg_match('/^\w+\(.*\)$/U', $value)) 
-               && !(strcasecmp($value, 'NULL') == 0) 
-               && $this->attribute_is_string($key)) {
-               //&& !is_numeric($value)) {
-                $value = str_replace("\\\"","\"", $value);
-                $value = str_replace("\'","'", $value);
-                $value = str_replace("\\\\","\\", $value);
-                $return[$key] = "'" . addslashes($value) . "'";
-            } else {
-                $return[$key] = $value;
-            }
-            //$return[$key] = $this->$db->quoteSmart($value);
+            $type = $this->attribute_is_string($key) ? "Text" : "Integer";
+            $return[$key] = self::$db->quote($value, $type);
         }
         return $return;
@@ -2255 +2272 @@
      */
     function set_content_columns($table_name) {
-        $this->content_columns = self::$db->tableInfo($table_name);
+        self::$db->loadModule('Reverse', null, true);
+        $this->content_columns = self::$db->reverse->tableInfo($table_name);
         if($this->is_error($this->content_columns)) {
             $this->raise($this->content_columns->getMessage());        
@@ -2276 +2294 @@
      */
     function get_insert_id() {
-        $id = self::$db->getOne("SELECT LAST_INSERT_ID();");
-        if ($this->is_error($id)) {
-            $this->raise($id->getMessage());
-        }
-        return $id;
+        // fetch the last inserted id via autoincrement or current value of a sequence
+        if(self::$db->supports('auto_increment') === true) {
+            $id = self::$db->lastInsertID($this->table_name, $this->primary_keys[0]);   
+            if($this->is_error($id)) {
+                $this->raise($id->getMessage());
+            } 
+            return $id;                
+        }
+
+        return null;
     }
 
@@ -2308 +2331 @@
      */
     function establish_connection() {
-        $connection = Trax::$active_record_connections[$this->connection_name];
+        $connection =& Trax::$active_record_connections[$this->connection_name];
         if(!is_object($connection) || $this->force_reconnect) {
             if(array_key_exists($this->connection_name, Trax::$database_settings)) {
@@ -2334 +2357 @@
             }
             # Connect to the database and throw an error if the connect fails.
-            $connection =& DB::Connect($connection_settings, $connection_options);
+            $connection =& MDB2::Connect($connection_settings, $connection_options);
+            //static $connect_cnt;  $connect_cnt++; error_log("connection #".$connect_cnt);
         }
         if(!$this->is_error($connection)) {
@@ -2347 +2371 @@
 
     /**
-     *  Test whether argument is a PEAR Error object or a DB Error object.
+     *  Test whether argument is a PEAR Error object or a MDB2 Error object.
      *
      *  @param object $obj Object to test
@@ -2353 +2377 @@
      */
     function is_error($obj) {
-        if((PEAR::isError($obj)) || (DB::isError($obj))) {
+        if((PEAR::isError($obj)) || (MDB2::isError($obj))) {
             return true;
         } else {
@@ -2431 +2455 @@
      */    
     function attribute_is_string($attribute) {
-        $column = $this->column_for_attribute($attribute);
-        switch($column['type']) {
+        $column_type = $this->column_type($attribute);
+        switch($column_type) {
             case 'string':
             case 'varchar':
@@ -2438 +2462 @@
             case 'text':
             case 'blob':
+            case 'clob':
             case 'date':
+            case 'time':
             case 'datetime':
             case 'timestamp':