diff options
41 files changed, 37 insertions, 275 deletions
diff --git a/drivers/adodb-access.inc.php b/drivers/adodb-access.inc.php index d1017df4..08f40371 100644 --- a/drivers/adodb-access.inc.php +++ b/drivers/adodb-access.inc.php @@ -81,11 +81,6 @@ class ADORecordSet_access extends ADORecordSet_odbc { var $databaseType = "access"; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } - } // class } diff --git a/drivers/adodb-ado_access.inc.php b/drivers/adodb-ado_access.inc.php index 7480cd16..9f158e5d 100644 --- a/drivers/adodb-ado_access.inc.php +++ b/drivers/adodb-ado_access.inc.php @@ -43,8 +43,4 @@ class ADORecordSet_ado_access extends ADORecordSet_ado { var $databaseType = "ado_access"; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-ado_mssql.inc.php b/drivers/adodb-ado_mssql.inc.php index b378b672..6ac16726 100644 --- a/drivers/adodb-ado_mssql.inc.php +++ b/drivers/adodb-ado_mssql.inc.php @@ -143,8 +143,4 @@ class ADORecordSet_ado_mssql extends ADORecordSet_ado { var $databaseType = 'ado_mssql'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-borland_ibase.inc.php b/drivers/adodb-borland_ibase.inc.php index 65823068..83e12c12 100644 --- a/drivers/adodb-borland_ibase.inc.php +++ b/drivers/adodb-borland_ibase.inc.php @@ -80,8 +80,4 @@ class ADORecordSet_borland_ibase extends ADORecordSet_ibase { var $databaseType = "borland_ibase"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-csv.inc.php b/drivers/adodb-csv.inc.php index 36ec1f1c..0d68388f 100644 --- a/drivers/adodb-csv.inc.php +++ b/drivers/adodb-csv.inc.php @@ -38,10 +38,6 @@ class ADODB_csv extends ADOConnection { var $hasTransactions = false; var $_errorNo = false; - function __construct() - { - } - function _insertid() { return $this->_insertid; @@ -193,10 +189,6 @@ class ADODB_csv extends ADOConnection { } // class class ADORecordset_csv extends ADORecordset { - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } function _close() { diff --git a/drivers/adodb-db2oci.inc.php b/drivers/adodb-db2oci.inc.php index 3b515a1c..24cb0b28 100644 --- a/drivers/adodb-db2oci.inc.php +++ b/drivers/adodb-db2oci.inc.php @@ -187,10 +187,6 @@ class ADORecordSet_db2oci extends ADORecordSet_db2 { var $databaseType = "db2oci"; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } } //define diff --git a/drivers/adodb-db2ora.inc.php b/drivers/adodb-db2ora.inc.php index 1af44726..559dfa2f 100644 --- a/drivers/adodb-db2ora.inc.php +++ b/drivers/adodb-db2ora.inc.php @@ -66,10 +66,6 @@ class ADORecordSet_db2oci extends ADORecordSet_odbc { var $databaseType = "db2oci"; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } } //define diff --git a/drivers/adodb-fbsql.inc.php b/drivers/adodb-fbsql.inc.php index a21c59d4..009946d2 100644 --- a/drivers/adodb-fbsql.inc.php +++ b/drivers/adodb-fbsql.inc.php @@ -25,10 +25,6 @@ class ADODB_fbsql extends ADOConnection { var $fmtTimeStamp = "'Y-m-d H:i:s'"; var $hasLimit = false; - function __construct() - { - } - function _insertid() { return fbsql_insert_id($this->_connectionID); diff --git a/drivers/adodb-firebird.inc.php b/drivers/adodb-firebird.inc.php index 8d3c4075..a7bea8d1 100644 --- a/drivers/adodb-firebird.inc.php +++ b/drivers/adodb-firebird.inc.php @@ -66,8 +66,4 @@ class ADORecordSet_firebird extends ADORecordSet_ibase { var $databaseType = "firebird"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-informix.inc.php b/drivers/adodb-informix.inc.php index 5aee23ea..92a8ef5f 100644 --- a/drivers/adodb-informix.inc.php +++ b/drivers/adodb-informix.inc.php @@ -33,9 +33,4 @@ class ADODB_informix extends ADODB_informix72 { class ADORecordset_informix extends ADORecordset_informix72 { var $databaseType = "informix"; - - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-ldap.inc.php b/drivers/adodb-ldap.inc.php index 43fc5aef..00df5d3c 100644 --- a/drivers/adodb-ldap.inc.php +++ b/drivers/adodb-ldap.inc.php @@ -45,10 +45,6 @@ class ADODB_ldap extends ADOConnection { # error on binding, eg. "Binding: invalid credentials" var $_bind_errmsg = "Binding: %s"; - function __construct() - { - } - // returns true or false function _connect( $host, $username, $password, $ldapbase) diff --git a/drivers/adodb-mssql.inc.php b/drivers/adodb-mssql.inc.php index b2fcfa8b..865395cb 100644 --- a/drivers/adodb-mssql.inc.php +++ b/drivers/adodb-mssql.inc.php @@ -1070,12 +1070,8 @@ class ADORecordset_mssql extends ADORecordSet { class ADORecordSet_array_mssql extends ADORecordSet_array { - function __construct($id=-1,$mode=false) - { - parent::__construct($id,$mode); - } - // mssql uses a default date like Dec 30 2000 12:00AM + // mssql uses a default date like Dec 30 2000 12:00AM static function UnixDate($v) { diff --git a/drivers/adodb-mssql_n.inc.php b/drivers/adodb-mssql_n.inc.php index c9163b5f..95e0d71c 100644 --- a/drivers/adodb-mssql_n.inc.php +++ b/drivers/adodb-mssql_n.inc.php @@ -70,12 +70,12 @@ class ADODB_mssql_n extends ADODB_mssql { * and ODBTP) keeping SQL compatibility at ADOdb level (instead of hacking every project to add * the "N" notation when working against MSSQL. * - * The orginal note indicated that this hack should only be used if ALL the char-based columns + * The orginal note indicated that this hack should only be used if ALL the char-based columns * in your DB are of type nchar, nvarchar and ntext, but testing seems to indicate that SQL server * doesn't seem to care if the statement is used against char etc fields. * * @todo This function should raise an ADOdb error if one of the transformations fail - * + * * @param mixed $inboundData Either a string containing an SQL statement * or an array with resources from prepared statements * @@ -84,22 +84,22 @@ class ADODB_mssql_n extends ADODB_mssql { function _appendN($inboundData) { $inboundIsArray = false; - + if (is_array($inboundData)) { $inboundIsArray = true; $inboundArray = $inboundData; } else $inboundArray = (array)$inboundData; - + /* * All changes will be placed here */ $outboundArray = $inboundArray; - + foreach($inboundArray as $inboundKey=>$inboundValue) { - + if (is_resource($inboundValue)) { /* @@ -110,7 +110,7 @@ class ADODB_mssql_n extends ADODB_mssql { continue; } - + if (strpos($inboundValue, SINGLEQUOTE) === false) { /* @@ -125,11 +125,11 @@ class ADODB_mssql_n extends ADODB_mssql { * Check we haven't an odd number of single quotes (this can cause problems below * and should be considered one wrong SQL). Exit with debug info. */ - if ((substr_count($inboundValue, SINGLEQUOTE) & 1)) + if ((substr_count($inboundValue, SINGLEQUOTE) & 1)) { if ($this->debug) ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Wrong number of quotes (odd)"); - + break; } @@ -140,9 +140,9 @@ class ADODB_mssql_n extends ADODB_mssql { $regexp = '/(\\\\' . SINGLEQUOTE . '[^' . SINGLEQUOTE . '])/'; if (preg_match($regexp, $inboundValue)) { - if ($this->debug) + if ($this->debug) ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Found bad use of backslash + single quote"); - + break; } @@ -152,16 +152,16 @@ class ADODB_mssql_n extends ADODB_mssql { $pairs = array(); $regexp = '/(' . SINGLEQUOTE . SINGLEQUOTE . ')/'; preg_match_all($regexp, $inboundValue, $list_of_pairs); - + if ($list_of_pairs) { foreach (array_unique($list_of_pairs[0]) as $key=>$value) $pairs['<@#@#@PAIR-'.$key.'@#@#@>'] = $value; - - + + if (!empty($pairs)) $inboundValue = str_replace($pairs, array_keys($pairs), $inboundValue); - + } /* @@ -170,13 +170,13 @@ class ADODB_mssql_n extends ADODB_mssql { $literals = array(); $regexp = '/(N?' . SINGLEQUOTE . '.*?' . SINGLEQUOTE . ')/is'; preg_match_all($regexp, $inboundValue, $list_of_literals); - + if ($list_of_literals) { foreach (array_unique($list_of_literals[0]) as $key=>$value) $literals['<#@#@#LITERAL-'.$key.'#@#@#>'] = $value; - - + + if (!empty($literals)) $inboundValue = str_replace($literals, array_keys($literals), $inboundValue); } @@ -189,11 +189,11 @@ class ADODB_mssql_n extends ADODB_mssql { foreach ($literals as $key=>$value) { if (!is_numeric(trim($value, SINGLEQUOTE))) /* - * Non numeric string, prepend our dear N, whilst + * Non numeric string, prepend our dear N, whilst * Trimming potentially existing previous "N" */ - $literals[$key] = 'N' . trim($value, 'N'); - + $literals[$key] = 'N' . trim($value, 'N'); + } } @@ -202,7 +202,7 @@ class ADODB_mssql_n extends ADODB_mssql { */ if (!empty($literals)) $inboundValue = str_replace(array_keys($literals), $literals, $inboundValue); - + /* * Any pairs followed by N' must be switched to N' followed by those pairs @@ -215,40 +215,36 @@ class ADODB_mssql_n extends ADODB_mssql { */ if (!empty($pairs)) $inboundValue = str_replace(array_keys($pairs), $pairs, $inboundValue); - + /* * Print transformation if debug = on */ if (strcmp($inboundValue,$inboundArray[$inboundKey]) <> 0 && $this->debug) ADOConnection::outp("{$this->databaseType} internal transformation: {$inboundArray[$inboundKey]} to {$inboundValue}"); - + if (strcmp($inboundValue,$inboundArray[$inboundKey]) <> 0) /* * Place the transformed value into the outbound array */ $outboundArray[$inboundKey] = $inboundValue; } - + /* * Any transformations are in the $outboundArray */ if ($inboundIsArray) return $outboundArray; - + /* * We passed a string in originally */ return $outboundArray[0]; - + } } class ADORecordset_mssql_n extends ADORecordset_mssql { var $databaseType = "mssql_n"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php index f6e5e242..3cf8c060 100644 --- a/drivers/adodb-mssqlnative.inc.php +++ b/drivers/adodb-mssqlnative.inc.php @@ -482,10 +482,10 @@ class ADODB_mssqlnative extends ADOConnection { $connectionInfo["Database"]=$argDatabasename; $connectionInfo["UID"]=$argUsername; $connectionInfo["PWD"]=$argPassword; - + foreach ($this->connectionParameters as $parameter=>$value) $connectionInfo[$parameter] = $value; - + if ($this->debug) ADOConnection::outp("<hr>connecting... hostname: $argHostname params: ".var_export($connectionInfo,true)); //if ($this->debug) ADOConnection::outp("<hr>_connectionID before: ".serialize($this->_connectionID)); if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) { @@ -1093,12 +1093,8 @@ class ADORecordset_mssqlnative extends ADORecordSet { class ADORecordSet_array_mssqlnative extends ADORecordSet_array { - function __construct($id=-1,$mode=false) - { - parent::__construct($id,$mode); - } - // mssql uses a default date like Dec 30 2000 12:00AM + // mssql uses a default date like Dec 30 2000 12:00AM static function UnixDate($v) { diff --git a/drivers/adodb-mssqlpo.inc.php b/drivers/adodb-mssqlpo.inc.php index ade8d065..105a1751 100644 --- a/drivers/adodb-mssqlpo.inc.php +++ b/drivers/adodb-mssqlpo.inc.php @@ -51,8 +51,4 @@ class ADODB_mssqlpo extends ADODB_mssql { class ADORecordset_mssqlpo extends ADORecordset_mssql { var $databaseType = "mssqlpo"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-mysql.inc.php b/drivers/adodb-mysql.inc.php index cac6ccc1..d10cfbcd 100644 --- a/drivers/adodb-mysql.inc.php +++ b/drivers/adodb-mysql.inc.php @@ -12,7 +12,7 @@ is deprected in PHP version 5.5 and removed in PHP version 7. It is deprecated as of ADOdb version 5.20.0. Use the mysqli driver instead, which supports both transactional and non-transactional updates - + Requires mysql client. Works on Windows and Unix. 28 Feb 2001: MetaColumns bug fix - suggested by Freek Dijkstra (phpeverywhere@macfreek.com) @@ -876,10 +876,6 @@ class ADORecordSet_mysql extends ADORecordSet{ } class ADORecordSet_ext_mysql extends ADORecordSet_mysql { - function __construct($queryID,$mode=false) - { - parent::__construct($queryID,$mode); - } function MoveNext() { diff --git a/drivers/adodb-mysqli.inc.php b/drivers/adodb-mysqli.inc.php index db952bb3..df6ca9f7 100644 --- a/drivers/adodb-mysqli.inc.php +++ b/drivers/adodb-mysqli.inc.php @@ -12,7 +12,7 @@ and non-transactional table types. You can use this as a drop-in replacement for both the mysql and mysqlt drivers. As of ADOdb Version 5.20.0, all other native MySQL drivers are deprecated - + Requires mysql client. Works on Windows and Unix. 21 October 2003: MySQLi extension implementation by Arjen de Rijke (a.de.rijke@xs4all.nl) @@ -1190,11 +1190,6 @@ class ADORecordSet_mysqli extends ADORecordSet{ class ADORecordSet_array_mysqli extends ADORecordSet_array { - function __construct($id=-1,$mode=false) - { - parent::__construct($id,$mode); - } - function MetaType($t, $len = -1, $fieldobj = false) { if (is_object($t)) { diff --git a/drivers/adodb-mysqlpo.inc.php b/drivers/adodb-mysqlpo.inc.php index 2612078f..debe7086 100644 --- a/drivers/adodb-mysqlpo.inc.php +++ b/drivers/adodb-mysqlpo.inc.php @@ -11,8 +11,8 @@ MySQL code that supports transactions. For MySQL 3.23 or later. Code from James Poon <jpoon88@yahoo.com> - - This driver extends the deprecated mysql driver, and was originally designed to be a + + This driver extends the deprecated mysql driver, and was originally designed to be a portable driver in the same manner as oci8po and mssqlpo. Its functionality is exactly duplicated in the mysqlt driver, which is itself deprecated. This driver will be removed in ADOdb version 6.0.0. @@ -116,11 +116,6 @@ class ADORecordSet_mysqlt extends ADORecordSet_mysql{ class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt { - function __construct($queryID,$mode=false) - { - parent::__construct($queryID,$mode); - } - function MoveNext() { return adodb_movenext($this); diff --git a/drivers/adodb-netezza.inc.php b/drivers/adodb-netezza.inc.php index 5775ea0b..cc635ad6 100644 --- a/drivers/adodb-netezza.inc.php +++ b/drivers/adodb-netezza.inc.php @@ -50,11 +50,6 @@ class ADODB_netezza extends ADODB_postgres64 { // http://bugs.php.net/bug.php?id=25404 - function __construct() - { - - } - function MetaColumns($table,$upper=true) { @@ -141,11 +136,6 @@ class ADORecordSet_netezza extends ADORecordSet_postgres64 var $databaseType = "netezza"; var $canSeek = true; - function __construct($queryID,$mode=false) - { - parent::__construct($queryID,$mode); - } - // _initrs modified to disable blob handling function _initrs() { diff --git a/drivers/adodb-oci8.inc.php b/drivers/adodb-oci8.inc.php index addae212..daf6e59a 100644 --- a/drivers/adodb-oci8.inc.php +++ b/drivers/adodb-oci8.inc.php @@ -1802,10 +1802,6 @@ class ADORecordset_oci8 extends ADORecordSet { } class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 { - function __construct($queryID,$mode=false) - { - parent::__construct($queryID, $mode); - } function MoveNext() { diff --git a/drivers/adodb-oci805.inc.php b/drivers/adodb-oci805.inc.php index e9b2f048..a2fe16bc 100644 --- a/drivers/adodb-oci805.inc.php +++ b/drivers/adodb-oci805.inc.php @@ -48,8 +48,4 @@ class ADODB_oci805 extends ADODB_oci8 { class ADORecordset_oci805 extends ADORecordset_oci8 { var $databaseType = "oci805"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-oci8po.inc.php b/drivers/adodb-oci8po.inc.php index 3f88706c..29418b84 100644 --- a/drivers/adodb-oci8po.inc.php +++ b/drivers/adodb-oci8po.inc.php @@ -96,11 +96,6 @@ class ADORecordset_oci8po extends ADORecordset_oci8 { var $databaseType = 'oci8po'; - function __construct($queryID,$mode=false) - { - parent::__construct($queryID,$mode); - } - function Fields($colname) { if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname]; diff --git a/drivers/adodb-oci8quercus.inc.php b/drivers/adodb-oci8quercus.inc.php index 846c11f1..c61d8cde 100644 --- a/drivers/adodb-oci8quercus.inc.php +++ b/drivers/adodb-oci8quercus.inc.php @@ -28,10 +28,6 @@ class ADODB_oci8quercus extends ADODB_oci8 { var $databaseType = 'oci8quercus'; var $dataProvider = 'oci8'; - function __construct() - { - } - } /*-------------------------------------------------------------------------------------- @@ -42,11 +38,6 @@ class ADORecordset_oci8quercus extends ADORecordset_oci8 { var $databaseType = 'oci8quercus'; - function __construct($queryID,$mode=false) - { - parent::__construct($queryID,$mode); - } - function _FetchField($fieldOffset = -1) { global $QUERCUS; diff --git a/drivers/adodb-odbc_db2.inc.php b/drivers/adodb-odbc_db2.inc.php index 35b5083a..bf7def1f 100644 --- a/drivers/adodb-odbc_db2.inc.php +++ b/drivers/adodb-odbc_db2.inc.php @@ -306,11 +306,6 @@ class ADORecordSet_odbc_db2 extends ADORecordSet_odbc { var $databaseType = "db2"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } - function MetaType($t,$len=-1,$fieldobj=false) { if (is_object($t)) { diff --git a/drivers/adodb-odbc_mssql.inc.php b/drivers/adodb-odbc_mssql.inc.php index ebecb865..22447895 100644 --- a/drivers/adodb-odbc_mssql.inc.php +++ b/drivers/adodb-odbc_mssql.inc.php @@ -47,12 +47,6 @@ class ADODB_odbc_mssql extends ADODB_odbc { var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON, # concatenating a null value with a string yields a NULL result - function __construct() - { - parent::__construct(); - //$this->curmode = SQL_CUR_USE_ODBC; - } - // crashes php... function ServerInfo() { @@ -356,8 +350,4 @@ class ADORecordSet_odbc_mssql extends ADORecordSet_odbc { var $databaseType = 'odbc_mssql'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-odbc_oracle.inc.php b/drivers/adodb-odbc_oracle.inc.php index ddc408ad..66add3ea 100644 --- a/drivers/adodb-odbc_oracle.inc.php +++ b/drivers/adodb-odbc_oracle.inc.php @@ -104,8 +104,4 @@ class ADORecordSet_odbc_oracle extends ADORecordSet_odbc { var $databaseType = 'odbc_oracle'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-odbtp.inc.php b/drivers/adodb-odbtp.inc.php index ba5bead0..d867aa7c 100644 --- a/drivers/adodb-odbtp.inc.php +++ b/drivers/adodb-odbtp.inc.php @@ -35,10 +35,6 @@ class ADODB_odbtp extends ADOConnection{ var $_canPrepareSP = false; var $_dontPoolDBC = true; - function __construct() - { - } - function ServerInfo() { return array('description' => @odbtp_get_attr( ODB_ATTR_DBMSNAME, $this->_connectionID), @@ -793,48 +789,28 @@ class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp { var $databaseType = 'odbtp_mssql'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } class ADORecordSet_odbtp_access extends ADORecordSet_odbtp { var $databaseType = 'odbtp_access'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp { var $databaseType = 'odbtp_vfp'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp { var $databaseType = 'odbtp_oci8'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp { var $databaseType = 'odbtp_sybase'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } diff --git a/drivers/adodb-oracle.inc.php b/drivers/adodb-oracle.inc.php index d11be9c2..5fd258fd 100644 --- a/drivers/adodb-oracle.inc.php +++ b/drivers/adodb-oracle.inc.php @@ -29,10 +29,6 @@ class ADODB_oracle extends ADOConnection { var $sysTimeStamp = 'SYSDATE'; var $connectSID = true; - function __construct() - { - } - // format and return date string in database date format function DBDate($d, $isfld = false) { diff --git a/drivers/adodb-pdo.inc.php b/drivers/adodb-pdo.inc.php index 9fbbbea8..c3f4c9d5 100644 --- a/drivers/adodb-pdo.inc.php +++ b/drivers/adodb-pdo.inc.php @@ -87,10 +87,6 @@ class ADODB_pdo extends ADOConnection { var $stmt = false; var $_driver; - function __construct() - { - } - function _UpdatePDO() { $d = $this->_driver; diff --git a/drivers/adodb-postgres64.inc.php b/drivers/adodb-postgres64.inc.php index 516d53c7..a8038fff 100644 --- a/drivers/adodb-postgres64.inc.php +++ b/drivers/adodb-postgres64.inc.php @@ -124,11 +124,6 @@ class ADODB_postgres64 extends ADOConnection{ // to know what the concequences are. The other values are correct (wheren't in 0.94) // -- Freek Dijkstra - function __construct() - { - // changes the metaColumnsSQL, adds columns: attnum[6] - } - function ServerInfo() { if (isset($this->version)) return $this->version; diff --git a/drivers/adodb-postgres7.inc.php b/drivers/adodb-postgres7.inc.php index b9d5eca5..7250bdbb 100644 --- a/drivers/adodb-postgres7.inc.php +++ b/drivers/adodb-postgres7.inc.php @@ -307,12 +307,6 @@ class ADORecordSet_postgres7 extends ADORecordSet_postgres64{ var $databaseType = "postgres7"; - - function __construct($queryID, $mode=false) - { - parent::__construct($queryID, $mode); - } - // 10% speedup to move MoveNext to child class function MoveNext() { @@ -339,11 +333,6 @@ class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{ var $databaseType = "postgres7"; - function __construct($queryID, $mode=false) - { - parent::__construct($queryID, $mode); - } - function _fetch() { if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0) { diff --git a/drivers/adodb-proxy.inc.php b/drivers/adodb-proxy.inc.php index ca5708bf..37427a06 100644 --- a/drivers/adodb-proxy.inc.php +++ b/drivers/adodb-proxy.inc.php @@ -25,11 +25,6 @@ class ADODB_proxy extends ADODB_csv { class ADORecordset_proxy extends ADORecordset_csv { var $databaseType = "proxy"; - - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } } // define diff --git a/drivers/adodb-sapdb.inc.php b/drivers/adodb-sapdb.inc.php index fb3be603..68cc3fb8 100644 --- a/drivers/adodb-sapdb.inc.php +++ b/drivers/adodb-sapdb.inc.php @@ -33,12 +33,6 @@ class ADODB_SAPDB extends ADODB_odbc { var $hasInsertId = true; var $_bindInputArray = true; - function __construct() - { - //if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC; - parent::__construct(); - } - function ServerInfo() { $info = ADODB_odbc::ServerInfo(); @@ -176,10 +170,6 @@ class ADORecordSet_sapdb extends ADORecordSet_odbc { var $databaseType = "sapdb"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } } //define diff --git a/drivers/adodb-sqlanywhere.inc.php b/drivers/adodb-sqlanywhere.inc.php index 6a05f492..fbcf60c0 100644 --- a/drivers/adodb-sqlanywhere.inc.php +++ b/drivers/adodb-sqlanywhere.inc.php @@ -153,11 +153,6 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){ var $databaseType = "sqlanywhere"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } - }; //class diff --git a/drivers/adodb-sqlite.inc.php b/drivers/adodb-sqlite.inc.php index 25b9e504..60755816 100644 --- a/drivers/adodb-sqlite.inc.php +++ b/drivers/adodb-sqlite.inc.php @@ -33,10 +33,6 @@ class ADODB_sqlite extends ADOConnection { var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')"; var $fmtTimeStamp = "'Y-m-d H:i:s'"; - function __construct() - { - } - function ServerInfo() { $arr['version'] = sqlite_libversion(); diff --git a/drivers/adodb-sqlite3.inc.php b/drivers/adodb-sqlite3.inc.php index 0c35f7df..4130f769 100644 --- a/drivers/adodb-sqlite3.inc.php +++ b/drivers/adodb-sqlite3.inc.php @@ -33,10 +33,6 @@ class ADODB_sqlite3 extends ADOConnection { var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')"; var $fmtTimeStamp = "'Y-m-d H:i:s'"; - function __construct() - { - } - function ServerInfo() { $version = SQLite3::version(); diff --git a/drivers/adodb-sqlitepo.inc.php b/drivers/adodb-sqlitepo.inc.php index 8617e0b3..109721a5 100644 --- a/drivers/adodb-sqlitepo.inc.php +++ b/drivers/adodb-sqlitepo.inc.php @@ -35,11 +35,6 @@ class ADORecordset_sqlitepo extends ADORecordset_sqlite { var $databaseType = 'sqlitepo'; - function __construct($queryID,$mode=false) - { - parent::__construct($queryID,$mode); - } - // Modified to strip table names from returned fields function _fetch($ignore_fields=false) { diff --git a/drivers/adodb-sybase.inc.php b/drivers/adodb-sybase.inc.php index ac3cc61a..bf455bc2 100644 --- a/drivers/adodb-sybase.inc.php +++ b/drivers/adodb-sybase.inc.php @@ -44,10 +44,6 @@ class ADODB_sybase extends ADOConnection { var $port; - function __construct() - { - } - // might require begintrans -- committrans function _insertid() { @@ -391,12 +387,8 @@ class ADORecordset_sybase extends ADORecordSet { } class ADORecordSet_array_sybase extends ADORecordSet_array { - function __construct($id=-1) - { - parent::__construct($id); - } - // sybase/mssql uses a default date like Dec 30 2000 12:00AM + // sybase/mssql uses a default date like Dec 30 2000 12:00AM static function UnixDate($v) { global $ADODB_sybase_mths; diff --git a/drivers/adodb-sybase_ase.inc.php b/drivers/adodb-sybase_ase.inc.php index ee3766f6..6e67d66d 100644 --- a/drivers/adodb-sybase_ase.inc.php +++ b/drivers/adodb-sybase_ase.inc.php @@ -22,10 +22,6 @@ class ADODB_sybase_ase extends ADODB_sybase { var $metaColumnsSQL = "SELECT syscolumns.name AS field_name, systypes.name AS type, systypes.length AS width FROM sysobjects, syscolumns, systypes WHERE sysobjects.name='%s' AND syscolumns.id = sysobjects.id AND systypes.type=syscolumns.type"; var $metaDatabasesSQL ="SELECT a.name FROM master.dbo.sysdatabases a, master.dbo.syslogins b WHERE a.suid = b.suid and a.name like '%' and a.name != 'tempdb' and a.status3 != 256 order by 1"; - function __construct() - { - } - // split the Views, Tables and procedures. function MetaTables($ttype=false,$showSchema=false,$mask=false) { @@ -111,10 +107,5 @@ class ADODB_sybase_ase extends ADODB_sybase { } class adorecordset_sybase_ase extends ADORecordset_sybase { -var $databaseType = "sybase_ase"; -function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } - + var $databaseType = "sybase_ase"; } diff --git a/drivers/adodb-text.inc.php b/drivers/adodb-text.inc.php index 8f4bf67c..296fb4a1 100644 --- a/drivers/adodb-text.inc.php +++ b/drivers/adodb-text.inc.php @@ -90,10 +90,6 @@ class ADODB_text extends ADOConnection { var $_reznames; var $_reztypes; - function __construct() - { - } - function RSRecordCount() { if (!empty($this->_rezarray)) return sizeof($this->_rezarray); diff --git a/drivers/adodb-vfp.inc.php b/drivers/adodb-vfp.inc.php index 05af51ad..bc0bc6e7 100644 --- a/drivers/adodb-vfp.inc.php +++ b/drivers/adodb-vfp.inc.php @@ -69,11 +69,6 @@ class ADORecordSet_vfp extends ADORecordSet_odbc { var $databaseType = "vfp"; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } - function MetaType($t, $len = -1, $fieldobj = false) { if (is_object($t)) { |