cvs: pear /MDB common.php mysql.php pgsql.php

lsmith          Fri Sep 27 06:12:53 2002 EDT

  Modified files:              
    /pear/MDB   common.php mysql.php pgsql.php 
  Log:
  - fixed some issues with option passing
  - cosmetic changes
  
  
Index: pear/MDB/common.php
diff -u pear/MDB/common.php:1.59 pear/MDB/common.php:1.60
--- pear/MDB/common.php:1.59    Sat Sep  7 10:42:24 2002
+++ pear/MDB/common.php Fri Sep 27 06:12:52 2002
@@ -42,7 +42,7 @@
 // | Author: Lukas Smith <smith@xxxxxxxxx>                                |
 // +----------------------------------------------------------------------+
 //
-// $Id: common.php,v 1.59 2002/09/07 14:42:24 lsmith Exp $
+// $Id: common.php,v 1.60 2002/09/27 10:12:52 lsmith Exp $
 
 require_once 'PEAR.php';
 
@@ -112,46 +112,55 @@
  * @author Lukas Smith <smith@xxxxxxxxx>
  */
 
-class MDB_common extends PEAR {
+class MDB_common extends PEAR
+{
     var $database = 0;
+    var $persistent = 1;
+
     var $host = '';
     var $user = '';
     var $password = '';
-    var $supported = array();
-    var $persistent = 1;
     var $database_name = '';
-    var $warnings = array();
-    var $affected_rows = -1;
-    var $auto_commit = 1;
-    var $prepared_queries = array();
-    var $first_selected_row = 0;
-    var $selected_row_limit = 0;
-    var $last_query = '';
+
+    var $supported = array();
     var $options = array(
             'persistent' => FALSE,
             'debug' => FALSE,
-            'seqname_format' => '%s_seq',
             'autofree' => FALSE,
             'lob_buffer_length' => 8000,
             'log_line_break' => "\n",
-            'escape_quotes' => '',
-            'decimal_places' => 2
         );
-    var $lobs = array();
-    var $clobs = array();
-    var $blobs = array();
-    var $in_transaction = 0;
-    var $error_handler = '';
-    var $manager;
+    var $escape_quotes = '';
+    var $decimal_places = 2;
+
     var $include_path = '';
     var $manager_included_constant = '';
     var $manager_include = '';
     var $manager_class_name = '';
-    var $last_error = '';
+    var $manager;
+
+    var $warnings = array();
     var $debug = '';
     var $debug_output = '';
     var $pass_debug_handle = FALSE;
 
+    var $auto_commit = 1;
+    var $in_transaction = 0;
+
+    var $first_selected_row = 0;
+    var $selected_row_limit = 0;
+    var $last_query = '';
+    var $affected_rows = -1;
+    var $prepared_queries = array();
+
+    var $lobs = array();
+    var $clobs = array();
+    var $blobs = array();
+
+    // deprecated
+    var $last_error = '';
+    var $error_handler = '';
+
     // }}}
     // {{{ constructor
 
@@ -185,6 +194,9 @@
         if (isset($options['includemanager'])) {
             $this->loadManager('load at start');
         }
+        if (isset($options['debug'])) {
+            $this->captureDebugOutput(TRUE);
+        }
         if (is_array($options)) {
             $this->options = array_merge($this->options, $options);
         }
@@ -446,10 +458,11 @@
     {
         $this->last_error = $message;
         $this->debug($scope . ': ' . $message);
-        if (strcmp($function = $this->error_handler, '')) {
-            $error = array('Scope' => $scope,
+        if (($function = $this->error_handler) != '') {
+            $error = array(
+                'Scope' => $scope,
                 'Message' => $message
-                );
+            );
             $function($this, $error);
         }
         return (0);
Index: pear/MDB/mysql.php
diff -u pear/MDB/mysql.php:1.51 pear/MDB/mysql.php:1.52
--- pear/MDB/mysql.php:1.51     Mon Sep 23 11:09:09 2002
+++ pear/MDB/mysql.php  Fri Sep 27 06:12:52 2002
@@ -42,7 +42,7 @@
 // | Author: Lukas Smith <smith@xxxxxxxxx>                                |
 // +----------------------------------------------------------------------+
 //
-// $Id: mysql.php,v 1.51 2002/09/23 15:09:09 pgc Exp $
+// $Id: mysql.php,v 1.52 2002/09/27 10:12:52 lsmith Exp $
 //
 
 if (!defined('MDB_MYSQL_INCLUDED')) {
@@ -65,16 +65,21 @@
     var $connected_password;
     var $connected_port;
     var $opened_persistent = '';
-    var $decimal_factor = 1.0;
-    var $highest_fetched_row = array();
-    var $columns = array();
-    var $fixed_float = 0;
+
     var $escape_quotes = "\\";
-    var $dummy_primary_key = 'dummy_primary_key';
+    var $decimal_factor = 1.0;
+
     var $manager_class_name = 'MDB_manager_mysql_class';
     var $manager_include = 'manager_mysql.php';
     var $manager_included_constant = 'MDB_MANAGER_MYSQL_INCLUDED';
+
+    var $highest_fetched_row = array();
+    var $columns = array();
+
+    // MySQL specific class variable
     var $default_table_type = '';
+    var $fixed_float = 0;
+    var $dummy_primary_key = 'dummy_primary_key';
 
     // }}}
     // {{{ constructor
@@ -84,6 +89,7 @@
     */
     function MDB_driver_mysql($dsninfo = NULL, $options = NULL)
     {
+        $options = array_merge(array('seqname_format' => '%s_seq',), $options);
         if(MDB::isError($common_contructor = $this->MDB_common($dsninfo, 
$options))) {
             return $common_contructor;
         }
@@ -132,7 +138,7 @@
             }
         }
         
-        $this->decimal_factor = pow(10.0, $this->options['decimal_places']);
+        $this->decimal_factor = pow(10.0, $this->decimal_places);
         
         $this->errorcode_map = array(
             1004 => MDB_ERROR_CANNOT_CREATE,
@@ -776,7 +782,7 @@
             case MDB_TYPE_BOOLEAN:
                 return (strcmp($value, 'Y') ? 0 : 1);
             case MDB_TYPE_DECIMAL:
-                return (sprintf('%.'.$this->options['decimal_places'].'f', 
doubleval($value)/$this->decimal_factor));
+                return (sprintf('%.'.$this->decimal_places.'f', 
doubleval($value)/$this->decimal_factor));
             case MDB_TYPE_FLOAT:
                 return (doubleval($value));
             case MDB_TYPE_DATE:
Index: pear/MDB/pgsql.php
diff -u pear/MDB/pgsql.php:1.39 pear/MDB/pgsql.php:1.40
--- pear/MDB/pgsql.php:1.39     Mon Sep 23 10:29:01 2002
+++ pear/MDB/pgsql.php  Fri Sep 27 06:12:53 2002
@@ -42,7 +42,7 @@
 // | Author: Paul Cooper <pgc@xxxxxxxxxx>                                 |
 // +----------------------------------------------------------------------+
 //
-// $Id: pgsql.php,v 1.39 2002/09/23 14:29:01 pgc Exp $
+// $Id: pgsql.php,v 1.40 2002/09/27 10:12:53 lsmith Exp $
 
 if (!defined('MDB_PGSQL_INCLUDED')) {
     define('MDB_PGSQL_INCLUDED', 1);
@@ -56,21 +56,24 @@
 * @author  Paul Cooper <pgc@xxxxxxxxxx>
 */
 
-class MDB_driver_pgsql extends MDB_common {
+class MDB_driver_pgsql extends MDB_common
+{
     var $connection = 0;
     var $connected_host;
     var $connected_port;
     var $selected_database = '';
     var $opened_persistent = '';
-    var $transaction_started = 0;
+
+    var $escape_quotes = "\\";
     var $decimal_factor = 1.0;
-    var $highest_fetchd_row = array();
-    var $columns = array();
-    var $escape_quotes = '\\';
+
     var $manager_class_name = 'MDB_manager_pgsql_class';
     var $manager_include = 'manager_pgsql.php';
     var $manager_included_constant = 'MDB_MANAGER_PGSQL_INCLUDED';
 
+    var $highest_fetchd_row = array();
+    var $columns = array();
+
     // }}}
     // {{{ constructor
 
@@ -99,7 +102,7 @@
         $this->supported['Replace'] = 1;
         $this->supported['SubSelects'] = 1;
         
-        $this->decimal_factor = pow(10.0, $this->options['decimal_places']);
+        $this->decimal_factor = pow(10.0, $this->decimal_places);
         
         if (function_exists('pg_cmdTuples')) {
             $connection = $this->_doConnect('template1', 0);
@@ -1148,7 +1151,7 @@
             case MDB_TYPE_BOOLEAN:
                 return (strcmp($value, 'Y') ? 0 : 1);
             case MDB_TYPE_DECIMAL:
-                return 
(sprintf('%.'.$this->options['decimal_places'].'f',doubleval($value)/$this->decimal_factor));
+                return 
(sprintf('%.'.$this->decimal_places.'f',doubleval($value)/$this->decimal_factor));
             case MDB_TYPE_FLOAT:
                 return doubleval($value);
             case MDB_TYPE_DATE:



-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php