From 5d67c62017211db9842942aabfca5d286ea0ddde Mon Sep 17 00:00:00 2001 From: moodler Date: Sun, 7 Mar 2004 02:33:26 +0000 Subject: [PATCH] Latest version ADOdb 4.20 --- lib/adodb/adodb-csvlib.inc.php | 434 +- lib/adodb/adodb-datadict.inc.php | 1320 +-- lib/adodb/adodb-error.inc.php | 504 +- lib/adodb/adodb-errorhandler.inc.php | 156 +- lib/adodb/adodb-errorpear.inc.php | 174 +- lib/adodb/adodb-exceptions.inc.php | 153 +- lib/adodb/adodb-iterator.inc.php | 110 +- lib/adodb/adodb-lib.inc.php | 1105 +-- lib/adodb/adodb-pager.inc.php | 570 +- lib/adodb/adodb-pear.inc.php | 716 +- lib/adodb/adodb-perf.inc.php | 1804 ++-- lib/adodb/adodb-php4.inc.php | 30 +- lib/adodb/adodb-xmlschema.inc.php | 2262 +++-- lib/adodb/adodb.inc.php | 7305 +++++++++-------- lib/adodb/datadict/datadict-access.inc.php | 182 +- lib/adodb/datadict/datadict-db2.inc.php | 146 +- lib/adodb/datadict/datadict-generic.inc.php | 242 +- lib/adodb/datadict/datadict-ibase.inc.php | 126 +- lib/adodb/datadict/datadict-informix.inc.php | 152 +- lib/adodb/datadict/datadict-mssql.inc.php | 454 +- lib/adodb/datadict/datadict-mysql.inc.php | 348 +- lib/adodb/datadict/datadict-oci8.inc.php | 524 +- lib/adodb/datadict/datadict-postgres.inc.php | 426 +- lib/adodb/datadict/datadict-sybase.inc.php | 447 +- lib/adodb/docs-adodb.htm | 6436 +++++++-------- lib/adodb/docs-datadict.htm | 854 +- lib/adodb/docs-perf.htm | 765 +- lib/adodb/docs-session.htm | 424 +- lib/adodb/drivers/adodb-access.inc.php | 156 +- lib/adodb/drivers/adodb-ado.inc.php | 1224 +-- lib/adodb/drivers/adodb-ado_access.inc.php | 90 +- lib/adodb/drivers/adodb-ado_mssql.inc.php | 122 +- lib/adodb/drivers/adodb-borland_ibase.inc.php | 156 +- lib/adodb/drivers/adodb-csv.inc.php | 398 +- lib/adodb/drivers/adodb-db2.inc.php | 637 +- lib/adodb/drivers/adodb-fbsql.inc.php | 522 +- lib/adodb/drivers/adodb-firebird.inc.php | 136 +- lib/adodb/drivers/adodb-ibase.inc.php | 1623 ++-- lib/adodb/drivers/adodb-informix.inc.php | 58 +- lib/adodb/drivers/adodb-informix72.inc.php | 770 +- lib/adodb/drivers/adodb-mssql.inc.php | 1847 ++--- lib/adodb/drivers/adodb-mssqlpo.inc.php | 116 +- lib/adodb/drivers/adodb-mysql.inc.php | 1340 +-- lib/adodb/drivers/adodb-mysqli.inc.php | 1654 ++-- lib/adodb/drivers/adodb-mysqlt.inc.php | 150 +- lib/adodb/drivers/adodb-oci8.inc.php | 2342 +++--- lib/adodb/drivers/adodb-oci805.inc.php | 110 +- lib/adodb/drivers/adodb-oci8po.inc.php | 378 +- lib/adodb/drivers/adodb-odbc.inc.php | 1422 ++-- lib/adodb/drivers/adodb-odbc_mssql.inc.php | 476 +- lib/adodb/drivers/adodb-odbc_oracle.inc.php | 228 +- lib/adodb/drivers/adodb-oracle.inc.php | 596 +- lib/adodb/drivers/adodb-postgres.inc.php | 26 +- lib/adodb/drivers/adodb-postgres64.inc.php | 1892 ++--- lib/adodb/drivers/adodb-postgres7.inc.php | 338 +- lib/adodb/drivers/adodb-proxy.inc.php | 58 +- lib/adodb/drivers/adodb-sapdb.inc.php | 124 +- lib/adodb/drivers/adodb-sqlanywhere.inc.php | 332 +- lib/adodb/drivers/adodb-sqlite.inc.php | 635 +- lib/adodb/drivers/adodb-sybase.inc.php | 813 +- lib/adodb/drivers/adodb-vfp.inc.php | 194 +- lib/adodb/license.txt | 362 +- lib/adodb/perf/perf-db2.inc.php | 198 +- lib/adodb/perf/perf-informix.inc.php | 134 +- lib/adodb/perf/perf-mssql.inc.php | 320 +- lib/adodb/perf/perf-mysql.inc.php | 509 +- lib/adodb/perf/perf-oci8.inc.php | 950 +-- lib/adodb/perf/perf-postgres.inc.php | 238 +- lib/adodb/pivottable.inc.php | 326 +- lib/adodb/rsfilter.inc.php | 106 +- lib/adodb/server.php | 194 +- lib/adodb/tests/benchmark.php | 168 +- lib/adodb/tests/client.php | 388 +- lib/adodb/tests/test-datadict.php | 456 +- lib/adodb/tests/test-pgblob.php | 55 +- lib/adodb/tests/test-php5.php | 112 +- lib/adodb/tests/test-xmlschema.php | 66 +- lib/adodb/tests/test.php | 2912 +++---- lib/adodb/tests/test2.php | 82 +- lib/adodb/tests/test3.php | 86 +- lib/adodb/tests/test4.php | 8 +- lib/adodb/tests/test5.php | 94 +- lib/adodb/tests/testcache.php | 56 +- lib/adodb/tests/testdatabases.inc.php | 570 +- lib/adodb/tests/testgenid.php | 70 +- lib/adodb/tests/testmssql.php | 136 +- lib/adodb/tests/testoci8.php | 138 +- lib/adodb/tests/testoci8cursor.php | 222 +- lib/adodb/tests/testpaging.php | 164 +- lib/adodb/tests/testpear.php | 66 +- lib/adodb/tests/testsessions.php | 130 +- lib/adodb/tests/tmssql.php | 128 +- lib/adodb/tests/xmlschema.xml | 59 +- lib/adodb/toexport.inc.php | 260 +- lib/adodb/tohtml.inc.php | 7 +- lib/adodb/tute.htm | 580 +- lib/adodb/xmlschema.dtd | 33 + lib/adodb/xsl/convert-0.1-0.2.xsl | 205 + lib/adodb/xsl/convert-0.2-0.1.xsl | 207 + 99 files changed, 30805 insertions(+), 29122 deletions(-) create mode 100644 lib/adodb/xmlschema.dtd create mode 100644 lib/adodb/xsl/convert-0.1-0.2.xsl create mode 100644 lib/adodb/xsl/convert-0.2-0.1.xsl diff --git a/lib/adodb/adodb-csvlib.inc.php b/lib/adodb/adodb-csvlib.inc.php index 37c46794ceb..ba0697ab83e 100644 --- a/lib/adodb/adodb-csvlib.inc.php +++ b/lib/adodb/adodb-csvlib.inc.php @@ -1,218 +1,218 @@ -FieldCount() : 0; - - if ($sql) $sql = urlencode($sql); - // metadata setup - - if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete - if (is_object($conn)) { - $sql .= ','.$conn->Affected_Rows(); - $sql .= ','.$conn->Insert_ID(); - } else - $sql .= ',,'; - - $text = "====-1,0,$sql\n"; - return $text; - } else { - $tt = ($rs->timeCreated) ? $rs->timeCreated : time(); - $line = "====0,$tt,$sql\n"; - } - // column definitions - for($i=0; $i < $max; $i++) { - $o = $rs->FetchField($i); - $line .= urlencode($o->name).':'.$rs->MetaType($o->type,$o->max_length,$o).":$o->max_length,"; - } - $text = substr($line,0,strlen($line)-1)."\n"; - - - // get data - if ($rs->databaseType == 'array') { - $text .= serialize($rs->_array); - } else { - $rows = array(); - while (!$rs->EOF) { - $rows[] = $rs->fields; - $rs->MoveNext(); - } - $text .= serialize($rows); - } - $rs->MoveFirst(); - return $text; - } - - -/** -* Open CSV file and convert it into Data. -* -* @param url file/ftp/http url -* @param err returns the error message -* @param timeout dispose if recordset has been alive for $timeout secs -* -* @return recordset, or false if error occured. If no -* error occurred in sql INSERT/UPDATE/DELETE, -* empty recordset is returned -*/ - function &csv2rs($url,&$err,$timeout=0) - { - $err = false; - $fp = @fopen($url,'r'); - if (!$fp) { - $err = $url.' file/URL not found'; - return false; - } - flock($fp, LOCK_SH); - $arr = array(); - $ttl = 0; - - if ($meta = fgetcsv ($fp, 32000, ",")) { - // check if error message - if (substr($meta[0],0,4) === '****') { - $err = trim(substr($meta[0],4,1024)); - fclose($fp); - return false; - } - // check for meta data - // $meta[0] is -1 means return an empty recordset - // $meta[1] contains a time - - if (substr($meta[0],0,4) === '====') { - - if ($meta[0] == "====-1") { - if (sizeof($meta) < 5) { - $err = "Corrupt first line for format -1"; - fclose($fp); - return false; - } - fclose($fp); - - if ($timeout > 0) { - $err = " Illegal Timeout $timeout "; - return false; - } - $rs->fields = array(); - $rs->timeCreated = $meta[1]; - $rs = new ADORecordSet($val=true); - $rs->EOF = true; - $rs->_numOfFields=0; - $rs->sql = urldecode($meta[2]); - $rs->affectedrows = (integer)$meta[3]; - $rs->insertid = $meta[4]; - return $rs; - } - # Under high volume loads, we want only 1 thread/process to _write_file - # so that we don't have 50 processes queueing to write the same data. - # Would require probabilistic blocking write - # - # -2 sec before timeout, give processes 1/16 chance of writing to file with blocking io - # -1 sec after timeout give processes 1/4 chance of writing with blocking - # +0 sec after timeout, give processes 100% chance writing with blocking - if (sizeof($meta) > 1) { - if($timeout >0){ - $tdiff = $meta[1]+$timeout - time(); - if ($tdiff <= 2) { - switch($tdiff) { - case 2: - if ((rand() & 15) == 0) { - fclose($fp); - $err = "Timeout 2"; - return false; - } - break; - case 1: - if ((rand() & 3) == 0) { - fclose($fp); - $err = "Timeout 1"; - return false; - } - break; - default: - fclose($fp); - $err = "Timeout 0"; - return false; - } // switch - - } // if check flush cache - }// (timeout>0) - $ttl = $meta[1]; - } - $meta = false; - $meta = fgetcsv($fp, 16000, ","); - if (!$meta) { - fclose($fp); - $err = "Unexpected EOF 1"; - return false; - } - } - - // Get Column definitions - $flds = array(); - foreach($meta as $o) { - $o2 = explode(':',$o); - if (sizeof($o2)!=3) { - $arr[] = $meta; - $flds = false; - break; - } - $fld = new ADOFieldObject(); - $fld->name = urldecode($o2[0]); - $fld->type = $o2[1]; - $fld->max_length = $o2[2]; - $flds[] = $fld; - } - } else { - fclose($fp); - $err = "Recordset had unexpected EOF 2"; - return false; - } - - // slurp in the data - $MAXSIZE = 128000; - - $text = ''; - while ($txt = fread($fp,$MAXSIZE)) { - $text .= $txt; - } - - fclose($fp); - $arr = @unserialize($text); - //var_dump($arr); - if (!is_array($arr)) { - $err = "Recordset had unexpected EOF (in serialized recordset)"; - if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!"; - return false; - } - $rs = new ADORecordSet_array(); - $rs->timeCreated = $ttl; - $rs->InitArrayFields($arr,$flds); - return $rs; - } +FieldCount() : 0; + + if ($sql) $sql = urlencode($sql); + // metadata setup + + if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete + if (is_object($conn)) { + $sql .= ','.$conn->Affected_Rows(); + $sql .= ','.$conn->Insert_ID(); + } else + $sql .= ',,'; + + $text = "====-1,0,$sql\n"; + return $text; + } else { + $tt = ($rs->timeCreated) ? $rs->timeCreated : time(); + $line = "====0,$tt,$sql\n"; + } + // column definitions + for($i=0; $i < $max; $i++) { + $o = $rs->FetchField($i); + $line .= urlencode($o->name).':'.$rs->MetaType($o->type,$o->max_length,$o).":$o->max_length,"; + } + $text = substr($line,0,strlen($line)-1)."\n"; + + + // get data + if ($rs->databaseType == 'array') { + $text .= serialize($rs->_array); + } else { + $rows = array(); + while (!$rs->EOF) { + $rows[] = $rs->fields; + $rs->MoveNext(); + } + $text .= serialize($rows); + } + $rs->MoveFirst(); + return $text; + } + + +/** +* Open CSV file and convert it into Data. +* +* @param url file/ftp/http url +* @param err returns the error message +* @param timeout dispose if recordset has been alive for $timeout secs +* +* @return recordset, or false if error occured. If no +* error occurred in sql INSERT/UPDATE/DELETE, +* empty recordset is returned +*/ + function &csv2rs($url,&$err,$timeout=0) + { + $err = false; + $fp = @fopen($url,'r'); + if (!$fp) { + $err = $url.' file/URL not found'; + return false; + } + flock($fp, LOCK_SH); + $arr = array(); + $ttl = 0; + + if ($meta = fgetcsv ($fp, 32000, ",")) { + // check if error message + if (substr($meta[0],0,4) === '****') { + $err = trim(substr($meta[0],4,1024)); + fclose($fp); + return false; + } + // check for meta data + // $meta[0] is -1 means return an empty recordset + // $meta[1] contains a time + + if (substr($meta[0],0,4) === '====') { + + if ($meta[0] == "====-1") { + if (sizeof($meta) < 5) { + $err = "Corrupt first line for format -1"; + fclose($fp); + return false; + } + fclose($fp); + + if ($timeout > 0) { + $err = " Illegal Timeout $timeout "; + return false; + } + $rs->fields = array(); + $rs->timeCreated = $meta[1]; + $rs = new ADORecordSet($val=true); + $rs->EOF = true; + $rs->_numOfFields=0; + $rs->sql = urldecode($meta[2]); + $rs->affectedrows = (integer)$meta[3]; + $rs->insertid = $meta[4]; + return $rs; + } + # Under high volume loads, we want only 1 thread/process to _write_file + # so that we don't have 50 processes queueing to write the same data. + # Would require probabilistic blocking write + # + # -2 sec before timeout, give processes 1/16 chance of writing to file with blocking io + # -1 sec after timeout give processes 1/4 chance of writing with blocking + # +0 sec after timeout, give processes 100% chance writing with blocking + if (sizeof($meta) > 1) { + if($timeout >0){ + $tdiff = $meta[1]+$timeout - time(); + if ($tdiff <= 2) { + switch($tdiff) { + case 2: + if ((rand() & 15) == 0) { + fclose($fp); + $err = "Timeout 2"; + return false; + } + break; + case 1: + if ((rand() & 3) == 0) { + fclose($fp); + $err = "Timeout 1"; + return false; + } + break; + default: + fclose($fp); + $err = "Timeout 0"; + return false; + } // switch + + } // if check flush cache + }// (timeout>0) + $ttl = $meta[1]; + } + $meta = false; + $meta = fgetcsv($fp, 16000, ","); + if (!$meta) { + fclose($fp); + $err = "Unexpected EOF 1"; + return false; + } + } + + // Get Column definitions + $flds = array(); + foreach($meta as $o) { + $o2 = explode(':',$o); + if (sizeof($o2)!=3) { + $arr[] = $meta; + $flds = false; + break; + } + $fld = new ADOFieldObject(); + $fld->name = urldecode($o2[0]); + $fld->type = $o2[1]; + $fld->max_length = $o2[2]; + $flds[] = $fld; + } + } else { + fclose($fp); + $err = "Recordset had unexpected EOF 2"; + return false; + } + + // slurp in the data + $MAXSIZE = 128000; + + $text = ''; + while ($txt = fread($fp,$MAXSIZE)) { + $text .= $txt; + } + + fclose($fp); + $arr = @unserialize($text); + //var_dump($arr); + if (!is_array($arr)) { + $err = "Recordset had unexpected EOF (in serialized recordset)"; + if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!"; + return false; + } + $rs = new ADORecordSet_array(); + $rs->timeCreated = $ttl; + $rs->InitArrayFields($arr,$flds); + return $rs; + } ?> \ No newline at end of file diff --git a/lib/adodb/adodb-datadict.inc.php b/lib/adodb/adodb-datadict.inc.php index db9c2016dfa..1959de22f4e 100644 --- a/lib/adodb/adodb-datadict.inc.php +++ b/lib/adodb/adodb-datadict.inc.php @@ -1,655 +1,667 @@ -$str

"; -$a= Lens_ParseArgs($str); -print "
";
-print_r($a);
-print "
"; -} - -if (!function_exists('ctype_alnum')) { - function ctype_alnum($text) { - return preg_match('/^[a-z0-9]*$/i', $text); - } -} - -//Lens_ParseTest(); - -/** - Parse arguments, treat "text" (text) and 'text' as quotation marks. - To escape, use "" or '' or )) - - Will read in "abc def" sans quotes, as: abc def - Same with 'abc def'. - However if `abc def`, then will read in as `abc def` - - @param endstmtchar Character that indicates end of statement - @param tokenchars Include the following characters in tokens apart from A-Z and 0-9 - @returns 2 dimensional array containing parsed tokens. -*/ -function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') -{ - $pos = 0; - $intoken = false; - $stmtno = 0; - $endquote = false; - $tokens = array(); - $tokens[$stmtno] = array(); - $max = strlen($args); - $quoted = false; - - while ($pos < $max) { - $ch = substr($args,$pos,1); - switch($ch) { - case ' ': - case "\t": - case "\n": - case "\r": - if (!$quoted) { - if ($intoken) { - $intoken = false; - $tokens[$stmtno][] = implode('',$tokarr); - } - break; - } - - $tokarr[] = $ch; - break; - - case '`': - if ($intoken) $tokarr[] = $ch; - case '(': - case ')': - case '"': - case "'": - - if ($intoken) { - if (empty($endquote)) { - $tokens[$stmtno][] = implode('',$tokarr); - if ($ch == '(') $endquote = ')'; - else $endquote = $ch; - $quoted = true; - $intoken = true; - $tokarr = array(); - } else if ($endquote == $ch) { - $ch2 = substr($args,$pos+1,1); - if ($ch2 == $endquote) { - $pos += 1; - $tokarr[] = $ch2; - } else { - $quoted = false; - $intoken = false; - $tokens[$stmtno][] = implode('',$tokarr); - $endquote = ''; - } - } else - $tokarr[] = $ch; - - }else { - - if ($ch == '(') $endquote = ')'; - else $endquote = $ch; - $quoted = true; - $intoken = true; - $tokarr = array(); - if ($ch == '`') $tokarr[] = '`'; - } - break; - - default: - - if (!$intoken) { - if ($ch == $endstmtchar) { - $stmtno += 1; - $tokens[$stmtno] = array(); - break; - } - - $intoken = true; - $quoted = false; - $endquote = false; - $tokarr = array(); - - } - - if ($quoted) $tokarr[] = $ch; - else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch; - else { - if ($ch == $endstmtchar) { - $tokens[$stmtno][] = implode('',$tokarr); - $stmtno += 1; - $tokens[$stmtno] = array(); - $intoken = false; - $tokarr = array(); - break; - } - $tokens[$stmtno][] = implode('',$tokarr); - $tokens[$stmtno][] = $ch; - $intoken = false; - } - } - $pos += 1; - } - - return $tokens; -} - - -class ADODB_DataDict { - var $connection; - var $debug = false; - var $dropTable = 'DROP TABLE %s'; - var $dropIndex = 'DROP INDEX %s'; - var $addCol = ' ADD'; - var $alterCol = ' ALTER COLUMN'; - var $dropCol = ' DROP COLUMN'; - var $schema = false; - var $serverInfo = array(); - var $autoIncrement = false; - var $dataProvider; - var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob - /// in other words, we use a text area for editting. - - function GetCommentSQL($table,$col) - { - return false; - } - - function SetCommentSQL($table,$col,$cmt) - { - return false; - } - - function &MetaTables() - { - return $this->connection->MetaTables(); - } - - function &MetaColumns($tab,$schema=false,$upper=true) - { - return $this->connection->MetaColumns($tab,$schema,$upper); - } - - function &MetaPrimaryKeys($tab,$owner=false,$intkey=false) - { - return $this->connection->MetaPrimaryKeys($tab.$owner,$intkey); - } - - function &MetaIndexes($table, $primary = false, $owner = false) - { - return $this->connection->MetaIndexes($table, $primary, $owner); - } - - function MetaType($t,$len=-1,$fieldobj=false) - { - return ADORecordSet::MetaType($t,$len,$fieldobj); - } - - function NameQuote($name) - { - if ( !is_object($this->connection) ) { - return $name; - } - - $replace = $this->connection->nameQuote .'$1'. $this->connection->nameQuote; - return preg_replace('/^`([^`]+)`$/', $replace, $name); - } - - function TableName($name) - { - if ( $this->schema ) { - return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name); - } - return $this->NameQuote($name); - } - - // Executes the sql array returned by GetTableSQL and GetIndexSQL - function ExecuteSQLArray($sql, $continueOnError = true) - { - $rez = 2; - $conn = &$this->connection; - $saved = $conn->debug; - foreach($sql as $line) { - - if ($this->debug) $conn->debug = true; - $ok = $conn->Execute($line); - $conn->debug = $saved; - if (!$ok) { - if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); - if (!$continueOnError) return 0; - $rez = 1; - } - } - return 2; - } - - /* - Returns the actual type given a character code. - - C: varchar - X: CLOB (character large object) or largest varchar size if CLOB is not supported - C2: Multibyte varchar - X2: Multibyte CLOB - - B: BLOB (binary large object) - - D: Date - T: Date-time - L: Integer field suitable for storing booleans (0 or 1) - I: Integer - F: Floating point number - N: Numeric or decimal number - */ - - function ActualType($meta) - { - return $meta; - } - - function CreateDatabase($dbname,$options=false) - { - $options = $this->_Options($options); - $sql = array(); - - $s = 'CREATE DATABASE ' . $this->NameQuote($dbname); - if (isset($options[$this->upperName])) - $s .= ' '.$options[$this->upperName]; - - $sql[] = $s; - return $sql; - } - - /* - Generates the SQL to create index. Returns an array of sql strings. - */ - function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false) - { - return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions)); - } - - function DropIndexSQL ($idxname, $tabname = NULL) - { - return array(sprintf($this->dropIndex, $this->NameQuote($idxname))); - } - - function SetSchema($schema) - { - $this->schema = $schema; - } - - function AddColumnSQL($tabname, $flds) - { - $tabname = $this->TableName ($tabname); - $sql = array(); - list($lines,$pkey) = $this->_GenFields($flds); - $alter = 'ALTER TABLE ' . $tabname . ' ' . $this->addCol . ' '; - foreach($lines as $v) { - $sql[] = $alter . $v; - } - return $sql; - } - - function AlterColumnSQL($tabname, $flds) - { - $tabname = $this->TableName ($tabname); - $sql = array(); - list($lines,$pkey) = $this->_GenFields($flds); - $alter = 'ALTER TABLE ' . $tabname . ' ' . $this->alterCol . ' '; - foreach($lines as $v) { - $sql[] = $alter . $v; - } - return $sql; - } - - function DropColumnSQL($tabname, $flds) - { - $tabname = $this->TableName ($tabname); - if (!is_array($flds)) $flds = explode(',',$flds); - $sql = array(); - $alter = 'ALTER TABLE ' . $tabname . ' ' . $this->dropCol . ' '; - foreach($flds as $v) { - $sql[] = $alter . $v; - } - return $sql; - } - - function DropTableSQL($tabname) - { - return array (sprintf($this->dropTable, $this->TableName($tabname))); - } - - /* - Generate the SQL to create table. Returns an array of sql strings. - */ - function CreateTableSQL($tabname, $flds, $tableoptions=false) - { - if (!$tableoptions) $tableoptions = array(); - - list($lines,$pkey) = $this->_GenFields($flds); - - $taboptions = $this->_Options($tableoptions); - $tabname = $this->TableName ($tabname); - $sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions); - - $tsql = $this->_Triggers($tabname,$taboptions); - foreach($tsql as $s) $sql[] = $s; - - return $sql; - } - - function _GenFields($flds) - { - if (is_string($flds)) { - $padding = ' '; - $txt = $flds.$padding; - $flds = array(); - $flds0 = Lens_ParseArgs($txt,','); - $hasparam = false; - foreach($flds0 as $f0) { - $f1 = array(); - foreach($f0 as $token) { - switch (strtoupper($token)) { - case 'CONSTRAINT': - case 'DEFAULT': - $hasparam = $token; - break; - default: - if ($hasparam) $f1[$hasparam] = $token; - else $f1[] = $token; - $hasparam = false; - break; - } - } - $flds[] = $f1; - - } - } - $this->autoIncrement = false; - $lines = array(); - $pkey = array(); - foreach($flds as $fld) { - $fld = _array_change_key_case($fld); - - $fname = false; - $fdefault = false; - $fautoinc = false; - $ftype = false; - $fsize = false; - $fprec = false; - $fprimary = false; - $fnoquote = false; - $fdefts = false; - $fdefdate = false; - $fconstraint = false; - $fnotnull = false; - $funsigned = false; - - //----------------- - // Parse attributes - foreach($fld as $attr => $v) { - if ($attr == 2 && is_numeric($v)) $attr = 'SIZE'; - else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v); - - switch($attr) { - case '0': - case 'NAME': $fname = $v; break; - case '1': - case 'TYPE': $ty = $v; $ftype = $this->ActualType(strtoupper($v)); break; - - case 'SIZE': - $dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,','); - if ($dotat === false) $fsize = $v; - else { - $fsize = substr($v,0,$dotat); - $fprec = substr($v,$dotat+1); - } - break; - case 'UNSIGNED': $funsigned = true; break; - case 'AUTOINCREMENT': - case 'AUTO': $fautoinc = true; $fnotnull = true; break; - case 'KEY': - case 'PRIMARY': $fprimary = $v; $fnotnull = true; break; - case 'DEF': - case 'DEFAULT': $fdefault = $v; break; - case 'NOTNULL': $fnotnull = $v; break; - case 'NOQUOTE': $fnoquote = $v; break; - case 'DEFDATE': $fdefdate = $v; break; - case 'DEFTIMESTAMP': $fdefts = $v; break; - case 'CONSTRAINT': $fconstraint = $v; break; - } //switch - } // foreach $fld - - //-------------------- - // VALIDATE FIELD INFO - if (!strlen($fname)) { - if ($this->debug) ADOConnection::outp("Undefined NAME"); - return false; - } - - $fname = $this->NameQuote($fname); - - if (!strlen($ftype)) { - if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'"); - return false; - } else { - $ftype = strtoupper($ftype); - } - - $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec); - - if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls - - if ($fprimary) $pkey[] = $fname; - - // some databases do not allow blobs to have defaults - if ($ty == 'X') $fdefault = false; - - //-------------------- - // CONSTRUCT FIELD SQL - if ($fdefts) { - if (substr($this->connection->databaseType,0,5) == 'mysql') { - $ftype = 'TIMESTAMP'; - } else { - $fdefault = $this->connection->sysTimeStamp; - } - } else if ($fdefdate) { - if (substr($this->connection->databaseType,0,5) == 'mysql') { - $ftype = 'TIMESTAMP'; - } else { - $fdefault = $this->connection->sysDate; - } - } else if (strlen($fdefault) && !$fnoquote) - if ($ty == 'C' or $ty == 'X' or - ( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) - if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') - $fdefault = trim($fdefault); - else if (strtolower($fdefault) != 'null') - $fdefault = $this->connection->qstr($fdefault); - $suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); - - $fname = str_pad($fname,16); - $lines[] = "$fname $ftype$suffix"; - - if ($fautoinc) $this->autoIncrement = true; - } // foreach $flds - - - return array($lines,$pkey); - } - /* - GENERATE THE SIZE PART OF THE DATATYPE - $ftype is the actual type - $ty is the type defined originally in the DDL - */ - function _GetSize($ftype, $ty, $fsize, $fprec) - { - if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) { - $ftype .= "(".$fsize; - if (strlen($fprec)) $ftype .= ",".$fprec; - $ftype .= ')'; - } - return $ftype; - } - - - // return string must begin with space - function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint) - { - $suffix = ''; - if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault"; - if ($fnotnull) $suffix .= ' NOT NULL'; - if ($fconstraint) $suffix .= ' '.$fconstraint; - return $suffix; - } - - function _IndexSQL($idxname, $tabname, $flds, $idxoptions) - { - $sql = array(); - - if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) { - $sql[] = sprintf ($this->dropIndex, $idxname); - if ( isset($idxoptions['DROP']) ) - return $sql; - } - - if ( empty ($flds) ) { - return $sql; - } - - $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : ''; - - $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' '; - - if ( isset($idxoptions[$this->upperName]) ) - $s .= $idxoptions[$this->upperName]; - - if ( is_array($flds) ) - $flds = implode(', ',$flds); - $s .= '(' . $flds . ')'; - $sql[] = $s; - - return $sql; - } - - function _DropAutoIncrement($tabname) - { - return false; - } - - function _TableSQL($tabname,$lines,$pkey,$tableoptions) - { - $sql = array(); - - if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) { - $sql[] = sprintf($this->dropTable,$tabname); - if ($this->autoIncrement) { - $sInc = $this->_DropAutoIncrement($tabname); - if ($sInc) $sql[] = $sInc; - } - if ( isset ($tableoptions['DROP']) ) { - return $sql; - } - } - $s = "CREATE TABLE $tabname (\n"; - $s .= implode(",\n", $lines); - if (sizeof($pkey)>0) { - $s .= ",\n PRIMARY KEY ("; - $s .= implode(", ",$pkey).")"; - } - if (isset($tableoptions['CONSTRAINTS'])) - $s .= "\n".$tableoptions['CONSTRAINTS']; - - if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) - $s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; - - $s .= "\n)"; - if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName]; - $sql[] = $s; - - return $sql; - } - - /* - GENERATE TRIGGERS IF NEEDED - used when table has auto-incrementing field that is emulated using triggers - */ - function _Triggers($tabname,$taboptions) - { - return array(); - } - - /* - Sanitize options, so that array elements with no keys are promoted to keys - */ - function _Options($opts) - { - if (!is_array($opts)) return array(); - $newopts = array(); - foreach($opts as $k => $v) { - if (is_numeric($k)) $newopts[strtoupper($v)] = $v; - else $newopts[strtoupper($k)] = $v; - } - return $newopts; - } - - -/* -"Florian Buzin [ easywe ]" - -This function changes/adds new fields to your table. You - dont have to know if the col is new or not. It will check on its -own. - -*/ - function ChangeTableSQL($tablename, $flds,$tableoptions=false) - { - $tabname = $this->TableName ($tablename); - - $conn = &$this->connection; - if (!is_object ($conn)) { - return false; - } - - $colarr = &$conn->MetaColumns($tabname); - if (!$colarr) { - return $this->CreateTableSQL($tablename,$flds,$tableoptions); - } - - foreach($colarr as $col) { - $cols[strtoupper($col->name)] = " ALTER "; - } - - $sql = array(); - list($lines,$pkey) = $this->_GenFields($flds); - - foreach($lines as $v) { - $f = explode(" ",$v); - if(!empty($cols[strtoupper($f[0])])){ - $sql[] = "ALTER TABLE $tabname $this->alterCol $v"; - }else{ - $sql[] = "ALTER TABLE $tabname $this->addCol $v"; - } - } - return $sql; - } -} // class +$str

"; +$a= Lens_ParseArgs($str); +print "
";
+print_r($a);
+print "
"; +} + +if (!function_exists('ctype_alnum')) { + function ctype_alnum($text) { + return preg_match('/^[a-z0-9]*$/i', $text); + } +} + +//Lens_ParseTest(); + +/** + Parse arguments, treat "text" (text) and 'text' as quotation marks. + To escape, use "" or '' or )) + + Will read in "abc def" sans quotes, as: abc def + Same with 'abc def'. + However if `abc def`, then will read in as `abc def` + + @param endstmtchar Character that indicates end of statement + @param tokenchars Include the following characters in tokens apart from A-Z and 0-9 + @returns 2 dimensional array containing parsed tokens. +*/ +function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') +{ + $pos = 0; + $intoken = false; + $stmtno = 0; + $endquote = false; + $tokens = array(); + $tokens[$stmtno] = array(); + $max = strlen($args); + $quoted = false; + + while ($pos < $max) { + $ch = substr($args,$pos,1); + switch($ch) { + case ' ': + case "\t": + case "\n": + case "\r": + if (!$quoted) { + if ($intoken) { + $intoken = false; + $tokens[$stmtno][] = implode('',$tokarr); + } + break; + } + + $tokarr[] = $ch; + break; + + case '`': + if ($intoken) $tokarr[] = $ch; + case '(': + case ')': + case '"': + case "'": + + if ($intoken) { + if (empty($endquote)) { + $tokens[$stmtno][] = implode('',$tokarr); + if ($ch == '(') $endquote = ')'; + else $endquote = $ch; + $quoted = true; + $intoken = true; + $tokarr = array(); + } else if ($endquote == $ch) { + $ch2 = substr($args,$pos+1,1); + if ($ch2 == $endquote) { + $pos += 1; + $tokarr[] = $ch2; + } else { + $quoted = false; + $intoken = false; + $tokens[$stmtno][] = implode('',$tokarr); + $endquote = ''; + } + } else + $tokarr[] = $ch; + + }else { + + if ($ch == '(') $endquote = ')'; + else $endquote = $ch; + $quoted = true; + $intoken = true; + $tokarr = array(); + if ($ch == '`') $tokarr[] = '`'; + } + break; + + default: + + if (!$intoken) { + if ($ch == $endstmtchar) { + $stmtno += 1; + $tokens[$stmtno] = array(); + break; + } + + $intoken = true; + $quoted = false; + $endquote = false; + $tokarr = array(); + + } + + if ($quoted) $tokarr[] = $ch; + else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch; + else { + if ($ch == $endstmtchar) { + $tokens[$stmtno][] = implode('',$tokarr); + $stmtno += 1; + $tokens[$stmtno] = array(); + $intoken = false; + $tokarr = array(); + break; + } + $tokens[$stmtno][] = implode('',$tokarr); + $tokens[$stmtno][] = $ch; + $intoken = false; + } + } + $pos += 1; + } + + return $tokens; +} + + +class ADODB_DataDict { + var $connection; + var $debug = false; + var $dropTable = 'DROP TABLE %s'; + var $dropIndex = 'DROP INDEX %s'; + var $addCol = ' ADD'; + var $alterCol = ' ALTER COLUMN'; + var $dropCol = ' DROP COLUMN'; + var $nameRegex = '\w'; + var $schema = false; + var $serverInfo = array(); + var $autoIncrement = false; + var $dataProvider; + var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob + /// in other words, we use a text area for editting. + + function GetCommentSQL($table,$col) + { + return false; + } + + function SetCommentSQL($table,$col,$cmt) + { + return false; + } + + function &MetaTables() + { + return $this->connection->MetaTables(); + } + + function &MetaColumns($tab, $upper=true, $schema=false) + { + return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema); + } + + function &MetaPrimaryKeys($tab,$owner=false,$intkey=false) + { + return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey); + } + + function &MetaIndexes($table, $primary = false, $owner = false) + { + return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner); + } + + function MetaType($t,$len=-1,$fieldobj=false) + { + return ADORecordSet::MetaType($t,$len,$fieldobj); + } + + function NameQuote($name = NULL) + { + if (!is_string($name)) { + return FALSE; + } + + $name = trim($name); + + if ( !is_object($this->connection) ) { + return $name; + } + + $quote = $this->connection->nameQuote; + + // if name is of the form `name`, quote it + if ( preg_match('/^`(.+)`$/', $name, $matches) ) { + return $quote . $matches[1] . $quote; + } + + // if name contains special characters, quote it + if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) { + return $quote . $name . $quote; + } + + return $name; + } + + function TableName($name) + { + if ( $this->schema ) { + return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name); + } + return $this->NameQuote($name); + } + + // Executes the sql array returned by GetTableSQL and GetIndexSQL + function ExecuteSQLArray($sql, $continueOnError = true) + { + $rez = 2; + $conn = &$this->connection; + $saved = $conn->debug; + foreach($sql as $line) { + + if ($this->debug) $conn->debug = true; + $ok = $conn->Execute($line); + $conn->debug = $saved; + if (!$ok) { + if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); + if (!$continueOnError) return 0; + $rez = 1; + } + } + return 2; + } + + /* + Returns the actual type given a character code. + + C: varchar + X: CLOB (character large object) or largest varchar size if CLOB is not supported + C2: Multibyte varchar + X2: Multibyte CLOB + + B: BLOB (binary large object) + + D: Date + T: Date-time + L: Integer field suitable for storing booleans (0 or 1) + I: Integer + F: Floating point number + N: Numeric or decimal number + */ + + function ActualType($meta) + { + return $meta; + } + + function CreateDatabase($dbname,$options=false) + { + $options = $this->_Options($options); + $sql = array(); + + $s = 'CREATE DATABASE ' . $this->NameQuote($dbname); + if (isset($options[$this->upperName])) + $s .= ' '.$options[$this->upperName]; + + $sql[] = $s; + return $sql; + } + + /* + Generates the SQL to create index. Returns an array of sql strings. + */ + function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false) + { + if (!is_array($flds)) { + $flds = explode(',',$flds); + } + + foreach($flds as $key => $fld) { + $flds[$key] = $this->NameQuote($fld); + } + + return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions)); + } + + function DropIndexSQL ($idxname, $tabname = NULL) + { + return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname))); + } + + function SetSchema($schema) + { + $this->schema = $schema; + } + + function AddColumnSQL($tabname, $flds) + { + $tabname = $this->TableName ($tabname); + $sql = array(); + list($lines,$pkey) = $this->_GenFields($flds); + $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' '; + foreach($lines as $v) { + $sql[] = $alter . $v; + } + return $sql; + } + + function AlterColumnSQL($tabname, $flds) + { + $tabname = $this->TableName ($tabname); + $sql = array(); + list($lines,$pkey) = $this->_GenFields($flds); + $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; + foreach($lines as $v) { + $sql[] = $alter . $v; + } + return $sql; + } + + function DropColumnSQL($tabname, $flds) + { + $tabname = $this->TableName ($tabname); + if (!is_array($flds)) $flds = explode(',',$flds); + $sql = array(); + $alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' '; + foreach($flds as $v) { + $sql[] = $alter . $this->NameQuote($v); + } + return $sql; + } + + function DropTableSQL($tabname) + { + return array (sprintf($this->dropTable, $this->TableName($tabname))); + } + + /* + Generate the SQL to create table. Returns an array of sql strings. + */ + function CreateTableSQL($tabname, $flds, $tableoptions=false) + { + if (!$tableoptions) $tableoptions = array(); + + list($lines,$pkey) = $this->_GenFields($flds); + + $taboptions = $this->_Options($tableoptions); + $tabname = $this->TableName ($tabname); + $sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions); + + $tsql = $this->_Triggers($tabname,$taboptions); + foreach($tsql as $s) $sql[] = $s; + + return $sql; + } + + function _GenFields($flds) + { + if (is_string($flds)) { + $padding = ' '; + $txt = $flds.$padding; + $flds = array(); + $flds0 = Lens_ParseArgs($txt,','); + $hasparam = false; + foreach($flds0 as $f0) { + $f1 = array(); + foreach($f0 as $token) { + switch (strtoupper($token)) { + case 'CONSTRAINT': + case 'DEFAULT': + $hasparam = $token; + break; + default: + if ($hasparam) $f1[$hasparam] = $token; + else $f1[] = $token; + $hasparam = false; + break; + } + } + $flds[] = $f1; + + } + } + $this->autoIncrement = false; + $lines = array(); + $pkey = array(); + foreach($flds as $fld) { + $fld = _array_change_key_case($fld); + + $fname = false; + $fdefault = false; + $fautoinc = false; + $ftype = false; + $fsize = false; + $fprec = false; + $fprimary = false; + $fnoquote = false; + $fdefts = false; + $fdefdate = false; + $fconstraint = false; + $fnotnull = false; + $funsigned = false; + + //----------------- + // Parse attributes + foreach($fld as $attr => $v) { + if ($attr == 2 && is_numeric($v)) $attr = 'SIZE'; + else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v); + + switch($attr) { + case '0': + case 'NAME': $fname = $v; break; + case '1': + case 'TYPE': $ty = $v; $ftype = $this->ActualType(strtoupper($v)); break; + + case 'SIZE': + $dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,','); + if ($dotat === false) $fsize = $v; + else { + $fsize = substr($v,0,$dotat); + $fprec = substr($v,$dotat+1); + } + break; + case 'UNSIGNED': $funsigned = true; break; + case 'AUTOINCREMENT': + case 'AUTO': $fautoinc = true; $fnotnull = true; break; + case 'KEY': + case 'PRIMARY': $fprimary = $v; $fnotnull = true; break; + case 'DEF': + case 'DEFAULT': $fdefault = $v; break; + case 'NOTNULL': $fnotnull = $v; break; + case 'NOQUOTE': $fnoquote = $v; break; + case 'DEFDATE': $fdefdate = $v; break; + case 'DEFTIMESTAMP': $fdefts = $v; break; + case 'CONSTRAINT': $fconstraint = $v; break; + } //switch + } // foreach $fld + + //-------------------- + // VALIDATE FIELD INFO + if (!strlen($fname)) { + if ($this->debug) ADOConnection::outp("Undefined NAME"); + return false; + } + + $fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname)); + $fname = $this->NameQuote($fname); + + if (!strlen($ftype)) { + if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'"); + return false; + } else { + $ftype = strtoupper($ftype); + } + + $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec); + + if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls + + if ($fprimary) $pkey[] = $fname; + + // some databases do not allow blobs to have defaults + if ($ty == 'X') $fdefault = false; + + //-------------------- + // CONSTRUCT FIELD SQL + if ($fdefts) { + if (substr($this->connection->databaseType,0,5) == 'mysql') { + $ftype = 'TIMESTAMP'; + } else { + $fdefault = $this->connection->sysTimeStamp; + } + } else if ($fdefdate) { + if (substr($this->connection->databaseType,0,5) == 'mysql') { + $ftype = 'TIMESTAMP'; + } else { + $fdefault = $this->connection->sysDate; + } + } else if (strlen($fdefault) && !$fnoquote) + if ($ty == 'C' or $ty == 'X' or + ( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) + if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') + $fdefault = trim($fdefault); + else if (strtolower($fdefault) != 'null') + $fdefault = $this->connection->qstr($fdefault); + $suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); + + $fname = str_pad($fname,16); + $lines[$fid] = $fname.' '.$ftype.$suffix; + + if ($fautoinc) $this->autoIncrement = true; + } // foreach $flds + + return array($lines,$pkey); + } + /* + GENERATE THE SIZE PART OF THE DATATYPE + $ftype is the actual type + $ty is the type defined originally in the DDL + */ + function _GetSize($ftype, $ty, $fsize, $fprec) + { + if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) { + $ftype .= "(".$fsize; + if (strlen($fprec)) $ftype .= ",".$fprec; + $ftype .= ')'; + } + return $ftype; + } + + + // return string must begin with space + function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint) + { + $suffix = ''; + if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault"; + if ($fnotnull) $suffix .= ' NOT NULL'; + if ($fconstraint) $suffix .= ' '.$fconstraint; + return $suffix; + } + + function _IndexSQL($idxname, $tabname, $flds, $idxoptions) + { + $sql = array(); + + if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) { + $sql[] = sprintf ($this->dropIndex, $idxname); + if ( isset($idxoptions['DROP']) ) + return $sql; + } + + if ( empty ($flds) ) { + return $sql; + } + + $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : ''; + + $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' '; + + if ( isset($idxoptions[$this->upperName]) ) + $s .= $idxoptions[$this->upperName]; + + if ( is_array($flds) ) + $flds = implode(', ',$flds); + $s .= '(' . $flds . ')'; + $sql[] = $s; + + return $sql; + } + + function _DropAutoIncrement($tabname) + { + return false; + } + + function _TableSQL($tabname,$lines,$pkey,$tableoptions) + { + $sql = array(); + + if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) { + $sql[] = sprintf($this->dropTable,$tabname); + if ($this->autoIncrement) { + $sInc = $this->_DropAutoIncrement($tabname); + if ($sInc) $sql[] = $sInc; + } + if ( isset ($tableoptions['DROP']) ) { + return $sql; + } + } + $s = "CREATE TABLE $tabname (\n"; + $s .= implode(",\n", $lines); + if (sizeof($pkey)>0) { + $s .= ",\n PRIMARY KEY ("; + $s .= implode(", ",$pkey).")"; + } + if (isset($tableoptions['CONSTRAINTS'])) + $s .= "\n".$tableoptions['CONSTRAINTS']; + + if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) + $s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; + + $s .= "\n)"; + if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName]; + $sql[] = $s; + + return $sql; + } + + /* + GENERATE TRIGGERS IF NEEDED + used when table has auto-incrementing field that is emulated using triggers + */ + function _Triggers($tabname,$taboptions) + { + return array(); + } + + /* + Sanitize options, so that array elements with no keys are promoted to keys + */ + function _Options($opts) + { + if (!is_array($opts)) return array(); + $newopts = array(); + foreach($opts as $k => $v) { + if (is_numeric($k)) $newopts[strtoupper($v)] = $v; + else $newopts[strtoupper($k)] = $v; + } + return $newopts; + } + + /* + "Florian Buzin [ easywe ]" + + This function changes/adds new fields to your table. You don't + have to know if the col is new or not. It will check on its own. + */ + function ChangeTableSQL($tablename, $flds, $tableoptions = false) + { + if ( !is_array($cols = &$this->MetaColumns($tablename)) ) { + return $this->CreateTableSQL($tablename, $flds, $tableoptions); + } + + list($lines,$pkey) = $this->_GenFields($flds); + $alter = 'ALTER TABLE ' . $this->TableName($tablename); + $sql = array(); + + foreach ( $lines as $id => $v ) { + if ( isset($cols[$id]) && is_object($cols[$id]) ) { + $sql[] = $alter . $this->alterCol . ' ' . $v; + } else { + $sql[] = $alter . $this->addCol . ' ' . $v; + } + } + + return $sql; + } +} // class ?> \ No newline at end of file diff --git a/lib/adodb/adodb-error.inc.php b/lib/adodb/adodb-error.inc.php index f874caf922c..b21f809e53c 100644 --- a/lib/adodb/adodb-error.inc.php +++ b/lib/adodb/adodb-error.inc.php @@ -1,253 +1,253 @@ - DB_ERROR_NOSUCHTABLE, - '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/' => DB_ERROR_ALREADY_EXISTS, - '/divide by zero$/' => DB_ERROR_DIVZERO, - '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER, - '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD, - '/parser: parse error at or near \"/' => DB_ERROR_SYNTAX, - '/referential integrity violation/' => DB_ERROR_CONSTRAINT - ); - reset($error_regexps); - while (list($regexp,$code) = each($error_regexps)) { - if (preg_match($regexp, $errormsg)) { - return $code; - } - } - // Fall back to DB_ERROR if there was no mapping. - return DB_ERROR; -} - -function adodb_error_odbc() -{ -static $MAP = array( - '01004' => DB_ERROR_TRUNCATED, - '07001' => DB_ERROR_MISMATCH, - '21S01' => DB_ERROR_MISMATCH, - '21S02' => DB_ERROR_MISMATCH, - '22003' => DB_ERROR_INVALID_NUMBER, - '22008' => DB_ERROR_INVALID_DATE, - '22012' => DB_ERROR_DIVZERO, - '23000' => DB_ERROR_CONSTRAINT, - '24000' => DB_ERROR_INVALID, - '34000' => DB_ERROR_INVALID, - '37000' => DB_ERROR_SYNTAX, - '42000' => DB_ERROR_SYNTAX, - 'IM001' => DB_ERROR_UNSUPPORTED, - 'S0000' => DB_ERROR_NOSUCHTABLE, - 'S0001' => DB_ERROR_NOT_FOUND, - 'S0002' => DB_ERROR_NOSUCHTABLE, - 'S0011' => DB_ERROR_ALREADY_EXISTS, - 'S0012' => DB_ERROR_NOT_FOUND, - 'S0021' => DB_ERROR_ALREADY_EXISTS, - 'S0022' => DB_ERROR_NOT_FOUND, - 'S1000' => DB_ERROR_NOSUCHTABLE, - 'S1009' => DB_ERROR_INVALID, - 'S1090' => DB_ERROR_INVALID, - 'S1C00' => DB_ERROR_NOT_CAPABLE - ); - return $MAP; -} - -function adodb_error_ibase() -{ -static $MAP = array( - -104 => DB_ERROR_SYNTAX, - -150 => DB_ERROR_ACCESS_VIOLATION, - -151 => DB_ERROR_ACCESS_VIOLATION, - -155 => DB_ERROR_NOSUCHTABLE, - -157 => DB_ERROR_NOSUCHFIELD, - -158 => DB_ERROR_VALUE_COUNT_ON_ROW, - -170 => DB_ERROR_MISMATCH, - -171 => DB_ERROR_MISMATCH, - -172 => DB_ERROR_INVALID, - -204 => DB_ERROR_INVALID, - -205 => DB_ERROR_NOSUCHFIELD, - -206 => DB_ERROR_NOSUCHFIELD, - -208 => DB_ERROR_INVALID, - -219 => DB_ERROR_NOSUCHTABLE, - -297 => DB_ERROR_CONSTRAINT, - -530 => DB_ERROR_CONSTRAINT, - -803 => DB_ERROR_CONSTRAINT, - -551 => DB_ERROR_ACCESS_VIOLATION, - -552 => DB_ERROR_ACCESS_VIOLATION, - -922 => DB_ERROR_NOSUCHDB, - -923 => DB_ERROR_CONNECT_FAILED, - -924 => DB_ERROR_CONNECT_FAILED - ); - - return $MAP; -} - -function adodb_error_ifx() -{ -static $MAP = array( - '-201' => DB_ERROR_SYNTAX, - '-206' => DB_ERROR_NOSUCHTABLE, - '-217' => DB_ERROR_NOSUCHFIELD, - '-329' => DB_ERROR_NODBSELECTED, - '-1204' => DB_ERROR_INVALID_DATE, - '-1205' => DB_ERROR_INVALID_DATE, - '-1206' => DB_ERROR_INVALID_DATE, - '-1209' => DB_ERROR_INVALID_DATE, - '-1210' => DB_ERROR_INVALID_DATE, - '-1212' => DB_ERROR_INVALID_DATE - ); - - return $MAP; -} - -function adodb_error_oci8() -{ -static $MAP = array( - 1 => DB_ERROR_ALREADY_EXISTS, - 900 => DB_ERROR_SYNTAX, - 904 => DB_ERROR_NOSUCHFIELD, - 923 => DB_ERROR_SYNTAX, - 942 => DB_ERROR_NOSUCHTABLE, - 955 => DB_ERROR_ALREADY_EXISTS, - 1476 => DB_ERROR_DIVZERO, - 1722 => DB_ERROR_INVALID_NUMBER, - 2289 => DB_ERROR_NOSUCHTABLE, - 2291 => DB_ERROR_CONSTRAINT, - 2449 => DB_ERROR_CONSTRAINT - ); - - return $MAP; -} - -function adodb_error_mssql() -{ -static $MAP = array( - 208 => DB_ERROR_NOSUCHTABLE, - 2601 => DB_ERROR_ALREADY_EXISTS - ); - - return $MAP; -} - -function adodb_error_sqlite() -{ -static $MAP = array( - 1 => DB_ERROR_SYNTAX - ); - - return $MAP; -} - -function adodb_error_mysql() -{ -static $MAP = array( - 1004 => DB_ERROR_CANNOT_CREATE, - 1005 => DB_ERROR_CANNOT_CREATE, - 1006 => DB_ERROR_CANNOT_CREATE, - 1007 => DB_ERROR_ALREADY_EXISTS, - 1008 => DB_ERROR_CANNOT_DROP, - 1045 => DB_ERROR_ACCESS_VIOLATION, - 1046 => DB_ERROR_NODBSELECTED, - 1049 => DB_ERROR_NOSUCHDB, - 1050 => DB_ERROR_ALREADY_EXISTS, - 1051 => DB_ERROR_NOSUCHTABLE, - 1054 => DB_ERROR_NOSUCHFIELD, - 1062 => DB_ERROR_ALREADY_EXISTS, - 1064 => DB_ERROR_SYNTAX, - 1100 => DB_ERROR_NOT_LOCKED, - 1136 => DB_ERROR_VALUE_COUNT_ON_ROW, - 1146 => DB_ERROR_NOSUCHTABLE, - 1048 => DB_ERROR_CONSTRAINT, - 2002 => DB_ERROR_CONNECT_FAILED - ); - - return $MAP; -} + DB_ERROR_NOSUCHTABLE, + '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/' => DB_ERROR_ALREADY_EXISTS, + '/divide by zero$/' => DB_ERROR_DIVZERO, + '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER, + '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD, + '/parser: parse error at or near \"/' => DB_ERROR_SYNTAX, + '/referential integrity violation/' => DB_ERROR_CONSTRAINT + ); + reset($error_regexps); + while (list($regexp,$code) = each($error_regexps)) { + if (preg_match($regexp, $errormsg)) { + return $code; + } + } + // Fall back to DB_ERROR if there was no mapping. + return DB_ERROR; +} + +function adodb_error_odbc() +{ +static $MAP = array( + '01004' => DB_ERROR_TRUNCATED, + '07001' => DB_ERROR_MISMATCH, + '21S01' => DB_ERROR_MISMATCH, + '21S02' => DB_ERROR_MISMATCH, + '22003' => DB_ERROR_INVALID_NUMBER, + '22008' => DB_ERROR_INVALID_DATE, + '22012' => DB_ERROR_DIVZERO, + '23000' => DB_ERROR_CONSTRAINT, + '24000' => DB_ERROR_INVALID, + '34000' => DB_ERROR_INVALID, + '37000' => DB_ERROR_SYNTAX, + '42000' => DB_ERROR_SYNTAX, + 'IM001' => DB_ERROR_UNSUPPORTED, + 'S0000' => DB_ERROR_NOSUCHTABLE, + 'S0001' => DB_ERROR_NOT_FOUND, + 'S0002' => DB_ERROR_NOSUCHTABLE, + 'S0011' => DB_ERROR_ALREADY_EXISTS, + 'S0012' => DB_ERROR_NOT_FOUND, + 'S0021' => DB_ERROR_ALREADY_EXISTS, + 'S0022' => DB_ERROR_NOT_FOUND, + 'S1000' => DB_ERROR_NOSUCHTABLE, + 'S1009' => DB_ERROR_INVALID, + 'S1090' => DB_ERROR_INVALID, + 'S1C00' => DB_ERROR_NOT_CAPABLE + ); + return $MAP; +} + +function adodb_error_ibase() +{ +static $MAP = array( + -104 => DB_ERROR_SYNTAX, + -150 => DB_ERROR_ACCESS_VIOLATION, + -151 => DB_ERROR_ACCESS_VIOLATION, + -155 => DB_ERROR_NOSUCHTABLE, + -157 => DB_ERROR_NOSUCHFIELD, + -158 => DB_ERROR_VALUE_COUNT_ON_ROW, + -170 => DB_ERROR_MISMATCH, + -171 => DB_ERROR_MISMATCH, + -172 => DB_ERROR_INVALID, + -204 => DB_ERROR_INVALID, + -205 => DB_ERROR_NOSUCHFIELD, + -206 => DB_ERROR_NOSUCHFIELD, + -208 => DB_ERROR_INVALID, + -219 => DB_ERROR_NOSUCHTABLE, + -297 => DB_ERROR_CONSTRAINT, + -530 => DB_ERROR_CONSTRAINT, + -803 => DB_ERROR_CONSTRAINT, + -551 => DB_ERROR_ACCESS_VIOLATION, + -552 => DB_ERROR_ACCESS_VIOLATION, + -922 => DB_ERROR_NOSUCHDB, + -923 => DB_ERROR_CONNECT_FAILED, + -924 => DB_ERROR_CONNECT_FAILED + ); + + return $MAP; +} + +function adodb_error_ifx() +{ +static $MAP = array( + '-201' => DB_ERROR_SYNTAX, + '-206' => DB_ERROR_NOSUCHTABLE, + '-217' => DB_ERROR_NOSUCHFIELD, + '-329' => DB_ERROR_NODBSELECTED, + '-1204' => DB_ERROR_INVALID_DATE, + '-1205' => DB_ERROR_INVALID_DATE, + '-1206' => DB_ERROR_INVALID_DATE, + '-1209' => DB_ERROR_INVALID_DATE, + '-1210' => DB_ERROR_INVALID_DATE, + '-1212' => DB_ERROR_INVALID_DATE + ); + + return $MAP; +} + +function adodb_error_oci8() +{ +static $MAP = array( + 1 => DB_ERROR_ALREADY_EXISTS, + 900 => DB_ERROR_SYNTAX, + 904 => DB_ERROR_NOSUCHFIELD, + 923 => DB_ERROR_SYNTAX, + 942 => DB_ERROR_NOSUCHTABLE, + 955 => DB_ERROR_ALREADY_EXISTS, + 1476 => DB_ERROR_DIVZERO, + 1722 => DB_ERROR_INVALID_NUMBER, + 2289 => DB_ERROR_NOSUCHTABLE, + 2291 => DB_ERROR_CONSTRAINT, + 2449 => DB_ERROR_CONSTRAINT + ); + + return $MAP; +} + +function adodb_error_mssql() +{ +static $MAP = array( + 208 => DB_ERROR_NOSUCHTABLE, + 2601 => DB_ERROR_ALREADY_EXISTS + ); + + return $MAP; +} + +function adodb_error_sqlite() +{ +static $MAP = array( + 1 => DB_ERROR_SYNTAX + ); + + return $MAP; +} + +function adodb_error_mysql() +{ +static $MAP = array( + 1004 => DB_ERROR_CANNOT_CREATE, + 1005 => DB_ERROR_CANNOT_CREATE, + 1006 => DB_ERROR_CANNOT_CREATE, + 1007 => DB_ERROR_ALREADY_EXISTS, + 1008 => DB_ERROR_CANNOT_DROP, + 1045 => DB_ERROR_ACCESS_VIOLATION, + 1046 => DB_ERROR_NODBSELECTED, + 1049 => DB_ERROR_NOSUCHDB, + 1050 => DB_ERROR_ALREADY_EXISTS, + 1051 => DB_ERROR_NOSUCHTABLE, + 1054 => DB_ERROR_NOSUCHFIELD, + 1062 => DB_ERROR_ALREADY_EXISTS, + 1064 => DB_ERROR_SYNTAX, + 1100 => DB_ERROR_NOT_LOCKED, + 1136 => DB_ERROR_VALUE_COUNT_ON_ROW, + 1146 => DB_ERROR_NOSUCHTABLE, + 1048 => DB_ERROR_CONSTRAINT, + 2002 => DB_ERROR_CONNECT_FAILED + ); + + return $MAP; +} ?> \ No newline at end of file diff --git a/lib/adodb/adodb-errorhandler.inc.php b/lib/adodb/adodb-errorhandler.inc.php index f57263f0c1d..94b4d4742a4 100644 --- a/lib/adodb/adodb-errorhandler.inc.php +++ b/lib/adodb/adodb-errorhandler.inc.php @@ -1,78 +1,78 @@ -$s

"; - trigger_error($s,ADODB_ERROR_HANDLER_TYPE); -} -?> +$s

"; + trigger_error($s,ADODB_ERROR_HANDLER_TYPE); +} +?> diff --git a/lib/adodb/adodb-errorpear.inc.php b/lib/adodb/adodb-errorpear.inc.php index c83f73334a1..ddc13aebb39 100644 --- a/lib/adodb/adodb-errorpear.inc.php +++ b/lib/adodb/adodb-errorpear.inc.php @@ -1,88 +1,88 @@ -!$s

"; -} - -/** -* Returns last PEAR_Error object. This error might be for an error that -* occured several sql statements ago. -*/ -function &ADODB_PEAR_Error() -{ -global $ADODB_Last_PEAR_Error; - - return $ADODB_Last_PEAR_Error; -} - +!$s

"; +} + +/** +* Returns last PEAR_Error object. This error might be for an error that +* occured several sql statements ago. +*/ +function &ADODB_PEAR_Error() +{ +global $ADODB_Last_PEAR_Error; + + return $ADODB_Last_PEAR_Error; +} + ?> \ No newline at end of file diff --git a/lib/adodb/adodb-exceptions.inc.php b/lib/adodb/adodb-exceptions.inc.php index 0e70ac14898..e4378e3283a 100644 --- a/lib/adodb/adodb-exceptions.inc.php +++ b/lib/adodb/adodb-exceptions.inc.php @@ -1,77 +1,78 @@ -sql = $p1; - $this->params = $p2; - $s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n"; - break; - - case 'PCONNECT': - case 'CONNECT': - $user = $thisConnection->user; - $s = "$dbms error: [$errno: $errmsg] in $fn($p1, '$user', '****', $p2)\n"; - break; - default: - $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n"; - break; - } - - $this->dbms = $dbms; - $this->host = $thisConnection->host; - $this->database = $thisConnection->database; - $this->fn = $fn; - $this->msg = $errmsg; - - parent::__construct($s,$errno); - } -} - -/** -* Default Error Handler. This will be called with the following params -* -* @param $dbms the RDBMS you are connecting to -* @param $fn the name of the calling function (in uppercase) -* @param $errno the native error number from the database -* @param $errmsg the native error msg from the database -* @param $p1 $fn specific parameter - see below -* @param $P2 $fn specific parameter - see below -*/ - -function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection) -{ -global $ADODB_EXCEPTION; - - if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION; - else $errfn = 'ADODB_EXCEPTION'; - throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection); -} - - +sql = $p1; + $this->params = $p2; + $s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n"; + break; + + case 'PCONNECT': + case 'CONNECT': + $user = $thisConnection->user; + $s = "$dbms error: [$errno: $errmsg] in $fn($p1, '$user', '****', $p2)\n"; + break; + default: + $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n"; + break; + } + + $this->dbms = $dbms; + $this->host = $thisConnection->host; + $this->database = $thisConnection->database; + $this->fn = $fn; + $this->msg = $errmsg; + + if (!is_numeric($errno)) $errno = -1; + parent::__construct($s,$errno); + } +} + +/** +* Default Error Handler. This will be called with the following params +* +* @param $dbms the RDBMS you are connecting to +* @param $fn the name of the calling function (in uppercase) +* @param $errno the native error number from the database +* @param $errmsg the native error msg from the database +* @param $p1 $fn specific parameter - see below +* @param $P2 $fn specific parameter - see below +*/ + +function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection) +{ +global $ADODB_EXCEPTION; + + if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION; + else $errfn = 'ADODB_EXCEPTION'; + throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection); +} + + ?> \ No newline at end of file diff --git a/lib/adodb/adodb-iterator.inc.php b/lib/adodb/adodb-iterator.inc.php index 1817fade304..f1d794f9a44 100644 --- a/lib/adodb/adodb-iterator.inc.php +++ b/lib/adodb/adodb-iterator.inc.php @@ -1,56 +1,56 @@ -Execute("select * from adoxyz"); - foreach($rs as $k => $v) { - echo $k; print_r($v); echo "
"; - } - */ - -class ADODB_Iterator implements Iterator { - - private $rs; - - function __construct($rs) - { - $this->rs = $rs; - } - function rewind() - { - $this->rs->MoveFirst(); - } - function hasMore() - { - return !$this->rs->EOF; - } - function key() - { - return $this->rs->_currentRow; - } - function current() - { - return $this->rs->fields; - } - function next() - { - $this->rs->MoveNext(); - } -} - - -class ADODB_BASE_RS implements IteratorAggregate { - function getIterator() { - return new ADODB_Iterator($this); - } -} - +Execute("select * from adoxyz"); + foreach($rs as $k => $v) { + echo $k; print_r($v); echo "
"; + } + */ + +class ADODB_Iterator implements Iterator { + + private $rs; + + function __construct($rs) + { + $this->rs = $rs; + } + function rewind() + { + $this->rs->MoveFirst(); + } + function hasMore() + { + return !$this->rs->EOF; + } + function key() + { + return $this->rs->_currentRow; + } + function current() + { + return $this->rs->fields; + } + function next() + { + $this->rs->MoveNext(); + } +} + + +class ADODB_BASE_RS implements IteratorAggregate { + function getIterator() { + return new ADODB_Iterator($this); + } +} + ?> \ No newline at end of file diff --git a/lib/adodb/adodb-lib.inc.php b/lib/adodb/adodb-lib.inc.php index 1c8d360d519..271de9d1fd2 100644 --- a/lib/adodb/adodb-lib.inc.php +++ b/lib/adodb/adodb-lib.inc.php @@ -1,549 +1,558 @@ -$value) - $new_array[strtoupper($key)] = $value; - - return $new_array; - } - - return $an_array; -} - -function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc) -{ - if (count($fieldArray) == 0) return 0; - $first = true; - $uSet = ''; - - if (!is_array($keyCol)) { - $keyCol = array($keyCol); - } - foreach($fieldArray as $k => $v) { - if ($autoQuote && !is_numeric($v) and strncmp($v,"'",1) !== 0 and strcasecmp($v,'null')!=0) { - $v = $zthis->qstr($v); - $fieldArray[$k] = $v; - } - if (in_array($k,$keyCol)) continue; // skip UPDATE if is key - - if ($first) { - $first = false; - $uSet = "$k=$v"; - } else - $uSet .= ",$k=$v"; - } - - $where = false; - foreach ($keyCol as $v) { - if ($where) $where .= " and $v=$fieldArray[$v]"; - else $where = "$v=$fieldArray[$v]"; - } - - if ($uSet && $where) { - $update = "UPDATE $table SET $uSet WHERE $where"; - - $rs = $zthis->Execute($update); - if ($rs) { - if ($zthis->poorAffectedRows) { - /* - The Select count(*) wipes out any errors that the update would have returned. - http://phplens.com/lens/lensforum/msgs.php?id=5696 - */ - if ($zthis->ErrorNo()<>0) return 0; - - # affected_rows == 0 if update field values identical to old values - # for mysql - which is silly. - - $cnt = $zthis->GetOne("select count(*) from $table where $where"); - if ($cnt > 0) return 1; // record already exists - } else - if (($zthis->Affected_Rows()>0)) return 1; - } - } - // print "

Error=".$this->ErrorNo().'

'; - $first = true; - foreach($fieldArray as $k => $v) { - if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col - - if ($first) { - $first = false; - $iCols = "$k"; - $iVals = "$v"; - } else { - $iCols .= ",$k"; - $iVals .= ",$v"; - } - } - $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; - $rs = $zthis->Execute($insert); - return ($rs) ? 2 : 0; -} - -// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM -function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, - $size=0, $selectAttr='',$compareFields0=true) -{ - $hasvalue = false; - - if ($multiple or is_array($defstr)) { - if ($size==0) $size=5; - $attr = " multiple size=$size"; - if (!strpos($name,'[]')) $name .= '[]'; - } else if ($size) $attr = " size=$size"; - else $attr =''; - - $s = "\n"; -} - -/* - Count the number of records this sql statement will return by using - query rewriting techniques... - - Does not work with UNIONs. -*/ -function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) -{ - $qryRecs = 0; - - if (preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || preg_match('/\s+GROUP\s+BY\s+/is',$sql)) { - // ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias - // but this is only supported by oracle and postgresql... - if ($zthis->dataProvider == 'oci8') { - - $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); - $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)"; - - } else if ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7') { - - $info = $zthis->ServerInfo(); - if (substr($info['version'],0,3) >= 7.1) { // good till version 999 - $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); - $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_"; - } - } - } else { - // now replace SELECT ... FROM with SELECT COUNT(*) FROM - - $rewritesql = preg_replace( - '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql); - - // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails - // with mssql, access and postgresql. Also a good speedup optimization - skips sorting! - $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql); - } - - if (isset($rewritesql) && $rewritesql != $sql) { - if ($secs2cache) { - // we only use half the time of secs2cache because the count can quickly - // become inaccurate if new records are added - $qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr); - - } else { - $qryRecs = $zthis->GetOne($rewritesql,$inputarr); - } - if ($qryRecs !== false) return $qryRecs; - } - - //-------------------------------------------- - // query rewrite failed - so try slower way... - - // strip off unneeded ORDER BY - $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); - $rstest = &$zthis->Execute($rewritesql,$inputarr); - if ($rstest) { - $qryRecs = $rstest->RecordCount(); - if ($qryRecs == -1) { - global $ADODB_EXTENSION; - // some databases will return -1 on MoveLast() - change to MoveNext() - if ($ADODB_EXTENSION) { - while(!$rstest->EOF) { - adodb_movenext($rstest); - } - } else { - while(!$rstest->EOF) { - $rstest->MoveNext(); - } - } - $qryRecs = $rstest->_currentRow; - } - $rstest->Close(); - if ($qryRecs == -1) return 0; - } - - return $qryRecs; -} - -/* - Code originally from "Cornel G" - - This code will not work with SQL that has UNION in it - - Also if you are using CachePageExecute(), there is a strong possibility that - data will get out of synch. use CachePageExecute() only with tables that - rarely change. -*/ -function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, - $inputarr=false, $secs2cache=0) -{ - $atfirstpage = false; - $atlastpage = false; - $lastpageno=1; - - // If an invalid nrows is supplied, - // we assume a default value of 10 rows per page - if (!isset($nrows) || $nrows <= 0) $nrows = 10; - - $qryRecs = false; //count records for no offset - - $qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache); - $lastpageno = (int) ceil($qryRecs / $nrows); - $zthis->_maxRecordCount = $qryRecs; - - // If page number <= 1, then we are at the first page - if (!isset($page) || $page <= 1) { - $page = 1; - $atfirstpage = true; - } - - // ***** Here we check whether $page is the last page or - // whether we are trying to retrieve - // a page number greater than the last page number. - if ($page >= $lastpageno) { - $page = $lastpageno; - $atlastpage = true; - } - - // We get the data we want - $offset = $nrows * ($page-1); - if ($secs2cache > 0) - $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); - else - $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); - - - // Before returning the RecordSet, we set the pagination properties we need - if ($rsreturn) { - $rsreturn->_maxRecordCount = $qryRecs; - $rsreturn->rowsPerPage = $nrows; - $rsreturn->AbsolutePage($page); - $rsreturn->AtFirstPage($atfirstpage); - $rsreturn->AtLastPage($atlastpage); - $rsreturn->LastPageNo($lastpageno); - } - return $rsreturn; -} - -// Iván Oliva version -function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) -{ - - $atfirstpage = false; - $atlastpage = false; - - if (!isset($page) || $page <= 1) { // If page number <= 1, then we are at the first page - $page = 1; - $atfirstpage = true; - } - if ($nrows <= 0) $nrows = 10; // If an invalid nrows is supplied, we assume a default value of 10 rows per page - - // ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than - // the last page number. - $pagecounter = $page + 1; - $pagecounteroffset = ($pagecounter * $nrows) - $nrows; - if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr); - else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache); - if ($rstest) { - while ($rstest && $rstest->EOF && $pagecounter>0) { - $atlastpage = true; - $pagecounter--; - $pagecounteroffset = $nrows * ($pagecounter - 1); - $rstest->Close(); - if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr); - else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache); - } - if ($rstest) $rstest->Close(); - } - if ($atlastpage) { // If we are at the last page or beyond it, we are going to retrieve it - $page = $pagecounter; - if ($page == 1) $atfirstpage = true; // We have to do this again in case the last page is the same as the first - //... page, that is, the recordset has only 1 page. - } - - // We get the data we want - $offset = $nrows * ($page-1); - if ($secs2cache > 0) $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); - else $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); - - // Before returning the RecordSet, we set the pagination properties we need - if ($rsreturn) { - $rsreturn->rowsPerPage = $nrows; - $rsreturn->AbsolutePage($page); - $rsreturn->AtFirstPage($atfirstpage); - $rsreturn->AtLastPage($atlastpage); - } - return $rsreturn; -} - -function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false) -{ - if (!$rs) { - printf(ADODB_BAD_RS,'GetUpdateSQL'); - return false; - } - - $fieldUpdatedCount = 0; - $arrFields = _array_change_key_case($arrFields); - - $hasnumeric = isset($rs->fields[0]); - $updateSQL = ''; - - // Loop through all of the fields in the recordset - for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) { - - // Get the field from the recordset - $field = $rs->FetchField($i); - - // If the recordset field is one - // of the fields passed in then process. - $upperfname = strtoupper($field->name); - if (adodb_key_exists($upperfname,$arrFields)) { - - // If the existing field value in the recordset - // is different from the value passed in then - // go ahead and append the field name and new value to - // the update query. - - if ($hasnumeric) $val = $rs->fields[$i]; - else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname]; - else if (isset($rs->fields[$field->name])) $val = $rs->fields[$field->name]; - else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)]; - else $val = ''; - - if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) { - // Set the counter for the number of fields that will be updated. - $fieldUpdatedCount++; - - // Based on the datatype of the field - // Format the value properly for the database - $mt = $rs->MetaType($field->type); - - // "mike" patch and "Ryan Bailey" - //PostgreSQL uses a 't' or 'f' and therefore needs to be processed as a string ('C') type field. - if ((strncmp($zthis->databaseType,"postgres",8) === 0) && ($mt == "L")) $mt = "C"; - // is_null requires php 4.0.4 - if ((defined('ADODB_FORCE_NULLS') && is_null($arrFields[$upperfname])) || $arrFields[$upperfname] === 'null') - $updateSQL .= $field->name . " = null, "; - else - switch($mt) { - case 'null': - case "C": - case "X": - case 'B': - $updateSQL .= $field->name . " = " . $zthis->qstr($arrFields[$upperfname],$magicq) . ", "; - break; - case "D": - $updateSQL .= $field->name . " = " . $zthis->DBDate($arrFields[$upperfname]) . ", "; - break; - case "T": - $updateSQL .= $field->name . " = " . $zthis->DBTimeStamp($arrFields[$upperfname]) . ", "; - break; - default: - $val = $arrFields[$upperfname]; - if (!is_numeric($val)) $val = (float) $val; - $updateSQL .= $field->name . " = " . $val . ", "; - break; - }; - }; - }; - }; - - // If there were any modified fields then build the rest of the update query. - if ($fieldUpdatedCount > 0 || $forceUpdate) { - - // Get the table name from the existing query. - preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); - - // Get the full where clause excluding the word "WHERE" from - // the existing query. - preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause); - - $discard = false; - // not a good hack, improvements? - if ($whereClause) - preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard); - else - $whereClause = array(false,false); - - if ($discard) - $whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1])); - - // updateSQL will contain the full update query when all - // processing has completed. - $updateSQL = "UPDATE " . $tableName[1] . " SET ".substr($updateSQL, 0, -2); - - // If the recordset has a where clause then use that same where clause - // for the update. - if ($whereClause[1]) $updateSQL .= " WHERE " . $whereClause[1]; - - return $updateSQL; - } else { - return false; - }; -} - -function adodb_key_exists($key, &$arr) -{ - if (!defined('ADODB_FORCE_NULLS')) { - // the following is the old behaviour where null or empty fields are ignored - return (!empty($arr[$key])) || (isset($arr[$key]) && strlen($arr[$key])>0); - } - - if (isset($arr[$key])) return true; - ## null check below - if (ADODB_PHPVER >= 0x4010) return array_key_exists($key,$arr); - return false; -} - -function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false) -{ - $values = ''; - $fields = ''; - $arrFields = _array_change_key_case($arrFields); - - if (!$rs) { - printf(ADODB_BAD_RS,'GetInsertSQL'); - return false; - } - - $fieldInsertedCount = 0; - - // Loop through all of the fields in the recordset - for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) { - - // Get the field from the recordset - $field = $rs->FetchField($i); - // If the recordset field is one - // of the fields passed in then process. - $upperfname = strtoupper($field->name); - if (adodb_key_exists($upperfname,$arrFields)) { - - // Set the counter for the number of fields that will be inserted. - $fieldInsertedCount++; - - // Get the name of the fields to insert - $fields .= $field->name . ", "; - - $mt = $rs->MetaType($field->type); - - // "mike" patch and "Ryan Bailey" - //PostgreSQL uses a 't' or 'f' and therefore needs to be processed as a string ('C') type field. - if ((strncmp($zthis->databaseType,"postgres",8) === 0) && ($mt == "L")) $mt = "C"; - - // Based on the datatype of the field - // Format the value properly for the database - if ((defined('ADODB_FORCE_NULLS') && is_null($arrFields[$upperfname])) || $arrFields[$upperfname] === 'null') - $values .= "null, "; - else - switch($mt) { - case "C": - case "X": - case 'B': - $values .= $zthis->qstr($arrFields[$upperfname],$magicq) . ", "; - break; - case "D": - $values .= $zthis->DBDate($arrFields[$upperfname]) . ", "; - break; - case "T": - $values .= $zthis->DBTimeStamp($arrFields[$upperfname]) . ", "; - break; - default: - $val = $arrFields[$upperfname]; - if (!is_numeric($val)) $val = (float) $val; - $values .= $val . ", "; - break; - }; - }; - }; - - // If there were any inserted fields then build the rest of the insert query. - if ($fieldInsertedCount <= 0) return false; - - // Get the table name from the existing query. - preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); - - // Strip off the comma and space on the end of both the fields - // and their values. - $fields = substr($fields, 0, -2); - $values = substr($values, 0, -2); - - // Append the fields and their values to the insert query. - $insertSQL = "INSERT INTO " . $tableName[1] . " ( $fields ) VALUES ( $values )"; - - return $insertSQL; -} - - +$value) + $new_array[strtoupper($key)] = $value; + + return $new_array; + } + + return $an_array; +} + +function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc) +{ + if (count($fieldArray) == 0) return 0; + $first = true; + $uSet = ''; + + if (!is_array($keyCol)) { + $keyCol = array($keyCol); + } + foreach($fieldArray as $k => $v) { + if ($autoQuote && !is_numeric($v) and strncmp($v,"'",1) !== 0 and strcasecmp($v,'null')!=0) { + $v = $zthis->qstr($v); + $fieldArray[$k] = $v; + } + if (in_array($k,$keyCol)) continue; // skip UPDATE if is key + + if ($first) { + $first = false; + $uSet = "$k=$v"; + } else + $uSet .= ",$k=$v"; + } + + $where = false; + foreach ($keyCol as $v) { + if ($where) $where .= " and $v=$fieldArray[$v]"; + else $where = "$v=$fieldArray[$v]"; + } + + if ($uSet && $where) { + $update = "UPDATE $table SET $uSet WHERE $where"; + + $rs = $zthis->Execute($update); + if ($rs) { + if ($zthis->poorAffectedRows) { + /* + The Select count(*) wipes out any errors that the update would have returned. + http://phplens.com/lens/lensforum/msgs.php?id=5696 + */ + if ($zthis->ErrorNo()<>0) return 0; + + # affected_rows == 0 if update field values identical to old values + # for mysql - which is silly. + + $cnt = $zthis->GetOne("select count(*) from $table where $where"); + if ($cnt > 0) return 1; // record already exists + } else + if (($zthis->Affected_Rows()>0)) return 1; + } + } + // print "

Error=".$this->ErrorNo().'

'; + $first = true; + foreach($fieldArray as $k => $v) { + if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col + + if ($first) { + $first = false; + $iCols = "$k"; + $iVals = "$v"; + } else { + $iCols .= ",$k"; + $iVals .= ",$v"; + } + } + $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; + $rs = $zthis->Execute($insert); + return ($rs) ? 2 : 0; +} + +// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM +function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, + $size=0, $selectAttr='',$compareFields0=true) +{ + $hasvalue = false; + + if ($multiple or is_array($defstr)) { + if ($size==0) $size=5; + $attr = " multiple size=$size"; + if (!strpos($name,'[]')) $name .= '[]'; + } else if ($size) $attr = " size=$size"; + else $attr =''; + + $s = "\n"; +} + +/* + Count the number of records this sql statement will return by using + query rewriting techniques... + + Does not work with UNIONs. +*/ +function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) +{ + $qryRecs = 0; + + if (preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || preg_match('/\s+GROUP\s+BY\s+/is',$sql)) { + // ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias + // but this is only supported by oracle and postgresql... + if ($zthis->dataProvider == 'oci8') { + + $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); + $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)"; + + } else if ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7') { + + $info = $zthis->ServerInfo(); + if (substr($info['version'],0,3) >= 7.1) { // good till version 999 + $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); + $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_"; + } + } + } else { + // now replace SELECT ... FROM with SELECT COUNT(*) FROM + + $rewritesql = preg_replace( + '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql); + + // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails + // with mssql, access and postgresql. Also a good speedup optimization - skips sorting! + $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql); + } + + if (isset($rewritesql) && $rewritesql != $sql) { + if ($secs2cache) { + // we only use half the time of secs2cache because the count can quickly + // become inaccurate if new records are added + $qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr); + + } else { + $qryRecs = $zthis->GetOne($rewritesql,$inputarr); + } + if ($qryRecs !== false) return $qryRecs; + } + + //-------------------------------------------- + // query rewrite failed - so try slower way... + + // strip off unneeded ORDER BY + $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); + $rstest = &$zthis->Execute($rewritesql,$inputarr); + if ($rstest) { + $qryRecs = $rstest->RecordCount(); + if ($qryRecs == -1) { + global $ADODB_EXTENSION; + // some databases will return -1 on MoveLast() - change to MoveNext() + if ($ADODB_EXTENSION) { + while(!$rstest->EOF) { + adodb_movenext($rstest); + } + } else { + while(!$rstest->EOF) { + $rstest->MoveNext(); + } + } + $qryRecs = $rstest->_currentRow; + } + $rstest->Close(); + if ($qryRecs == -1) return 0; + } + + return $qryRecs; +} + +/* + Code originally from "Cornel G" + + This code will not work with SQL that has UNION in it + + Also if you are using CachePageExecute(), there is a strong possibility that + data will get out of synch. use CachePageExecute() only with tables that + rarely change. +*/ +function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, + $inputarr=false, $secs2cache=0) +{ + $atfirstpage = false; + $atlastpage = false; + $lastpageno=1; + + // If an invalid nrows is supplied, + // we assume a default value of 10 rows per page + if (!isset($nrows) || $nrows <= 0) $nrows = 10; + + $qryRecs = false; //count records for no offset + + $qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache); + $lastpageno = (int) ceil($qryRecs / $nrows); + $zthis->_maxRecordCount = $qryRecs; + + // If page number <= 1, then we are at the first page + if (!isset($page) || $page <= 1) { + $page = 1; + $atfirstpage = true; + } + + // ***** Here we check whether $page is the last page or + // whether we are trying to retrieve + // a page number greater than the last page number. + if ($page >= $lastpageno) { + $page = $lastpageno; + $atlastpage = true; + } + + // We get the data we want + $offset = $nrows * ($page-1); + if ($secs2cache > 0) + $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); + else + $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); + + + // Before returning the RecordSet, we set the pagination properties we need + if ($rsreturn) { + $rsreturn->_maxRecordCount = $qryRecs; + $rsreturn->rowsPerPage = $nrows; + $rsreturn->AbsolutePage($page); + $rsreturn->AtFirstPage($atfirstpage); + $rsreturn->AtLastPage($atlastpage); + $rsreturn->LastPageNo($lastpageno); + } + return $rsreturn; +} + +// Iván Oliva version +function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) +{ + + $atfirstpage = false; + $atlastpage = false; + + if (!isset($page) || $page <= 1) { // If page number <= 1, then we are at the first page + $page = 1; + $atfirstpage = true; + } + if ($nrows <= 0) $nrows = 10; // If an invalid nrows is supplied, we assume a default value of 10 rows per page + + // ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than + // the last page number. + $pagecounter = $page + 1; + $pagecounteroffset = ($pagecounter * $nrows) - $nrows; + if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr); + else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache); + if ($rstest) { + while ($rstest && $rstest->EOF && $pagecounter>0) { + $atlastpage = true; + $pagecounter--; + $pagecounteroffset = $nrows * ($pagecounter - 1); + $rstest->Close(); + if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr); + else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache); + } + if ($rstest) $rstest->Close(); + } + if ($atlastpage) { // If we are at the last page or beyond it, we are going to retrieve it + $page = $pagecounter; + if ($page == 1) $atfirstpage = true; // We have to do this again in case the last page is the same as the first + //... page, that is, the recordset has only 1 page. + } + + // We get the data we want + $offset = $nrows * ($page-1); + if ($secs2cache > 0) $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); + else $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); + + // Before returning the RecordSet, we set the pagination properties we need + if ($rsreturn) { + $rsreturn->rowsPerPage = $nrows; + $rsreturn->AbsolutePage($page); + $rsreturn->AtFirstPage($atfirstpage); + $rsreturn->AtLastPage($atlastpage); + } + return $rsreturn; +} + +function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false) +{ + if (!$rs) { + printf(ADODB_BAD_RS,'GetUpdateSQL'); + return false; + } + + $fieldUpdatedCount = 0; + $arrFields = _array_change_key_case($arrFields); + + $hasnumeric = isset($rs->fields[0]); + $updateSQL = ''; + + // Loop through all of the fields in the recordset + for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) { + + // Get the field from the recordset + $field = $rs->FetchField($i); + + // If the recordset field is one + // of the fields passed in then process. + $upperfname = strtoupper($field->name); + if (adodb_key_exists($upperfname,$arrFields)) { + + // If the existing field value in the recordset + // is different from the value passed in then + // go ahead and append the field name and new value to + // the update query. + + if ($hasnumeric) $val = $rs->fields[$i]; + else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname]; + else if (isset($rs->fields[$field->name])) $val = $rs->fields[$field->name]; + else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)]; + else $val = ''; + + if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) { + // Set the counter for the number of fields that will be updated. + $fieldUpdatedCount++; + + // Based on the datatype of the field + // Format the value properly for the database + $mt = $rs->MetaType($field->type); + + // "mike" patch and "Ryan Bailey" + //PostgreSQL uses a 't' or 'f' and therefore needs to be processed as a string ('C') type field. + if ((strncmp($zthis->databaseType,"postgres",8) === 0) && ($mt == "L")) $mt = "C"; + // is_null requires php 4.0.4 + if ((defined('ADODB_FORCE_NULLS') && is_null($arrFields[$upperfname])) || $arrFields[$upperfname] === 'null') + $updateSQL .= $field->name . " = null, "; + else + switch($mt) { + case 'null': + case "C": + case "X": + case 'B': + $updateSQL .= $field->name . " = " . $zthis->qstr($arrFields[$upperfname],$magicq) . ", "; + break; + case "D": + $updateSQL .= $field->name . " = " . $zthis->DBDate($arrFields[$upperfname]) . ", "; + break; + case "T": + $updateSQL .= $field->name . " = " . $zthis->DBTimeStamp($arrFields[$upperfname]) . ", "; + break; + default: + $val = $arrFields[$upperfname]; + /*if (!is_numeric($val)) { + if (strncmp($val,'=',1) == 0) $val = substr($val,1); + else $val = (float) $val; + }*/ + if (empty($val)) $val = '0'; + + $updateSQL .= $field->name . " = " . $val . ", "; + break; + }; + }; + }; + }; + + // If there were any modified fields then build the rest of the update query. + if ($fieldUpdatedCount > 0 || $forceUpdate) { + + // Get the table name from the existing query. + preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); + + // Get the full where clause excluding the word "WHERE" from + // the existing query. + preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause); + + $discard = false; + // not a good hack, improvements? + if ($whereClause) + preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard); + else + $whereClause = array(false,false); + + if ($discard) + $whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1])); + + // updateSQL will contain the full update query when all + // processing has completed. + $updateSQL = "UPDATE " . $tableName[1] . " SET ".substr($updateSQL, 0, -2); + + // If the recordset has a where clause then use that same where clause + // for the update. + if ($whereClause[1]) $updateSQL .= " WHERE " . $whereClause[1]; + + return $updateSQL; + } else { + return false; + }; +} + +function adodb_key_exists($key, &$arr) +{ + if (!defined('ADODB_FORCE_NULLS')) { + // the following is the old behaviour where null or empty fields are ignored + return (!empty($arr[$key])) || (isset($arr[$key]) && strlen($arr[$key])>0); + } + + if (isset($arr[$key])) return true; + ## null check below + if (ADODB_PHPVER >= 0x4010) return array_key_exists($key,$arr); + return false; +} + +function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false) +{ + $values = ''; + $fields = ''; + $arrFields = _array_change_key_case($arrFields); + + if (!$rs) { + printf(ADODB_BAD_RS,'GetInsertSQL'); + return false; + } + + $fieldInsertedCount = 0; + + // Loop through all of the fields in the recordset + for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) { + + // Get the field from the recordset + $field = $rs->FetchField($i); + // If the recordset field is one + // of the fields passed in then process. + $upperfname = strtoupper($field->name); + if (adodb_key_exists($upperfname,$arrFields)) { + + // Set the counter for the number of fields that will be inserted. + $fieldInsertedCount++; + + // Get the name of the fields to insert + $fields .= $field->name . ", "; + + $mt = $rs->MetaType($field->type); + + // "mike" patch and "Ryan Bailey" + //PostgreSQL uses a 't' or 'f' and therefore needs to be processed as a string ('C') type field. + if ((strncmp($zthis->databaseType,"postgres",8) === 0) && ($mt == "L")) $mt = "C"; + + // Based on the datatype of the field + // Format the value properly for the database + if ((defined('ADODB_FORCE_NULLS') && is_null($arrFields[$upperfname])) || $arrFields[$upperfname] === 'null') + $values .= "null, "; + else + switch($mt) { + case "C": + case "X": + case 'B': + $values .= $zthis->qstr($arrFields[$upperfname],$magicq) . ", "; + break; + case "D": + $values .= $zthis->DBDate($arrFields[$upperfname]) . ", "; + break; + case "T": + $values .= $zthis->DBTimeStamp($arrFields[$upperfname]) . ", "; + break; + default: + $val = $arrFields[$upperfname]; + /*if (!is_numeric($val)) { + if (strncmp($val,'=',1) == 0) $val = substr($val,1); + else $val = (float) $val; + }*/ + if (empty($val)) $val = '0'; + $values .= $val . ", "; + break; + }; + }; + }; + + // If there were any inserted fields then build the rest of the insert query. + if ($fieldInsertedCount <= 0) return false; + + // Get the table name from the existing query. + preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); + + // Strip off the comma and space on the end of both the fields + // and their values. + $fields = substr($fields, 0, -2); + $values = substr($values, 0, -2); + + // Append the fields and their values to the insert query. + $insertSQL = "INSERT INTO " . $tableName[1] . " ( $fields ) VALUES ( $values )"; + + return $insertSQL; +} + + ?> \ No newline at end of file diff --git a/lib/adodb/adodb-pager.inc.php b/lib/adodb/adodb-pager.inc.php index ebff53faf12..037636d7e25 100644 --- a/lib/adodb/adodb-pager.inc.php +++ b/lib/adodb/adodb-pager.inc.php @@ -1,285 +1,285 @@ - implemented Render_PageLinks(). - - Please note, this class is entirely unsupported, - and no free support requests except for bug reports - will be entertained by the author. - -*/ -class ADODB_Pager { - var $id; // unique id for pager (defaults to 'adodb') - var $db; // ADODB connection object - var $sql; // sql used - var $rs; // recordset generated - var $curr_page; // current page number before Render() called, calculated in constructor - var $rows; // number of rows per page - var $linksPerPage=10; // number of links per page in navigation bar - var $showPageLinks; - - var $gridAttributes = 'width=100% border=1 bgcolor=white'; - - // Localize text strings here - var $first = '|<'; - var $prev = '<<'; - var $next = '>>'; - var $last = '>|'; - var $moreLinks = '...'; - var $startLinks = '...'; - var $gridHeader = false; - var $htmlSpecialChars = true; - var $page = 'Page'; - var $linkSelectedColor = 'red'; - var $cache = 0; #secs to cache with CachePageExecute() - - //---------------------------------------------- - // constructor - // - // $db adodb connection object - // $sql sql statement - // $id optional id to identify which pager, - // if you have multiple on 1 page. - // $id should be only be [a-z0-9]* - // - function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false) - { - global $HTTP_SERVER_VARS,$PHP_SELF,$HTTP_SESSION_VARS,$HTTP_GET_VARS; - - $curr_page = $id.'_curr_page'; - if (empty($PHP_SELF)) $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF']; - - $this->sql = $sql; - $this->id = $id; - $this->db = $db; - $this->showPageLinks = $showPageLinks; - - $next_page = $id.'_next_page'; - - if (isset($HTTP_GET_VARS[$next_page])) { - $HTTP_SESSION_VARS[$curr_page] = $HTTP_GET_VARS[$next_page]; - } - if (empty($HTTP_SESSION_VARS[$curr_page])) $HTTP_SESSION_VARS[$curr_page] = 1; ## at first page - - $this->curr_page = $HTTP_SESSION_VARS[$curr_page]; - - } - - //--------------------------- - // Display link to first page - function Render_First($anchor=true) - { - global $PHP_SELF; - if ($anchor) { - ?> - first;?>   - first   "; - } - } - - //-------------------------- - // Display link to next page - function render_next($anchor=true) - { - global $PHP_SELF; - - if ($anchor) { - ?> - next;?>   - next   "; - } - } - - //------------------ - // Link to last page - // - // for better performance with large recordsets, you can set - // $this->db->pageExecuteCountRows = false, which disables - // last page counting. - function render_last($anchor=true) - { - global $PHP_SELF; - - if (!$this->db->pageExecuteCountRows) return; - - if ($anchor) { - ?> - last;?>   - last   "; - } - } - - //--------------------------------------------------- - // original code by "Pablo Costa" - function render_pagelinks() - { - global $PHP_SELF; - $pages = $this->rs->LastPageNo(); - $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages; - for($i=1; $i <= $pages; $i+=$linksperpage) - { - if($this->rs->AbsolutePage() >= $i) - { - $start = $i; - } - } - $numbers = ''; - $end = $start+$linksperpage-1; - $link = $this->id . "_next_page"; - if($end > $pages) $end = $pages; - - - if ($this->startLinks && $start > 1) { - $pos = $start - 1; - $numbers .= "$this->startLinks "; - } - - for($i=$start; $i <= $end; $i++) { - if ($this->rs->AbsolutePage() == $i) - $numbers .= "linkSelectedColor>$i "; - else - $numbers .= "$i "; - - } - if ($this->moreLinks && $end < $pages) - $numbers .= "$this->moreLinks "; - print $numbers . '   '; - } - // Link to previous page - function render_prev($anchor=true) - { - global $PHP_SELF; - if ($anchor) { - ?> - prev;?>   - prev   "; - } - } - - //-------------------------------------------------------- - // Simply rendering of grid. You should override this for - // better control over the format of the grid - // - // We use output buffering to keep code clean and readable. - function RenderGrid() - { - global $gSQLBlockRows; // used by rs2html to indicate how many rows to display - include_once(ADODB_DIR.'/tohtml.inc.php'); - ob_start(); - $gSQLBlockRows = $this->rows; - rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars); - $s = ob_get_contents(); - ob_end_clean(); - return $s; - } - - //------------------------------------------------------- - // Navigation bar - // - // we use output buffering to keep the code easy to read. - function RenderNav() - { - ob_start(); - if (!$this->rs->AtFirstPage()) { - $this->Render_First(); - $this->Render_Prev(); - } else { - $this->Render_First(false); - $this->Render_Prev(false); - } - if ($this->showPageLinks){ - $this->Render_PageLinks(); - } - if (!$this->rs->AtLastPage()) { - $this->Render_Next(); - $this->Render_Last(); - } else { - $this->Render_Next(false); - $this->Render_Last(false); - } - $s = ob_get_contents(); - ob_end_clean(); - return $s; - } - - //------------------- - // This is the footer - function RenderPageCount() - { - if (!$this->db->pageExecuteCountRows) return ''; - $lastPage = $this->rs->LastPageNo(); - if ($lastPage == -1) $lastPage = 1; // check for empty rs. - return "$this->page ".$this->curr_page."/".$lastPage.""; - } - - //----------------------------------- - // Call this class to draw everything. - function Render($rows=10) - { - global $ADODB_COUNTRECS; - - $this->rows = $rows; - - $savec = $ADODB_COUNTRECS; - if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true; - if ($this->cache) - $rs = &$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page); - else - $rs = &$this->db->PageExecute($this->sql,$rows,$this->curr_page); - $ADODB_COUNTRECS = $savec; - - $this->rs = &$rs; - if (!$rs) { - print "

Query failed: $this->sql

"; - return; - } - - if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) - $header = $this->RenderNav(); - else - $header = " "; - - $grid = $this->RenderGrid(); - $footer = $this->RenderPageCount(); - $rs->Close(); - $this->rs = false; - - $this->RenderLayout($header,$grid,$footer); - } - - //------------------------------------------------------ - // override this to control overall layout and formating - function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige') - { - echo "
", - $header, - "
", - $grid, - "
", - $footer, - "
"; - } -} - - -?> + implemented Render_PageLinks(). + + Please note, this class is entirely unsupported, + and no free support requests except for bug reports + will be entertained by the author. + +*/ +class ADODB_Pager { + var $id; // unique id for pager (defaults to 'adodb') + var $db; // ADODB connection object + var $sql; // sql used + var $rs; // recordset generated + var $curr_page; // current page number before Render() called, calculated in constructor + var $rows; // number of rows per page + var $linksPerPage=10; // number of links per page in navigation bar + var $showPageLinks; + + var $gridAttributes = 'width=100% border=1 bgcolor=white'; + + // Localize text strings here + var $first = '|<'; + var $prev = '<<'; + var $next = '>>'; + var $last = '>|'; + var $moreLinks = '...'; + var $startLinks = '...'; + var $gridHeader = false; + var $htmlSpecialChars = true; + var $page = 'Page'; + var $linkSelectedColor = 'red'; + var $cache = 0; #secs to cache with CachePageExecute() + + //---------------------------------------------- + // constructor + // + // $db adodb connection object + // $sql sql statement + // $id optional id to identify which pager, + // if you have multiple on 1 page. + // $id should be only be [a-z0-9]* + // + function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false) + { + global $HTTP_SERVER_VARS,$PHP_SELF,$HTTP_SESSION_VARS,$HTTP_GET_VARS; + + $curr_page = $id.'_curr_page'; + if (empty($PHP_SELF)) $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF']; + + $this->sql = $sql; + $this->id = $id; + $this->db = $db; + $this->showPageLinks = $showPageLinks; + + $next_page = $id.'_next_page'; + + if (isset($HTTP_GET_VARS[$next_page])) { + $HTTP_SESSION_VARS[$curr_page] = $HTTP_GET_VARS[$next_page]; + } + if (empty($HTTP_SESSION_VARS[$curr_page])) $HTTP_SESSION_VARS[$curr_page] = 1; ## at first page + + $this->curr_page = $HTTP_SESSION_VARS[$curr_page]; + + } + + //--------------------------- + // Display link to first page + function Render_First($anchor=true) + { + global $PHP_SELF; + if ($anchor) { + ?> + first;?>   + first   "; + } + } + + //-------------------------- + // Display link to next page + function render_next($anchor=true) + { + global $PHP_SELF; + + if ($anchor) { + ?> + next;?>   + next   "; + } + } + + //------------------ + // Link to last page + // + // for better performance with large recordsets, you can set + // $this->db->pageExecuteCountRows = false, which disables + // last page counting. + function render_last($anchor=true) + { + global $PHP_SELF; + + if (!$this->db->pageExecuteCountRows) return; + + if ($anchor) { + ?> + last;?>   + last   "; + } + } + + //--------------------------------------------------- + // original code by "Pablo Costa" + function render_pagelinks() + { + global $PHP_SELF; + $pages = $this->rs->LastPageNo(); + $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages; + for($i=1; $i <= $pages; $i+=$linksperpage) + { + if($this->rs->AbsolutePage() >= $i) + { + $start = $i; + } + } + $numbers = ''; + $end = $start+$linksperpage-1; + $link = $this->id . "_next_page"; + if($end > $pages) $end = $pages; + + + if ($this->startLinks && $start > 1) { + $pos = $start - 1; + $numbers .= "$this->startLinks "; + } + + for($i=$start; $i <= $end; $i++) { + if ($this->rs->AbsolutePage() == $i) + $numbers .= "linkSelectedColor>$i "; + else + $numbers .= "$i "; + + } + if ($this->moreLinks && $end < $pages) + $numbers .= "$this->moreLinks "; + print $numbers . '   '; + } + // Link to previous page + function render_prev($anchor=true) + { + global $PHP_SELF; + if ($anchor) { + ?> + prev;?>   + prev   "; + } + } + + //-------------------------------------------------------- + // Simply rendering of grid. You should override this for + // better control over the format of the grid + // + // We use output buffering to keep code clean and readable. + function RenderGrid() + { + global $gSQLBlockRows; // used by rs2html to indicate how many rows to display + include_once(ADODB_DIR.'/tohtml.inc.php'); + ob_start(); + $gSQLBlockRows = $this->rows; + rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars); + $s = ob_get_contents(); + ob_end_clean(); + return $s; + } + + //------------------------------------------------------- + // Navigation bar + // + // we use output buffering to keep the code easy to read. + function RenderNav() + { + ob_start(); + if (!$this->rs->AtFirstPage()) { + $this->Render_First(); + $this->Render_Prev(); + } else { + $this->Render_First(false); + $this->Render_Prev(false); + } + if ($this->showPageLinks){ + $this->Render_PageLinks(); + } + if (!$this->rs->AtLastPage()) { + $this->Render_Next(); + $this->Render_Last(); + } else { + $this->Render_Next(false); + $this->Render_Last(false); + } + $s = ob_get_contents(); + ob_end_clean(); + return $s; + } + + //------------------- + // This is the footer + function RenderPageCount() + { + if (!$this->db->pageExecuteCountRows) return ''; + $lastPage = $this->rs->LastPageNo(); + if ($lastPage == -1) $lastPage = 1; // check for empty rs. + return "$this->page ".$this->curr_page."/".$lastPage.""; + } + + //----------------------------------- + // Call this class to draw everything. + function Render($rows=10) + { + global $ADODB_COUNTRECS; + + $this->rows = $rows; + + $savec = $ADODB_COUNTRECS; + if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true; + if ($this->cache) + $rs = &$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page); + else + $rs = &$this->db->PageExecute($this->sql,$rows,$this->curr_page); + $ADODB_COUNTRECS = $savec; + + $this->rs = &$rs; + if (!$rs) { + print "

Query failed: $this->sql

"; + return; + } + + if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) + $header = $this->RenderNav(); + else + $header = " "; + + $grid = $this->RenderGrid(); + $footer = $this->RenderPageCount(); + $rs->Close(); + $this->rs = false; + + $this->RenderLayout($header,$grid,$footer); + } + + //------------------------------------------------------ + // override this to control overall layout and formating + function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige') + { + echo "
", + $header, + "
", + $grid, + "
", + $footer, + "
"; + } +} + + +?> \ No newline at end of file diff --git a/lib/adodb/adodb-pear.inc.php b/lib/adodb/adodb-pear.inc.php index 3c97dc5c16e..3894730469c 100644 --- a/lib/adodb/adodb-pear.inc.php +++ b/lib/adodb/adodb-pear.inc.php @@ -1,359 +1,359 @@ - | - * and Tomas V.V.Cox . Portions (c)1997-2002 The PHP Group. - */ - - /* - We support: - - DB_Common - --------- - query - returns PEAR_Error on error - limitQuery - return PEAR_Error on error - prepare - does not return PEAR_Error on error - execute - does not return PEAR_Error on error - setFetchMode - supports ASSOC and ORDERED - errorNative - quote - nextID - disconnect - - DB_Result - --------- - numRows - returns -1 if not supported - numCols - fetchInto - does not support passing of fetchmode - fetchRows - does not support passing of fetchmode - free - */ - -define('ADODB_PEAR',dirname(__FILE__)); -include_once "PEAR.php"; -include_once ADODB_PEAR."/adodb-errorpear.inc.php"; -include_once ADODB_PEAR."/adodb.inc.php"; - -if (!defined('DB_OK')) { -define("DB_OK", 1); -define("DB_ERROR",-1); -/** - * This is a special constant that tells DB the user hasn't specified - * any particular get mode, so the default should be used. - */ - -define('DB_FETCHMODE_DEFAULT', 0); - -/** - * Column data indexed by numbers, ordered from 0 and up - */ - -define('DB_FETCHMODE_ORDERED', 1); - -/** - * Column data indexed by column names - */ - -define('DB_FETCHMODE_ASSOC', 2); - -/* for compatibility */ - -define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED); -define('DB_GETMODE_ASSOC', DB_FETCHMODE_ASSOC); - -/** - * these are constants for the tableInfo-function - * they are bitwised or'ed. so if there are more constants to be defined - * in the future, adjust DB_TABLEINFO_FULL accordingly - */ - -define('DB_TABLEINFO_ORDER', 1); -define('DB_TABLEINFO_ORDERTABLE', 2); -define('DB_TABLEINFO_FULL', 3); -} - -/** - * The main "DB" class is simply a container class with some static - * methods for creating DB objects as well as some utility functions - * common to all parts of DB. - * - */ - -class DB -{ - /** - * Create a new DB object for the specified database type - * - * @param $type string database type, for example "mysql" - * - * @return object a newly created DB object, or a DB error code on - * error - */ - - function &factory($type) - { - include_once(ADODB_DIR."/drivers/adodb-$type.inc.php"); - $obj = &NewADOConnection($type); - if (!is_object($obj)) $obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1); - return $obj; - } - - /** - * Create a new DB object and connect to the specified database - * - * @param $dsn mixed "data source name", see the DB::parseDSN - * method for a description of the dsn format. Can also be - * specified as an array of the format returned by DB::parseDSN. - * - * @param $options mixed if boolean (or scalar), tells whether - * this connection should be persistent (for backends that support - * this). This parameter can also be an array of options, see - * DB_common::setOption for more information on connection - * options. - * - * @return object a newly created DB connection object, or a DB - * error object on error - * - * @see DB::parseDSN - * @see DB::isError - */ - function &connect($dsn, $options = false) - { - if (is_array($dsn)) { - $dsninfo = $dsn; - } else { - $dsninfo = DB::parseDSN($dsn); - } - switch ($dsninfo["phptype"]) { - case 'pgsql': $type = 'postgres7'; break; - case 'ifx': $type = 'informix9'; break; - default: $type = $dsninfo["phptype"]; break; - } - - if (is_array($options) && isset($options["debug"]) && - $options["debug"] >= 2) { - // expose php errors with sufficient debug level - @include_once("adodb-$type.inc.php"); - } else { - @include_once("adodb-$type.inc.php"); - } - - @$obj =& NewADOConnection($type); - if (!is_object($obj)) { - $obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1); - return $obj; - } - if (is_array($options)) { - foreach($options as $k => $v) { - switch(strtolower($k)) { - case 'persistent': $persist = $v; break; - #ibase - case 'dialect': $obj->dialect = $v; break; - case 'charset': $obj->charset = $v; break; - case 'buffers': $obj->buffers = $v; break; - #ado - case 'charpage': $obj->charPage = $v; break; - #mysql - case 'clientflags': $obj->clientFlags = $v; break; - } - } - } else { - $persist = false; - } - - if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket']; - else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port']; - - if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); - else $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); - - if (!$ok) $obj = ADODB_PEAR_Error(); - return $obj; - } - - /** - * Return the DB API version - * - * @return int the DB API version number - */ - function apiVersion() - { - return 2; - } - - /** - * Tell whether a result code from a DB method is an error - * - * @param $value int result code - * - * @return bool whether $value is an error - */ - function isError($value) - { - return (is_object($value) && - (get_class($value) == 'db_error' || - is_subclass_of($value, 'db_error'))); - } - - - /** - * Tell whether a result code from a DB method is a warning. - * Warnings differ from errors in that they are generated by DB, - * and are not fatal. - * - * @param $value mixed result value - * - * @return bool whether $value is a warning - */ - function isWarning($value) - { - return is_object($value) && - (get_class( $value ) == "db_warning" || - is_subclass_of($value, "db_warning")); - } - - /** - * Parse a data source name - * - * @param $dsn string Data Source Name to be parsed - * - * @return array an associative array with the following keys: - * - * phptype: Database backend used in PHP (mysql, odbc etc.) - * dbsyntax: Database used with regards to SQL syntax etc. - * protocol: Communication protocol to use (tcp, unix etc.) - * hostspec: Host specification (hostname[:port]) - * database: Database to use on the DBMS server - * username: User name for login - * password: Password for login - * - * The format of the supplied DSN is in its fullest form: - * - * phptype(dbsyntax)://username:password@protocol+hostspec/database - * - * Most variations are allowed: - * - * phptype://username:password@protocol+hostspec:110//usr/db_file.db - * phptype://username:password@hostspec/database_name - * phptype://username:password@hostspec - * phptype://username@hostspec - * phptype://hostspec/database - * phptype://hostspec - * phptype(dbsyntax) - * phptype - * - * @author Tomas V.V.Cox - */ - function parseDSN($dsn) - { - if (is_array($dsn)) { - return $dsn; - } - - $parsed = array( - 'phptype' => false, - 'dbsyntax' => false, - 'protocol' => false, - 'hostspec' => false, - 'database' => false, - 'username' => false, - 'password' => false - ); - - // Find phptype and dbsyntax - if (($pos = strpos($dsn, '://')) !== false) { - $str = substr($dsn, 0, $pos); - $dsn = substr($dsn, $pos + 3); - } else { - $str = $dsn; - $dsn = NULL; - } - - // Get phptype and dbsyntax - // $str => phptype(dbsyntax) - if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) { - $parsed['phptype'] = $arr[1]; - $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2]; - } else { - $parsed['phptype'] = $str; - $parsed['dbsyntax'] = $str; - } - - if (empty($dsn)) { - return $parsed; - } - - // Get (if found): username and password - // $dsn => username:password@protocol+hostspec/database - if (($at = strpos($dsn,'@')) !== false) { - $str = substr($dsn, 0, $at); - $dsn = substr($dsn, $at + 1); - if (($pos = strpos($str, ':')) !== false) { - $parsed['username'] = urldecode(substr($str, 0, $pos)); - $parsed['password'] = urldecode(substr($str, $pos + 1)); - } else { - $parsed['username'] = urldecode($str); - } - } - - // Find protocol and hostspec - // $dsn => protocol+hostspec/database - if (($pos=strpos($dsn, '/')) !== false) { - $str = substr($dsn, 0, $pos); - $dsn = substr($dsn, $pos + 1); - } else { - $str = $dsn; - $dsn = NULL; - } - - // Get protocol + hostspec - // $str => protocol+hostspec - if (($pos=strpos($str, '+')) !== false) { - $parsed['protocol'] = substr($str, 0, $pos); - $parsed['hostspec'] = urldecode(substr($str, $pos + 1)); - } else { - $parsed['hostspec'] = urldecode($str); - } - - // Get dabase if any - // $dsn => database - if (!empty($dsn)) { - $parsed['database'] = $dsn; - } - - return $parsed; - } - - /** - * Load a PHP database extension if it is not loaded already. - * - * @access public - * - * @param $name the base name of the extension (without the .so or - * .dll suffix) - * - * @return bool true if the extension was already or successfully - * loaded, false if it could not be loaded - */ - function assertExtension($name) - { - if (!extension_loaded($name)) { - $dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so'; - @dl($name . $dlext); - } - if (!extension_loaded($name)) { - return false; - } - return true; - } -} - + | + * and Tomas V.V.Cox . Portions (c)1997-2002 The PHP Group. + */ + + /* + We support: + + DB_Common + --------- + query - returns PEAR_Error on error + limitQuery - return PEAR_Error on error + prepare - does not return PEAR_Error on error + execute - does not return PEAR_Error on error + setFetchMode - supports ASSOC and ORDERED + errorNative + quote + nextID + disconnect + + DB_Result + --------- + numRows - returns -1 if not supported + numCols + fetchInto - does not support passing of fetchmode + fetchRows - does not support passing of fetchmode + free + */ + +define('ADODB_PEAR',dirname(__FILE__)); +include_once "PEAR.php"; +include_once ADODB_PEAR."/adodb-errorpear.inc.php"; +include_once ADODB_PEAR."/adodb.inc.php"; + +if (!defined('DB_OK')) { +define("DB_OK", 1); +define("DB_ERROR",-1); +/** + * This is a special constant that tells DB the user hasn't specified + * any particular get mode, so the default should be used. + */ + +define('DB_FETCHMODE_DEFAULT', 0); + +/** + * Column data indexed by numbers, ordered from 0 and up + */ + +define('DB_FETCHMODE_ORDERED', 1); + +/** + * Column data indexed by column names + */ + +define('DB_FETCHMODE_ASSOC', 2); + +/* for compatibility */ + +define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED); +define('DB_GETMODE_ASSOC', DB_FETCHMODE_ASSOC); + +/** + * these are constants for the tableInfo-function + * they are bitwised or'ed. so if there are more constants to be defined + * in the future, adjust DB_TABLEINFO_FULL accordingly + */ + +define('DB_TABLEINFO_ORDER', 1); +define('DB_TABLEINFO_ORDERTABLE', 2); +define('DB_TABLEINFO_FULL', 3); +} + +/** + * The main "DB" class is simply a container class with some static + * methods for creating DB objects as well as some utility functions + * common to all parts of DB. + * + */ + +class DB +{ + /** + * Create a new DB object for the specified database type + * + * @param $type string database type, for example "mysql" + * + * @return object a newly created DB object, or a DB error code on + * error + */ + + function &factory($type) + { + include_once(ADODB_DIR."/drivers/adodb-$type.inc.php"); + $obj = &NewADOConnection($type); + if (!is_object($obj)) $obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1); + return $obj; + } + + /** + * Create a new DB object and connect to the specified database + * + * @param $dsn mixed "data source name", see the DB::parseDSN + * method for a description of the dsn format. Can also be + * specified as an array of the format returned by DB::parseDSN. + * + * @param $options mixed if boolean (or scalar), tells whether + * this connection should be persistent (for backends that support + * this). This parameter can also be an array of options, see + * DB_common::setOption for more information on connection + * options. + * + * @return object a newly created DB connection object, or a DB + * error object on error + * + * @see DB::parseDSN + * @see DB::isError + */ + function &connect($dsn, $options = false) + { + if (is_array($dsn)) { + $dsninfo = $dsn; + } else { + $dsninfo = DB::parseDSN($dsn); + } + switch ($dsninfo["phptype"]) { + case 'pgsql': $type = 'postgres7'; break; + case 'ifx': $type = 'informix9'; break; + default: $type = $dsninfo["phptype"]; break; + } + + if (is_array($options) && isset($options["debug"]) && + $options["debug"] >= 2) { + // expose php errors with sufficient debug level + @include_once("adodb-$type.inc.php"); + } else { + @include_once("adodb-$type.inc.php"); + } + + @$obj =& NewADOConnection($type); + if (!is_object($obj)) { + $obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1); + return $obj; + } + if (is_array($options)) { + foreach($options as $k => $v) { + switch(strtolower($k)) { + case 'persistent': $persist = $v; break; + #ibase + case 'dialect': $obj->dialect = $v; break; + case 'charset': $obj->charset = $v; break; + case 'buffers': $obj->buffers = $v; break; + #ado + case 'charpage': $obj->charPage = $v; break; + #mysql + case 'clientflags': $obj->clientFlags = $v; break; + } + } + } else { + $persist = false; + } + + if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket']; + else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port']; + + if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); + else $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); + + if (!$ok) $obj = ADODB_PEAR_Error(); + return $obj; + } + + /** + * Return the DB API version + * + * @return int the DB API version number + */ + function apiVersion() + { + return 2; + } + + /** + * Tell whether a result code from a DB method is an error + * + * @param $value int result code + * + * @return bool whether $value is an error + */ + function isError($value) + { + return (is_object($value) && + (get_class($value) == 'db_error' || + is_subclass_of($value, 'db_error'))); + } + + + /** + * Tell whether a result code from a DB method is a warning. + * Warnings differ from errors in that they are generated by DB, + * and are not fatal. + * + * @param $value mixed result value + * + * @return bool whether $value is a warning + */ + function isWarning($value) + { + return is_object($value) && + (get_class( $value ) == "db_warning" || + is_subclass_of($value, "db_warning")); + } + + /** + * Parse a data source name + * + * @param $dsn string Data Source Name to be parsed + * + * @return array an associative array with the following keys: + * + * phptype: Database backend used in PHP (mysql, odbc etc.) + * dbsyntax: Database used with regards to SQL syntax etc. + * protocol: Communication protocol to use (tcp, unix etc.) + * hostspec: Host specification (hostname[:port]) + * database: Database to use on the DBMS server + * username: User name for login + * password: Password for login + * + * The format of the supplied DSN is in its fullest form: + * + * phptype(dbsyntax)://username:password@protocol+hostspec/database + * + * Most variations are allowed: + * + * phptype://username:password@protocol+hostspec:110//usr/db_file.db + * phptype://username:password@hostspec/database_name + * phptype://username:password@hostspec + * phptype://username@hostspec + * phptype://hostspec/database + * phptype://hostspec + * phptype(dbsyntax) + * phptype + * + * @author Tomas V.V.Cox + */ + function parseDSN($dsn) + { + if (is_array($dsn)) { + return $dsn; + } + + $parsed = array( + 'phptype' => false, + 'dbsyntax' => false, + 'protocol' => false, + 'hostspec' => false, + 'database' => false, + 'username' => false, + 'password' => false + ); + + // Find phptype and dbsyntax + if (($pos = strpos($dsn, '://')) !== false) { + $str = substr($dsn, 0, $pos); + $dsn = substr($dsn, $pos + 3); + } else { + $str = $dsn; + $dsn = NULL; + } + + // Get phptype and dbsyntax + // $str => phptype(dbsyntax) + if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) { + $parsed['phptype'] = $arr[1]; + $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2]; + } else { + $parsed['phptype'] = $str; + $parsed['dbsyntax'] = $str; + } + + if (empty($dsn)) { + return $parsed; + } + + // Get (if found): username and password + // $dsn => username:password@protocol+hostspec/database + if (($at = strpos($dsn,'@')) !== false) { + $str = substr($dsn, 0, $at); + $dsn = substr($dsn, $at + 1); + if (($pos = strpos($str, ':')) !== false) { + $parsed['username'] = urldecode(substr($str, 0, $pos)); + $parsed['password'] = urldecode(substr($str, $pos + 1)); + } else { + $parsed['username'] = urldecode($str); + } + } + + // Find protocol and hostspec + // $dsn => protocol+hostspec/database + if (($pos=strpos($dsn, '/')) !== false) { + $str = substr($dsn, 0, $pos); + $dsn = substr($dsn, $pos + 1); + } else { + $str = $dsn; + $dsn = NULL; + } + + // Get protocol + hostspec + // $str => protocol+hostspec + if (($pos=strpos($str, '+')) !== false) { + $parsed['protocol'] = substr($str, 0, $pos); + $parsed['hostspec'] = urldecode(substr($str, $pos + 1)); + } else { + $parsed['hostspec'] = urldecode($str); + } + + // Get dabase if any + // $dsn => database + if (!empty($dsn)) { + $parsed['database'] = $dsn; + } + + return $parsed; + } + + /** + * Load a PHP database extension if it is not loaded already. + * + * @access public + * + * @param $name the base name of the extension (without the .so or + * .dll suffix) + * + * @return bool true if the extension was already or successfully + * loaded, false if it could not be loaded + */ + function assertExtension($name) + { + if (!extension_loaded($name)) { + $dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so'; + @dl($name . $dlext); + } + if (!extension_loaded($name)) { + return false; + } + return true; + } +} + ?> \ No newline at end of file diff --git a/lib/adodb/adodb-perf.inc.php b/lib/adodb/adodb-perf.inc.php index 9c0efd24d79..7444e1d9d8d 100644 --- a/lib/adodb/adodb-perf.inc.php +++ b/lib/adodb/adodb-perf.inc.php @@ -1,903 +1,903 @@ -fnExecute = false; - $t0 = microtime(); - $rs =& $conn->Execute($sql,$inputarr); - $t1 = microtime(); - - if (!empty($conn->_logsql)) { - $conn->_logsql = false; // disable logsql error simulation - $dbT = $conn->databaseType; - - $a0 = split(' ',$t0); - $a0 = (float)$a0[1]+(float)$a0[0]; - - $a1 = split(' ',$t1); - $a1 = (float)$a1[1]+(float)$a1[0]; - - $time = $a1 - $a0; - - if (!$rs) { - $errM = $conn->ErrorMsg(); - $errN = $conn->ErrorNo(); - $conn->lastInsID = 0; - $tracer = substr('ERROR: '.htmlspecialchars($errM),0,250); - } else { - $tracer = ''; - $errM = ''; - $errN = 0; - $dbg = $conn->debug; - $conn->debug = false; - if (!is_object($rs) || $rs->dataProvider == 'empty') - $conn->_affected = $conn->affected_rows(true); - $conn->lastInsID = @$conn->Insert_ID(); - $conn->debug = $dbg; - } - if (isset($HTTP_SERVER_VARS['HTTP_HOST'])) { - $tracer .= '
'.$HTTP_SERVER_VARS['HTTP_HOST']; - if (isset($HTTP_SERVER_VARS['PHP_SELF'])) $tracer .= $HTTP_SERVER_VARS['PHP_SELF']; - } else - if (isset($HTTP_SERVER_VARS['PHP_SELF'])) $tracer .= '
'.$HTTP_SERVER_VARS['PHP_SELF']; - //$tracer .= (string) adodb_backtrace(false); - - $tracer = substr($tracer,0,500); - - if (is_array($inputarr)) { - if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr); - else { - $params = ''; - $params = implode(', ',$inputarr); - if (strlen($params) >= 3000) $params = substr($params, 0, 3000); - } - } else { - $params = ''; - } - - if (is_array($sql)) $sql = $sql[0]; - $arr = array('b'=>trim(substr($sql,0,230)), - 'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>round($time,6)); - - $saved = $conn->debug; - $conn->debug = 0; - - if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') { - $isql = "insert into $perf_table values($conn->sysTimeStamp,:b,:c,:d,:e,:f)"; - } else if ($dbT == 'odbc_mssql' || $dbT == 'informix') { - $timer = $arr['f']; - if ($dbT == 'informix') $sql2 = substr($sql2,0,230); - - $sql1 = $conn->qstr($arr['b']); - $sql2 = $conn->qstr($arr['c']); - $params = $conn->qstr($arr['d']); - $tracer = $conn->qstr($arr['e']); - - $isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($conn->sysTimeStamp,$sql1,$sql2,$params,$tracer,$timer)"; - if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql); - $arr = false; - } else { - $isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $conn->sysTimeStamp,?,?,?,?,?)"; - } - $ok = $conn->Execute($isql,$arr); - $conn->debug = $saved; - - if ($ok) { - $conn->_logsql = true; - } else { - $err2 = $conn->ErrorMsg(); - $conn->_logsql = true; // enable logsql error simulation - $perf =& NewPerfMonitor($conn); - if ($perf) { - if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr); - } else { - $ok = $conn->Execute("create table $perf_table ( - created varchar(50), - sql0 varchar(250), - sql1 varchar(4000), - params varchar(3000), - tracer varchar(500), - timer decimal(16,6))"); - } - if (!$ok) { - ADOConnection::outp( "LOGSQL Insert Failed: $isql
$err2
"); - $conn->_logsql = false; - } - } - $conn->_errorMsg = $errM; - $conn->_errorCode = $errN; - } - $conn->fnExecute = 'adodb_log_sql'; - return $rs; -} - - -/* -The settings data structure is an associative array that database parameter per element. - -Each database parameter element in the array is itself an array consisting of: - -0: category code, used to group related db parameters -1: either - a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", - b. array holding sql string and field to look for, e.g. array('show variables','table_cache'), - c. a string prefixed by =, then a PHP method of the class is invoked, - e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue', -2: description of the database parameter -*/ - -class adodb_perf { - var $conn; - var $color = '#F0F0F0'; - var $table = ''; - var $titles = ''; - var $warnRatio = 90; - var $tablesSQL = false; - var $cliFormat = "%32s => %s \r\n"; - var $sql1 = 'sql1'; // used for casting sql1 to text for mssql - var $explain = true; - var $helpurl = "LogSQL help"; - var $createTableSQL = false; - var $maxLength = 2000; - - // Sets the tablename to be used - function table($newtable = false) - { - static $_table; - - if (!empty($newtable)) $_table = $newtable; - if (empty($_table)) $_table = 'adodb_logsql'; - return $_table; - } - - // returns array with info to calculate CPU Load - function _CPULoad() - { -/* - -cpu 524152 2662 2515228 336057010 -cpu0 264339 1408 1257951 168025827 -cpu1 259813 1254 1257277 168031181 -page 622307 25475680 -swap 24 1891 -intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -disk_io: (3,0):(3144904,54369,610378,3090535,50936192) (3,1):(3630212,54097,633016,3576115,50951320) -ctxt 66155838 -btime 1062315585 -processes 69293 - -*/ - // Algorithm is taken from - // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp - if (strncmp(PHP_OS,'WIN',3)==0) { - @$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'"); - if (!$c) return false; - - $info[0] = $c->PercentProcessorTime; - $info[1] = 0; - $info[2] = 0; - $info[3] = $c->TimeStamp_Sys100NS; - //print_r($info); - return $info; - } - - // Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com) - $statfile = '/proc/stat'; - if (!file_exists($statfile)) return false; - - $fd = fopen($statfile,"r"); - if (!$fd) return false; - - $statinfo = explode("\n",fgets($fd, 1024)); - fclose($fd); - foreach($statinfo as $line) { - $info = explode(" ",$line); - if($info[0]=="cpu") { - array_shift($info); // pop off "cpu" - if(!$info[0]) array_shift($info); // pop off blank space (if any) - return $info; - } - } - - return false; - - } - - /* NOT IMPLEMENTED */ - function MemInfo() - { - /* - - total: used: free: shared: buffers: cached: -Mem: 1055289344 917299200 137990144 0 165437440 599773184 -Swap: 2146775040 11055104 2135719936 -MemTotal: 1030556 kB -MemFree: 134756 kB -MemShared: 0 kB -Buffers: 161560 kB -Cached: 581384 kB -SwapCached: 4332 kB -Active: 494468 kB -Inact_dirty: 322856 kB -Inact_clean: 24256 kB -Inact_target: 168316 kB -HighTotal: 131064 kB -HighFree: 1024 kB -LowTotal: 899492 kB -LowFree: 133732 kB -SwapTotal: 2096460 kB -SwapFree: 2085664 kB -Committed_AS: 348732 kB - */ - } - - - /* - Remember that this is client load, not db server load! - */ - var $_lastLoad; - function CPULoad() - { - $info = $this->_CPULoad(); - if (!$info) return false; - - if (empty($this->_lastLoad)) { - sleep(1); - $this->_lastLoad = $info; - $info = $this->_CPULoad(); - } - - $last = $this->_lastLoad; - $this->_lastLoad = $info; - - $d_user = $info[0] - $last[0]; - $d_nice = $info[1] - $last[1]; - $d_system = $info[2] - $last[2]; - $d_idle = $info[3] - $last[3]; - - //printf("Delta - User: %f Nice: %f System: %f Idle: %f
",$d_user,$d_nice,$d_system,$d_idle); - - if (strncmp(PHP_OS,'WIN',3)==0) { - if ($d_idle < 1) $d_idle = 1; - return 100*(1-$d_user/$d_idle); - }else { - $total=$d_user+$d_nice+$d_system+$d_idle; - if ($total<1) $total=1; - return 100*($d_user+$d_nice+$d_system)/$total; - } - } - - function Tracer($sql) - { - $perf_table = adodb_perf::table(); - $saveE = $this->conn->fnExecute; - $this->conn->fnExecute = false; - - $sqlq = $this->conn->qstr($sql); - $arr = $this->conn->GetArray( -"select count(*),tracer - from $perf_table where sql1=$sqlq - group by tracer - order by 1 desc"); - $s = ''; - if ($arr) { - $s .= '

Scripts Affected

'; - foreach($arr as $k) { - $s .= sprintf("%4d",$k[0]).'   '.strip_tags($k[1]).'
'; - } - } - $this->conn->fnExecute = $saveE; - return $s; - } - - /* - Explain Plan for $sql. - If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the - actual sql. - */ - function Explain($sql,$partial=false) - { - return false; - } - - function InvalidSQL($numsql = 10) - { - global $HTTP_GET_VARS; - - if (isset($HTTP_GET_VARS['sql'])) return; - $s = '

Invalid SQL

'; - $saveE = $this->conn->fnExecute; - $this->conn->fnExecute = false; - $perf_table = adodb_perf::table(); - $rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql); - $this->conn->fnExecute = $saveE; - if ($rs) { - $s .= rs2html($rs,false,false,false,false); - } else - return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; - - return $s; - } - - - /* - This script identifies the longest running SQL - */ - function _SuspiciousSQL($numsql = 10) - { - global $ADODB_FETCH_MODE,$HTTP_GET_VARS; - - $perf_table = adodb_perf::table(); - $saveE = $this->conn->fnExecute; - $this->conn->fnExecute = false; - - if (isset($HTTP_GET_VARS['exps']) && isset($HTTP_GET_VARS['sql'])) { - $partial = !empty($HTTP_GET_VARS['part']); - echo "".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n"; - } - - if (isset($HTTP_GET_VARS['sql'])) return; - $sql1 = $this->sql1; - - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - //$this->conn->debug=1; - $rs =& $this->conn->SelectLimit( - "select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer - from $perf_table - where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT') - and (tracer is null or tracer not like 'ERROR:%') - group by sql1 - order by 1 desc",$numsql); - $ADODB_FETCH_MODE = $save; - $this->conn->fnExecute = $saveE; - - if (!$rs) return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; - $s = "

Suspicious SQL

-The following SQL have high average execution times
-
ParameterValueDescription
\n"; - $max = $this->maxLength; - while (!$rs->EOF) { - $sql = $rs->fields[1]; - $raw = urlencode($sql); - if (strlen($raw)>$max-100) { - $sql2 = substr($sql,0,$max-500); - $raw = urlencode($sql2).'&part='.crc32($sql); - } - $prefix = ""; - $suffix = ""; - if ($this->explain == false || strlen($prefix)>$max) { - $suffix = ' ... String too long for GET parameter: '.strlen($prefix).''; - $prefix = ''; - } - $s .= ""; - $rs->MoveNext(); - } - return $s."
Avg TimeCountSQLMaxMin
".round($rs->fields[0],6)."".$rs->fields[2]."".$prefix.htmlspecialchars($sql).$suffix."". - "".$rs->fields[3]."".$rs->fields[4]."
"; - - } - - function CheckMemory() - { - return ''; - } - - - function SuspiciousSQL($numsql=10) - { - return adodb_perf::_SuspiciousSQL($numsql); - } - - function ExpensiveSQL($numsql=10) - { - return adodb_perf::_ExpensiveSQL($numsql); - } - - - /* - This reports the percentage of load on the instance due to the most - expensive few SQL statements. Tuning these statements can often - make huge improvements in overall system performance. - */ - function _ExpensiveSQL($numsql = 10) - { - global $HTTP_GET_VARS,$ADODB_FETCH_MODE; - - $perf_table = adodb_perf::table(); - $saveE = $this->conn->fnExecute; - $this->conn->fnExecute = false; - - if (isset($HTTP_GET_VARS['expe']) && isset($HTTP_GET_VARS['sql'])) { - $partial = !empty($HTTP_GET_VARS['part']); - echo "".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n"; - } - - if (isset($HTTP_GET_VARS['sql'])) return; - - $sql1 = $this->sql1; - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - $rs =& $this->conn->SelectLimit( - "select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer - from $perf_table - where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT') - and (tracer is null or tracer not like 'ERROR:%') - group by sql1 - order by 1 desc",$numsql); - - $this->conn->fnExecute = $saveE; - $ADODB_FETCH_MODE = $save; - if (!$rs) return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; - $s = "

Expensive SQL

-Tuning the following SQL will reduce the server load substantially
-\n"; - $max = $this->maxLength; - while (!$rs->EOF) { - $sql = $rs->fields[1]; - $raw = urlencode($sql); - if (strlen($raw)>$max-100) { - $sql2 = substr($sql,0,$max-500); - $raw = urlencode($sql2).'&part='.crc32($sql); - } - $prefix = ""; - $suffix = ""; - if($this->explain == false || strlen($prefix>$max)) { - $prefix = ''; - $suffix = ''; - } - $s .= ""; - $rs->MoveNext(); - } - return $s."
LoadCountSQLMaxMin
".round($rs->fields[0],6)."".$rs->fields[2]."".$prefix.htmlspecialchars($sql).$suffix."". - "".$rs->fields[3]."".$rs->fields[4]."
"; - } - - /* - Raw function to return parameter value from $settings. - */ - function DBParameter($param) - { - if (empty($this->settings[$param])) return false; - $sql = $this->settings[$param][1]; - return $this->_DBParameter($sql); - } - - /* - Raw function returning array of poll paramters - */ - function &PollParameters() - { - $arr[0] = (float)$this->DBParameter('data cache hit ratio'); - $arr[1] = (float)$this->DBParameter('data reads'); - $arr[2] = (float)$this->DBParameter('data writes'); - $arr[3] = (integer) $this->DBParameter('current connections'); - return $arr; - } - - /* - Low-level Get Database Parameter - */ - function _DBParameter($sql) - { - $savelog = $this->conn->LogSQL(false); - if (is_array($sql)) { - global $ADODB_FETCH_MODE; - - $sql1 = $sql[0]; - $key = $sql[1]; - if (sizeof($sql)>2) $pos = $sql[2]; - else $pos = 1; - if (sizeof($sql)>3) $coef = $sql[3]; - else $coef = false; - $ret = false; - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - $rs = $this->conn->Execute($sql1); - $ADODB_FETCH_MODE = $save; - if ($rs) { - while (!$rs->EOF) { - $keyf = reset($rs->fields); - if (trim($keyf) == $key) { - $ret = $rs->fields[$pos]; - if ($coef) $ret *= $coef; - break; - } - $rs->MoveNext(); - } - $rs->Close(); - } - $this->conn->LogSQL($savelog); - return $ret; - } else { - if (strncmp($sql,'=',1) == 0) { - $fn = substr($sql,1); - return $this->$fn(); - } - $sql = str_replace('$DATABASE',$this->conn->database,$sql); - $ret = $this->conn->GetOne($sql); - $this->conn->LogSQL($savelog); - - return $ret; - } - } - - /* - Warn if cache ratio falls below threshold. Displayed in "Description" column. - */ - function WarnCacheRatio($val) - { - if ($val < $this->warnRatio) - return 'Cache ratio should be at least '.$this->warnRatio.'%'; - else return ''; - } - - /***********************************************************************************************/ - // HIGH LEVEL UI FUNCTIONS - /***********************************************************************************************/ - - - function UI($pollsecs=5) - { - global $HTTP_GET_VARS,$HTTP_SERVER_VARS,$HTTP_POST_VARS; - - $perf_table = adodb_perf::table(); - $conn = $this->conn; - - $app = $conn->host; - if ($conn->host && $conn->database) $app .= ', db='; - $app .= $conn->database; - - if ($app) $app .= ', '; - $savelog = $this->conn->LogSQL(false); - $info = $conn->ServerInfo(); - if (isset($HTTP_GET_VARS['clearsql'])) { - $this->conn->Execute('delete from $perf_table'); - } - $this->conn->LogSQL($savelog); - - // magic quotes - - if (isset($HTTP_GET_VARS['sql']) && get_magic_quotes_gpc()) { - $_GET['sql'] = $HTTP_GET_VARS['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$HTTP_GET_VARS['sql']); - } - - if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10; - else $nsql = $_SESSION['ADODB_PERF_SQL']; - - $app .= ''.$info['description'].''; - - - if (isset($HTTP_GET_VARS['do'])) $do = $HTTP_GET_VARS['do']; - else if (isset($HTTP_POST_VARS['do'])) $do = $HTTP_POST_VARS['do']; - else if (isset($HTTP_GET_VARS['sql'])) $do = 'viewsql'; - else $do = 'stats'; - - if (isset($HTTP_GET_VARS['nsql'])) { - if ($HTTP_GET_VARS['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $HTTP_GET_VARS['nsql']; - } - echo "ADOdb Performance Monitor on $app"; - if ($do == 'viewsql') $form = "
# SQL:
"; - else $form = " "; - - $allowsql = !defined('ADODB_PERF_NO_RUN_SQL'); - - if (empty($HTTP_GET_VARS['hidem'])) - echo "
- ADOdb Performance Monitor for $app
- Performance Stats   View SQL -   View Tables   Poll Stats", - $allowsql ? '   Run SQL' : '', - "$form", - "
"; - - - switch ($do) { - default: - case 'stats': - echo $this->HealthCheck(); - $this->conn->debug=1; - echo $this->CheckMemory(); - break; - case 'poll': - echo ""; - break; - case 'poll2': - echo "
";
-			$this->Poll($pollsecs);
-			break;
-		
-		case 'dosql':
-			if (!$allowsql) break;
-			
-			$this->DoSQLForm();
-			break;
-		case 'viewsql':
-			if (empty($HTTP_GET_VARS['hidem']))
-				echo "  Clear SQL Log
";
-			echo($this->SuspiciousSQL($nsql));
-			echo($this->ExpensiveSQL($nsql));
-			echo($this->InvalidSQL($nsql));
-			break;
-		case 'tables': 
-			echo $this->Tables(); break;
-		}
-		global $ADODB_vers;
-		echo "
$ADODB_vers Sponsored by phpLens
";
-	}
-	
-	/*
-		Runs in infinite loop, returning real-time statistics
-	*/
-	function Poll($secs=5)
-	{
-		$this->conn->fnExecute = false;
-		//$this->conn->debug=1;
-		if ($secs <= 1) $secs = 1;
-		echo "Accumulating statistics, every $secs seconds...\n";flush();
-		$arro =& $this->PollParameters();
-		$cnt = 0;
-		set_time_limit(0);
-		sleep($secs);
-		while (1) {
-			$arr =& $this->PollParameters();
-			
-			$hits   = sprintf('%2.2f',$arr[0]);
-			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
-			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
-			$sess = sprintf('%5d',$arr[3]);
-			
-			$load = $this->CPULoad();
-			if ($load !== false) {
-				$oslabel = 'WS-CPU%';
-				$osval = sprintf(" %2.1f  ",(float) $load);
-			}else {
-				$oslabel = '';
-				$osval = '';
-			}
-			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
-			$cnt += 1;
-			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
-			flush();
-			
-			sleep($secs);
-			$arro = $arr;
-		}
-	}
-	
-	/*
-		Returns basic health check in a command line interface
-	*/
-	function HealthCheckCLI()
-	{
-		return $this->HealthCheck(true);
-	}
-	
-		
-	/*
-		Returns basic health check as HTML
-	*/
-	function HealthCheck($cli=false)
-	{
-		$saveE = $this->conn->fnExecute;
-		$this->conn->fnExecute = false;	
-		if ($cli) $html = '';
-		else $html = $this->table.'
'.$this->conn->databaseType.'
'.$this->titles;
-		
-		$oldc = false;
-		$bgc = '';
-		foreach($this->settings as $name => $arr) {
-			if ($arr === false) break;
-			
-			if (!is_string($name)) {
-				if ($cli) $html .= " -- $arr -- \n";
-				else $html .= "color>$arr  ";
-				continue;
-			}
-			
-			if (!is_array($arr)) break;
-			$category = $arr[0];
-			$how = $arr[1];
-			if (sizeof($arr)>2) $desc = $arr[2];
-			else $desc = '   ';
-			
-			
-			if ($category == 'HIDE') continue;
-			
-			$val = $this->_DBParameter($how);
-			
-			if ($desc && strncmp($desc,"=",1) === 0) {
-				$fn = substr($desc,1);
-				$desc = $this->$fn($val);
-			}
-			
-			if ($val === false) {
-				$m = $this->conn->ErrorMsg();
-				$val = "Error: $m"; 
-			} else {
-				if (is_numeric($val) && $val >= 256*1024) {
-					if ($val % (1024*1024) == 0) {
-						$val /= (1024*1024);
-						$val .= 'M';
-					} else if ($val % 1024 == 0) {
-						$val /= 1024;
-						$val .= 'K';
-					}
-					//$val = htmlspecialchars($val);
-				}
-			}
-			if ($category != $oldc) {
-				$oldc = $category;
-				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
-			}
-			if (strlen($desc)==0) $desc = ' ';
-			if (strlen($val)==0) $val = ' ';
-			if ($cli) {
-				$html  .= str_replace(' ','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
-				
-			}else {
-				$html .= "".$name.''.$val.''.$desc."\n";
-			}
-		}
-		
-		if (!$cli) $html .= "\n";
-		$this->conn->fnExecute = $saveE;
-			
-		return $html;	
-	}
-	
-	function Tables($orderby='1')
-	{
-		if (!$this->tablesSQL) return false;
-		
-		$savelog = $this->conn->LogSQL(false);
-		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
-		$this->conn->LogSQL($savelog);
-		$html = rs2html($rs,false,false,false,false);
-		return $html;
-	}
-	
-
-	function CreateLogTable()
-	{
-		if (!$this->createTableSQL) return false;
-		
-		$savelog = $this->conn->LogSQL(false);
-		$ok = $this->conn->Execute($this->createTableSQL);
-		$this->conn->LogSQL($savelog);
-		return ($ok) ? true : false;
-	}
-	
-	function DoSQLForm()
-	{
-	global $HTTP_SERVER_VARS,$HTTP_GET_VARS,$HTTP_POST_VARS,$HTTP_SESSION_VARS;
-	
-		$HTTP_VARS = array_merge($HTTP_GET_VARS,$HTTP_POST_VARS);
-		
-		$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
-		$sql = isset($HTTP_VARS['sql']) ? $HTTP_VARS['sql'] : '';
-
-		if (isset($HTTP_SESSION_VARS['phplens_sqlrows'])) $rows = $HTTP_SESSION_VARS['phplens_sqlrows'];
-		else $rows = 3;
-		
-		if (isset($HTTP_VARS['SMALLER'])) {
-			$rows /= 2;
-			if ($rows < 3) $rows = 3;
-			$HTTP_SESSION_VARS['phplens_sqlrows'] = $rows;
-		}
-		if (isset($HTTP_VARS['BIGGER'])) {
-			$rows *= 2;
-			$HTTP_SESSION_VARS['phplens_sqlrows'] = $rows;
-		}
-		
-?>
-
-

-
-
-
-  
-  
-  
- 
 Form size: 
-
-
-

-  

-

-
-undomq(trim($sql));
-		if (substr($sql,strlen($sql)-1) === ';') {
-			$print = true;
-			$sqla = $this->SplitSQL($sql);
-		} else  {
-			$print = false;
-			$sqla = array($sql);
-		}
-		foreach($sqla as $sqls) {
-
-			if (!$sqls) continue;
-			
-			if ($print) {
-				print "
".htmlspecialchars($sqls)."
";
-				flush();
-			}
-			$savelog = $this->conn->LogSQL(false);
-			$rs = $this->conn->Execute($sqls);
-			$this->conn->LogSQL($savelog);
-			if ($rs && is_object($rs) && !$rs->EOF) {
-				rs2html($rs);
-				while ($rs->NextRecordSet()) {
-					print "
 
";
-					rs2html($rs);
-				}
-			} else {
-				$e1 = (integer) $this->conn->ErrorNo();
-				$e2 = $this->conn->ErrorMsg();
-				if (($e1) || ($e2)) {
-					if (empty($e1)) $e1 = '-1'; // postgresql fix
-					print '   '.$e1.': '.$e2;
-				} else {
-					print "
No Recordset returned
";
-				}
-			}
-		} // foreach
-	}
-	
-	function SplitSQL($sql)
-	{
-		$arr = explode(';',$sql);
-		return $arr;
-	}
-	
-	function undomq(&$m) 
-	{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-	}
-	return $m;
-}
-}
-
-
-
+fnExecute = false;
+	$t0 = microtime();
+	$rs =& $conn->Execute($sql,$inputarr);
+	$t1 = microtime();
+
+	if (!empty($conn->_logsql)) {
+		$conn->_logsql = false; // disable logsql error simulation
+		$dbT = $conn->databaseType;
+		
+		$a0 = split(' ',$t0);
+		$a0 = (float)$a0[1]+(float)$a0[0];
+		
+		$a1 = split(' ',$t1);
+		$a1 = (float)$a1[1]+(float)$a1[0];
+		
+		$time = $a1 - $a0;
+	
+		if (!$rs) {
+			$errM = $conn->ErrorMsg();
+			$errN = $conn->ErrorNo();
+			$conn->lastInsID = 0;
+			$tracer = substr('ERROR: '.htmlspecialchars($errM),0,250);
+		} else {
+			$tracer = '';
+			$errM = '';
+			$errN = 0;
+			$dbg = $conn->debug;
+			$conn->debug = false;
+			if (!is_object($rs) || $rs->dataProvider == 'empty') 
+				$conn->_affected = $conn->affected_rows(true);
+			$conn->lastInsID = @$conn->Insert_ID();
+			$conn->debug = $dbg;
+		}
+		if (isset($HTTP_SERVER_VARS['HTTP_HOST'])) {
+			$tracer .= '
'.$HTTP_SERVER_VARS['HTTP_HOST'];
+			if (isset($HTTP_SERVER_VARS['PHP_SELF'])) $tracer .= $HTTP_SERVER_VARS['PHP_SELF'];
+		} else 
+			if (isset($HTTP_SERVER_VARS['PHP_SELF'])) $tracer .= '
'.$HTTP_SERVER_VARS['PHP_SELF'];
+		//$tracer .= (string) adodb_backtrace(false);
+		
+		$tracer = substr($tracer,0,500);
+		
+		if (is_array($inputarr)) {
+			if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);
+			else {
+				$params = '';
+				$params = implode(', ',$inputarr);
+				if (strlen($params) >= 3000) $params = substr($params, 0, 3000);
+			}
+		} else {
+			$params = '';
+		}
+		
+		if (is_array($sql)) $sql = $sql[0];
+		$arr = array('b'=>trim(substr($sql,0,230)),
+					'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>round($time,6));
+
+		$saved = $conn->debug;
+		$conn->debug = 0;
+		
+		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
+			$isql = "insert into $perf_table values($conn->sysTimeStamp,:b,:c,:d,:e,:f)";
+		} else if ($dbT == 'odbc_mssql' || $dbT == 'informix') {
+			$timer = $arr['f'];
+			if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
+
+			$sql1 = $conn->qstr($arr['b']);
+			$sql2 = $conn->qstr($arr['c']);
+			$params = $conn->qstr($arr['d']);
+			$tracer = $conn->qstr($arr['e']);
+			
+			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($conn->sysTimeStamp,$sql1,$sql2,$params,$tracer,$timer)";
+			if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);
+			$arr = false;
+		} else {
+			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $conn->sysTimeStamp,?,?,?,?,?)";
+		}
+		$ok = $conn->Execute($isql,$arr);
+		$conn->debug = $saved;
+		
+		if ($ok) {
+			$conn->_logsql = true; 
+		} else {
+			$err2 = $conn->ErrorMsg();
+			$conn->_logsql = true; // enable logsql error simulation
+			$perf =& NewPerfMonitor($conn);
+			if ($perf) {
+				if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr);
+			} else {
+				$ok = $conn->Execute("create table $perf_table (
+				created varchar(50),
+				sql0 varchar(250), 
+				sql1 varchar(4000),
+				params varchar(3000),
+				tracer varchar(500),
+				timer decimal(16,6))");
+			}
+			if (!$ok) {
+				ADOConnection::outp( "LOGSQL Insert Failed: $isql
$err2
");
+				$conn->_logsql = false;
+			}
+		}
+		$conn->_errorMsg = $errM;
+		$conn->_errorCode = $errN;
+	} 
+	$conn->fnExecute = 'adodb_log_sql';
+	return $rs;
+}
+
+	
+/*
+The settings data structure is an associative array that database parameter per element.
+
+Each database parameter element in the array is itself an array consisting of:
+
+0: category code, used to group related db parameters
+1: either
+	a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", 
+	b. array holding sql string and field to look for, e.g. array('show variables','table_cache'),
+	c. a string prefixed by =, then a PHP method of the class is invoked, 
+		e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue',
+2: description of the database parameter
+*/
+
+class adodb_perf {
+	var $conn;
+	var $color = '#F0F0F0';
+	var $table = '';
+	var $titles = '';
+	var $warnRatio = 90;
+	var $tablesSQL = false;
+	var $cliFormat = "%32s => %s \r\n";
+	var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
+	var $explain = true;
+	var $helpurl = "LogSQL help";
+	var $createTableSQL = false;
+	var $maxLength = 2000;
+	
+    // Sets the tablename to be used            
+    function table($newtable = false)
+    {
+        static $_table;
+
+        if (!empty($newtable))  $_table = $newtable;
+		if (empty($_table)) $_table = 'adodb_logsql';
+        return $_table;
+    }
+
+	// returns array with info to calculate CPU Load
+	function _CPULoad()
+	{
+/*
+
+cpu  524152 2662 2515228 336057010
+cpu0 264339 1408 1257951 168025827
+cpu1 259813 1254 1257277 168031181
+page 622307 25475680
+swap 24 1891
+intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+disk_io: (3,0):(3144904,54369,610378,3090535,50936192) (3,1):(3630212,54097,633016,3576115,50951320)
+ctxt 66155838
+btime 1062315585
+processes 69293
+
+*/
+		// Algorithm is taken from
+		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
+		if (strncmp(PHP_OS,'WIN',3)==0) {
+			@$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");
+			if (!$c) return false;
+			
+			$info[0] = $c->PercentProcessorTime;
+			$info[1] = 0;
+			$info[2] = 0;
+			$info[3] = $c->TimeStamp_Sys100NS;
+			//print_r($info);
+			return $info;
+		}
+		
+		// Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com)
+		$statfile = '/proc/stat';
+		if (!file_exists($statfile)) return false;
+		
+		$fd = fopen($statfile,"r");
+		if (!$fd) return false;
+		
+		$statinfo = explode("\n",fgets($fd, 1024));
+		fclose($fd);
+		foreach($statinfo as $line) {
+			$info = explode(" ",$line);
+			if($info[0]=="cpu") {
+				array_shift($info);  // pop off "cpu"
+				if(!$info[0]) array_shift($info); // pop off blank space (if any)
+				return $info;
+			}
+		}
+		
+		return false;
+		
+	}
+	
+	/* NOT IMPLEMENTED */
+	function MemInfo()
+	{
+		/*
+
+        total:    used:    free:  shared: buffers:  cached:
+Mem:  1055289344 917299200 137990144        0 165437440 599773184
+Swap: 2146775040 11055104 2135719936
+MemTotal:      1030556 kB
+MemFree:        134756 kB
+MemShared:           0 kB
+Buffers:        161560 kB
+Cached:         581384 kB
+SwapCached:       4332 kB
+Active:         494468 kB
+Inact_dirty:    322856 kB
+Inact_clean:     24256 kB
+Inact_target:   168316 kB
+HighTotal:      131064 kB
+HighFree:         1024 kB
+LowTotal:       899492 kB
+LowFree:        133732 kB
+SwapTotal:     2096460 kB
+SwapFree:      2085664 kB
+Committed_AS:   348732 kB
+		*/
+	}
+	
+	
+	/*
+		Remember that this is client load, not db server load!
+	*/
+	var $_lastLoad;
+	function CPULoad()
+	{
+		$info = $this->_CPULoad();
+		if (!$info) return false;
+			
+		if (empty($this->_lastLoad)) {
+			sleep(1);
+			$this->_lastLoad = $info;
+			$info = $this->_CPULoad();
+		}
+		
+		$last = $this->_lastLoad;
+		$this->_lastLoad = $info;
+		
+		$d_user = $info[0] - $last[0];
+		$d_nice = $info[1] - $last[1];
+		$d_system = $info[2] - $last[2];
+		$d_idle = $info[3] - $last[3];
+		
+		//printf("Delta - User: %f  Nice: %f  System: %f  Idle: %f
",$d_user,$d_nice,$d_system,$d_idle);
+
+		if (strncmp(PHP_OS,'WIN',3)==0) {
+			if ($d_idle < 1) $d_idle = 1;
+			return 100*(1-$d_user/$d_idle);
+		}else {
+			$total=$d_user+$d_nice+$d_system+$d_idle;
+			if ($total<1) $total=1;
+			return 100*($d_user+$d_nice+$d_system)/$total; 
+		}
+	}
+	
+	function Tracer($sql)
+	{
+        $perf_table = adodb_perf::table();
+		$saveE = $this->conn->fnExecute;
+		$this->conn->fnExecute = false;
+			
+		$sqlq = $this->conn->qstr($sql);
+		$arr = $this->conn->GetArray(
+"select count(*),tracer 
+	from $perf_table where sql1=$sqlq 
+	group by tracer
+	order by 1 desc");
+		$s = '';
+		if ($arr) {
+			$s .= '
Scripts Affected
';
+			foreach($arr as $k) {
+				$s .= sprintf("%4d",$k[0]).'   '.strip_tags($k[1]).'
';
+			}
+		}
+		$this->conn->fnExecute = $saveE;
+		return $s;
+	}
+
+	/* 
+		Explain Plan for $sql.
+		If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the 
+			actual sql.
+	*/
+	function Explain($sql,$partial=false)
+	{	
+		return false;
+	}
+	
+	function InvalidSQL($numsql = 10)
+	{
+	global $HTTP_GET_VARS;
+	
+		if (isset($HTTP_GET_VARS['sql'])) return;
+		$s = '
Invalid SQL
';
+		$saveE = $this->conn->fnExecute;
+		$this->conn->fnExecute = false;
+        $perf_table = adodb_perf::table();
+		$rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
+		$this->conn->fnExecute = $saveE;
+		if ($rs) {
+			$s .= rs2html($rs,false,false,false,false);
+		} else
+			return "
$this->helpurl. ".$this->conn->ErrorMsg()."
";
+		
+		return $s;
+	}
+
+	
+	/*
+		This script identifies the longest running SQL
+	*/	
+	function _SuspiciousSQL($numsql = 10)
+	{
+		global $ADODB_FETCH_MODE,$HTTP_GET_VARS;
+		
+            $perf_table = adodb_perf::table();
+			$saveE = $this->conn->fnExecute;
+			$this->conn->fnExecute = false;
+			
+			if (isset($HTTP_GET_VARS['exps']) && isset($HTTP_GET_VARS['sql'])) {
+				$partial = !empty($HTTP_GET_VARS['part']);
+				echo "".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
+			}
+			
+			if (isset($HTTP_GET_VARS['sql'])) return;
+			$sql1 = $this->sql1;
+			
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			//$this->conn->debug=1;
+			$rs =& $this->conn->SelectLimit(
+			"select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
+				from $perf_table
+				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT')
+				and (tracer is null or tracer not like 'ERROR:%')
+				group by sql1
+				order by 1 desc",$numsql);
+			$ADODB_FETCH_MODE = $save;
+			$this->conn->fnExecute = $saveE;
+			
+			if (!$rs) return "
$this->helpurl. ".$this->conn->ErrorMsg()."
";
+			$s = "
Suspicious SQL

+The following SQL have high average execution times

+
ParameterValueDescription
\n";
+			$max = $this->maxLength;
+			while (!$rs->EOF) {
+				$sql = $rs->fields[1];
+				$raw = urlencode($sql);
+				if (strlen($raw)>$max-100) {
+					$sql2 = substr($sql,0,$max-500);
+					$raw = urlencode($sql2).'&part='.crc32($sql);
+				}
+				$prefix = "";
+				$suffix = "";
+				if ($this->explain == false || strlen($prefix)>$max) {
+					$suffix = ' ... String too long for GET parameter: '.strlen($prefix).'';
+					$prefix = '';
+				}
+				$s .= "";
+				$rs->MoveNext();
+			}
+			return $s."
Avg TimeCountSQLMaxMin
".round($rs->fields[0],6)."".$rs->fields[2]."".$prefix.htmlspecialchars($sql).$suffix."".
+					"".$rs->fields[3]."".$rs->fields[4]."
";
+		
+	}
+	
+	function CheckMemory()
+	{
+		return '';
+	}
+	
+	
+	function SuspiciousSQL($numsql=10)
+	{
+		return adodb_perf::_SuspiciousSQL($numsql);
+	}
+
+	function ExpensiveSQL($numsql=10)
+	{
+		return adodb_perf::_ExpensiveSQL($numsql);
+	}
+
+	
+	/*
+		This reports the percentage of load on the instance due to the most 
+		expensive few SQL statements. Tuning these statements can often 
+		make huge improvements in overall system performance. 
+	*/
+	function _ExpensiveSQL($numsql = 10)
+	{
+		global $HTTP_GET_VARS,$ADODB_FETCH_MODE;
+		
+            $perf_table = adodb_perf::table();
+			$saveE = $this->conn->fnExecute;
+			$this->conn->fnExecute = false;
+			
+			if (isset($HTTP_GET_VARS['expe']) && isset($HTTP_GET_VARS['sql'])) {
+				$partial = !empty($HTTP_GET_VARS['part']);
+				echo "".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
+			}
+			
+			if (isset($HTTP_GET_VARS['sql'])) return;
+			
+			$sql1 = $this->sql1;
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			$rs =& $this->conn->SelectLimit(
+			"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
+				from $perf_table
+				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5))  not in ('DROP ','INSER','COMMI','CREAT')
+				and (tracer is null or tracer not like 'ERROR:%')
+				group by sql1
+				order by 1 desc",$numsql);
+			
+			$this->conn->fnExecute = $saveE;
+			$ADODB_FETCH_MODE = $save;
+			if (!$rs) return "
$this->helpurl. ".$this->conn->ErrorMsg()."
";
+			$s = "
Expensive SQL

+Tuning the following SQL will reduce the server load substantially

+\n";
+			$max = $this->maxLength;
+			while (!$rs->EOF) {
+				$sql = $rs->fields[1];
+				$raw = urlencode($sql);
+				if (strlen($raw)>$max-100) {
+					$sql2 = substr($sql,0,$max-500);
+					$raw = urlencode($sql2).'&part='.crc32($sql);
+				}
+				$prefix = "";
+				$suffix = "";
+				if($this->explain == false || strlen($prefix>$max)) {
+					$prefix = '';
+					$suffix = '';
+				}
+				$s .= "";
+				$rs->MoveNext();
+			}
+			return $s."
LoadCountSQLMaxMin
".round($rs->fields[0],6)."".$rs->fields[2]."".$prefix.htmlspecialchars($sql).$suffix."".
+					"".$rs->fields[3]."".$rs->fields[4]."
";
+	}
+	
+	/*
+		Raw function to return parameter value from $settings.
+	*/
+	function DBParameter($param)
+	{
+		if (empty($this->settings[$param])) return false;
+		$sql = $this->settings[$param][1];
+		return $this->_DBParameter($sql);
+	}
+	
+	/*
+		Raw function returning array of poll paramters
+	*/
+	function &PollParameters()
+	{
+		$arr[0] = (float)$this->DBParameter('data cache hit ratio');
+		$arr[1] = (float)$this->DBParameter('data reads');
+		$arr[2] = (float)$this->DBParameter('data writes');
+		$arr[3] = (integer) $this->DBParameter('current connections');
+		return $arr;
+	}
+	
+	/*
+		Low-level Get Database Parameter
+	*/
+	function _DBParameter($sql)
+	{
+		$savelog = $this->conn->LogSQL(false);
+		if (is_array($sql)) {
+		global $ADODB_FETCH_MODE;
+		
+			$sql1 = $sql[0];
+			$key = $sql[1];
+			if (sizeof($sql)>2) $pos = $sql[2];
+			else $pos = 1;
+			if (sizeof($sql)>3) $coef = $sql[3];
+			else $coef = false;
+			$ret = false;
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			$rs = $this->conn->Execute($sql1);
+			$ADODB_FETCH_MODE = $save;
+			if ($rs) {
+				while (!$rs->EOF) {
+					$keyf = reset($rs->fields);
+					if (trim($keyf) == $key) {
+						$ret = $rs->fields[$pos];
+						if ($coef) $ret *= $coef;
+						break;
+					}
+					$rs->MoveNext();
+				}
+				$rs->Close();
+			}
+			$this->conn->LogSQL($savelog);
+			return $ret;
+		} else {
+			if (strncmp($sql,'=',1) == 0) {
+				$fn = substr($sql,1);
+				return $this->$fn();
+			}
+			$sql = str_replace('$DATABASE',$this->conn->database,$sql);
+			$ret = $this->conn->GetOne($sql);
+			$this->conn->LogSQL($savelog);
+			
+			return $ret;
+		}
+	}
+	
+	/*
+		Warn if cache ratio falls below threshold. Displayed in "Description" column.
+	*/
+	function WarnCacheRatio($val)
+	{
+		if ($val < $this->warnRatio) 
+			 return 'Cache ratio should be at least '.$this->warnRatio.'%';
+		else return '';
+	}
+	
+	/***********************************************************************************************/
+	//                                    HIGH LEVEL UI FUNCTIONS
+	/***********************************************************************************************/
+
+	
+	function UI($pollsecs=5)
+	{
+	global $HTTP_GET_VARS,$HTTP_SERVER_VARS,$HTTP_POST_VARS;
+	
+    $perf_table = adodb_perf::table();
+	$conn = $this->conn;
+	
+	$app = $conn->host;
+	if ($conn->host && $conn->database) $app .= ', db=';
+	$app .= $conn->database;
+	
+	if ($app) $app .= ', ';
+	$savelog = $this->conn->LogSQL(false);	
+	$info = $conn->ServerInfo();
+	if (isset($HTTP_GET_VARS['clearsql'])) {
+		$this->conn->Execute("delete from $perf_table");
+	}
+	$this->conn->LogSQL($savelog);
+	
+	// magic quotes
+	
+	if (isset($HTTP_GET_VARS['sql']) && get_magic_quotes_gpc()) {
+		$_GET['sql'] = $HTTP_GET_VARS['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$HTTP_GET_VARS['sql']);
+	}
+	
+	if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
+	else  $nsql = $_SESSION['ADODB_PERF_SQL'];
+	
+	$app .= ''.$info['description'].'';
+	
+	
+	if (isset($HTTP_GET_VARS['do'])) $do = $HTTP_GET_VARS['do'];
+	else if (isset($HTTP_POST_VARS['do'])) $do = $HTTP_POST_VARS['do'];
+	 else if (isset($HTTP_GET_VARS['sql'])) $do = 'viewsql';
+	 else $do = 'stats';
+	 
+	if (isset($HTTP_GET_VARS['nsql'])) {
+		if ($HTTP_GET_VARS['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $HTTP_GET_VARS['nsql'];
+	}
+	echo "ADOdb Performance Monitor on $app";
+	if ($do == 'viewsql') $form = "
# SQL: 
";
+	else $form = " ";
+	
+	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
+	
+	if  (empty($HTTP_GET_VARS['hidem']))
+	echo "

+	ADOdb Performance Monitor for $app

+	Performance Stats   View SQL
+	   View Tables   Poll Stats",
+	 $allowsql ? '   Run SQL' : '',
+	 "$form",
+	 "
";
+
+	 
+	 	switch ($do) {
+		default:
+		case 'stats':
+			echo $this->HealthCheck();
+			$this->conn->debug=1;
+			echo $this->CheckMemory();
+			break;
+		case 'poll':
+			echo "";
+			break;
+		case 'poll2':
+			echo "
";
+			$this->Poll($pollsecs);
+			break;
+		
+		case 'dosql':
+			if (!$allowsql) break;
+			
+			$this->DoSQLForm();
+			break;
+		case 'viewsql':
+			if (empty($HTTP_GET_VARS['hidem']))
+				echo "  Clear SQL Log
";
+			echo($this->SuspiciousSQL($nsql));
+			echo($this->ExpensiveSQL($nsql));
+			echo($this->InvalidSQL($nsql));
+			break;
+		case 'tables': 
+			echo $this->Tables(); break;
+		}
+		global $ADODB_vers;
+		echo "
$ADODB_vers Sponsored by phpLens
";
+	}
+	
+	/*
+		Runs in infinite loop, returning real-time statistics
+	*/
+	function Poll($secs=5)
+	{
+		$this->conn->fnExecute = false;
+		//$this->conn->debug=1;
+		if ($secs <= 1) $secs = 1;
+		echo "Accumulating statistics, every $secs seconds...\n";flush();
+		$arro =& $this->PollParameters();
+		$cnt = 0;
+		set_time_limit(0);
+		sleep($secs);
+		while (1) {
+			$arr =& $this->PollParameters();
+			
+			$hits   = sprintf('%2.2f',$arr[0]);
+			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
+			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
+			$sess = sprintf('%5d',$arr[3]);
+			
+			$load = $this->CPULoad();
+			if ($load !== false) {
+				$oslabel = 'WS-CPU%';
+				$osval = sprintf(" %2.1f  ",(float) $load);
+			}else {
+				$oslabel = '';
+				$osval = '';
+			}
+			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
+			$cnt += 1;
+			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
+			flush();
+			
+			sleep($secs);
+			$arro = $arr;
+		}
+	}
+	
+	/*
+		Returns basic health check in a command line interface
+	*/
+	function HealthCheckCLI()
+	{
+		return $this->HealthCheck(true);
+	}
+	
+		
+	/*
+		Returns basic health check as HTML
+	*/
+	function HealthCheck($cli=false)
+	{
+		$saveE = $this->conn->fnExecute;
+		$this->conn->fnExecute = false;	
+		if ($cli) $html = '';
+		else $html = $this->table.'
'.$this->conn->databaseType.'
'.$this->titles;
+		
+		$oldc = false;
+		$bgc = '';
+		foreach($this->settings as $name => $arr) {
+			if ($arr === false) break;
+			
+			if (!is_string($name)) {
+				if ($cli) $html .= " -- $arr -- \n";
+				else $html .= "color>$arr  ";
+				continue;
+			}
+			
+			if (!is_array($arr)) break;
+			$category = $arr[0];
+			$how = $arr[1];
+			if (sizeof($arr)>2) $desc = $arr[2];
+			else $desc = '   ';
+			
+			
+			if ($category == 'HIDE') continue;
+			
+			$val = $this->_DBParameter($how);
+			
+			if ($desc && strncmp($desc,"=",1) === 0) {
+				$fn = substr($desc,1);
+				$desc = $this->$fn($val);
+			}
+			
+			if ($val === false) {
+				$m = $this->conn->ErrorMsg();
+				$val = "Error: $m"; 
+			} else {
+				if (is_numeric($val) && $val >= 256*1024) {
+					if ($val % (1024*1024) == 0) {
+						$val /= (1024*1024);
+						$val .= 'M';
+					} else if ($val % 1024 == 0) {
+						$val /= 1024;
+						$val .= 'K';
+					}
+					//$val = htmlspecialchars($val);
+				}
+			}
+			if ($category != $oldc) {
+				$oldc = $category;
+				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
+			}
+			if (strlen($desc)==0) $desc = ' ';
+			if (strlen($val)==0) $val = ' ';
+			if ($cli) {
+				$html  .= str_replace(' ','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
+				
+			}else {
+				$html .= "".$name.''.$val.''.$desc."\n";
+			}
+		}
+		
+		if (!$cli) $html .= "\n";
+		$this->conn->fnExecute = $saveE;
+			
+		return $html;	
+	}
+	
+	function Tables($orderby='1')
+	{
+		if (!$this->tablesSQL) return false;
+		
+		$savelog = $this->conn->LogSQL(false);
+		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
+		$this->conn->LogSQL($savelog);
+		$html = rs2html($rs,false,false,false,false);
+		return $html;
+	}
+	
+
+	function CreateLogTable()
+	{
+		if (!$this->createTableSQL) return false;
+		
+		$savelog = $this->conn->LogSQL(false);
+		$ok = $this->conn->Execute($this->createTableSQL);
+		$this->conn->LogSQL($savelog);
+		return ($ok) ? true : false;
+	}
+	
+	function DoSQLForm()
+	{
+	global $HTTP_SERVER_VARS,$HTTP_GET_VARS,$HTTP_POST_VARS,$HTTP_SESSION_VARS;
+	
+		$HTTP_VARS = array_merge($HTTP_GET_VARS,$HTTP_POST_VARS);
+		
+		$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
+		$sql = isset($HTTP_VARS['sql']) ? $HTTP_VARS['sql'] : '';
+
+		if (isset($HTTP_SESSION_VARS['phplens_sqlrows'])) $rows = $HTTP_SESSION_VARS['phplens_sqlrows'];
+		else $rows = 3;
+		
+		if (isset($HTTP_VARS['SMALLER'])) {
+			$rows /= 2;
+			if ($rows < 3) $rows = 3;
+			$HTTP_SESSION_VARS['phplens_sqlrows'] = $rows;
+		}
+		if (isset($HTTP_VARS['BIGGER'])) {
+			$rows *= 2;
+			$HTTP_SESSION_VARS['phplens_sqlrows'] = $rows;
+		}
+		
+?>
+
+

+
+
+
+  
+  
+  
+ 
 Form size: 
+
+
+

+  

+

+
+undomq(trim($sql));
+		if (substr($sql,strlen($sql)-1) === ';') {
+			$print = true;
+			$sqla = $this->SplitSQL($sql);
+		} else  {
+			$print = false;
+			$sqla = array($sql);
+		}
+		foreach($sqla as $sqls) {
+
+			if (!$sqls) continue;
+			
+			if ($print) {
+				print "
".htmlspecialchars($sqls)."
";
+				flush();
+			}
+			$savelog = $this->conn->LogSQL(false);
+			$rs = $this->conn->Execute($sqls);
+			$this->conn->LogSQL($savelog);
+			if ($rs && is_object($rs) && !$rs->EOF) {
+				rs2html($rs);
+				while ($rs->NextRecordSet()) {
+					print "
 
";
+					rs2html($rs);
+				}
+			} else {
+				$e1 = (integer) $this->conn->ErrorNo();
+				$e2 = $this->conn->ErrorMsg();
+				if (($e1) || ($e2)) {
+					if (empty($e1)) $e1 = '-1'; // postgresql fix
+					print '   '.$e1.': '.$e2;
+				} else {
+					print "
No Recordset returned
";
+				}
+			}
+		} // foreach
+	}
+	
+	function SplitSQL($sql)
+	{
+		$arr = explode(';',$sql);
+		return $arr;
+	}
+	
+	function undomq(&$m) 
+	{
+	if (get_magic_quotes_gpc()) {
+		// undo the damage
+		$m = str_replace('\\\\','\\',$m);
+		$m = str_replace('\"','"',$m);
+		$m = str_replace('\\\'','\'',$m);
+	}
+	return $m;
+}
+}
+
+
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/adodb-php4.inc.php b/lib/adodb/adodb-php4.inc.php
index ef2f55e393f..766f00683e9 100644
--- a/lib/adodb/adodb-php4.inc.php
+++ b/lib/adodb/adodb-php4.inc.php
@@ -1,16 +1,16 @@
-
\ No newline at end of file
diff --git a/lib/adodb/adodb-xmlschema.inc.php b/lib/adodb/adodb-xmlschema.inc.php
index e86b62b23f4..9c9932afa79 100644
--- a/lib/adodb/adodb-xmlschema.inc.php
+++ b/lib/adodb/adodb-xmlschema.inc.php
@@ -1,144 +1,359 @@
-parent =& $parent;
+	}
 	
 	/**
-	* @var string	Field index: Keeps track of which field is currently being processed
-	*/
-	var $currentField;
-	
-	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
+	* XML Callback to process start elements
+	*
 	* @access private
 	*/
-	var $upgrade;
+	function _tag_open( &$parser, $tag, $attributes ) {
+		
+	}
 	
 	/**
-	* @var array Array of legacy metadata. Used for REPLACE upgrades.
+	* XML Callback to process CDATA elements
+	*
 	* @access private
 	*/
-	var $legacyFieldMetadata;
+	function _tag_cdata( &$parser, $cdata ) {
+		
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	function create() {
+		return array();
+	}
+	
+	/**
+	* Destroys the object
+	*/
+	function destroy() {
+		unset( $this );
+	}
+	
+	/**
+	* Checks whether the specified RDBMS is supported by the current
+	* database object or its ranking ancestor.
+	*
+	* @param string $platform RDBMS platform name (from ADODB platform list).
+	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
+	}
+	
+	/**
+	* Returns the prefix set by the ranking ancestor of the database object.
+	*
+	* @param string $name Prefix string.
+	* @return string Prefix.
+	*/
+	function prefix( $name = '' ) {
+		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
+	}
+	
+	/**
+	* Extracts a field ID from the specified field.
+	*
+	* @param string $field Field.
+	* @return string Field ID.
+	*/
+	function FieldID( $field ) {
+		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
+	}
+}
+
+/**
+* Creates a table object in ADOdb's datadict format
+*
+* This class stores information about a database table. As charactaristics
+* of the table are loaded from the external source, methods and properties
+* of this class are used to build up the table description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbTable extends dbObject {
+	
+	/**
+	* @var string Table name
+	*/
+	var $name;
+	
+	/**
+	* @var array Field specifier: Meta-information about each field
+	*/
+	var $fields = array();
+	
+	/**
+	* @var array List of table indexes.
+	*/
+	var $indexes = array();
+	
+	/**
+	* @var array Table options: Table-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var string Field index: Keeps track of which field is currently being processed
+	*/
+	var $current_field;
 	
 	/**
 	* @var boolean Mark table for destruction
 	* @access private
 	*/
-	var $dropTable;
+	var $drop_table;
 	
 	/**
 	* @var boolean Mark field for destruction (not yet implemented)
 	* @access private
 	*/
-	var $dropField;
+	var $drop_field = array();
 	
 	/**
-	* Constructor. Iniitializes a new table object.
+	* Iniitializes a new table object.
 	*
-	* If the table already exists, there are two methods available to upgrade it.
-	* To upgrade an existing table the new schema by ALTERing the table, set the upgradeTable
-	* argument to "ALTER."  To force the new table to replace the current table, set the upgradeTable
-	* argument to "REPLACE."
-	*
-	* @param string	$name		Table name
-	* @param string	$upgradeTable		Upgrade method (NULL, ALTER, or REPLACE)
+	* @param string $prefix DB Object prefix
+	* @param array $attributes Array of table attributes.
 	*/
-	function dbTable( $name, $upgrade = NULL ) {
-		logMsg( "+++dbTable( $name, $upgrade )" );
+	function dbTable( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+		$this->name = $this->prefix($attributes['NAME']);
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
 		
-		$dbconn = $GLOBALS['AXMLS_DBCONN'];
-		$dbdict = $GLOBALS['AXMLS_DBDICT'];
-		
-		$this->tableName = $name;
-
-		// If upgrading, set and handle the upgrade method
-		if( isset( $upgrade ) ) {
-			$upgrade = strtoupper( $upgrade );
-			
-			switch( $upgrade ) {
+		switch( $this->currentElement ) {
+			case 'INDEX':
+				xml_set_object( $parser, $this->addIndex( $attributes ) );
+				break;
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'FIELD':
+				// Add a field
+				$fieldName = $attributes['NAME'];
+				$fieldType = $attributes['TYPE'];
+				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
+				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
 				
-				case "ALTER":
-					$this->upgrade = strtoupper( $upgrade );
-					logMsg( "Upgrading table '$name' using {$this->upgrade}" );
-					break;
-					
-				case "REPLACE":
-					$this->upgrade = strtoupper( $upgrade );
-					logMsg( "Upgrading table '$name' using {$this->upgrade}" );
-					
-					// Need to fetch column names, run them through the case handler (for MySQL),
-					// create the new column, migrate the data, then drop the old column.
-					$this->legacyFieldMetadata = $dbconn->MetaColumns( $name );
-					logMsg( $this->legacyFieldMetadata, "Legacy Metadata" );
-					break;
-					
-				default:
-					unset( $this->upgrade );
-					break;
-			}
-			
-		} else {
-			logMsg( "Creating table '$name'" );
+				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
+				break;
+			case 'KEY':	
+			case 'NOTNULL':
+			case 'AUTOINCREMENT':
+				// Add a field option
+				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				break;
+			case 'DEFAULT':
+				// Add a field option to the table object
+				
+				// Work around ADOdb datadict issue that misinterprets empty strings.
+				if( $attributes['VALUE'] == '' ) {
+					$attributes['VALUE'] = " '' ";
+				}
+				
+				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
 		}
-		logMsg( "   ---dbTable" );
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Table constraint
+			case 'CONSTRAINT':
+			// Table option
+			case 'OPT':
+				$this->addTableOpt( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+		}
+	}
+	
+	/**
+	* Adds an index to a table object
+	*
+	* @param array $attributes Index attributes
+	* @return object dbIndex object
+	*/
+	function &addIndex( $attributes ) {
+		$name = strtoupper( $attributes['NAME'] );
+		$this->indexes[$name] =& new dbIndex( $this, $attributes );
+		return $this->indexes[$name];
 	}
 	
 	/**
@@ -164,31 +379,33 @@ class dbTable {
 	*	- F:  Floating point number
 	*	- N:  Numeric or decimal number
 	*
-	* @param string $name	Name of the table to which the field will be added.
-	* @param string $type		ADODB datadict field type.
-	* @param string $size		Field size
-	* @param array $opts		Field options array
-	* @return array	Field specifier array
+	* @param string $name Name of the table to which the field will be added.
+	* @param string $type	ADODB datadict field type.
+	* @param string $size	Field size
+	* @param array $opts	Field options array
+	* @return array Field specifier array
 	*/
 	function addField( $name, $type, $size = NULL, $opts = NULL ) {
-		logMsg( "   +++addField( $name, $type, $size, $opts )" );
+		$field_id = $this->FieldID( $name );
+		
 		// Set the field index so we know where we are
-		$this->currentField = $name;
+		$this->current_field = $field_id;
+		
+		// Set the field name (required)
+		$this->fields[$field_id]['NAME'] = $name;
 		
 		// Set the field type (required)
-		$this->fieldSpec[$name]['TYPE'] = $type;
+		$this->fields[$field_id]['TYPE'] = $type;
 		
 		// Set the field size (optional)
 		if( isset( $size ) ) {
-			$this->fieldSpec[$name]['SIZE'] = $size;
+			$this->fields[$field_id]['SIZE'] = $size;
 		}
 		
 		// Set the field options
-		if( isset( $opts ) ) $this->fieldSpec[$name]['OPTS'] = $opts;
-		
-		// Return array containing field specifier
-		logMsg( "   ---addField" );
-		return $this->fieldSpec;
+		if( isset( $opts ) ) {
+			$this->fields[$field_id]['OPTS'] = $opts;
+		}
 	}
 	
 	/**
@@ -197,181 +414,158 @@ class dbTable {
 	* This method adds a field option allowed by the ADOdb datadict 
 	* and appends it to the given field.
 	*
-	* @param string $field		Field name
-	* @param string $opt		ADOdb field option
-	* @param mixed $value	Field option value
-	* @return array	Field specifier array
+	* @param string $field	Field name
+	* @param string $opt ADOdb field option
+	* @param mixed $value Field option value
+	* @return array Field specifier array
 	*/
 	function addFieldOpt( $field, $opt, $value = NULL ) {
-		logMsg( "   +++addFieldOpt( $field, $opt, $value )" );
-		
-		// Add the option to the field specifier
-		if(  $value === NULL ) { // No value, so add only the option
-			$this->fieldSpec[$field]['OPTS'][] = $opt;
-		} else { // Add the option and value
-			$this->fieldSpec[$field]['OPTS'][] = array( "$opt" => "$value" );
+		if( !isset( $value ) ) {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
+		// Add the option and value
+		} else {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
 		}
-	
-		// Return array containing field specifier
-		logMsg( "   ---addFieldOpt( $field )" );
-		return $this->fieldSpec;
 	}
 	
 	/**
 	* Adds an option to the table
 	*
-	*This method takes a comma-separated list of table-level options
+	* This method takes a comma-separated list of table-level options
 	* and appends them to the table object.
 	*
-	* @param string $opt		Table option
-	* @return string	Option list
+	* @param string $opt Table option
+	* @return array Options
 	*/
 	function addTableOpt( $opt ) {
-		logMsg( "   +++addTableOpt( $opt )" );
+		$this->opts[] = $opt;
 		
-		$optlist = &$this->tableOpts;
-		$optlist ? ( $optlist .= ", $opt" ) : ($optlist = $opt );
-		
-		// Return the options list
-		logMsg( "   ---addTableOpt( $opt )" );
-		return $optlist;
+		return $this->opts;
 	}
 	
 	/**
 	* Generates the SQL that will create the table in the database
 	*
-	* Returns SQL that will create the table represented by the object.
-	*
-	* @param object $dict		ADOdb data dictionary
-	* @return array	Array containing table creation SQL
+	* @param object $xmls adoSchema object
+	* @return array Array containing table creation SQL
 	*/
-	function create( $dict ) {
-		logMsg( "   +++create( $dict )" );
-	
-		// Drop the table
-		if( $this->dropTable ) {
-			$sqlArray[] = "DROP TABLE {$this->tableName}";
-			return $sqlArray;
+	function create( &$xmls ) {
+		$sql = array();
+		
+		// drop any existing indexes
+		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
+			foreach( $legacy_indexes as $index => $index_details ) {
+				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
+			}
+		}
+		
+		// remove fields to be dropped from table object
+		foreach( $this->drop_field as $field ) {
+			unset( $this->fields[$field] );
+		}
+		
+		// if table exists
+		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
+			// drop table
+			if( $this->drop_table ) {
+				$sql[] = $xmls->dict->DropTableSQL( $this->name );
+				
+				return $sql;
+			}
+			
+			// drop any existing fields not in schema
+			foreach( $legacy_fields as $field_id => $field ) {
+				if( !isset( $this->fields[$field_id] ) ) {
+					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
+				}
+			}
+		// if table doesn't exist
+		} else {
+			if( $this->drop_table ) {
+				return $sql;
+			}
+			
+			$legacy_fields = array();
 		}
 		
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
-		$i = 0;
 		
-		foreach( $this->fieldSpec as $field => $finfo ) {
-			$i++;
-			
+		foreach( $this->fields as $field_id => $finfo ) {
 			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) $finfo['SIZE'] = '';
+			if( !isset( $finfo['SIZE'] ) ) {
+				$finfo['SIZE'] = '';
+			}
 			
 			// Initialize the field array with the type and size
-			$fldarray[$i] = array( $field, $finfo['TYPE'], $finfo['SIZE'] );
+			$fldarray[$field_id] = array(
+				'NAME' => $finfo['NAME'],
+				'TYPE' => $finfo['TYPE'],
+				'SIZE' => $finfo['SIZE']
+			);
 			
 			// Loop through the options array and add the field options. 
 			if( isset( $finfo['OPTS'] ) ) {
 				foreach( $finfo['OPTS'] as $opt ) {
-					
-					if( is_array( $opt ) ) { // Option has an argument.
+					// Option has an argument.
+					if( is_array( $opt ) ) {
 						$key = key( $opt );
-						$value = $opt[key( $opt ) ];
-						$fldarray[$i][$key] = $value;
-						
-					} else { // Option doesn't have arguments
-						array_push( $fldarray[$i], $opt );
+						$value = $opt[key( $opt )];
+						$fldarray[$field_id][$key] = $value;
+					// Option doesn't have arguments
+					} else {
+						$fldarray[$field_id][$opt] = $opt;
 					}
 				}
 			}
 		}
 		
-		// Check for existing table
-		$legacyTables = $dict->MetaTables();
-		if( is_array( $legacyTables ) and count( $legacyTables > 0 ) ) {
-			foreach( $dict->MetaTables() as $table ) {
-				$this->legacyTables[ strtoupper( $table ) ] = $table;
-			}
-			if( isset( $this->legacyTables ) and is_array( $this->legacyTables ) and count( $this->legacyTables > 0 ) ) {
-				if( array_key_exists( strtoupper( $this->tableName ), $this->legacyTables ) ) {
-					$existingTableName = $this->legacyTables[strtoupper( $this->tableName )];
-					logMsg( "Upgrading $existingTableName using '{$this->upgrade}'" );
-				}
-			}
-		} 	
-		
-		// Build table array
-		if( !isset( $this->upgrade ) or !isset( $existingTableName ) ) {
-			
+		if( empty( $legacy_fields ) ) {
 			// Create the new table
-			$sqlArray = $dict->CreateTableSQL( $this->tableName, $fldarray, $this->tableOpts );
-			logMsg( $sqlArray, "Generated CreateTableSQL" );
-			
+			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+			logMsg( end( $sql ), 'Generated CreateTableSQL' );
 		} else {
-			
 			// Upgrade an existing table
-			switch( $this->upgrade ) {
-				
+			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
+			switch( $xmls->upgrade ) {
+				// Use ChangeTableSQL
 				case 'ALTER':
-					// Use ChangeTableSQL
-					$sqlArray = $dict->ChangeTableSQL( $this->tableName, $fldarray, $this->tableOpts );
-					logMsg( $sqlArray, "Generated ChangeTableSQL (ALTERing table)" );
+					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
+					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
 					break;
-					
 				case 'REPLACE':
-					logMsg( "Doing upgrade REPLACE (testing)" );
-					$sqlArray = $dict->ChangeTableSQL( $this->tableName, $fldarray, $this->tableOpts );
-					$this->replace( $dict );
+					logMsg( 'Doing upgrade REPLACE (testing)' );
+					$sql[] = $xmls->dict->DropTableSQL( $this->name );
+					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
 					break;
-					
+				// ignore table
 				default:
+					return array();
 			}
 		}
 		
-		// Return the array containing the SQL to create the table
-		logMsg( "   ---create" );
-		return $sqlArray;
+		foreach( $this->indexes as $index ) {
+			$sql[] = $index->create( $xmls );
+		}
+		
+		return $sql;
 	}
 	
 	/**
-	* Generates the SQL that will drop the table or field from the database
-	*
-	* @param object $dict		ADOdb data dictionary
-	* @return array	Array containing table creation SQL
+	* Marks a field or table for destruction
 	*/
-	function drop( $dict ) {
-		if( isset( $this->currentField ) ) {
+	function drop() {
+		if( isset( $this->current_field ) ) {
 			// Drop the current field
-			logMsg( "Dropping field '{$this->currentField}' from table '{$this->tableName}'" );
-			$this->dropField = TRUE;
-			$sqlArray = $dict->DropColumnSQL( $this->tableName, $this->currentField );
+			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
+			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
+			$this->drop_field[$this->current_field] = $this->current_field;
 		} else {
 			// Drop the current table
-			logMsg( "Dropping table '{$this->tableName}'" );
-			$this->dropTable = TRUE;
-			$sqlArray = false;
+			logMsg( "Dropping table '{$this->name}'" );
+			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
+			$this->drop_table = TRUE;
 		}
-		return $sqlArray; 
-	}
-	
-	/**
-	* Generates the SQL that will replace an existing table in the database
-	*
-	* Returns SQL that will replace the table represented by the object.
-	*
-	* @return array	Array containing table replacement SQL
-	*/
-	function replace( $dict ) {
-		logMsg( "   +++replace( $dict )" );
-		
-		// Identify new columns
-		
-		logMsg( "   ---replace)" );
-	}
-	
-	/**
-	* Destructor
-	*/
-	function destroy() {
-		logMsg( "===destroy" );
-		unset( $this );
 	}
 }
 
@@ -383,180 +577,174 @@ class dbTable {
 * of this class are used to build up the index description in ADOdb's
 * datadict format.
 *
+* @package axmls
 * @access private
 */
-class dbIndex {
+class dbIndex extends dbObject {
 	
 	/**
 	* @var string	Index name
 	*/
-	var $indexName;
+	var $name;
 	
 	/**
 	* @var array	Index options: Index-level options
 	*/
-	var $indexOpts;
-
-	/**
-	* @var string	Name of the table this index is attached to
-	*/
-	var $tableName;
+	var $opts = array();
 	
 	/**
 	* @var array	Indexed fields: Table columns included in this index
 	*/
-	var $fields;
-	
-	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
-	* @access private
-	*/
-	var $upgrade;
+	var $columns = array();
 	
 	/**
 	* @var boolean Mark index for destruction
 	* @access private
 	*/
-	var $dropIndex;
+	var $drop = FALSE;
 	
 	/**
-	* Constructor. Initialize the index and table names.
+	* Initializes the new dbIndex object.
 	*
-	* If the upgrade argument is set to ALTER or REPLACE, axmls will attempt to drop the index
-	* before and replace it with the new one.
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
 	*
-	* @param string $name	Index name
-	* @param string $table		Name of indexed table
-	* @param string	$upgrade		Upgrade method (NULL, ALTER, or REPLACE)
+	* @internal
 	*/
-	function dbIndex( $name, $table, $upgrade = NULL ) {
-		logMsg( "===dbIndex( $name, $table )" );
-		$this->indexName = $name;
-		$this->tableName = $table;
-		$this->dropIndex = FALSE;
+	function dbIndex( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
 		
-		// If upgrading, set the upgrade method
-		if( isset( $upgrade ) ) {
-			$upgrade = strtoupper( $upgrade );
-			if( $upgrade == 'ALTER' or $upgrade == 'REPLACE' ) {
-				$this->upgrade = strtoupper( $upgrade );
-				// Drop the old index
-				logMsg( "Dropping old index '$name' using {$this->upgrade}" );
-			} else {
-				unset( $this->upgrade );
-			}
-			
-		} else {
-			logMsg( "Creating index '$name'" );
+		$this->name = $this->prefix ($attributes['NAME']);
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'CLUSTERED':
+			case 'BITMAP':
+			case 'UNIQUE':
+			case 'FULLTEXT':
+			case 'HASH':
+				// Add index Option
+				$this->addIndexOpt( $this->currentElement );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'COL':
+				$this->addField( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'INDEX':
+				xml_set_object( $parser, $this->parent );
+				break;
 		}
 	}
 	
 	/**
 	* Adds a field to the index
-	* 
-	* This method adds the specified column to an index.
 	*
-	* @param string $name		Field name
-	* @return string	Field list
+	* @param string $name Field name
+	* @return string Field list
 	*/
 	function addField( $name ) {
-		logMsg( "   +++addField( $name )" );
-		
-		$fieldlist = &$this->fields;
-		$fieldlist ? ( $fieldlist .=" , $name" ) : ( $fieldlist = $name );
+		$this->columns[$this->FieldID( $name )] = $name;
 		
 		// Return the field list
-		logMsg( "   ---addField" );
-		return $fieldlist;
+		return $this->columns;
 	}
 	
 	/**
-	* Adds an option to the index
+	* Adds options to the index
 	*
-	*This method takes a comma-separated list of index-level options
-	* and appends them to the index object.
-	*
-	* @param string $opt		Index option
-	* @return string	Option list
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
 	*/
 	function addIndexOpt( $opt ) {
-		logMsg( "   +++addIndexOpt( $opt )" );
-		$optlist = &$this->indexOpts;
-		$optlist ? ( $optlist .= ", $opt" ) : ( $optlist = $opt );
-
+		$this->opts[] = $opt;
+		
 		// Return the options list
-		logMsg( "   ---addIndexOpt" );
-		return $optlist;
+		return $this->opts;
 	}
-
+	
 	/**
 	* Generates the SQL that will create the index in the database
 	*
-	* Returns SQL that will create the index represented by the object.
-	*
-	* @param object $dict	ADOdb data dictionary object
-	* @return array	Array containing index creation SQL
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
 	*/
-	function create( $dict ) {
-		logMsg( "   +++create( $dict )" );
-		
-		// Drop the index
-		if( $this->dropIndex == TRUE ) {
-			$sqlArray = array( "DROP INDEX {$this->indexName}" );
-			return $sqlArray; 
+	function create( &$xmls ) {
+		if( $this->drop ) {
+			return NULL;
 		}
 		
-		if (isset($this->indexOpts) ) {
-			// CreateIndexSQL requires an array of options.
-			$indexOpts_arr = explode(",",$this->indexOpts);
-		} else {
-			$indexOpts_arr = NULL;
-		}
-	 
-		// Build index SQL array
-		$sqlArray = $dict->CreateIndexSQL( $this->indexName, $this->tableName, $this->fields, $indexOpts_arr );
-	 	
-		// If upgrading, prepend SQL to drop the old index
-		if( isset( $this->upgrade ) ) {
-			$dropSql = "DROP INDEX {$this->indexName} ON {$this->tableName}";
-			array_unshift( $sqlArray, $dropSql );
+		// eliminate any columns that aren't in the table
+		foreach( $this->columns as $id => $col ) {
+			if( !isset( $this->parent->fields[$id] ) ) {
+				unset( $this->columns[$id] );
+			}
 		}
 		
-		// Return the array containing the SQL to create the table
-		logMsg( "   ---create" );
-		return $sqlArray;
+		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
 	}
 	
 	/**
 	* Marks an index for destruction
 	*/
 	function drop() {
-		logMsg( "Marking index '{$this->indexName}' from '{$this->tableName}' for drop" );
-		$this->dropIndex = TRUE;
-	}
-	
-	/**
-	* Destructor
-	*/
-	function destroy() {
-		logMsg( "===destroy" );
-		unset( $this );
+		$this->drop = TRUE;
 	}
 }
 
 /**
 * Creates the SQL to execute a list of provided SQL queries
 *
-* This class compiles a list of SQL queries specified in the external file.
-*
+* @package axmls
 * @access private
 */
-class dbQuerySet {
+class dbQuerySet extends dbObject {
 	
 	/**
 	* @var array	List of SQL queries
 	*/
-	var $querySet;
+	var $queries = array();
 	
 	/**
 	* @var string	String used to build of a query line by line
@@ -564,23 +752,153 @@ class dbQuerySet {
 	var $query;
 	
 	/**
-	* Constructor. Initializes the queries array
+	* @var string	Query prefix key
 	*/
-	function dbQuerySet() {
-		logMsg( "===dbQuerySet" );
-		$this->querySet = array();
+	var $prefixKey = '';
+	
+	/**
+	* @var boolean	Auto prefix enable (TRUE)
+	*/
+	var $prefixMethod = 'AUTO';
+	
+	/**
+	* Initializes the query set.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*/
+	function dbQuerySet( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+			
+		// Overrides the manual prefix key
+		if( isset( $attributes['KEY'] ) ) {
+			$this->prefixKey = $attributes['KEY'];
+		}
+		
+		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
+		
+		// Enables or disables automatic prefix prepending
+		switch( $prefixMethod ) {
+			case 'AUTO':
+				$this->prefixMethod = 'AUTO';
+				break;
+			case 'MANUAL':
+				$this->prefixMethod = 'MANUAL';
+				break;
+			case 'NONE':
+				$this->prefixMethod = 'NONE';
+				break;
+			default:
+				$this->prefixMethod = 'AUTO';
+		}
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: QUERY. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'QUERY':
+				// Create a new query in a SQL queryset.
+				// Ignore this query set if a platform is specified and it's different than the 
+				// current connection platform.
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->newQuery();
+				} else {
+					$this->discardQuery();
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Line of queryset SQL data
+			case 'QUERY':
+				$this->buildQuery( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'QUERY':
+				// Add the finished query to the open query set.
+				$this->addQuery();
+				break;
+			case 'SQL':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* Re-initializes the query.
+	*
+	* @return boolean TRUE
+	*/
+	function newQuery() {
 		$this->query = '';
+		
+		return TRUE;
+	}
+	
+	/**
+	* Discards the existing query.
+	*
+	* @return boolean TRUE
+	*/
+	function discardQuery() {
+		unset( $this->query );
+		
+		return TRUE;
 	}
 	
 	/** 
 	* Appends a line to a query that is being built line by line
 	*
-	* $param string $data	Line of SQL data or NULL to initialize a new query
+	* @param string $data Line of SQL data or NULL to initialize a new query
+	* @return string SQL query string.
 	*/
-	function buildQuery( $data = NULL ) {
-		logMsg( "   +++buildQuery( $data )" );
-		isset( $data ) ? ( $this->query .= " " . trim( $data ) ) : ( $this->query = '' );
-		logMsg( "   ---buildQuery" );
+	function buildQuery( $sql = NULL ) {
+		if( !isset( $this->query ) ) {
+			return FALSE;
+		}
+		
+		if( empty( $sql ) ) {
+			return FALSE;
+		}
+		
+		if( !empty( $this->query ) ) {
+			$this->query .= ' ';
+		}
+		
+		$this->query .= trim( $sql );
+		
+		return $this->query;
 	}
 	
 	/**
@@ -589,71 +907,120 @@ class dbQuerySet {
 	* @return string	SQL of added query
 	*/
 	function addQuery() {
-		logMsg( "   +++addQuery" );
+		if( !isset( $this->query ) ) {
+			return FALSE;
+		}
 		
-		// Push the query onto the query set array
-		$finishedQuery = $this->query;
-		array_push( $this->querySet, $finishedQuery );
+		$this->queries[] = $this->query;
+		$return = $this->query;
 		
-		// Return the query set array
-		logMsg( "   ---addQuery" );
-		return $finishedQuery;
+		unset( $this->query );
+		
+		return $return;
 	}
 	
 	/**
 	* Creates and returns the current query set
 	*
+	* @param object $xmls adoSchema object
 	* @return array Query set
 	*/
-	function create() {
-		logMsg( "   ===create" );
-		return $this->querySet;
+	function create( &$xmls ) {
+		foreach( $this->queries as $id => $query ) {
+			switch( $this->prefixMethod ) {
+				case 'AUTO':
+					// Enable auto prefix replacement
+					
+					// Process object prefix.
+					// Evaluate SQL statements to prepend prefix to objects
+					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query );
+					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query );
+					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query );
+					
+					// SELECT statements aren't working yet
+					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
+					
+				case 'MANUAL':
+					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
+					// If prefixKey is not set, we use the default constant XMLS_PREFIX
+					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
+						// Enable prefix override
+						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
+					} else {
+						// Use default replacement
+						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
+					}
+			}
+			
+			$this->queries[$id] = trim( $query );
+		}
+		
+		// Return the query set array
+		return $this->queries;
 	}
 	
 	/**
-	* Destructor
+	* Rebuilds the query with the prefix attached to any objects
+	*
+	* @param string $regex Regex used to add prefix
+	* @param string $query SQL query string
+	* @param string $prefix Prefix to be appended to tables, indices, etc.
+	* @return string Prefixed SQL query string.
 	*/
-	function destroy() {
-		logMsg( "===destroy" );
-		unset( $this );
+	function prefixQuery( $regex, $query, $prefix = NULL ) {
+		if( !isset( $prefix ) ) {
+			return $query;
+		}
+		
+		if( preg_match( $regex, $query, $match ) ) {
+			$preamble = $match[1];
+			$postamble = $match[5];
+			$objectList = explode( ',', $match[3] );
+			// $prefix = $prefix . '_';
+			
+			$prefixedList = '';
+			
+			foreach( $objectList as $object ) {
+				if( $prefixedList !== '' ) {
+					$prefixedList .= ', ';
+				}
+				
+				$prefixedList .= $prefix . trim( $object );
+			}
+			
+			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
+		}
+		
+		return $query;
 	}
 }
 
-
 /**
 * Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
 * 
 * This class is used to load and parse the XML file, to create an array of SQL statements
 * that can be used to build a database, and to build the database using the SQL array.
 *
-* @author Richard Tango-Lowy
+* @tutorial getting_started.pkg
+*
+* @author Richard Tango-Lowy & Dan Cech
 * @version $Revision$
-* @copyright (c) 2003 ars Cognita, Inc., all rights reserved
+*
+* @package axmls
 */
 class adoSchema {
 	
 	/**
 	* @var array	Array containing SQL queries to generate all objects
-	*/
-	var $sqlArray;
-	
-	/**
-	* @var object	XML Parser object
 	* @access private
 	*/
-	var $xmlParser;
+	var $sqlArray;
 	
 	/**
 	* @var object	ADOdb connection object
 	* @access private
 	*/
-	var $dbconn;
-	
-	/**
-	* @var string	Database type (platform)
-	* @access private
-	*/
-	var $dbType;
+	var $db;
 	
 	/**
 	* @var object	ADOdb Data Dictionary
@@ -661,47 +1028,23 @@ class adoSchema {
 	*/
 	var $dict;
 	
-	/**
-	* @var object	Temporary dbTable object
-	* @access private
-	*/
-	var $table;
-	
-	/**
-	* @var object	Temporary dbIndex object
-	* @access private
-	*/
-	var $index;
-	
-	/**
-	* @var object	Temporary dbQuerySet object
-	* @access private
-	*/
-	var $querySet;
-	
 	/**
 	* @var string Current XML element
 	* @access private
 	*/
-	var $currentElement;
+	var $currentElement = '';
 	
 	/**
 	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
 	* @access private
 	*/
-	var $upgradeMethod;
-	
-	/**
-	* @var mixed Existing tables before upgrade
-	* @access private
-	*/
-	var $legacyTables;
+	var $upgrade = '';
 	
 	/**
 	* @var string Optional object prefix
 	* @access private
 	*/
-	var $objectPrefix;
+	var $objectPrefix = '';
 	
 	/**
 	* @var long	Original Magic Quotes Runtime value
@@ -716,171 +1059,322 @@ class adoSchema {
 	var $debug;
 	
 	/**
-	* Constructor. Initializes the xmlschema object.
-	*
-	* adoSchema provides methods to parse and process the XML schema file. The dbconn argument 
-	* is a database connection object created by ADONewConnection. To upgrade an existing database to
-	* the provided schema, set the upgradeSchema flag to TRUE. By default, adoSchema will attempt to
-	* upgrade tables by ALTERing them on the fly. If your RDBMS doesn't support direct alteration
-	* (e.g., PostgreSQL), setting the forceReplace flag to TRUE will replace existing tables rather than
-	* altering them, copying data from each column in the old table to the like-named column in the
-	* new table.
-	*
-	* @param object $dbconn		ADOdb connection object
-	* @param object $upgradeSchema	Upgrade the database (deprecated)
-	* @param object $forceReplace	If upgrading, REPLACE tables (deprecated)
+	* @var string Regular expression to find schema version
+	* @access private
 	*/
-	function adoSchema( $dbconn, $upgradeSchema = FALSE, $forceReplace = FALSE ) {
-		logMsg( "+++adoSchema( $dbconn, $upgradeSchema, $forceReplace )" );
-		
+	var $versionRegex = '//';
+	
+	/**
+	* @var string Current schema version
+	* @access private
+	*/
+	var $schemaVersion;
+	
+	/**
+	* @var int	Success of last Schema execution
+	*/
+	var $success;
+	
+	/**
+	* @var bool	Execute SQL inline as it is generated
+	*/
+	var $executeInline;
+	
+	/**
+	* @var bool	Continue SQL execution if errors occur
+	*/
+	var $continueOnError;
+	
+	/**
+	* Creates an adoSchema object
+	*
+	* Creating an adoSchema object is the first step in processing an XML schema.
+	* The only parameter is an ADOdb database connection object, which must already
+	* have been created.
+	*
+	* @param object $db ADOdb database connection object.
+	*/
+	function adoSchema( &$db ) {
 		// Initialize the environment
 		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);	
+		set_magic_quotes_runtime(0);
 		
-		$this->dbconn	=  &$dbconn;
-		$this->dbType = $dbconn->databaseType;
+		$this->debug = $this->db->debug;
+		$this->db =& $db;
+		$this->dict = NewDataDictionary( $this->db );
 		$this->sqlArray = array();
-		$this->debug = $this->dbconn->debug;
-		
-		// Create an ADOdb dictionary object
-		$this->dict = NewDataDictionary( $dbconn );
-	
-		$GLOBALS['AXMLS_DBCONN'] = $this->dbconn;
-		$GLOBALS['AXMLS_DBDICT'] = $this->dict;
-		
-		// If upgradeSchema is set, we will be upgrading an existing database to match
-		// the provided schema. If forceReplace is set, objects are marked for replacement
-		// rather than alteration. Both these options are deprecated in favor of the 
-		// upgradeSchema method.
-		if( $upgradeSchema == TRUE ) {
-			
-			if( $forceReplace == TRUE ) {
-				logMsg( "upgradeSchema option deprecated. Use adoSchema->upgradeSchema('REPLACE') method instead" );
-				$method = 'REPLACE';
-			} else {
-				logMsg( "upgradeSchema option deprecated. Use adoSchema->upgradeSchema() method instead" );
-				$method = 'BEST';
-			}
-			$method = $this->upgradeSchema( $method );
-			logMsg( "Upgrading database using '$method'" );
-			
-		} else {
-			logMsg( "Creating new database schema" );
-			unset( $this->upgradeMethod );
-		}
-		logMsg( "---adoSchema" );
+		$this->schemaVersion = XMLS_SCHEMA_VERSION;
+		$this->executeInline( XMLS_EXECUTE_INLINE );
+		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
+		$this->setUpgradeMethod();
 	}
 	
 	/**
-	* Upgrades an existing schema rather than creating a new one
+	* Sets the method to be used for upgrading an existing database
 	*
-	* Upgrades an exsiting database to match the provided schema. The method
-	* option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
+	* Use this method to specify how existing database objects should be upgraded.
+	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
 	* alter each database object directly, REPLACE attempts to rebuild each object
 	* from scratch, BEST attempts to determine the best upgrade method for each
 	* object, and NONE disables upgrading.
 	*
+	* This method is not yet used by AXMLS, but exists for backward compatibility.
+	* The ALTER method is automatically assumed when the adoSchema object is
+	* instantiated; other upgrade methods are not currently supported.
+	*
 	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
 	* @returns string Upgrade method used
 	*/
-	function upgradeSchema( $method = 'BEST' ) {
+	function SetUpgradeMethod( $method = '' ) {
+		if( !is_string( $method ) ) {
+			return FALSE;
+		}
 		
-		// Get the metadata from existing tables, then map the names back to case-insensitive
-		// names (for RDBMS' like MySQL,. that are case specific.)
-		$legacyTables = $this->dict->MetaTables();
-
-		if( is_array( $legacyTables ) and count( $legacyTables > 0 ) ) {
-			foreach( $this->dict->MetaTables() as $table ) {
-				$this->legacyTables[ strtoupper( $table ) ] = $table;
-			}
-			logMsg( $this->legacyTables, "Legacy Tables Map" );
-		} 
+		$method = strtoupper( $method );
 		
 		// Handle the upgrade methods
-		switch( strtoupper( $method ) ) {
-			
+		switch( $method ) {
 			case 'ALTER':
-				$this->upgradeMethod = 'ALTER';
+				$this->upgrade = $method;
 				break;
-				
 			case 'REPLACE':
-				$this->upgradeMethod = 'REPLACE';
+				$this->upgrade = $method;
 				break;
-				
 			case 'BEST':
-				$this->upgradeMethod = 'ALTER';
+				$this->upgrade = 'ALTER';
 				break;
-				
 			case 'NONE':
-				$this->upgradeMethod = '';
+				$this->upgrade = 'NONE';
 				break;
-				
 			default:
-				// Fail out if no legitimate method is passed.
-				return FALSE;
+				// Use default if no legitimate method is passed.
+				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
 		}
-		return $method;
+		
+		return $this->upgrade;
 	}
-		
+	
 	/**
-	* Loads and parses an XML file
+	* Enables/disables inline SQL execution.
 	*
-	* This method accepts a path to an xmlschema-compliant XML file,
-	* loads it, parses it, and uses it to create the SQL to generate the objects
-	* described by the XML file.
+	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
+	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
+	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
+	* to apply the schema to the database.
 	*
-	* @param string $file		XML file
-	* @return array	Array of SQL queries, ready to execute
+	* @param bool $mode execute
+	* @return bool current execution mode
+	*
+	* @see ParseSchema(), ExecuteSchema()
 	*/
-	function ParseSchema( $file ) {
-		logMsg( "+++ParseSchema( $file )" );
-		
-		// Create the parser
-		$this->xmlParser = &$xmlParser;
-		$xmlParser = xml_parser_create();
-		xml_set_object( $xmlParser, $this );
-		
-		// Initialize the XML callback functions
-		xml_set_element_handler( $xmlParser, "_xmlcb_startElement", "_xmlcb_endElement" );
-		xml_set_character_data_handler( $xmlParser, "_xmlcb_cData" );
-		
-		// Open the file
-		if( !( $fp = fopen( $file, "r" ) ) ) {
-			die( "Unable to open file" );
+	function ExecuteInline( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->executeInline = $mode;
 		}
 		
+		return $this->executeInline;
+	}
+	
+	/**
+	* Enables/disables SQL continue on error.
+	*
+	* Call this method to enable or disable continuation of SQL execution if an error occurs.
+	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
+	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
+	* of the schema will continue.
+	*
+	* @param bool $mode execute
+	* @return bool current continueOnError mode
+	*
+	* @see addSQL(), ExecuteSchema()
+	*/
+	function ContinueOnError( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->continueOnError = $mode;
+		}
+		
+		return $this->continueOnError;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to create the database described. 
+	* @see ParseSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function ParseSchema( $filename ) {
+		return $this->ParseSchemaString( $this->ConvertSchemaFile ( $filename ) );
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
+	* and generate the SQL necessary to create the database described by the schema.
+	*
+	* @param string $file Name of XML schema file.
+	* @return array Array of SQL queries, ready to execute.
+	*
+	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
+	* @see ParseSchema(), ParseSchemaString()
+	*/
+	function ParseSchemaFile( $filename ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
+			return FALSE;
+		}
+		
+		$xmlParser = $this->create_parser();
+		
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-				die( sprintf( "XML error: %s at line %d",
-					xml_error_string( xml_get_error_code( $xmlParser ) ),
-					xml_get_current_line_number( $xmlParser ) ) );
+				die( sprintf(
+					"XML error: %s at line %d",
+					xml_error_string( xml_get_error_code( $xmlParser) ),
+					xml_get_current_line_number( $xmlParser)
+				) );
 			}
 		}
 		
-		// Return the array of queries
-		logMsg( "---ParseSchema" );
+		xml_parser_free( $xmlParser );
+		
 		return $this->sqlArray;
 	}
 	
 	/**
-	* Loads a schema into the database
+	* Converts an XML schema string to SQL.
 	*
-	* Accepts an array of SQL queries generated by the parser 
-	* and executes them.
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to create the database described by the schema. 
+	* @see ParseSchema()
 	*
-	* @param array $sqlArray	Array of SQL statements
-	* @param boolean $continueOnErr	Don't fail out if an error is encountered
-	* @returns integer	0 if failed, 1 if errors, 2 if successful
+	* @param string $xmlstring XML schema string.
+	* @return array Array of SQL queries, ready to execute.
 	*/
-	function ExecuteSchema( $sqlArray, $continueOnErr =  TRUE ) {
-		logMsg( "+++ExecuteSchema( $sqlArray, $continueOnErr )" );
+	function ParseSchemaString( $xmlstring ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
 		
-		$err = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
+		// do version detection here
+		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
+			return FALSE;
+		}
 		
-		// Return the success code
-		logMsg( "---ExecuteSchema" );
-		return $err;
+		$xmlParser = $this->create_parser();
+		
+		$this->success = 2;
+		
+		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
+			die( sprintf(
+				"XML error: %s at line %d",
+				xml_error_string( xml_get_error_code( $xmlParser) ),
+				xml_get_current_line_number( $xmlParser)
+			) );
+		}
+		
+		xml_parser_free( $xmlParser );
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Applies the current XML schema to the database (post execution).
+	*
+	* Call this method to apply the current schema (generally created by calling 
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* and executing other SQL specified in the schema) after parsing.
+	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
+	*
+	* @param array $sqlArray Array of SQL statements that will be applied rather than
+	*		the current schema.
+	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
+	* @returns integer 0 if failure, 1 if errors, 2 if successful.
+	*/
+	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
+		if( !is_bool( $continueOnErr ) ) {
+			$continueOnErr = $this->ContinueOnError();
+		}
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			$this->success = 0;
+		} else {
+			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
+		}
+		
+		return $this->success;
+	}
+	
+	/**
+	* Returns the current SQL array. 
+	*
+	* Call this method to fetch the array of SQL queries resulting from 
+	* ParseSchema() or ParseSchemaString(). 
+	*
+	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
+	* @return array Array of SQL statements or FALSE if an error occurs
+	*/
+	function PrintSQL( $format = 'NONE' ) {
+		return $this->getSQL( $format, $sqlArray );
+	}
+	
+	/**
+	* Saves the current SQL array to the local filesystem as a list of SQL queries.
+	*
+	* Call this method to save the array of SQL queries (generally resulting from a
+	* parsed XML schema) to the filesystem.
+	*
+	* @param string $filename Path and name where the file should be saved.
+	* @return boolean TRUE if save is successful, else FALSE. 
+	*/
+	function SaveSQL( $filename = './schema.sql' ) {
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		if( !isset( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		$fp = fopen( $filename, "w" );
+		
+		foreach( $sqlArray as $key => $query ) {
+			fwrite( $fp, $query . ";\n" );
+		}
+		fclose( $fp );
+	}
+	
+	/**
+	* Create an xml parser
+	*
+	* @return object PHP XML parser object
+	*
+	* @access private
+	*/
+	function &create_parser() {
+		// Create the parser
+		$xmlParser = xml_parser_create();
+		xml_set_object( $xmlParser, $this );
+		
+		// Initialize the XML callback functions
+		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
+		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
+		
+		return $xmlParser;
 	}
 	
 	/**
@@ -888,273 +1382,451 @@ class adoSchema {
 	*
 	* @access private
 	*/
-	function _xmlcb_startElement( $parser, $name, $attrs ) {
-		
-		isset( $this->upgradeMethod ) ? ( $upgradeMethod = $this->upgradeMethod ) : ( $upgradeMethod = '' );
-		
-		$dbType = $this->dbType;
-		if( isset( $this->table ) ) $table = &$this->table;
-		if( isset( $this->index ) ) $index = &$this->index;
-		if( isset( $this->querySet ) ) $querySet = &$this->querySet;
-		$this->currentElement = $name;
-		
-		// Process the element. Ignore unimportant elements.
-		if( in_array( trim( $name ),  array( "SCHEMA", "DESCR", "COL", "CONSTRAINT" ) ) ) {
-			return FALSE;
+	function _tag_open( &$parser, $tag, $attributes ) {
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->obj = new dbTable( $this, $attributes );
+				xml_set_object( $parser, $this->obj );
+				break;
+			case 'SQL':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->obj = new dbQuerySet( $this, $attributes );
+					xml_set_object( $parser, $this->obj );
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
 		}
 		
-		switch( $name ) {
-				
-			case "CLUSTERED":	// IndexOpt
-			case "BITMAP":		// IndexOpt
-			case "UNIQUE":		// IndexOpt
-			case "FULLTEXT":	// IndexOpt
-			case "HASH":		// IndexOpt
-				if( isset( $this->index ) ) $this->index->addIndexOpt( $name );
-				break;
-
-			case "TABLE":	// Table element
-				if( !isset( $attrs['PLATFORM'] ) or $this->supportedPlatform( $attrs['PLATFORM'] ) ) {
-					isset( $this->objectPrefix ) ? ( $tableName = $this->objectPrefix . $attrs['NAME'] ) : ( $tableName =  $attrs['NAME'] );
-					$this->table = new dbTable( $tableName, $upgradeMethod );
-				} else {
-					unset( $this->table );
-				}
-				break;
-				
-			case "FIELD":	// Table field
-				if( isset( $this->table ) ) {
-					$fieldName = $attrs['NAME'];
-					$fieldType = $attrs['TYPE'];
-					isset( $attrs['SIZE'] ) ? ( $fieldSize = $attrs['SIZE'] ) : ( $fieldSize = NULL );
-					isset( $attrs['OPTS'] ) ? ( $fieldOpts = $attrs['OPTS'] ) : ( $fieldOpts = NULL );
-					$this->table->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
-				}
-				break;
-				
-			case "KEY":	// Table field option
-				if( isset( $this->table ) ) {
-					$this->table->addFieldOpt( $this->table->currentField, 'KEY' );
-				}
-				break;
-				
-			case "NOTNULL":	// Table field option
-				if( isset( $this->table ) ) {
-					$this->table->addFieldOpt( $this->table->currentField, 'NOTNULL' );
-				}
-				break;
-				
-			case "AUTOINCREMENT":	// Table field option
-				if( isset( $this->table ) ) {
-					$this->table->addFieldOpt( $this->table->currentField, 'AUTOINCREMENT' );
-				}
-				break;
-				
-			case "DEFAULT":	// Table field option
-				if( isset( $this->table ) ) {
-					$this->table->addFieldOpt( $this->table->currentField, 'DEFAULT', $attrs['VALUE'] );
-				}
-				break;
-				
-			case "INDEX":	// Table index
-			
-				if( !isset( $attrs['PLATFORM'] ) or $this->supportedPlatform( $attrs['PLATFORM'] ) ) {
-					if (isset($attrs['TABLE']))
-						isset( $this->objectPrefix) ? ( $tableName = $this->objectPrefix . $attrs['TABLE'] ) : ( $tableName =  $attrs['TABLE'] );
-					else
-						$tableName = '';
-					$this->index = new dbIndex( $attrs['NAME'], $tableName, $upgradeMethod );
-				} else {
-					if( isset( $this->index ) ) unset( $this->index );
-				}
-				break;
-				
-			case "SQL":	// Freeform SQL queryset
-				if( !isset( $attrs['PLATFORM'] ) or $this->supportedPlatform( $attrs['PLATFORM'] ) ) {
-					$this->querySet = new dbQuerySet( $attrs );
-				} else {
-					if( isset( $this->querySet ) ) unset( $this->querySet );
-				}
-				break;
-				
-			case "QUERY":	// Queryset SQL query
-				if( isset( $this->querySet ) ) {
-					// Ignore this query set if a platform is specified and it's different than the 
-					// current connection platform.
-					if( !isset( $attrs['PLATFORM'] ) or $this->supportedPlatform( $attrs['PLATFORM'] ) ) {
-						$this->querySet->buildQuery();
-					} else {
-						if( isset( $this->querySet->query ) ) unset( $this->querySet->query );
-					}
-				}
-				break;
-				
-			default:
-				if( $this->debug ) print "OPENING ELEMENT '$name'
\n";
-		}	
 	}
-
+	
 	/**
-	* XML Callback to process cDATA elements
+	* XML Callback to process CDATA elements
 	*
 	* @access private
 	*/
-	function _xmlcb_cData( $parser, $data ) {
-		
-		$element = &$this->currentElement;
-		
-		if( trim( $data ) == "" ) return;
-		
-		// Process the data depending on the element
-		switch( $element ) {
-		
-			case "COL":	// Index column
-				if( isset( $this->index ) ) $this->index->addField( $data );
-				break;
-				
-			case "DESCR":	// Description element
-				// Display the description information
-				if( isset( $this->table ) ) {
-					$name = "({$this->table->tableName}):  ";
-				} elseif( isset( $this->index ) ) {
-					$name = "({$this->index->indexName}):  ";
-				} else {
-					$name = "";
-				}
-				if( $this->debug ) print "
  •  $name $data\n";
-				break;
-			
-			case "QUERY":	// Query SQL data
-				if( isset( $this->querySet ) and isset( $this->querySet->query ) ) $this->querySet->buildQuery( $data );
-				break;
-			
-			case "CONSTRAINT":	// Table constraint
-				if( isset( $this->table ) ) $this->table->addTableOpt( $data );
-				break;
-				
-			default:
-				if( $this->debug ) print "
    • CDATA ($element) $data
    \n";
-		}
+	function _tag_cdata( &$parser, $cdata ) {
 	}
-
+	
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
+	* @internal
 	*/
-	function _xmlcb_endElement( $parser, $name ) {
+	function _tag_close( &$parser, $tag ) {
 		
-		// Process the element. Ignore unimportant elements.
-		if( in_array( trim( $name ), 
-			array( 	"SCHEMA", "DESCR", "KEY", "AUTOINCREMENT", "FIELD",
-						"DEFAULT", "NOTNULL", "CONSTRAINT", "COL" ) ) ) {
-			return FALSE;
-		}
-		
-		switch( trim( $name ) ) {
-			
-			case "TABLE":	// Table element
-				if( isset( $this->table ) ) {
-					$tableSQL = $this->table->create( $this->dict );
-					
-					// Handle case changes in MySQL
-					// Get the metadata from the database, convert old and new table names to the
-					// same case and compare. If they're the same, pop a RENAME onto the query stack.
- 					$tableName = $this->table->tableName;
-					if( $this->dict->upperName == 'MYSQL' 
-						and is_array( $this->legacyTables )
-						and array_key_exists( strtoupper( $tableName ), $this->legacyTables )
-						and $oldTableName = $this->legacyTables[ strtoupper( $tableName ) ] ) {
-						if( $oldTableName != $tableName ) {
-    						logMsg( "RENAMING table $oldTableName to $tableName" );
-    						array_push( $this->sqlArray, "RENAME TABLE $oldTableName TO $tableName" );
-						}
-					}
-					foreach( $tableSQL as $query ) {
-						array_push( $this->sqlArray, $query );
-					}
-					$this->table->destroy();
-				}
-				break;
-				
-			case "DROP":	// Drop an item
-				logMsg( "DROPPING" );
-				if( isset( $this->table ) ) {
-					// Drop a table or field
-					$dropSQL = $this->table->drop( $this->dict );					
-				} 
-				if( isset( $this->index ) ) {
-					// Drop an index
-					$dropSQL = $this->index->drop();
-				}
-				break;
-				
-			case "INDEX":	// Index element
-				if( isset( $this->index ) ) {
-					$indexSQL = $this->index->create( $this->dict );
-					foreach( $indexSQL as $query ) {
-						array_push( $this->sqlArray, $query );
-					}
-					$this->index->destroy();
-				}
-				break;
-			
-			case "QUERY":	// Queryset element
-				if( isset( $this->querySet ) and isset( $this->querySet->query ) ) $this->querySet->addQuery();
-				break;
-			
-			case "SQL":	// Query SQL element
-				if( isset( $this->querySet ) ) {
-					$querySQL = $this->querySet->create();
-					$this->sqlArray = array_merge( $this->sqlArray, $querySQL );;
-					$this->querySet->destroy();
-				}
-				break;
-				
-			default:
-				if( $this->debug ) print "
  • CLOSING $name\n";
-		}
 	}
 	
 	/**
-    * Set object prefix
-    *
-    * Sets a standard prefix that will be prepended to all database tables during
-    * database creation. Calling setPrefix with no arguments clears the prefix.
-    *
-    * @param string $prefix Prefix
-    * @return boolean       TRUE if successful, else FALSE
-    */
-    function setPrefix( $prefix = '' ) {
-
-            if( !preg_match( '/[^\w]/', $prefix ) and strlen( $prefix < XMLS_PREFIX_MAXLEN ) ) {
-                $this->objectPrefix = $prefix;
-                logMsg( "Prepended prefix: $prefix" );
-                return TRUE;
-            } else {
-            	logMsg( "No prefix" );
-                return FALSE;
-            }
-    }
+	* Converts an XML schema string to the specified DTD version.
+	*
+	* Call this method to convert a string containing an XML schema to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaFile()
+	*
+	* @param string $schema String containing XML schema that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = $schema;
+		} else {
+			// Fail if XSLT extension is not available
+			if( ! function_exists( 'xslt_create' ) ) {
+				return FALSE;
+			}
+			
+			$xsl_file = dirname( __FILE__ ) . '/xsl/convert-' . $version . '-' . $newVersion . '.xsl';
+			
+			// look for xsl
+			if( !is_readable( $xsl_file ) ) {
+				return FALSE;
+			}
+			
+			$arguments = array (
+				'/_xml' => $schema,
+				'/_xsl' => file_get_contents ($xsl_file)
+			);
+			
+			// create an XSLT processor
+			$xh = xslt_create ();
+			
+			// set error handler
+			xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
+			
+			// process the schema
+			$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
+			
+			xslt_free ($xh);
+		}
+		
+		if( is_string ($newFile) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite ($fp, $result);
+			fclose ($fp);
+		}
+		
+		return $result;
+	}
 	
+	/**
+	* Converts an XML schema file to the specified DTD version.
+	*
+	* Call this method to convert the specified XML schema file to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaString()
+	*
+	* @param string $filename Name of XML schema file that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = file_get_contents( $filename );
+			
+			// remove unicode BOM if present
+			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
+				$result = substr( $result, 3 );
+			}
+		} else {
+			// Fail if XSLT extension is not available
+			if( ! function_exists( 'xslt_create' ) ) {
+				return FALSE;
+			}
+			
+			$xsl_file = dirname( __FILE__ ) . '/xsl/convert-' . $version . '-' . $newVersion . '.xsl';
+			
+			// look for xsl
+			if( !is_readable( $xsl_file ) ) {
+				return FALSE;
+			}
+			
+			$arguments = array (
+				'/_xml' => file_get_contents ($filename),
+				'/_xsl' => file_get_contents ($xsl_file)
+			);
+			
+			// create an XSLT processor
+			$xh = xslt_create ();
+			
+			// set error handler
+			xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
+			
+			// process the schema
+			$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
+			
+			xslt_free ($xh);
+		}
+		
+		if( is_string ($newFile) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite ($fp, $result);
+			fclose ($fp);
+		}
+		
+		return $result;
+	}
+	
+	/**
+	* Processes XSLT transformation errors
+	*
+	* @param object $parser XML parser object
+	* @param integer $errno Error number
+	* @param integer $level Error level
+	* @param array $fields Error information fields
+	*
+	* @access private
+	*/
+	function xslt_error_handler( $parser, $errno, $level, $fields ) {
+		if( is_array( $fields ) ) {
+			$msg = array(
+				'Message Type' => ucfirst( $fields['msgtype'] ),
+				'Message Code' => $fields['code'],
+				'Message' => $fields['msg'],
+				'Error Number' => $errno,
+				'Level' => $level
+			);
+			
+			switch( $fields['URI'] ) {
+				case 'arg:/_xml':
+					$msg['Input'] = 'XML';
+					break;
+				case 'arg:/_xsl':
+					$msg['Input'] = 'XSL';
+					break;
+				default:
+					$msg['Input'] = $fields['URI'];
+			}
+			
+			$msg['Line'] = $fields['line'];
+		} else {
+			$msg = array(
+				'Message Type' => 'Error',
+				'Error Number' => $errno,
+				'Level' => $level,
+				'Fields' => var_export( $fields, TRUE )
+			);
+		}
+		
+		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
+					   . '' . "\n";
+		
+		foreach( $msg as $label => $details ) {
+			$error_details .= '' . "\n";
+		}
+		
+		$error_details .= '
    ' . $label . ': ' . htmlentities( $details ) . '
    ';
+		
+		trigger_error( $error_details, E_USER_ERROR );
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the requested XML schema file.
+	*
+	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
+	* @see SchemaStringVersion()
+	*
+	* @param string $filename AXMLS schema file
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaFileVersion( $filename ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( preg_match( $this->versionRegex, $data, $matches ) ) {
+				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+			}
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the provided XML schema string.
+	*
+	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
+	* @see SchemaFileVersion()
+	*
+	* @param string $xmlstring XML schema string
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaStringVersion( $xmlstring ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
+		
+		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
+			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Extracts an XML schema from an existing database.
+	*
+	* Call this method to create an XML schema string from an existing database.
+	* If the data parameter is set to TRUE, AXMLS will include the data from the database
+	* in the schema. 
+	*
+	* @param boolean $data Include data in schema dump
+	* @return string Generated XML schema
+	*/
+	function ExtractSchema( $data = FALSE ) {
+		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
+		
+		$schema = '' . "\n"
+				. '' . "\n";
+		
+		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
+			foreach( $tables as $table ) {
+				$schema .= '	' . "\n";
+				
+				// grab details from database
+				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE -1' );
+				$fields = $this->db->MetaColumns( $table );
+				$indexes = $this->db->MetaIndexes( $table );
+				
+				if( is_array( $fields ) ) {
+					foreach( $fields as $details ) {
+						$extra = '';
+						$content = array();
+						
+						if( $details->max_length > 0 ) {
+							$extra .= ' size="' . $details->max_length . '"';
+						}
+						
+						if( $details->primary_key ) {
+							$content[] = '';
+						} elseif( $details->not_null ) {
+							$content[] = '';
+						}
+						
+						if( $details->has_default ) {
+							$content[] = '';
+						}
+						
+						if( $details->auto_increment ) {
+							$content[] = '';
+						}
+						
+						// this stops the creation of 'R' columns,
+						// AUTOINCREMENT is used to create auto columns
+						$details->primary_key = 0;
+						$type = $rs->MetaType( $details );
+						
+						$schema .= '		';
+						
+						if( !empty( $content ) ) {
+							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
+						}
+						
+						$schema .= '' . "\n";
+					}
+				}
+				
+				if( is_array( $indexes ) ) {
+					foreach( $indexes as $index => $details ) {
+						$schema .= '		' . "\n";
+						
+						if( $details['unique'] ) {
+							$schema .= '			' . "\n";
+						}
+						
+						foreach( $details['columns'] as $column ) {
+							$schema .= '			' . $column . '' . "\n";
+						}
+						
+						$schema .= '		' . "\n";
+					}
+				}
+				
+				if( $data ) {
+					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
+					
+					if( is_object( $rs ) ) {
+						$schema .= '		' . "\n";
+						
+						while( $row = $rs->FetchRow() ) {
+							$schema .= '			' . implode( '', $row ) . '' . "\n";
+						}
+						
+						$schema .= '		' . "\n";
+					}
+				}
+				
+				$schema .= '	
    ' . "\n";
+			}
+		}
+		
+		$this->db->SetFetchMode( $old_mode );
+		
+		$schema .= '    ';
+		return $schema;
+	}
+	
+	/**
+	* Sets a prefix for database objects
+	*
+	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
+	*
+	* @param string $prefix Prefix that will be prepended.
+	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
+	* @return boolean TRUE if successful, else FALSE
+	*/
+	function SetPrefix( $prefix = '', $underscore = TRUE ) {
+		switch( TRUE ) {
+			// clear prefix
+			case empty( $prefix ):
+				logMsg( 'Cleared prefix' );
+				$this->objectPrefix = '';
+				return TRUE;
+			// prefix too long
+			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
+			// prefix contains invalid characters
+			case !preg_match( '/^[a-z][a-z0-9]+$/i', $prefix ):
+				logMsg( 'Invalid prefix: ' . $prefix );
+				return FALSE;
+		}
+		
+		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+			$prefix .= '_';
+		}
+		
+		// prefix valid
+		logMsg( 'Set prefix: ' . $prefix );
+		$this->objectPrefix = $prefix;
+		return TRUE;
+	}
+	
+	/**
+	* Returns an object name with the current prefix prepended.
+	*
+	* @param string	$name Name
+	* @return string	Prefixed name
+	*
+	* @access private
+	*/
+	function prefix( $name = '' ) {
+		// if prefix is set
+		if( !empty( $this->objectPrefix ) ) {
+			// Prepend the object prefix to the table name
+			// prepend after quote if used
+			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
+		}
+		
+		// No prefix set. Use name provided.
+		return $name;
+	}
 	
 	/**
 	* Checks if element references a specific platform
 	*
-	* Returns TRUE is no platform is specified or if we are currently
-	* using the specified platform.
-	*
-	* @param string	$platform	Requested platform
-	* @returns boolean	TRUE if platform check succeeds
+	* @param string $platform Requested platform
+	* @returns boolean TRUE if platform check succeeds
 	*
 	* @access private
 	*/
 	function supportedPlatform( $platform = NULL ) {
+		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
 		
-		$dbType = $this->dbType;
-		$regex = "/^(\w*\|)*" . $dbType . "(\|\w*)*$/";
-		
-		if( !isset( $platform ) or preg_match( $regex, $platform ) ) {
+		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
 			logMsg( "Platform $platform is supported" );
 			return TRUE;
 		} else {
@@ -1164,38 +1836,116 @@ class adoSchema {
 	}
 	
 	/**
-	* Destructor: Destroys an adoSchema object. 
+	* Clears the array of generated SQL.
 	*
-	* You should call this to clean up when you're finished with adoSchema.
+	* @access private
+	*/
+	function clearSQL() {
+		$this->sqlArray = array();
+	}
+	
+	/**
+	* Adds SQL into the SQL array.
+	*
+	* @param mixed $sql SQL to Add
+	* @return boolean TRUE if successful, else FALSE.
+	*
+	* @access private
+	*/	
+	function addSQL( $sql = NULL ) {
+		if( is_array( $sql ) ) {
+			foreach( $sql as $line ) {
+				$this->addSQL( $line );
+			}
+			
+			return TRUE;
+		}
+		
+		if( is_string( $sql ) ) {
+			$this->sqlArray[] = $sql;
+			
+			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
+			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
+				$saved = $this->db->debug;
+				$this->db->debug = $this->debug;
+				$ok = $this->db->Execute( $sql );
+				$this->db->debug = $saved;
+				
+				if( !$ok ) {
+					if( $this->debug ) {
+						ADOConnection::outp( $this->db->ErrorMsg() );
+					}
+					
+					$this->success = 1;
+				}
+			}
+			
+			return TRUE;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Gets the SQL array in the specified format.
+	*
+	* @param string $format Format
+	* @return mixed SQL
+	*	
+	* @access private
+	*/
+	function getSQL( $format = NULL, $sqlArray = NULL ) {
+		if( !is_array( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		switch( strtolower( $format ) ) {
+			case 'string':
+			case 'text':
+				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
+			case'html':
+				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
+		}
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Destroys an adoSchema object.
+	*
+	* Call this method to clean up after an adoSchema object that is no longer in use.
+	* @deprecated adoSchema now cleans up automatically.
 	*/
 	function Destroy() {
-		xml_parser_free( $this->xmlParser );
 		set_magic_quotes_runtime( $this->mgq );
 		unset( $this );
 	}
 }
 
 /**
-* Message loggging function
+* Message logging function
 *
 * @access private
 */
 function logMsg( $msg, $title = NULL ) {
 	if( XMLS_DEBUG ) {
-		print "
    ";
+		echo '
    ';
+		
 		if( isset( $title ) ) {
-			print "
    $title
    ";
+			echo '
    ' . htmlentities( $title ) . '
    ';
 		}
-		if( isset( $this ) ) {
-			print "[" . get_class( $this ) . "] ";
+		
+		if( is_object( $this ) ) {
+			echo '[' . get_class( $this ) . '] ';
 		}
-		if( is_array( $msg ) or is_object( $msg ) ) {
-			print_r( $msg );
-			print "
    ";
-		} else {
-			print "$msg
    ";
-		}
-		print "
    ";
+		
+		print_r( $msg );
+		
+		echo '
    ';
 	}
 }
 ?>
\ No newline at end of file
diff --git a/lib/adodb/adodb.inc.php b/lib/adodb/adodb.inc.php
index 46a72684e5c..4a0efd204e9 100644
--- a/lib/adodb/adodb.inc.php
+++ b/lib/adodb/adodb.inc.php
@@ -1,3639 +1,3668 @@
-
-	Manual is at http://php.weblogs.com/adodb_manual
-	  
- */
- 
- if (!defined('_ADODB_LAYER')) {
- 	define('_ADODB_LAYER',1);
-	
-	//==============================================================================================	
-	// CONSTANT DEFINITIONS
-	//==============================================================================================	
-
-
-	/** 
-	 * Set ADODB_DIR to the directory where this file resides...
-	 * This constant was formerly called $ADODB_RootPath
-	 */
-	if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
-	
-	//==============================================================================================	
-	// GLOBAL VARIABLES
-	//==============================================================================================	
-
-	GLOBAL 
-		$ADODB_vers, 		// database version
-		$ADODB_COUNTRECS,	// count number of records returned - slows down query
-		$ADODB_CACHE_DIR,	// directory to cache recordsets
-		$ADODB_EXTENSION,   // ADODB extension installed
-		$ADODB_COMPAT_PATCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF
-	 	$ADODB_FETCH_MODE;	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
-	
-	//==============================================================================================	
-	// GLOBAL SETUP
-	//==============================================================================================	
-	
-	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
-	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-		
-		define('ADODB_BAD_RS','
    Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;
    ');
-	
-	// allow [ ] @ ` and . in table names
-		define('ADODB_TABLE_REGEX','([]0-9a-z_\`\.\@\[-]*)');
-	
-	// prefetching used by oracle
-		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-	
-	
-	/*
-	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
-	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-	
- 		0 = assoc lowercase field names. $rs->fields['orderid']
-		1 = assoc uppercase field names. $rs->fields['ORDERID']
-		2 = use native-case field names. $rs->fields['OrderID']
-	*/
-	
-		define('ADODB_FETCH_DEFAULT',0);
-		define('ADODB_FETCH_NUM',1);
-		define('ADODB_FETCH_ASSOC',2);
-		define('ADODB_FETCH_BOTH',3);
-		
-		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-	
-		if (strnatcmp(PHP_VERSION,'4.3.0')>=0) {
-			define('ADODB_PHPVER',0x4300);
-		} else if (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
-			define('ADODB_PHPVER',0x4200);
-		} else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
-			define('ADODB_PHPVER',0x4050);
-		} else {
-			define('ADODB_PHPVER',0x4000);
-		}
-	}
-	
-	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-	
-	
-	/**
-	 	Accepts $src and $dest arrays, replacing string $data
-	*/
-	function ADODB_str_replace($src, $dest, $data)
-	{
-		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
-		
-		$s = reset($src);
-		$d = reset($dest);
-		while ($s !== false) {
-			$data = str_replace($s,$d,$data);
-			$s = next($src);
-			$d = next($dest);
-		}
-		return $data;
-	}
-	
-	function ADODB_Setup()
-	{
-	GLOBAL 
-		$ADODB_vers, 		// database version
-		$ADODB_COUNTRECS,	// count number of records returned - slows down query
-		$ADODB_CACHE_DIR,	// directory to cache recordsets
-	 	$ADODB_FETCH_MODE;
-		
-		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
-		
-		if (!isset($ADODB_CACHE_DIR)) {
-			$ADODB_CACHE_DIR = '/tmp';
-		} else {
-			// do not accept url based paths, eg. http:/ or ftp:/
-			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
-				die("Illegal path http:// or ftp://");
-		}
-		
-			
-		// Initialize random number generator for randomizing cache flushes
-		srand(((double)microtime())*1000000);
-		
-		/**
-		 * ADODB version as a string.
-		 */
-		$ADODB_vers = 'V4.11 27 Jan 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
-	
-		/**
-		 * Determines whether recordset->RecordCount() is used. 
-		 * Set to false for highest performance -- RecordCount() will always return -1 then
-		 * for databases that provide "virtual" recordcounts...
-		 */
-		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
-	}
-	
-	
-	//==============================================================================================	
-	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-	//==============================================================================================	
-	
-	ADODB_Setup();
-
-	//==============================================================================================	
-	// CLASS ADOFieldObject
-	//==============================================================================================	
-	/**
-	 * Helper class for FetchFields -- holds info on a column
-	 */
-	class ADOFieldObject { 
-		var $name = '';
-		var $max_length=0;
-		var $type="";
-
-		// additional fields by dannym... (danny_milo@yahoo.com)
-		var $not_null = false; 
-		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
-		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
-
-		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
-			// others to come (dannym)
-		var $default_value; // default, if any, and supported. Check has_default first.
-	}
-	
-
-	
-	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
-	{
-		//print "Errorno ($fn errno=$errno m=$errmsg) ";
-		$thisConnection->_transOK = false;
-		if ($thisConnection->_oldRaiseFn) {
-			$fn = $thisConnection->_oldRaiseFn;
-			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
-		}
-	}
-	
-	//==============================================================================================	
-	// CLASS ADOConnection
-	//==============================================================================================	
-	
-	/**
-	 * Connection object. For connecting to databases, and executing queries.
-	 */ 
-	class ADOConnection {
-	//
-	// PUBLIC VARS 
-	//
-	var $dataProvider = 'native';
-	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
-	var $database = '';			/// Name of database to be used.	
-	var $host = ''; 			/// The hostname of the database server	
-	var $user = ''; 			/// The username which is used to connect to the database server. 
-	var $password = ''; 		/// Password for the username. For security, we no longer store it.
-	var $debug = false; 		/// if set to true will output sql statements
-	var $maxblobsize = 256000; 	/// maximum size of blobs or large text fields -- some databases die otherwise like foxpro
-	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
-	var $substr = 'substr';		/// substring operator
-	var $length = 'length';		/// string length operator
-	var $random = 'rand()';		/// random function
-	var $upperCase = false;		/// uppercase function
-	var $fmtDate = "'Y-m-d'";	/// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; /// used by DBTimeStamp as the default timestamp fmt.
-	var $true = '1'; 			/// string that represents TRUE for a database
-	var $false = '0'; 			/// string that represents FALSE for a database
-	var $replaceQuote = "\\'"; 	/// string to use to replace quotes
-	var $nameQuote = '"';		/// string to use to quote identifiers and names
-	var $charSet=false; 		/// character set to use - only for interbase
-	var $metaDatabasesSQL = '';
-	var $metaTablesSQL = '';
-	var $uniqueOrderBy = false; /// All order by columns have to be unique
-	var $emptyDate = ' ';
-	var $emptyTimeStamp = ' ';
-	var $lastInsID = false;
-	//--
-	var $hasInsertID = false; 		/// supports autoincrement ID?
-	var $hasAffectedRows = false; 	/// supports affected rows for update/delete?
-	var $hasTop = false;			/// support mssql/access SELECT TOP 10 * FROM TABLE
-	var $hasLimit = false;			/// support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	var $readOnly = false; 			/// this is a readonly database - used by phpLens
-	var $hasMoveFirst = false;  /// has ability to run MoveFirst(), scrolling backwards
-	var $hasGenID = false; 		/// can generate sequences using GenID();
-	var $hasTransactions = true; /// has transactions
-	//--
-	var $genID = 0; 			/// sequence id used by GenID();
-	var $raiseErrorFn = false; 	/// error function to call
-	var $isoDates = false; /// accepts dates in ISO format
-	var $cacheSecs = 3600; /// cache for 1 hour
-	var $sysDate = false; /// name of function that returns the current date
-	var $sysTimeStamp = false; /// name of function that returns the current timestamp
-	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
-	
-	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
-	var $numCacheHits = 0; 
-	var $numCacheMisses = 0;
-	var $pageExecuteCountRows = true;
-	var $uniqueSort = false; /// indicates that all fields in order by must be unique
-	var $leftOuter = false; /// operator to use for left outer join in WHERE clause
-	var $rightOuter = false; /// operator to use for right outer join in WHERE clause
-	var $ansiOuter = false; /// whether ansi outer join syntax supported
-	var $autoRollback = false; // autoRollback on PConnect().
-	var $poorAffectedRows = false; // affectedRows not working or unreliable
-	
-	var $fnExecute = false;
-	var $fnCacheExecute = false;
-	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
-	var $rsPrefix = "ADORecordSet_";
-	
-	var $autoCommit = true; 	/// do not modify this yourself - actually private
-	var $transOff = 0; 			/// temporarily disable transactions
-	var $transCnt = 0; 			/// count of nested transactions
-	
-	var $fetchMode=false;
-	 //
-	 // PRIVATE VARS
-	 //
-	var $_oldRaiseFn =  false;
-	var $_transOK = null;
-	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
-	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
-								/// then returned by the errorMsg() function	
-	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
-	var $_queryID = false;		/// This variable keeps the last created result link identifier
-	
-	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
-	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
-	var $_evalAll = false;
-	var $_affected = false;
-	var $_logsql = false;
-	
-
-	
-	/**
-	 * Constructor
-	 */
-	function ADOConnection()			
-	{
-		die('Virtual Class -- cannot instantiate');
-	}
-	
-	/**
-		Get server version info...
-		
-		@returns An array with 2 elements: $arr['string'] is the description string, 
-			and $arr[version] is the version (also a string).
-	*/
-	function ServerInfo()
-	{
-		return array('description' => '', 'version' => '');
-	}
-	
-	function _findvers($str)
-	{
-		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
-		else return '';
-	}
-	
-	/**
-	* All error messages go through this bottleneck function.
-	* You can define your own handler by defining the function name in ADODB_OUTP.
-	*/
-	function outp($msg,$newline=true)
-	{
-	global $HTTP_SERVER_VARS,$ADODB_FLUSH;
-	
-		if (defined('ADODB_OUTP')) {
-			$fn = ADODB_OUTP;
-			$fn($msg,$newline);
-			return;
-		}
-		
-		if ($newline) $msg .= "
    \n";
-		
-		if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) echo $msg;
-		else echo strip_tags($msg);
-		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  dp not flush if output buffering enabled - useless - thx to Jesse Mullan 
-		
-	}
-	
-	/**
-	 * Connect to database
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 * @param [forceNew]		force new connection
-	 *
-	 * @return true or false
-	 */	  
-	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
-	{
-		if ($argHostname != "") $this->host = $argHostname;
-		if ($argUsername != "") $this->user = $argUsername;
-		if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-		
-		$this->_isPersistentConnection = false;	
-		if ($fn = $this->raiseErrorFn) {
-			if ($forceNew) {
-				if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
-			} else {
-				 if ($this->_connect($this->host, $this->user, $this->password, $this->database)) return true;
-			}
-			$err = $this->ErrorMsg();
-			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
-			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		} else {
-			if ($forceNew) {
-				if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
-			} else {
-				if ($this->_connect($this->host, $this->user, $this->password, $this->database)) return true;
-			}
-		}
-		if ($this->debug) ADOConnection::outp( $this->host.': '.$this->ErrorMsg());
-		return false;
-	}	
-	
-	 function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
-	 {
-	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
-	 }
-	
-	
-	/**
-	 * Always force a new connection to database - currently only works with oracle
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 *
-	 * @return true or false
-	 */	  
-	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
-	{
-		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
-	}
-	
-	/**
-	 * Establish persistent connect to database
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 *
-	 * @return return true or false
-	 */	
-	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
-	{
-		if (defined('ADODB_NEVER_PERSIST')) 
-			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-		
-		if ($argHostname != "") $this->host = $argHostname;
-		if ($argUsername != "") $this->user = $argUsername;
-		if ($argPassword != "") $this->password = $argPassword;
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-			
-		$this->_isPersistentConnection = true;	
-		
-		if ($fn = $this->raiseErrorFn) {
-			if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
-			$err = $this->ErrorMsg();
-			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
-			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		} else 
-			if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
-
-		if ($this->debug) ADOConnection::outp( $this->host.': '.$this->ErrorMsg());
-		return false;
-	}
-
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysDate;
-		return $col; // child class implement
-	}
-	
-	/**
-	 * Should prepare the sql statement and return the stmt resource.
-	 * For databases that do not support this, we return the $sql. To ensure
-	 * compatibility with databases that do not support prepare:
-	 *
-	 *   $stmt = $db->Prepare("insert into table (id, name) values (?,?)");
-	 *   $db->Execute($stmt,array(1,'Jill')) or die('insert failed');
-	 *   $db->Execute($stmt,array(2,'Joe')) or die('insert failed');
-	 *
-	 * @param sql	SQL to send to database
-	 *
-	 * @return return FALSE, or the prepared statement, or the original sql if
-	 * 			if the database does not support prepare.
-	 *
-	 */	
-	function Prepare($sql)
-	{
-		return $sql;
-	}
-
-	/**
-	 * Some databases, eg. mssql require a different function for preparing
-	 * stored procedures. So we cannot use Prepare().
-	 *
-	 * Should prepare the stored procedure  and return the stmt resource.
-	 * For databases that do not support this, we return the $sql. To ensure
-	 * compatibility with databases that do not support prepare:
-	 *
-	 * @param sql	SQL to send to database
-	 *
-	 * @return return FALSE, or the prepared statement, or the original sql if
-	 * 			if the database does not support prepare.
-	 *
-	 */	
-	function PrepareSP($sql,$param=false)
-	{
-		return $this->Prepare($sql,$param);
-	}
-	
-	/**
-	* PEAR DB Compat
-	*/
-	function Quote($s)
-	{
-		return $this->qstr($s,false);
-	}
-	
-	/**
-	 Requested by "Karsten Dambekalns" 
-	*/
-	function QMagic($s)
-	{
-		return $this->qstr($s,get_magic_quotes_gpc());
-	}
-
-	function q(&$s)
-	{
-		$s = $this->qstr($s,false);
-	}
-	
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function ErrorNative()
-	{
-		return $this->ErrorNo();
-	}
-
-	
-   /**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function nextId($seq_name)
-	{
-		return $this->GenID($seq_name);
-	}
-
-	/**
-	*	 Lock a row, will escalate and lock the table if row locking not supported
-	*	will normally free the lock at the end of the transaction
-	*
-	*  @param $table	name of table to lock
-	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
-	*/
-	function RowLock($table,$where)
-	{
-		return false;
-	}
-	
-	function CommitLock($table)
-	{
-		return $this->CommitTrans();
-	}
-	
-	function RollbackLock($table)
-	{
-		return $this->RollbackTrans();
-	}
-	
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*
-	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
-	* 	for easy porting :-)
-	*
-	* @param mode	The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
-	* @returns		The previous fetch mode
-	*/
-	function SetFetchMode($mode)
-	{	
-		$old = $this->fetchMode;
-		$this->fetchMode = $mode;
-		
-		if ($old === false) {
-		global $ADODB_FETCH_MODE;
-			return $ADODB_FETCH_MODE;
-		}
-		return $old;
-	}
-	
-
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function &Query($sql, $inputarr=false)
-	{
-		$rs = &$this->Execute($sql, $inputarr);
-		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-		return $rs;
-	}
-
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function &LimitQuery($sql, $offset, $count, $params=false)
-	{
-		$rs = &$this->SelectLimit($sql, $count, $offset, $params); 
-		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-		return $rs;
-	}
-
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function Disconnect()
-	{
-		return $this->Close();
-	}
-	
-	/*
-		 returns placeholder for parameter, eg.
-		 $DB->Param('a')
-		 
-		 will return ':a' for Oracle, and '?' for most other databases...
-	*/
-	function Param($name)
-	{
-		return '?';
-	}
-	
-	/*
-		InParameter and OutParameter are self-documenting versions of Parameter().
-	*/
-	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
-		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
-	}
-	
-	/*
-	*/
-	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
-		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-	
-	}
-	
-	/* 
-	Usage in oracle
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group',64);
-		$db->Execute();
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-
-	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-	{
-		return false;
-	}
-	
-	/**
-		Improved method of initiating a transaction. Used together with CompleteTrans().
-		Advantages include:
-		
-		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
-		   Only the outermost block is treated as a transaction.
    
-		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.
    
-		c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block
-		   are disabled, making it backward compatible.
-	*/
-	function StartTrans($errfn = 'ADODB_TransMonitor')
-	{
-		if ($this->transOff > 0) {
-			$this->transOff += 1;
-			return;
-		}
-		
-		$this->_oldRaiseFn = $this->raiseErrorFn;
-		$this->raiseErrorFn = $errfn;
-		$this->_transOK = true;
-		
-		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
-		$this->BeginTrans();
-		$this->transOff = 1;
-	}
-	
-	/**
-		Used together with StartTrans() to end a transaction. Monitors connection
-		for sql errors, and will commit or rollback as appropriate.
-		
-		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
-		and if set to false force rollback even if no SQL error detected.
-		@returns true on commit, false on rollback.
-	*/
-	function CompleteTrans($autoComplete = true)
-	{
-		if ($this->transOff > 1) {
-			$this->transOff -= 1;
-			return true;
-		}
-		$this->raiseErrorFn = $this->_oldRaiseFn;
-		
-		$this->transOff = 0;
-		if ($this->_transOK && $autoComplete) {
-			if (!$this->CommitTrans()) {
-				$this->_transOK = false;
-				if ($this->debug) ADOConnection::outp("Smart Commit failed");
-			} else
-				if ($this->debug) ADOConnection::outp("Smart Commit occurred");
-		} else {
-			$this->RollbackTrans();
-			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
-		}
-		
-		return $this->_transOK;
-	}
-	
-	/*
-		At the end of a StartTrans/CompleteTrans block, perform a rollback.
-	*/
-	function FailTrans()
-	{
-		if ($this->debug) 
-			if ($this->transOff == 0) {
-				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
-			} else {
-				ADOConnection::outp("FailTrans was called");
-				adodb_backtrace();
-			}
-		$this->_transOK = false;
-	}
-	
-	/**
-		Check if transaction has failed, only for Smart Transactions.
-	*/
-	function HasFailedTrans()
-	{
-		if ($this->transOff > 0) return $this->_transOK == false;
-		return false;
-	}
-	
-	/**
-	 * Execute SQL 
-	 *
-	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
-	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
-	 * @return 		RecordSet or false
-	 */
-	function &Execute($sql,$inputarr=false) 
-	{
-		if ($this->fnExecute) {
-			$fn = $this->fnExecute;
-			$ret =& $fn($this,$sql,$inputarr);
-			if (isset($ret)) return $ret;
-		}
-		if ($inputarr && is_array($inputarr)) {
-			$element0 = reset($inputarr);
-			# is_object check is because oci8 descriptors can be passed in
-			$array_2d = is_array($element0) && !is_object(reset($element0));
-			
-			if (!is_array($sql) && !$this->_bindInputArray) {
-				$sqlarr = explode('?',$sql);
-					
-				if (!$array_2d) $inputarr = array($inputarr);
-				foreach($inputarr as $arr) {
-					$sql = ''; $i = 0;
-					foreach($arr as $v) {
-						$sql .= $sqlarr[$i];
-						// from Ron Baldwin 
-						// Only quote string types	
-						if (gettype($v) == 'string')
-							$sql .= $this->qstr($v);
-						else if ($v === null)
-							$sql .= 'NULL';
-						else
-							$sql .= $v;
-						$i += 1;
-					}
-					$sql .= $sqlarr[$i];
-					
-					if ($i+1 != sizeof($sqlarr))	
-						ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
-		
-					$ret =& $this->_Execute($sql,false);
-					if (!$ret) return $ret;
-				}	
-			} else {
-				if ($array_2d) {
-					$stmt = $this->Prepare($sql);
-					foreach($inputarr as $arr) {
-						$ret =& $this->_Execute($stmt,$arr);
-						if (!$ret) return $ret;
-					}
-				} else
-					$ret =& $this->_Execute($sql,$inputarr);
-			}
-		} else {
-			$ret =& $this->_Execute($sql,false);
-		}
-
-		return $ret;
-	}
-	
-	function& _Execute($sql,$inputarr=false)
-	{
-		// debug version of query
-		if ($this->debug) {
-		global $HTTP_SERVER_VARS;
-			$ss = '';
-			if ($inputarr) {
-				foreach($inputarr as $kk=>$vv) {
-					if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...';
-					$ss .= "($kk=>'$vv') ";
-				}
-				$ss = "[ $ss ]";
-			}
-			$sqlTxt = str_replace(',',', ',is_array($sql) ?$sql[0] : $sql);
-			
-			// check if running from browser or command-line
-			$inBrowser = isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']);
-			
-			if ($inBrowser)
-				if ($this->debug === -1)
-				ADOConnection::outp( "
    \n($this->databaseType): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false);
-				else ADOConnection::outp( "
    \n($this->databaseType): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false);
-			else
-				ADOConnection::outp(  "=----\n($this->databaseType): ".($sqlTxt)." \n-----\n",false);
-			
-			$this->_queryID = $this->_query($sql,$inputarr);
-			/* 
-				Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql
-				because ErrorNo() calls Execute('SELECT @ERROR'), causing recure
-			*/
-			if ($this->databaseType == 'mssql') { 
-			// ErrorNo is a slow function call in mssql, and not reliable
-			// in PHP 4.0.6
-				if($emsg = $this->ErrorMsg()) {
-					$err = $this->ErrorNo();
-					if ($err) {
-						ADOConnection::outp($err.': '.$emsg);
-					}
-				}
-			} else 
-				if (!$this->_queryID) {
-					$e = $this->ErrorNo();
-					$m = $this->ErrorMsg();
-					ADOConnection::outp($e .': '. $m );
-				}
-		} else {
-			// non-debug version of query
-			
-			$this->_queryID =@$this->_query($sql,$inputarr);
-		}
-		
-		/************************
-			OK, query executed
-		*************************/
-		// error handling if query fails
-		if ($this->_queryID === false) {
-			if ($this->debug == 99) adodb_backtrace(true,5);	
-			$fn = $this->raiseErrorFn;
-			if ($fn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-			} 
-				
-			return false;
-		} else if ($this->_queryID === true) {
-		// return simplified empty recordset for inserts/updates/deletes with lower overhead
-			$rs =& new ADORecordSet_empty();
-			return $rs;
-		}
-		
-		// return real recordset from select statement
-		$rsclass = $this->rsPrefix.$this->databaseType;
-		$rs =& new $rsclass($this->_queryID,$this->fetchMode); // &new not supported by older PHP versions
-		$rs->connection = &$this; // Pablo suggestion
-		$rs->Init();
-		if (is_array($sql)) $rs->sql = $sql[0];
-		else $rs->sql = $sql;
-		if ($rs->_numOfRows <= 0) {
-		global $ADODB_COUNTRECS;
-	
-			if ($ADODB_COUNTRECS) {
-				if (!$rs->EOF){ 
-					$rs = &$this->_rs2rs($rs,-1,-1,!is_array($sql));
-					$rs->_queryID = $this->_queryID;
-				} else
-					$rs->_numOfRows = 0;
-			}
-		}
-		return $rs;
-	}
-
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
-	}
-
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-
-	/**
-	 * Generates a sequence id and stores it in $this->genID;
-	 * GenID is only available if $this->hasGenID = true;
-	 *
-	 * @param seqname		name of sequence to use
-	 * @param startID		if sequence does not exist, start at this ID
-	 * @return		0 if not supported, otherwise a sequence id
-	 */
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		if (!$this->hasGenID) {
-			return 0; // formerly returns false pre 1.60
-		}
-		
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		
-		$holdtransOK = $this->_transOK;
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			$this->_transOK = $holdtransOK; //if the status was ok before reset
-			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
-			$rs = $this->Execute($getnext);
-		}
-		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
-		else $this->genID = 0; // false
-	
-		if ($rs) $rs->Close();
-
-		return $this->genID;
-	}	
-
-	/**
-	 * @return  the last inserted ID. Not all databases support this.
-	 */ 
-	function Insert_ID()
-	{
-		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
-		if ($this->hasInsertID) return $this->_insertid();
-		if ($this->debug) {
-			ADOConnection::outp( '
    Insert_ID error
    ');
-			adodb_backtrace();
-		}
-		return false;
-	}
-
-
-	/**
-	 * Portable Insert ID. Pablo Roca 
-	 *
-	 * @return  the last inserted ID. All databases support this. But aware possible
-	 * problems in multiuser environments. Heavy test this before deploying.
-	 */ 
-	function PO_Insert_ID($table="", $id="") 
-	{
-	   if ($this->hasInsertID){
-		   return $this->Insert_ID();
-	   } else {
-		   return $this->GetOne("SELECT MAX($id) FROM $table");
-	   }
-	}
-
-	/**
-	* @return # rows affected by UPDATE/DELETE
-	*/ 
-	function Affected_Rows()
-	{
-		if ($this->hasAffectedRows) {
-			if ($this->fnExecute === 'adodb_log_sql') {
-				if ($this->_logsql && $this->_affected !== false) return $this->_affected;
-			}
-			$val = $this->_affectedrows();
-			return ($val < 0) ? false : $val;
-		}
-				  
-		if ($this->debug) ADOConnection::outp( '
    Affected_Rows error
    ',false);
-		return false;
-	}
-	
-	
-	/**
-	 * @return  the last error message
-	 */
-	function ErrorMsg()
-	{
-		return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
-	}
-	
-	
-	/**
-	 * @return the last error number. Normally 0 means no error.
-	 */
-	function ErrorNo() 
-	{
-		return ($this->_errorMsg) ? -1 : 0;
-	}
-	
-	function MetaError($err=false)
-	{
-		include_once(ADODB_DIR."/adodb-error.inc.php");
-		if ($err === false) $err = $this->ErrorNo();
-		return adodb_error($this->dataProvider,$this->databaseType,$err);
-	}
-	
-	function MetaErrorMsg($errno)
-	{
-		include_once(ADODB_DIR."/adodb-error.inc.php");
-		return adodb_errormsg($errno);
-	}
-	
-	/**
-	 * @returns an array with the primary key columns in it.
-	 */
-	function MetaPrimaryKeys($table, $owner=false)
-	{
-	// owner not used in base class - see oci8
-		$p = array();
-		$objs =& $this->MetaColumns($table);
-		if ($objs) {
-			foreach($objs as $v) {
-				if (!empty($v->primary_key))
-					$p[] = $v->name;
-			}
-		}
-		if (sizeof($p)) return $p;
-		if (function_exists('ADODB_VIEW_PRIMARYKEYS'))
-			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
-		return false;
-	}
-	
-	/**
-	 * @returns assoc array where keys are tables, and values are foreign keys
-	 */
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-		return false;
-	}
-	/**
-	 * Choose a database to connect to. Many databases do not support this.
-	 *
-	 * @param dbName 	is the name of the database to select
-	 * @return 		true or false
-	 */
-	function SelectDB($dbName) 
-	{return false;}
-	
-	
-	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
-	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
-	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]		is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($this->hasTop && $nrows > 0) {
-		// suggested by Reinhard Balling. Access requires top after distinct 
-		 // Informix requires first before distinct - F Riosa
-			$ismssql = (strpos($this->databaseType,'mssql') !== false);
-			if ($ismssql) $isaccess = false;
-			else $isaccess = (strpos($this->databaseType,'access') !== false);
-			
-			if ($offset <= 0) {
-				
-					// access includes ties in result
-					if ($isaccess) {
-						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
-
-						if ($secs2cache>0) {
-							$ret =& $this->CacheExecute($secs2cache, $sql,$inputarr);
-						} else {
-							$ret =& $this->Execute($sql,$inputarr);
-						}
-						return $ret; // PHP5 fix
-					} else if ($ismssql){
-						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
-					} else {
-						$sql = preg_replace(
-						'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
-					}
-			} else {
-				$nn = $nrows + $offset;
-				if ($isaccess || $ismssql) {
-					$sql = preg_replace(
-					'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
-				} else {
-					$sql = preg_replace(
-					'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
-				}
-			}
-		}
-		
-		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
-		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
-		global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-			
-		if ($offset>0){
-			if ($secs2cache>0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-			else $rs = &$this->Execute($sql,$inputarr);
-		} else {
-			if ($secs2cache>0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-			else $rs = &$this->Execute($sql,$inputarr);
-		}
-		$ADODB_COUNTRECS = $savec;
-		if ($rs && !$rs->EOF) {
-			$rs =& $this->_rs2rs($rs,$nrows,$offset);
-		}
-		//print_r($rs);
-		return $rs;
-	}
-	
-	/**
-	* Create serializable recordset. Breaks rs link to connection.
-	*
-	* @param rs			the recordset to serialize
-	*/
-	function &SerializableRS(&$rs)
-	{
-		$rs2 =& $this->_rs2rs($rs);
-		$ignore = false;
-		$rs2->connection =& $ignore;
-		
-		return $rs2;
-	}
-	
-	/**
-	* Convert database recordset to an array recordset
-	* input recordset's cursor should be at beginning, and
-	* old $rs will be closed.
-	*
-	* @param rs			the recordset to copy
-	* @param [nrows]  	number of rows to retrieve (optional)
-	* @param [offset] 	offset by number of rows (optional)
-	* @return 			the new recordset
-	*/
-	function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
-	{
-		if (! $rs) return false;
-		
-		$dbtype = $rs->databaseType;
-		if (!$dbtype) {
-			$rs = &$rs;  // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
-			return $rs;
-		}
-		if (($dbtype == 'array' || $dbtype == 'csv') && $nrows == -1 && $offset == -1) {
-			$rs->MoveFirst();
-			$rs = &$rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1-- why ?
-			return $rs;
-		}
-		$flds = array();
-		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
-			$flds[] = $rs->FetchField($i);
-		}
-		$arr =& $rs->GetArrayLimit($nrows,$offset);
-		//print_r($arr);
-		if ($close) $rs->Close();
-		
-		$arrayClass = $this->arrayClass;
-		
-		$rs2 =& new $arrayClass();
-		$rs2->connection = &$this;
-		$rs2->sql = $rs->sql;
-		$rs2->dataProvider = $this->dataProvider;
-		$rs2->InitArrayFields($arr,$flds);
-		return $rs2;
-	}
-	
-	/*
-	* Return all rows. Compat with PEAR DB
-	*/
-	function &GetAll($sql, $inputarr=false)
-	{
-		$arr =& $this->GetArray($sql,$inputarr);
-		return $arr;
-	}
-	
-	function &GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
-	{
-		$rs =& $this->Execute($sql, $inputarr);
-		if (!$rs) return false;
-		
-		$arr =& $rs->GetAssoc($force_array,$first2cols);
-		return $arr;
-	}
-	
-	function &CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
-	{
-		if (!is_numeric($secs2cache)) {
-			$first2cols = $force_array;
-			$force_array = $inputarr;
-		}
-		$rs =& $this->CacheExecute($secs2cache, $sql, $inputarr);
-		if (!$rs) return false;
-		
-		$arr =& $rs->GetAssoc($force_array,$first2cols);
-		return $arr;
-	}
-	
-	/**
-	* Return first element of first row of sql statement. Recordset is disposed
-	* for you.
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function GetOne($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		$crecs = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		
-		$ret = false;
-		$rs = &$this->Execute($sql,$inputarr);
-		if ($rs) {		
-			if (!$rs->EOF) $ret = reset($rs->fields);
-			$rs->Close();
-		} 
-		$ADODB_COUNTRECS = $crecs;
-		return $ret;
-	}
-	
-	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
-	{
-		$ret = false;
-		$rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-		if ($rs) {		
-			if (!$rs->EOF) $ret = reset($rs->fields);
-			$rs->Close();
-		} 
-		
-		return $ret;
-	}
-	
-	function GetCol($sql, $inputarr = false, $trim = false)
-	{
-	  	$rv = false;
-	  	$rs = &$this->Execute($sql, $inputarr);
-	  	if ($rs) {
-			$rv = array();
-	   		if ($trim) {
-				while (!$rs->EOF) {
-					$rv[] = trim(reset($rs->fields));
-					$rs->MoveNext();
-		   		}
-			} else {
-				while (!$rs->EOF) {
-					$rv[] = reset($rs->fields);
-					$rs->MoveNext();
-		   		}
-			}
-	   		$rs->Close();
-	  	}
-	  	return $rv;
-	}
-	
-	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
-	{
-	  	$rv = false;
-	  	$rs = &$this->CacheExecute($secs, $sql, $inputarr);
-	  	if ($rs) {
-			if ($trim) {
-				while (!$rs->EOF) {
-					$rv[] = trim(reset($rs->fields));
-					$rs->MoveNext();
-		   		}
-			} else {
-				while (!$rs->EOF) {
-					$rv[] = reset($rs->fields);
-					$rs->MoveNext();
-		   		}
-			}
-	   		$rs->Close();
-	  	}
-	  	return $rv;
-	}
- 
-	/*
-		Calculate the offset of a date for a particular database and generate
-			appropriate SQL. Useful for calculating future/past dates and storing
-			in a database.
-			
-		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
-	*/
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		return  '('.$date.'+'.$dayFraction.')';
-	}
-	
-	
-	/**
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function &GetArray($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		$rs =& $this->Execute($sql,$inputarr);
-		$ADODB_COUNTRECS = $savec;
-		if (!$rs) 
-			if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-			else return false;
-		$arr =& $rs->GetArray();
-		$rs->Close();
-		return $arr;
-	}
-	
-	function &CacheGetAll($secs2cache,$sql=false,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
-		$ADODB_COUNTRECS = $savec;
-		
-		if (!$rs) 
-			if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-			else return false;
-		
-		$arr =& $rs->GetArray();
-		$rs->Close();
-		return $arr;
-	}
-	
-	
-	
-	/**
-	* Return one row of sql statement. Recordset is disposed for you.
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function &GetRow($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		$crecs = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		
-		$rs =& $this->Execute($sql,$inputarr);
-		
-		$ADODB_COUNTRECS = $crecs;
-		if ($rs) {
-			if (!$rs->EOF) $arr = $rs->fields;
-			else $arr = array();
-			$rs->Close();
-			return $arr;
-		}
-		
-		return false;
-	}
-	
-	function &CacheGetRow($secs2cache,$sql=false,$inputarr=false)
-	{
-		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
-		if ($rs) {
-			$arr = false;
-			if (!$rs->EOF) $arr = $rs->fields;
-			$rs->Close();
-			return $arr;
-		}
-		return false;
-	}
-	
-	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
-	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
-	* Also note that no table locking is done currently, so it is possible that the
-	* record be inserted twice by two programs...
-	*
-	* $this->Replace('products', array('prodname' =>"'Nails'","price" => 3.99), 'prodname');
-	*
-	* $table		table name
-	* $fieldArray	associative array of data (you must quote strings yourself).
-	* $keyCol		the primary key field name or if compound key, array of field names
-	* autoQuote		set to true to use a hueristic to quote strings. Works with nulls and numbers
-	*					but does not work with dates nor SQL functions.
-	* has_autoinc	the primary key is an auto-inc field, so skip in insert.
-	*
-	* Currently blob replace not supported
-	*
-	* returns 0 = fail, 1 = update, 2 = insert 
-	*/
-	
-	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		
-		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
-	}
-	
-	
-	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
-	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]	is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
-	function &CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-	{	
-		if (!is_numeric($secs2cache)) {
-			if ($sql === false) $sql = -1;
-			if ($offset == -1) $offset = false;
-									  // sql,	nrows, offset,inputarr
-			$rs =& $this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
-		} else {
-			if ($sql === false) ADOConnection::outp( "Warning: \$sql missing from CacheSelectLimit()");
-			$rs =& $this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		}
-		return $rs;
-	}
-	
-	/**
-	* Flush cached recordsets that match a particular $sql statement. 
-	* If $sql == false, then we purge all files in the cache.
- 	*/
-	function CacheFlush($sql=false,$inputarr=false)
-	{
-	global $ADODB_CACHE_DIR;
-	
-		if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
-			if (strncmp(PHP_OS,'WIN',3) === 0) {
-				$cmd = 'del /s '.str_replace('/','\\',$ADODB_CACHE_DIR).'\adodb_*.cache';
-			} else {
-				$cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/??/adodb_*.cache'; 
-				// old version 'rm -f `find '.$ADODB_CACHE_DIR.' -name adodb_*.cache`';
-			}
-			if ($this->debug) {
-				ADOConnection::outp( "CacheFlush: $cmd
    \n", system($cmd),"
    ");
-			} else {
-				exec($cmd);
-			}
-			return;
-		} 
-		$f = $this->_gencachename($sql.serialize($inputarr),false);
-		adodb_write_file($f,''); // is adodb_write_file needed?
-		if (!@unlink($f)) {
-			if ($this->debug) ADOConnection::outp( "CacheFlush: failed for $f");
-		}
-	}
-	
-	/**
-	* Private function to generate filename for caching.
-	* Filename is generated based on:
-	*
-	*  - sql statement
-	*  - database type (oci8, ibase, ifx, etc)
-	*  - database name
-	*  - userid
-	*
-	* We create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
-	* Assuming that we can have 50,000 files per directory with good performance, 
-	* then we can scale to 12.8 million unique cached recordsets. Wow!
- 	*/
-	function _gencachename($sql,$createdir)
-	{
-	global $ADODB_CACHE_DIR;
-		
-		$m = md5($sql.$this->databaseType.$this->database.$this->user);
-		$dir = $ADODB_CACHE_DIR.'/'.substr($m,0,2);
-		if ($createdir && !file_exists($dir)) {
-			$oldu = umask(0);
-			if (!mkdir($dir,0771)) 
-				if ($this->debug) ADOConnection::outp( "Unable to mkdir $dir for $sql");
-			umask($oldu);
-		}
-		return $dir.'/adodb_'.$m.'.cache';
-	}
-	
-	
-	/**
-	 * Execute SQL, caching recordsets.
-	 *
-	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
-	 *					  This is an optional parameter.
-	 * @param sql		SQL statement to execute
-	 * @param [inputarr]	holds the input data  to bind to
-	 * @return 		RecordSet or false
-	 */
-	function &CacheExecute($secs2cache,$sql=false,$inputarr=false)
-	{
-		if (!is_numeric($secs2cache)) {
-			$inputarr = $sql;
-			$sql = $secs2cache;
-			$secs2cache = $this->cacheSecs;
-		}
-		global $ADODB_INCLUDED_CSV;
-		if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-		
-		if (is_array($sql)) $sql = $sql[0];
-			
-		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
-		$err = '';
-		
-		if ($secs2cache > 0){
-			$rs = &csv2rs($md5file,$err,$secs2cache);
-			$this->numCacheHits += 1;
-		} else {
-			$err='Timeout 1';
-			$rs = false;
-			$this->numCacheMisses += 1;
-		}
-		if (!$rs) {
-		// no cached rs found
-			if ($this->debug) {
-				if (get_magic_quotes_runtime()) {
-					ADOConnection::outp("Please disable magic_quotes_runtime - it corrupts cache files :(");
-				}
-				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
-			}
-			$rs = &$this->Execute($sql,$inputarr);
-			if ($rs) {
-				$eof = $rs->EOF;
-				$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
-				$txt = _rs2serialize($rs,false,$sql); // serialize
-		
-				if (!adodb_write_file($md5file,$txt,$this->debug)) {
-					if ($fn = $this->raiseErrorFn) {
-						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
-					}
-					if ($this->debug) ADOConnection::outp( " Cache write error");
-				}
-				if ($rs->EOF && !$eof) {
-					$rs->MoveFirst();
-					//$rs = &csv2rs($md5file,$err);		
-					$rs->connection = &$this; // Pablo suggestion
-				}  
-				
-			} else
-				@unlink($md5file);
-		} else {
-			$this->_errorMsg = '';
-			$this->_errorCode = 0;
-			
-			if ($this->fnCacheExecute) {
-				$fn = $this->fnCacheExecute;
-				$fn($this, $secs2cache, $sql, $inputarr);
-			}
-		// ok, set cached object found
-			$rs->connection = &$this; // Pablo suggestion
-			if ($this->debug){ 
-			global $HTTP_SERVER_VARS;
-					
-				$inBrowser = isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']);
-				$ttl = $rs->timeCreated + $secs2cache - time();
-				$s = is_array($sql) ? $sql[0] : $sql;
-				if ($inBrowser) $s = ''.htmlspecialchars($s).'';
-				
-				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
-			}
-		}
-		return $rs;
-	}
-	
-	
-	/**
-	 * Generates an Update Query based on an existing recordset.
-	 * $arrFields is an associative array of fields with the value
-	 * that should be assigned.
-	 *
-	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table and sql should only 
-	 *		 be a simple select stmt with no groupby/orderby/limit
-	 *
-	 * "Jonathan Younger" 
-  	 */
-	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq);
-	}
-
-
-	/**
-	 * Generates an Insert Query based on an existing recordset.
-	 * $arrFields is an associative array of fields with the value
-	 * that should be assigned.
-	 *
-	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table.
-  	 */
-	function GetInsertSQL(&$rs, $arrFields,$magicq=false)
-	{	
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq);
-	}
-	
-
-	/**
-	* Update a blob column, given a where clause. There are more sophisticated
-	* blob handling functions that we could have implemented, but all require
-	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use. 
-	*
-	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
-	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
-	* field blobtable.blobcolumn:
-	*
-	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
-	*
-	* Insert example:
-	*
-	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
-	}
-
-	/**
-	* Usage:
-	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB'
-	*
-	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	*	$conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
-	*/
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
-	{
-		$fd = fopen($path,'rb');
-		if ($fd === false) return false;
-		$val = fread($fd,filesize($path));
-		fclose($fd);
-		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
-	}
-	
-	function BlobDecode($blob)
-	{
-		return $blob;
-	}
-	
-	function BlobEncode($blob)
-	{
-		return $blob;
-	}
-	
-	function SetCharSet($charset)
-	{
-		return false;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
-	}
-	
-	function LogSQL($enable=true)
-	{
-		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		
-		if ($enable) $this->fnExecute = 'adodb_log_sql';
-		else $this->fnExecute = false;
-		
-		$old = $this->_logsql;	
-		$this->_logsql = $enable;
-		if ($enable && !$old) $this->_affected = false;
-		return $old;
-	}
-	
-	function GetCharSet()
-	{
-		return false;
-	}
-	
-	/**
-	* Usage:
-	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
-	*
-	*	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
-	*	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
-	*/
-	function UpdateClob($table,$column,$val,$where)
-	{
-		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
-	}
-	
-	
-	/**
-	*  Change the SQL connection locale to a specified locale.
-	*  This is used to get the date formats written depending on the client locale.
-	*/
-	function SetDateLocale($locale = 'En')
-	{
-		$this->locale = $locale;
-		switch ($locale)
-		{
-			default:
-			case 'En':
-				$this->fmtDate="Y-m-d";
-				$this->fmtTimeStamp = "Y-m-d H:i:s";
-				break;
-	
-			case 'Fr':
-			case 'Ro':
-			case 'It':
-				$this->fmtDate="d-m-Y";
-				$this->fmtTimeStamp = "d-m-Y H:i:s";
-				break;
-				
-			case 'Ge':
-				$this->fmtDate="d.m.Y";
-				$this->fmtTimeStamp = "d.m.Y H:i:s";
-				break;
-		}
-	}
-	
-	
-	/**
-	 *  $meta	contains the desired type, which could be...
-	 *	C for character. You will have to define the precision yourself.
-	 *	X for teXt. For unlimited character lengths.
-	 *	B for Binary
-	 *  F for floating point, with no need to define scale and precision
-	 * 	N for decimal numbers, you will have to define the (scale, precision) yourself
-	 *	D for date
-	 *	T for timestamp
-	 * 	L for logical/Boolean
-	 *	I for integer
-	 *	R for autoincrement counter/integer
-	 *  and if you want to use double-byte, add a 2 to the end, like C2 or X2.
-	 * 
-	 *
-	 * @return the actual type of the data or false if no such type available
-	*/
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C':
-		case 'X':
-			return 'VARCHAR';
-		case 'B':
-			
-		case 'D':
-		case 'T':
-		case 'L':
-		
-		case 'R':
-			
-		case 'I':
-		case 'N':
-			return false;
-		}
-	}
-
-	
-	/**
-	 * Close Connection
-	 */
-	function Close() 
-	{
-		return $this->_close();
-		
-		// "Simon Lee"  reports that persistent connections need 
-		// to be closed too!
-		//if ($this->_isPersistentConnection != true) return $this->_close();
-		//else return true;	
-	}
-	
-	/**
-	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
-	 *
-	 * @return true if succeeded or false if database does not support transactions
-	 */
-	function BeginTrans() {return false;}
-	
-	
-	/**
-	 * If database does not support transactions, always return true as data always commited
-	 *
-	 * @param $ok  set to false to rollback transaction, true to commit
-	 *
-	 * @return true/false.
-	 */
-	function CommitTrans($ok=true) 
-	{ return true;}
-	
-	
-	/**
-	 * If database does not support transactions, rollbacks always fail, so return false
-	 *
-	 * @return true/false.
-	 */
-	function RollbackTrans() 
-	{ return false;}
-
-
-	/**
-	 * return the databases that the driver can connect to. 
-	 * Some databases will return an empty array.
-	 *
-	 * @return an array of database names.
-	 */
-		function MetaDatabases() 
-		{
-		global $ADODB_FETCH_MODE;
-		
-			if ($this->metaDatabasesSQL) {
-				$save = $ADODB_FETCH_MODE; 
-				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-				
-				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-				
-				$arr = $this->GetCol($this->metaDatabasesSQL);
-				if (isset($savem)) $this->SetFetchMode($savem);
-				$ADODB_FETCH_MODE = $save; 
-			
-				return $arr;
-			}
-			
-			return false;
-		}
-		
-	/**
-	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
-	 * 		If false, both views and tables are returned.
-	 *		"VIEW" returns only views
-	 *		"TABLE" returns only tables
-	 * @param showSchema returns the schema/user with the table name, eg. USER.TABLE
-	 * @param mask  is the input mask - only supported by oci8 and postgresql
-	 *
-	 * @return  array of tables for current database.
-	 */ 
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if ($mask) return false;
-		
-		if ($this->metaTablesSQL) {
-			// complicated state saving by the need for backward compat
-			$save = $ADODB_FETCH_MODE; 
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-			
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
-			$rs = $this->Execute($this->metaTablesSQL);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save; 
-			
-			if ($rs === false) return false;
-			$arr =& $rs->GetArray();
-			$arr2 = array();
-			
-			if ($hast = ($ttype && isset($arr[0][1]))) { 
-				$showt = strncmp($ttype,'T',1);
-			}
-			
-			for ($i=0; $i < sizeof($arr); $i++) {
-				if ($hast) {
-					if ($showt == 0) {
-						if (strncmp($arr[$i][1],'T',1) == 0) $arr2[] = trim($arr[$i][0]);
-					} else {
-						if (strncmp($arr[$i][1],'V',1) == 0) $arr2[] = trim($arr[$i][0]);
-					}
-				} else
-					$arr2[] = trim($arr[$i][0]);
-			}
-			$rs->Close();
-			return $arr2;
-		}
-		return false;
-	}
-	
-	
-	function _findschema(&$table,&$schema)
-	{
-		if (!$schema && ($at = strpos($table,'.')) !== false) {
-			$schema = substr($table,0,$at);
-			$table = substr($table,$at+1);
-		}
-	}
-	
-	/**
-	 * List columns in a database as an array of ADOFieldObjects. 
-	 * See top of file for definition of object.
-	 *
-	 * @param table	table name to query
-	 * @param upper	uppercase table name (required by some databases)
-	 * @schema is optional database schema to use - not supported by all databases.
-	 *
-	 * @return  array of ADOFieldObjects for current table.
-	 */
-	function &MetaColumns($table,$upper=true) 
-	{
-	global $ADODB_FETCH_MODE;
-		
-		if (!empty($this->metaColumnsSQL)) {
-		
-			$schema = false;
-			$this->_findschema($table,$schema);
-		
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,($upper)?strtoupper($table):$table));
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			if ($rs === false) return false;
-
-			$retarr = array();
-			while (!$rs->EOF) { //print_r($rs->fields);
-				$fld =& new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$fld->type = $rs->fields[1];
-				if (isset($rs->fields[3]) && $rs->fields[3]) {
-					if ($rs->fields[3]>0) $fld->max_length = $rs->fields[3];
-					$fld->scale = $rs->fields[4];
-					if ($fld->scale>0) $fld->max_length += 1;
-				} else
-					$fld->max_length = $rs->fields[2];
-					
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-				else $retarr[strtoupper($fld->name)] = $fld;
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return false;
-	}
-	
-    /**
-      * List indexes on a table as an array.
-      * @param table        table name to query
-      * @param primary include primary keys.
-	  *
-      * @return array of indexes on current table.
-      */
-     function &MetaIndexes($table, $primary = false, $owner = false)
-     {
-             return FALSE;
-     }
-
-	/**
-	 * List columns names in a table as an array. 
-	 * @param table	table name to query
-	 *
-	 * @return  array of column names for current table.
-	 */ 
-	function &MetaColumnNames($table) 
-	{
-		$objarr =& $this->MetaColumns($table);
-		if (!is_array($objarr)) return false;
-		
-		$arr = array();
-		foreach($objarr as $v) {
-			$arr[] = $v->name;
-		}
-		return $arr;
-	}
-			
-	/**
-	 * Different SQL databases used different methods to combine strings together.
-	 * This function provides a wrapper. 
-	 * 
-	 * param s	variable number of string parameters
-	 *
-	 * Usage: $db->Concat($str1,$str2);
-	 * 
-	 * @return concatenated string
-	 */ 	 
-	function Concat()
-	{	
-		$arr = func_get_args();
-		return implode($this->concat_operator, $arr);
-	}
-	
-	
-	/**
-	 * Converts a date "d" to a string that the database can understand.
-	 *
-	 * @param d	a date in Unix date time format.
-	 *
-	 * @return  date string in database date format
-	 */
-	function DBDate($d)
-	{
-		if (empty($d) && $d !== 0) return 'null';
-
-		if (is_string($d) && !is_numeric($d)) {
-			if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
-			if ($this->isoDates) return "'$d'";
-			$d = ADOConnection::UnixDate($d);
-		}
-
-		return adodb_date($this->fmtDate,$d);
-	}
-	
-	
-	/**
-	 * Converts a timestamp "ts" to a string that the database can understand.
-	 *
-	 * @param ts	a timestamp in Unix date time format.
-	 *
-	 * @return  timestamp string in database timestamp format
-	 */
-	function DBTimeStamp($ts)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-
-		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
-			return adodb_date($this->fmtTimeStamp,$ts);
-		
-		if ($ts === 'null') return $ts;
-		if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
-		
-		$ts = ADOConnection::UnixTimeStamp($ts);
-		return adodb_date($this->fmtTimeStamp,$ts);
-	}
-	
-	/**
-	 * Also in ADORecordSet.
-	 * @param $v is a date string in YYYY-MM-DD format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	function UnixDate($v)
-	{
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
-			($v), $rr)) return false;
-
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
-		// h-m-s-MM-DD-YY
-		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-	}
-	
-
-	/**
-	 * Also in ADORecordSet.
-	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	function UnixTimeStamp($v)
-	{
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-			($v), $rr)) return false;
-			
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
-		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
-	}
-	
-	/**
-	 * Also in ADORecordSet.
-	 *
-	 * Format database date based on user defined format.
-	 *
-	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a date formated as user desires
-	 */
-	 
-	function UserDate($v,$fmt='Y-m-d')
-	{
-		$tt = $this->UnixDate($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		else if ($tt == 0) return $this->emptyDate;
-		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
-		}
-		
-		return adodb_date($fmt,$tt);
-	
-	}
-	
-		/**
-	 *
-	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a timestamp formated as user desires
-	 */
-	function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
-	{
-		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
-		$tt = $this->UnixTimeStamp($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		if ($tt == 0) return $this->emptyTimeStamp;
-		return adodb_date($fmt,$tt);
-	}
-	
-	
-	/**
-	 * Correctly quotes a string so that all strings are escaped. We prefix and append
-	 * to the string single-quotes.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
-	 *
-	 * @return  quoted string to be sent back to database
-	 */
-	function qstr($s,$magic_quotes=false)
-	{	
-		if (!$magic_quotes) {
-		
-			if ($this->replaceQuote[0] == '\\'){
-				// only since php 4.0.5
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
-			return "'$s'";
-		else {// change \' to '' for sybase/mssql
-			$s = str_replace('\\\\','\\',$s);
-			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		}
-	}
-	
-	
-	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
-	*
-	* See readme.htm#ex8 for an example of usage.
-	*
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
-	*
-	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
-	*
-	*/
-	function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		if ($this->pageExecuteCountRows) return _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
-		return _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
-
-	}
-	
-		
-	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
-	*
-	* @param secs2cache	seconds to cache data, set to 0 to force query
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
-	*/
-	function &CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
-	{
-		/*switch($this->dataProvider) {
-		case 'postgres':
-		case 'mysql': 
-			break;
-		default: $secs2cache = 0; break;
-		}*/
-		$rs =& $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
-		return $rs;
-	}
-
-} // end class ADOConnection
-	
-	
-	
-	//==============================================================================================	
-	// CLASS ADOFetchObj
-	//==============================================================================================	
-		
-	/**
-	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
-	*/
-	class ADOFetchObj {
-	};
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet_empty
-	//==============================================================================================	
-	
-	/**
-	* Lightweight recordset when there are no records to be returned
-	*/
-	class ADORecordSet_empty
-	{
-		var $dataProvider = 'empty';
-		var $databaseType = false;
-		var $EOF = true;
-		var $_numOfRows = 0;
-		var $fields = false;
-		var $connection = false;
-		function RowCount() {return 0;}
-		function RecordCount() {return 0;}
-		function PO_RecordCount(){return 0;}
-		function Close(){return true;}
-		function FetchRow() {return false;}
-		function FieldCount(){ return 0;}
-	}
-	
-	//==============================================================================================	
-	// DATE AND TIME FUNCTIONS
-	//==============================================================================================	
-	include_once(ADODB_DIR.'/adodb-time.inc.php');
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet
-	//==============================================================================================	
-
-	if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
-	else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
-   /**
-	 * RecordSet class that represents the dataset returned by the database.
-	 * To keep memory overhead low, this class holds only the current row in memory.
-	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
-	 * means recordcount not known).
-	 */
-	class ADORecordSet extends ADODB_BASE_RS {
-	/*
-	 * public variables	
-	 */
-	var $dataProvider = "native";
-	var $fields = false; 	/// holds the current row data
-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
-							/// in other words, we use a text area for editing.
-	var $canSeek = false; 	/// indicates that seek is supported
-	var $sql; 				/// sql text
-	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
-	
-	var $emptyTimeStamp = ' '; /// what to display when $time==0
-	var $emptyDate = ' '; /// what to display when $time==0
-	var $debug = false;
-	var $timeCreated=0; 	/// datetime in Unix format rs created -- for cached recordsets
-
-	var $bind = false; 		/// used by Fields() to hold array - should be private?
-	var $fetchMode;			/// default fetch mode
-	var $connection = false; /// the parent connection
-	/*
-	 *	private variables	
-	 */
-	var $_numOfRows = -1;	/** number of rows, or -1 */
-	var $_numOfFields = -1;	/** number of fields in recordset */
-	var $_queryID = -1;		/** This variable keeps the result link identifier.	*/
-	var $_currentRow = -1;	/** This variable keeps the current row in the Recordset.	*/
-	var $_closed = false; 	/** has recordset been closed */
-	var $_inited = false; 	/** Init() should only be called once */
-	var $_obj; 				/** Used by FetchObj */
-	var $_names;			/** Used by FetchObj */
-	
-	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_lastPageNo = -1; 
-	var $_maxRecordCount = 0;
-	var $dateHasTime = false;
-	
-	/**
-	 * Constructor
-	 *
-	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
-	 *
-	 */
-	function ADORecordSet($queryID) 
-	{
-		$this->_queryID = $queryID;
-	}
-	
-	
-	
-	function Init()
-	{
-		if ($this->_inited) return;
-		$this->_inited = true;
-		if ($this->_queryID) @$this->_initrs();
-		else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-		}
-		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
-			
-			$this->_currentRow = 0;
-			if ($this->EOF = ($this->_fetch() === false)) {
-				$this->_numOfRows = 0; // _numOfRows could be -1
-			}
-		} else {
-			$this->EOF = true;
-		}
-	}
-	
-	
-	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the FIRST column.
-	 *
-	 * @param name  		name of SELECT tag
-	 * @param [defstr]		the value to hilite. Use an array for multiple hilites for listbox.
-	 * @param [blank1stItem]	true to leave the 1st item in list empty
-	 * @param [multiple]		true for listbox, false for popup
-	 * @param [size]		#rows to show for listbox. not used by popup
-	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
-	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
-	 *				column 0 (1st col) if this is true. This is not documented.
-	 *
-	 * @return HTML
-	 *
-	 * changes by glen.davies@cce.ac.nz to support multiple hilited items
-	 */
-	function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='',$compareFields0=true)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,$compareFields0);
-	}
-	
-	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the SECOND column.
-	 *
-	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getmenu($this,$name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,false);
-	}
-
-
-	/**
-	 * return recordset as a 2-dimensional array.
-	 *
-	 * @param [nRows]  is the number of rows to return. -1 means every row.
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function &GetArray($nRows = -1) 
-	{
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) return adodb_getall($this,$nRows);
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nRows != $cnt) {
-			$results[] = $this->fields;
-			$this->MoveNext();
-			$cnt++;
-		}
-		return $results;
-	}
-	
-	function &GetAll($nRows = -1)
-	{
-		$arr =& $this->GetArray($nRows);
-		return $arr;
-	}
-	
-	/*
-	* Some databases allow multiple recordsets to be returned. This function
-	* will return true if there is a next recordset, or false if no more.
-	*/
-	function NextRecordSet()
-	{
-		return false;
-	}
-	
-	/**
-	 * return recordset as a 2-dimensional array. 
-	 * Helper function for ADOConnection->SelectLimit()
-	 *
-	 * @param offset	is the row to start calculations from (1-based)
-	 * @param [nrows]	is the number of rows to return
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{	
-		if ($offset <= 0) {
-			$arr =& $this->GetArray($nrows);
-			return $arr;
-		} 
-		
-		$this->Move($offset);
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-	
-	
-	/**
-	 * Synonym for GetArray() for compatibility with ADO.
-	 *
-	 * @param [nRows]  is the number of rows to return. -1 means every row.
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function &GetRows($nRows = -1) 
-	{
-		$arr =& $this->GetArray($nRows);
-		return $arr;
-	}
-	
-	/**
-	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
-	 * The first column is treated as the key and is not included in the array. 
-	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
-	 * $force_array == true.
-	 *
-	 * @param [force_array] has only meaning if we have 2 data columns. If false, a 1 dimensional
-	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
-	 * 	read the source.
-	 *
-	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
-	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
-	 *
-	 * @return an associative array indexed by the first column of the array, 
-	 * 	or false if the  data has less than 2 cols.
-	 */
-	function &GetAssoc($force_array = false, $first2cols = false) {
-		$cols = $this->_numOfFields;
-		if ($cols < 2) {
-			return false;
-		}
-		$numIndex = isset($this->fields[0]);
-		$results = array();
-		
-		if (!$first2cols && ($cols > 2 || $force_array)) {
-			if ($numIndex) {
-				while (!$this->EOF) {
-					$results[trim($this->fields[0])] = array_slice($this->fields, 1);
-					$this->MoveNext();
-				}
-			} else {
-				while (!$this->EOF) {
-					$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
-					$this->MoveNext();
-				}
-			}
-		} else {
-			// return scalar values
-			if ($numIndex) {
-				while (!$this->EOF) {
-				// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-					$results[trim(($this->fields[0]))] = $this->fields[1];
-					$this->MoveNext();
-				}
-			} else {
-				while (!$this->EOF) {
-				// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-					$v1 = trim(reset($this->fields));
-					$v2 = ''.next($this->fields); 
-					$results[$v1] = $v2;
-					$this->MoveNext();
-				}
-			}
-		}
-		return $results; 
-	}
-	
-	
-	/**
-	 *
-	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a timestamp formated as user desires
-	 */
-	function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
-	{
-		if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
-		$tt = $this->UnixTimeStamp($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		if ($tt === 0) return $this->emptyTimeStamp;
-		return adodb_date($fmt,$tt);
-	}
-	
-	
-	/**
-	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a date formated as user desires
-	 */
-	function UserDate($v,$fmt='Y-m-d')
-	{
-		$tt = $this->UnixDate($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		else if ($tt == 0) return $this->emptyDate;
-		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
-		}
-		return adodb_date($fmt,$tt);
-	
-	}
-	
-	
-	/**
-	 * @param $v is a date string in YYYY-MM-DD format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	function UnixDate($v)
-	{
-		
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
-			($v), $rr)) return false;
-			
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
-		// h-m-s-MM-DD-YY
-		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-	}
-	
-
-	/**
-	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	function UnixTimeStamp($v)
-	{
-		
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-			($v), $rr)) return false;
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
-		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
-	}
-	
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function Free()
-	{
-		return $this->Close();
-	}
-	
-	
-	/**
-	* PEAR DB compat, number of rows
-	*/
-	function NumRows()
-	{
-		return $this->_numOfRows;
-	}
-	
-	
-	/**
-	* PEAR DB compat, number of cols
-	*/
-	function NumCols()
-	{
-		return $this->_numOfFields;
-	}
-	
-	/**
-	* Fetch a row, returning false if no more rows. 
-	* This is PEAR DB compat mode.
-	*
-	* @return false or array containing the current record
-	*/
-	function FetchRow()
-	{
-		if ($this->EOF) return false;
-		$arr = $this->fields;
-		$this->_currentRow++;
-		if (!$this->_fetch()) $this->EOF = true;
-		return $arr;
-	}
-	
-	
-	/**
-	* Fetch a row, returning PEAR_Error if no more rows. 
-	* This is PEAR DB compat mode.
-	*
-	* @return DB_OK or error object
-	*/
-	function FetchInto(&$arr)
-	{
-		if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new PEAR_Error('EOF',-1): false;
-		$arr = $this->fields;
-		$this->MoveNext();
-		return 1; // DB_OK
-	}
-	
-	
-	/**
-	 * Move to the first row in the recordset. Many databases do NOT support this.
-	 *
-	 * @return true or false
-	 */
-	function MoveFirst() 
-	{
-		if ($this->_currentRow == 0) return true;
-		return $this->Move(0);			
-	}			
-
-	
-	/**
-	 * Move to the last row in the recordset. 
-	 *
-	 * @return true or false
-	 */
-	function MoveLast() 
-	{
-		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
-		if ($this->EOF) return false;
-		while (!$this->EOF) {
-			$f = $this->fields;
-			$this->MoveNext();
-		}
-		$this->fields = $f;
-		$this->EOF = false;
-		return true;
-	}
-	
-	
-	/**
-	 * Move to next record in the recordset.
-	 *
-	 * @return true if there still rows available, or false if there are no more rows (EOF).
-	 */
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_fetch()) return true;
-		}
-		$this->EOF = true;
-		/* -- tested error handling when scrolling cursor -- seems useless.
-		$conn = $this->connection;
-		if ($conn && $conn->raiseErrorFn && ($errno = $conn->ErrorNo())) {
-			$fn = $conn->raiseErrorFn;
-			$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' ('.$this->sql.')',$conn->host,$conn->database);
-		}
-		*/
-		return false;
-	}	
-	
-	/**
-	 * Random access to a specific row in the recordset. Some databases do not support
-	 * access to previous rows in the databases (no scrolling backwards).
-	 *
-	 * @param rowNumber is the row to move to (0-based)
-	 *
-	 * @return true if there still rows available, or false if there are no more rows (EOF).
-	 */
-	function Move($rowNumber = 0) 
-	{
-		$this->EOF = false;
-		if ($rowNumber == $this->_currentRow) return true;
-		if ($rowNumber >= $this->_numOfRows)
-	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-  				
-		if ($this->canSeek) { 
-	
-			if ($this->_seek($rowNumber)) {
-				$this->_currentRow = $rowNumber;
-				if ($this->_fetch()) {
-					return true;
-				}
-			} else {
-				$this->EOF = true;
-				return false;
-			}
-		} else {
-			if ($rowNumber < $this->_currentRow) return false;
-			global $ADODB_EXTENSION;
-			if ($ADODB_EXTENSION) {
-				while (!$this->EOF && $this->_currentRow < $rowNumber) {
-					adodb_movenext($this);
-				}
-			} else {
-			
-				while (! $this->EOF && $this->_currentRow < $rowNumber) {
-					$this->_currentRow++;
-					
-					if (!$this->_fetch()) $this->EOF = true;
-				}
-			}
-			return !($this->EOF);
-		}
-		
-		$this->fields = false;	
-		$this->EOF = true;
-		return false;
-	}
-	
-		
-	/**
-	 * Get the value of a field in the current row by column name.
-	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
-	 * 
-	 * @param colname  is the field to access
-	 *
-	 * @return the value of $colname column
-	 */
-	function Fields($colname)
-	{
-		return $this->fields[$colname];
-	}
-	
-	function GetAssocKeys($upper=true)
-	{
-		$this->bind = array();
-		for ($i=0; $i < $this->_numOfFields; $i++) {
-			$o =& $this->FetchField($i);
-			if ($upper === 2) $this->bind[$o->name] = $i;
-			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
-		}
-	}
-	
-  /**
-   * Use associative array to get fields array for databases that do not support
-   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli@libero.it
-   *
-   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC
-   * before you execute your SQL statement, and access $rs->fields['col'] directly.
-   *
-   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by FetchField
-   */
-	function &GetRowAssoc($upper=1)
-	{
-		$record = array();
-	 //	if (!$this->fields) return $record;
-		
-	   	if (!$this->bind) {
-			$this->GetAssocKeys($upper);
-		}
-		
-		foreach($this->bind as $k => $v) {
-			$record[$k] = $this->fields[$v];
-		}
-
-		return $record;
-	}
-	
-	
-	/**
-	 * Clean up recordset
-	 *
-	 * @return true or false
-	 */
-	function Close() 
-	{
-		// free connection object - this seems to globally free the object
-		// and not merely the reference, so don't do this...
-		// $this->connection = false; 
-		if (!$this->_closed) {
-			$this->_closed = true;
-			return $this->_close();		
-		} else
-			return true;
-	}
-	
-	/**
-	 * synonyms RecordCount and RowCount	
-	 *
-	 * @return the number of rows or -1 if this is not supported
-	 */
-	function RecordCount() {return $this->_numOfRows;}
-	
-	
-	/*
-	* If we are using PageExecute(), this will return the maximum possible rows
-	* that can be returned when paging a recordset.
-	*/
-	function MaxRecordCount()
-	{
-		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
-	}
-	
-	/**
-	 * synonyms RecordCount and RowCount	
-	 *
-	 * @return the number of rows or -1 if this is not supported
-	 */
-	function RowCount() {return $this->_numOfRows;} 
-	
-
-	 /**
-	 * Portable RecordCount. Pablo Roca 
-	 *
-	 * @return  the number of records from a previous SELECT. All databases support this.
-	 *
-	 * But aware possible problems in multiuser environments. For better speed the table
-	 * must be indexed by the condition. Heavy test this before deploying.
-	 */ 
-	function PO_RecordCount($table="", $condition="") {
-		
-		$lnumrows = $this->_numOfRows;
-		// the database doesn't support native recordcount, so we do a workaround
-		if ($lnumrows == -1 && $this->connection) {
-			IF ($table) {
-				if ($condition) $condition = " WHERE " . $condition; 
-				$resultrows = &$this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
-				if ($resultrows) $lnumrows = reset($resultrows->fields);
-			}
-		}
-		return $lnumrows;
-	}
-	
-	/**
-	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
-	 */
-	function CurrentRow() {return $this->_currentRow;}
-	
-	/**
-	 * synonym for CurrentRow -- for ADO compat
-	 *
-	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
-	 */
-	function AbsolutePosition() {return $this->_currentRow;}
-	
-	/**
-	 * @return the number of columns in the recordset. Some databases will set this to 0
-	 * if no records are returned, others will return the number of columns in the query.
-	 */
-	function FieldCount() {return $this->_numOfFields;}   
-
-
-	/**
-	 * Get the ADOFieldObject of a specific column.
-	 *
-	 * @param fieldoffset	is the column position to access(0-based).
-	 *
-	 * @return the ADOFieldObject for that column, or false.
-	 */
-	function &FetchField($fieldoffset) 
-	{
-		// must be defined by child class
-	}	
-	
-	/**
-	 * Get the ADOFieldObjects of all columns in an array.
-	 *
-	 */
-	function FieldTypesArray()
-	{
-		$arr = array();
-		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
-			$arr[] = $this->FetchField($i);
-		return $arr;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default case is lowercase field names.
-	*
-	* @return the object with the properties set to the fields of the current row
-	*/
-	function &FetchObj()
-	{
-		$o =& $this->FetchObject(false);
-		return $o;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default case is uppercase.
-	* 
-	* @param $isupper to set the object property names to uppercase
-	*
-	* @return the object with the properties set to the fields of the current row
-	*/
-	function &FetchObject($isupper=true)
-	{
-		if (empty($this->_obj)) {
-			$this->_obj =& new ADOFetchObj();
-			$this->_names = array();
-			for ($i=0; $i <$this->_numOfFields; $i++) {
-				$f = $this->FetchField($i);
-				$this->_names[] = $f->name;
-			}
-		}
-		$i = 0;
-		$o = &$this->_obj;
-		for ($i=0; $i <$this->_numOfFields; $i++) {
-			$name = $this->_names[$i];
-			if ($isupper) $n = strtoupper($name);
-			else $n = $name;
-			
-			$o->$n = $this->Fields($name);
-		}
-		return $o;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default is lower-case field names.
-	* 
-	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
-	*
-	* Fixed bug reported by tim@orotech.net
-	*/
-	function &FetchNextObj()
-	{
-		return $this->FetchNextObject(false);
-	}
-	
-	
-	/**
-	* Return the fields array of the current row as an object for convenience. 
-	* The default is upper case field names.
-	* 
-	* @param $isupper to set the object property names to uppercase
-	*
-	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
-	*
-	* Fixed bug reported by tim@orotech.net
-	*/
-	function &FetchNextObject($isupper=true)
-	{
-		$o = false;
-		if ($this->_numOfRows != 0 && !$this->EOF) {
-			$o = $this->FetchObject($isupper);	
-			$this->_currentRow++;
-			if ($this->_fetch()) return $o;
-		}
-		$this->EOF = true;
-		return $o;
-	}
-	
-	/**
-	 * Get the metatype of the column. This is used for formatting. This is because
-	 * many databases use different names for the same type, so we transform the original
-	 * type to our standardised version which uses 1 character codes:
-	 *
-	 * @param t  is the type passed in. Normally is ADOFieldObject->type.
-	 * @param len is the maximum length of that field. This is because we treat character
-	 * 	fields bigger than a certain size as a 'B' (blob).
-	 * @param fieldobj is the field object returned by the database driver. Can hold
-	 *	additional info (eg. primary_key for mysql).
-	 * 
-	 * @return the general type of the data: 
-	 *	C for character < 200 chars
-	 *	X for teXt (>= 200 chars)
-	 *	B for Binary
-	 * 	N for numeric floating point
-	 *	D for date
-	 *	T for timestamp
-	 * 	L for logical/Boolean
-	 *	I for integer
-	 *	R for autoincrement counter/integer
-	 * 
-	 *
-	*/
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-	// changed in 2.32 to hashing instead of switch stmt for speed...
-	static $typeMap = array(
-		'VARCHAR' => 'C',
-		'VARCHAR2' => 'C',
-		'CHAR' => 'C',
-		'C' => 'C',
-		'STRING' => 'C',
-		'NCHAR' => 'C',
-		'NVARCHAR' => 'C',
-		'VARYING' => 'C',
-		'BPCHAR' => 'C',
-		'CHARACTER' => 'C',
-		'INTERVAL' => 'C',  # Postgres
-		##
-		'LONGCHAR' => 'X',
-		'TEXT' => 'X',
-		'NTEXT' => 'X',
-		'M' => 'X',
-		'X' => 'X',
-		'CLOB' => 'X',
-		'NCLOB' => 'X',
-		'LVARCHAR' => 'X',
-		##
-		'BLOB' => 'B',
-		'IMAGE' => 'B',
-		'BINARY' => 'B',
-		'VARBINARY' => 'B',
-		'LONGBINARY' => 'B',
-		'B' => 'B',
-		##
-		'YEAR' => 'D', // mysql
-		'DATE' => 'D',
-		'D' => 'D',
-		##
-		'TIME' => 'T',
-		'TIMESTAMP' => 'T',
-		'DATETIME' => 'T',
-		'TIMESTAMPTZ' => 'T',
-		'T' => 'T',
-		##
-		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
-		'BIT' => 'L',
-		'L' => 'L',
-		##
-		'COUNTER' => 'R',
-		'R' => 'R',
-		'SERIAL' => 'R', // ifx
-		'INT IDENTITY' => 'R',
-		##
-		'INT' => 'I',
-		'INTEGER' => 'I',
-		'INTEGER UNSIGNED' => 'I',
-		'SHORT' => 'I',
-		'TINYINT' => 'I',
-		'SMALLINT' => 'I',
-		'I' => 'I',
-		##
-		'LONG' => 'N', // interbase is numeric, oci8 is blob
-		'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
-		'DECIMAL' => 'N',
-		'DEC' => 'N',
-		'REAL' => 'N',
-		'DOUBLE' => 'N',
-		'DOUBLE PRECISION' => 'N',
-		'SMALLFLOAT' => 'N',
-		'FLOAT' => 'N',
-		'NUMBER' => 'N',
-		'NUM' => 'N',
-		'NUMERIC' => 'N',
-		'MONEY' => 'N',
-		
-		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
-		'SQLTEXT' => 'X' 
-		);
-		
-		$tmap = false;
-		$t = strtoupper($t);
-		$tmap = @$typeMap[$t];
-		switch ($tmap) {
-		case 'C':
-		
-			// is the char field is too long, return as text field... 
-			if ($this->blobSize >= 0) {
-				if ($len > $this->blobSize) return 'X';
-			} else if ($len > 250) {
-				return 'X';
-			}
-			return 'C';
-			
-		case 'I':
-			if (!empty($fieldobj->primary_key)) return 'R';
-			return 'I';
-		
-		case false:
-			return 'N';
-			
-		case 'B':
-			 if (isset($fieldobj->binary)) 
-				 return ($fieldobj->binary) ? 'B' : 'X';
-			return 'B';
-		
-		case 'D':
-			if (!empty($this->dateHasTime)) return 'T';
-			return 'D';
-			
-		default: 
-			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
-			return $tmap;
-		}
-	}
-	
-	function _close() {}
-	
-	/**
-	 * set/returns the current recordset page when paginating
-	 */
-	function AbsolutePage($page=-1)
-	{
-		if ($page != -1) $this->_currentPage = $page;
-		return $this->_currentPage;
-	}
-	
-	/**
-	 * set/returns the status of the atFirstPage flag when paginating
-	 */
-	function AtFirstPage($status=false)
-	{
-		if ($status != false) $this->_atFirstPage = $status;
-		return $this->_atFirstPage;
-	}
-	
-	function LastPageNo($page = false)
-	{
-		if ($page != false) $this->_lastPageNo = $page;
-		return $this->_lastPageNo;
-	}
-	
-	/**
-	 * set/returns the status of the atLastPage flag when paginating
-	 */
-	function AtLastPage($status=false)
-	{
-		if ($status != false) $this->_atLastPage = $status;
-		return $this->_atLastPage;
-	}
-	
-} // end class ADORecordSet
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet_array
-	//==============================================================================================	
-	
-	/**
-	 * This class encapsulates the concept of a recordset created in memory
-	 * as an array. This is useful for the creation of cached recordsets.
-	 * 
-	 * Note that the constructor is different from the standard ADORecordSet
-	 */
-	
-	class ADORecordSet_array extends ADORecordSet
-	{
-		var $databaseType = 'array';
-
-		var $_array; 	// holds the 2-dimensional data array
-		var $_types;	// the array of types of each column (C B I L M)
-		var $_colnames;	// names of each column in array
-		var $_skiprow1;	// skip 1st row because it holds column names
-		var $_fieldarr; // holds array of field objects
-		var $canSeek = true;
-		var $affectedrows = false;
-		var $insertid = false;
-		var $sql = '';
-		var $compat = false;
-		/**
-		 * Constructor
-		 *
-		 */
-		function ADORecordSet_array($fakeid=1)
-		{
-		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-		
-			// fetch() on EOF does not delete $this->fields
-			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
-			$this->fetchMode = $ADODB_FETCH_MODE;
-		}
-		
-		
-		/**
-		 * Setup the array.
-		 *
-		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
-		 *			unless paramter $colnames is used.
-		 * @param typearr	holds an array of types. These are the same types 
-		 *			used in MetaTypes (C,B,L,I,N).
-		 * @param [colnames]	array of column names. If set, then the first row of
-		 *			$array should not hold the column names.
-		 */
-		function InitArray($array,$typearr,$colnames=false)
-		{
-			$this->_array = $array;
-			$this->_types = $typearr;	
-			if ($colnames) {
-				$this->_skiprow1 = false;
-				$this->_colnames = $colnames;
-			} else  {
-				$this->_skiprow1 = true;
-				$this->_colnames = $array[0];
-			}
-			$this->Init();
-		}
-		/**
-		 * Setup the Array and datatype file objects
-		 *
-		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
-		 *			unless paramter $colnames is used.
-		 * @param fieldarr	holds an array of ADOFieldObject's.
-		 */
-		function InitArrayFields($array,$fieldarr)
-		{
-			$this->_array = $array;
-			$this->_skiprow1= false;
-			if ($fieldarr) {
-				$this->_fieldobjects = $fieldarr;
-			} 
-			$this->Init();
-		}
-		
-		function &GetArray($nRows=-1)
-		{
-			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
-				return $this->_array;
-			} else {
-				$arr =& ADORecordSet::GetArray($nRows);
-				return $arr;
-			}
-		}
-		
-		function _initrs()
-		{
-			$this->_numOfRows =  sizeof($this->_array);
-			if ($this->_skiprow1) $this->_numOfRows -= 1;
-		
-			$this->_numOfFields =(isset($this->_fieldobjects)) ?
-				 sizeof($this->_fieldobjects):sizeof($this->_types);
-		}
-		
-		/* Use associative array to get fields array */
-		function Fields($colname)
-		{
-			if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-	
-			if (!$this->bind) {
-				$this->bind = array();
-				for ($i=0; $i < $this->_numOfFields; $i++) {
-					$o = $this->FetchField($i);
-					$this->bind[strtoupper($o->name)] = $i;
-				}
-			}
-			return $this->fields[$this->bind[strtoupper($colname)]];
-		}
-		
-		function &FetchField($fieldOffset = -1) 
-		{
-			if (isset($this->_fieldobjects)) {
-				return $this->_fieldobjects[$fieldOffset];
-			}
-			$o =  new ADOFieldObject();
-			$o->name = $this->_colnames[$fieldOffset];
-			$o->type =  $this->_types[$fieldOffset];
-			$o->max_length = -1; // length not known
-			
-			return $o;
-		}
-			
-		function _seek($row)
-		{
-			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
-				$this->_currentRow = $row;
-				if ($this->_skiprow1) $row += 1;
-				$this->fields = $this->_array[$row];
-				return true;
-			}
-			return false;
-		}
-		
-		function MoveNext() 
-		{
-			if (!$this->EOF) {		
-				$this->_currentRow++;
-				
-				$pos = $this->_currentRow;
-				
-				if ($this->_numOfRows <= $pos) {
-					if (!$this->compat) $this->fields = false;
-				} else {
-					if ($this->_skiprow1) $pos += 1;
-					$this->fields = $this->_array[$pos];
-					return true;
-				}		
-				$this->EOF = true;
-			}
-			
-			return false;
-		}	
-	
-		function _fetch()
-		{
-			$pos = $this->_currentRow;
-			
-			if ($this->_numOfRows <= $pos) {
-				if (!$this->compat) $this->fields = false;
-				return false;
-			}
-			if ($this->_skiprow1) $pos += 1;
-			$this->fields = $this->_array[$pos];
-			return true;
-		}
-		
-		function _close() 
-		{
-			return true;	
-		}
-	
-	} // ADORecordSet_array
-
-	//==============================================================================================	
-	// HELPER FUNCTIONS
-	//==============================================================================================			
-	
-	/**
-	 * Synonym for ADOLoadCode. Private function. Do not use.
-	 *
-	 * @deprecated
-	 */
-	function ADOLoadDB($dbType) 
-	{ 
-		return ADOLoadCode($dbType);
-	}
-		
-	/**
-	 * Load the code for a specific database driver. Private function. Do not use.
-	 */
-	function ADOLoadCode($dbType) 
-	{
-	global $ADODB_LASTDB;
-	
-		if (!$dbType) return false;
-		$db = strtolower($dbType);
-		switch ($db) {
-			case 'maxsql': $db = 'mysqlt'; break;
-			case 'postgres':
-			case 'pgsql': $db = 'postgres7'; break;
-		}
-		$ok = @include_once(ADODB_DIR."/drivers/adodb-".$db.".inc.php");
-		$ADODB_LASTDB = $db;
-		
-		if ($ok) return $db;
-		
-		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
-		if (file_exists($file)) ADOConnection::outp("Missing file: $file");
-		else ADOConnection::outp("Syntax error in file: $file");
-		return false;
-	}
-
-	/**
-	 * synonym for ADONewConnection for people like me who cannot remember the correct name
-	 */
-	function &NewADOConnection($db='')
-	{
-		$tmp =& ADONewConnection($db);
-		return $tmp;
-	}
-	
-	/**
-	 * Instantiate a new Connection class for a specific database driver.
-	 *
-	 * @param [db]  is the database Connection object to create. If undefined,
-	 * 	use the last database driver that was loaded by ADOLoadCode().
-	 *
-	 * @return the freshly created instance of the Connection class.
-	 */
-	function &ADONewConnection($db='')
-	{
-	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-		
-		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
-		
-		if (!empty($ADODB_NEWCONNECTION)) {
-			$obj = $ADODB_NEWCONNECTION($db);
-			if ($obj) {
-				if ($errorfn)  $obj->raiseErrorFn = $errorfn;
-				return $obj;
-			}
-		}
-		
-		if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
-		if (empty($db)) $db = $ADODB_LASTDB;
-		
-		if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
-		
-		if (!$db) {
-			 if ($errorfn) {
-				// raise an error
-				$ignore = false;
-				$errorfn('ADONewConnection', 'ADONewConnection', -998,
-						 "could not load the database driver for '$db",
-						 $db,false,$ignore);
-			} else
-				 ADOConnection::outp( "
    ADONewConnection: Unable to load database driver '$db'
    ",false);
-				
-			return false;
-		}
-		
-		$cls = 'ADODB_'.$db;
-		if (!class_exists($cls)) {
-			adodb_backtrace();
-			return false;
-		}
-		
-		$obj =& new $cls();
-		if ($errorfn) $obj->raiseErrorFn = $errorfn;
-		
-		return $obj;
-	}
-	
-	// $perf == true means called by NewPerfMonitor()
-	function _adodb_getdriver($provider,$drivername,$perf=false)
-	{
-		if ($provider !== 'native' && $provider != 'odbc' && $provider != 'ado') 
-			$drivername = $provider;
-		else {
-			if (substr($drivername,0,5) == 'odbc_') $drivername = substr($drivername,5);
-			else if (substr($drivername,0,4) == 'ado_') $drivername = substr($drivername,4);
-			else 
-			switch($drivername) {
-			case 'oracle': $drivername = 'oci8';break;
-			//case 'sybase': $drivername = 'mssql';break;
-			case 'access': 
-						if ($perf) $drivername = '';
-						break;
-			case 'db2':	
-						if ($perf) break;
-			default:
-				$drivername = 'generic';
-				break;
-			}
-		}
-		
-		return $drivername;
-	}
-	
-	function &NewPerfMonitor(&$conn)
-	{
-		$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
-		if (!$drivername || $drivername == 'generic') return false;
-		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		@include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
-		$class = "Perf_$drivername";
-		if (!class_exists($class)) return false;
-		$perf =& new $class($conn);
-		
-		return $perf;
-	}
-	
-	function &NewDataDictionary(&$conn)
-	{
-		$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
-		
-		include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		include_once(ADODB_DIR.'/adodb-datadict.inc.php');
-		$path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
-
-		if (!file_exists($path)) {
-			ADOConnection::outp("Database driver '$path' not available");
-			return false;
-		}
-		include_once($path);
-		$class = "ADODB2_$drivername";
-		$dict =& new $class();
-		$dict->dataProvider = $conn->dataProvider;
-		$dict->connection = &$conn;
-		$dict->upperName = strtoupper($drivername);
-		$dict->quote = $conn->nameQuote;
-		if (is_resource($conn->_connectionID))
-			$dict->serverInfo = $conn->ServerInfo();
-		
-		return $dict;
-	}
-
-
-	/**
-	* Save a file $filename and its $contents (normally for caching) with file locking
-	*/
-	function adodb_write_file($filename, $contents,$debug=false)
-	{ 
-	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
-	# So to simulate locking, we assume that rename is an atomic operation.
-	# First we delete $filename, then we create a $tempfile write to it and 
-	# rename to the desired $filename. If the rename works, then we successfully 
-	# modified the file exclusively.
-	# What a stupid need - having to simulate locking.
-	# Risks:
-	# 1. $tempfile name is not unique -- very very low
-	# 2. unlink($filename) fails -- ok, rename will fail
-	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs
-	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
-		if (strncmp(PHP_OS,'WIN',3) === 0) {
-			// skip the decimal place
-			$mtime = substr(str_replace(' ','_',microtime()),2); 
-			// getmypid() actually returns 0 on Win98 - never mind!
-			$tmpname = $filename.uniqid($mtime).getmypid();
-			if (!($fd = fopen($tmpname,'a'))) return false;
-			$ok = ftruncate($fd,0);			
-			if (!fwrite($fd,$contents)) $ok = false;
-			fclose($fd);
-			chmod($tmpname,0644);
-			// the tricky moment
-			@unlink($filename);
-			if (!@rename($tmpname,$filename)) {
-				unlink($tmpname);
-				$ok = false;
-			}
-			if (!$ok) {
-				if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
-			}
-			return $ok;
-		}
-		if (!($fd = fopen($filename, 'a'))) return false;
-		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
-			$ok = fwrite( $fd, $contents );
-			fclose($fd);
-			chmod($filename,0644);
-		}else {
-			fclose($fd);
-			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename
    \n");
-			$ok = false;
-		}
-	
-		return $ok;
-	}
-	
-	/*
-		Perform a print_r, with pre tags for better formatting.
-	*/
-	function adodb_pr($var)
-	{
-		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
-			echo " 
    \n";print_r($var);echo "
    \n";
-		} else
-			print_r($var);
-	}
-	
-	/*
-		Perform a stack-crawl and pretty print it.
-		
-		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
-		@param levels Number of levels to display
-	*/
-	function adodb_backtrace($printOrArr=true,$levels=9999)
-	{
-		$s = '';
-		if (PHPVERSION() < 4.3) return;
-		 
-		$html =  (isset($_SERVER['HTTP_USER_AGENT']));
-		$fmt =  ($html) ? " %% line %4d, file: %s" : "%% line %4d, file: %s";
-
-		$MAXSTRLEN = 64;
-	
-		$s = ($html) ? '
    ' : '';
-		
-		if (is_array($printOrArr)) $traceArr = $printOrArr;
-		else $traceArr = debug_backtrace();
-		array_shift($traceArr);
-		$tabs = sizeof($traceArr)-1;
-		
-		foreach ($traceArr as $arr) {
-			$levels -= 1;
-			if ($levels < 0) break;
-			
-			$args = array();
-			for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? '   ' : "\t";
-			$tabs -= 1;
-			if ($html) $s .= '';
-			if (isset($arr['class'])) $s .= $arr['class'].'.';
-			if (isset($arr['args']))
-			 foreach($arr['args'] as $v) {
-				if (is_null($v)) $args[] = 'null';
-				else if (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-				else if (is_object($v)) $args[] = 'Object:'.get_class($v);
-				else if (is_bool($v)) $args[] = $v ? 'true' : 'false';
-				else {
-					$v = (string) @$v;
-					$str = htmlspecialchars(substr($v,0,$MAXSTRLEN));
-					if (strlen($v) > $MAXSTRLEN) $str .= '...';
-					$args[] = $str;
-				}
-			}
-			$s .= $arr['function'].'('.implode(', ',$args).')';
-			
-			
-			$s .= @sprintf($fmt, $arr['line'],$arr['file'],basename($arr['file']));
-				
-			$s .= "\n";
-		}	
-		if ($html) $s .= '
    ';
-		if ($printOrArr) print $s;
-		
-		return $s;
-	}
-	
-} // defined
+
+	Manual is at http://php.weblogs.com/adodb_manual
+	  
+ */
+ 
+ if (!defined('_ADODB_LAYER')) {
+ 	define('_ADODB_LAYER',1);
+	
+	//==============================================================================================	
+	// CONSTANT DEFINITIONS
+	//==============================================================================================	
+
+
+	/** 
+	 * Set ADODB_DIR to the directory where this file resides...
+	 * This constant was formerly called $ADODB_RootPath
+	 */
+	if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
+	
+	//==============================================================================================	
+	// GLOBAL VARIABLES
+	//==============================================================================================	
+
+	GLOBAL 
+		$ADODB_vers, 		// database version
+		$ADODB_COUNTRECS,	// count number of records returned - slows down query
+		$ADODB_CACHE_DIR,	// directory to cache recordsets
+		$ADODB_EXTENSION,   // ADODB extension installed
+		$ADODB_COMPAT_PATCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF
+	 	$ADODB_FETCH_MODE;	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
+	
+	//==============================================================================================	
+	// GLOBAL SETUP
+	//==============================================================================================	
+	
+	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
+	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
+		
+		define('ADODB_BAD_RS','
    Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;
    ');
+	
+	// allow [ ] @ ` " and . in table names
+		define('ADODB_TABLE_REGEX','([]0-9a-z_\"\`\.\@\[-]*)');
+	
+	// prefetching used by oracle
+		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
+	
+	
+	/*
+	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
+	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
+	
+ 		0 = assoc lowercase field names. $rs->fields['orderid']
+		1 = assoc uppercase field names. $rs->fields['ORDERID']
+		2 = use native-case field names. $rs->fields['OrderID']
+	*/
+	
+		define('ADODB_FETCH_DEFAULT',0);
+		define('ADODB_FETCH_NUM',1);
+		define('ADODB_FETCH_ASSOC',2);
+		define('ADODB_FETCH_BOTH',3);
+		
+		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
+	
+		if (strnatcmp(PHP_VERSION,'4.3.0')>=0) {
+			define('ADODB_PHPVER',0x4300);
+		} else if (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
+			define('ADODB_PHPVER',0x4200);
+		} else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
+			define('ADODB_PHPVER',0x4050);
+		} else {
+			define('ADODB_PHPVER',0x4000);
+		}
+	}
+	
+	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
+	
+	
+	/**
+	 	Accepts $src and $dest arrays, replacing string $data
+	*/
+	function ADODB_str_replace($src, $dest, $data)
+	{
+		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
+		
+		$s = reset($src);
+		$d = reset($dest);
+		while ($s !== false) {
+			$data = str_replace($s,$d,$data);
+			$s = next($src);
+			$d = next($dest);
+		}
+		return $data;
+	}
+	
+	function ADODB_Setup()
+	{
+	GLOBAL 
+		$ADODB_vers, 		// database version
+		$ADODB_COUNTRECS,	// count number of records returned - slows down query
+		$ADODB_CACHE_DIR,	// directory to cache recordsets
+	 	$ADODB_FETCH_MODE;
+		
+		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
+		
+		if (!isset($ADODB_CACHE_DIR)) {
+			$ADODB_CACHE_DIR = '/tmp';
+		} else {
+			// do not accept url based paths, eg. http:/ or ftp:/
+			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
+				die("Illegal path http:// or ftp://");
+		}
+		
+			
+		// Initialize random number generator for randomizing cache flushes
+		srand(((double)microtime())*1000000);
+		
+		/**
+		 * ADODB version as a string.
+		 */
+		$ADODB_vers = 'V4.20 22 Feb 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+	
+		/**
+		 * Determines whether recordset->RecordCount() is used. 
+		 * Set to false for highest performance -- RecordCount() will always return -1 then
+		 * for databases that provide "virtual" recordcounts...
+		 */
+		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
+	}
+	
+	
+	//==============================================================================================	
+	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
+	//==============================================================================================	
+	
+	ADODB_Setup();
+
+	//==============================================================================================	
+	// CLASS ADOFieldObject
+	//==============================================================================================	
+	/**
+	 * Helper class for FetchFields -- holds info on a column
+	 */
+	class ADOFieldObject { 
+		var $name = '';
+		var $max_length=0;
+		var $type="";
+
+		// additional fields by dannym... (danny_milo@yahoo.com)
+		var $not_null = false; 
+		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
+		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
+
+		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
+			// others to come (dannym)
+		var $default_value; // default, if any, and supported. Check has_default first.
+	}
+	
+
+	
+	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
+	{
+		//print "Errorno ($fn errno=$errno m=$errmsg) ";
+		$thisConnection->_transOK = false;
+		if ($thisConnection->_oldRaiseFn) {
+			$fn = $thisConnection->_oldRaiseFn;
+			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
+		}
+	}
+	
+	//==============================================================================================	
+	// CLASS ADOConnection
+	//==============================================================================================	
+	
+	/**
+	 * Connection object. For connecting to databases, and executing queries.
+	 */ 
+	class ADOConnection {
+	//
+	// PUBLIC VARS 
+	//
+	var $dataProvider = 'native';
+	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
+	var $database = '';			/// Name of database to be used.	
+	var $host = ''; 			/// The hostname of the database server	
+	var $user = ''; 			/// The username which is used to connect to the database server. 
+	var $password = ''; 		/// Password for the username. For security, we no longer store it.
+	var $debug = false; 		/// if set to true will output sql statements
+	var $maxblobsize = 256000; 	/// maximum size of blobs or large text fields -- some databases die otherwise like foxpro
+	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
+	var $substr = 'substr';		/// substring operator
+	var $length = 'length';		/// string length operator
+	var $random = 'rand()';		/// random function
+	var $upperCase = false;		/// uppercase function
+	var $fmtDate = "'Y-m-d'";	/// used by DBDate() as the default date format used by the database
+	var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; /// used by DBTimeStamp as the default timestamp fmt.
+	var $true = '1'; 			/// string that represents TRUE for a database
+	var $false = '0'; 			/// string that represents FALSE for a database
+	var $replaceQuote = "\\'"; 	/// string to use to replace quotes
+	var $nameQuote = '"';		/// string to use to quote identifiers and names
+	var $charSet=false; 		/// character set to use - only for interbase
+	var $metaDatabasesSQL = '';
+	var $metaTablesSQL = '';
+	var $uniqueOrderBy = false; /// All order by columns have to be unique
+	var $emptyDate = ' ';
+	var $emptyTimeStamp = ' ';
+	var $lastInsID = false;
+	//--
+	var $hasInsertID = false; 		/// supports autoincrement ID?
+	var $hasAffectedRows = false; 	/// supports affected rows for update/delete?
+	var $hasTop = false;			/// support mssql/access SELECT TOP 10 * FROM TABLE
+	var $hasLimit = false;			/// support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	var $readOnly = false; 			/// this is a readonly database - used by phpLens
+	var $hasMoveFirst = false;  /// has ability to run MoveFirst(), scrolling backwards
+	var $hasGenID = false; 		/// can generate sequences using GenID();
+	var $hasTransactions = true; /// has transactions
+	//--
+	var $genID = 0; 			/// sequence id used by GenID();
+	var $raiseErrorFn = false; 	/// error function to call
+	var $isoDates = false; /// accepts dates in ISO format
+	var $cacheSecs = 3600; /// cache for 1 hour
+	var $sysDate = false; /// name of function that returns the current date
+	var $sysTimeStamp = false; /// name of function that returns the current timestamp
+	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
+	
+	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
+	var $numCacheHits = 0; 
+	var $numCacheMisses = 0;
+	var $pageExecuteCountRows = true;
+	var $uniqueSort = false; /// indicates that all fields in order by must be unique
+	var $leftOuter = false; /// operator to use for left outer join in WHERE clause
+	var $rightOuter = false; /// operator to use for right outer join in WHERE clause
+	var $ansiOuter = false; /// whether ansi outer join syntax supported
+	var $autoRollback = false; // autoRollback on PConnect().
+	var $poorAffectedRows = false; // affectedRows not working or unreliable
+	
+	var $fnExecute = false;
+	var $fnCacheExecute = false;
+	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
+	var $rsPrefix = "ADORecordSet_";
+	
+	var $autoCommit = true; 	/// do not modify this yourself - actually private
+	var $transOff = 0; 			/// temporarily disable transactions
+	var $transCnt = 0; 			/// count of nested transactions
+	
+	var $fetchMode=false;
+	 //
+	 // PRIVATE VARS
+	 //
+	var $_oldRaiseFn =  false;
+	var $_transOK = null;
+	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
+	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
+								/// then returned by the errorMsg() function	
+	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
+	var $_queryID = false;		/// This variable keeps the last created result link identifier
+	
+	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
+	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
+	var $_evalAll = false;
+	var $_affected = false;
+	var $_logsql = false;
+	
+
+	
+	/**
+	 * Constructor
+	 */
+	function ADOConnection()			
+	{
+		die('Virtual Class -- cannot instantiate');
+	}
+	
+	/**
+		Get server version info...
+		
+		@returns An array with 2 elements: $arr['string'] is the description string, 
+			and $arr[version] is the version (also a string).
+	*/
+	function ServerInfo()
+	{
+		return array('description' => '', 'version' => '');
+	}
+	
+	function _findvers($str)
+	{
+		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
+		else return '';
+	}
+	
+	/**
+	* All error messages go through this bottleneck function.
+	* You can define your own handler by defining the function name in ADODB_OUTP.
+	*/
+	function outp($msg,$newline=true)
+	{
+	global $HTTP_SERVER_VARS,$ADODB_FLUSH;
+	
+		if (defined('ADODB_OUTP')) {
+			$fn = ADODB_OUTP;
+			$fn($msg,$newline);
+			return;
+		}
+		
+		if ($newline) $msg .= "
    \n";
+		
+		if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) echo $msg;
+		else echo strip_tags($msg);
+		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  dp not flush if output buffering enabled - useless - thx to Jesse Mullan 
+		
+	}
+	
+	/**
+	 * Connect to database
+	 *
+	 * @param [argHostname]		Host to connect to
+	 * @param [argUsername]		Userid to login
+	 * @param [argPassword]		Associated password
+	 * @param [argDatabaseName]	database
+	 * @param [forceNew]		force new connection
+	 *
+	 * @return true or false
+	 */	  
+	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
+	{
+		if ($argHostname != "") $this->host = $argHostname;
+		if ($argUsername != "") $this->user = $argUsername;
+		if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
+		
+		$this->_isPersistentConnection = false;	
+		if ($fn = $this->raiseErrorFn) {
+			if ($forceNew) {
+				if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
+			} else {
+				 if ($this->_connect($this->host, $this->user, $this->password, $this->database)) return true;
+			}
+			$err = $this->ErrorMsg();
+			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
+			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
+		} else {
+			if ($forceNew) {
+				if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
+			} else {
+				if ($this->_connect($this->host, $this->user, $this->password, $this->database)) return true;
+			}
+		}
+		if ($this->debug) ADOConnection::outp( $this->host.': '.$this->ErrorMsg());
+		return false;
+	}	
+	
+	 function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
+	 {
+	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
+	 }
+	
+	
+	/**
+	 * Always force a new connection to database - currently only works with oracle
+	 *
+	 * @param [argHostname]		Host to connect to
+	 * @param [argUsername]		Userid to login
+	 * @param [argPassword]		Associated password
+	 * @param [argDatabaseName]	database
+	 *
+	 * @return true or false
+	 */	  
+	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
+	{
+		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
+	}
+	
+	/**
+	 * Establish persistent connect to database
+	 *
+	 * @param [argHostname]		Host to connect to
+	 * @param [argUsername]		Userid to login
+	 * @param [argPassword]		Associated password
+	 * @param [argDatabaseName]	database
+	 *
+	 * @return return true or false
+	 */	
+	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
+	{
+		if (defined('ADODB_NEVER_PERSIST')) 
+			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
+		
+		if ($argHostname != "") $this->host = $argHostname;
+		if ($argUsername != "") $this->user = $argUsername;
+		if ($argPassword != "") $this->password = $argPassword;
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
+			
+		$this->_isPersistentConnection = true;	
+		
+		if ($fn = $this->raiseErrorFn) {
+			if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
+			$err = $this->ErrorMsg();
+			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
+			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
+		} else 
+			if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
+
+		if ($this->debug) ADOConnection::outp( $this->host.': '.$this->ErrorMsg());
+		return false;
+	}
+
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysDate;
+		return $col; // child class implement
+	}
+	
+	/**
+	 * Should prepare the sql statement and return the stmt resource.
+	 * For databases that do not support this, we return the $sql. To ensure
+	 * compatibility with databases that do not support prepare:
+	 *
+	 *   $stmt = $db->Prepare("insert into table (id, name) values (?,?)");
+	 *   $db->Execute($stmt,array(1,'Jill')) or die('insert failed');
+	 *   $db->Execute($stmt,array(2,'Joe')) or die('insert failed');
+	 *
+	 * @param sql	SQL to send to database
+	 *
+	 * @return return FALSE, or the prepared statement, or the original sql if
+	 * 			if the database does not support prepare.
+	 *
+	 */	
+	function Prepare($sql)
+	{
+		return $sql;
+	}
+
+	/**
+	 * Some databases, eg. mssql require a different function for preparing
+	 * stored procedures. So we cannot use Prepare().
+	 *
+	 * Should prepare the stored procedure  and return the stmt resource.
+	 * For databases that do not support this, we return the $sql. To ensure
+	 * compatibility with databases that do not support prepare:
+	 *
+	 * @param sql	SQL to send to database
+	 *
+	 * @return return FALSE, or the prepared statement, or the original sql if
+	 * 			if the database does not support prepare.
+	 *
+	 */	
+	function PrepareSP($sql,$param=false)
+	{
+		return $this->Prepare($sql,$param);
+	}
+	
+	/**
+	* PEAR DB Compat
+	*/
+	function Quote($s)
+	{
+		return $this->qstr($s,false);
+	}
+	
+	/**
+	 Requested by "Karsten Dambekalns" 
+	*/
+	function QMagic($s)
+	{
+		return $this->qstr($s,get_magic_quotes_gpc());
+	}
+
+	function q(&$s)
+	{
+		$s = $this->qstr($s,false);
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function ErrorNative()
+	{
+		return $this->ErrorNo();
+	}
+
+	
+   /**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function nextId($seq_name)
+	{
+		return $this->GenID($seq_name);
+	}
+
+	/**
+	*	 Lock a row, will escalate and lock the table if row locking not supported
+	*	will normally free the lock at the end of the transaction
+	*
+	*  @param $table	name of table to lock
+	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
+	*/
+	function RowLock($table,$where)
+	{
+		return false;
+	}
+	
+	function CommitLock($table)
+	{
+		return $this->CommitTrans();
+	}
+	
+	function RollbackLock($table)
+	{
+		return $this->RollbackTrans();
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*
+	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
+	* 	for easy porting :-)
+	*
+	* @param mode	The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
+	* @returns		The previous fetch mode
+	*/
+	function SetFetchMode($mode)
+	{	
+		$old = $this->fetchMode;
+		$this->fetchMode = $mode;
+		
+		if ($old === false) {
+		global $ADODB_FETCH_MODE;
+			return $ADODB_FETCH_MODE;
+		}
+		return $old;
+	}
+	
+
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function &Query($sql, $inputarr=false)
+	{
+		$rs = &$this->Execute($sql, $inputarr);
+		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+		return $rs;
+	}
+
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function &LimitQuery($sql, $offset, $count, $params=false)
+	{
+		$rs = &$this->SelectLimit($sql, $count, $offset, $params); 
+		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+		return $rs;
+	}
+
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function Disconnect()
+	{
+		return $this->Close();
+	}
+	
+	/*
+		 Returns placeholder for parameter, eg.
+		 $DB->Param('a')
+		 
+		 will return ':a' for Oracle, and '?' for most other databases...
+		 
+		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
+		 	pass in Param(false) before setting the first parameter.
+	*/
+	function Param($name)
+	{
+		return '?';
+	}
+	
+	/*
+		InParameter and OutParameter are self-documenting versions of Parameter().
+	*/
+	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+	{
+		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
+	}
+	
+	/*
+	*/
+	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+	{
+		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
+	
+	}
+	
+	/* 
+	Usage in oracle
+		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
+		$db->Parameter($stmt,$id,'myid');
+		$db->Parameter($stmt,$group,'group',64);
+		$db->Execute();
+		
+		@param $stmt Statement returned by Prepare() or PrepareSP().
+		@param $var PHP variable to bind to
+		@param $name Name of stored procedure variable name to bind to.
+		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
+		@param [$maxLen] Holds an maximum length of the variable.
+		@param [$type] The data type of $var. Legal values depend on driver.
+
+	*/
+	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
+	{
+		return false;
+	}
+	
+	/**
+		Improved method of initiating a transaction. Used together with CompleteTrans().
+		Advantages include:
+		
+		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
+		   Only the outermost block is treated as a transaction.
    
+		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.
    
+		c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block
+		   are disabled, making it backward compatible.
+	*/
+	function StartTrans($errfn = 'ADODB_TransMonitor')
+	{
+		if ($this->transOff > 0) {
+			$this->transOff += 1;
+			return;
+		}
+		
+		$this->_oldRaiseFn = $this->raiseErrorFn;
+		$this->raiseErrorFn = $errfn;
+		$this->_transOK = true;
+		
+		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
+		$this->BeginTrans();
+		$this->transOff = 1;
+	}
+	
+	/**
+		Used together with StartTrans() to end a transaction. Monitors connection
+		for sql errors, and will commit or rollback as appropriate.
+		
+		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
+		and if set to false force rollback even if no SQL error detected.
+		@returns true on commit, false on rollback.
+	*/
+	function CompleteTrans($autoComplete = true)
+	{
+		if ($this->transOff > 1) {
+			$this->transOff -= 1;
+			return true;
+		}
+		$this->raiseErrorFn = $this->_oldRaiseFn;
+		
+		$this->transOff = 0;
+		if ($this->_transOK && $autoComplete) {
+			if (!$this->CommitTrans()) {
+				$this->_transOK = false;
+				if ($this->debug) ADOConnection::outp("Smart Commit failed");
+			} else
+				if ($this->debug) ADOConnection::outp("Smart Commit occurred");
+		} else {
+			$this->RollbackTrans();
+			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
+		}
+		
+		return $this->_transOK;
+	}
+	
+	/*
+		At the end of a StartTrans/CompleteTrans block, perform a rollback.
+	*/
+	function FailTrans()
+	{
+		if ($this->debug) 
+			if ($this->transOff == 0) {
+				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
+			} else {
+				ADOConnection::outp("FailTrans was called");
+				adodb_backtrace();
+			}
+		$this->_transOK = false;
+	}
+	
+	/**
+		Check if transaction has failed, only for Smart Transactions.
+	*/
+	function HasFailedTrans()
+	{
+		if ($this->transOff > 0) return $this->_transOK == false;
+		return false;
+	}
+	
+	/**
+	 * Execute SQL 
+	 *
+	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
+	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
+	 * @return 		RecordSet or false
+	 */
+	function &Execute($sql,$inputarr=false) 
+	{
+		if ($this->fnExecute) {
+			$fn = $this->fnExecute;
+			$ret =& $fn($this,$sql,$inputarr);
+			if (isset($ret)) return $ret;
+		}
+		if ($inputarr && is_array($inputarr)) {
+			$element0 = reset($inputarr);
+			# is_object check is because oci8 descriptors can be passed in
+			$array_2d = is_array($element0) && !is_object(reset($element0));
+			
+			if (!is_array($sql) && !$this->_bindInputArray) {
+				$sqlarr = explode('?',$sql);
+					
+				if (!$array_2d) $inputarr = array($inputarr);
+				foreach($inputarr as $arr) {
+					$sql = ''; $i = 0;
+					foreach($arr as $v) {
+						$sql .= $sqlarr[$i];
+						// from Ron Baldwin 
+						// Only quote string types	
+						if (gettype($v) == 'string')
+							$sql .= $this->qstr($v);
+						else if ($v === null)
+							$sql .= 'NULL';
+						else
+							$sql .= $v;
+						$i += 1;
+					}
+					$sql .= $sqlarr[$i];
+					
+					if ($i+1 != sizeof($sqlarr))	
+						ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
+		
+					$ret =& $this->_Execute($sql,false);
+					if (!$ret) return $ret;
+				}	
+			} else {
+				if ($array_2d) {
+					$stmt = $this->Prepare($sql);
+					foreach($inputarr as $arr) {
+						$ret =& $this->_Execute($stmt,$arr);
+						if (!$ret) return $ret;
+					}
+				} else
+					$ret =& $this->_Execute($sql,$inputarr);
+			}
+		} else {
+			$ret =& $this->_Execute($sql,false);
+		}
+
+		return $ret;
+	}
+	
+	function& _Execute($sql,$inputarr=false)
+	{
+		// debug version of query
+		if ($this->debug) {
+		global $HTTP_SERVER_VARS;
+			$ss = '';
+			if ($inputarr) {
+				foreach($inputarr as $kk=>$vv) {
+					if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...';
+					$ss .= "($kk=>'$vv') ";
+				}
+				$ss = "[ $ss ]";
+			}
+			$sqlTxt = str_replace(',',', ',is_array($sql) ?$sql[0] : $sql);
+			
+			// check if running from browser or command-line
+			$inBrowser = isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']);
+			
+			if ($inBrowser)
+				if ($this->debug === -1)
+				ADOConnection::outp( "
    \n($this->databaseType): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false);
+				else ADOConnection::outp( "
    \n($this->databaseType): ".htmlspecialchars($sqlTxt)."   $ss\n
    \n",false);
+			else
+				ADOConnection::outp(  "=----\n($this->databaseType): ".($sqlTxt)." \n-----\n",false);
+			
+			$this->_queryID = $this->_query($sql,$inputarr);
+			/* 
+				Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql
+				because ErrorNo() calls Execute('SELECT @ERROR'), causing recure
+			*/
+			if ($this->databaseType == 'mssql') { 
+			// ErrorNo is a slow function call in mssql, and not reliable
+			// in PHP 4.0.6
+				if($emsg = $this->ErrorMsg()) {
+					$err = $this->ErrorNo();
+					if ($err) {
+						ADOConnection::outp($err.': '.$emsg);
+					}
+				}
+			} else 
+				if (!$this->_queryID) {
+					$e = $this->ErrorNo();
+					$m = $this->ErrorMsg();
+					ADOConnection::outp($e .': '. $m );
+				}
+		} else {
+			// non-debug version of query
+			
+			$this->_queryID =@$this->_query($sql,$inputarr);
+		}
+		
+		/************************
+			OK, query executed
+		*************************/
+		// error handling if query fails
+		if ($this->_queryID === false) {
+			if ($this->debug == 99) adodb_backtrace(true,5);	
+			$fn = $this->raiseErrorFn;
+			if ($fn) {
+				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
+			} 
+				
+			return false;
+		} else if ($this->_queryID === true) {
+		// return simplified empty recordset for inserts/updates/deletes with lower overhead
+			$rs =& new ADORecordSet_empty();
+			return $rs;
+		}
+		
+		// return real recordset from select statement
+		$rsclass = $this->rsPrefix.$this->databaseType;
+		$rs =& new $rsclass($this->_queryID,$this->fetchMode); // &new not supported by older PHP versions
+		$rs->connection = &$this; // Pablo suggestion
+		$rs->Init();
+		if (is_array($sql)) $rs->sql = $sql[0];
+		else $rs->sql = $sql;
+		if ($rs->_numOfRows <= 0) {
+		global $ADODB_COUNTRECS;
+	
+			if ($ADODB_COUNTRECS) {
+				if (!$rs->EOF){ 
+					$rs = &$this->_rs2rs($rs,-1,-1,!is_array($sql));
+					$rs->_queryID = $this->_queryID;
+				} else
+					$rs->_numOfRows = 0;
+			}
+		}
+		return $rs;
+	}
+
+	function CreateSequence($seqname='adodbseq',$startID=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
+	}
+
+	function DropSequence($seqname)
+	{
+		if (empty($this->_dropSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+
+	/**
+	 * Generates a sequence id and stores it in $this->genID;
+	 * GenID is only available if $this->hasGenID = true;
+	 *
+	 * @param seqname		name of sequence to use
+	 * @param startID		if sequence does not exist, start at this ID
+	 * @return		0 if not supported, otherwise a sequence id
+	 */
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		if (!$this->hasGenID) {
+			return 0; // formerly returns false pre 1.60
+		}
+		
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		
+		$holdtransOK = $this->_transOK;
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			$this->_transOK = $holdtransOK; //if the status was ok before reset
+			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
+			$rs = $this->Execute($getnext);
+		}
+		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
+		else $this->genID = 0; // false
+	
+		if ($rs) $rs->Close();
+
+		return $this->genID;
+	}	
+
+	/**
+	 * @return  the last inserted ID. Not all databases support this.
+	 */ 
+	function Insert_ID()
+	{
+		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
+		if ($this->hasInsertID) return $this->_insertid();
+		if ($this->debug) {
+			ADOConnection::outp( '
    Insert_ID error
    ');
+			adodb_backtrace();
+		}
+		return false;
+	}
+
+
+	/**
+	 * Portable Insert ID. Pablo Roca 
+	 *
+	 * @return  the last inserted ID. All databases support this. But aware possible
+	 * problems in multiuser environments. Heavy test this before deploying.
+	 */ 
+	function PO_Insert_ID($table="", $id="") 
+	{
+	   if ($this->hasInsertID){
+		   return $this->Insert_ID();
+	   } else {
+		   return $this->GetOne("SELECT MAX($id) FROM $table");
+	   }
+	}
+
+	/**
+	* @return # rows affected by UPDATE/DELETE
+	*/ 
+	function Affected_Rows()
+	{
+		if ($this->hasAffectedRows) {
+			if ($this->fnExecute === 'adodb_log_sql') {
+				if ($this->_logsql && $this->_affected !== false) return $this->_affected;
+			}
+			$val = $this->_affectedrows();
+			return ($val < 0) ? false : $val;
+		}
+				  
+		if ($this->debug) ADOConnection::outp( '
    Affected_Rows error
    ',false);
+		return false;
+	}
+	
+	
+	/**
+	 * @return  the last error message
+	 */
+	function ErrorMsg()
+	{
+		return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
+	}
+	
+	
+	/**
+	 * @return the last error number. Normally 0 means no error.
+	 */
+	function ErrorNo() 
+	{
+		return ($this->_errorMsg) ? -1 : 0;
+	}
+	
+	function MetaError($err=false)
+	{
+		include_once(ADODB_DIR."/adodb-error.inc.php");
+		if ($err === false) $err = $this->ErrorNo();
+		return adodb_error($this->dataProvider,$this->databaseType,$err);
+	}
+	
+	function MetaErrorMsg($errno)
+	{
+		include_once(ADODB_DIR."/adodb-error.inc.php");
+		return adodb_errormsg($errno);
+	}
+	
+	/**
+	 * @returns an array with the primary key columns in it.
+	 */
+	function MetaPrimaryKeys($table, $owner=false)
+	{
+	// owner not used in base class - see oci8
+		$p = array();
+		$objs =& $this->MetaColumns($table);
+		if ($objs) {
+			foreach($objs as $v) {
+				if (!empty($v->primary_key))
+					$p[] = $v->name;
+			}
+		}
+		if (sizeof($p)) return $p;
+		if (function_exists('ADODB_VIEW_PRIMARYKEYS'))
+			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
+		return false;
+	}
+	
+	/**
+	 * @returns assoc array where keys are tables, and values are foreign keys
+	 */
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+		return false;
+	}
+	/**
+	 * Choose a database to connect to. Many databases do not support this.
+	 *
+	 * @param dbName 	is the name of the database to select
+	 * @return 		true or false
+	 */
+	function SelectDB($dbName) 
+	{return false;}
+	
+	
+	/**
+	* Will select, getting rows from $offset (1-based), for $nrows. 
+	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	* eg. 
+	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
+	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
+	*
+	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
+	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
+	*
+	* @param sql
+	* @param [offset]	is the row to start calculations from (1-based)
+	* @param [nrows]		is the number of rows to get
+	* @param [inputarr]	array of bind variables
+	* @param [secs2cache]		is a private parameter only used by jlim
+	* @return		the recordset ($rs->databaseType == 'array')
+ 	*/
+	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		if ($this->hasTop && $nrows > 0) {
+		// suggested by Reinhard Balling. Access requires top after distinct 
+		 // Informix requires first before distinct - F Riosa
+			$ismssql = (strpos($this->databaseType,'mssql') !== false);
+			if ($ismssql) $isaccess = false;
+			else $isaccess = (strpos($this->databaseType,'access') !== false);
+			
+			if ($offset <= 0) {
+				
+					// access includes ties in result
+					if ($isaccess) {
+						$sql = preg_replace(
+						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
+
+						if ($secs2cache>0) {
+							$ret =& $this->CacheExecute($secs2cache, $sql,$inputarr);
+						} else {
+							$ret =& $this->Execute($sql,$inputarr);
+						}
+						return $ret; // PHP5 fix
+					} else if ($ismssql){
+						$sql = preg_replace(
+						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
+					} else {
+						$sql = preg_replace(
+						'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
+					}
+			} else {
+				$nn = $nrows + $offset;
+				if ($isaccess || $ismssql) {
+					$sql = preg_replace(
+					'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
+				} else {
+					$sql = preg_replace(
+					'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
+				}
+			}
+		}
+		
+		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
+		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
+		global $ADODB_COUNTRECS;
+		
+		$savec = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+			
+		if ($offset>0){
+			if ($secs2cache>0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
+			else $rs = &$this->Execute($sql,$inputarr);
+		} else {
+			if ($secs2cache>0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
+			else $rs = &$this->Execute($sql,$inputarr);
+		}
+		$ADODB_COUNTRECS = $savec;
+		if ($rs && !$rs->EOF) {
+			$rs =& $this->_rs2rs($rs,$nrows,$offset);
+		}
+		//print_r($rs);
+		return $rs;
+	}
+	
+	/**
+	* Create serializable recordset. Breaks rs link to connection.
+	*
+	* @param rs			the recordset to serialize
+	*/
+	function &SerializableRS(&$rs)
+	{
+		$rs2 =& $this->_rs2rs($rs);
+		$ignore = false;
+		$rs2->connection =& $ignore;
+		
+		return $rs2;
+	}
+	
+	/**
+	* Convert database recordset to an array recordset
+	* input recordset's cursor should be at beginning, and
+	* old $rs will be closed.
+	*
+	* @param rs			the recordset to copy
+	* @param [nrows]  	number of rows to retrieve (optional)
+	* @param [offset] 	offset by number of rows (optional)
+	* @return 			the new recordset
+	*/
+	function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
+	{
+		if (! $rs) return false;
+		
+		$dbtype = $rs->databaseType;
+		if (!$dbtype) {
+			$rs = &$rs;  // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
+			return $rs;
+		}
+		if (($dbtype == 'array' || $dbtype == 'csv') && $nrows == -1 && $offset == -1) {
+			$rs->MoveFirst();
+			$rs = &$rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1-- why ?
+			return $rs;
+		}
+		$flds = array();
+		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
+			$flds[] = $rs->FetchField($i);
+		}
+		$arr =& $rs->GetArrayLimit($nrows,$offset);
+		//print_r($arr);
+		if ($close) $rs->Close();
+		
+		$arrayClass = $this->arrayClass;
+		
+		$rs2 =& new $arrayClass();
+		$rs2->connection = &$this;
+		$rs2->sql = $rs->sql;
+		$rs2->dataProvider = $this->dataProvider;
+		$rs2->InitArrayFields($arr,$flds);
+		return $rs2;
+	}
+	
+	/*
+	* Return all rows. Compat with PEAR DB
+	*/
+	function &GetAll($sql, $inputarr=false)
+	{
+		$arr =& $this->GetArray($sql,$inputarr);
+		return $arr;
+	}
+	
+	function &GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
+	{
+		$rs =& $this->Execute($sql, $inputarr);
+		if (!$rs) return false;
+		
+		$arr =& $rs->GetAssoc($force_array,$first2cols);
+		return $arr;
+	}
+	
+	function &CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
+	{
+		if (!is_numeric($secs2cache)) {
+			$first2cols = $force_array;
+			$force_array = $inputarr;
+		}
+		$rs =& $this->CacheExecute($secs2cache, $sql, $inputarr);
+		if (!$rs) return false;
+		
+		$arr =& $rs->GetAssoc($force_array,$first2cols);
+		return $arr;
+	}
+	
+	/**
+	* Return first element of first row of sql statement. Recordset is disposed
+	* for you.
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function GetOne($sql,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+		$crecs = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+		
+		$ret = false;
+		$rs = &$this->Execute($sql,$inputarr);
+		if ($rs) {		
+			if (!$rs->EOF) $ret = reset($rs->fields);
+			$rs->Close();
+		} 
+		$ADODB_COUNTRECS = $crecs;
+		return $ret;
+	}
+	
+	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
+	{
+		$ret = false;
+		$rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
+		if ($rs) {		
+			if (!$rs->EOF) $ret = reset($rs->fields);
+			$rs->Close();
+		} 
+		
+		return $ret;
+	}
+	
+	function GetCol($sql, $inputarr = false, $trim = false)
+	{
+	  	$rv = false;
+	  	$rs = &$this->Execute($sql, $inputarr);
+	  	if ($rs) {
+			$rv = array();
+	   		if ($trim) {
+				while (!$rs->EOF) {
+					$rv[] = trim(reset($rs->fields));
+					$rs->MoveNext();
+		   		}
+			} else {
+				while (!$rs->EOF) {
+					$rv[] = reset($rs->fields);
+					$rs->MoveNext();
+		   		}
+			}
+	   		$rs->Close();
+	  	}
+	  	return $rv;
+	}
+	
+	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
+	{
+	  	$rv = false;
+	  	$rs = &$this->CacheExecute($secs, $sql, $inputarr);
+	  	if ($rs) {
+			if ($trim) {
+				while (!$rs->EOF) {
+					$rv[] = trim(reset($rs->fields));
+					$rs->MoveNext();
+		   		}
+			} else {
+				while (!$rs->EOF) {
+					$rv[] = reset($rs->fields);
+					$rs->MoveNext();
+		   		}
+			}
+	   		$rs->Close();
+	  	}
+	  	return $rv;
+	}
+ 
+	/*
+		Calculate the offset of a date for a particular database and generate
+			appropriate SQL. Useful for calculating future/past dates and storing
+			in a database.
+			
+		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
+	*/
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) $date = $this->sysDate;
+		return  '('.$date.'+'.$dayFraction.')';
+	}
+	
+	
+	/**
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function &GetArray($sql,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+		
+		$savec = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+		$rs =& $this->Execute($sql,$inputarr);
+		$ADODB_COUNTRECS = $savec;
+		if (!$rs) 
+			if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+			else return false;
+		$arr =& $rs->GetArray();
+		$rs->Close();
+		return $arr;
+	}
+	
+	function &CacheGetAll($secs2cache,$sql=false,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+		
+		$savec = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
+		$ADODB_COUNTRECS = $savec;
+		
+		if (!$rs) 
+			if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+			else return false;
+		
+		$arr =& $rs->GetArray();
+		$rs->Close();
+		return $arr;
+	}
+	
+	
+	
+	/**
+	* Return one row of sql statement. Recordset is disposed for you.
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function &GetRow($sql,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+		$crecs = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+		
+		$rs =& $this->Execute($sql,$inputarr);
+		
+		$ADODB_COUNTRECS = $crecs;
+		if ($rs) {
+			if (!$rs->EOF) $arr = $rs->fields;
+			else $arr = array();
+			$rs->Close();
+			return $arr;
+		}
+		
+		return false;
+	}
+	
+	function &CacheGetRow($secs2cache,$sql=false,$inputarr=false)
+	{
+		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
+		if ($rs) {
+			$arr = false;
+			if (!$rs->EOF) $arr = $rs->fields;
+			$rs->Close();
+			return $arr;
+		}
+		return false;
+	}
+	
+	/**
+	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
+	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
+	* Also note that no table locking is done currently, so it is possible that the
+	* record be inserted twice by two programs...
+	*
+	* $this->Replace('products', array('prodname' =>"'Nails'","price" => 3.99), 'prodname');
+	*
+	* $table		table name
+	* $fieldArray	associative array of data (you must quote strings yourself).
+	* $keyCol		the primary key field name or if compound key, array of field names
+	* autoQuote		set to true to use a hueristic to quote strings. Works with nulls and numbers
+	*					but does not work with dates nor SQL functions.
+	* has_autoinc	the primary key is an auto-inc field, so skip in insert.
+	*
+	* Currently blob replace not supported
+	*
+	* returns 0 = fail, 1 = update, 2 = insert 
+	*/
+	
+	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		
+		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
+	}
+	
+	
+	/**
+	* Will select, getting rows from $offset (1-based), for $nrows. 
+	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	* eg. 
+	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
+	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
+	*
+	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
+	*
+	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
+	* @param sql
+	* @param [offset]	is the row to start calculations from (1-based)
+	* @param [nrows]	is the number of rows to get
+	* @param [inputarr]	array of bind variables
+	* @return		the recordset ($rs->databaseType == 'array')
+ 	*/
+	function &CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
+	{	
+		if (!is_numeric($secs2cache)) {
+			if ($sql === false) $sql = -1;
+			if ($offset == -1) $offset = false;
+									  // sql,	nrows, offset,inputarr
+			$rs =& $this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
+		} else {
+			if ($sql === false) ADOConnection::outp( "Warning: \$sql missing from CacheSelectLimit()");
+			$rs =& $this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		}
+		return $rs;
+	}
+	
+	/**
+	* Flush cached recordsets that match a particular $sql statement. 
+	* If $sql == false, then we purge all files in the cache.
+ 	*/
+	function CacheFlush($sql=false,$inputarr=false)
+	{
+	global $ADODB_CACHE_DIR;
+	
+		if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
+			if (strncmp(PHP_OS,'WIN',3) === 0) {
+				$cmd = 'del /s '.str_replace('/','\\',$ADODB_CACHE_DIR).'\adodb_*.cache';
+			} else {
+				$cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/??/adodb_*.cache'; 
+				// old version 'rm -f `find '.$ADODB_CACHE_DIR.' -name adodb_*.cache`';
+			}
+			if ($this->debug) {
+				ADOConnection::outp( "CacheFlush: $cmd
    \n", system($cmd),"
    ");
+			} else {
+				exec($cmd);
+			}
+			return;
+		} 
+		$f = $this->_gencachename($sql.serialize($inputarr),false);
+		adodb_write_file($f,''); // is adodb_write_file needed?
+		if (!@unlink($f)) {
+			if ($this->debug) ADOConnection::outp( "CacheFlush: failed for $f");
+		}
+	}
+	
+	/**
+	* Private function to generate filename for caching.
+	* Filename is generated based on:
+	*
+	*  - sql statement
+	*  - database type (oci8, ibase, ifx, etc)
+	*  - database name
+	*  - userid
+	*
+	* We create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
+	* Assuming that we can have 50,000 files per directory with good performance, 
+	* then we can scale to 12.8 million unique cached recordsets. Wow!
+ 	*/
+	function _gencachename($sql,$createdir)
+	{
+	global $ADODB_CACHE_DIR;
+		
+		$m = md5($sql.$this->databaseType.$this->database.$this->user);
+		$dir = $ADODB_CACHE_DIR.'/'.substr($m,0,2);
+		if ($createdir && !file_exists($dir)) {
+			$oldu = umask(0);
+			if (!mkdir($dir,0771)) 
+				if ($this->debug) ADOConnection::outp( "Unable to mkdir $dir for $sql");
+			umask($oldu);
+		}
+		return $dir.'/adodb_'.$m.'.cache';
+	}
+	
+	
+	/**
+	 * Execute SQL, caching recordsets.
+	 *
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
+	 *					  This is an optional parameter.
+	 * @param sql		SQL statement to execute
+	 * @param [inputarr]	holds the input data  to bind to
+	 * @return 		RecordSet or false
+	 */
+	function &CacheExecute($secs2cache,$sql=false,$inputarr=false)
+	{
+		if (!is_numeric($secs2cache)) {
+			$inputarr = $sql;
+			$sql = $secs2cache;
+			$secs2cache = $this->cacheSecs;
+		}
+		global $ADODB_INCLUDED_CSV;
+		if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+		
+		if (is_array($sql)) $sql = $sql[0];
+			
+		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
+		$err = '';
+		
+		if ($secs2cache > 0){
+			$rs = &csv2rs($md5file,$err,$secs2cache);
+			$this->numCacheHits += 1;
+		} else {
+			$err='Timeout 1';
+			$rs = false;
+			$this->numCacheMisses += 1;
+		}
+		if (!$rs) {
+		// no cached rs found
+			if ($this->debug) {
+				if (get_magic_quotes_runtime()) {
+					ADOConnection::outp("Please disable magic_quotes_runtime - it corrupts cache files :(");
+				}
+				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
+			}
+			$rs = &$this->Execute($sql,$inputarr);
+			if ($rs) {
+				$eof = $rs->EOF;
+				$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
+				$txt = _rs2serialize($rs,false,$sql); // serialize
+		
+				if (!adodb_write_file($md5file,$txt,$this->debug)) {
+					if ($fn = $this->raiseErrorFn) {
+						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
+					}
+					if ($this->debug) ADOConnection::outp( " Cache write error");
+				}
+				if ($rs->EOF && !$eof) {
+					$rs->MoveFirst();
+					//$rs = &csv2rs($md5file,$err);		
+					$rs->connection = &$this; // Pablo suggestion
+				}  
+				
+			} else
+				@unlink($md5file);
+		} else {
+			$this->_errorMsg = '';
+			$this->_errorCode = 0;
+			
+			if ($this->fnCacheExecute) {
+				$fn = $this->fnCacheExecute;
+				$fn($this, $secs2cache, $sql, $inputarr);
+			}
+		// ok, set cached object found
+			$rs->connection = &$this; // Pablo suggestion
+			if ($this->debug){ 
+			global $HTTP_SERVER_VARS;
+					
+				$inBrowser = isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']);
+				$ttl = $rs->timeCreated + $secs2cache - time();
+				$s = is_array($sql) ? $sql[0] : $sql;
+				if ($inBrowser) $s = ''.htmlspecialchars($s).'';
+				
+				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
+			}
+		}
+		return $rs;
+	}
+	
+	
+	/**
+	 * Generates an Update Query based on an existing recordset.
+	 * $arrFields is an associative array of fields with the value
+	 * that should be assigned.
+	 *
+	 * Note: This function should only be used on a recordset
+	 *	   that is run against a single table and sql should only 
+	 *		 be a simple select stmt with no groupby/orderby/limit
+	 *
+	 * "Jonathan Younger" 
+  	 */
+	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false)
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq);
+	}
+
+
+	/**
+	 * Generates an Insert Query based on an existing recordset.
+	 * $arrFields is an associative array of fields with the value
+	 * that should be assigned.
+	 *
+	 * Note: This function should only be used on a recordset
+	 *	   that is run against a single table.
+  	 */
+	function GetInsertSQL(&$rs, $arrFields,$magicq=false)
+	{	
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq);
+	}
+	
+
+	/**
+	* Update a blob column, given a where clause. There are more sophisticated
+	* blob handling functions that we could have implemented, but all require
+	* a very complex API. Instead we have chosen something that is extremely
+	* simple to understand and use. 
+	*
+	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
+	*
+	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
+	* field blobtable.blobcolumn:
+	*
+	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
+	*
+	* Insert example:
+	*
+	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+	*/
+	
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
+	}
+
+	/**
+	* Usage:
+	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
+	*	
+	*	$blobtype supports 'BLOB' and 'CLOB'
+	*
+	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+	*	$conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
+	*/
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	{
+		$fd = fopen($path,'rb');
+		if ($fd === false) return false;
+		$val = fread($fd,filesize($path));
+		fclose($fd);
+		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
+	}
+	
+	function BlobDecode($blob)
+	{
+		return $blob;
+	}
+	
+	function BlobEncode($blob)
+	{
+		return $blob;
+	}
+	
+	function SetCharSet($charset)
+	{
+		return false;
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
+	}
+	
+	function LogSQL($enable=true)
+	{
+		include_once(ADODB_DIR.'/adodb-perf.inc.php');
+		
+		if ($enable) $this->fnExecute = 'adodb_log_sql';
+		else $this->fnExecute = false;
+		
+		$old = $this->_logsql;	
+		$this->_logsql = $enable;
+		if ($enable && !$old) $this->_affected = false;
+		return $old;
+	}
+	
+	function GetCharSet()
+	{
+		return false;
+	}
+	
+	/**
+	* Usage:
+	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
+	*
+	*	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
+	*	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
+	*/
+	function UpdateClob($table,$column,$val,$where)
+	{
+		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
+	}
+	
+	
+	/**
+	*  Change the SQL connection locale to a specified locale.
+	*  This is used to get the date formats written depending on the client locale.
+	*/
+	function SetDateLocale($locale = 'En')
+	{
+		$this->locale = $locale;
+		switch ($locale)
+		{
+			default:
+			case 'En':
+				$this->fmtDate="Y-m-d";
+				$this->fmtTimeStamp = "Y-m-d H:i:s";
+				break;
+	
+			case 'Fr':
+			case 'Ro':
+			case 'It':
+				$this->fmtDate="d-m-Y";
+				$this->fmtTimeStamp = "d-m-Y H:i:s";
+				break;
+				
+			case 'Ge':
+				$this->fmtDate="d.m.Y";
+				$this->fmtTimeStamp = "d.m.Y H:i:s";
+				break;
+		}
+	}
+	
+	
+	/**
+	 *  $meta	contains the desired type, which could be...
+	 *	C for character. You will have to define the precision yourself.
+	 *	X for teXt. For unlimited character lengths.
+	 *	B for Binary
+	 *  F for floating point, with no need to define scale and precision
+	 * 	N for decimal numbers, you will have to define the (scale, precision) yourself
+	 *	D for date
+	 *	T for timestamp
+	 * 	L for logical/Boolean
+	 *	I for integer
+	 *	R for autoincrement counter/integer
+	 *  and if you want to use double-byte, add a 2 to the end, like C2 or X2.
+	 * 
+	 *
+	 * @return the actual type of the data or false if no such type available
+	*/
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C':
+		case 'X':
+			return 'VARCHAR';
+		case 'B':
+			
+		case 'D':
+		case 'T':
+		case 'L':
+		
+		case 'R':
+			
+		case 'I':
+		case 'N':
+			return false;
+		}
+	}
+
+	
+	/**
+	 * Close Connection
+	 */
+	function Close() 
+	{
+		return $this->_close();
+		
+		// "Simon Lee"  reports that persistent connections need 
+		// to be closed too!
+		//if ($this->_isPersistentConnection != true) return $this->_close();
+		//else return true;	
+	}
+	
+	/**
+	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
+	 *
+	 * @return true if succeeded or false if database does not support transactions
+	 */
+	function BeginTrans() {return false;}
+	
+	
+	/**
+	 * If database does not support transactions, always return true as data always commited
+	 *
+	 * @param $ok  set to false to rollback transaction, true to commit
+	 *
+	 * @return true/false.
+	 */
+	function CommitTrans($ok=true) 
+	{ return true;}
+	
+	
+	/**
+	 * If database does not support transactions, rollbacks always fail, so return false
+	 *
+	 * @return true/false.
+	 */
+	function RollbackTrans() 
+	{ return false;}
+
+
+	/**
+	 * return the databases that the driver can connect to. 
+	 * Some databases will return an empty array.
+	 *
+	 * @return an array of database names.
+	 */
+		function MetaDatabases() 
+		{
+		global $ADODB_FETCH_MODE;
+		
+			if ($this->metaDatabasesSQL) {
+				$save = $ADODB_FETCH_MODE; 
+				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
+				
+				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+				
+				$arr = $this->GetCol($this->metaDatabasesSQL);
+				if (isset($savem)) $this->SetFetchMode($savem);
+				$ADODB_FETCH_MODE = $save; 
+			
+				return $arr;
+			}
+			
+			return false;
+		}
+		
+	/**
+	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
+	 * 		If false, both views and tables are returned.
+	 *		"VIEW" returns only views
+	 *		"TABLE" returns only tables
+	 * @param showSchema returns the schema/user with the table name, eg. USER.TABLE
+	 * @param mask  is the input mask - only supported by oci8 and postgresql
+	 *
+	 * @return  array of tables for current database.
+	 */ 
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+	global $ADODB_FETCH_MODE;
+	
+		if ($mask) return false;
+		
+		if ($this->metaTablesSQL) {
+			// complicated state saving by the need for backward compat
+			$save = $ADODB_FETCH_MODE; 
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
+			
+			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+			
+			$rs = $this->Execute($this->metaTablesSQL);
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save; 
+			
+			if ($rs === false) return false;
+			$arr =& $rs->GetArray();
+			$arr2 = array();
+			
+			if ($hast = ($ttype && isset($arr[0][1]))) { 
+				$showt = strncmp($ttype,'T',1);
+			}
+			
+			for ($i=0; $i < sizeof($arr); $i++) {
+				if ($hast) {
+					if ($showt == 0) {
+						if (strncmp($arr[$i][1],'T',1) == 0) $arr2[] = trim($arr[$i][0]);
+					} else {
+						if (strncmp($arr[$i][1],'V',1) == 0) $arr2[] = trim($arr[$i][0]);
+					}
+				} else
+					$arr2[] = trim($arr[$i][0]);
+			}
+			$rs->Close();
+			return $arr2;
+		}
+		return false;
+	}
+	
+	
+	function _findschema(&$table,&$schema)
+	{
+		if (!$schema && ($at = strpos($table,'.')) !== false) {
+			$schema = substr($table,0,$at);
+			$table = substr($table,$at+1);
+		}
+	}
+	
+	/**
+	 * List columns in a database as an array of ADOFieldObjects. 
+	 * See top of file for definition of object.
+	 *
+	 * @param table	table name to query
+	 * @param upper	uppercase table name (required by some databases)
+	 * @schema is optional database schema to use - not supported by all databases.
+	 *
+	 * @return  array of ADOFieldObjects for current table.
+	 */
+	function &MetaColumns($table,$upper=true) 
+	{
+	global $ADODB_FETCH_MODE;
+		
+		if (!empty($this->metaColumnsSQL)) {
+		
+			$schema = false;
+			$this->_findschema($table,$schema);
+		
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,($upper)?strtoupper($table):$table));
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			if ($rs === false) return false;
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld =& new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+				if (isset($rs->fields[3]) && $rs->fields[3]) {
+					if ($rs->fields[3]>0) $fld->max_length = $rs->fields[3];
+					$fld->scale = $rs->fields[4];
+					if ($fld->scale>0) $fld->max_length += 1;
+				} else
+					$fld->max_length = $rs->fields[2];
+					
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+				else $retarr[strtoupper($fld->name)] = $fld;
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+	
+    /**
+      * List indexes on a table as an array.
+      * @param table        table name to query
+      * @param primary include primary keys.
+	  *
+      * @return array of indexes on current table.
+      */
+     function &MetaIndexes($table, $primary = false, $owner = false)
+     {
+             return FALSE;
+     }
+
+	/**
+	 * List columns names in a table as an array. 
+	 * @param table	table name to query
+	 *
+	 * @return  array of column names for current table.
+	 */ 
+	function &MetaColumnNames($table) 
+	{
+		$objarr =& $this->MetaColumns($table);
+		if (!is_array($objarr)) return false;
+		
+		$arr = array();
+		foreach($objarr as $v) {
+			$arr[] = $v->name;
+		}
+		return $arr;
+	}
+			
+	/**
+	 * Different SQL databases used different methods to combine strings together.
+	 * This function provides a wrapper. 
+	 * 
+	 * param s	variable number of string parameters
+	 *
+	 * Usage: $db->Concat($str1,$str2);
+	 * 
+	 * @return concatenated string
+	 */ 	 
+	function Concat()
+	{	
+		$arr = func_get_args();
+		return implode($this->concat_operator, $arr);
+	}
+	
+	
+	/**
+	 * Converts a date "d" to a string that the database can understand.
+	 *
+	 * @param d	a date in Unix date time format.
+	 *
+	 * @return  date string in database date format
+	 */
+	function DBDate($d)
+	{
+		if (empty($d) && $d !== 0) return 'null';
+
+		if (is_string($d) && !is_numeric($d)) {
+			if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
+			if ($this->isoDates) return "'$d'";
+			$d = ADOConnection::UnixDate($d);
+		}
+
+		return adodb_date($this->fmtDate,$d);
+	}
+	
+	
+	/**
+	 * Converts a timestamp "ts" to a string that the database can understand.
+	 *
+	 * @param ts	a timestamp in Unix date time format.
+	 *
+	 * @return  timestamp string in database timestamp format
+	 */
+	function DBTimeStamp($ts)
+	{
+		if (empty($ts) && $ts !== 0) return 'null';
+
+		# strlen(14) allows YYYYMMDDHHMMSS format
+		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
+			return adodb_date($this->fmtTimeStamp,$ts);
+		
+		if ($ts === 'null') return $ts;
+		if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
+		
+		$ts = ADOConnection::UnixTimeStamp($ts);
+		return adodb_date($this->fmtTimeStamp,$ts);
+	}
+	
+	/**
+	 * Also in ADORecordSet.
+	 * @param $v is a date string in YYYY-MM-DD format
+	 *
+	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
+	 */
+	function UnixDate($v)
+	{
+		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
+			($v), $rr)) return false;
+
+		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
+		// h-m-s-MM-DD-YY
+		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+	}
+	
+
+	/**
+	 * Also in ADORecordSet.
+	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
+	 *
+	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
+	 */
+	function UnixTimeStamp($v)
+	{
+		if (!preg_match( 
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+			($v), $rr)) return false;
+			
+		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
+	
+		// h-m-s-MM-DD-YY
+		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+	}
+	
+	/**
+	 * Also in ADORecordSet.
+	 *
+	 * Format database date based on user defined format.
+	 *
+	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a date formated as user desires
+	 */
+	 
+	function UserDate($v,$fmt='Y-m-d')
+	{
+		$tt = $this->UnixDate($v);
+		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		else if ($tt == 0) return $this->emptyDate;
+		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
+		}
+		
+		return adodb_date($fmt,$tt);
+	
+	}
+	
+		/**
+	 *
+	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a timestamp formated as user desires
+	 */
+	function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
+	{
+		# strlen(14) allows YYYYMMDDHHMMSS format
+		if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
+		$tt = $this->UnixTimeStamp($v);
+		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		if ($tt == 0) return $this->emptyTimeStamp;
+		return adodb_date($fmt,$tt);
+	}
+	
+	/**
+	* Quotes a string, without prefixing nor appending quotes. 
+	*/
+	function addq($s,$magicq=false)
+	{
+		if (!$magic_quotes) {
+		
+			if ($this->replaceQuote[0] == '\\'){
+				// only since php 4.0.5
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
+			}
+			return  str_replace("'",$this->replaceQuote,$s);
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		
+		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
+			return $s;
+		else {// change \' to '' for sybase/mssql
+			$s = str_replace('\\\\','\\',$s);
+			return str_replace("\\'",$this->replaceQuote,$s);
+		}
+	}
+	
+	/**
+	 * Correctly quotes a string so that all strings are escaped. We prefix and append
+	 * to the string single-quotes.
+	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
+	 * 
+	 * @param s			the string to quote
+	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
+	 *				This undoes the stupidity of magic quotes for GPC.
+	 *
+	 * @return  quoted string to be sent back to database
+	 */
+	function qstr($s,$magic_quotes=false)
+	{	
+		if (!$magic_quotes) {
+		
+			if ($this->replaceQuote[0] == '\\'){
+				// only since php 4.0.5
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		
+		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
+			return "'$s'";
+		else {// change \' to '' for sybase/mssql
+			$s = str_replace('\\\\','\\',$s);
+			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+		}
+	}
+	
+	
+	/**
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
+	*
+	* See readme.htm#ex8 for an example of usage.
+	*
+	* @param sql
+	* @param nrows		is the number of rows per page to get
+	* @param page		is the page number to get (1-based)
+	* @param [inputarr]	array of bind variables
+	* @param [secs2cache]		is a private parameter only used by jlim
+	* @return		the recordset ($rs->databaseType == 'array')
+	*
+	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
+	*
+	*/
+	function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		if ($this->pageExecuteCountRows) return _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
+		return _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
+
+	}
+	
+		
+	/**
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
+	*
+	* @param secs2cache	seconds to cache data, set to 0 to force query
+	* @param sql
+	* @param nrows		is the number of rows per page to get
+	* @param page		is the page number to get (1-based)
+	* @param [inputarr]	array of bind variables
+	* @return		the recordset ($rs->databaseType == 'array')
+	*/
+	function &CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
+	{
+		/*switch($this->dataProvider) {
+		case 'postgres':
+		case 'mysql': 
+			break;
+		default: $secs2cache = 0; break;
+		}*/
+		$rs =& $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
+		return $rs;
+	}
+
+} // end class ADOConnection
+	
+	
+	
+	//==============================================================================================	
+	// CLASS ADOFetchObj
+	//==============================================================================================	
+		
+	/**
+	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
+	*/
+	class ADOFetchObj {
+	};
+	
+	//==============================================================================================	
+	// CLASS ADORecordSet_empty
+	//==============================================================================================	
+	
+	/**
+	* Lightweight recordset when there are no records to be returned
+	*/
+	class ADORecordSet_empty
+	{
+		var $dataProvider = 'empty';
+		var $databaseType = false;
+		var $EOF = true;
+		var $_numOfRows = 0;
+		var $fields = false;
+		var $connection = false;
+		function RowCount() {return 0;}
+		function RecordCount() {return 0;}
+		function PO_RecordCount(){return 0;}
+		function Close(){return true;}
+		function FetchRow() {return false;}
+		function FieldCount(){ return 0;}
+	}
+	
+	//==============================================================================================	
+	// DATE AND TIME FUNCTIONS
+	//==============================================================================================	
+	include_once(ADODB_DIR.'/adodb-time.inc.php');
+	
+	//==============================================================================================	
+	// CLASS ADORecordSet
+	//==============================================================================================	
+
+	if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
+	else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
+   /**
+	 * RecordSet class that represents the dataset returned by the database.
+	 * To keep memory overhead low, this class holds only the current row in memory.
+	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
+	 * means recordcount not known).
+	 */
+	class ADORecordSet extends ADODB_BASE_RS {
+	/*
+	 * public variables	
+	 */
+	var $dataProvider = "native";
+	var $fields = false; 	/// holds the current row data
+	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
+							/// in other words, we use a text area for editing.
+	var $canSeek = false; 	/// indicates that seek is supported
+	var $sql; 				/// sql text
+	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
+	
+	var $emptyTimeStamp = ' '; /// what to display when $time==0
+	var $emptyDate = ' '; /// what to display when $time==0
+	var $debug = false;
+	var $timeCreated=0; 	/// datetime in Unix format rs created -- for cached recordsets
+
+	var $bind = false; 		/// used by Fields() to hold array - should be private?
+	var $fetchMode;			/// default fetch mode
+	var $connection = false; /// the parent connection
+	/*
+	 *	private variables	
+	 */
+	var $_numOfRows = -1;	/** number of rows, or -1 */
+	var $_numOfFields = -1;	/** number of fields in recordset */
+	var $_queryID = -1;		/** This variable keeps the result link identifier.	*/
+	var $_currentRow = -1;	/** This variable keeps the current row in the Recordset.	*/
+	var $_closed = false; 	/** has recordset been closed */
+	var $_inited = false; 	/** Init() should only be called once */
+	var $_obj; 				/** Used by FetchObj */
+	var $_names;			/** Used by FetchObj */
+	
+	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_lastPageNo = -1; 
+	var $_maxRecordCount = 0;
+	var $datetime = false;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
+	 *
+	 */
+	function ADORecordSet($queryID) 
+	{
+		$this->_queryID = $queryID;
+	}
+	
+	
+	
+	function Init()
+	{
+		if ($this->_inited) return;
+		$this->_inited = true;
+		if ($this->_queryID) @$this->_initrs();
+		else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+		}
+		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
+			
+			$this->_currentRow = 0;
+			if ($this->EOF = ($this->_fetch() === false)) {
+				$this->_numOfRows = 0; // _numOfRows could be -1
+			}
+		} else {
+			$this->EOF = true;
+		}
+	}
+	
+	
+	/**
+	 * Generate a SELECT tag string from a recordset, and return the string.
+	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * the text to display to the user, and 2nd col as the return value. Default
+	 * strings are compared with the FIRST column.
+	 *
+	 * @param name  		name of SELECT tag
+	 * @param [defstr]		the value to hilite. Use an array for multiple hilites for listbox.
+	 * @param [blank1stItem]	true to leave the 1st item in list empty
+	 * @param [multiple]		true for listbox, false for popup
+	 * @param [size]		#rows to show for listbox. not used by popup
+	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
+	 *				useful for holding javascript onChange='...' handlers.
+	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
+	 *				column 0 (1st col) if this is true. This is not documented.
+	 *
+	 * @return HTML
+	 *
+	 * changes by glen.davies@cce.ac.nz to support multiple hilited items
+	 */
+	function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
+			$size=0, $selectAttr='',$compareFields0=true)
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
+			$size, $selectAttr,$compareFields0);
+	}
+	
+	/**
+	 * Generate a SELECT tag string from a recordset, and return the string.
+	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * the text to display to the user, and 2nd col as the return value. Default
+	 * strings are compared with the SECOND column.
+	 *
+	 */
+	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_getmenu($this,$name,$defstr,$blank1stItem,$multiple,
+			$size, $selectAttr,false);
+	}
+
+
+	/**
+	 * return recordset as a 2-dimensional array.
+	 *
+	 * @param [nRows]  is the number of rows to return. -1 means every row.
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function &GetArray($nRows = -1) 
+	{
+	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) return adodb_getall($this,$nRows);
+		
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nRows != $cnt) {
+			$results[] = $this->fields;
+			$this->MoveNext();
+			$cnt++;
+		}
+		return $results;
+	}
+	
+	function &GetAll($nRows = -1)
+	{
+		$arr =& $this->GetArray($nRows);
+		return $arr;
+	}
+	
+	/*
+	* Some databases allow multiple recordsets to be returned. This function
+	* will return true if there is a next recordset, or false if no more.
+	*/
+	function NextRecordSet()
+	{
+		return false;
+	}
+	
+	/**
+	 * return recordset as a 2-dimensional array. 
+	 * Helper function for ADOConnection->SelectLimit()
+	 *
+	 * @param offset	is the row to start calculations from (1-based)
+	 * @param [nrows]	is the number of rows to return
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function &GetArrayLimit($nrows,$offset=-1) 
+	{	
+		if ($offset <= 0) {
+			$arr =& $this->GetArray($nrows);
+			return $arr;
+		} 
+		
+		$this->Move($offset);
+		
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+	
+	
+	/**
+	 * Synonym for GetArray() for compatibility with ADO.
+	 *
+	 * @param [nRows]  is the number of rows to return. -1 means every row.
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function &GetRows($nRows = -1) 
+	{
+		$arr =& $this->GetArray($nRows);
+		return $arr;
+	}
+	
+	/**
+	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
+	 * The first column is treated as the key and is not included in the array. 
+	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
+	 * $force_array == true.
+	 *
+	 * @param [force_array] has only meaning if we have 2 data columns. If false, a 1 dimensional
+	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
+	 * 	read the source.
+	 *
+	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
+	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
+	 *
+	 * @return an associative array indexed by the first column of the array, 
+	 * 	or false if the  data has less than 2 cols.
+	 */
+	function &GetAssoc($force_array = false, $first2cols = false) {
+		$cols = $this->_numOfFields;
+		if ($cols < 2) {
+			return false;
+		}
+		$numIndex = isset($this->fields[0]);
+		$results = array();
+		
+		if (!$first2cols && ($cols > 2 || $force_array)) {
+			if ($numIndex) {
+				while (!$this->EOF) {
+					$results[trim($this->fields[0])] = array_slice($this->fields, 1);
+					$this->MoveNext();
+				}
+			} else {
+				while (!$this->EOF) {
+					$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
+					$this->MoveNext();
+				}
+			}
+		} else {
+			// return scalar values
+			if ($numIndex) {
+				while (!$this->EOF) {
+				// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
+					$results[trim(($this->fields[0]))] = $this->fields[1];
+					$this->MoveNext();
+				}
+			} else {
+				while (!$this->EOF) {
+				// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
+					$v1 = trim(reset($this->fields));
+					$v2 = ''.next($this->fields); 
+					$results[$v1] = $v2;
+					$this->MoveNext();
+				}
+			}
+		}
+		return $results; 
+	}
+	
+	
+	/**
+	 *
+	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a timestamp formated as user desires
+	 */
+	function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
+	{
+		if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
+		$tt = $this->UnixTimeStamp($v);
+		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		if ($tt === 0) return $this->emptyTimeStamp;
+		return adodb_date($fmt,$tt);
+	}
+	
+	
+	/**
+	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a date formated as user desires
+	 */
+	function UserDate($v,$fmt='Y-m-d')
+	{
+		$tt = $this->UnixDate($v);
+		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		else if ($tt == 0) return $this->emptyDate;
+		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
+		}
+		return adodb_date($fmt,$tt);
+	
+	}
+	
+	
+	/**
+	 * @param $v is a date string in YYYY-MM-DD format
+	 *
+	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
+	 */
+	function UnixDate($v)
+	{
+		
+		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
+			($v), $rr)) return false;
+			
+		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
+		// h-m-s-MM-DD-YY
+		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+	}
+	
+
+	/**
+	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
+	 *
+	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
+	 */
+	function UnixTimeStamp($v)
+	{
+		
+		if (!preg_match( 
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+			($v), $rr)) return false;
+		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
+	
+		// h-m-s-MM-DD-YY
+		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+	}
+	
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function Free()
+	{
+		return $this->Close();
+	}
+	
+	
+	/**
+	* PEAR DB compat, number of rows
+	*/
+	function NumRows()
+	{
+		return $this->_numOfRows;
+	}
+	
+	
+	/**
+	* PEAR DB compat, number of cols
+	*/
+	function NumCols()
+	{
+		return $this->_numOfFields;
+	}
+	
+	/**
+	* Fetch a row, returning false if no more rows. 
+	* This is PEAR DB compat mode.
+	*
+	* @return false or array containing the current record
+	*/
+	function FetchRow()
+	{
+		if ($this->EOF) return false;
+		$arr = $this->fields;
+		$this->_currentRow++;
+		if (!$this->_fetch()) $this->EOF = true;
+		return $arr;
+	}
+	
+	
+	/**
+	* Fetch a row, returning PEAR_Error if no more rows. 
+	* This is PEAR DB compat mode.
+	*
+	* @return DB_OK or error object
+	*/
+	function FetchInto(&$arr)
+	{
+		if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new PEAR_Error('EOF',-1): false;
+		$arr = $this->fields;
+		$this->MoveNext();
+		return 1; // DB_OK
+	}
+	
+	
+	/**
+	 * Move to the first row in the recordset. Many databases do NOT support this.
+	 *
+	 * @return true or false
+	 */
+	function MoveFirst() 
+	{
+		if ($this->_currentRow == 0) return true;
+		return $this->Move(0);			
+	}			
+
+	
+	/**
+	 * Move to the last row in the recordset. 
+	 *
+	 * @return true or false
+	 */
+	function MoveLast() 
+	{
+		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
+		if ($this->EOF) return false;
+		while (!$this->EOF) {
+			$f = $this->fields;
+			$this->MoveNext();
+		}
+		$this->fields = $f;
+		$this->EOF = false;
+		return true;
+	}
+	
+	
+	/**
+	 * Move to next record in the recordset.
+	 *
+	 * @return true if there still rows available, or false if there are no more rows (EOF).
+	 */
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_fetch()) return true;
+		}
+		$this->EOF = true;
+		/* -- tested error handling when scrolling cursor -- seems useless.
+		$conn = $this->connection;
+		if ($conn && $conn->raiseErrorFn && ($errno = $conn->ErrorNo())) {
+			$fn = $conn->raiseErrorFn;
+			$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' ('.$this->sql.')',$conn->host,$conn->database);
+		}
+		*/
+		return false;
+	}	
+	
+	/**
+	 * Random access to a specific row in the recordset. Some databases do not support
+	 * access to previous rows in the databases (no scrolling backwards).
+	 *
+	 * @param rowNumber is the row to move to (0-based)
+	 *
+	 * @return true if there still rows available, or false if there are no more rows (EOF).
+	 */
+	function Move($rowNumber = 0) 
+	{
+		$this->EOF = false;
+		if ($rowNumber == $this->_currentRow) return true;
+		if ($rowNumber >= $this->_numOfRows)
+	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
+  				
+		if ($this->canSeek) { 
+	
+			if ($this->_seek($rowNumber)) {
+				$this->_currentRow = $rowNumber;
+				if ($this->_fetch()) {
+					return true;
+				}
+			} else {
+				$this->EOF = true;
+				return false;
+			}
+		} else {
+			if ($rowNumber < $this->_currentRow) return false;
+			global $ADODB_EXTENSION;
+			if ($ADODB_EXTENSION) {
+				while (!$this->EOF && $this->_currentRow < $rowNumber) {
+					adodb_movenext($this);
+				}
+			} else {
+			
+				while (! $this->EOF && $this->_currentRow < $rowNumber) {
+					$this->_currentRow++;
+					
+					if (!$this->_fetch()) $this->EOF = true;
+				}
+			}
+			return !($this->EOF);
+		}
+		
+		$this->fields = false;	
+		$this->EOF = true;
+		return false;
+	}
+	
+		
+	/**
+	 * Get the value of a field in the current row by column name.
+	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
+	 * 
+	 * @param colname  is the field to access
+	 *
+	 * @return the value of $colname column
+	 */
+	function Fields($colname)
+	{
+		return $this->fields[$colname];
+	}
+	
+	function GetAssocKeys($upper=true)
+	{
+		$this->bind = array();
+		for ($i=0; $i < $this->_numOfFields; $i++) {
+			$o =& $this->FetchField($i);
+			if ($upper === 2) $this->bind[$o->name] = $i;
+			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
+		}
+	}
+	
+  /**
+   * Use associative array to get fields array for databases that do not support
+   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli@libero.it
+   *
+   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC
+   * before you execute your SQL statement, and access $rs->fields['col'] directly.
+   *
+   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by FetchField
+   */
+	function &GetRowAssoc($upper=1)
+	{
+		$record = array();
+	 //	if (!$this->fields) return $record;
+		
+	   	if (!$this->bind) {
+			$this->GetAssocKeys($upper);
+		}
+		
+		foreach($this->bind as $k => $v) {
+			$record[$k] = $this->fields[$v];
+		}
+
+		return $record;
+	}
+	
+	
+	/**
+	 * Clean up recordset
+	 *
+	 * @return true or false
+	 */
+	function Close() 
+	{
+		// free connection object - this seems to globally free the object
+		// and not merely the reference, so don't do this...
+		// $this->connection = false; 
+		if (!$this->_closed) {
+			$this->_closed = true;
+			return $this->_close();		
+		} else
+			return true;
+	}
+	
+	/**
+	 * synonyms RecordCount and RowCount	
+	 *
+	 * @return the number of rows or -1 if this is not supported
+	 */
+	function RecordCount() {return $this->_numOfRows;}
+	
+	
+	/*
+	* If we are using PageExecute(), this will return the maximum possible rows
+	* that can be returned when paging a recordset.
+	*/
+	function MaxRecordCount()
+	{
+		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
+	}
+	
+	/**
+	 * synonyms RecordCount and RowCount	
+	 *
+	 * @return the number of rows or -1 if this is not supported
+	 */
+	function RowCount() {return $this->_numOfRows;} 
+	
+
+	 /**
+	 * Portable RecordCount. Pablo Roca 
+	 *
+	 * @return  the number of records from a previous SELECT. All databases support this.
+	 *
+	 * But aware possible problems in multiuser environments. For better speed the table
+	 * must be indexed by the condition. Heavy test this before deploying.
+	 */ 
+	function PO_RecordCount($table="", $condition="") {
+		
+		$lnumrows = $this->_numOfRows;
+		// the database doesn't support native recordcount, so we do a workaround
+		if ($lnumrows == -1 && $this->connection) {
+			IF ($table) {
+				if ($condition) $condition = " WHERE " . $condition; 
+				$resultrows = &$this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
+				if ($resultrows) $lnumrows = reset($resultrows->fields);
+			}
+		}
+		return $lnumrows;
+	}
+	
+	/**
+	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
+	 */
+	function CurrentRow() {return $this->_currentRow;}
+	
+	/**
+	 * synonym for CurrentRow -- for ADO compat
+	 *
+	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
+	 */
+	function AbsolutePosition() {return $this->_currentRow;}
+	
+	/**
+	 * @return the number of columns in the recordset. Some databases will set this to 0
+	 * if no records are returned, others will return the number of columns in the query.
+	 */
+	function FieldCount() {return $this->_numOfFields;}   
+
+
+	/**
+	 * Get the ADOFieldObject of a specific column.
+	 *
+	 * @param fieldoffset	is the column position to access(0-based).
+	 *
+	 * @return the ADOFieldObject for that column, or false.
+	 */
+	function &FetchField($fieldoffset) 
+	{
+		// must be defined by child class
+	}	
+	
+	/**
+	 * Get the ADOFieldObjects of all columns in an array.
+	 *
+	 */
+	function FieldTypesArray()
+	{
+		$arr = array();
+		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
+			$arr[] = $this->FetchField($i);
+		return $arr;
+	}
+	
+	/**
+	* Return the fields array of the current row as an object for convenience.
+	* The default case is lowercase field names.
+	*
+	* @return the object with the properties set to the fields of the current row
+	*/
+	function &FetchObj()
+	{
+		$o =& $this->FetchObject(false);
+		return $o;
+	}
+	
+	/**
+	* Return the fields array of the current row as an object for convenience.
+	* The default case is uppercase.
+	* 
+	* @param $isupper to set the object property names to uppercase
+	*
+	* @return the object with the properties set to the fields of the current row
+	*/
+	function &FetchObject($isupper=true)
+	{
+		if (empty($this->_obj)) {
+			$this->_obj =& new ADOFetchObj();
+			$this->_names = array();
+			for ($i=0; $i <$this->_numOfFields; $i++) {
+				$f = $this->FetchField($i);
+				$this->_names[] = $f->name;
+			}
+		}
+		$i = 0;
+		$o = &$this->_obj;
+		for ($i=0; $i <$this->_numOfFields; $i++) {
+			$name = $this->_names[$i];
+			if ($isupper) $n = strtoupper($name);
+			else $n = $name;
+			
+			$o->$n = $this->Fields($name);
+		}
+		return $o;
+	}
+	
+	/**
+	* Return the fields array of the current row as an object for convenience.
+	* The default is lower-case field names.
+	* 
+	* @return the object with the properties set to the fields of the current row,
+	* 	or false if EOF
+	*
+	* Fixed bug reported by tim@orotech.net
+	*/
+	function &FetchNextObj()
+	{
+		return $this->FetchNextObject(false);
+	}
+	
+	
+	/**
+	* Return the fields array of the current row as an object for convenience. 
+	* The default is upper case field names.
+	* 
+	* @param $isupper to set the object property names to uppercase
+	*
+	* @return the object with the properties set to the fields of the current row,
+	* 	or false if EOF
+	*
+	* Fixed bug reported by tim@orotech.net
+	*/
+	function &FetchNextObject($isupper=true)
+	{
+		$o = false;
+		if ($this->_numOfRows != 0 && !$this->EOF) {
+			$o = $this->FetchObject($isupper);	
+			$this->_currentRow++;
+			if ($this->_fetch()) return $o;
+		}
+		$this->EOF = true;
+		return $o;
+	}
+	
+	/**
+	 * Get the metatype of the column. This is used for formatting. This is because
+	 * many databases use different names for the same type, so we transform the original
+	 * type to our standardised version which uses 1 character codes:
+	 *
+	 * @param t  is the type passed in. Normally is ADOFieldObject->type.
+	 * @param len is the maximum length of that field. This is because we treat character
+	 * 	fields bigger than a certain size as a 'B' (blob).
+	 * @param fieldobj is the field object returned by the database driver. Can hold
+	 *	additional info (eg. primary_key for mysql).
+	 * 
+	 * @return the general type of the data: 
+	 *	C for character < 200 chars
+	 *	X for teXt (>= 200 chars)
+	 *	B for Binary
+	 * 	N for numeric floating point
+	 *	D for date
+	 *	T for timestamp
+	 * 	L for logical/Boolean
+	 *	I for integer
+	 *	R for autoincrement counter/integer
+	 * 
+	 *
+	*/
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+	// changed in 2.32 to hashing instead of switch stmt for speed...
+	static $typeMap = array(
+		'VARCHAR' => 'C',
+		'VARCHAR2' => 'C',
+		'CHAR' => 'C',
+		'C' => 'C',
+		'STRING' => 'C',
+		'NCHAR' => 'C',
+		'NVARCHAR' => 'C',
+		'VARYING' => 'C',
+		'BPCHAR' => 'C',
+		'CHARACTER' => 'C',
+		'INTERVAL' => 'C',  # Postgres
+		##
+		'LONGCHAR' => 'X',
+		'TEXT' => 'X',
+		'NTEXT' => 'X',
+		'M' => 'X',
+		'X' => 'X',
+		'CLOB' => 'X',
+		'NCLOB' => 'X',
+		'LVARCHAR' => 'X',
+		##
+		'BLOB' => 'B',
+		'IMAGE' => 'B',
+		'BINARY' => 'B',
+		'VARBINARY' => 'B',
+		'LONGBINARY' => 'B',
+		'B' => 'B',
+		##
+		'YEAR' => 'D', // mysql
+		'DATE' => 'D',
+		'D' => 'D',
+		##
+		'TIME' => 'T',
+		'TIMESTAMP' => 'T',
+		'DATETIME' => 'T',
+		'TIMESTAMPTZ' => 'T',
+		'T' => 'T',
+		##
+		'BOOL' => 'L',
+		'BOOLEAN' => 'L', 
+		'BIT' => 'L',
+		'L' => 'L',
+		##
+		'COUNTER' => 'R',
+		'R' => 'R',
+		'SERIAL' => 'R', // ifx
+		'INT IDENTITY' => 'R',
+		##
+		'INT' => 'I',
+		'INTEGER' => 'I',
+		'INTEGER UNSIGNED' => 'I',
+		'SHORT' => 'I',
+		'TINYINT' => 'I',
+		'SMALLINT' => 'I',
+		'I' => 'I',
+		##
+		'LONG' => 'N', // interbase is numeric, oci8 is blob
+		'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
+		'DECIMAL' => 'N',
+		'DEC' => 'N',
+		'REAL' => 'N',
+		'DOUBLE' => 'N',
+		'DOUBLE PRECISION' => 'N',
+		'SMALLFLOAT' => 'N',
+		'FLOAT' => 'N',
+		'NUMBER' => 'N',
+		'NUM' => 'N',
+		'NUMERIC' => 'N',
+		'MONEY' => 'N',
+		
+		## informix 9.2
+		'SQLINT' => 'I', 
+		'SQLSERIAL' => 'I', 
+		'SQLSMINT' => 'I', 
+		'SQLSMFLOAT' => 'N', 
+		'SQLFLOAT' => 'N', 
+		'SQLMONEY' => 'N', 
+		'SQLDECIMAL' => 'N', 
+		'SQLDATE' => 'D', 
+		'SQLVCHAR' => 'C', 
+		'SQLCHAR' => 'C', 
+		'SQLDTIME' => 'T', 
+		'SQLINTERVAL' => 'N', 
+		'SQLBYTES' => 'B', 
+		'SQLTEXT' => 'X' 
+		);
+		
+		$tmap = false;
+		$t = strtoupper($t);
+		$tmap = @$typeMap[$t];
+		switch ($tmap) {
+		case 'C':
+		
+			// is the char field is too long, return as text field... 
+			if ($this->blobSize >= 0) {
+				if ($len > $this->blobSize) return 'X';
+			} else if ($len > 250) {
+				return 'X';
+			}
+			return 'C';
+			
+		case 'I':
+			if (!empty($fieldobj->primary_key)) return 'R';
+			return 'I';
+		
+		case false:
+			return 'N';
+			
+		case 'B':
+			 if (isset($fieldobj->binary)) 
+				 return ($fieldobj->binary) ? 'B' : 'X';
+			return 'B';
+		
+		case 'D':
+			if (!empty($this->datetime)) return 'T';
+			return 'D';
+			
+		default: 
+			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
+			return $tmap;
+		}
+	}
+	
+	function _close() {}
+	
+	/**
+	 * set/returns the current recordset page when paginating
+	 */
+	function AbsolutePage($page=-1)
+	{
+		if ($page != -1) $this->_currentPage = $page;
+		return $this->_currentPage;
+	}
+	
+	/**
+	 * set/returns the status of the atFirstPage flag when paginating
+	 */
+	function AtFirstPage($status=false)
+	{
+		if ($status != false) $this->_atFirstPage = $status;
+		return $this->_atFirstPage;
+	}
+	
+	function LastPageNo($page = false)
+	{
+		if ($page != false) $this->_lastPageNo = $page;
+		return $this->_lastPageNo;
+	}
+	
+	/**
+	 * set/returns the status of the atLastPage flag when paginating
+	 */
+	function AtLastPage($status=false)
+	{
+		if ($status != false) $this->_atLastPage = $status;
+		return $this->_atLastPage;
+	}
+	
+} // end class ADORecordSet
+	
+	//==============================================================================================	
+	// CLASS ADORecordSet_array
+	//==============================================================================================	
+	
+	/**
+	 * This class encapsulates the concept of a recordset created in memory
+	 * as an array. This is useful for the creation of cached recordsets.
+	 * 
+	 * Note that the constructor is different from the standard ADORecordSet
+	 */
+	
+	class ADORecordSet_array extends ADORecordSet
+	{
+		var $databaseType = 'array';
+
+		var $_array; 	// holds the 2-dimensional data array
+		var $_types;	// the array of types of each column (C B I L M)
+		var $_colnames;	// names of each column in array
+		var $_skiprow1;	// skip 1st row because it holds column names
+		var $_fieldarr; // holds array of field objects
+		var $canSeek = true;
+		var $affectedrows = false;
+		var $insertid = false;
+		var $sql = '';
+		var $compat = false;
+		/**
+		 * Constructor
+		 *
+		 */
+		function ADORecordSet_array($fakeid=1)
+		{
+		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
+		
+			// fetch() on EOF does not delete $this->fields
+			$this->compat = !empty($ADODB_COMPAT_FETCH);
+			$this->ADORecordSet($fakeid); // fake queryID		
+			$this->fetchMode = $ADODB_FETCH_MODE;
+		}
+		
+		
+		/**
+		 * Setup the array.
+		 *
+		 * @param array		is a 2-dimensional array holding the data.
+		 *			The first row should hold the column names 
+		 *			unless paramter $colnames is used.
+		 * @param typearr	holds an array of types. These are the same types 
+		 *			used in MetaTypes (C,B,L,I,N).
+		 * @param [colnames]	array of column names. If set, then the first row of
+		 *			$array should not hold the column names.
+		 */
+		function InitArray($array,$typearr,$colnames=false)
+		{
+			$this->_array = $array;
+			$this->_types = $typearr;	
+			if ($colnames) {
+				$this->_skiprow1 = false;
+				$this->_colnames = $colnames;
+			} else  {
+				$this->_skiprow1 = true;
+				$this->_colnames = $array[0];
+			}
+			$this->Init();
+		}
+		/**
+		 * Setup the Array and datatype file objects
+		 *
+		 * @param array		is a 2-dimensional array holding the data.
+		 *			The first row should hold the column names 
+		 *			unless paramter $colnames is used.
+		 * @param fieldarr	holds an array of ADOFieldObject's.
+		 */
+		function InitArrayFields($array,$fieldarr)
+		{
+			$this->_array = $array;
+			$this->_skiprow1= false;
+			if ($fieldarr) {
+				$this->_fieldobjects = $fieldarr;
+			} 
+			$this->Init();
+		}
+		
+		function &GetArray($nRows=-1)
+		{
+			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
+				return $this->_array;
+			} else {
+				$arr =& ADORecordSet::GetArray($nRows);
+				return $arr;
+			}
+		}
+		
+		function _initrs()
+		{
+			$this->_numOfRows =  sizeof($this->_array);
+			if ($this->_skiprow1) $this->_numOfRows -= 1;
+		
+			$this->_numOfFields =(isset($this->_fieldobjects)) ?
+				 sizeof($this->_fieldobjects):sizeof($this->_types);
+		}
+		
+		/* Use associative array to get fields array */
+		function Fields($colname)
+		{
+			if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+	
+			if (!$this->bind) {
+				$this->bind = array();
+				for ($i=0; $i < $this->_numOfFields; $i++) {
+					$o = $this->FetchField($i);
+					$this->bind[strtoupper($o->name)] = $i;
+				}
+			}
+			return $this->fields[$this->bind[strtoupper($colname)]];
+		}
+		
+		function &FetchField($fieldOffset = -1) 
+		{
+			if (isset($this->_fieldobjects)) {
+				return $this->_fieldobjects[$fieldOffset];
+			}
+			$o =  new ADOFieldObject();
+			$o->name = $this->_colnames[$fieldOffset];
+			$o->type =  $this->_types[$fieldOffset];
+			$o->max_length = -1; // length not known
+			
+			return $o;
+		}
+			
+		function _seek($row)
+		{
+			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
+				$this->_currentRow = $row;
+				if ($this->_skiprow1) $row += 1;
+				$this->fields = $this->_array[$row];
+				return true;
+			}
+			return false;
+		}
+		
+		function MoveNext() 
+		{
+			if (!$this->EOF) {		
+				$this->_currentRow++;
+				
+				$pos = $this->_currentRow;
+				
+				if ($this->_numOfRows <= $pos) {
+					if (!$this->compat) $this->fields = false;
+				} else {
+					if ($this->_skiprow1) $pos += 1;
+					$this->fields = $this->_array[$pos];
+					return true;
+				}		
+				$this->EOF = true;
+			}
+			
+			return false;
+		}	
+	
+		function _fetch()
+		{
+			$pos = $this->_currentRow;
+			
+			if ($this->_numOfRows <= $pos) {
+				if (!$this->compat) $this->fields = false;
+				return false;
+			}
+			if ($this->_skiprow1) $pos += 1;
+			$this->fields = $this->_array[$pos];
+			return true;
+		}
+		
+		function _close() 
+		{
+			return true;	
+		}
+	
+	} // ADORecordSet_array
+
+	//==============================================================================================	
+	// HELPER FUNCTIONS
+	//==============================================================================================			
+	
+	/**
+	 * Synonym for ADOLoadCode. Private function. Do not use.
+	 *
+	 * @deprecated
+	 */
+	function ADOLoadDB($dbType) 
+	{ 
+		return ADOLoadCode($dbType);
+	}
+		
+	/**
+	 * Load the code for a specific database driver. Private function. Do not use.
+	 */
+	function ADOLoadCode($dbType) 
+	{
+	global $ADODB_LASTDB;
+	
+		if (!$dbType) return false;
+		$db = strtolower($dbType);
+		switch ($db) {
+			case 'maxsql': $db = 'mysqlt'; break;
+			case 'postgres':
+			case 'pgsql': $db = 'postgres7'; break;
+		}
+		@include_once(ADODB_DIR."/drivers/adodb-".$db.".inc.php");
+		$ADODB_LASTDB = $db;
+		
+		$ok = class_exists("ADODB_" . $db);
+		if ($ok) return $db;
+		
+		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
+		if (file_exists($file)) ADOConnection::outp("Missing file: $file");
+		else ADOConnection::outp("Syntax error in file: $file");
+		return false;
+	}
+
+	/**
+	 * synonym for ADONewConnection for people like me who cannot remember the correct name
+	 */
+	function &NewADOConnection($db='')
+	{
+		$tmp =& ADONewConnection($db);
+		return $tmp;
+	}
+	
+	/**
+	 * Instantiate a new Connection class for a specific database driver.
+	 *
+	 * @param [db]  is the database Connection object to create. If undefined,
+	 * 	use the last database driver that was loaded by ADOLoadCode().
+	 *
+	 * @return the freshly created instance of the Connection class.
+	 */
+	function &ADONewConnection($db='')
+	{
+	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
+		
+		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
+		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
+		
+		if (!empty($ADODB_NEWCONNECTION)) {
+			$obj = $ADODB_NEWCONNECTION($db);
+			if ($obj) {
+				if ($errorfn)  $obj->raiseErrorFn = $errorfn;
+				return $obj;
+			}
+		}
+		
+		if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
+		if (empty($db)) $db = $ADODB_LASTDB;
+		
+		if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
+		
+		if (!$db) {
+			 if ($errorfn) {
+				// raise an error
+				$ignore = false;
+				$errorfn('ADONewConnection', 'ADONewConnection', -998,
+						 "could not load the database driver for '$db",
+						 $db,false,$ignore);
+			} else
+				 ADOConnection::outp( "
    ADONewConnection: Unable to load database driver '$db'
    ",false);
+				
+			return false;
+		}
+		
+		$cls = 'ADODB_'.$db;
+		if (!class_exists($cls)) {
+			adodb_backtrace();
+			return false;
+		}
+		
+		$obj =& new $cls();
+		if ($errorfn) $obj->raiseErrorFn = $errorfn;
+		
+		return $obj;
+	}
+	
+	// $perf == true means called by NewPerfMonitor()
+	function _adodb_getdriver($provider,$drivername,$perf=false)
+	{
+		if ($provider !== 'native' && $provider != 'odbc' && $provider != 'ado') 
+			$drivername = $provider;
+		else {
+			if (substr($drivername,0,5) == 'odbc_') $drivername = substr($drivername,5);
+			else if (substr($drivername,0,4) == 'ado_') $drivername = substr($drivername,4);
+			else 
+			switch($drivername) {
+			case 'oracle': $drivername = 'oci8';break;
+			//case 'sybase': $drivername = 'mssql';break;
+			case 'access': 
+						if ($perf) $drivername = '';
+						break;
+			case 'db2':	
+						break;
+			default:
+				$drivername = 'generic';
+				break;
+			}
+		}
+		
+		return $drivername;
+	}
+	
+	function &NewPerfMonitor(&$conn)
+	{
+		$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
+		if (!$drivername || $drivername == 'generic') return false;
+		include_once(ADODB_DIR.'/adodb-perf.inc.php');
+		@include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
+		$class = "Perf_$drivername";
+		if (!class_exists($class)) return false;
+		$perf =& new $class($conn);
+		
+		return $perf;
+	}
+	
+	function &NewDataDictionary(&$conn)
+	{
+		$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
+		
+		include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		include_once(ADODB_DIR.'/adodb-datadict.inc.php');
+		$path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
+
+		if (!file_exists($path)) {
+			ADOConnection::outp("Database driver '$path' not available");
+			return false;
+		}
+		include_once($path);
+		$class = "ADODB2_$drivername";
+		$dict =& new $class();
+		$dict->dataProvider = $conn->dataProvider;
+		$dict->connection = &$conn;
+		$dict->upperName = strtoupper($drivername);
+		$dict->quote = $conn->nameQuote;
+		if (is_resource($conn->_connectionID))
+			$dict->serverInfo = $conn->ServerInfo();
+		
+		return $dict;
+	}
+
+
+	/**
+	* Save a file $filename and its $contents (normally for caching) with file locking
+	*/
+	function adodb_write_file($filename, $contents,$debug=false)
+	{ 
+	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
+	# So to simulate locking, we assume that rename is an atomic operation.
+	# First we delete $filename, then we create a $tempfile write to it and 
+	# rename to the desired $filename. If the rename works, then we successfully 
+	# modified the file exclusively.
+	# What a stupid need - having to simulate locking.
+	# Risks:
+	# 1. $tempfile name is not unique -- very very low
+	# 2. unlink($filename) fails -- ok, rename will fail
+	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs
+	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
+		if (strncmp(PHP_OS,'WIN',3) === 0) {
+			// skip the decimal place
+			$mtime = substr(str_replace(' ','_',microtime()),2); 
+			// getmypid() actually returns 0 on Win98 - never mind!
+			$tmpname = $filename.uniqid($mtime).getmypid();
+			if (!($fd = fopen($tmpname,'a'))) return false;
+			$ok = ftruncate($fd,0);			
+			if (!fwrite($fd,$contents)) $ok = false;
+			fclose($fd);
+			chmod($tmpname,0644);
+			// the tricky moment
+			@unlink($filename);
+			if (!@rename($tmpname,$filename)) {
+				unlink($tmpname);
+				$ok = false;
+			}
+			if (!$ok) {
+				if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+			}
+			return $ok;
+		}
+		if (!($fd = fopen($filename, 'a'))) return false;
+		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
+			$ok = fwrite( $fd, $contents );
+			fclose($fd);
+			chmod($filename,0644);
+		}else {
+			fclose($fd);
+			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename
    \n");
+			$ok = false;
+		}
+	
+		return $ok;
+	}
+	
+	/*
+		Perform a print_r, with pre tags for better formatting.
+	*/
+	function adodb_pr($var)
+	{
+		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
+			echo " 
    \n";print_r($var);echo "
    \n";
+		} else
+			print_r($var);
+	}
+	
+	/*
+		Perform a stack-crawl and pretty print it.
+		
+		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
+		@param levels Number of levels to display
+	*/
+	function adodb_backtrace($printOrArr=true,$levels=9999)
+	{
+		$s = '';
+		if (PHPVERSION() < 4.3) return;
+		 
+		$html =  (isset($_SERVER['HTTP_USER_AGENT']));
+		$fmt =  ($html) ? "     %% line %4d, file: %s" : "%% line %4d, file: %s";
+
+		$MAXSTRLEN = 64;
+	
+		$s = ($html) ? '
    ' : '';
+		
+		if (is_array($printOrArr)) $traceArr = $printOrArr;
+		else $traceArr = debug_backtrace();
+		array_shift($traceArr);
+		$tabs = sizeof($traceArr)-1;
+		
+		foreach ($traceArr as $arr) {
+			$levels -= 1;
+			if ($levels < 0) break;
+			
+			$args = array();
+			for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? '   ' : "\t";
+			$tabs -= 1;
+			if ($html) $s .= '';
+			if (isset($arr['class'])) $s .= $arr['class'].'.';
+			if (isset($arr['args']))
+			 foreach($arr['args'] as $v) {
+				if (is_null($v)) $args[] = 'null';
+				else if (is_array($v)) $args[] = 'Array['.sizeof($v).']';
+				else if (is_object($v)) $args[] = 'Object:'.get_class($v);
+				else if (is_bool($v)) $args[] = $v ? 'true' : 'false';
+				else {
+					$v = (string) @$v;
+					$str = htmlspecialchars(substr($v,0,$MAXSTRLEN));
+					if (strlen($v) > $MAXSTRLEN) $str .= '...';
+					$args[] = $str;
+				}
+			}
+			$s .= $arr['function'].'('.implode(', ',$args).')';
+			
+			
+			$s .= @sprintf($fmt, $arr['line'],$arr['file'],basename($arr['file']));
+				
+			$s .= "\n";
+		}	
+		if ($html) $s .= '
    ';
+		if ($printOrArr) print $s;
+		
+		return $s;
+	}
+	
+} // defined
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-access.inc.php b/lib/adodb/datadict/datadict-access.inc.php
index f1760c941ba..c6a4bc53685 100644
--- a/lib/adodb/datadict/datadict-access.inc.php
+++ b/lib/adodb/datadict/datadict-access.inc.php
@@ -1,92 +1,92 @@
-debug) ADOConnection::outp("Warning: Access does not supported DEFAULT values (field $fname)");
-		}
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	function CreateDatabase($dbname,$options=false)
-	{
-		return array();
-	}
-	
-	
-	function SetSchema($schema)
-	{
-	}
-
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-
+debug) ADOConnection::outp("Warning: Access does not supported DEFAULT values (field $fname)");
+		}
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	function CreateDatabase($dbname,$options=false)
+	{
+		return array();
+	}
+	
+	
+	function SetSchema($schema)
+	{
+	}
+
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-db2.inc.php b/lib/adodb/datadict/datadict-db2.inc.php
index 48f2f331e94..cadf5161077 100644
--- a/lib/adodb/datadict/datadict-db2.inc.php
+++ b/lib/adodb/datadict/datadict-db2.inc.php
@@ -1,74 +1,74 @@
-debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-
+debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-generic.inc.php b/lib/adodb/datadict/datadict-generic.inc.php
index 23267cceafa..cb4fc462d11 100644
--- a/lib/adodb/datadict/datadict-generic.inc.php
+++ b/lib/adodb/datadict/datadict-generic.inc.php
@@ -1,122 +1,122 @@
-debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-/*
-//db2
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'X': return 'VARCHAR'; 
-		
-		case 'C2': return 'VARCHAR'; // up to 32K
-		case 'X2': return 'VARCHAR';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'DOUBLE';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-	
-// ifx
-function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';// 255
-		case 'X': return 'TEXT'; 
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'TEXT';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'DATETIME';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'DECIMAL(20)';
-		
-		case 'F': return 'FLOAT';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-*/
+debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+/*
+//db2
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'X': return 'VARCHAR'; 
+		
+		case 'C2': return 'VARCHAR'; // up to 32K
+		case 'X2': return 'VARCHAR';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'DOUBLE';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+	
+// ifx
+function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';// 255
+		case 'X': return 'TEXT'; 
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'TEXT';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'T': return 'DATETIME';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'DECIMAL(20)';
+		
+		case 'F': return 'FLOAT';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+*/
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-ibase.inc.php b/lib/adodb/datadict/datadict-ibase.inc.php
index 6feb613eef0..0583b962a2a 100644
--- a/lib/adodb/datadict/datadict-ibase.inc.php
+++ b/lib/adodb/datadict/datadict-ibase.inc.php
@@ -1,64 +1,64 @@
-debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-
+debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-informix.inc.php b/lib/adodb/datadict/datadict-informix.inc.php
index 2fcaf922f2d..0064c9a43ad 100644
--- a/lib/adodb/datadict/datadict-informix.inc.php
+++ b/lib/adodb/datadict/datadict-informix.inc.php
@@ -1,77 +1,77 @@
-debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{
-		if ($fautoinc) {
-			$ftype = 'SERIAL';
-			return '';
-		}
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-}
-
+debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
+	{
+		if ($fautoinc) {
+			$ftype = 'SERIAL';
+			return '';
+		}
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+}
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-mssql.inc.php b/lib/adodb/datadict/datadict-mssql.inc.php
index bddb6c8421d..a3fdc9e3ecc 100644
--- a/lib/adodb/datadict/datadict-mssql.inc.php
+++ b/lib/adodb/datadict/datadict-mssql.inc.php
@@ -1,227 +1,229 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
-	}
-	
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
-		
-		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
-		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname $this->addCol";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(',',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	/*
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		foreach($lines as $v) {
-			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-		}
-
-		return $sql;
-	}
-	*/
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds))
-			$flds = explode(',',$flds);
-		$f = array();
-		$s = 'ALTER TABLE ' . $tabname;
-		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol $v";
-		}
-		$s .= implode(',',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		else if ($suffix == '') $suffix .= ' NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-	*/
-	
-	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
-		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
-		}
-*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $tabname . '.' . $idxname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-}
+type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+
+		case 'INT': 
+		case 'INTEGER': return  'I';
+		case 'BIT':
+		case 'TINYINT': return  'I1';
+		case 'SMALLINT': return 'I2';
+		case 'BIGINT':  return  'I8';
+		
+		case 'REAL':
+		case 'FLOAT': return 'F';
+		default: return parent::MetaType($t,$len,$fieldobj);
+		}
+	}
+	
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+		
+		case 'B': return 'IMAGE';
+			
+		case 'D': return 'DATETIME';
+		case 'T': return 'DATETIME';
+		case 'L': return 'BIT';
+		
+		case 'I': return 'INT'; 
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(',',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	/*
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		foreach($lines as $v) {
+			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+		}
+
+		return $sql;
+	}
+	*/
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds))
+			$flds = explode(',',$flds);
+		$f = array();
+		$s = 'ALTER TABLE ' . $tabname;
+		foreach($flds as $v) {
+			$f[] = "\n$this->dropCol $v";
+		}
+		$s .= implode(',',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+	*/
+	
+	/*
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+		[ WITH < index_option > [ ,...n] ] 
+		[ ON filegroup ]
+		< index_option > :: = 
+		    { PAD_INDEX | 
+		        FILLFACTOR = fillfactor | 
+		        IGNORE_DUP_KEY | 
+		        DROP_EXISTING | 
+		    STATISTICS_NORECOMPUTE | 
+		    SORT_IN_TEMPDB  
+		}
+*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-mysql.inc.php b/lib/adodb/datadict/datadict-mysql.inc.php
index 2eed142e664..8990fcf883b 100644
--- a/lib/adodb/datadict/datadict-mysql.inc.php
+++ b/lib/adodb/datadict/datadict-mysql.inc.php
@@ -1,174 +1,176 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'STRING': 
-		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET':
-			if ($len <= $this->blobSize) return 'C';
-			
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-			return 'X';
-			
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'YEAR':
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP': return 'T';
-		
-		case 'FLOAT':
-		case 'DOUBLE':
-			return 'F';
-			
-		case 'INT': 
-		case 'INTEGER': return (!empty($fieldobj->primary_key)) ? 'R' : 'I';
-		case 'TINYINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I1';
-		case 'SMALLINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I2';
-		case 'MEDIUMINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I4';
-		case 'BIGINT':  return (!empty($fieldobj->primary_key)) ? 'R' : 'I8';
-		default: return 'N';
-		}
-	}
-
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'LONGTEXT';
-		
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'LONGTEXT';
-		
-		case 'B': return 'LONGBLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'DATETIME';
-		case 'L': return 'TINYINT';
-		
-		case 'R':
-		case 'I': return 'INTEGER';
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'MEDIUMINT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'DOUBLE';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
-		$suffix = '';
-		if ($funsigned) $suffix .= ' UNSIGNED';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' AUTO_INCREMENT';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
-		[table_options] [select_statement]
-		create_definition:
-		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
-		[PRIMARY KEY] [reference_definition]
-		or PRIMARY KEY (index_col_name,...)
-		or KEY [index_name] (index_col_name,...)
-		or INDEX [index_name] (index_col_name,...)
-		or UNIQUE [INDEX] [index_name] (index_col_name,...)
-		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
-		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
-		[reference_definition]
-		or CHECK (expr)
-	*/
-	
-	/*
-	CREATE [UNIQUE|FULLTEXT] INDEX index_name
-		ON tbl_name (col_name[(length)],... )
-	*/
-	
-	function DropIndexSQL ($idxname, $tabname)
-	{
-		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
-	}
-	
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		if (isset($idxoptions['FULLTEXT'])) {
-			$unique = ' FULLTEXT';
-		} elseif (isset($idxoptions['UNIQUE'])) {
-			$unique = ' UNIQUE';
-		} else {
-			$unique = '';
-		}
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		$sql[] = $s;
-		
-		return $sql;
-	}
-}
+type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'STRING': 
+		case 'CHAR':
+		case 'VARCHAR': 
+		case 'TINYBLOB': 
+		case 'TINYTEXT': 
+		case 'ENUM': 
+		case 'SET':
+			if ($len <= $this->blobSize) return 'C';
+			
+		case 'TEXT':
+		case 'LONGTEXT': 
+		case 'MEDIUMTEXT':
+			return 'X';
+			
+		// php_mysql extension always returns 'blob' even if 'text'
+		// so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+			return !empty($fieldobj->binary) ? 'B' : 'X';
+			
+		case 'YEAR':
+		case 'DATE': return 'D';
+		
+		case 'TIME':
+		case 'DATETIME':
+		case 'TIMESTAMP': return 'T';
+		
+		case 'FLOAT':
+		case 'DOUBLE':
+			return 'F';
+			
+		case 'INT': 
+		case 'INTEGER': return (!empty($fieldobj->primary_key)) ? 'R' : 'I';
+		case 'TINYINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I1';
+		case 'SMALLINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I2';
+		case 'MEDIUMINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I4';
+		case 'BIGINT':  return (!empty($fieldobj->primary_key)) ? 'R' : 'I8';
+		default: return 'N';
+		}
+	}
+
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'LONGTEXT';
+		
+		case 'C2': return 'VARCHAR';
+		case 'X2': return 'LONGTEXT';
+		
+		case 'B': return 'LONGBLOB';
+			
+		case 'D': return 'DATE';
+		case 'T': return 'DATETIME';
+		case 'L': return 'TINYINT';
+		
+		case 'R':
+		case 'I': return 'INTEGER';
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'MEDIUMINT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'DOUBLE';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if ($funsigned) $suffix .= ' UNSIGNED';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' AUTO_INCREMENT';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
+		[table_options] [select_statement]
+		create_definition:
+		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
+		[PRIMARY KEY] [reference_definition]
+		or PRIMARY KEY (index_col_name,...)
+		or KEY [index_name] (index_col_name,...)
+		or INDEX [index_name] (index_col_name,...)
+		or UNIQUE [INDEX] [index_name] (index_col_name,...)
+		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
+		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
+		[reference_definition]
+		or CHECK (expr)
+	*/
+	
+	/*
+	CREATE [UNIQUE|FULLTEXT] INDEX index_name
+		ON tbl_name (col_name[(length)],... )
+	*/
+	
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
+			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
+
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		if (isset($idxoptions['FULLTEXT'])) {
+			$unique = ' FULLTEXT';
+		} elseif (isset($idxoptions['UNIQUE'])) {
+			$unique = ' UNIQUE';
+		} else {
+			$unique = '';
+		}
+		
+		if ( is_array($flds) ) $flds = implode(', ',$flds);
+		
+		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
+		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
+		
+		$s .= ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		$sql[] = $s;
+		
+		return $sql;
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-oci8.inc.php b/lib/adodb/datadict/datadict-oci8.inc.php
index e3afdd8067f..cd038f7931d 100644
--- a/lib/adodb/datadict/datadict-oci8.inc.php
+++ b/lib/adodb/datadict/datadict-oci8.inc.php
@@ -1,263 +1,263 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-			if (isset($this) && $len <= $this->blobSize) return 'C';
-			return 'X';
-		
-		case 'NCHAR':
-		case 'NVARCHAR2':
-		case 'NVARCHAR':
-			if (isset($this) && $len <= $this->blobSize) return 'C2';
-			return 'X2';
-			
-		case 'NCLOB':
-		case 'CLOB':
-			return 'XL';
-		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
-		
-		case 'DATE': 
-			return 'T';
-		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
-			
-		default:
-			return 'N';
-		}
-	}
-	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'X': return 'VARCHAR(4000)';
-		case 'XL': return 'CLOB';
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NVARCHAR(2000)';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': 
-		case 'T': return 'DATE';
-		case 'L': return 'DECIMAL(1)';
-		case 'I1': return 'DECIMAL(3)';
-		case 'I2': return 'DECIMAL(5)';
-		case 'I':
-		case 'I4': return 'DECIMAL(10)';
-		
-		case 'I8': return 'DECIMAL(20)';
-		case 'F': return 'DECIMAL';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}	
-	}
-	
-	function CreateDatabase($dbname, $options=false)
-	{
-		$options = $this->_Options($options);
-		$password = isset($options['PASSWORD']) ? $options['PASSWORD'] : 'tiger';
-		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
-		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
-		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
-		
-		return $sql;
-	}
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname ADD (";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		
-		$s .= implode(',',$f).')';
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname MODIFY(";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(',',$f).')';
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported for Oracle");
-		return array();
-	}
-	
-	function _DropAutoIncrement($t)
-	{
-		if (strpos($t,'.') !== false) {
-			$tarr = explode('.',$t);
-			return "drop sequence ".$tarr[0].".seq_".$tarr[1];
-		}
-		return "drop sequence seq_".$t;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{
-		$suffix = '';
-		
-		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
-			$fnotnull = false;
-			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
-		}
-		
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		
-		if ($fautoinc) $this->seqField = $fname;
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
-		return $suffix;
-	}
-	
-/*
-CREATE or replace TRIGGER jaddress_insert
-before insert on jaddress
-for each row
-begin
-select seqaddress.nextval into :new.A_ID from dual;
-end;
-*/
-	function _Triggers($tabname,$tableoptions)
-	{
-		if (!$this->seqField) return array();
-		
-		if ($this->schema) {
-			$t = strpos($tabname,'.');
-			if ($t !== false) $tab = substr($tabname,$t+1);
-			else $tab = $tabname;
-			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
-			$trigname = $this->schema.'.TRIG_'.$this->seqPrefix.$tab;
-		} else {
-			$seqname = $this->seqPrefix.$tabname;
-			$trigname = "TRIG_$seqname";
-		}
-		if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
-		$sql[] = "CREATE SEQUENCE $seqname";
-		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
-		
-		$this->seqField = false;
-		return $sql;
-	}
-	
-	/*
-	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
-		[table_options] [select_statement]
-		create_definition:
-		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
-		[PRIMARY KEY] [reference_definition]
-		or PRIMARY KEY (index_col_name,...)
-		or KEY [index_name] (index_col_name,...)
-		or INDEX [index_name] (index_col_name,...)
-		or UNIQUE [INDEX] [index_name] (index_col_name,...)
-		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
-		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
-		[reference_definition]
-		or CHECK (expr)
-	*/
-	
-
-	
-	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		if (isset($idxoptions['BITMAP'])) {
-			$unique = ' BITMAP'; 
-		} elseif (isset($idxoptions['UNIQUE'])) {
-			$unique = ' UNIQUE';
-		} else {
-			$unique = '';
-		}
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if (isset($idxoptions['oci8']))
-			$s .= $idxoptions['oci8'];
-		
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function GetCommentSQL($table,$col)
-	{
-		$table = $this->connection->qstr($table);
-		$col = $this->connection->qstr($col);	
-		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
-	}
-	
-	function SetCommentSQL($table,$col,$cmt)
-	{
-		$cmt = $this->connection->qstr($cmt);
-		return  "COMMENT ON COLUMN $table.$col IS $cmt";
-	}
-}
+type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+	 	case 'VARCHAR':
+	 	case 'VARCHAR2':
+		case 'CHAR':
+		case 'VARBINARY':
+		case 'BINARY':
+			if (isset($this) && $len <= $this->blobSize) return 'C';
+			return 'X';
+		
+		case 'NCHAR':
+		case 'NVARCHAR2':
+		case 'NVARCHAR':
+			if (isset($this) && $len <= $this->blobSize) return 'C2';
+			return 'X2';
+			
+		case 'NCLOB':
+		case 'CLOB':
+			return 'XL';
+		
+		case 'LONG RAW':
+		case 'LONG VARBINARY':
+		case 'BLOB':
+			return 'B';
+		
+		case 'DATE': 
+			return 'T';
+		
+		case 'INT': 
+		case 'SMALLINT':
+		case 'INTEGER': 
+			return 'I';
+			
+		default:
+			return 'N';
+		}
+	}
+	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'X': return 'VARCHAR(4000)';
+		case 'XL': return 'CLOB';
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NVARCHAR(2000)';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': 
+		case 'T': return 'DATE';
+		case 'L': return 'DECIMAL(1)';
+		case 'I1': return 'DECIMAL(3)';
+		case 'I2': return 'DECIMAL(5)';
+		case 'I':
+		case 'I4': return 'DECIMAL(10)';
+		
+		case 'I8': return 'DECIMAL(20)';
+		case 'F': return 'DECIMAL';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}	
+	}
+	
+	function CreateDatabase($dbname, $options=false)
+	{
+		$options = $this->_Options($options);
+		$password = isset($options['PASSWORD']) ? $options['PASSWORD'] : 'tiger';
+		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
+		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
+		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
+		
+		return $sql;
+	}
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname ADD (";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		
+		$s .= implode(',',$f).')';
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname MODIFY(";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(',',$f).')';
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported for Oracle");
+		return array();
+	}
+	
+	function _DropAutoIncrement($t)
+	{
+		if (strpos($t,'.') !== false) {
+			$tarr = explode('.',$t);
+			return "drop sequence ".$tarr[0].".seq_".$tarr[1];
+		}
+		return "drop sequence seq_".$t;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		$suffix = '';
+		
+		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
+			$fnotnull = false;
+			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
+		}
+		
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		
+		if ($fautoinc) $this->seqField = $fname;
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		
+		return $suffix;
+	}
+	
+/*
+CREATE or replace TRIGGER jaddress_insert
+before insert on jaddress
+for each row
+begin
+select seqaddress.nextval into :new.A_ID from dual;
+end;
+*/
+	function _Triggers($tabname,$tableoptions)
+	{
+		if (!$this->seqField) return array();
+		
+		if ($this->schema) {
+			$t = strpos($tabname,'.');
+			if ($t !== false) $tab = substr($tabname,$t+1);
+			else $tab = $tabname;
+			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
+			$trigname = $this->schema.'.TRIG_'.$this->seqPrefix.$tab;
+		} else {
+			$seqname = $this->seqPrefix.$tabname;
+			$trigname = "TRIG_$seqname";
+		}
+		if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
+		$sql[] = "CREATE SEQUENCE $seqname";
+		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
+		
+		$this->seqField = false;
+		return $sql;
+	}
+	
+	/*
+	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
+		[table_options] [select_statement]
+		create_definition:
+		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
+		[PRIMARY KEY] [reference_definition]
+		or PRIMARY KEY (index_col_name,...)
+		or KEY [index_name] (index_col_name,...)
+		or INDEX [index_name] (index_col_name,...)
+		or UNIQUE [INDEX] [index_name] (index_col_name,...)
+		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
+		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
+		[reference_definition]
+		or CHECK (expr)
+	*/
+	
+
+	
+	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		if (isset($idxoptions['BITMAP'])) {
+			$unique = ' BITMAP'; 
+		} elseif (isset($idxoptions['UNIQUE'])) {
+			$unique = ' UNIQUE';
+		} else {
+			$unique = '';
+		}
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if (isset($idxoptions['oci8']))
+			$s .= $idxoptions['oci8'];
+		
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function GetCommentSQL($table,$col)
+	{
+		$table = $this->connection->qstr($table);
+		$col = $this->connection->qstr($col);	
+		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
+	}
+	
+	function SetCommentSQL($table,$col,$cmt)
+	{
+		$cmt = $this->connection->qstr($cmt);
+		return  "COMMENT ON COLUMN $table.$col IS $cmt";
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-postgres.inc.php b/lib/adodb/datadict/datadict-postgres.inc.php
index 6279227fe05..9005ac55948 100644
--- a/lib/adodb/datadict/datadict-postgres.inc.php
+++ b/lib/adodb/datadict/datadict-postgres.inc.php
@@ -1,214 +1,214 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-			case 'INTERVAL':
-			case 'CHAR':
-			case 'CHARACTER':
-			case 'VARCHAR':
-			case 'NAME':
-	   		case 'BPCHAR':
-				if ($len <= $this->blobSize) return 'C';
-			
-			case 'TEXT':
-				return 'X';
-	
-			case 'IMAGE': // user defined type
-			case 'BLOB': // user defined type
-			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
-			case 'VARBIT':
-			case 'BYTEA':
-				return 'B';
-			
-			case 'BOOL':
-			case 'BOOLEAN':
-				return 'L';
-			
-			case 'DATE':
-				return 'D';
-			
-			case 'TIME':
-			case 'DATETIME':
-			case 'TIMESTAMP':
-			case 'TIMESTAMPTZ':
-				return 'T';
-			
-			case 'INTEGER': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I' : 'R';
-			case 'SMALLINT': 
-			case 'INT2': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I2' : 'R';
-			case 'INT4': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I4' : 'R';
-			case 'BIGINT': 
-			case 'INT8': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I8' : 'R';
-				
-			case 'OID':
-			case 'SERIAL':
-				return 'R';
-			
-			case 'FLOAT4':
-			case 'FLOAT8':
-			case 'DOUBLE PRECISION':
-			case 'REAL':
-				return 'F';
-				
-			 default:
-			 	return 'N';
-		}
-	}
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'TEXT';
-		
-		case 'B': return 'BYTEA';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'INT2';
-		case 'I4': return 'INT4';
-		case 'I8': return 'INT8';
-		
-		case 'F': return 'FLOAT8';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	/* The following does not work in Pg 6.0 - does anyone want to contribute code? 
-	
-	//"ALTER TABLE table ALTER COLUMN column SET DEFAULT mydef" and
-	//"ALTER TABLE table ALTER COLUMN column DROP DEFAULT mydef"
-	//"ALTER TABLE table ALTER COLUMN column SET NOT NULL" and
-	//"ALTER TABLE table ALTER COLUMN column DROP NOT NULL"*/
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported for PostgreSQL");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL only works with PostgreSQL 7.3+");
-		return ADODB_DataDict::DropColumnSQL($tabname, $flds)."/* only works for PostgreSQL 7.3+ */";
-	}
-
-	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{
-		if ($fautoinc) {
-			$ftype = 'SERIAL';
-			return '';
-		}
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	function _DropAutoIncrement($t)
-	{
-		return "drop sequence ".$t."_m_id_seq";
-	}
-	
-	/*
-	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
-	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
-	| table_constraint } [, ... ]
-	)
-	[ INHERITS ( parent_table [, ... ] ) ]
-	[ WITH OIDS | WITHOUT OIDS ]
-	where column_constraint is:
-	[ CONSTRAINT constraint_name ]
-	{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |
-	CHECK (expression) |
-	REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
-	[ ON DELETE action ] [ ON UPDATE action ] }
-	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-	and table_constraint is:
-	[ CONSTRAINT constraint_name ]
-	{ UNIQUE ( column_name [, ... ] ) |
-	PRIMARY KEY ( column_name [, ... ] ) |
-	CHECK ( expression ) |
-	FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]
-	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
-	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-	*/
-	
-	
-	/*
-	CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( column [ ops_name ] [, ...] )
-[ WHERE predicate ]
-CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
-[ WHERE predicate ]
-	*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
-		if (isset($idxoptions['HASH']))
-			$s .= 'USING HASH ';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
-		$sql[] = $s;
-		
-		return $sql;
-	}
-}
+type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+			case 'INTERVAL':
+			case 'CHAR':
+			case 'CHARACTER':
+			case 'VARCHAR':
+			case 'NAME':
+	   		case 'BPCHAR':
+				if ($len <= $this->blobSize) return 'C';
+			
+			case 'TEXT':
+				return 'X';
+	
+			case 'IMAGE': // user defined type
+			case 'BLOB': // user defined type
+			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
+			case 'VARBIT':
+			case 'BYTEA':
+				return 'B';
+			
+			case 'BOOL':
+			case 'BOOLEAN':
+				return 'L';
+			
+			case 'DATE':
+				return 'D';
+			
+			case 'TIME':
+			case 'DATETIME':
+			case 'TIMESTAMP':
+			case 'TIMESTAMPTZ':
+				return 'T';
+			
+			case 'INTEGER': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I' : 'R';
+			case 'SMALLINT': 
+			case 'INT2': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I2' : 'R';
+			case 'INT4': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I4' : 'R';
+			case 'BIGINT': 
+			case 'INT8': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I8' : 'R';
+				
+			case 'OID':
+			case 'SERIAL':
+				return 'R';
+			
+			case 'FLOAT4':
+			case 'FLOAT8':
+			case 'DOUBLE PRECISION':
+			case 'REAL':
+				return 'F';
+				
+			 default:
+			 	return 'N';
+		}
+	}
+ 	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'VARCHAR';
+		case 'X2': return 'TEXT';
+		
+		case 'B': return 'BYTEA';
+			
+		case 'D': return 'DATE';
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'INT2';
+		case 'I4': return 'INT4';
+		case 'I8': return 'INT8';
+		
+		case 'F': return 'FLOAT8';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	/* The following does not work in Pg 6.0 - does anyone want to contribute code? 
+	
+	//"ALTER TABLE table ALTER COLUMN column SET DEFAULT mydef" and
+	//"ALTER TABLE table ALTER COLUMN column DROP DEFAULT mydef"
+	//"ALTER TABLE table ALTER COLUMN column SET NOT NULL" and
+	//"ALTER TABLE table ALTER COLUMN column DROP NOT NULL"*/
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported for PostgreSQL");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL only works with PostgreSQL 7.3+");
+		return ADODB_DataDict::DropColumnSQL($tabname, $flds)."/* only works for PostgreSQL 7.3+ */";
+	}
+
+	// return string must begin with space
+	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
+	{
+		if ($fautoinc) {
+			$ftype = 'SERIAL';
+			return '';
+		}
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	function _DropAutoIncrement($t)
+	{
+		return "drop sequence ".$t."_m_id_seq";
+	}
+	
+	/*
+	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
+	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
+	| table_constraint } [, ... ]
+	)
+	[ INHERITS ( parent_table [, ... ] ) ]
+	[ WITH OIDS | WITHOUT OIDS ]
+	where column_constraint is:
+	[ CONSTRAINT constraint_name ]
+	{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |
+	CHECK (expression) |
+	REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
+	[ ON DELETE action ] [ ON UPDATE action ] }
+	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+	and table_constraint is:
+	[ CONSTRAINT constraint_name ]
+	{ UNIQUE ( column_name [, ... ] ) |
+	PRIMARY KEY ( column_name [, ... ] ) |
+	CHECK ( expression ) |
+	FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]
+	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
+	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+	*/
+	
+	
+	/*
+	CREATE [ UNIQUE ] INDEX index_name ON table
+[ USING acc_method ] ( column [ ops_name ] [, ...] )
+[ WHERE predicate ]
+CREATE [ UNIQUE ] INDEX index_name ON table
+[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
+[ WHERE predicate ]
+	*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
+		
+		if (isset($idxoptions['HASH']))
+			$s .= 'USING HASH ';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s .= '(' . $flds . ')';
+		$sql[] = $s;
+		
+		return $sql;
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-sybase.inc.php b/lib/adodb/datadict/datadict-sybase.inc.php
index 37d1874b904..50c7494dd73 100644
--- a/lib/adodb/datadict/datadict-sybase.inc.php
+++ b/lib/adodb/datadict/datadict-sybase.inc.php
@@ -1,224 +1,225 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
-	}
-	
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
-		
-		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
-		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname $this->addCol";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(',',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		foreach($lines as $v) {
-			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-		}
-
-		return $sql;
-	}
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		$f = array();
-		$s = "ALTER TABLE $tabname";
-		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol $v";
-		}
-		$s .= implode(',',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		else if ($suffix == '') $suffix .= ' NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-	*/
-	
-	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
-		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
-		}
-*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $tabname . '.' . $idxname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-}
+type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+
+		case 'INT': 
+		case 'INTEGER': return  'I';
+		case 'BIT':
+		case 'TINYINT': return  'I1';
+		case 'SMALLINT': return 'I2';
+		case 'BIGINT':  return  'I8';
+		
+		case 'REAL':
+		case 'FLOAT': return 'F';
+		default: return parent::MetaType($t,$len,$fieldobj);
+		}
+	}
+	
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+		
+		case 'B': return 'IMAGE';
+			
+		case 'D': return 'DATETIME';
+		case 'T': return 'DATETIME';
+		case 'L': return 'BIT';
+		
+		case 'I': return 'INT'; 
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(',',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		foreach($lines as $v) {
+			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+		}
+
+		return $sql;
+	}
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		$f = array();
+		$s = "ALTER TABLE $tabname";
+		foreach($flds as $v) {
+			$f[] = "\n$this->dropCol $v";
+		}
+		$s .= implode(',',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+	*/
+	
+	/*
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+		[ WITH < index_option > [ ,...n] ] 
+		[ ON filegroup ]
+		< index_option > :: = 
+		    { PAD_INDEX | 
+		        FILLFACTOR = fillfactor | 
+		        IGNORE_DUP_KEY | 
+		        DROP_EXISTING | 
+		    STATISTICS_NORECOMPUTE | 
+		    SORT_IN_TEMPDB  
+		}
+*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/docs-adodb.htm b/lib/adodb/docs-adodb.htm
index 65b808eb25d..b2f2d69bfbf 100644
--- a/lib/adodb/docs-adodb.htm
+++ b/lib/adodb/docs-adodb.htm
@@ -1,3207 +1,3229 @@
-
-
-ADODB Manual
-
-
-	
-
-
-
    ADOdb Library for PHP
    
-
    V4.11 27 Jan 2004 (c) 2000-2004 John Lim (jlim#natsoft.com)
    
-
    This software is dual licensed using BSD-Style and LGPL. This 
-  means you can use it in compiled proprietary and commercial products.
    
-	
    Useful ADOdb links:  Download   Other Docs
-
-
    Introduction
    
-	Unique Features
    
-	How People are using ADOdb
    
-	Feature Requests and Bug Reports
    
-	    Installation
    
-	Minimum Install
    
-	Initializing Code and Connection Examples
    
-	ADONewConnection 
-	NewADOConnection
    
-	High Speed ADOdb - tuning tips
    
-	Hacking and Modifying ADOdb Safely
    
-	PHP5 Features
    
-	foreach iterators exceptions
    
-	 Supported Databases
    
-	 Tutorials
    
-	Example 1: Select
    
-	Example 2: Advanced Select
    
-	Example 3: Insert
    
-	Example 4: Debugging  rs2html 
-	example
    
-	Example 5: MySQL and Menus
    
-	Example 6: Connecting to Multiple Databases at once 
    
-	Example 7: Generating Update and Insert SQL 
    
-	Example 8: Implementing Scrolling with Next and Previous
    
-	Example 9: Exporting in CSV or Tab-Delimited Format 
    
-	Example 10: Custom filters
    
-	Example 11: Smart Transactions
    
-	
    
-	 Using Custom Error Handlers and PEAR_Error
    
-	Data Source Names
    
-	Caching
    
-	Pivot Tables     
-
    REFERENCE
-
     Variables: $ADODB_COUNTRECS $ADODB_ANSI_PADDING_OFF
-  $ADODB_CACHE_DIR $ADODB_FETCH_MODE 
-  $ADODB_LANG
    
-  Constants:     ADODB_ASSOC_CASE 
-  
    
-   ADOConnection
    
-  Connections: Connect PConnect 
-  NConnect 
    
-  Executing SQL: Execute CacheExecute 
-  SelectLimit CacheSelectLimit 
-  Param Prepare PrepareSP 
-  InParameter OutParameter
-  
    
-                GetOne 
-  CacheGetOne GetRow CacheGetRow 
-  GetAll CacheGetAll GetCol 
-  CacheGetCol GetAssoc CacheGetAssoc Replace 
-  
    
-                 ExecuteCursor 
-  (oci8 only)
    
-  Generates SQL strings: GetUpdateSQL GetInsertSQL 
-  Concat IfNull length random substr 
-  qstr Param 
-  OffsetDate SQLDate 
-  DBDate  DBTimeStamp
-  
    
-  Blobs: UpdateBlob UpdateClob 
-  UpdateBlobFile BlobEncode 
-  BlobDecode
    
-  Paging/Scrolling: PageExecute CachePageExecute
    
-  Cleanup: CacheFlush Close
    
-  Transactions: StartTrans CompleteTrans 
-  FailTrans HasFailedTrans 
-  BeginTrans CommitTrans 
-  RollbackTrans 
    
-  Fetching Data:      SetFetchMode
    
-  Strings: concat length  qstr quote substr
    
-  Dates: DBDate DBTimeStamp UnixDate 
-  UnixTimeStamp OffsetDate 
-  SQLDate 
    
-  Row Management: Affected_Rows Insert_ID  RowLock
-  GenID CreateSequence DropSequence 
-  
    
-  Error Handling: ErrorMsg ErrorNo 
-  MetaError MetaErrorMsg
    
-  Data Dictionary (metadata): MetaDatabases MetaTables 
-  MetaColumns MetaColumnNames 
-  MetaPrimaryKeys MetaForeignKeys 
-  ServerInfo 
    
-  Statistics and Query-Rewriting: LogSQL fnExecute 
-  and fnCacheExecute
    
-      Deprecated: Bind BlankRecordSet
-  Parameter
-  
    
-  ADORecordSet
    
-  
-  Returns one field: Fields
    
- Returns one row:FetchRow FetchInto 
-  FetchObject FetchNextObject 
-  FetchObj FetchNextObj
- GetRowAssoc 
    
-  Returns all rows:GetArray GetRows 
-  GetAssoc
    
-  Scrolling:Move MoveNext MoveFirst 
-  MoveLast AbsolutePosition CurrentRow 
-  AtFirstPage AtLastPage 
-  AbsolutePage      
    
-  Menu generation:GetMenu GetMenu2
    
-  Dates:UserDate UserTimeStamp 
-  UnixDate UnixTimeStamp
    
-      Recordset Info:RecordCount PO_RecordSet 
-  NextRecordSet
    
-  Field Info:FieldCount FetchField 
-  MetaType
    
-  Cleanup: Close      
-
    rs2html  example
    
-  Differences between ADOdb and ADO
    
-  Database Driver Guide
    
-      Change Log
    
-
    
-
    Introduction
    
-
    PHP's database access functions are not standardised. This creates a need for 
-  a database class library to hide the differences between the different database 
-  API's (encapsulate the differences) so we can easily switch databases. PHP 4.0.5 or later
-  is now required (because we use array-based str_replace).
    
-
    We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, Informix, 
-  PostgreSQL, FrontBase,  SQLite, Interbase (Firebird and Borland variants), Foxpro, Access, ADO, DB2, SAP DB and ODBC. 
-  We have had successful reports of connecting to Progress and CacheLite via ODBC. We hope more people 
-  will contribute drivers to support other databases.
    
-
    PHP4 supports session variables. You can store your session information using 
-  ADOdb for true portability and scalability. See adodb-session.php for more information.
    
-
    Also read http://php.weblogs.com/portable_sql 
-  (also available as tips_portable_sql.htm in the release) for tips on writing 
-  portable SQL.
    
-
    Unique Features of ADOdb
    
-
      
-  
    • Easy for Windows programmers to adapt to because many of the conventions 
-	are similar to Microsoft's ADO.
      • 
-  
    • Unlike other PHP database classes which focus only on select statements, 
-	we provide support code to handle inserts and updates which can be adapted 
-	to multiple databases quickly. Methods are provided for date handling, 
-	string concatenation and string quoting characters for differing databases.
      • 
-  
    • A metatype system is built in so that we can figure out that types 
-	such as CHAR, TEXT and STRING are equivalent in different databases.
      • 
-  
    • Easy to port because all the database dependant code are stored in 
-	stub functions. You do not need to port the core logic of the classes.
      • 
-  
    • Portable table and index creation with the datadict classes.
-  
    • Database performance monitoring and SQL tuning with the performance monitoring classes.
-  
    • Database-backed sessions with the session management classes. Supports session expiry notification.
-
    
-
    How People are using ADOdb
    
-Here are some examples of how people are using ADOdb (for a much longer list, 
-visit http://php.weblogs.com/adodb-cool-applications): 
-
      
-
    • PhpLens is a commercial data grid component that allows both cool Web designers and serious unshaved programmers to develop and maintain databases on the Web easily. Developed by the author of ADOdb.
      
-
-
    • PHAkt: PHP Extension for DreamWeaver Ultradev allows you to script PHP in the popular Web page editor. Database handling provided by ADOdb.
      
-
-
    • Analysis Console for Intrusion Databases (ACID): PHP-based analysis engine to search and process a database of security incidents generated by security-related software such as IDSes and firewalls (e.g. Snort, ipchains). By Roman Danyliw.
      
-
-
    • PostNuke is a very popular free content management
- system and weblog system. It offers full CSS support, HTML 4.01 transitional compliance throughout, an advanced blocks system, and is fully multi-lingual enabled. 
      
-
-
    • EasyPublish CMS  is another free content management system for managing information and integrated modules on your internet, intranet- and extranet-sites. From Norway.
      
-
-
    • NOLA is a full featured accounting, inventory, and job tracking application. It is licensed under the GPL, and developed by Noguska.
-
    
-
-
    Feature Requests and Bug Reports
    
-
    Feature requests and bug reports can be emailed to jlim#natsoft.com.my 
-  or posted to the ADOdb Help forums at http://phplens.com/lens/lensforum/topics.php?id=4.
    
-
    Installation Guide
    
-
    Make sure you are running PHP 4.0.4 or later. 
-  Unpack all the files into a directory accessible by your webserver.
    
-
    To test, try modifying some of the tutorial examples. Make sure you customize 
-  the connection settings correctly. You can debug using $db->debug = true as shown below:
    
-
    <?php
-	include('adodb/adodb.inc.php');
-	$db = ADONewConnection($dbdriver); # eg 'mysql' or 'postgres'
-	$db->debug = true;
-	$db->Connect($server, $user, $password, $database);
-	$rs = $db->Execute('select * from some_small_table');
-	print "<pre>";
-	print_r($rs->GetRows());
-	print "</pre>";
-?>
    
-
- 
    Minimum Install
    
-
    For developers who want to release a minimal install of ADOdb, you will need:
-
      
-
    • adodb.inc.php
-
    • adodb-lib.inc.php
-
    • adodb-time.inc.php
-
    • adodb-csvlib.inc.php (if you use cached recordsets - CacheExecute(), etc)
-
    • adodb-error.inc.php and lang/adodb-$lang.inc.php (if you use MetaError())
-
    • drivers/adodb-$database.inc.php
-
    • license.txt (for legal reasons)
-
    
-
-
    Code Initialization Examples
    
-
    When running ADOdb, at least two files are loaded. First is adodb/adodb.inc.php, 
- which contains all functions used by all database classes. The code specific 
- to a particular database is in the adodb/driver/adodb-????.inc.php file.
    
- 
-
    For example, to connect to a mysql database:
    
-
    -include('/path/to/set/here/adodb.inc.php');
-$conn = &ADONewConnection('mysql');
-
    
-
    Whenever you need to connect to a database, you create a Connection object 
-  using the ADONewConnection($driver) function. 
-  NewADOConnection($driver) is an alternative name for the same function.
    
-
-
    At this point, you are not connected to the database. You will first need to decide
-whether to use persistent or non-persistent connections. The advantage of persistent
-connections is that they are faster, as the database connection is never closed (even 
-when you call Close()). Non-persistent connections take up much fewer resources though,
-reducing the risk of your database and your web-server becoming overloaded. 
-
    For persistent connections,
-use $conn->PConnect(),
- or $conn->Connect() for non-persistent connections.
-Some database drivers also support NConnect(), which forces 
-the creation of a new connection. 
-
-
    Connection Gotcha:  If you create two connections, but both use the same userid and password,
-PHP will share the same connection. This can cause problems if the connections are meant to 
-different databases. The solution is to always use different userid's for different databases,
- or use NConnect().
-
-
    Examples of Connecting to Databases
    
-
    MySQL and Most Other Database Drivers
    
-
    MySQL connections are very straightforward, and the parameters are identical 
-  to mysql_connect:
    
-
    -	$conn = &ADONewConnection('mysql'); 
-	$conn->PConnect('localhost','userid','password','database');
- 
    
-
     Most other database drivers use a similar convention: Connect($server, $user, $password, $database). Exceptions are listed below.
-
    PostgreSQL
    
-
    PostgreSQL accepts connections using: 
    
-
    a. the standard connection string:
    
-
    -	$conn = &ADONewConnection('postgres7'); 
-	$conn->PConnect('host=localhost port=5432 dbname=mary');
    
-
     b. the classical 4 parameters:
    
- 
    -	$conn->PConnect('localhost','userid','password','database');
- 
    
-
    Interbase/Firebird
    
-You define the database in the $host parameter:
-
    -	$conn = &ADONewConnection('ibase'); 
-	$conn->PConnect('localhost:c:\ibase\employee.gdb','sysdba','masterkey');
-
    
-
    SQLite
    
-Sqlite will create database if it does not exist.
-
    -	$conn = &ADONewConnection('sqlite'); 
-	$conn->PConnect('c:\path\to\sqlite.db'); # sqlite will create if does not exist
-
    
-
    Oracle
    
-
    With Oracle, you can connect in multiple ways.
    
-
    a. PHP and Oracle reside on the same machine, use default SID.
    
-
    	$conn->Connect(false, 'scott', 'tiger');
    
-
    b. TNS Name defined, eg. 'myTNS'
    
-
    	$conn->PConnect(false, 'scott', 'tiger', 'myTNS');
-
    
-
    or
    
-
     	$conn->PConnect('myTNS', 'scott', 'tiger');
    
-
    c. Host Address and SID
    
-
    	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'SID');
    
-
    d. Host Address and Service Name
    
-
    	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'servicename');
    
-
-
    DSN-less ODBC (access and mssql examples)
    
-
    ODBC DSN's can be created in the ODBC control panel, or you can use a DSN-less 
-  connection.To use DSN-less connections with ODBC you need PHP 4.3 or later. 
-
    
-
    For Microsoft Access:
    
-
    -	$db =& ADONewConnection('access');
-	$dsn = "Driver={Microsoft Access Driver (*.mdb)};Dbq=d:\\northwind.mdb;Uid=Admin;Pwd=;";
-	$db->Connect($dsn);
-
    
-For Microsoft SQL Server: 
-
    -	$db =& ADONewConnection('odbc_mssql');
-	$dsn = "Driver={SQL Server};Server=localhost;Database=northwind;";
-	$db->Connect($dsn,'userid','password');
-
    
-DSN-less Connections with ADO
    
-If you are using versions of PHP earlier than PHP 4.3.0, DSN-less connections 
-only work with Microsoft's ADO, which is Microsoft's COM based API. An example 
-using the ADOdb library and Microsoft's ADO: 
-
    -<?php
-	include('adodb.inc.php'); 
-	$db = &ADONewConnection("ado_mssql");
-	print "<h1>Connecting DSN-less $db->databaseType...</h1>";
-		
-	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
-		. "SERVER=flipper;DATABASE=ai;UID=sa;PWD=;"  ;
-	$db->Connect($myDSN);
-	
-	$rs = $db->Execute("select * from table");
-	$arr = $rs->GetArray();
-	print_r($arr);
-?>
-
    
-
    High Speed ADOdb - tuning tips
    
-
    ADOdb is a big class library, yet it consistently beats all other PHP class 
-  libraries in performance. This is because it is designed in a layered fashion, 
-  like an onion, with the fastest functions in the innermost layer. Stick to the 
-  following functions for best performance:
    
-
-  
-    
-  
-   
-    
-  
-
    Innermost Layer
    Connect, PConnect, NConnect
    
-        Execute, CacheExecute
    
-        SelectLimit, SelectLimit
    
-        MoveNext, Close 
    
-		qstr, Affected_Rows, Insert_ID
    
-
    The fastest way to access the fields is by accessing the array $recordset->fields 
-  directly. Also set the global variables $ADODB_FETCH_MODE 
-  = ADODB_FETCH_NUM, and (for oci8, ibase/firebird and odbc) $ADODB_COUNTRECS = false 
-  before you connect to your database. At the time of writing (Dec 2003).
    
-
    Consider using bind parameters if your database supports it, as it improves 
-  query plan reuse. Use ADOdb's performance tuning system to identify bottlenecks 
-  quickly. At the time of writing (Dec 2003), this means oci8 and odbc drivers.
    
-
    Lastly make sure you have a PHP accelerator cache installed such as APC, Turck 
-  MMCache, Zend Accelerator or ionCube.
    
- 
    Informix tips: Disable scrollable cursors with $db->cursorType = 0.
-
     
    
-
    Hacking ADOdb Safely
    
-
    You might want to modify ADOdb for your own purposes. Luckily you can
-still maintain backward compatibility by sub-classing ADOdb and using the $ADODB_NEWCONNECTION
-variable. $ADODB_NEWCONNECTION allows you to override the behaviour of ADONewConnection().
-ADOConnection() checks for this variable and will call
-the function-name stored in this variable if it is defined.
-
    In the following example, new functionality for the connection object 
-is placed in the hack_mysql and hack_postgres7 classes. The recordset class naming convention
-can be controlled using $rsPrefix. Here we set it to 'hack_rs_', which will make ADOdb use
-hack_rs_mysql and hack_rs_postgres7 as the recordset classes.
-If you want to use the default ADOdb drivers return false.
-
-
    -class hack_mysql extends adodb_mysql {
-var $rsPrefix = 'hack_rs_';
-  /* Your mods here */
-}
-
-class hack_rs_mysql extends ADORecordSet_mysql {
- /* Your mods here */
-}
-
-class hack_postgres7 extends adodb_postgres7 {
-var $rsPrefix = 'hack_rs_';
-  /* Your mods here */
-}
-
-class hack_rs_postgres7 extends ADORecordSet_postgres7 {
- /* Your mods here */
-}
-
-$ADODB_NEWCONNECTION = 'hack_factory';
-
-function& hack_factory($driver)
-{
-	if ($driver !== 'mysql' && $driver !== 'postgres7') return false;
-	
-	$driver = 'hack_'.$driver;
-	$obj = new $driver();
-	return $obj;
-}
-
-include_once('adodb.inc.php');
-
-
    
-
    Don't forget to call the constructor of the parent class.
-
-
    PHP5 Features
    
- ADOdb 4.02 or later will transparently determine which version of PHP you are using.
-If PHP5 is detected, the following features become available:
- 
-
    Databases Supported
    
-
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-   
-    
-    
-    
-    
-    
-    
-  
-  
     
-
    NameTestedDatabaseRecordCount() usablePrerequisitesOperating Systems
    accessBMicrosoft Access/Jet. You need to create an ODBC DSN.Y/NODBC Windows only
    adoB
    Generic ADO, not tuned for specific databases. Allows 
-        DSN-less connections. For best performance, use an OLEDB provider. This 
-        is the base class for all ado drivers.
    
-      
    You can set $db->codePage before connecting.
    		? depends on databaseADO or OLEDB providerWindows only
    ado_accessBMicrosoft Access/Jet using ADO. Allows DSN-less connections. 
-      For best performance, use an OLEDB provider.Y/NADO or OLEDB providerWindows only
    ado_mssqlBMicrosoft SQL Server using ADO. Allows DSN-less connections. 
-      For best performance, use an OLEDB provider.Y/NADO or OLEDB providerWindows only
    db2ADB2. Should work reliably as based on ODBC 
-      driver.Y/NDB2 CLI/ODBC interface 
    Unix and Windows. Unix 
-        install hints.
    vfpAMicrosoft Visual FoxPro. You need to create an ODBC DSN.Y/NODBCWindows only
    fbsqlCFrontBase. Y? 
    Unix and Windows
    ibaseBInterbase 6 or earlier. Some users report you might need 
-      to use this
    
-      $db->PConnect('localhost:c:/ibase/employee.gdb', "sysdba", "masterkey") 
-      to connect. Lacks Affected_Rows currently.
    
-      
    
-      You can set $db->dialect, $db->buffers and $db->charSet before connecting.    		Y/NInterbase clientUnix and Windows
    firebirdCFirebird version of interbase.Y/NInterbase clientUnix and Windows
    borland_ibaseCBorland version of Interbase 6.5 or later. Very sad that 
-      the forks differ.Y/NInterbase clientUnix and Windows
    informix72C Informix databases before Informix 7.3 that do no support 
-      SELECT FIRST.Y/NInformix clientUnix and Windows
    informixCGeneric informix driver.Y/NInformix clientUnix and Windows
    mssqlA 
    Microsoft SQL Server 7 and later. Works 
-        with Microsoft SQL Server 2000 also. Note that date formating is problematic 
-        with this driver. For example, the PHP mssql extension does not return 
-        the seconds for datetime!
    		Y/NMssql client 
    Unix and Windows. 
    
-        Unix install 
-        howto and another 
-        one. 
    mssqlpoA 
    Portable mssql driver. Identical to above 
-        mssql driver, except that '||', the concatenation operator, is converted 
-        to '+'. Useful for porting scripts from most other sql variants that use 
-        ||.
    		Y/NMssql client 
    Unix and Windows. 
    
-        Unix install howto    .
    mysqlAMySQL without transaction support. You can also set $db->clientFlags 
-      before connecting.Y/NMySQL clientUnix and Windows
    mysqlt or maxsqlA 
    MySQL with transaction support. We recommend using 
-        || as the concat operator for best portability. This can be done by running 
-        MySQL using: 
    
-        mysqld --ansi or mysqld --sql-mode=PIPES_AS_CONCAT
    		Y/NMySQL clientUnix and Windows
    oci8AOracle 8/9. Has more functionality than oracle driver 
-      (eg. Affected_Rows). You might have to putenv('ORACLE_HOME=...') before 
-      Connect/PConnect.  
     There are 2 ways of connecting 
-        - with server IP and service name: 
    
-        PConnect('serverip:1521','scott','tiger','service')
    
-        or using an entry in TNSNAMES.ORA or ONAMES or HOSTNAMES: 
    
-        PConnect(false, 'scott', 'tiger', $oraname).      
-      
    Since 2.31, we support Oracle REF cursor variables directly 
-        (see ExecuteCursor). 
    		Y/NOracle clientUnix and Windows
    oci805CSupports reduced Oracle functionality for Oracle 8.0.5. 
-      SelectLimit is not as efficient as in the oci8 or oci8po drivers.Y/NOracle clientUnix and Windows
    oci8poAOracle 8/9 portable driver. This is nearly identical with 
-      the oci8 driver except (a) bind variables in Prepare() use the ? convention, 
-      instead of :bindvar, (b) field names use the more common PHP convention 
-      of lowercase names.  
    Use this driver if porting 
-        from other databases is important. Otherwise the oci8 driver offers better 
-        performance.  
    		Y/NOracle clientUnix and Windows
    odbcAGeneric ODBC, not tuned for specific databases. To connect, 
-      use 
    
-      PConnect('DSN','user','pwd'). This is the base class for all odbc derived 
-      drivers.    		? depends on databaseODBCUnix and Windows. Unix 
-      hints.
    odbc_mssqlCUses ODBC to connect to MSSQLY/NODBCUnix and Windows. 
    odbc_oracleCUses ODBC to connect to OracleY/NODBCUnix and Windows. 
    oracleCImplements old Oracle 7 client API. Use oci8 
-      driver if possible for better performance.Y/NOracle clientUnix and Windows
    postgresAGeneric PostgreSQL driver. Currently identical to postgres7 
-      driver. YPostgreSQL clientUnix and Windows. 
    postgres64AFor PostgreSQL 6.4 and earlier which does not support LIMIT 
-      internally.YPostgreSQL clientUnix and Windows. 
    postgres7APostgreSQL which supports LIMIT and other version 7 functionality.YPostgreSQL clientUnix and Windows. 
    sapdbCSAP DB. Should work reliably as based on ODBC driver.Y/NSAP ODBC client 
    ?
    sqlanywhereCSybase SQL Anywhere. Should work reliably as based on ODBC 
-      driver.Y/NSQL Anywhere ODBC client 
    ?
    sqliteBSQLite. Only tested on PHP5.Y- 
    Unix and Windows.
    sybaseCSybase. Y/NSybase client 
    Unix and Windows.
    
-
-
    The "Tested" column indicates how extensively the code has been tested 
-  and used. 
    
-  A = well tested and used by many people
    
-  B = tested and usable, but some features might not be implemented
    
-  C = user contributed or experimental driver. Might not fully support all of 
-  the latest features of ADOdb. 
    
-
    The column "RecordCount() usable" indicates whether RecordCount() 
-  return the number of rows, or returns -1 when a SELECT statement is executed. 
-  If this column displays Y/N then the RecordCount() is emulated when the global 
-  variable $ADODB_COUNTRECS=true (this is the default). Note that for large recordsets, 
-  it might be better to disable RecordCount() emulation because substantial amounts 
-  of memory are required to cache the recordset for counting. Also there is a 
-  speed penalty of 40-50% if emulation is required. This is emulated in most databases 
-  except for PostgreSQL and MySQL. This variable is checked every time a query 
-  is executed, so you can selectively choose which recordsets to count.
    
-
     
-
    
-
    Tutorials
    
-
    Example 1: Select Statement
    
-
    Task: Connect to the Access Northwind DSN, display the first 2 columns of each 
-  row.
    
-
    In this example, we create a ADOConnection object, which represents the connection 
-  to the database. The connection is initiated with PConnect, 
-  which is a persistent connection. Whenever we want to query the database, we 
-  call the ADOConnection.Execute() 
-  function. This returns an ADORecordSet object which is actually a cursor that 
-  holds the current row in the array fields[]. 
-  We use MoveNext() 
-  to move from row to row.
    
-
    NB: A useful function that is not used in this example is SelectLimit, 
-  which allows us to limit the number of rows shown. 
-
    -<?
-include('adodb.inc.php');	   # load code common to ADOdb
-$conn = &ADONewConnection('access');	# create a connection
-$conn->PConnect('northwind');   # connect to MS-Access, northwind DSN
-$recordSet = &$conn->Execute('select * from products');
-if (!$recordSet) 
-	print $conn->ErrorMsg();
-else
-while (!$recordSet->EOF) {
-	print $recordSet->fields[0].' '.$recordSet->fields[1].'<BR>';
-	$recordSet->MoveNext();
-}
-
-$recordSet->Close(); # optional
-$conn->Close(); # optional
-
-?>
-
    
-
    The $recordSet returned stores 
-  the current row in the $recordSet->fields 
-  array, indexed by column number (starting from zero). We use the MoveNext() 
-  function to move to the next row. The EOF 
-  property is set to true when end-of-file is reached. If an error occurs in Execute(), 
-  we return false instead of a recordset.
    
-
    The $recordSet->fields[] array is generated by the PHP database 
-  extension. Some database extensions only index by number and do not index the 
-  array by field name. To force indexing by name - that is associative arrays 
-  - use the SetFetchMode function. Each recordset saves and uses whatever fetch 
-  mode was set when the recordset was created in Execute() or SelectLimit(). 
-
    -	$db->SetFetchMode(ADODB_FETCH_NUM);
-	$rs1 = $db->Execute('select * from table');
-	$db->SetFetchMode(ADODB_FETCH_ASSOC);
-	$rs2 = $db->Execute('select * from table');
-	print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
-	print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
-
    
-
     
    
-
    To get the number of rows in the select statement, you can use $recordSet->RecordCount(). 
-  Note that it can return -1 if the number of rows returned cannot be determined.
    
-
    Example 2: Advanced Select with Field Objects
    
-
    Select a table, display the first two columns. If the second column is a date 
-  or timestamp, reformat the date to US format.
    
-
    -<?
-include('adodb.inc.php');	   # load code common to ADOdb
-$conn = &ADONewConnection('access');	# create a connection
-$conn->PConnect('northwind');   # connect to MS-Access, northwind dsn
-$recordSet = &$conn->Execute('select CustomerID,OrderDate from Orders');
-if (!$recordSet) 
-	print $conn->ErrorMsg();
-else
-while (!$recordSet->EOF) {
-	$fld = $recordSet->FetchField(1);
-	$type = $recordSet->MetaType($fld->type);
-
-	if ( $type == 'D' || $type == 'T') 
-		print $recordSet->fields[0].' '.
-			$recordSet->UserDate($recordSet->fields[1],'m/d/Y').'<BR>';
-	else 
-		print $recordSet->fields[0].' '.$recordSet->fields[1].'<BR>';
-
-	$recordSet->MoveNext();
-}
-$recordSet->Close(); # optional
-$conn->Close(); # optional
-
-?>
-
    
-
    In this example, we check the field type of the second column using FetchField(). 
-  This returns an object with at least 3 fields.
    
-
      
-  
    • name: name of column
      • 
-  
    •  type: native field type of column
      • 
-  
    •  max_length: maximum length of field. Some databases such as MySQL 
-    do not return the maximum length of the field correctly. In these cases max_length 
-    will be set to -1.
      • 
-
    
-
    We then use MetaType() 
-  to translate the native type to a generic type. Currently the following 
-  generic types are defined:
    
-
      
-  
    • C: character fields that should be shown in a <input type="text"> 
-    tag.
      • 
-  
    • X: TeXt, large text fields that should be shown in a <textarea>
      • 
-  
    • B: Blobs, or Binary Large Objects. Typically images. 
-  
    • D: Date field
      • 
-  
    • T: Timestamp field
      • 
-  
    • L: Logical field (boolean or bit-field)
      • 
-  
    • I:  Integer field
      • 
-  
    • N: Numeric field. Includes autoincrement, numeric, floating point, 
-    real and integer. 
      • 
-  
    • R: Serial field. Includes serial, autoincrement integers. This works 
-    for selected databases. 
      • 
-
    
-
    If the metatype is of type date or timestamp, then we print it using the user 
-  defined date format with UserDate(), 
-  which converts the PHP SQL date string format to a user defined one. Another 
-  use for MetaType() 
-  is data validation before doing an SQL insert or update.
    
-
    Example 3: Inserting
    
-
    Insert a row to the Orders table containing dates and strings that need to 
-  be quoted before they can be accepted by the database, eg: the single-quote 
-  in the word John's.
    
-
    -<?
-include('adodb.inc.php');	   # load code common to ADOdb
-$conn = &ADONewConnection('access');	# create a connection
-
-$conn->PConnect('northwind');   # connect to MS-Access, northwind dsn
-$shipto = $conn->qstr("John's Old Shoppe");
-
-$sql = "insert into orders (customerID,EmployeeID,OrderDate,ShipName) ";
-$sql .= "values ('ANATR',2,".$conn->DBDate(time()).",$shipto)";
-
-if ($conn->Execute($sql) === false) {
-	print 'error inserting: '.$conn->ErrorMsg().'<BR>';
-}
-?>
-
    
-
    In this example, we see the advanced date and quote handling facilities of 
-  ADOdb. The unix timestamp (which is a long integer) is appropriately formated 
-  for Access with DBDate(), 
-  and the right escape character is used for quoting the John's Old Shoppe, 
-  which is John''s Old Shoppe and not PHP's default John's 
-  Old Shoppe with qstr(). 
-
    
-
    Observe the error-handling of the Execute statement. False is returned by 
-  Execute() if an error occured. The error message 
-  for the last error that occurred is displayed in ErrorMsg(). 
-  Note: php_track_errors might have to be enabled for error messages to 
-  be saved.
    
-
     Example 4: Debugging
    
-
    <?
-include('adodb.inc.php');	   # load code common to ADOdb
-$conn = &ADONewConnection('access');	# create a connection
-$conn->PConnect('northwind');   # connect to MS-Access, northwind dsn
-$shipto = $conn->qstr("John's Old Shoppe");
-$sql = "insert into orders (customerID,EmployeeID,OrderDate,ShipName) ";
-$sql .= "values ('ANATR',2,".$conn->FormatDate(time()).",$shipto)";
-$conn->debug = true;
-if ($conn->Execute($sql) === false) print 'error inserting';
-?>
-
    
-
    In the above example, we have turned on debugging by setting debug = true. 
-  This will display the SQL statement before execution, and also show any error 
-  messages. There is no need to call ErrorMsg() 
-  in this case. For displaying the recordset, see the rs2html() 
-  example.
    
-
    Also see the section on Custom Error Handlers.
    
-
    Example 5: MySQL and Menus
    
-
    Connect to MySQL database agora, and generate a <select> menu 
-  from an SQL statement where the <option> captions are in the 1st column, 
-  and the value to send back to the server is in the 2nd column.
    
-
    <?
-include('adodb.inc.php'); # load code common to ADOdb
-$conn = &ADONewConnection('mysql');  # create a connection
-$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
-$sql = 'select CustomerName, CustomerID from customers';
-$rs = $conn->Execute($sql);
-print $rs->GetMenu('GetCust','Mary Rosli');
-?>
    
-
    Here we define a menu named GetCust, with the menu option 'Mary Rosli' selected. 
-  See GetMenu(). 
-  We also have functions that return the recordset as an array: GetArray(), 
-  and as an associative array with the key being the first column: GetAssoc().
    
-
    Example 6: Connecting to 2 Databases At Once
    
-
    <?
-include('adodb.inc.php');	 # load code common to ADOdb
-$conn1 = &ADONewConnection('mysql');  # create a mysql connection
-$conn2 = &ADONewConnection('oracle');  # create a oracle connection
-
-$conn1->PConnect($server, $userid, $password, $database);
-$conn2->PConnect(false, $ora_userid, $ora_pwd, $oraname);
-
-$conn1->Execute('insert ...');
-$conn2->Execute('update ...');
-?>
    
-
     
-
    Example 7: Generating Update and Insert SQL
    
-ADOdb 1.31 and later supports two new recordset functions: GetUpdateSQL( ) and 
-GetInsertSQL( ). This allow you to perform a "SELECT * FROM table query WHERE...", 
-make a copy of the $rs->fields, modify the fields, and then generate the SQL to 
-update or insert into the table automatically. 
-
     We show how the functions can be used when accessing a table with the following 
-  fields: (ID, FirstName, LastName, Created). 
-
     Before these functions can be called, you need to initialize the recordset 
-  by performing a select on the table. Idea and code by Jonathan Younger jyounger#unilab.com. 
-
     
-
    <?
-#==============================================
-# SAMPLE GetUpdateSQL() and GetInsertSQL() code
-#==============================================
-include('adodb.inc.php');
-include('tohtml.inc.php');
-
-#==========================
-# This code tests an insert
-
-$sql = "SELECT * FROM ADOXYZ WHERE id = -1"; 
-# Select an empty record from the database
-
-$conn = &ADONewConnection("mysql");  # create a connection
-$conn->debug=1;
-$conn->PConnect("localhost", "admin", "", "test"); # connect to MySQL, testdb
-$rs = $conn->Execute($sql); # Execute the query and get the empty recordset
-
-$record = array(); # Initialize an array to hold the record data to insert
-
-# Set the values for the fields in the record
-# Note that field names are case-insensitive
-$record["firstname"] = "Bob";
-$record["lastNamE"] = "Smith";
-$record["creaTed"] = time();
-
-# Pass the empty recordset and the array containing the data to insert
-# into the GetInsertSQL function. The function will process the data and return
-# a fully formatted insert sql statement.
-$insertSQL = $conn->GetInsertSQL($rs, $record);
-
-$conn->Execute($insertSQL); # Insert the record into the database
-
-#==========================
-# This code tests an update
-
-$sql = "SELECT * FROM ADOXYZ WHERE id = 1"; 
-# Select a record to update
-
-$rs = $conn->Execute($sql); # Execute the query and get the existing record to update
-
-$record = array(); # Initialize an array to hold the record data to update
-
-# Set the values for the fields in the record
-# Note that field names are case-insensitive
-$record["firstname"] = "Caroline";
-$record["LasTnAme"] = "Smith"; # Update Caroline's lastname from Miranda to Smith
-
-# Pass the single record recordset and the array containing the data to update
-# into the GetUpdateSQL function. The function will process the data and return
-# a fully formatted update sql statement with the correct WHERE clause.
-# If the data has not changed, no recordset is returned
-$updateSQL = $conn->GetUpdateSQL($rs, $record);
-
-$conn->Execute($updateSQL); # Update the record in the database
-$conn->Close();
-?>
-
    
-
    Example 8: Implementing Scrolling with Next and Previous
    
-
     The following code creates a very simple recordset pager, where you can scroll 
-  from page to page of a recordset.
    
-
    -include_once('../adodb.inc.php');
-include_once('../adodb-pager.inc.php');
-session_start();
-
-$db = NewADOConnection('mysql');
-
-$db->Connect('localhost','root','','xphplens');
-
-$sql = "select * from adoxyz ";
-
-$pager = new ADODB_Pager($db,$sql);
-$pager->Render($rows_per_page=5);
    
-
    This will create a basic record pager that looks like this:  
-
     
-
-   
-    
-  
-  
-    
-  
-  
-    
-  
-
     |<   << 
-        >>   >| 
-        
    
-        
-        
-        
-        
-         
-          
-          
-          
-          
-        
-         
-          
-          
-          
-          
-        
-         
-          
-          
-          
-          
-        
-         
-          
-          
-          
-          
-        
-         
-          
-          
-          
-          
-        
-      
    IDFirst NameLast NameDate Created
    36 Alan Turing Sat 06, Oct 2001 
    37 Serena Williams Sat 06, Oct 2001 
    38 Yat Sun Sun Sat 06, Oct 2001 
    39 Wai Hun See Sat 06, Oct 2001 
    40 Steven Oey Sat 06, Oct 2001 
    Page 8/10
    
-
    The number of rows to display at one time is controled by the Render($rows) 
-  method. If you do not pass any value to Render(), ADODB_Pager will default to 
-  10 records per page. 
-
    You can control the column titles by modifying your SQL (supported by most 
-  databases): 
-
    $sql = 'select id as "ID", firstname as "First Name", 
-		  lastname as "Last Name", created as "Date Created" 
    		from adoxyz';
    
-
    The above code can be found in the adodb/tests/testpaging.php example 
-  included with this release, and the class ADODB_Pager in adodb/adodb-pager.inc.php. 
-  The ADODB_Pager code can be adapted by a programmer so that the text links can 
-  be replaced by images, and the dull white background be replaced with more interesting 
-  colors. 
-
    You can also allow display of html by setting $pager->htmlSpecialChars = false. 
-
    Some of the code used here was contributed by Iván Oliva and Cornel 
-  G. 
    
-
    Example 9: Exporting in CSV or Tab-Delimited Format
    
-
    We provide some helper functions to export in comma-separated-value (CSV) and 
-  tab-delimited formats:
    
-
    include_once('/path/to/adodb/toexport.inc.php');
    include_once('/path/to/adodb/adodb.inc.php');
    
-$db = &NewADOConnection('mysql');
    $db->Connect($server, $userid, $password, $database);

    $rs = $db->Execute('select fname as "First Name", surname as "Surname" from table');
-
-print "<pre>";
    print rs2csv($rs); # return a string, CSV format
    print '<hr>';
-
    $rs->MoveFirst(); # note, some databases do not support MoveFirst
    print rs2tab($rs,false); # return a string, tab-delimited
-						 # false == suppress field names in first line
    print '<hr>';
    $rs->MoveFirst();
    rs2tabout($rs); # send to stdout directly (there is also an rs2csvout function)
-print "</pre>";
-
-$rs->MoveFirst();
    $fp = fopen($path, "w");
-if ($fp) {
      rs2csvfile($rs, $fp); # write to file (there is also an rs2tabfile function)
-  fclose($fp);
    }
-
    
-
     Carriage-returns or newlines are converted to spaces. Field names are returned 
-  in the first line of text. Strings containing the delimiter character are quoted 
-  with double-quotes. Double-quotes are double-quoted again. This conforms to 
-  Excel import and export guide-lines. 
-
    All the above functions take as an optional last parameter, $addtitles which 
-  defaults to true. When set to false field names in the first line 
-  are suppressed. 
    
-
    Example 10: Recordset Filters
    
-
    Sometimes we want to pre-process all rows in a recordset before we use it. 
-  For example, we want to ucwords all text in recordset. 
-
    -include_once('adodb/rsfilter.inc.php');
-include_once('adodb/adodb.inc.php');
-
-// ucwords() every element in the recordset
-function do_ucwords(&$arr,$rs)
-{
-	foreach($arr as $k => $v) {
-		$arr[$k] = ucwords($v);
-	}
-}
-
-$db = NewADOConnection('mysql');
-$db->PConnect('server','user','pwd','db');
-
-$rs = $db->Execute('select ... from table');
-$rs = RSFilter($rs,'do_ucwords');
-
    
-
    The RSFilter function takes 2 parameters, the recordset, and the name 
-  of the filter function. It returns the processed recordset scrolled to 
-  the first record. The filter function takes two parameters, the current 
-  row as an array, and the recordset object. For future compatibility, you should 
-  not use the original recordset object. 
    
-
    Example 11: Smart Transactions
    
-The old way of doing transactions required you to use 
-
    -$conn->BeginTrans();
-$ok = $conn->Execute($sql);
-if ($ok) $ok = $conn->Execute($sql2);
-if (!$ok) $conn->RollbackTrans();
-else $conn->CommitTrans();
-
    
-This is very complicated for large projects because you have to track the error 
-status. Smart Transactions is much simpler. You start a smart transaction by calling 
-StartTrans(): 
-
    -$conn->StartTrans();
-$conn->Execute($sql);
-$conn->Execute($Sql2);
-$conn->CompleteTrans();
-
    
-CompleteTrans() detects when an SQL error occurs, and will Rollback/Commit as 
-appropriate. To specificly force a rollback even if no error occured, use FailTrans(). 
-Note that the rollback is done in CompleteTrans(), and not in FailTrans(). 
-
    -$conn->StartTrans();
-$conn->Execute($sql);
-if (!CheckRecords()) $conn->FailTrans();
-$conn->Execute($Sql2);
-$conn->CompleteTrans();
-
    
-
    You can also check if a transaction has failed, using HasFailedTrans(), which 
-  returns true if FailTrans() was called, or there was an error in the SQL execution. 
-  Make sure you call HasFailedTrans() before you call CompleteTrans(), as it is 
-  only works between StartTrans/CompleteTrans.
-
    Lastly, StartTrans/CompleteTrans is nestable, and only the outermost block 
-  is executed. In contrast, BeginTrans/CommitTrans/RollbackTrans is NOT nestable. 
-
    -$conn->StartTrans();
-$conn->Execute($sql);
-  $conn->StartTrans();    # ignored
-  if (!CheckRecords()) $conn->FailTrans();
-  $conn->CompleteTrans(); # ignored
-$conn->Execute($Sql2);
-$conn->CompleteTrans();
-
    
-
    Note: Savepoints are currently not supported. 
-
    Using Custom Error Handlers and PEAR_Error
    
-Apart from the old $con->debug = true; way of debugging, ADOdb 1.50 onwards provides 
-another way of handling errors using ADOdb's custom error handlers. 
-
     ADOdb provides two custom handlers which you can modify for your needs. The 
-  first one is in the adodb-errorhandler.inc.php file. This makes use of 
-  the standard PHP functions error_reporting 
-  to control what error messages types to display, and trigger_error 
-  which invokes the default PHP error handler. 
-
     Including the above file will cause trigger_error($errorstring,E_USER_ERROR) 
-  to be called when
    
-  (a) Connect() or PConnect() fails, or 
    
-  (b) a function that executes SQL statements such as Execute() or SelectLimit() 
-  has an error.
    
-  (c) GenID() appears to go into an infinite loop. 
-
     The $errorstring is generated by ADOdb and will contain useful debugging information 
-  similar to the error.log data generated below. This file adodb-errorhandler.inc.php 
-  should be included before you create any ADOConnection objects. 
-
     If you define error_reporting(0), no errors will be passed to the error handler. 
-  If you set error_reporting(E_ALL), all errors will be passed to the error handler. 
-  You still need to use ini_set("display_errors", "0" or "1") to control 
-  the display of errors. 
-
    -<?php
-error_reporting(E_ALL); # pass any error messages triggered to error handler
-include('adodb-errorhandler.inc.php');
-include('adodb.inc.php');
-include('tohtml.inc.php');
-$c = NewADOConnection('mysql');
-$c->PConnect('localhost','root','','northwind');
-$rs=$c->Execute('select * from productsz'); #invalid table productsz');
-if ($rs) rs2html($rs);
-?>
-
    
-
     If you want to log the error message, you can do so by defining the following 
-  optional constants ADODB_ERROR_LOG_TYPE and ADODB_ERROR_LOG_DEST. ADODB_ERROR_LOG_TYPE 
-  is the error log message type (see error_log 
-  in the PHP manual). In this case we set it to 3, which means log to the file 
-  defined by the constant ADODB_ERROR_LOG_DEST. 
-
    -<?php
-error_reporting(E_ALL); # report all errors
-ini_set("display_errors", "0"); # but do not echo the errors
-define('ADODB_ERROR_LOG_TYPE',3);
-define('ADODB_ERROR_LOG_DEST','C:/errors.log');
-include('adodb-errorhandler.inc.php');
-include('adodb.inc.php');
-include('tohtml.inc.php');
-
-$c = NewADOConnection('mysql');
-$c->PConnect('localhost','root','','northwind');
-$rs=$c->Execute('select * from productsz'); ## invalid table productsz
-if ($rs) rs2html($rs);
-?>
-
    
-The following message will be logged in the error.log file: 
-
    -(2001-10-28 14:20:38) mysql error: [1146: Table 'northwind.productsz' doesn't exist] in
- EXECUTE("select * from productsz")
-
    
-The second error handler is adodb-errorpear.inc.php. This will create a 
-PEAR_Error derived object whenever an error occurs. The last PEAR_Error object 
-created can be retrieved using ADODB_Pear_Error(). 
-
    -<?php
-include('adodb-errorpear.inc.php');
-include('adodb.inc.php');
-include('tohtml.inc.php');
-$c = NewADOConnection('mysql');
-$c->PConnect('localhost','root','','northwind');
-$rs=$c->Execute('select * from productsz'); #invalid table productsz');
-if ($rs) rs2html($rs);
-else {
-	$e = ADODB_Pear_Error();
-	echo '<p>',$e->message,'</p>';
-}
-?>
-
    
-
     You can use a PEAR_Error derived class by defining the constant ADODB_PEAR_ERROR_CLASS 
-  before the adodb-errorpear.inc.php file is included. For easy debugging, you 
-  can set the default error handler in the beginning of the PHP script to PEAR_ERROR_DIE, 
-  which will cause an error message to be printed, then halt script execution: 
-
    -include('PEAR.php');
-PEAR::setErrorHandling('PEAR_ERROR_DIE');
-
    
-
     Note that we do not explicitly return a PEAR_Error object to you when an error 
-  occurs. We return false instead. You have to call ADODB_Pear_Error() to get 
-  the last error or use the PEAR_ERROR_DIE technique. 
-
    Error Messages
    
-
    Error messages are outputted using the static method ADOConnnection::outp($msg,$newline=true). 
-  By default, it sends the messages to the client. You can override this to perform 
-  error-logging. 
-
     Data Source Names
    
-
    We now support connecting using PEAR style DSN's. A DSN is a connection string 
-  of the form:
    
-
    $dsn = "$driver://$username:$password@$hostname/$databasename";
    
-
    You pass the DSN to the static class function DB::Connect. An example:
    
-
       include_once('../adodb/adodb-pear.inc.php');
-   $username = 'root';
-   $password = '';
-   $hostname = 'localhost';
-   $databasename = 'xphplens';
-   $driver = 'mysql';
-   $dsn = "$driver://$username:$password@$hostname/$databasename";
    
-
       $db = DB::Connect($dsn);
       $rs = $db->Execute('select firstname,lastname from adoxyz');
-   $cnt = 0;
-   while ($arr = $rs->FetchRow()) {
-		print_r($arr); print "<br>";
-   }
    
-
    This requires PEAR to be installed and in the default include path in php.ini.
    
-
    Caching of Recordsets
    
-
    ADOdb now supports caching of recordsets using the CacheExecute( ), CachePageExecute( 
-  ) and CacheSelectLimit( ) functions. There are similar to the non-cache functions, 
-  except that they take a new first parameter, $secs2cache. 
-
     An example: 
-
    -include('adodb.inc.php'); # load code common to ADOdb
-$ADODB_CACHE_DIR = '/usr/ADODB_cache';
-$conn = &ADONewConnection('mysql');  # create a connection
-$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
-$sql = 'select CustomerName, CustomerID from customers';
-$rs = $conn->CacheExecute(15,$sql);
    
-
     The first parameter is the number of seconds to cache 
-  the query. Subsequent calls to that query will used the cached version stored 
-  in $ADODB_CACHE_DIR. To force a query to execute and flush the cache, call CacheExecute() 
-  with the first parameter set to zero. Alternatively, use the CacheFlush($sql) 
-  call. 
    
-
    For the sake of security, we recommend you set register_globals=off 
-  in php.ini if you are using $ADODB_CACHE_DIR.
    
-
    In ADOdb 1.80 onwards, the secs2cache parameter is optional in CacheSelectLimit() 
-  and CacheExecute(). If you leave it out, it will use the $connection->cacheSecs 
-  parameter, which defaults to 60 minutes. 
-
    -	$conn->Connect(...);
-	$conn->cacheSecs = 3600*24; # cache 24 hours
-	$rs = $conn->CacheExecute('select * from table');
-
    
-
    Please note that magic_quotes_runtime should be turned off. More 
-  info.  
-
    Pivot Tables
    
- 
    Since ADOdb 2.30, we support the generation of 
-SQL to create pivot tables, also known as cross-tabulations. For further explanation 
-read this DevShed Cross-Tabulation 
-tutorial. We assume that your database supports the SQL case-when expression. 
     
- 
-
    In this example, we will use the Northwind database from Microsoft. In the 
-  database, we have a products table, and we want to analyze this table by suppliers 
-  versus product categories. We will place the suppliers on each row, and 
-  pivot on categories. So from the table on the left, we generate the pivot-table 
-  on the right:
    
-     
-
-  
-	
-	
-	
-  
-
    
-	  
-		 
-		  
-		  
-		
-		 
-		  
-		  
-		
-		 
-		  
-		  			
-		
-		 
-		  			
-		  
-		
-	  
    SupplierCategory
    supplier1category1
    supplier2category1
    supplier2category2
    
-	    		 -->
-	  
-		 
-		  
-		  
-		  
-		  
-		
-		 
-		  
-		  
-		  
-		  
-		
-		 
-		  
-		  
-		  
-		  
-		
-	  
     category1category2total
    supplier1101
    supplier2112
    
-	
    
- 
-
    The following code will generate the SQL for a cross-tabulation: 
-
    -# Query the main "product" table
-# Set the rows to CompanyName
-# and the columns to the values of Categories
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
- include "adodb/pivottable.php";
- $sql = PivotTableSQL(
- 	$gDB,                                      # adodb connection
- 	'products p ,categories c ,suppliers s',   # tables
-	'CompanyName',                             # rows (multiple fields allowed)
-	'CategoryName',                            # column to pivot on 
-	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
-);
-
    
-     
-
     This will generate the following SQL:
    
-
    SELECT CompanyName, 
    
-  SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
-  
    
-  SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
-  
    
-  SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
-  
    
-  SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy 
-  Products", 
    
-  SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
-  
    
-  SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
-  
    
-  SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-  
    
-  SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-  
    
-  SUM(1) as Total 
    
-  FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID 
-  and s.SupplierID= p.SupplierID 
    
-  GROUP BY CompanyName
    
-
     You can also pivot on numerical columns and generate totals 
-	by using ranges. This code was revised in ADODB 2.41 
-	and is not backward compatible. The second example shows this:
    
-
    - $sql = PivotTableSQL(
- 	$gDB,                                       # adodb connection
- 	'products p ,categories c ,suppliers s',    # tables
-	'CompanyName',                              # rows (multiple fields allowed)
-   array(                                       # column ranges
-	' 0 '      => 'UnitsInStock <= 0',
-	"1 to 5"   => '0 < UnitsInStock and UnitsInStock <= 5',
-	"6 to 10"  => '5 < UnitsInStock and UnitsInStock <= 10',
-	"11 to 15" => '10 < UnitsInStock and UnitsInStock <= 15',
-	"16+"      => '15 < UnitsInStock'
-	),
-	' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
-	'UnitsInStock',                             # sum this field
-	'Sum '                                      # sum label prefix
-);
-
     
-
    Which generates: 
    
-
      SELECT CompanyName, 
    
-	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum 
-	0 ", 
    
-	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock 
-	ELSE 0 END) AS "Sum 1 to 5",
    
-	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock 
-	ELSE 0 END) AS "Sum 6 to 10",
    
-	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock 
-	ELSE 0 END) AS "Sum 11 to 15", 
    
-	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 
-	16+", 
    
-	SUM(UnitsInStock) AS "Sum UnitsInStock", 
    
-	SUM(1) as Total,
    
-	FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID 
-	and s.SupplierID= p.SupplierID 
    
-	GROUP BY CompanyName
    
-	     
    
-
    
-
    Class Reference
    
-
    Function parameters with [ ] around them are optional.
    
-     
-
    Global Variables
    
-
    $ADODB_COUNTRECS
    
-
    If the database driver API does not support counting the number of records 
-	returned in a SELECT statement, the function RecordCount() is emulated when 
-	the global variable $ADODB_COUNTRECS is set to true, which is the default. 
-	We emulate this by buffering the records, which can take up large amounts 
-	of memory for big recordsets. Set this variable to false for the best performance. 
-	This variable is checked every time a query is executed, so you can selectively 
-	choose which recordsets to count.
    
-
    $ADODB_CACHE_DIR
    
- 
-
    If you are using recordset caching, this is the directory to save your recordsets 
-  in. Define this before you call any caching functions such as CacheExecute( 
-  ). We recommend setting register_globals=off in php.ini if you use this 
-  feature for security reasons.
    
-
    If you are using Unix and apache, you might need to set your cache directory 
-  permissions to something similar to the following:
    
-     
-
    chown -R apache /path/to/adodb/cache
    
-  chgrp -R apache /path/to/adodb/cache 
    
-
-
    $ADODB_ANSI_PADDING_OFF
    
-
    Determines whether to right trim CHAR fields (and also VARCHAR for ibase/firebird).
-Set to true to trim. Default is false. Currently works for oci8po, ibase and firebird 
-drivers. Added in ADOdb 4.01.
-
    $ADODB_LANG
    
-
    Determines the language used in MetaErrorMsg(). The default is 'en', for English. 
-To find out what languages are supported, see the files 
-in adodb/lang/adodb-$lang.inc.php, where $lang is the supported langauge.
-
    $ADODB_FETCH_MODE
    
-
    This is a global variable that determines how arrays are retrieved by recordsets. 
-  The recordset saves this value on creation (eg. in Execute( ) or SelectLimit( 
-  )), and any subsequent changes to $ADODB_FETCH_MODE have no affect on existing 
-  recordsets, only on recordsets created in the future.
    
-
    The following constants are defined:
    
-     
-
    define('ADODB_FETCH_DEFAULT',0);
    
-  define('ADODB_FETCH_NUM',1);
    
-  define('ADODB_FETCH_ASSOC',2);
    
-  define('ADODB_FETCH_BOTH',3); 
    
- 
-
     An example: 
-
    -	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$rs1 = $db->Execute('select * from table');
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs2 = $db->Execute('select * from table');
-	print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
-	print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
-
    
-
     As you can see in the above example, both recordsets store and use different 
-	fetch modes based on the $ADODB_FETCH_MODE setting when the recordset was 
-	created by Execute().
    
-
    If no fetch mode is predefined, the fetch mode defaults to ADODB_FETCH_DEFAULT. 
-	The behaviour of this default mode varies from driver to driver, so do not 
-	rely on ADODB_FETCH_DEFAULT. For portability, we recommend sticking to ADODB_FETCH_NUM 
-	or ADODB_FETCH_ASSOC. Many drivers do not support ADODB_FETCH_BOTH.
    
-
    SetFetchMode Function
    
-
    Some programmers prefer to use a more object-oriented solution, where the fetch 
-	mode is set by a object function, SetFetchMode. 
-	Once this function is called for a connection object, that connection object 
-	will ignore the global variable $ADODB_FETCH_MODE and will use the internal 
-	fetchMode property exclusively.
    
-
    -	$db->SetFetchMode(ADODB_FETCH_NUM);
-	$rs1 = $db->Execute('select * from table');
-	$db->SetFetchMode(ADODB_FETCH_ASSOC);
-	$rs2 = $db->Execute('select * from table');
-	print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
-	print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
    
-
    To retrieve the previous fetch mode, you can use check the $db->fetchMode 
-	property, or use the return value of SetFetchMode( ). 
-
    ADODB_ASSOC_CASE
    
-
    You can control the associative fetch case for certain drivers which behave 
-	differently. For the sybase, oci8po, mssql, odbc and ibase drivers and all 
-	drivers derived from them, ADODB_ASSOC_CASE will by default generate recordsets 
-	where the field name keys are lower-cased. Use the constant ADODB_ASSOC_CASE 
-	to change the case of the keys. There are 3 possible values:
    
-
    0 = assoc lowercase field names. $rs->fields['orderid']
    
-	1 = assoc uppercase field names. $rs->fields['ORDERID']
    
-	2 = use native-case field names. $rs->fields['OrderID'] -- this is the 
-	default since ADOdb 2.90
    
-
    To use it, declare it before you incldue adodb.inc.php.
    
-
    define('ADODB_ASSOC_CASE', 2); # use native-case for ADODB_FETCH_ASSOC
    
-	include('adodb.inc.php'); 
    
-
    
-
    ADOConnection
    
-
    Object that performs the connection to the database, executes SQL statements 
-	and has a set of utility functions for standardising the format of SQL statements 
-	for issues such as concatenation and date formats.
    
-
    ADOConnection Fields
    
-
    databaseType: Name of the database system we are connecting to. Eg. 
-	odbc or mssql or mysql.
    
-
    dataProvider: The underlying mechanism used to connect to the database. 
-	Normally set to native, unless using odbc or ado.
    
-
    host: Name of server or data source name (DSN) to connect to.
    
-
    database: Name of the database or to connect to. If ado is used, it 
-	will hold the ado data provider.
    
-
    user: Login id to connect to database. Password is not saved for security 
-	reasons.
    
-
    raiseErrorFn: Allows you to define an error handling function. See adodb-errorhandler.inc.php 
-	for an example.
    
-
    debug: Set to true to make debug statements to appear.
    
-
    concat_operator: Set to '+' or '||' normally. The operator used to concatenate 
-	strings in SQL. Used by the Concat function.
    
-
    fmtDate: The format used by the DBDate 
-	function to send dates to the database. is '#Y-m-d#' for Microsoft Access, 
-	and ''Y-m-d'' for MySQL.
    
-
    fmtTimeStamp: The format used by the DBTimeStamp 
-	function to send timestamps to the database. 
    
-
    true: The value used to represent true.Eg. '.T.'. for Foxpro, '1' for 
-	Microsoft SQL.
    
-
    false:  The value used to represent false. Eg. '.F.'. for Foxpro, '0' 
-	for Microsoft SQL.
    
-
    replaceQuote: The string used to escape quotes. Eg. double single-quotes 
-	for Microsoft SQL, and backslash-quote for MySQL. Used by qstr.
    
-
    autoCommit: indicates whether automatic commit is enabled. Default is 
-	true.
    
-
    charSet: set the default charset to use. Currently only interbase supports 
-	this.
    
-
    dialect: set the default sql dialect to use. Currently only interbase 
-	supports this.
    
-
    metaTablesSQL: SQL statement to return a list of available tables. Eg. 
-	SHOW TABLES in MySQL.
    
-
    genID: The latest id generated by GenID() if supported by the database.
    
-
    cacheSecs: The number of seconds to cache recordsets if CacheExecute() 
-	or CacheSelectLimit() omit the $secs2cache parameter. Defaults to 60 minutes.
    
-
    sysDate: String that holds the name of the database function to call 
-	to get the current date. Useful for inserts and updates.
    
-
    sysTimeStamp: String that holds the name of the database function to 
-	call to get the current timestamp/datetime value.
    
-
    leftOuter: String that holds operator for left outer join, if known. 
-	Otherwise set to false.
    
-
    rightOuter: String that holds operator for left outer join, if known. 
-	Otherwise set to false.
    
-
    ansiOuter: Boolean that if true indicates that ANSI style outer joins 
-	are permitted. Eg. select * from table1 left join table2 on p1=p2.
    
-
    connectSID: Boolean that indicates whether to treat the $database parameter 
-	in connects as the SID for the oci8 driver. Defaults to false. Useful for 
-	Oracle 8.0.5 and earlier.
    
-
    autoRollback: Persistent connections are auto-rollbacked in PConnect( 
-	) if this is set to true. Default is false.
    
-
    
-
    ADOConnection Main Functions
    
-
    ADOConnection( )
    
-
    Constructor function. Do not call this directly. Use ADONewConnection( ) instead.
    
-
    Connect($host,[$user],[$password],[$database])
    
-
    Non-persistent connect to data source or server $host, using userid 
-	$user and password $password. If the server supports multiple 
-	databases, connect to database $database. 
    
-
    Returns true/false depending on connection.
    
-
    ADO Note: If you are using a Microsoft ADO and not OLEDB, you can set the $database 
-	parameter to the OLEDB data provider you are using.
    
-
    PostgreSQL: An alternative way of connecting to the database is to pass the 
-	standard PostgreSQL connection string in the first parameter $host, and the 
-	other parameters will be ignored.
    
-
    For Oracle and Oci8, there are two ways to connect. First is to use the TNS 
-	name defined in your local tnsnames.ora (or ONAMES or HOSTNAMES). Place the 
-	name in the $database field, and set the $host field to false. Alternatively, 
-	set $host to the server, and $database to the database SID, this bypassed 
-	tnsnames.ora. 
-
    Examples: 
-
     # $oraname in tnsnames.ora/ONAMES/HOSTNAMES
- $conn->Connect(false, 'scott', 'tiger', $oraname); 
- $conn->Connect('server:1521', 'scott', 'tiger', 'ServiceName'); # bypass tnsnames.ora
    
-
    There are many examples of connecting to a database at php.weblogs.com/ADOdb, 
-	and in the testdatabases.inc.php file included in the release.
    
-
    PConnect($host,[$user],[$password],[$database])
    
-
    Persistent connect to data source or server $host, using userid $user 
-	and password $password. If the server supports multiple databases, 
-	connect to database $database.
    
-
    We now perform a rollback on persistent connection for selected databases since 
-	2.21, as advised in the PHP manual. See change log or source code for which 
-	databases are affected. 
-
    Returns true/false depending on connection. See Connect( ) above for more info.
    
-
    Since ADOdb 2.21, we also support autoRollback. If you set:
    
-     
-
     $conn = &NewADOConnection('mysql');
- $conn->autoRollback = true; # default is false
- $conn->PConnect(...); # rollback here
    
-
     Then when doing a persistent connection with PConnect( ), ADOdb will 
-  perform a rollback first. This is because it is documented that PHP is 
-  not guaranteed to rollback existing failed transactions when 
-  persistent connections are used. This is implemented in Oracle, 
-  MySQL, PgSQL, MSSQL, ODBC currently. 
-
    Since ADOdb 3.11, you can force non-persistent 
-connections even if PConnect is called by defining the constant 
-ADODB_NEVER_PERSIST  before you call PConnect.
-
    NConnect($host,[$user],[$password],[$database])
    
-
    Always force a new connection. In contrast, PHP sometimes reuses connections 
-	when you use Connect() or PConnect(). Currently works only on mysql (PHP 4.3.0 
-	or later), postgresql and oci8-derived drivers. For other drivers, NConnect() works like 
-	Connect(). 
- 
-
    Execute($sql,$inputarr=false)
    
-
    Execute SQL statement $sql and return derived class of ADORecordSet 
-	if successful. Note that a record set is always returned on success, even 
-	if we are executing an insert or update statement. You can also pass in $sql a statement prepared 
-	in Prepare().
    
-
    Returns derived class of ADORecordSet. Eg. if connecting via mysql, then ADORecordSet_mysql 
-	would be returned. False is returned if there was an error in executing the 
-	sql.
    
-
    The $inputarr parameter can be used for binding variables to parameters. Below 
-	is an Oracle example:
    
-
    - $conn->Execute("SELECT * FROM TABLE WHERE COND=:val", array('val'=> $val));
- 
    
-
    Another example, using ODBC,which uses the ? convention:
    
-
    -  $conn->Execute("SELECT * FROM TABLE WHERE COND=?", array($val));
-
    
-
-Binding variables
    
-Variable binding speeds the compilation and caching of SQL statements, leading 
-to higher performance. Currently Oracle, Interbase and ODBC supports variable binding. 
-Interbase/ODBC style ? binding is emulated in databases that do not support binding. 
-Note that you do not have to quote strings if you use binding.
-
     Variable binding in the odbc, interbase and oci8po drivers. 
-
    -$rs = $db->Execute('select * from table where val=?', array('10'));
-
    
-Variable binding in the oci8 driver: 
-
    -$rs = $db->Execute('select name from table where val=:key', 
-  array('key' => 10));
-
    
-
-Bulk binding
-
    Since ADOdb 3.80, we support bulk binding in Execute(), in which you pass in a 2-dimensional array to
-be bound to an INSERT/UPDATE or DELETE statement.
-
    -$arr = array(
-	array('Ahmad',32),
-	array('Zulkifli', 24),
-	array('Rosnah', 21)
-	);
-$ok = $db->Execute('insert into table (name,age) values (?,?)',$arr);
-
    
-
    This provides very high performance as the SQL statement is prepared first. 
-The prepared statement is executed repeatedly for each array row until all rows are completed, 
-or until the first error. Very useful for importing data.
-
-
    CacheExecute([$secs2cache,]$sql,$inputarr=false)
    
-
    Similar to Execute, except that the recordset is cached for $secs2cache seconds 
-	in the $ADODB_CACHE_DIR directory, and $inputarr only accepts 1-dimensional arrays. 
-	If CacheExecute() is called again with the same $sql, $inputarr, 
-	and also the same database, same userid, and the cached recordset 
-	has not expired, the cached recordset is returned. 
-
    -  include('adodb.inc.php'); 
-  include('tohtml.inc.php');
-  $ADODB_CACHE_DIR = '/usr/local/ADOdbcache';
-  $conn = &ADONewConnection('mysql'); 
-  $conn->PConnect('localhost','userid','password','database');
-  $rs = $conn->CacheExecute(15, 'select * from table'); # cache 15 secs
-  rs2html($rs); /* recordset to html table */  
-
    
-
     Alternatively, since ADOdb 1.80, the $secs2cache parameter is optional:
    
-
    	$conn->Connect(...);
-   	$conn->cacheSecs = 3600*24; // cache 24 hours
-	$rs = $conn->CacheExecute('select * from table');
-
    
-If $secs2cache is omitted, we use the value 
-in $connection->cacheSecs (default is 3600 seconds, or 1 hour). Use CacheExecute() 
-only with SELECT statements. 
-
    Performance note: I have done some benchmarks and found that they vary so greatly 
-	that it's better to talk about when caching is of benefit. When your database 
-	server is much slower than your Web server or the database is very 
-	overloaded then ADOdb's caching is good because it reduces the load on 
-	your database server. If your database server is lightly loaded or much faster 
-	than your Web server, then caching could actually reduce performance. 
    
-
    ExecuteCursor($sql,$cursorName='rs',$parameters=false)
    
-
    Execute an Oracle stored procedure, and returns an Oracle REF cursor variable as 
-	a regular ADOdb recordset. Does not work with any other database except oci8. 
-	Thanks to Robert Tuttle for the design.
-
    -    $db = ADONewConnection("oci8"); 
-    $db->Connect("foo.com:1521", "uid", "pwd", "FOO"); 
-    $rs = $db->ExecuteCursor("begin :cursorvar := getdata(:param1); end;", 
-					'cursorvar',
-					array('param1'=>10)); 
-    # $rs is now just like any other ADOdb recordset object
        rs2html($rs);
    
-
    ExecuteCursor() is a helper function that does the following internally: 
-
    -	$stmt = $db->Prepare("BEGIN :RS := SP_FOO(); END;", true); 
-	$db->Parameter($stmt, $cur, 'RS', false, -1, OCI_B_CURSOR);
-	$rs = $db->Execute($stmt);
    
-
    SelectLimit($sql,$numrows=-1,$offset=-1,$inputarr=false)
    
-
    Returns a recordset if successful. Returns false otherwise. Performs a select 
-	statement, simulating PostgreSQL's SELECT statement, LIMIT $numrows OFFSET 
-	$offset clause.
    
-
    In PostgreSQL, SELECT * FROM TABLE LIMIT 3 will return the first 3 records 
-	only. The equivalent is $connection->SelectLimit('SELECT * FROM TABLE',3). 
-	This functionality is simulated for databases that do not possess this feature.
    
-
    And SELECT * FROM TABLE LIMIT 3 OFFSET 2 will return records 3, 4 and 5 (eg. 
-	after record 2, return 3 rows). The equivalent in ADOdb is $connection->SelectLimit('SELECT 
-	* FROM TABLE',3,2).
    
-
    Note that this is the opposite of MySQL's LIMIT clause. You can also 
-	set $connection->SelectLimit('SELECT * FROM TABLE',-1,10) to 
-	get rows 11 to the last row.
    
-
    The last parameter $inputarr is for databases that support variable binding 
-	such as Oracle oci8. This substantially reduces SQL compilation overhead. 
-	Below is an Oracle example:
    
-
    - $conn->SelectLimit("SELECT * FROM TABLE WHERE COND=:val", 100,-1,array('val'=> $val));
- 
    
-
    The oci8po driver (oracle portable driver) uses the more standard bind variable 
-	of ?: 
-
    - $conn->SelectLimit("SELECT * FROM TABLE WHERE COND=?", 100,-1,array('val'=> $val));
-
    
-
     
-
    Ron Wilson reports that SelectLimit does not work with UNIONs. 
-
    CacheSelectLimit([$secs2cache,] $sql, $numrows=-1,$offset=-1,$inputarr=false)
    
-
    Similar to SelectLimit, except that the recordset returned is cached for $secs2cache 
-	seconds in the $ADODB_CACHE_DIR directory. 
    
-
    Since 1.80, $secs2cache has been optional, and you can define the caching time 
-	in $connection->cacheSecs.
    
-     
-
    	$conn->Connect(...);
-   $conn->cacheSecs = 3600*24; // cache 24 hours
-	$rs = $conn->CacheSelectLimit('select * from table',10);
    
- 
-
    CacheFlush($sql=false,$inputarr=false)
    
-
    Flush (delete) any cached recordsets for the SQL statement $sql in $ADODB_CACHE_DIR. 
-
    If no parameter is passed in, then all adodb_*.cache files are deleted. 
-
     If you want to flush all cached recordsets manually, execute the following 
-	PHP code (works only under Unix): 
    
-	   system("rm -f `find ".$ADODB_CACHE_DIR." -name 
-	adodb_*.cache`");
    
-
    For general cleanup of all expired files, you should use crontab 
-	on Unix, or at.exe on Windows, and a shell script similar to the following:
    
-	#------------------------------------------------------ 
    
-	# This particular example deletes files in the TMPPATH 
    
-	# directory with the string ".cache" in their name that 
    
-	# are more than 7 days old. 
    
-	#------------------------------------------------------ 
    
-	AGED=7 
    
-	find ${TMPPATH} -mtime +$AGED | grep "\.cache" | xargs rm -f 
    
-	     
    
-
    MetaError($errno=false)
    
-
    Returns a virtualized error number, based on PEAR DB's error number system. You might
-need to include adodb-error.inc.php before you call this function. The parameter $errno
-is the native error number you want to convert. If you do not pass any parameter, MetaError
-will call ErrorNo() for you and convert it. If the error number cannot be virtualized, MetaError 
-will return -1 (DB_ERROR).
    
-
-
    MetaErrorMsg($errno)
    
-
    Pass the error number returned by MetaError() for the equivalent textual error message.
    
-
    ErrorMsg()
    
-
    Returns the last status or error message. This can return a string even if 
-	no error occurs. In general you do not need to call this function unless an 
-	ADOdb function returns false on an error. 
    
-
    Note: If debug is enabled, the SQL error message is always displayed 
-	when the Execute function is called.
    
-
    ErrorNo()
    
-
    Returns the last error number. Note that old versions of PHP (pre 4.0.6) do 
-	not support error number for ODBC. In general you do not need to call this 
-	function unless an ADOdb function returns false on an error.
    
-    
-
    SetFetchMode($mode)
    
-
    Sets the current fetch mode for the connection and stores 
-	it in $db->fetchMode. Legal modes are ADODB_FETCH_ASSOC and ADODB_FETCH_NUM. 
-	For more info, see $ADODB_FETCH_MODE.
    
-
    Returns the previous fetch mode, which could be false 
-	if SetFetchMode( ) has not been called before.
    
- 
-
    CreateSequence($seqName = 'adodbseq',$startID=1)
    
-
    Create a sequence. The next time GenID( ) is called, the value returned will 
-	be $startID. Added in 2.60. 
-
    DropSequenceD($seqName = 'adodbseq')
    
-
    Delete a sequence. Added in 2.60. 
-
    GenID($seqName = 'adodbseq',$startID=1)
    
-
    Generate a sequence number . Works for interbase, 
-	mysql, postgresql, oci8, oci8po, mssql, ODBC based (access,vfp,db2,etc) drivers 
-	currently. Uses $seqName as the name of the sequence. GenID() will automatically 
-	create the sequence for you if it does not exist (provided the userid has 
-	permission to do so). Otherwise you will have to create the sequence yourself. 
-
     If your database driver emulates sequences, the name of the table is the sequence 
-	name. The table has one column, "id" which should be of type integer, or if 
-	you need something larger - numeric(16). 
-
     For ODBC and databases that do not support sequences natively (eg mssql, mysql), 
-	we create a table for each sequence. If the sequence has not been defined 
-	earlier, it is created with the starting value set in $startID.
    
-
    Note that the mssql driver's GenID() before 1.90 used to generate 16 byte GUID's.
    
-
    UpdateBlob($table,$column,$val,$where)
    
-Allows you to store a blob (in $val) into $table into $column in a row at $where. 
-
     Usage: 
-
     
-
    -	# for oracle
-	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, empty_blob())');
-	$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
-	
-	# non oracle databases
-	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
-
    
-
     Returns true if succesful, false otherwise. Supported by MySQL, PostgreSQL, 
-	Oci8, Oci8po and Interbase drivers. Other drivers might work, depending on 
-	the state of development.
    
-
    Note that when an Interbase blob is retrieved using SELECT, it still needs 
-	to be decoded using $connection->DecodeBlob($blob); to derive the original 
-	value in versions of PHP before 4.1.0. 
-
    For PostgreSQL, you can store your blob using blob oid's or as a bytea field. 
-	You can use bytea fields but not blob oid's currently with UpdateBlob( ). 
-	Conversely UpdateBlobFile( ) supports oid's, but not bytea data.
    
-	
    
-	If you do not pass in an oid, then UpdateBlob() assumes that you are storing 
-	in bytea fields.
-
    UpdateClob($table,$column,$val,$where)
    
-Allows you to store a clob (in $val) into $table into $column in a row at $where. 
-Similar to UpdateBlob (see above), but for Character Large OBjects. 
-
     Usage:
-
    -	# for oracle
-	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, empty_clob())');
-	$conn->UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');
-	
-	# non oracle databases
-	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
-	$conn->UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');
-
    
-
    UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
    
-
    Similar to UpdateBlob, except that we pass in a file path to where the blob 
-	resides.
-
    For PostgreSQL, if you are using blob oid's, use this interface. This interface 
-	does not support bytea fields.
-
    Returns true if successful, false otherwise. 
-
    BlobEncode($blob) 
-
    Some databases require blob's to be encoded manually before upload. Note if 
-	you use UpdateBlob( ) or UpdateBlobFile( ) the conversion is done automatically 
-	for you and you do not have to call this function. For PostgreSQL, currently, 
-	BlobEncode() can only be used for bytea fields.
-
    Returns the encoded blob value.
-
    Note that there is a connection property called blobEncodeType which 
-	has 3 legal values: 
-
    false - no need to perform encoding or decoding.
    
-	'I' - blob encoding required, and returned encoded blob is a numeric value 
-	(no need to quote).
    
-	'C' - blob encoding required, and returned encoded blob is a character value 
-	(requires quoting).
-
    This is purely for documentation purposes, so that programs that accept multiple 
-	database drivers know what is the right thing to do when processing blobs.
-
    BlobDecode($blob) 
-
    Some databases require blob's to be decoded manually after doing a select statement. 
-	If the database does not require decoding, then this function will return 
-	the blob unchanged. Currently BlobDecode is only required for one database, 
-	PostgreSQL, and only if you are using blob oid's (if you are using bytea fields, 
-	we auto-decode for you).
-
    $rs = $db->Execute("select bloboid from postgres_table where id=$key");
-$blob = $db->BlobDecode( reset($rs->fields) );
    
-
    Replace($table, $arrFields, $keyCols,$autoQuote=false)
    
-
    Try to update a record, and if the record is not found, an insert statement 
-	is generated and executed. Returns 0 on failure, 1 if update statement worked, 
-	2 if no record was found and the insert was executed successfully. This differs 
-	from MySQL's replace which deletes the record and inserts a new record. This 
-	also means you cannot update the primary key. The only exception to this is 
-	Interbase and its derivitives, which uses delete and insert because of some 
-	Interbase API limitations. 
-
    The parameters are $table which is the table name, the $keyCols which is an 
-	associative array where the keys are the field names, and keyCols is the name 
-	of the primary key, or an array of field names if it is a compound key. If 
-	$autoQuote is set to true, then Replace() will quote all values that are non-numeric; 
-	auto-quoting will not quote nulls. Note that auto-quoting will not work if 
-	you use SQL functions or operators. 
-
    Examples: 
-
    -# single field primary key
-$ret = $db->Replace('atable', 
-	array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
-	'id',$autoquote = true);	
-# generates UPDATE atable SET firstname='Harun',lastname='Al-Rashid' WHERE id=1000
-# or INSERT INTO atable (id,firstname,lastname) VALUES (1000,'Harun','Al-Rashid')
-
-# compound key
-$ret = $db->Replace('atable2', 
-	array('firstname'=>'Harun','lastname'=>'Al-Rashid', 'age' => 33, 'birthday' => 'null'),
-	array('lastname','firstname'),
-	$autoquote = true);
-
-# no auto-quoting
-$ret = $db->Replace('atable2', 
-	array('firstname'=>"'Harun'",'lastname'=>"'Al-Rashid'", 'age' => 'null'),
-	array('lastname','firstname'));	
-
    
-
    GetUpdateSQL(&$rs, $arrFields, $forceUpdate=false,$magicq=false)
    
-
    Generate SQL to update a table given a recordset $rs, and the modified fields 
-	of the array $arrFields (which must be an associative array holding the column 
-	names and the new values) are compared with the current recordset. If $forceUpdate 
-	is true, then we also generate the SQL even if $arrFields is identical to 
-	$rs->fields. Requires the recordset to be associative. $magicq is used 
-	to indicate whether magic quotes are enabled (see qstr()). The field names in the array 
-	are case-insensitive.
    
-	
    Since 3.61, define('ADODB_FORCE_NULLS',1) and all PHP nulls will be auto-converted to SQL nulls.
-
    GetInsertSQL(&$rs, $arrFields,$magicq=false)
    
-
    Generate SQL to insert into a table given a recordset $rs. Requires the query 
-	to be associative. $magicq is used to indicate whether magic quotes are enabled 
-	(for qstr()). The field names in the array are case-insensitive.
    
-	
-
    Since 3.61, define('ADODB_FORCE_NULLS',1) and all PHP nulls will be auto-converted 
-  to SQL nulls. 
-
    PageExecute($sql, $nrows, $page, $inputarr=false) 
-
    Used for pagination of recordset. $page is 1-based. See Example 
-  8.
    
-     
-
    CachePageExecute($secs2cache, 
-  $sql, $nrows, $page, $inputarr=false) 
    
-
    Used for pagination of recordset. $page is 1-based. See 
-  Example 8. Caching version of PageExecute.
    
- 
-
    
-
    Close( )
    
-
    Close the database connection. PHP4 proudly states that we no longer have to 
-  clean up at the end of the connection because the reference counting mechanism 
-  of PHP4 will automatically clean up for us.
    
-  
    StartTrans( )
    
-  
    Start a monitored transaction. As SQL statements are executed, ADOdb will monitor
-  for SQL errors, and if any are detected, when CompleteTrans() is called, we auto-rollback.
-  
    
-  
     To understand why StartTrans() is superior to BeginTrans(), 
-  let us examine a few ways of using BeginTrans().
-  The following is the wrong way to use transactions: 
-
    -$DB->BeginTrans();
-$DB->Execute("update table1 set val=$val1 where id=$id");
-$DB->Execute("update table2 set val=$val2 where id=$id");
-$DB->CommitTrans();
-
    
-
    because you perform no error checking. It is possible to update table1 and 
-  for the update on table2 to fail. Here is a better way: 
-
    -$DB->BeginTrans();
-$ok = $DB->Execute("update table1 set val=$val1 where id=$id");
-if ($ok) $ok = $DB->Execute("update table2 set val=$val2 where id=$id");
-if ($ok) $DB->CommitTrans();
-else $DB->RollbackTrans();
-
    
-
    Another way is (since ADOdb 2.0): 
-
    -$DB->BeginTrans();
-$ok = $DB->Execute("update table1 set val=$val1 where id=$id");
-if ($ok) $ok = $DB->Execute("update table2 set val=$val2 where id=$id");
-$DB->CommitTrans($ok);
-
    
-
     Now it is a headache monitoring $ok all over the place. StartTrans() is an
-improvement because it monitors all SQL errors for you. This is particularly
-useful if you are calling black-box functions in which SQL queries might be executed.
- Also all BeginTrans, CommitTrans and RollbackTrans calls inside a StartTrans block 
-  will be disabled, so even if the black box function does a commit, it will be ignored.
-
    -$DB->StartTrans();
-CallBlackBox();
-$DB->Execute("update table1 set val=$val1 where id=$id");
-$DB->Execute("update table2 set val=$val2 where id=$id");
-$DB->CompleteTrans($ok);
-
    
-
    Note that a StartTrans blocks are nestable, the inner blocks are ignored.
- 
    CompleteTrans($autoComplete=true)
    
-  
    Complete a transaction called with StartTrans(). This function monitors
-  for SQL errors, and will commit if no errors have occured, otherwise it will rollback. 
-  Returns true on commit, false on rollback. If the parameter $autoComplete is true
-  monitor sql errors and commit and rollback as appropriate. Set $autoComplete to false 
-  to force rollback even if no SQL error detected.
-  
    FailTrans( )
    
-  
    Fail a transaction started with StartTrans(). The rollback will only occur when
-  CompleteTrans() is called.
-    
    HasFailedTrans( )
    
-	
    Check whether smart transaction has failed, 
-	eg. returns true if there was an error in SQL execution or FailTrans() was called.
-	If not within smart transaction, returns false.
-
    BeginTrans( )
    
-
    Begin a transaction. Turns off autoCommit. Returns true if successful. Some 
-  databases will always return false if transaction support is not available. 
-   Any open transactions will be rolled back when the connection is closed. Among the
-   databases that support transactions are Oracle, PostgreSQL, Interbase, MSSQL, certain
-    versions of MySQL, DB2, Informix, Sybase, etc.
    
- 
    Note that StartTrans() and CompleteTrans() is a superior method of 
- handling transactions, available since ADOdb 3.40. For a explanation, see the StartTrans() documentation.
-
-
    You can also use the ADOdb error handler to die 
-  and rollback your transactions for you transparently. Some buggy database extensions 
-  are known to commit all outstanding tranasactions, so you might want to explicitly 
-  do a $DB->RollbackTrans() in your error handler for safety. 
- 
    Detecting Transactions
    
- 
    Since ADOdb 2.50, you are able to detect when you are inside a transaction. Check
- that $connection->transCnt > 0. This variable is incremented whenever BeginTrans() is called,
- and decremented whenever RollbackTrans() or CommitTrans() is called.
-
    CommitTrans($ok=true)
    
-
    End a transaction successfully. Returns true if successful. If the database 
-  does not support transactions, will return true also as data is always committed. 
-
    
-
    If you pass the parameter $ok=false, the data is rolled back. See example in 
-  BeginTrans().
    
-
    RollbackTrans( )
    
-
    End a transaction, rollback all changes. Returns true if successful. If the 
-  database does not support transactions, will return false as data is never rollbacked. 
-
    
-     
-
    GetAssoc($sql,$inputarr=false,$force_array=false,$first2cols=false)
    
-
    Returns an associative array for the given query $sql with optional bind parameters 
-  in $inputarr. If the number of columns returned is greater to two, a 2-dimensional 
-  array is returned, with the first column of the recordset becomes the keys 
-  to the rest of the rows. If the columns is equal to two, a 1-dimensional array 
-  is created, where the the keys directly map to the values (unless $force_array 
-  is set to true, when an array is created for each value).
-
     Examples:
    
-    
-
    We have the following data in a recordset:
    
-
    row1: Apple, Fruit, Edible
    
-  row2: Cactus, Plant, Inedible
    
-  row3: Rose, Flower, Edible
    
-
    GetAssoc will generate the following 2-dimensional associative 
-  array:
    
-
    Apple => array[Fruit, Edible]
    
-  Cactus => array[Plant, Inedible]
    
-  Rose => array[Flower,Edible]
    
-
    If the dataset is:
    
-
    row1: Apple, 
-  Fruit
    
-  row2: Cactus, Plant
    
-  row3: Rose, Flower     
    
-
    GetAssoc will generate the following 
-  1-dimensional associative array (with $force_array==false):
    
-
    Apple => Fruit
    
-  Cactus=>Plant
    
-  Rose=>Flower  
    
-
    The function returns:
    
-
    The associative array, or false if an error occurs.
    
-
-
    CacheGetAssoc([$secs2cache,] $sql,$inputarr=false,$force_array=false,$first2cols=false)
    
-     
-
    Caching version of GetAssoc function above.
-
    GetOne($sql,$inputarr=false)
    
-
    Executes the SQL and returns the first field of the first row. The recordset 
-  and remaining rows are discarded for you automatically. If an error occur, false 
-  is returned.
    
-
    GetRow($sql,$inputarr=false)
    
-
    Executes the SQL and returns the first row as an array. The recordset and remaining 
-  rows are discarded for you automatically. If an error occurs, false is returned.
    
-
    GetAll($sql)
    
-    
-
    Executes the SQL and returns the all the rows as a 2-dimensional 
-  array. The recordset is discarded for you automatically. If an error occurs, 
-  false is returned.
    
- 
    GetCol($sql,$inputarr=false,$trim=false)
    
-
-
    Executes the SQL and returns all elements of the first column as a 
-1-dimensional array. The recordset is discarded for you automatically. If an error occurs, 
-  false is returned.
    
-
    CacheGetOne([$secs2cache,] 
-  $sql,$inputarr=false), CacheGetRow([$secs2cache,] $sql,$inputarr=false), CacheGetAll([$secs2cache,] 
-  $sql,$inputarr=false), CacheGetCol([$secs2cache,] 
-  $sql,$inputarr=false,$trim=false)
    
- 
-
    Similar to above Get* functions, except that the recordset is serialized and 
-  cached in the $ADODB_CACHE_DIR directory for $secs2cache seconds. Good for speeding 
-  up queries on rarely changing data. Note that the $secs2cache parameter is optional. 
-  If omitted, we use the value in $connection->cacheSecs (default is 3600 seconds, 
-  or 1 hour).
    
-
    Prepare($sql )
    
-     
-
    Prepares (compiles) an SQL query for repeated execution. Bind parameters
-are denoted by ?, except for the oci8 driver, which uses the traditional Oracle :varname
-convention. 
-  
    
-
    Returns an array containing the original sql statement 
-  in the first array element; the remaining elements of the array are driver dependent. 
-  If there is an error, or we are emulating Prepare( ), we return the original 
-  $sql string. This is because all error-handling has been centralized in Execute( 
-  ).
    
-
    Prepare( ) cannot be used with functions that use SQL 
-  query rewriting techniques, e.g. PageExecute( ) and SelectLimit( ).
    
-
    Example:
    
-
    $stmt = $DB->Prepare('insert into table (col1,col2) values (?,?)');
-for ($i=0; $i < $max; $i++)
    	$DB->Execute($stmt,array((string) rand(), $i));
-
    
- 
-
    Also see InParameter(), OutParameter() and PrepareSP() below. Only supported internally by interbase, 
-  oci8 and selected ODBC-based drivers, otherwise it is emulated. There is no 
-  performance advantage to using Prepare() with emulation. 
-
     Important: Due to limitations or bugs in PHP, if you are getting errors when 
-  you using prepared queries, try setting $ADODB_COUNTRECS = false before preparing. 
-  This behaviour has been observed with ODBC. 
-
    IfNull($field, $nullReplacementValue)
    
-
    Portable IFNULL function (NVL in Oracle). Returns a string that represents 
-  the function that checks whether a $field is null for the given database, and 
-  if null, change the value returned to $nullReplacementValue. Eg.
    
-
    $sql = 'SELECT '.$db->IfNull('name', "'- unknown -'"). ' FROM table';
    
-
-
    length
    
-
    This is not a function, but a property. Some databases have "length" and others "len"
-as the function to measure the length of a string. To use this property:
-
    -  $sql = "SELECT ".$db->length."(field) from table";
-  $rs = $db->Execute($sql);
-
    
-
-
    random
    
-
    This is not a function, but a property. This is a string that holds the sql to
-generate a random number between 0.0 and 1.0 inclusive.
-
-
    substr
    
-
    This is not a function, but a property. Some databases have "substr" and others "substring"
-as the function to retrieve a sub-string. To use this property:
-
    -  $sql = "SELECT ".$db->substr."(field, $offset, $length) from table";
-  $rs = $db->Execute($sql);
-
    
-
    For all databases, the 1st parameter of substr is the field, the 2nd is the
-offset (1-based) to the beginning of the sub-string, and the 3rd is the length of the sub-string.
-
-
-
    Param($name )
    
-
    Generates a bind placeholder portably. For most databases, the bind placeholder 
-  is "?". However some databases use named bind parameters such as Oracle, eg 
-  ":somevar". This allows us to portably define an SQL statement with bind parameters: 
-
    $sql = 'insert into table (col1,col2) values ('.$DB->Param('a').','.$DB->Param('b').')';
-# generates 'insert into table (col1,col2) values (?,?)'
-# or        'insert into table (col1,col2) values (:a,:b)'
-$stmt = $DB->Prepare($sql);
-$stmt = $DB->Execute($stmt,array('one','two'));
-
    
- 
-
    
-
    PrepareSP($sql)
    
-
    When calling stored procedures in mssql and oci8 (oracle), and you might want 
-  to directly bind to parameters that return values, or for special LOB handling. 
-  PrepareSP() allows you to do so. 
-
    Returns the same array or $sql string as Prepare( ) above. If you do not need 
-  to bind to return values, you should use Prepare( ) instead.
    
-
    For examples of usage of PrepareSP( ), see InParameter( ) below. 
-
    Note: in the mssql driver, preparing stored procedures requires a special function 
-  call, mssql_init( ), which is called by this function. PrepareSP( ) is available 
-  in all other drivers, and is emulated by calling Prepare( ). 
    
-
     InParameter($stmt, $var, $name,
-  $maxLen = 4000, $type = false )
    
-Binds a PHP variable as input to a stored procedure variable. The parameter $stmt
- is the value returned by PrepareSP(), $var is the PHP variable you want to bind, $name
- is the name of the stored procedure variable. Optional is $maxLen, the maximum length of the
- data to bind, and $type which is database dependant. 
- Consult mssql_bind and ocibindbyname docs
-  at php.net for more info on legal values for $type. 
- 
    
-InParameter() is a wrapper function that calls Parameter() with $isOutput=false. 
-The advantage of this function is that it is self-documenting, because
-the $isOutput parameter is no longer needed.  Only for mssql 
-  and oci8 currently.
-  
    Here is an example using oci8:
-  
    # For oracle, Prepare and PrepareSP are identical
-$stmt = $db->PrepareSP(
-	"declare RETVAL integer; 
-	begin
-	:RETVAL := SP_RUNSOMETHING(:myid,:group);
-	end;");
-$db->InParameter($stmt,$id,'myid');
-$db->InParameter($stmt,$group,'group',64);
-$db->OutParameter($stmt,$ret,'RETVAL');
    $db->Execute($stmt);
-
    
-
     The same example using mssql:
    
-     
-
    # @RETVAL = SP_RUNSOMETHING @myid,@group
-$stmt = $db->PrepareSP('SP_RUNSOMETHING'); 
    # note that the parameter name does not have @ in front!
-$db->InParameter($stmt,$id,'myid');
-$db->InParameter($stmt,$group,'group',64);
-# return value in mssql - RETVAL is hard-coded name 
-$db->OutParameter($stmt,$ret,'RETVAL');
-$db->Execute($stmt); 
    
-
-
    Note that the only difference between the oci8 and mssql implementations is $sql.
    
-  
    
- If $type parameter is set to false, in mssql, $type will be dynamicly determined 
-based on the type of the PHP variable passed (string 
-=> SQLCHAR, boolean =>SQLINT1, integer =>SQLINT4 or float/double=>SQLFLT8).
-
     
-In oci8, $type can be set to OCI_B_FILE (Binary-File), OCI_B_CFILE (Character-File), 
-OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). To 
-pass in a null, use $db->Parameter($stmt, 
-$null=null, 'param'). 
-  
     OutParameter($stmt, $var, $name, 
-  $maxLen = 4000, $type = false )
    
-  Binds a PHP variable as output from a stored procedure variable. The parameter $stmt
- is the value returned by PrepareSP(), $var is the PHP variable you want to bind, $name
- is the name of the stored procedure variable. Optional is $maxLen, the maximum length of the
- data to bind, and $type which is database dependant. 
-  
    
-  OutParameter() is a wrapper function that calls Parameter() with $isOutput=true. 
-  The advantage of this function is that it is self-documenting, because
-the $isOutput parameter is no longer needed.  Only for mssql 
-  and oci8 currently.
-
    
-For an example, see InParameter.
-
-
     Parameter($stmt, $var, $name, $isOutput=false, 
-  $maxLen = 4000, $type = false )
    
-
    Note: This function is deprecated, because of the new InParameter() and OutParameter() functions.
-These are superior because they are self-documenting, unlike Parameter().
-
    Adds a bind parameter suitable for return values or special data handling (eg. 
-  LOBs) after a statement has been prepared using PrepareSP(). Only for mssql 
-  and oci8 currently. The parameters are:
    
-  
    
-  $stmt Statement returned by Prepare() or PrepareSP().
    
-  $var PHP variable to bind to. Make sure you pre-initialize it!
    
-  $name Name of stored procedure variable name to bind to.
    
-  [$isOutput] Indicates direction of parameter 0/false=IN 1=OUT 
-  2= IN/OUT. This is ignored in oci8 as this driver auto-detects the direction.
    
-  [$maxLen] Maximum length of the parameter variable.
    
-  [$type] Consult mssql_bind and 
-  ocibindbyname docs at php.net for 
-  more info on legal values for type.
    
-
    Lastly, in oci8, bind parameters can be reused without calling PrepareSP( ) 
-  or Parameters again. This is not possible with mssql. An oci8 example:
    
-
    $id = 0; $i = 0;
-$stmt = $db->PrepareSP( "update table set val=:i where id=:id");
-$db->Parameter($stmt,$id,'id');
-$db->Parameter($stmt,$i, 'i');
-for ($cnt=0; $cnt < 1000; $cnt++) {
-	$id = $cnt; 
    	$i = $cnt * $cnt; # works with oci8!
-	$db->Execute($stmt); 
    }
    
-
    Bind($stmt, $var, $size=4001, $type=false, $name=false)
    
-     
-
    This is a low-level function supported only by the oci8 
-  driver. Avoid using unless you only want to support Oracle. The Parameter( 
-  ) function is the recommended way to go with bind variables.
    
-
    Bind( ) allows you to use bind variables in your sql 
-  statement. This binds a PHP variable to a name defined in an Oracle sql statement 
-  that was previously prepared using Prepare(). Oracle named variables begin with 
-  a colon, and ADOdb requires the named variables be called :0, :1, :2, :3, etc. 
-  The first invocation of Bind() will match :0, the second invocation will match 
-  :1, etc. Binding can provide 100% speedups for insert, select and update statements. 
-  
    
-
    The other variables, $size sets the buffer size for data storage, $type is 
-  the optional descriptor type OCI_B_FILE (Binary-File), OCI_B_CFILE (Character-File), 
-  OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). 
-  Lastly, instead of using the default :0, :1, etc names, you can define your 
-  own bind-name using $name. 
-
    The following example shows 3 bind variables being used: 
-  p1, p2 and p3. These variables are bound to :0, :1 and :2.
    
-
    $stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
-$DB->Bind($stmt, $p1);
-$DB->Bind($stmt, $p2);
-$DB->Bind($stmt, $p3);
-for ($i = 0; $i < $max; $i++) { 
-   $p1 = ?; $p2 = ?; $p3 = ?;
-   $DB->Execute($stmt);
-}
    
-
    You can also use named variables:
    
-
    -$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:name0, :name1, :name2)");
-$DB->Bind($stmt, $p1, "name0");
-$DB->Bind($stmt, $p2, "name1");
-$DB->Bind($stmt, $p3, "name2");
-for ($i = 0; $i < $max; $i++) { 
-   $p1 = ?; $p2 = ?; $p3 = ?;
-   $DB->Execute($stmt);
-}
    
-
    LogSQL($enable=true)
    
-Call this method to install a SQL logging and timing function (using fnExecute). 
-Then all SQL statements are logged into an adodb_logsql table in a database. If 
-the adodb_logsql table does not exist, ADOdb will create the table if you have 
-the appropriate permissions. Returns the previous logging value (true for enabled, 
-false for disabled). Here are samples of the DDL for selected databases: 
-
     
-
    -		mysql:
-		CREATE TABLE adodb_logsql (
-		  created datetime NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 text NOT NULL,
-		  params text NOT NULL,
-		  tracer text NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)
-		
-		postgres:
-		CREATE TABLE adodb_logsql (
-		  created timestamp NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 text NOT NULL,
-		  params text NOT NULL,
-		  tracer text NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)
-		
-		mssql:
-		CREATE TABLE adodb_logsql (
-		  created datetime NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 varchar(4000) NOT NULL,
-		  params varchar(3000) NOT NULL,
-		  tracer varchar(500) NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)
-		
-		oci8:
-		CREATE TABLE adodb_logsql (
-		  created date NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 varchar(4000) NOT NULL,
-		  params varchar(4000),
-		  tracer varchar(4000),
-		  timer decimal(16,6) NOT NULL
-		)
-
    
-Usage: 
-
    -	$conn->LogSQL(); // turn on logging
-	  :
-	$conn->Execute(...);
-	  :
-	$conn->LogSQL(false); // turn off logging
-	
-	# output summary of SQL logging results
-	$perf = NewPerfMonitor($conn);
-	echo $perf->SuspiciousSQL();
-	echo $perf->ExpensiveSQL();
-
    
-
    One limitation of logging is that rollback also prevents SQL from being logged.
-
    
-If you prefer to use another name for the table used to store the SQL, you can override it by calling 
-adodb_perf::table($tablename), where $tablename is the new table name (you will still need to manually
-create the table yourself). An example:
-
    -	include('adodb.inc.php');
-	include('adodb-perf.inc.php');
-	adodb_perf::table('my_logsql_table');
-
    
-Also see Performance Monitor. 
-
    fnExecute and fnCacheExecute properties
    
-
    These two properties allow you to define bottleneck functions for all sql statements 
-  processed by ADOdb. This allows you to perform statistical analysis and query-rewriting 
-  of your sql. 
-
    Examples of fnExecute
    
-
    Here is an example of using fnExecute, to count all cached queries and non-cached 
-  queries, you can do this:
    
-
    # $db is the connection object
-function CountExecs($db, $sql, $inputarray)
-{
-global $EXECS;
-
-if (!is_array(inputarray)) $EXECS++;
-# handle 2-dimensional input arrays
-else if (is_array(reset($inputarray))) $EXECS += sizeof($inputarray);
-else $EXECS++;
-}
-
-# $db is the connection object
-function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
-{
    global $CACHED; $CACHED++;
-}
-
    $db = NewADOConnection('mysql');
-$db->Connect(...);
-$db->fnExecute = 'CountExecs';
-$db->fnCacheExecute = 'CountCachedExecs';
- :
- :
    # After many sql statements:`
-printf("<p>Total queries=%d; total cached=%d</p>",$EXECS+$CACHED, $CACHED);
-
    
-
    The fnExecute function is called before the sql is parsed and executed, so 
-  you can perform a query rewrite. If you are passing in a prepared statement, 
-  then $sql is an array (see Prepare). The fnCacheExecute 
-  function is only called if the recordset returned was cached. 
-  The function parameters match the Execute and CacheExecute functions respectively, 
-  except that $this (the connection object) is passed as the first parameter.
    
-
    Since ADOdb 3.91, the behaviour of fnExecute varies depending on whether the 
-  defined function returns a value. If it does not return a value, then the $sql 
-  is executed as before. This is useful for query rewriting or counting sql queries. 
-
     On the other hand, you might want to replace the Execute function with one 
-  of your own design. If this is the case, then have your function return a value. 
-  If a value is returned, that value is returned immediately, without any further 
-  processing. This is used internally by ADOdb to implement LogSQL() functionality. 
-
      
-
    
-
    ADOConnection Utility Functions
    
-
    BlankRecordSet([$queryid])
    
-
    No longer available - removed since 1.99.
    
-
    Concat($s1,$s2,....)
    
-
    Generates the sql string used to concatenate $s1, $s2, etc together. Uses the 
-  string in the concat_operator field to generate the concatenation. Override 
-  this function if a concatenation operator is not used, eg. MySQL.
    
-
    Returns the concatenated string.
    
-
    DBDate($date)
    
-
    Format the $date in the format the database accepts. This is used in 
-  INSERT/UPDATE statements; for SELECT statements, use SQLDate. 
-  The $date parameter can be a Unix integer timestamp or an ISO format 
-  Y-m-d. Uses the fmtDate field, which holds the format to use. If null or false 
-  or '' is passed in, it will be converted to an SQL null.
    
-
    Returns the date as a quoted string.
    
-
    DBTimeStamp($ts)
    
-
    Format the timestamp $ts in the format the database accepts; this can 
-  be a Unix integer timestamp or an ISO format Y-m-d H:i:s. Uses the fmtTimeStamp 
-  field, which holds the format to use. If null or false or '' is passed in, it 
-  will be converted to an SQL null.
    
-
    Returns the timestamp as a quoted string.
    
-
    qstr($s,[$magic_quotes_enabled=false])
    
-
    Quotes a string to be sent to the database. The $magic_quotes_enabled 
-  parameter may look funny, but the idea is if you are quoting a string extracted 
-  from a POST/GET variable, then pass get_magic_quotes_gpc() as the second parameter. 
-  This will ensure that the variable is not quoted twice, once by qstr 
-  and once by the magic_quotes_gpc.
    
-
    Eg. $s = $db->qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());
    
-
    Returns the quoted string.
    
-
    Quote($s)
    
-
    Quotes the string $s, escaping the database specific quote character as appropriate. 
-  Formerly checked magic quotes setting, but this was disabled since 3.31 for 
-  compatibility with PEAR DB. 
-
    Affected_Rows( )
    
-
    Returns the number of rows affected by a update or delete statement. Returns 
-  false if function not supported.
    
-
    Not supported by interbase/firebird currently. 
    
-
    Insert_ID( )
    
-
    Returns the last autonumbering ID inserted. Returns false if function not supported. 
-
    
-
    Only supported by databases that support auto-increment or object id's, such 
-  as PostgreSQL, MySQL and MS SQL Server currently. PostgreSQL returns the OID, which 
-  can change on a database reload.
    
-
    RowLock($table,$where)
    
-
    Lock a table row for the duration of a transaction. For example to lock record $id in table1:
-
    -	$DB->StartTrans();
-	$DB->RowLock("table1","rowid=$id");
-	$DB->Execute($sql1);
-	$DB->Execute($sql2);
-	$DB->CompleteTrans();
-
    
-
    Supported in db2, interbase, informix, mssql, oci8, postgres, sybase.
-
    MetaDatabases()
    
-
    Returns a list of databases available on the server as an array. You have to 
-  connect to the server first. Only available for ODBC, MySQL and ADO.
    
-
    MetaTables($ttype = false, $showSchema = false, 
-  $mask=false)
    
-
    Returns an array of tables and views for the current database as an array. 
-  The array should exclude system catalog tables if possible. To only show tables, 
-  use $db->MetaTables('TABLES'). To show only views, use $db->MetaTables('VIEWS'). 
-  The $showSchema parameter currently works only for DB2, and when set to true, 
-  will add the schema name to the table, eg. "SCHEMA.TABLE". 
    
-
    You can define a mask for matching. For example, setting $mask = 'TMP%' will 
-  match all tables that begin with 'TMP'. Currently only mssql, oci8, odbc_mssql 
-  and postgres* support $mask. 
-
    MetaColumns($table,$toupper=true)
    
-
    Returns an array of ADOFieldObject's, one field object for every column of 
-  $table. A field object is a class instance with (name, type, max_length) defined.
-  Currently Sybase does not recognise date types, and ADO cannot identify 
-  the correct data type (so we default to varchar).   
- 
     The $toupper parameter determines whether we uppercase the table name 
- (required for some databases).
- 
    For schema support, pass in the $table parameter, "$schema.$tablename". This is only
- supported for selected databases.
-
    MetaColumnNames($table)
    
-
    Returns an array of column names for $table. 
-
    MetaPrimaryKeys($table, 
-  $owner=false) 
-
    Returns an array containing column names that are the 
-  primary keys of $table. Supported by mysql, odbc (including db2, odbc_mssql, 
-  etc), mssql, postgres, interbase/firebird, oci8 currently.  
-
    Views (and some tables) have primary keys, but sometimes this information is not available from the
-database. You can define a function  ADODB_View_PrimaryKeys($databaseType, $database, $view, $owner) that
-should return an array containing the fields that make up the primary key. If that function exists,
-it will be called when MetaPrimaryKeys() cannot find a primary key for a table or view.
-
    -// In this example: dbtype = 'oci8', $db = 'mydb', $view = 'dataView', $owner = false 
-function ADODB_View_PrimaryKeys($dbtype,$db,$view,$owner)
-{
-	switch(strtoupper($view)) {
-	case 'DATAVIEW': return array('DATAID');
-	default: return false;
-	}
-}
-
-$db = NewADOConnection('oci8');
-$db->Connect('localhost','root','','mydb'); 
-$db->MetaPrimaryKeys('dataView');
-
    
-
    ServerInfo($table) 
-
    Returns an array of containing two elements 'description' 
-  and 'version'. The 'description' element contains the string description of 
-  the database. The 'version' naturally holds the version number (which is also 
-  a string). 
-
    MetaForeignKeys($table, $owner=false, $upper=false) 
-
    Returns an associate array of foreign keys, or false if not supported. For 
-  example, if table employee has a foreign key where employee.deptkey points to 
-  dept_table.deptid, and employee.posn=posn_table.postionid and employee.poscategory=posn_table.category, 
-  then $conn->MetaForeignKeys('employee') will return 
-
    -	array(
-		'dept_table' => array('deptkey=deptid'),
-		'posn_table' => array('posn=positionid','poscategory=category')
-	)
-
    
-
    The optional schema or owner can be defined in $owner. If $upper is true, then 
-  the table names (array keys) are upper-cased. 
-
    
-
    ADORecordSet
    
-
    When an SQL statement successfully is executed by ADOConnection->Execute($sql),an 
-  ADORecordSet object is returned. This object contains a virtual cursor so we 
-  can move from row to row, functions to obtain information about the columns 
-  and column types, and helper functions to deal with formating the results to 
-  show to the user.
    
-
    ADORecordSet Fields
    
-
    fields: Array containing the current row. This is not associative, but 
-  is an indexed array from 0 to columns-1. See also the function Fields, 
-  which behaves like an associative array.
    
-
    dataProvider: The underlying mechanism used to connect to the database. 
-  Normally set to native, unless using odbc or ado.
    
-
    blobSize: Maximum size of a char, string or varchar object before it 
-  is treated as a Blob (Blob's should be shown with textarea's). See the MetaType 
-  function.
    
-
    sql: Holds the sql statement used to generate this record set.
    
-
    canSeek: Set to true if Move( ) function works.
    
-
    EOF: True if we have scrolled the cursor past the last record.
    
-
    ADORecordSet Functions
    
-
    ADORecordSet( )
    
-
    Constructer. Normally you never call this function yourself.
    
-
    GetAssoc([$force_array])
    
-
    Generates an associative array from the recordset. Note that is this function 
-  is also available in the connection object. More details 
-  can be found there.
    
-     
-
    GetArray([$number_of_rows])
    
-
    Generate a 2-dimensional array of records from the current cursor position, 
-  indexed from 0 to $number_of_rows - 1. If $number_of_rows is undefined, till 
-  EOF.
    
-
    GetRows([$number_of_rows])
    
-Generate a 2-dimensional array of records from the current cursor position. Synonym 
-for GetArray() for compatibility with Microsoft ADO. 
-
     GetMenu($name, [$default_str=''], [$blank1stItem=true], 
-  [$multiple_select=false], [$size=0], [$moreAttr=''])
    
-
    Generate a HTML menu (<select><option><option></select>). 
-  The first column of the recordset (fields[0]) will hold the string to display 
-  in the option tags. If the recordset has more than 1 column, the second column 
-  (fields[1]) is the value to send back to the web server.. The menu will be given 
-  the name $name. 
-
     If $default_str is defined, then if $default_str == fields[0], 
-  that field is selected. If $blank1stItem is true, the first option is 
-  empty. You can also set the first option strings by setting $blank1stItem = 
-  "$value:$text".
    
-
    $Default_str can be array for a multiple select listbox.
    
-
    To get a listbox, set the $size to a non-zero value (or pass $default_str 
-  as an array). If $multiple_select is true then a listbox will be generated 
-  with $size items (or if $size==0, then 5 items) visible, and we will 
-  return an array to a server. Lastly use $moreAttr  to add additional 
-  attributes such as javascript or styles. 
    
-
    Menu Example 1: GetMenu('menu1','A',true) will generate a menu: 
-  
-  for the data (A,1), (B,2), (C,3). Also see example 5.
    
-
    Menu Example 2: For the same data, GetMenu('menu1',array('A','B'),false) 
-  will generate a menu with both A and B selected: 
    
-  
-
     GetMenu2($name, [$default_str=''], [$blank1stItem=true], 
-  [$multiple_select=false], [$size=0], [$moreAttr=''])
    
-
    This is nearly identical to GetMenu, except that the $default_str is 
-  matched to fields[1] (the option values).
    
-
    Menu Example 3: Given the data in menu example 2, GetMenu2('menu1',array('1','2'),false) 
-  will generate a menu with both A and B selected in menu example 2, but this 
-  time the selection is based on the 2nd column, which holds the values to return 
-  to the Web server. 
-
    UserDate($str, [$fmt])
    
-
    Converts the date string $str to another format. The date format is Y-m-d,
-or Unix timestamp format. The default $fmt is Y-m-d.
    
-
    UserTimeStamp($str, [$fmt])
    
-
    Converts the timestamp string $str to another format. The timestamp 
-  format is Y-m-d H:i:s, as in '2002-02-28 23:00:12', or Unix timestamp format.
-   UserTimeStamp calls UnixTimeStamp to parse $str, and $fmt defaults to Y-m-d H:i:s if not defined. 
-
    
-
    UnixDate($str)
    
-
    Parses the date string $str and returns it in unix mktime format (eg. 
-  a number indicating the seconds after January 1st, 1970). Expects the date to 
-  be in Y-m-d H:i:s format, except for Sybase and Microsoft SQL Server, where 
-  M d Y is also accepted (the 3 letter month strings are controlled by a global 
-  array, which might need localisation).
    
-
    This function is available in both ADORecordSet and ADOConnection since 1.91.
    
-
    UnixTimeStamp($str)
    
-
    Parses the timestamp string $str and returns it in unix mktime format 
-  (eg. a number indicating the seconds after January 1st, 1970). Expects the date 
-  to be in "Y-m-d, H:i:s" (1970-12-24, 00:00:00) or "Y-m-d H:i:s" (1970-12-24 00:00:00) or "YmdHis" (19701225000000) format, except for Sybase and Microsoft SQL Server, where 
-  "M d Y h:i:sA" (Dec 25 1970 00:00:00AM) is also accepted (the 3 letter month strings are controlled by 
-  a global array, which might need localisation).
    
-     
-
    This function is available in both ADORecordSet and ADOConnection 
-  since 1.91. 
    
-
    OffsetDate($dayFraction, 
-  $basedate=false)
    
-
    Returns a string with the 
-  native SQL functions to calculate future and past dates based on $basedate in 
-  a portable fashion. If $basedate is not defined, then the current date (at 12 
-  midnight) is used. Returns the SQL string that performs the calculation when 
-  passed to Execute(). 
    
-
    For example, in Oracle, to find the date and time that 
-  is 2.5 days from today, you can use:
    
-
    # get date one week from now
-$fld = $conn->OffsetDate(7); // returns "(trunc(sysdate)+7")
    
-
    # get date and time that is 60 hours from current date and time
-$fld = $conn->OffsetDate(2.5, $conn->sysTimeStamp);	// returns "(sysdate+2.5)"
-
-$conn->Execute("UPDATE TABLE SET dodate=$fld WHERE ID=$id");
    
-
     This function is available for mysql, mssql, oracle, oci8 and postgresql drivers 
-  since 2.13. It might work with other drivers provided 
-  they allow performing numeric day arithmetic on dates.
    
- 
-
    SQLDate($dateFormat, $basedate=false)
    
-Returns a string which contains the native SQL functions to format a date or date 
-column $basedate. This is used in SELECT statements. For INSERT/UPDATE statements, 
-use DBDate. It uses a case-sensitive $dateFormat, which 
-supports: 
-
    - Y: 4-digit Year
- Q: Quarter (1-4)
- m: Month (01-12)
- d: Day (01-31)
- H: Hour (00-23)
- h: Hour (1-12)
- i: Minute (00-59)
- s: Second (00-60)
- A: AM/PM indicator
    
-
    All other characters are treated as strings. You can also use \ to escape characters. 
-  Available on selected databases, including mysql, postgresql, mssql, oci8 and 
-  DB2. 
-
    This is useful in writing portable sql statements that GROUP BY on dates. For 
-  example to display total cost of goods sold broken by quarter (dates are stored 
-  in a field called postdate): 
-
    - $sqlfn = $db->SQLDate('Y-\QQ','postdate'); # get sql that formats postdate to output 2002-Q1
- $sql = "SELECT $sqlfn,SUM(cogs) FROM table GROUP BY $sqlfn ORDER BY 1 desc";
- 
    
-
    MoveNext( )
    
-
    Move the internal cursor to the next row. The $this->fields array is 
-  automatically updated. Returns false if unable to do so (normally because EOF 
-  has been reached), otherwise true. 
-
     If EOF is reached, then the $this->fields array is set to false (this was 
-  only implemented consistently in ADOdb 3.30). For the pre-3.30 behaviour of 
-  $this->fields (at EOF), set the global variable $ADODB_COMPAT_FETCH = true.
    
-
    Example:
    
-
    $rs = $db->Execute($sql);
-if ($rs) 
-	while (!$rs->EOF) {
- 		ProcessArray($rs->fields);	
-		$rs->MoveNext();
-	} 
    
-
    Move($to)
    
-
    Moves the internal cursor to a specific row $to. Rows are zero-based 
-  eg. 0 is the first row. The fields array is automatically updated. For 
-  databases that do not support scrolling internally, ADOdb will simulate forward 
-  scrolling. Some databases do not support backward scrolling. If the $to 
-  position is after the EOF, $to will move to the end of the RecordSet 
-  for most databases. Some obscure databases using odbc might not behave this 
-  way.
    
-
    Note: This function uses absolute positioning, unlike Microsoft's ADO.
    
-
    Returns true or false. If false, the internal cursor is not moved in most implementations, 
-  so AbsolutePosition( ) will return the last cursor position before the Move( 
-  ). 
    
-
    MoveFirst()
    
-
    Internally calls Move(0). Note that some databases do not support this function.
    
-
    MoveLast()
    
-
    Internally calls Move(RecordCount()-1). Note that some databases do not support 
-  this function.
    
-
    GetRowAssoc($toUpper=true)
    
-
    Returns an associative array containing the current row. The keys to the array 
-  are the column names. The column names are upper-cased for easy access. To get 
-  the next row, you will still need to call MoveNext(). 
    
-
    For example:
    
-  Array ( [ID] => 1 [FIRSTNAME] => Caroline [LASTNAME] => Miranda [CREATED] => 
-  2001-07-05 ) 
    
-
    Note: do not use GetRowAssoc() with $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC. 
-  Because they have the same functionality, they will interfere with each other.
    
-     
-
    AbsolutePage($page=-1) 
-  
    
-
    Returns the current page. Requires PageExecute()/CachePageExecute() to be called. 
-  See Example 8.
    
- 
-
    AtFirstPage($status='')
    
-
    Returns true if at first page (1-based). Requires PageExecute()/CachePageExecute() 
-  to be called. See Example 8.
    
-
    AtLastPage($status='')
    
-
    Returns true if at last page (1-based). Requires PageExecute()/CachePageExecute() 
-  to be called. See Example 8.
    
-
    Fields($colname)
    
-
    Returns the value of the 
-  associated column $colname for the current row. The column name is case-insensitive.
    
-
    This is a convenience function. For higher performance, use $ADODB_FETCH_MODE. 
    
-
    FetchRow()
    
-     
-
    Returns array containing current row, or false if EOF. 
-  FetchRow( ) internally moves to the next record after returning the current 
-  row. 
    
-
    Warning: Do not mix using FetchRow() with MoveNext().
    
-
    Usage:
    
-
    $rs = $db->Execute($sql);
-if ($rs)
-	while ($arr = $rs->FetchRow()) {
-	     # process $arr	
-	}
    
-
    FetchInto(&$array)
    
-
     Sets $array to the current row. Returns PEAR_Error object 
-  if EOF, 1 if ok (DB_OK constant). If PEAR is undefined, false is returned when 
-  EOF. FetchInto( ) internally moves to the next 
-  record after returning the current row. 
    
-
     FetchRow() is easier to use. See above.
    
- 
-
    FetchField($column_number)
    
-
    Returns an object containing the name, type and max_length 
-  of the associated field. If the max_length cannot be determined reliably, it 
-  will be set to -1. The column numbers are zero-based. See example 
-  2.
    
-
    FieldCount( )
    
-
    Returns the number of fields (columns) in the record set.
    
-
    RecordCount( )
    
-
    Returns the number of rows in the record set. If the number of records returned 
-  cannot be determined from the database driver API, we will buffer all rows and 
-  return a count of the rows after all the records have been retrieved. This buffering 
-  can be disabled (for performance reasons) by setting the global variable $ADODB_COUNTRECS 
-  = false. When disabled, RecordCount( ) will return -1 for certain databases. 
-  See the supported databases list above for more details. 
    
-
     RowCount is a synonym for RecordCount.
    
-
    PO_RecordCount($table, $where)
    
-
    Returns the number of rows in the record set. If the database does not support 
-  this, it will perform a SELECT COUNT(*) on the table $table, with the given 
-  $where condition to return an estimate of the recordset size.
    
-
    $numrows = $rs->PO_RecordCount("articles_table", "group=$group");
    
- NextRecordSet() 
-
    For databases that allow multiple recordsets to be returned in one query, this 
-  function allows you to switch to the next recordset. Currently only supported 
-  by mssql driver.
    
-
    -$rs = $db->Execute('execute return_multiple_rs');
-$arr1 = $rs->GetArray();
-$rs->NextRecordSet();
-$arr2 = $rs->GetArray();
    
-
    FetchObject($toupper=true)
    
-
    Returns the current row as an object. If you set $toupper to true, then the 
-  object fields are set to upper-case. Note: The newer FetchNextObject() is the 
-  recommended way of accessing rows as objects. See below.
    
-
    FetchNextObject($toupper=true)
    
-
    Gets the current row as an object and moves to the next row automatically. 
-  Returns false if at end-of-file. If you set $toupper to true, then the object 
-  fields are set to upper-case.
    
-
    -$rs = $db->Execute('select firstname,lastname from table');
-if ($rs) {
-	while ($o = $rs->FetchNextObject()) {
-		print "$o->FIRSTNAME, $o->LASTNAME<BR>";
-	}
-}
-
    
-
    There is some trade-off in speed in using FetchNextObject(). If performance 
-  is important, you should access rows with the fields[] array. FetchObj() 
-
    Returns the current record as an object. Fields are not upper-cased, unlike 
-  FetchObject.  
-
    FetchNextObj() 
-  
    
-
    Returns the current record as an object and moves to 
-  the next record. If EOF, false is returned. Fields are not upper-cased, unlike 
-  FetctNextObject. 
    
- 
-
    CurrentRow( )
    
-
    Returns the current row of the record set. 0 is the first row.
    
-
    AbsolutePosition( )
    
-
    Synonym for CurrentRow for compatibility with ADO. Returns the current 
-  row of the record set. 0 is the first row.
    
-
    MetaType($nativeDBType[,$field_max_length],[$fieldobj])
    
-
    Determine what generic meta type a database field type is given its 
-  native type $nativeDBType as a string and the length of the field $field_max_length. 
-  Note that field_max_length can be -1 if it is not known. The field object returned 
-  by FetchField() can be passed in $fieldobj or as the 1st parameter $nativeDBType. 
-  This is useful for databases such as mysql which has additional properties 
-  in the field object such as primary_key. 
    
-
    Uses the field blobSize and compares it with $field_max_length 
-  to determine whether the character field is actually a blob.
    
-For example, $db->MetaType('char') will return 'C'. 
-
    Returns:
    
-
      
-  
    • C: Character fields that should be shown in a <input type="text"> 
-    tag. 
      • 
-  
    • X: Clob (character large objects), or large text fields that should 
-    be shown in a <textarea>
      • 
-  
    • D: Date field
      • 
-  
    • T: Timestamp field
      • 
-  
    • L: Logical field (boolean or bit-field)
      • 
-  
    • N: Numeric field. Includes decimal, numeric, floating point, and 
-    real. 
      • 
-  
    • I:  Integer field. 
      • 
-  
    • R: Counter or Autoincrement field. Must be numeric.
      • 
-  
    • B: Blob, or binary large objects. 
      • 
-
    
-     
-
     Since ADOdb 3.0, MetaType accepts $fieldobj as the first 
-  parameter, instead of $nativeDBType. 
    
- 
-
    Close( )
    
-
    Closes the recordset, cleaning all memory and resources associated with the recordset. 
-
    
-If memory management is not an issue, you do not need to call this function as recordsets
-are closed for you by PHP at the end of the script. 
-SQL statements such as INSERT/UPDATE/DELETE do not really return a recordset, so you do not have to call Close()
-for such SQL statements.
    
-
    
-
    function rs2html($adorecordset,[$tableheader_attributes], 
-  [$col_titles])
    
-
    This is a standalone function (rs2html = recordset to html) that is similar 
-  to PHP's odbc_result_all function, it prints a ADORecordSet, $adorecordset 
-  as a HTML table. $tableheader_attributes allow you to control the table 
-  cellpadding, cellspacing and border attributes. Lastly 
-  you can replace the database column names with your own column titles with the 
-  array $col_titles. This is designed more as a quick debugging mechanism, 
-  not a production table recordset viewer.
    
-
    You will need to include the file tohtml.inc.php.
    
-
    Example of rs2html:
    
-
    <?
-include('tohtml.inc.php'); # load code common to ADOdb 
-include('adodb.inc.php'); # load code common to ADOdb 
-$conn = &ADONewConnection('mysql');   # create a connection 
-$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
-$sql = 'select CustomerName, CustomerID from customers'; 
-$rs   = $conn->Execute($sql); 
-rs2html($rs,'border=2 cellpadding=3',array('Customer Name','Customer ID'));
-?>
    
-
    
-
    Differences between this ADOdb library and Microsoft ADO
    
-
      
-  
    1. ADOdb only supports recordsets created by a connection object. Recordsets 
-    cannot be created independently.
      2. 
-  
    2. ADO properties are implemented as functions in ADOdb. This makes it easier 
-    to implement any enhanced ADO functionality in the future.
      3. 
-  
    3. ADOdb's ADORecordSet->Move() 
-    uses absolute positioning, not relative. Bookmarks are not supported.
      4. 
-  
    4. ADORecordSet->AbsolutePosition() 
-    cannot be used to move the record cursor.
      5. 
-  
    5. ADO Parameter objects are not supported. Instead we have the ADOConnection::Parameter( 
-    ) function, which provides a simpler interface for calling preparing parameters 
-    and calling stored procedures.
      6. 
-  
    6. Recordset properties for paging records are available, but implemented as 
-    in Example 8.
      7. 
-
    
-
    
-
    Database Driver Guide
    
-
    This describes how to create a class to connect to a new database. To ensure 
-  there is no duplication of work, kindly email me at jlim#natsoft.com.my if you 
-  decide to create such a class.
    
-
    First decide on a name in lower case to call the database type. Let's say we 
-  call it xbase. 
    
-
    Then we need to create two classes ADODB_xbase and ADORecordSet_xbase in the 
-  file adodb-xbase.inc.php.
    
-
    The simplest form of database driver is an adaptation of an existing ODBC driver. 
-  Then we just need to create the class ADODB_xbase extends ADODB_odbc 
-  to support the new date and timestamp formats, the concatenation 
-  operator used, true and false. For the ADORecordSet_xbase extends 
-  ADORecordSet_odbc we need to change the MetaType function. See 
-  adodb-vfp.inc.php as an example.
    
-
    More complicated is a totally new database driver that connects to a new PHP 
-  extension. Then you will need to implement several functions. Fortunately, you 
-  do not have to modify most of the complex code. You only need to override a 
-  few stub functions. See adodb-mysql.inc.php for example.
    
-
    The default date format of ADOdb internally is YYYY-MM-DD (Ansi-92). All dates 
-  should be converted to that format when passing to an ADOdb date function. See 
-  Oracle for an example how we use ALTER SESSION to change the default date format 
-  in _pconnect _connect.
    
-
    ADOConnection Functions to Override
    
-
    Defining a constructor for your ADOConnection derived function is optional. 
-  There is no need to call the base class constructor.
    
-
    _connect: Low level implementation of Connect. Returns true or false. 
-  Should set the _connectionID.
    
-
    _pconnect: Low level implemention of PConnect. Returns true or false. 
-  Should set the _connectionID.
    
-
    _query: Execute a query. Returns the queryID, or false.
    
-
    _close: Close the connection -- PHP should clean up all recordsets. 
-
    
-
    ErrorMsg: Stores the error message in the private variable _errorMsg. 
-
    
-
    ADOConnection Fields to Set
    
-
    _bindInputArray: Set to true if binding of parameters for SQL inserts 
-  and updates is allowed using ?, eg. as with ODBC.
    
-
    fmtDate
    
-
    fmtTimeStamp
    
-
    true
    
-
    false
    
-
    concat_operator
    
-
    replaceQuote
    
-
    hasLimit support SELECT * FROM TABLE LIMIT 10 of MySQL.
    
-
    hasTop support Microsoft style SELECT TOP 10 * FROM TABLE.
    
-
    ADORecordSet Functions to Override
    
-
    You will need to define a constructor for your ADORecordSet derived class that 
-  calls the parent class constructor.
    
-
    FetchField:  as documented above in ADORecordSet
    
-
    _initrs: low level initialization of the recordset: setup the _numOfRows 
-  and _numOfFields fields -- called by the constructor.
    
-
    _seek: seek to a particular row. Do not load the data into the fields 
-  array. This is done by _fetch. Returns true or false. Note that some implementations 
-  such as Interbase do not support seek. Set canSeek to false.
    
-
    _fetch: fetch a row using the database extension function and then move 
-  to the next row. Sets the fields array. If the parameter $ignore_fields 
-  is true then there is no need to populate the fields array, just move 
-  to the next row. then Returns true or false.
    
-
    _close: close the recordset
    
-
    Fields: If the array row returned by the PHP extension is not an associative 
-  one, you will have to override this. See adodb-odbc.inc.php for an example. 
-  For databases such as MySQL and MSSQL where an associative array is returned, 
-  there is no need to override this function.
    
-
    ADOConnection Fields to Set
    
-
    canSeek: Set to true if the _seek function works.
    
-
    ToDo:
    
-
    See the RoadMap article.
    
-
    Also see the ADOdb proxy article 
-  for bridging Windows and Unix databases using http remote procedure calls. For 
-  your education, visit palslib.com for database info, 
-  and read this article on Optimizing 
-  PHP. 
    
-    
-
    Change Log
    
-
    4.11 27 Jan 2004
-
    Table misspelt in perf-oci8.inc.php. Changed v$conn_cache_advice to v$db_cache_advice. Reported by Steve W.
-
    UserTimeStamp and DBTimeStamp did not handle YYYYMMDDHHMMSS format properly. Reported by Mike Muir. Fixed.
-
    Changed oci8 Prepare(). Does not auto-allocate OCINewCursor automatically, unless 2nd param is set to true.
-This will break backward compat, if Prepare/Execute is used instead of ExecuteCursor. Reported by Chris Jones.
-
    Added InParameter() and OutParameter(). Wrapper functions to Parameter(), but nicer because they
-are self-documenting.
-
    Added 'R' handling in ActualType() to datadict-mysql.inc.php
-
    Added ADOConnection::SerializableRS($rs). Returns a recordset that can be serialized in a session.
-
    Added "Run SQL" to performance UI().
-
    Misc spelling corrections in adodb-mysqli.inc.php, adodb-oci8.inc.php and datadict-oci8.inc.php, from Heinz Hombergs.
-
    MetaIndexes() for ibase contributed by Heinz Hombergs.
-
    4.10 12 Jan 2004
-
    Dan Cech contributed extensive changes to data dictionary to support name quoting (with `), and drop table/index.
-
    Informix added cursorType property. Default remains IFX_SCROLL, but you can change to 0 (non-scrollable cursor) for performance.
-
    Added ADODB_View_PrimaryKeys() for returning view primary keys to MetaPrimaryKeys().
-
    Simplified chinese file, adodb-cn.inc.php from cysoft.
-
    Added check for ctype_alnum in adodb-datadict.inc.php. Thx to Jason Judge.
-
    Added connection parameter to ibase Prepare(). Fix by Daniel Hassan.
-
    Added nameQuote for quoting identifiers and names to connection obj. Requested by Jason Judge. Also the
-data dictionary parser now detects `field name` and generates column names with spaces correctly.
-
    BOOL type not recognised correctly as L. Fixed.
-
    Fixed paths in ADODB_DIR for session files, and back-ported it to 4.05 (15 Dec 2003)
-
    Added Schema to postgresql MetaTables. Thx to col#gear.hu
-
    Empty postgresql recordsets that had blob fields did not set EOF properly. Fixed.
-
    CacheSelectLimit internal parameters to SelectLimit were wrong. Thx to Nio.
-
    Modified adodb_pr() and adodb_backtrace() to support command-line usage (eg. no html).
-
    Fixed some fr and it lang errors. Thx to Gaetano G.
-
    Added contrib directory, with adodb rs to xmlrpc convertor by Gaetano G.
-
    Fixed array recordset bugs when _skiprow1 is true. Thx to Gaetano G.
-
    Fixed pivot table code when count is false.
-
    
-
-
    4.05 13 Dec 2003 
-
    Added MetaIndexes - thx to Dan Cech.
-
    Rewritten session code by Ross Smith. Moved code to adodb/session directory.
-
    Added function exists check on connecting to most drivers, so we don't crash with the unknown function error.
-
    Smart Transactions failed with GenID() when it no seq table has been created because the sql
-	statement fails. Fix by Mark Newnham.
-
    Added $db->length, which holds name of function that returns strlen.
-
    Fixed error handling for bad driver in ADONewConnection - passed too few params to error-handler.
-
    Datadict did not handle types like 16.0 properly in _GetSize. Fixed.
-
    Oci8 driver SelectLimit() bug &= instead of =& used. Thx to Swen Thümmler.
-
    Jesse Mullan suggested not flushing outp when output buffering enabled. Due to Apache 2.0 bug. Added.
-
    MetaTables/MetaColumns return ref bug with PHP5 fixed in adodb-datadict.inc.php.
-
    New mysqli driver contributed by Arjen de Rijke. Based on adodb 3.40 driver.
-Then jlim added BeginTrans, CommitTrans, RollbackTrans, IfNull, SQLDate. Also fixed return ref bug.
-
    $ADODB_FLUSH added, if true then force flush in debugging outp. Default is false.  In earlier
-versions, outp defaulted to flush, which is not compat with apache 2.0.
-
    Mysql driver's GenID() function did not work when when sql logging is on. Fixed.
-
    $ADODB_SESSION_TBL not declared as global var. Not available if adodb-session.inc.php included in function. Fixed.
-
    The input array not passed to Execute() in _adodb_getcount(). Fixed.
-
    4.04 13 Nov 2003 
-
    Switched back to foreach - faster than list-each.
-
    Fixed bug in ado driver - wiping out $this->fields with date fields.
-
    Performance Monitor, View SQL, Explain Plan did not work if strlen($SQL)>max($_GET length). Fixed.
-
    Performance monitor, oci8 driver added memory sort ratio.
-
    Added random property, returns SQL to generate a floating point number between 0 and 1;
-
    4.03 6 Nov 2003 
-
    The path to adodb-php4.inc.php and adodb-iterators.inc.php was not setup properly.
-
    Patched SQLDate in interbase to support hours/mins/secs. Thx to ari kuorikoski.
-
    Force autorollback for pgsql persistent connections - 
-apparently pgsql did not autorollback properly before 4.3.4. See http://bugs.php.net/bug.php?id=25404
-
    4.02 5 Nov 2003 
-
    Some errors in adodb_error_pg() fixed. Thx to Styve.
-
    Spurious Insert_ID() error was generated by LogSQL(). Fixed.
-
    Insert_ID was interfering with Affected_Rows() and Replace()  when LogSQL() enabled. Fixed.
-
    More foreach loops optimized with list/each.
-
    Null dates not handled properly in ADO driver (it becomes 31 Dec 1969!).
-
    Heinz Hombergs contributed patches for mysql MetaColumns - adding scale, made
-interbase MetaColumns work with firebird/interbase, and added lang/adodb-de.inc.php.
-
    Added INFORMIXSERVER environment variable.
-
    Added $ADODB_ANSI_PADDING_OFF for interbase/firebird.
-
    PHP 5 beta 2 compat check. Foreach (Iterator) support. Exceptions support.
-
    4.01 23 Oct 2003 
-
    Fixed bug in rs2html(), tohtml.inc.php, that generated blank table cells.
-
    Fixed insert_id() incorrectly generated when logsql() enabled.
-
    Modified PostgreSQL _fixblobs to use list/each instead of foreach.
-
    Informix ErrorNo() implemented correctly.
-
    Modified several places to use list/each, including GetRowAssoc().
-
    Added UserTimeStamp() to connection class.
-
    Added $ADODB_ANSI_PADDING_OFF for oci8po.
-
    4.00 20 Oct 2003 
-
    Upgraded adodb-xmlschema to 1 Oct 2003 snapshot.
-
    Fix to rs2html warning message. Thx to Filo.
-
    Fix for odbc_mssql/mssql SQLDate(), hours was wrong.
-
    Added MetaColumns and MetaPrimaryKeys for sybase. Thx to Chris Phillipson.
-
    Added autoquoting to datadict for MySQL and PostgreSQL. Suggestion by Karsten Dambekalns  
-
    3.94 11 Oct 2003 
-
    Create trigger in datadict-oci8.inc.php did not work, because all cr/lf's must be removed. 
-
    ErrorMsg()/ErrorNo() did not work for many databases when logging enabled. Fixed.
-
    Removed global variable $ADODB_LOGSQL as it does not work properly with multiple connections.
-
    Added SQLDate support for sybase. Thx to Chris Phillipson
-
    Postgresql checking of pgsql resultset resource was incorrect. Fix by Bharat Mediratta bharat#menalto.com.
-Same patch applied to  _insertid and _affectedrows for adodb-postgres64.inc.php.
-
    Added support for NConnect for postgresql.
-
    Added Sybase data dict support. Thx to Chris Phillipson  
-
    Extensive improvements in $perf->UI(), eg. Explain now opens in new window, we show scripts
-which call sql, etc.
-
    Perf Monitor UI works with magic quotes enabled.
-
    rsPrefix was declared twice. Removed.
-
    Oci8 stored procedure support, eg. "begin func(); end;" was incorrect in _query. Fixed.
-
    Tiraboschi Massimiliano contributed italian language file.
-
    Fernando Ortiz, fortiz#lacorona.com.mx, contributed informix performance monitor.
-
    Added _varchar (varchar arrays) support for postgresql. Reported by PREVOT Stéphane.
-
    3.92 22 Sept 2003 
-
    Added GetAssoc and CacheGetAssoc to connection object.
-
    Removed TextMax and CharMax functions from adodb.inc.php. 
-
    HasFailedTrans() returned false when trans failed. Fixed. 
-
    Moved perf driver classes into adodb/perf/*.php. 
-
    Misc improvements to performance monitoring, including UI(). 
-
    RETVAL in mssql Parameter(), we do not append @ now. 
-
    Added Param($name) to connection class, returns '?' or ":$name", for defining 
-  bind parameters portably. 
-
    LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8 
-  _stmt and _affectedrows() bugs. 
-
    Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT 
-  stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also 
-  added new $conn->datetime field to oci8, controls whether MetaType() returns 
-  'D' ($this->datetime==false) or 'T' ($this->datetime == true) for DATE type. 
-
    Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php. 
-
    Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL(). 
-
    Tuned include_once handling to reduce file-system checking overhead. 
-
    3.91 9 Sept 2003 
-
    Only released to InterAkt 
-
    Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory 
-  for driver instantiation. 
-
    Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com 
-
    Added portable substr support. 
-
    Now rs2html() has new parameter, $echo. Set to false to return $html instead 
-  of echoing it. 
-
    3.90 5 Sept 2003 
-
    First beta of performance monitoring released. 
-
    MySQL supports MetaTable() masking. 
-
    Fixed key_exists() bug in adodb-lib.inc.php 
-
    Added sp_executesql Prepare() support to mssql. 
-
    Added bind support to db2. 
-
    Added swedish language file - Christian Tiberg" christian#commsoft.nu 
-
    Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich. 
-
    Left join setting for oci8 was wrong. Thx to johnwilk#juno.com 
-
    3.80 27 Aug 2003 
-
    Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility. 
-
    Added matching mask for MetaTables. Only for oci8, mssql and postgres currently. 
-
    Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano. 
-
    Added better debugging for Smart Transactions. 
-
    Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP. 
-
    ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define 
-  it after including adodb.inc.php. 
-
    Added portugese (brazilian) to languages. Thx to "Levi Fukumori". 
-
    Removed arg3 parameter from Execute/SelectLimit/Cache* functions. 
-
    Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() 
-  to note change in sql query counting with 2-d arrays. 
-
    Added MONEY to MetaType in PostgreSQL. 
-
    Added more debugging output to CacheFlush(). 
-
    3.72 9 Aug 2003 
-
    Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes 
-  and does the right thing... 
-
    Fixed CacheFlush() bug - Thx to martin#gmx.de 
-
    Walt Boring contributed MetaForeignKeys for postgres7. 
-
    _fetch() called _BlobDecode() wrongly in interbase. Fixed. 
-
    adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980 
-
    3.71 4 Aug 2003 
-
    The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner 
-  == false. 
-
    Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru. 
-
    Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com. 
-
    Error handling in oci8 bugfix - if there was an error in Execute(), then when 
-  calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but 
-  the 2nd call would return no error. 
-
    Error handling in odbc bugfix. ODBC would always return the last error, even 
-  if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 
-  0 everytime before CacheExecute() and Execute(). 
-
    3.70 29 July 2003 
-
    Added new SQLite driver. Tested on PHP 4.3 and PHP 5. 
-
    Added limited "sapdb" driver support - mainly date support. 
-
    The oci8 driver did not identify NUMBER with no defined precision correctly. 
-
    Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls 
-  in GetInsertSQL/GetUpdateSQL. 
-
    DBDate() and DBTimeStamp() format for postgresql had problems. Fixed. 
-
    Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit. 
-
    Added charset support to postgresql. Thx to Julian Tarkhanov. 
-
    Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS) 
-
    Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn. 
-
    adodb-cryptsession.php includes wrong. Fixed. 
-
    Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8. 
-
    Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. 
-
    adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause checking 
-  in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. 
-
    Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring. 
-
    Upgraded to adodb-xmlschema.inc.php 0.0.2. 
-
    NConnect for mysql now returns value. Thx to Dennis Verspuij. 
-
    ADODB_FETCH_BOTH support added to interbase/firebird. 
-
    Czech language file contributed by Kamil Jakubovic jake#host.sk. 
-
    PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec. 
-
    Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it 
-
    ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed. 
-
    3.60 16 June 2003 
-
    We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with 
-  mssql driver. 
-
    The property $emptyDate missing from connection class. Also changed 1903 to 
-  constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. 
-
    ADOdb speedup optimization - we now return all arrays by reference. 
-
    Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. 
-  Suggested by vincent. 
-
    Added GetArray() to connection class. 
-
    Added not_null check in informix metacolumns(). 
-
    Connection parameters for postgresql did not work correctly when port was defined. 
-
    DB2 is now a tested driver, making adodb 100% compatible. Extensive changes 
-  to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching 
-  to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() 
-  fixes. 
-
    The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed. 
-
    Some bugs in adodb_backtrace() fixed. 
-
    Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql 
-  properly. 
-
    MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions 
-  to odbc MetaColumns() for vfp and db2 compat. 
-
    Added unsigned support to mysql datadict class. Thx to iamsure. 
-
    Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to 
-  Josh R, Night_Wulfe#hotmail.com. 
-
    ChangeTableSQL contributed by Florian Buzin. 
-
    The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with 
-  mssql driver. 
-
    
-
    0.10 Sept 9 2000 First release 
-
    Old changelog history moved to old-changelog.htm. 
-  
    
-
     
    
-
      
-
-
+
+
+ADODB Manual
+
+
+	
+
+
+
    ADOdb Library for PHP
    
+
    V4.20 22 Feb 2004 (c) 2000-2004 John Lim (jlim#natsoft.com)
    
+
    This software is dual licensed using BSD-Style and LGPL. This 
+  means you can use it in compiled proprietary and commercial products.
    
+	
    Useful ADOdb links:  Download   Other Docs
+
+
    Introduction
    
+	Unique Features
    
+	How People are using ADOdb
    
+	Feature Requests and Bug Reports
    
+	    Installation
    
+	Minimum Install
    
+	Initializing Code and Connection Examples
    
+	ADONewConnection 
+	NewADOConnection
    
+	High Speed ADOdb - tuning tips
    
+	Hacking and Modifying ADOdb Safely
    
+	PHP5 Features
    
+	foreach iterators exceptions
    
+	 Supported Databases
    
+	 Tutorials
    
+	Example 1: Select
    
+	Example 2: Advanced Select
    
+	Example 3: Insert
    
+	Example 4: Debugging  rs2html 
+	example
    
+	Example 5: MySQL and Menus
    
+	Example 6: Connecting to Multiple Databases at once 
    
+	Example 7: Generating Update and Insert SQL 
    
+	Example 8: Implementing Scrolling with Next and Previous
    
+	Example 9: Exporting in CSV or Tab-Delimited Format 
    
+	Example 10: Custom filters
    
+	Example 11: Smart Transactions
    
+	
    
+	 Using Custom Error Handlers and PEAR_Error
    
+	Data Source Names
    
+	Caching
    
+	Pivot Tables     
+
    REFERENCE
+
     Variables: $ADODB_COUNTRECS $ADODB_ANSI_PADDING_OFF
+  $ADODB_CACHE_DIR $ADODB_FETCH_MODE 
+  $ADODB_LANG
    
+  Constants:     ADODB_ASSOC_CASE 
+  
    
+   ADOConnection
    
+  Connections: Connect PConnect 
+  NConnect 
    
+  Executing SQL: Execute CacheExecute 
+  SelectLimit CacheSelectLimit 
+  Param Prepare PrepareSP 
+  InParameter OutParameter
+  
    
+                GetOne 
+  CacheGetOne GetRow CacheGetRow 
+  GetAll CacheGetAll GetCol 
+  CacheGetCol GetAssoc CacheGetAssoc Replace 
+  
    
+                 ExecuteCursor 
+  (oci8 only)
    
+  Generates SQL strings: GetUpdateSQL GetInsertSQL 
+  Concat IfNull length random substr 
+  qstr Param 
+  OffsetDate SQLDate 
+  DBDate  DBTimeStamp
+  
    
+  Blobs: UpdateBlob UpdateClob 
+  UpdateBlobFile BlobEncode 
+  BlobDecode
    
+  Paging/Scrolling: PageExecute CachePageExecute
    
+  Cleanup: CacheFlush Close
    
+  Transactions: StartTrans CompleteTrans 
+  FailTrans HasFailedTrans 
+  BeginTrans CommitTrans 
+  RollbackTrans 
    
+  Fetching Data:      SetFetchMode
    
+  Strings: concat length  qstr quote substr
    
+  Dates: DBDate DBTimeStamp UnixDate 
+  UnixTimeStamp OffsetDate 
+  SQLDate 
    
+  Row Management: Affected_Rows Insert_ID  RowLock
+  GenID CreateSequence DropSequence 
+  
    
+  Error Handling: ErrorMsg ErrorNo 
+  MetaError MetaErrorMsg
    
+  Data Dictionary (metadata): MetaDatabases MetaTables 
+  MetaColumns MetaColumnNames 
+  MetaPrimaryKeys MetaForeignKeys 
+  ServerInfo 
    
+  Statistics and Query-Rewriting: LogSQL fnExecute 
+  and fnCacheExecute
    
+      Deprecated: Bind BlankRecordSet
+  Parameter
+  
    
+  ADORecordSet
    
+  
+  Returns one field: Fields
    
+ Returns one row:FetchRow FetchInto 
+  FetchObject FetchNextObject 
+  FetchObj FetchNextObj
+ GetRowAssoc 
    
+  Returns all rows:GetArray GetRows 
+  GetAssoc
    
+  Scrolling:Move MoveNext MoveFirst 
+  MoveLast AbsolutePosition CurrentRow 
+  AtFirstPage AtLastPage 
+  AbsolutePage      
    
+  Menu generation:GetMenu GetMenu2
    
+  Dates:UserDate UserTimeStamp 
+  UnixDate UnixTimeStamp
    
+      Recordset Info:RecordCount PO_RecordSet 
+  NextRecordSet
    
+  Field Info:FieldCount FetchField 
+  MetaType
    
+  Cleanup: Close      
+
    rs2html  example
    
+  Differences between ADOdb and ADO
    
+  Database Driver Guide
    
+      Change Log
    
+
    
+
    Introduction
    
+
    PHP's database access functions are not standardised. This creates a need for 
+  a database class library to hide the differences between the different database 
+  API's (encapsulate the differences) so we can easily switch databases. PHP 4.0.5 or later
+  is now required (because we use array-based str_replace).
    
+
    We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, Informix, 
+  PostgreSQL, FrontBase,  SQLite, Interbase (Firebird and Borland variants), Foxpro, Access, ADO, DB2, SAP DB and ODBC. 
+  We have had successful reports of connecting to Progress and CacheLite via ODBC. We hope more people 
+  will contribute drivers to support other databases.
    
+
    PHP4 supports session variables. You can store your session information using 
+  ADOdb for true portability and scalability. See adodb-session.php for more information.
    
+
    Also read http://php.weblogs.com/portable_sql 
+  (also available as tips_portable_sql.htm in the release) for tips on writing 
+  portable SQL.
    
+
    Unique Features of ADOdb
    
+
      
+  
    • Easy for Windows programmers to adapt to because many of the conventions 
+	are similar to Microsoft's ADO.
      • 
+  
    • Unlike other PHP database classes which focus only on select statements, 
+	we provide support code to handle inserts and updates which can be adapted 
+	to multiple databases quickly. Methods are provided for date handling, 
+	string concatenation and string quoting characters for differing databases.
      • 
+  
    • A metatype system is built in so that we can figure out that types 
+	such as CHAR, TEXT and STRING are equivalent in different databases.
      • 
+  
    • Easy to port because all the database dependant code are stored in 
+	stub functions. You do not need to port the core logic of the classes.
      • 
+  
    • Portable table and index creation with the datadict classes.
+  
    • Database performance monitoring and SQL tuning with the performance monitoring classes.
+  
    • Database-backed sessions with the session management classes. Supports session expiry notification.
+
    
+
    How People are using ADOdb
    
+Here are some examples of how people are using ADOdb (for a much longer list, 
+visit http://php.weblogs.com/adodb-cool-applications): 
+
      
+
    • PhpLens is a commercial data grid component that allows both cool Web designers and serious unshaved programmers to develop and maintain databases on the Web easily. Developed by the author of ADOdb.
      
+
+
    • PHAkt: PHP Extension for DreamWeaver Ultradev allows you to script PHP in the popular Web page editor. Database handling provided by ADOdb.
      
+
+
    • Analysis Console for Intrusion Databases (ACID): PHP-based analysis engine to search and process a database of security incidents generated by security-related software such as IDSes and firewalls (e.g. Snort, ipchains). By Roman Danyliw.
      
+
+
    • PostNuke is a very popular free content management
+ system and weblog system. It offers full CSS support, HTML 4.01 transitional compliance throughout, an advanced blocks system, and is fully multi-lingual enabled. 
      
+
+
    • EasyPublish CMS  is another free content management system for managing information and integrated modules on your internet, intranet- and extranet-sites. From Norway.
      
+
+
    • NOLA is a full featured accounting, inventory, and job tracking application. It is licensed under the GPL, and developed by Noguska.
+
    
+
+
    Feature Requests and Bug Reports
    
+
    Feature requests and bug reports can be emailed to jlim#natsoft.com.my 
+  or posted to the ADOdb Help forums at http://phplens.com/lens/lensforum/topics.php?id=4.
    
+
    Installation Guide
    
+
    Make sure you are running PHP 4.0.4 or later. 
+  Unpack all the files into a directory accessible by your webserver.
    
+
    To test, try modifying some of the tutorial examples. Make sure you customize 
+  the connection settings correctly. You can debug using $db->debug = true as shown below:
    
+
    <?php
+	include('adodb/adodb.inc.php');
+	$db = ADONewConnection($dbdriver); # eg 'mysql' or 'postgres'
+	$db->debug = true;
+	$db->Connect($server, $user, $password, $database);
+	$rs = $db->Execute('select * from some_small_table');
+	print "<pre>";
+	print_r($rs->GetRows());
+	print "</pre>";
+?>
    
+
+ 
    Minimum Install
    
+
    For developers who want to release a minimal install of ADOdb, you will need:
+
      
+
    • adodb.inc.php
+
    • adodb-lib.inc.php
+
    • adodb-time.inc.php
+
    • adodb-csvlib.inc.php (if you use cached recordsets - CacheExecute(), etc)
+
    • adodb-error.inc.php and lang/adodb-$lang.inc.php (if you use MetaError())
+
    • drivers/adodb-$database.inc.php
+
    • license.txt (for legal reasons)
+
    
+
+
    Code Initialization Examples
    
+
    When running ADOdb, at least two files are loaded. First is adodb/adodb.inc.php, 
+ which contains all functions used by all database classes. The code specific 
+ to a particular database is in the adodb/driver/adodb-????.inc.php file.
    
+ 
+
    For example, to connect to a mysql database:
    
+
    +include('/path/to/set/here/adodb.inc.php');
+$conn = &ADONewConnection('mysql');
+
    
+
    Whenever you need to connect to a database, you create a Connection object 
+  using the ADONewConnection($driver) function. 
+  NewADOConnection($driver) is an alternative name for the same function.
    
+
+
    At this point, you are not connected to the database. You will first need to decide
+whether to use persistent or non-persistent connections. The advantage of persistent
+connections is that they are faster, as the database connection is never closed (even 
+when you call Close()). Non-persistent connections take up much fewer resources though,
+reducing the risk of your database and your web-server becoming overloaded. 
+
    For persistent connections,
+use $conn->PConnect(),
+ or $conn->Connect() for non-persistent connections.
+Some database drivers also support NConnect(), which forces 
+the creation of a new connection. 
+
+
    Connection Gotcha:  If you create two connections, but both use the same userid and password,
+PHP will share the same connection. This can cause problems if the connections are meant to 
+different databases. The solution is to always use different userid's for different databases,
+ or use NConnect().
+
+
    Examples of Connecting to Databases
    
+
    MySQL and Most Other Database Drivers
    
+
    MySQL connections are very straightforward, and the parameters are identical 
+  to mysql_connect:
    
+
    +	$conn = &ADONewConnection('mysql'); 
+	$conn->PConnect('localhost','userid','password','database');
+ 
    
+
     Most other database drivers use a similar convention: Connect($server, $user, $password, $database). Exceptions are listed below.
+
    PostgreSQL
    
+
    PostgreSQL accepts connections using: 
    
+
    a. the standard connection string:
    
+
    +	$conn = &ADONewConnection('postgres7'); 
+	$conn->PConnect('host=localhost port=5432 dbname=mary');
    
+
     b. the classical 4 parameters:
    
+ 
    +	$conn->PConnect('localhost','userid','password','database');
+ 
    
+
    Interbase/Firebird
    
+You define the database in the $host parameter:
+
    +	$conn = &ADONewConnection('ibase'); 
+	$conn->PConnect('localhost:c:\ibase\employee.gdb','sysdba','masterkey');
+
    
+
    SQLite
    
+Sqlite will create database if it does not exist.
+
    +	$conn = &ADONewConnection('sqlite'); 
+	$conn->PConnect('c:\path\to\sqlite.db'); # sqlite will create if does not exist
+
    
+
    Oracle
    
+
    With Oracle, you can connect in multiple ways.
    
+
    a. PHP and Oracle reside on the same machine, use default SID.
    
+
    	$conn->Connect(false, 'scott', 'tiger');
    
+
    b. TNS Name defined, eg. 'myTNS'
    
+
    	$conn->PConnect(false, 'scott', 'tiger', 'myTNS');
+
    
+
    or
    
+
     	$conn->PConnect('myTNS', 'scott', 'tiger');
    
+
    c. Host Address and SID
    
+
    	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'SID');
    
+
    d. Host Address and Service Name
    
+
    	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'servicename');
    
+
+
    DSN-less ODBC (access and mssql examples)
    
+
    ODBC DSN's can be created in the ODBC control panel, or you can use a DSN-less 
+  connection.To use DSN-less connections with ODBC you need PHP 4.3 or later. 
+
    
+
    For Microsoft Access:
    
+
    +	$db =& ADONewConnection('access');
+	$dsn = "Driver={Microsoft Access Driver (*.mdb)};Dbq=d:\\northwind.mdb;Uid=Admin;Pwd=;";
+	$db->Connect($dsn);
+
    
+For Microsoft SQL Server: 
+
    +	$db =& ADONewConnection('odbc_mssql');
+	$dsn = "Driver={SQL Server};Server=localhost;Database=northwind;";
+	$db->Connect($dsn,'userid','password');
+
    
+DSN-less Connections with ADO
    
+If you are using versions of PHP earlier than PHP 4.3.0, DSN-less connections 
+only work with Microsoft's ADO, which is Microsoft's COM based API. An example 
+using the ADOdb library and Microsoft's ADO: 
+
    +<?php
+	include('adodb.inc.php'); 
+	$db = &ADONewConnection("ado_mssql");
+	print "<h1>Connecting DSN-less $db->databaseType...</h1>";
+		
+	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
+		. "SERVER=flipper;DATABASE=ai;UID=sa;PWD=;"  ;
+	$db->Connect($myDSN);
+	
+	$rs = $db->Execute("select * from table");
+	$arr = $rs->GetArray();
+	print_r($arr);
+?>
+
    
+
    High Speed ADOdb - tuning tips
    
+
    ADOdb is a big class library, yet it consistently beats all other PHP class 
+  libraries in performance. This is because it is designed in a layered fashion, 
+  like an onion, with the fastest functions in the innermost layer. Stick to the 
+  following functions for best performance:
    
+
+  
+    
+  
+   
+    
+  
+
    Innermost Layer
    Connect, PConnect, NConnect
    
+        Execute, CacheExecute
    
+        SelectLimit, SelectLimit
    
+        MoveNext, Close 
    
+		qstr, Affected_Rows, Insert_ID
    
+
    The fastest way to access the fields is by accessing the array $recordset->fields 
+  directly. Also set the global variables $ADODB_FETCH_MODE 
+  = ADODB_FETCH_NUM, and (for oci8, ibase/firebird and odbc) $ADODB_COUNTRECS = false 
+  before you connect to your database. At the time of writing (Dec 2003).
    
+
    Consider using bind parameters if your database supports it, as it improves 
+  query plan reuse. Use ADOdb's performance tuning system to identify bottlenecks 
+  quickly. At the time of writing (Dec 2003), this means oci8 and odbc drivers.
    
+
    Lastly make sure you have a PHP accelerator cache installed such as APC, Turck 
+  MMCache, Zend Accelerator or ionCube.
    
+ 
    Informix tips: Disable scrollable cursors with $db->cursorType = 0.
+
     
    
+
    Hacking ADOdb Safely
    
+
    You might want to modify ADOdb for your own purposes. Luckily you can
+still maintain backward compatibility by sub-classing ADOdb and using the $ADODB_NEWCONNECTION
+variable. $ADODB_NEWCONNECTION allows you to override the behaviour of ADONewConnection().
+ADOConnection() checks for this variable and will call
+the function-name stored in this variable if it is defined.
+
    In the following example, new functionality for the connection object 
+is placed in the hack_mysql and hack_postgres7 classes. The recordset class naming convention
+can be controlled using $rsPrefix. Here we set it to 'hack_rs_', which will make ADOdb use
+hack_rs_mysql and hack_rs_postgres7 as the recordset classes.
+If you want to use the default ADOdb drivers return false.
+
+
    +class hack_mysql extends adodb_mysql {
+var $rsPrefix = 'hack_rs_';
+  /* Your mods here */
+}
+
+class hack_rs_mysql extends ADORecordSet_mysql {
+ /* Your mods here */
+}
+
+class hack_postgres7 extends adodb_postgres7 {
+var $rsPrefix = 'hack_rs_';
+  /* Your mods here */
+}
+
+class hack_rs_postgres7 extends ADORecordSet_postgres7 {
+ /* Your mods here */
+}
+
+$ADODB_NEWCONNECTION = 'hack_factory';
+
+function& hack_factory($driver)
+{
+	if ($driver !== 'mysql' && $driver !== 'postgres7') return false;
+	
+	$driver = 'hack_'.$driver;
+	$obj = new $driver();
+	return $obj;
+}
+
+include_once('adodb.inc.php');
+
+
    
+
    Don't forget to call the constructor of the parent class.
+
+
    PHP5 Features
    
+ ADOdb 4.02 or later will transparently determine which version of PHP you are using.
+If PHP5 is detected, the following features become available:
+ 
+
    Databases Supported
    
+
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+   
+    
+    
+    
+    
+    
+    
+  
+  
     
+
    NameTestedDatabaseRecordCount() usablePrerequisitesOperating Systems
    accessBMicrosoft Access/Jet. You need to create an ODBC DSN.Y/NODBC Windows only
    adoB
    Generic ADO, not tuned for specific databases. Allows 
+        DSN-less connections. For best performance, use an OLEDB provider. This 
+        is the base class for all ado drivers.
    
+      
    You can set $db->codePage before connecting.
    		? depends on databaseADO or OLEDB providerWindows only
    ado_accessBMicrosoft Access/Jet using ADO. Allows DSN-less connections. 
+      For best performance, use an OLEDB provider.Y/NADO or OLEDB providerWindows only
    ado_mssqlBMicrosoft SQL Server using ADO. Allows DSN-less connections. 
+      For best performance, use an OLEDB provider.Y/NADO or OLEDB providerWindows only
    db2ADB2. Should work reliably as based on ODBC 
+      driver.Y/NDB2 CLI/ODBC interface 
    Unix and Windows. Unix 
+        install hints. I have had reports that the $host and $database params have to be reversed in Connect() when using the CLI interface.
    vfpAMicrosoft Visual FoxPro. You need to create an ODBC DSN.Y/NODBCWindows only
    fbsqlCFrontBase. Y? 
    Unix and Windows
    ibaseBInterbase 6 or earlier. Some users report you might need 
+      to use this
    
+      $db->PConnect('localhost:c:/ibase/employee.gdb', "sysdba", "masterkey") 
+      to connect. Lacks Affected_Rows currently.
    
+      
    
+      You can set $db->dialect, $db->buffers and $db->charSet before connecting.    		Y/NInterbase clientUnix and Windows
    firebirdCFirebird version of interbase.Y/NInterbase clientUnix and Windows
    borland_ibaseCBorland version of Interbase 6.5 or later. Very sad that 
+      the forks differ.Y/NInterbase clientUnix and Windows
    informix72C Informix databases before Informix 7.3 that do no support 
+      SELECT FIRST.Y/NInformix clientUnix and Windows
    informixCGeneric informix driver.Y/NInformix clientUnix and Windows
    mssqlA 
    Microsoft SQL Server 7 and later. Works 
+        with Microsoft SQL Server 2000 also. Note that date formating is problematic 
+        with this driver. For example, the PHP mssql extension does not return 
+        the seconds for datetime!
    		Y/NMssql client 
    Unix and Windows. 
    
+        Unix install 
+        howto and another 
+        one. 
    mssqlpoA 
    Portable mssql driver. Identical to above 
+        mssql driver, except that '||', the concatenation operator, is converted 
+        to '+'. Useful for porting scripts from most other sql variants that use 
+        ||.
    		Y/NMssql client 
    Unix and Windows. 
    
+        Unix install howto    .
    mysqlAMySQL without transaction support. You can also set $db->clientFlags 
+      before connecting.Y/NMySQL clientUnix and Windows
    mysqlt or maxsqlA 
    MySQL with transaction support. We recommend using 
+        || as the concat operator for best portability. This can be done by running 
+        MySQL using: 
    
+        mysqld --ansi or mysqld --sql-mode=PIPES_AS_CONCAT
    		Y/NMySQL clientUnix and Windows
    oci8AOracle 8/9. Has more functionality than oracle driver 
+      (eg. Affected_Rows). You might have to putenv('ORACLE_HOME=...') before 
+      Connect/PConnect.  
     There are 2 ways of connecting 
+        - with server IP and service name: 
    
+        PConnect('serverip:1521','scott','tiger','service')
    
+        or using an entry in TNSNAMES.ORA or ONAMES or HOSTNAMES: 
    
+        PConnect(false, 'scott', 'tiger', $oraname).      
+      
    Since 2.31, we support Oracle REF cursor variables directly 
+        (see ExecuteCursor). 
    		Y/NOracle clientUnix and Windows
    oci805CSupports reduced Oracle functionality for Oracle 8.0.5. 
+      SelectLimit is not as efficient as in the oci8 or oci8po drivers.Y/NOracle clientUnix and Windows
    oci8poAOracle 8/9 portable driver. This is nearly identical with 
+      the oci8 driver except (a) bind variables in Prepare() use the ? convention, 
+      instead of :bindvar, (b) field names use the more common PHP convention 
+      of lowercase names.  
    Use this driver if porting 
+        from other databases is important. Otherwise the oci8 driver offers better 
+        performance.  
    		Y/NOracle clientUnix and Windows
    odbcAGeneric ODBC, not tuned for specific databases. To connect, 
+      use 
    
+      PConnect('DSN','user','pwd'). This is the base class for all odbc derived 
+      drivers.    		? depends on databaseODBCUnix and Windows. Unix 
+      hints.
    odbc_mssqlCUses ODBC to connect to MSSQLY/NODBCUnix and Windows. 
    odbc_oracleCUses ODBC to connect to OracleY/NODBCUnix and Windows. 
    oracleCImplements old Oracle 7 client API. Use oci8 
+      driver if possible for better performance.Y/NOracle clientUnix and Windows
    postgresAGeneric PostgreSQL driver. Currently identical to postgres7 
+      driver. YPostgreSQL clientUnix and Windows. 
    postgres64AFor PostgreSQL 6.4 and earlier which does not support LIMIT 
+      internally.YPostgreSQL clientUnix and Windows. 
    postgres7APostgreSQL which supports LIMIT and other version 7 functionality.YPostgreSQL clientUnix and Windows. 
    sapdbCSAP DB. Should work reliably as based on ODBC driver.Y/NSAP ODBC client 
    ?
    sqlanywhereCSybase SQL Anywhere. Should work reliably as based on ODBC 
+      driver.Y/NSQL Anywhere ODBC client 
    ?
    sqliteBSQLite. Only tested on PHP5.Y- 
    Unix and Windows.
    sybaseCSybase. Y/NSybase client 
    Unix and Windows.
    
+
+
    The "Tested" column indicates how extensively the code has been tested 
+  and used. 
    
+  A = well tested and used by many people
    
+  B = tested and usable, but some features might not be implemented
    
+  C = user contributed or experimental driver. Might not fully support all of 
+  the latest features of ADOdb. 
    
+
    The column "RecordCount() usable" indicates whether RecordCount() 
+  return the number of rows, or returns -1 when a SELECT statement is executed. 
+  If this column displays Y/N then the RecordCount() is emulated when the global 
+  variable $ADODB_COUNTRECS=true (this is the default). Note that for large recordsets, 
+  it might be better to disable RecordCount() emulation because substantial amounts 
+  of memory are required to cache the recordset for counting. Also there is a 
+  speed penalty of 40-50% if emulation is required. This is emulated in most databases 
+  except for PostgreSQL and MySQL. This variable is checked every time a query 
+  is executed, so you can selectively choose which recordsets to count.
    
+
     
+
    
+
    Tutorials
    
+
    Example 1: Select Statement
    
+
    Task: Connect to the Access Northwind DSN, display the first 2 columns of each 
+  row.
    
+
    In this example, we create a ADOConnection object, which represents the connection 
+  to the database. The connection is initiated with PConnect, 
+  which is a persistent connection. Whenever we want to query the database, we 
+  call the ADOConnection.Execute() 
+  function. This returns an ADORecordSet object which is actually a cursor that 
+  holds the current row in the array fields[]. 
+  We use MoveNext() 
+  to move from row to row.
    
+
    NB: A useful function that is not used in this example is SelectLimit, 
+  which allows us to limit the number of rows shown. 
+
    +<?
+include('adodb.inc.php');	   # load code common to ADOdb
+$conn = &ADONewConnection('access');	# create a connection
+$conn->PConnect('northwind');   # connect to MS-Access, northwind DSN
+$recordSet = &$conn->Execute('select * from products');
+if (!$recordSet) 
+	print $conn->ErrorMsg();
+else
+while (!$recordSet->EOF) {
+	print $recordSet->fields[0].' '.$recordSet->fields[1].'<BR>';
+	$recordSet->MoveNext();
+}
+
+$recordSet->Close(); # optional
+$conn->Close(); # optional
+
+?>
+
    
+
    The $recordSet returned stores 
+  the current row in the $recordSet->fields 
+  array, indexed by column number (starting from zero). We use the MoveNext() 
+  function to move to the next row. The EOF 
+  property is set to true when end-of-file is reached. If an error occurs in Execute(), 
+  we return false instead of a recordset.
    
+
    The $recordSet->fields[] array is generated by the PHP database 
+  extension. Some database extensions only index by number and do not index the 
+  array by field name. To force indexing by name - that is associative arrays 
+  - use the SetFetchMode function. Each recordset saves and uses whatever fetch 
+  mode was set when the recordset was created in Execute() or SelectLimit(). 
+
    +	$db->SetFetchMode(ADODB_FETCH_NUM);
+	$rs1 = $db->Execute('select * from table');
+	$db->SetFetchMode(ADODB_FETCH_ASSOC);
+	$rs2 = $db->Execute('select * from table');
+	print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
+	print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
+
    
+
     
    
+
    To get the number of rows in the select statement, you can use $recordSet->RecordCount(). 
+  Note that it can return -1 if the number of rows returned cannot be determined.
    
+
    Example 2: Advanced Select with Field Objects
    
+
    Select a table, display the first two columns. If the second column is a date 
+  or timestamp, reformat the date to US format.
    
+
    +<?
+include('adodb.inc.php');	   # load code common to ADOdb
+$conn = &ADONewConnection('access');	# create a connection
+$conn->PConnect('northwind');   # connect to MS-Access, northwind dsn
+$recordSet = &$conn->Execute('select CustomerID,OrderDate from Orders');
+if (!$recordSet) 
+	print $conn->ErrorMsg();
+else
+while (!$recordSet->EOF) {
+	$fld = $recordSet->FetchField(1);
+	$type = $recordSet->MetaType($fld->type);
+
+	if ( $type == 'D' || $type == 'T') 
+		print $recordSet->fields[0].' '.
+			$recordSet->UserDate($recordSet->fields[1],'m/d/Y').'<BR>';
+	else 
+		print $recordSet->fields[0].' '.$recordSet->fields[1].'<BR>';
+
+	$recordSet->MoveNext();
+}
+$recordSet->Close(); # optional
+$conn->Close(); # optional
+
+?>
+
    
+
    In this example, we check the field type of the second column using FetchField(). 
+  This returns an object with at least 3 fields.
    
+
      
+  
    • name: name of column
      • 
+  
    •  type: native field type of column
      • 
+  
    •  max_length: maximum length of field. Some databases such as MySQL 
+    do not return the maximum length of the field correctly. In these cases max_length 
+    will be set to -1.
      • 
+
    
+
    We then use MetaType() 
+  to translate the native type to a generic type. Currently the following 
+  generic types are defined:
    
+
      
+  
    • C: character fields that should be shown in a <input type="text"> 
+    tag.
      • 
+  
    • X: TeXt, large text fields that should be shown in a <textarea>
      • 
+  
    • B: Blobs, or Binary Large Objects. Typically images. 
+  
    • D: Date field
      • 
+  
    • T: Timestamp field
      • 
+  
    • L: Logical field (boolean or bit-field)
      • 
+  
    • I:  Integer field
      • 
+  
    • N: Numeric field. Includes autoincrement, numeric, floating point, 
+    real and integer. 
      • 
+  
    • R: Serial field. Includes serial, autoincrement integers. This works 
+    for selected databases. 
      • 
+
    
+
    If the metatype is of type date or timestamp, then we print it using the user 
+  defined date format with UserDate(), 
+  which converts the PHP SQL date string format to a user defined one. Another 
+  use for MetaType() 
+  is data validation before doing an SQL insert or update.
    
+
    Example 3: Inserting
    
+
    Insert a row to the Orders table containing dates and strings that need to 
+  be quoted before they can be accepted by the database, eg: the single-quote 
+  in the word John's.
    
+
    +<?
+include('adodb.inc.php');	   # load code common to ADOdb
+$conn = &ADONewConnection('access');	# create a connection
+
+$conn->PConnect('northwind');   # connect to MS-Access, northwind dsn
+$shipto = $conn->qstr("John's Old Shoppe");
+
+$sql = "insert into orders (customerID,EmployeeID,OrderDate,ShipName) ";
+$sql .= "values ('ANATR',2,".$conn->DBDate(time()).",$shipto)";
+
+if ($conn->Execute($sql) === false) {
+	print 'error inserting: '.$conn->ErrorMsg().'<BR>';
+}
+?>
+
    
+
    In this example, we see the advanced date and quote handling facilities of 
+  ADOdb. The unix timestamp (which is a long integer) is appropriately formated 
+  for Access with DBDate(), 
+  and the right escape character is used for quoting the John's Old Shoppe, 
+  which is John''s Old Shoppe and not PHP's default John's 
+  Old Shoppe with qstr(). 
+
    
+
    Observe the error-handling of the Execute statement. False is returned by 
+  Execute() if an error occured. The error message 
+  for the last error that occurred is displayed in ErrorMsg(). 
+  Note: php_track_errors might have to be enabled for error messages to 
+  be saved.
    
+
     Example 4: Debugging
    
+
    <?
+include('adodb.inc.php');	   # load code common to ADOdb
+$conn = &ADONewConnection('access');	# create a connection
+$conn->PConnect('northwind');   # connect to MS-Access, northwind dsn
+$shipto = $conn->qstr("John's Old Shoppe");
+$sql = "insert into orders (customerID,EmployeeID,OrderDate,ShipName) ";
+$sql .= "values ('ANATR',2,".$conn->FormatDate(time()).",$shipto)";
+$conn->debug = true;
+if ($conn->Execute($sql) === false) print 'error inserting';
+?>
+
    
+
    In the above example, we have turned on debugging by setting debug = true. 
+  This will display the SQL statement before execution, and also show any error 
+  messages. There is no need to call ErrorMsg() 
+  in this case. For displaying the recordset, see the rs2html() 
+  example.
    
+
    Also see the section on Custom Error Handlers.
    
+
    Example 5: MySQL and Menus
    
+
    Connect to MySQL database agora, and generate a <select> menu 
+  from an SQL statement where the <option> captions are in the 1st column, 
+  and the value to send back to the server is in the 2nd column.
    
+
    <?
+include('adodb.inc.php'); # load code common to ADOdb
+$conn = &ADONewConnection('mysql');  # create a connection
+$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
+$sql = 'select CustomerName, CustomerID from customers';
+$rs = $conn->Execute($sql);
+print $rs->GetMenu('GetCust','Mary Rosli');
+?>
    
+
    Here we define a menu named GetCust, with the menu option 'Mary Rosli' selected. 
+  See GetMenu(). 
+  We also have functions that return the recordset as an array: GetArray(), 
+  and as an associative array with the key being the first column: GetAssoc().
    
+
    Example 6: Connecting to 2 Databases At Once
    
+
    <?
+include('adodb.inc.php');	 # load code common to ADOdb
+$conn1 = &ADONewConnection('mysql');  # create a mysql connection
+$conn2 = &ADONewConnection('oracle');  # create a oracle connection
+
+$conn1->PConnect($server, $userid, $password, $database);
+$conn2->PConnect(false, $ora_userid, $ora_pwd, $oraname);
+
+$conn1->Execute('insert ...');
+$conn2->Execute('update ...');
+?>
    
+
     
+
    Example 7: Generating Update and Insert SQL
    
+ADOdb 1.31 and later supports two new recordset functions: GetUpdateSQL( ) and 
+GetInsertSQL( ). This allow you to perform a "SELECT * FROM table query WHERE...", 
+make a copy of the $rs->fields, modify the fields, and then generate the SQL to 
+update or insert into the table automatically. 
+
     We show how the functions can be used when accessing a table with the following 
+  fields: (ID, FirstName, LastName, Created). 
+
     Before these functions can be called, you need to initialize the recordset 
+  by performing a select on the table. Idea and code by Jonathan Younger jyounger#unilab.com. 
+
     
+
    <?
+#==============================================
+# SAMPLE GetUpdateSQL() and GetInsertSQL() code
+#==============================================
+include('adodb.inc.php');
+include('tohtml.inc.php');
+
+#==========================
+# This code tests an insert
+
+$sql = "SELECT * FROM ADOXYZ WHERE id = -1"; 
+# Select an empty record from the database
+
+$conn = &ADONewConnection("mysql");  # create a connection
+$conn->debug=1;
+$conn->PConnect("localhost", "admin", "", "test"); # connect to MySQL, testdb
+$rs = $conn->Execute($sql); # Execute the query and get the empty recordset
+
+$record = array(); # Initialize an array to hold the record data to insert
+
+# Set the values for the fields in the record
+# Note that field names are case-insensitive
+$record["firstname"] = "Bob";
+$record["lastNamE"] = "Smith";
+$record["creaTed"] = time();
+
+# Pass the empty recordset and the array containing the data to insert
+# into the GetInsertSQL function. The function will process the data and return
+# a fully formatted insert sql statement.
+$insertSQL = $conn->GetInsertSQL($rs, $record);
+
+$conn->Execute($insertSQL); # Insert the record into the database
+
+#==========================
+# This code tests an update
+
+$sql = "SELECT * FROM ADOXYZ WHERE id = 1"; 
+# Select a record to update
+
+$rs = $conn->Execute($sql); # Execute the query and get the existing record to update
+
+$record = array(); # Initialize an array to hold the record data to update
+
+# Set the values for the fields in the record
+# Note that field names are case-insensitive
+$record["firstname"] = "Caroline";
+$record["LasTnAme"] = "Smith"; # Update Caroline's lastname from Miranda to Smith
+
+# Pass the single record recordset and the array containing the data to update
+# into the GetUpdateSQL function. The function will process the data and return
+# a fully formatted update sql statement with the correct WHERE clause.
+# If the data has not changed, no recordset is returned
+$updateSQL = $conn->GetUpdateSQL($rs, $record);
+
+$conn->Execute($updateSQL); # Update the record in the database
+$conn->Close();
+?>
+
    
+
    Example 8: Implementing Scrolling with Next and Previous
    
+
     The following code creates a very simple recordset pager, where you can scroll 
+  from page to page of a recordset.
    
+
    +include_once('../adodb.inc.php');
+include_once('../adodb-pager.inc.php');
+session_start();
+
+$db = NewADOConnection('mysql');
+
+$db->Connect('localhost','root','','xphplens');
+
+$sql = "select * from adoxyz ";
+
+$pager = new ADODB_Pager($db,$sql);
+$pager->Render($rows_per_page=5);
    
+
    This will create a basic record pager that looks like this:  
+
     
+
+   
+    
+  
+  
+    
+  
+  
+    
+  
+
     |<   << 
+        >>   >| 
+        
    
+        
+        
+        
+        
+         
+          
+          
+          
+          
+        
+         
+          
+          
+          
+          
+        
+         
+          
+          
+          
+          
+        
+         
+          
+          
+          
+          
+        
+         
+          
+          
+          
+          
+        
+      
    IDFirst NameLast NameDate Created
    36 Alan Turing Sat 06, Oct 2001 
    37 Serena Williams Sat 06, Oct 2001 
    38 Yat Sun Sun Sat 06, Oct 2001 
    39 Wai Hun See Sat 06, Oct 2001 
    40 Steven Oey Sat 06, Oct 2001 
    Page 8/10
    
+
    The number of rows to display at one time is controled by the Render($rows) 
+  method. If you do not pass any value to Render(), ADODB_Pager will default to 
+  10 records per page. 
+
    You can control the column titles by modifying your SQL (supported by most 
+  databases): 
+
    $sql = 'select id as "ID", firstname as "First Name", 
+		  lastname as "Last Name", created as "Date Created" 
    		from adoxyz';
    
+
    The above code can be found in the adodb/tests/testpaging.php example 
+  included with this release, and the class ADODB_Pager in adodb/adodb-pager.inc.php. 
+  The ADODB_Pager code can be adapted by a programmer so that the text links can 
+  be replaced by images, and the dull white background be replaced with more interesting 
+  colors. 
+
    You can also allow display of html by setting $pager->htmlSpecialChars = false. 
+
    Some of the code used here was contributed by Iván Oliva and Cornel 
+  G. 
    
+
    Example 9: Exporting in CSV or Tab-Delimited Format
    
+
    We provide some helper functions to export in comma-separated-value (CSV) and 
+  tab-delimited formats:
    
+
    include_once('/path/to/adodb/toexport.inc.php');
    include_once('/path/to/adodb/adodb.inc.php');
    
+$db = &NewADOConnection('mysql');
    $db->Connect($server, $userid, $password, $database);

    $rs = $db->Execute('select fname as "First Name", surname as "Surname" from table');
+
+print "<pre>";
    print rs2csv($rs); # return a string, CSV format
    print '<hr>';
+
    $rs->MoveFirst(); # note, some databases do not support MoveFirst
    print rs2tab($rs,false); # return a string, tab-delimited
+						 # false == suppress field names in first line
    print '<hr>';
    $rs->MoveFirst();
    rs2tabout($rs); # send to stdout directly (there is also an rs2csvout function)
+print "</pre>";
+
+$rs->MoveFirst();
    $fp = fopen($path, "w");
+if ($fp) {
      rs2csvfile($rs, $fp); # write to file (there is also an rs2tabfile function)
+  fclose($fp);
    }
+
    
+
     Carriage-returns or newlines are converted to spaces. Field names are returned 
+  in the first line of text. Strings containing the delimiter character are quoted 
+  with double-quotes. Double-quotes are double-quoted again. This conforms to 
+  Excel import and export guide-lines. 
+
    All the above functions take as an optional last parameter, $addtitles which 
+  defaults to true. When set to false field names in the first line 
+  are suppressed. 
    
+
    Example 10: Recordset Filters
    
+
    Sometimes we want to pre-process all rows in a recordset before we use it. 
+  For example, we want to ucwords all text in recordset. 
+
    +include_once('adodb/rsfilter.inc.php');
+include_once('adodb/adodb.inc.php');
+
+// ucwords() every element in the recordset
+function do_ucwords(&$arr,$rs)
+{
+	foreach($arr as $k => $v) {
+		$arr[$k] = ucwords($v);
+	}
+}
+
+$db = NewADOConnection('mysql');
+$db->PConnect('server','user','pwd','db');
+
+$rs = $db->Execute('select ... from table');
+$rs = RSFilter($rs,'do_ucwords');
+
    
+
    The RSFilter function takes 2 parameters, the recordset, and the name 
+  of the filter function. It returns the processed recordset scrolled to 
+  the first record. The filter function takes two parameters, the current 
+  row as an array, and the recordset object. For future compatibility, you should 
+  not use the original recordset object. 
    
+
    Example 11: Smart Transactions
    
+The old way of doing transactions required you to use 
+
    +$conn->BeginTrans();
+$ok = $conn->Execute($sql);
+if ($ok) $ok = $conn->Execute($sql2);
+if (!$ok) $conn->RollbackTrans();
+else $conn->CommitTrans();
+
    
+This is very complicated for large projects because you have to track the error 
+status. Smart Transactions is much simpler. You start a smart transaction by calling 
+StartTrans(): 
+
    +$conn->StartTrans();
+$conn->Execute($sql);
+$conn->Execute($Sql2);
+$conn->CompleteTrans();
+
    
+CompleteTrans() detects when an SQL error occurs, and will Rollback/Commit as 
+appropriate. To specificly force a rollback even if no error occured, use FailTrans(). 
+Note that the rollback is done in CompleteTrans(), and not in FailTrans(). 
+
    +$conn->StartTrans();
+$conn->Execute($sql);
+if (!CheckRecords()) $conn->FailTrans();
+$conn->Execute($Sql2);
+$conn->CompleteTrans();
+
    
+
    You can also check if a transaction has failed, using HasFailedTrans(), which 
+  returns true if FailTrans() was called, or there was an error in the SQL execution. 
+  Make sure you call HasFailedTrans() before you call CompleteTrans(), as it is 
+  only works between StartTrans/CompleteTrans.
+
    Lastly, StartTrans/CompleteTrans is nestable, and only the outermost block 
+  is executed. In contrast, BeginTrans/CommitTrans/RollbackTrans is NOT nestable. 
+
    +$conn->StartTrans();
+$conn->Execute($sql);
+  $conn->StartTrans();    # ignored
+  if (!CheckRecords()) $conn->FailTrans();
+  $conn->CompleteTrans(); # ignored
+$conn->Execute($Sql2);
+$conn->CompleteTrans();
+
    
+
    Note: Savepoints are currently not supported. 
+
    Using Custom Error Handlers and PEAR_Error
    
+Apart from the old $con->debug = true; way of debugging, ADOdb 1.50 onwards provides 
+another way of handling errors using ADOdb's custom error handlers. 
+
     ADOdb provides two custom handlers which you can modify for your needs. The 
+  first one is in the adodb-errorhandler.inc.php file. This makes use of 
+  the standard PHP functions error_reporting 
+  to control what error messages types to display, and trigger_error 
+  which invokes the default PHP error handler. 
+
     Including the above file will cause trigger_error($errorstring,E_USER_ERROR) 
+  to be called when
    
+  (a) Connect() or PConnect() fails, or 
    
+  (b) a function that executes SQL statements such as Execute() or SelectLimit() 
+  has an error.
    
+  (c) GenID() appears to go into an infinite loop. 
+
     The $errorstring is generated by ADOdb and will contain useful debugging information 
+  similar to the error.log data generated below. This file adodb-errorhandler.inc.php 
+  should be included before you create any ADOConnection objects. 
+
     If you define error_reporting(0), no errors will be passed to the error handler. 
+  If you set error_reporting(E_ALL), all errors will be passed to the error handler. 
+  You still need to use ini_set("display_errors", "0" or "1") to control 
+  the display of errors. 
+
    +<?php
+error_reporting(E_ALL); # pass any error messages triggered to error handler
+include('adodb-errorhandler.inc.php');
+include('adodb.inc.php');
+include('tohtml.inc.php');
+$c = NewADOConnection('mysql');
+$c->PConnect('localhost','root','','northwind');
+$rs=$c->Execute('select * from productsz'); #invalid table productsz');
+if ($rs) rs2html($rs);
+?>
+
    
+
     If you want to log the error message, you can do so by defining the following 
+  optional constants ADODB_ERROR_LOG_TYPE and ADODB_ERROR_LOG_DEST. ADODB_ERROR_LOG_TYPE 
+  is the error log message type (see error_log 
+  in the PHP manual). In this case we set it to 3, which means log to the file 
+  defined by the constant ADODB_ERROR_LOG_DEST. 
+
    +<?php
+error_reporting(E_ALL); # report all errors
+ini_set("display_errors", "0"); # but do not echo the errors
+define('ADODB_ERROR_LOG_TYPE',3);
+define('ADODB_ERROR_LOG_DEST','C:/errors.log');
+include('adodb-errorhandler.inc.php');
+include('adodb.inc.php');
+include('tohtml.inc.php');
+
+$c = NewADOConnection('mysql');
+$c->PConnect('localhost','root','','northwind');
+$rs=$c->Execute('select * from productsz'); ## invalid table productsz
+if ($rs) rs2html($rs);
+?>
+
    
+The following message will be logged in the error.log file: 
+
    +(2001-10-28 14:20:38) mysql error: [1146: Table 'northwind.productsz' doesn't exist] in
+ EXECUTE("select * from productsz")
+
    
+The second error handler is adodb-errorpear.inc.php. This will create a 
+PEAR_Error derived object whenever an error occurs. The last PEAR_Error object 
+created can be retrieved using ADODB_Pear_Error(). 
+
    +<?php
+include('adodb-errorpear.inc.php');
+include('adodb.inc.php');
+include('tohtml.inc.php');
+$c = NewADOConnection('mysql');
+$c->PConnect('localhost','root','','northwind');
+$rs=$c->Execute('select * from productsz'); #invalid table productsz');
+if ($rs) rs2html($rs);
+else {
+	$e = ADODB_Pear_Error();
+	echo '<p>',$e->message,'</p>';
+}
+?>
+
    
+
     You can use a PEAR_Error derived class by defining the constant ADODB_PEAR_ERROR_CLASS 
+  before the adodb-errorpear.inc.php file is included. For easy debugging, you 
+  can set the default error handler in the beginning of the PHP script to PEAR_ERROR_DIE, 
+  which will cause an error message to be printed, then halt script execution: 
+
    +include('PEAR.php');
+PEAR::setErrorHandling('PEAR_ERROR_DIE');
+
    
+
     Note that we do not explicitly return a PEAR_Error object to you when an error 
+  occurs. We return false instead. You have to call ADODB_Pear_Error() to get 
+  the last error or use the PEAR_ERROR_DIE technique. 
+
    Error Messages
    
+
    Error messages are outputted using the static method ADOConnnection::outp($msg,$newline=true). 
+  By default, it sends the messages to the client. You can override this to perform 
+  error-logging. 
+
     Data Source Names
    
+
    We now support connecting using PEAR style DSN's. A DSN is a connection string 
+  of the form:
    
+
    $dsn = "$driver://$username:$password@$hostname/$databasename";
    
+
    You pass the DSN to the static class function DB::Connect. An example:
    
+
       include_once('../adodb/adodb-pear.inc.php');
+   $username = 'root';
+   $password = '';
+   $hostname = 'localhost';
+   $databasename = 'xphplens';
+   $driver = 'mysql';
+   $dsn = "$driver://$username:$password@$hostname/$databasename";
    
+
       $db = DB::Connect($dsn);
       $rs = $db->Execute('select firstname,lastname from adoxyz');
+   $cnt = 0;
+   while ($arr = $rs->FetchRow()) {
+		print_r($arr); print "<br>";
+   }
    
+
    This requires PEAR to be installed and in the default include path in php.ini.
    
+
    Caching of Recordsets
    
+
    ADOdb now supports caching of recordsets using the CacheExecute( ), CachePageExecute( 
+  ) and CacheSelectLimit( ) functions. There are similar to the non-cache functions, 
+  except that they take a new first parameter, $secs2cache. 
+
     An example: 
+
    +include('adodb.inc.php'); # load code common to ADOdb
+$ADODB_CACHE_DIR = '/usr/ADODB_cache';
+$conn = &ADONewConnection('mysql');  # create a connection
+$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
+$sql = 'select CustomerName, CustomerID from customers';
+$rs = $conn->CacheExecute(15,$sql);
    
+
     The first parameter is the number of seconds to cache 
+  the query. Subsequent calls to that query will used the cached version stored 
+  in $ADODB_CACHE_DIR. To force a query to execute and flush the cache, call CacheExecute() 
+  with the first parameter set to zero. Alternatively, use the CacheFlush($sql) 
+  call. 
    
+
    For the sake of security, we recommend you set register_globals=off 
+  in php.ini if you are using $ADODB_CACHE_DIR.
    
+
    In ADOdb 1.80 onwards, the secs2cache parameter is optional in CacheSelectLimit() 
+  and CacheExecute(). If you leave it out, it will use the $connection->cacheSecs 
+  parameter, which defaults to 60 minutes. 
+
    +	$conn->Connect(...);
+	$conn->cacheSecs = 3600*24; # cache 24 hours
+	$rs = $conn->CacheExecute('select * from table');
+
    
+
    Please note that magic_quotes_runtime should be turned off. More 
+  info.  
+
    Pivot Tables
    
+ 
    Since ADOdb 2.30, we support the generation of 
+SQL to create pivot tables, also known as cross-tabulations. For further explanation 
+read this DevShed Cross-Tabulation 
+tutorial. We assume that your database supports the SQL case-when expression. 
     
+ 
+
    In this example, we will use the Northwind database from Microsoft. In the 
+  database, we have a products table, and we want to analyze this table by suppliers 
+  versus product categories. We will place the suppliers on each row, and 
+  pivot on categories. So from the table on the left, we generate the pivot-table 
+  on the right:
    
+     
+
+  
+	
+	
+	
+  
+
    
+	  
+		 
+		  
+		  
+		
+		 
+		  
+		  
+		
+		 
+		  
+		  			
+		
+		 
+		  			
+		  
+		
+	  
    SupplierCategory
    supplier1category1
    supplier2category1
    supplier2category2
    
+	    		 -->
+	  
+		 
+		  
+		  
+		  
+		  
+		
+		 
+		  
+		  
+		  
+		  
+		
+		 
+		  
+		  
+		  
+		  
+		
+	  
     category1category2total
    supplier1101
    supplier2112
    
+	
    
+ 
+
    The following code will generate the SQL for a cross-tabulation: 
+
    +# Query the main "product" table
+# Set the rows to CompanyName
+# and the columns to the values of Categories
+# and define the joins to link to lookup tables 
+# "categories" and "suppliers"
+#
+ include "adodb/pivottable.php";
+ $sql = PivotTableSQL(
+ 	$gDB,                                      # adodb connection
+ 	'products p ,categories c ,suppliers s',   # tables
+	'CompanyName',                             # rows (multiple fields allowed)
+	'CategoryName',                            # column to pivot on 
+	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
+);
+
    
+     
+
     This will generate the following SQL:
    
+
    SELECT CompanyName, 
    
+  SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
+  
    
+  SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
+  
    
+  SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
+  
    
+  SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy 
+  Products", 
    
+  SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
+  
    
+  SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
+  
    
+  SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
+  
    
+  SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
+  
    
+  SUM(1) as Total 
    
+  FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID 
+  and s.SupplierID= p.SupplierID 
    
+  GROUP BY CompanyName
    
+
     You can also pivot on numerical columns and generate totals 
+	by using ranges. This code was revised in ADODB 2.41 
+	and is not backward compatible. The second example shows this:
    
+
    + $sql = PivotTableSQL(
+ 	$gDB,                                       # adodb connection
+ 	'products p ,categories c ,suppliers s',    # tables
+	'CompanyName',                              # rows (multiple fields allowed)
+   array(                                       # column ranges
+	' 0 '      => 'UnitsInStock <= 0',
+	"1 to 5"   => '0 < UnitsInStock and UnitsInStock <= 5',
+	"6 to 10"  => '5 < UnitsInStock and UnitsInStock <= 10',
+	"11 to 15" => '10 < UnitsInStock and UnitsInStock <= 15',
+	"16+"      => '15 < UnitsInStock'
+	),
+	' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
+	'UnitsInStock',                             # sum this field
+	'Sum '                                      # sum label prefix
+);
+
     
+
    Which generates: 
    
+
      SELECT CompanyName, 
    
+	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum 
+	0 ", 
    
+	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock 
+	ELSE 0 END) AS "Sum 1 to 5",
    
+	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock 
+	ELSE 0 END) AS "Sum 6 to 10",
    
+	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock 
+	ELSE 0 END) AS "Sum 11 to 15", 
    
+	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 
+	16+", 
    
+	SUM(UnitsInStock) AS "Sum UnitsInStock", 
    
+	SUM(1) as Total,
    
+	FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID 
+	and s.SupplierID= p.SupplierID 
    
+	GROUP BY CompanyName
    
+	     
    
+
    
+
    Class Reference
    
+
    Function parameters with [ ] around them are optional.
    
+     
+
    Global Variables
    
+
    $ADODB_COUNTRECS
    
+
    If the database driver API does not support counting the number of records 
+	returned in a SELECT statement, the function RecordCount() is emulated when 
+	the global variable $ADODB_COUNTRECS is set to true, which is the default. 
+	We emulate this by buffering the records, which can take up large amounts 
+	of memory for big recordsets. Set this variable to false for the best performance. 
+	This variable is checked every time a query is executed, so you can selectively 
+	choose which recordsets to count.
    
+
    $ADODB_CACHE_DIR
    
+ 
+
    If you are using recordset caching, this is the directory to save your recordsets 
+  in. Define this before you call any caching functions such as CacheExecute( 
+  ). We recommend setting register_globals=off in php.ini if you use this 
+  feature for security reasons.
    
+
    If you are using Unix and apache, you might need to set your cache directory 
+  permissions to something similar to the following:
    
+     
+
    chown -R apache /path/to/adodb/cache
    
+  chgrp -R apache /path/to/adodb/cache 
    
+
+
    $ADODB_ANSI_PADDING_OFF
    
+
    Determines whether to right trim CHAR fields (and also VARCHAR for ibase/firebird).
+Set to true to trim. Default is false. Currently works for oci8po, ibase and firebird 
+drivers. Added in ADOdb 4.01.
+
    $ADODB_LANG
    
+
    Determines the language used in MetaErrorMsg(). The default is 'en', for English. 
+To find out what languages are supported, see the files 
+in adodb/lang/adodb-$lang.inc.php, where $lang is the supported langauge.
+
    $ADODB_FETCH_MODE
    
+
    This is a global variable that determines how arrays are retrieved by recordsets. 
+  The recordset saves this value on creation (eg. in Execute( ) or SelectLimit( 
+  )), and any subsequent changes to $ADODB_FETCH_MODE have no affect on existing 
+  recordsets, only on recordsets created in the future.
    
+
    The following constants are defined:
    
+     
+
    define('ADODB_FETCH_DEFAULT',0);
    
+  define('ADODB_FETCH_NUM',1);
    
+  define('ADODB_FETCH_ASSOC',2);
    
+  define('ADODB_FETCH_BOTH',3); 
    
+ 
+
     An example: 
+
    +	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$rs1 = $db->Execute('select * from table');
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs2 = $db->Execute('select * from table');
+	print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
+	print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
+
    
+
     As you can see in the above example, both recordsets store and use different 
+	fetch modes based on the $ADODB_FETCH_MODE setting when the recordset was 
+	created by Execute().
    
+
    If no fetch mode is predefined, the fetch mode defaults to ADODB_FETCH_DEFAULT. 
+	The behaviour of this default mode varies from driver to driver, so do not 
+	rely on ADODB_FETCH_DEFAULT. For portability, we recommend sticking to ADODB_FETCH_NUM 
+	or ADODB_FETCH_ASSOC. Many drivers do not support ADODB_FETCH_BOTH.
    
+
    SetFetchMode Function
    
+
    Some programmers prefer to use a more object-oriented solution, where the fetch 
+	mode is set by a object function, SetFetchMode. 
+	Once this function is called for a connection object, that connection object 
+	will ignore the global variable $ADODB_FETCH_MODE and will use the internal 
+	fetchMode property exclusively.
    
+
    +	$db->SetFetchMode(ADODB_FETCH_NUM);
+	$rs1 = $db->Execute('select * from table');
+	$db->SetFetchMode(ADODB_FETCH_ASSOC);
+	$rs2 = $db->Execute('select * from table');
+	print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
+	print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
    
+
    To retrieve the previous fetch mode, you can use check the $db->fetchMode 
+	property, or use the return value of SetFetchMode( ). 
+
    ADODB_ASSOC_CASE
    
+
    You can control the associative fetch case for certain drivers which behave 
+	differently. For the sybase, oci8po, mssql, odbc and ibase drivers and all 
+	drivers derived from them, ADODB_ASSOC_CASE will by default generate recordsets 
+	where the field name keys are lower-cased. Use the constant ADODB_ASSOC_CASE 
+	to change the case of the keys. There are 3 possible values:
    
+
    0 = assoc lowercase field names. $rs->fields['orderid']
    
+	1 = assoc uppercase field names. $rs->fields['ORDERID']
    
+	2 = use native-case field names. $rs->fields['OrderID'] -- this is the 
+	default since ADOdb 2.90
    
+
    To use it, declare it before you incldue adodb.inc.php.
    
+
    define('ADODB_ASSOC_CASE', 2); # use native-case for ADODB_FETCH_ASSOC
    
+	include('adodb.inc.php'); 
    
+
    
+
    ADOConnection
    
+
    Object that performs the connection to the database, executes SQL statements 
+	and has a set of utility functions for standardising the format of SQL statements 
+	for issues such as concatenation and date formats.
    
+
    ADOConnection Fields
    
+
    databaseType: Name of the database system we are connecting to. Eg. 
+	odbc or mssql or mysql.
    
+
    dataProvider: The underlying mechanism used to connect to the database. 
+	Normally set to native, unless using odbc or ado.
    
+
    host: Name of server or data source name (DSN) to connect to.
    
+
    database: Name of the database or to connect to. If ado is used, it 
+	will hold the ado data provider.
    
+
    user: Login id to connect to database. Password is not saved for security 
+	reasons.
    
+
    raiseErrorFn: Allows you to define an error handling function. See adodb-errorhandler.inc.php 
+	for an example.
    
+
    debug: Set to true to make debug statements to appear.
    
+
    concat_operator: Set to '+' or '||' normally. The operator used to concatenate 
+	strings in SQL. Used by the Concat function.
    
+
    fmtDate: The format used by the DBDate 
+	function to send dates to the database. is '#Y-m-d#' for Microsoft Access, 
+	and ''Y-m-d'' for MySQL.
    
+
    fmtTimeStamp: The format used by the DBTimeStamp 
+	function to send timestamps to the database. 
    
+
    true: The value used to represent true.Eg. '.T.'. for Foxpro, '1' for 
+	Microsoft SQL.
    
+
    false:  The value used to represent false. Eg. '.F.'. for Foxpro, '0' 
+	for Microsoft SQL.
    
+
    replaceQuote: The string used to escape quotes. Eg. double single-quotes 
+	for Microsoft SQL, and backslash-quote for MySQL. Used by qstr.
    
+
    autoCommit: indicates whether automatic commit is enabled. Default is 
+	true.
    
+
    charSet: set the default charset to use. Currently only interbase supports 
+	this.
    
+
    dialect: set the default sql dialect to use. Currently only interbase 
+	supports this.
    
+
    metaTablesSQL: SQL statement to return a list of available tables. Eg. 
+	SHOW TABLES in MySQL.
    
+
    genID: The latest id generated by GenID() if supported by the database.
    
+
    cacheSecs: The number of seconds to cache recordsets if CacheExecute() 
+	or CacheSelectLimit() omit the $secs2cache parameter. Defaults to 60 minutes.
    
+
    sysDate: String that holds the name of the database function to call 
+	to get the current date. Useful for inserts and updates.
    
+
    sysTimeStamp: String that holds the name of the database function to 
+	call to get the current timestamp/datetime value.
    
+
    leftOuter: String that holds operator for left outer join, if known. 
+	Otherwise set to false.
    
+
    rightOuter: String that holds operator for left outer join, if known. 
+	Otherwise set to false.
    
+
    ansiOuter: Boolean that if true indicates that ANSI style outer joins 
+	are permitted. Eg. select * from table1 left join table2 on p1=p2.
    
+
    connectSID: Boolean that indicates whether to treat the $database parameter 
+	in connects as the SID for the oci8 driver. Defaults to false. Useful for 
+	Oracle 8.0.5 and earlier.
    
+
    autoRollback: Persistent connections are auto-rollbacked in PConnect( 
+	) if this is set to true. Default is false.
    
+
    
+
    ADOConnection Main Functions
    
+
    ADOConnection( )
    
+
    Constructor function. Do not call this directly. Use ADONewConnection( ) instead.
    
+
    Connect($host,[$user],[$password],[$database])
    
+
    Non-persistent connect to data source or server $host, using userid 
+	$user and password $password. If the server supports multiple 
+	databases, connect to database $database. 
    
+
    Returns true/false depending on connection.
    
+
    ADO Note: If you are using a Microsoft ADO and not OLEDB, you can set the $database 
+	parameter to the OLEDB data provider you are using.
    
+
    PostgreSQL: An alternative way of connecting to the database is to pass the 
+	standard PostgreSQL connection string in the first parameter $host, and the 
+	other parameters will be ignored.
    
+
    For Oracle and Oci8, there are two ways to connect. First is to use the TNS 
+	name defined in your local tnsnames.ora (or ONAMES or HOSTNAMES). Place the 
+	name in the $database field, and set the $host field to false. Alternatively, 
+	set $host to the server, and $database to the database SID, this bypassed 
+	tnsnames.ora. 
+
    Examples: 
+
     # $oraname in tnsnames.ora/ONAMES/HOSTNAMES
+ $conn->Connect(false, 'scott', 'tiger', $oraname); 
+ $conn->Connect('server:1521', 'scott', 'tiger', 'ServiceName'); # bypass tnsnames.ora
    
+
    There are many examples of connecting to a database at php.weblogs.com/ADOdb, 
+	and in the testdatabases.inc.php file included in the release.
    
+
    PConnect($host,[$user],[$password],[$database])
    
+
    Persistent connect to data source or server $host, using userid $user 
+	and password $password. If the server supports multiple databases, 
+	connect to database $database.
    
+
    We now perform a rollback on persistent connection for selected databases since 
+	2.21, as advised in the PHP manual. See change log or source code for which 
+	databases are affected. 
+
    Returns true/false depending on connection. See Connect( ) above for more info.
    
+
    Since ADOdb 2.21, we also support autoRollback. If you set:
    
+     
+
     $conn = &NewADOConnection('mysql');
+ $conn->autoRollback = true; # default is false
+ $conn->PConnect(...); # rollback here
    
+
     Then when doing a persistent connection with PConnect( ), ADOdb will 
+  perform a rollback first. This is because it is documented that PHP is 
+  not guaranteed to rollback existing failed transactions when 
+  persistent connections are used. This is implemented in Oracle, 
+  MySQL, PgSQL, MSSQL, ODBC currently. 
+
    Since ADOdb 3.11, you can force non-persistent 
+connections even if PConnect is called by defining the constant 
+ADODB_NEVER_PERSIST  before you call PConnect.
+
    NConnect($host,[$user],[$password],[$database])
    
+
    Always force a new connection. In contrast, PHP sometimes reuses connections 
+	when you use Connect() or PConnect(). Currently works only on mysql (PHP 4.3.0 
+	or later), postgresql and oci8-derived drivers. For other drivers, NConnect() works like 
+	Connect(). 
+ 
+
    Execute($sql,$inputarr=false)
    
+
    Execute SQL statement $sql and return derived class of ADORecordSet 
+	if successful. Note that a record set is always returned on success, even 
+	if we are executing an insert or update statement. You can also pass in $sql a statement prepared 
+	in Prepare().
    
+
    Returns derived class of ADORecordSet. Eg. if connecting via mysql, then ADORecordSet_mysql 
+	would be returned. False is returned if there was an error in executing the 
+	sql.
    
+
    The $inputarr parameter can be used for binding variables to parameters. Below 
+	is an Oracle example:
    
+
    + $conn->Execute("SELECT * FROM TABLE WHERE COND=:val", array('val'=> $val));
+ 
    
+
    Another example, using ODBC,which uses the ? convention:
    
+
    +  $conn->Execute("SELECT * FROM TABLE WHERE COND=?", array($val));
+
    
+
+Binding variables
    
+Variable binding speeds the compilation and caching of SQL statements, leading 
+to higher performance. Currently Oracle, Interbase and ODBC supports variable binding. 
+Interbase/ODBC style ? binding is emulated in databases that do not support binding. 
+Note that you do not have to quote strings if you use binding.
+
     Variable binding in the odbc, interbase and oci8po drivers. 
+
    +$rs = $db->Execute('select * from table where val=?', array('10'));
+
    
+Variable binding in the oci8 driver: 
+
    +$rs = $db->Execute('select name from table where val=:key', 
+  array('key' => 10));
+
    
+
+Bulk binding
+
    Since ADOdb 3.80, we support bulk binding in Execute(), in which you pass in a 2-dimensional array to
+be bound to an INSERT/UPDATE or DELETE statement.
+
    +$arr = array(
+	array('Ahmad',32),
+	array('Zulkifli', 24),
+	array('Rosnah', 21)
+	);
+$ok = $db->Execute('insert into table (name,age) values (?,?)',$arr);
+
    
+
    This provides very high performance as the SQL statement is prepared first. 
+The prepared statement is executed repeatedly for each array row until all rows are completed, 
+or until the first error. Very useful for importing data.
+
+
    CacheExecute([$secs2cache,]$sql,$inputarr=false)
    
+
    Similar to Execute, except that the recordset is cached for $secs2cache seconds 
+	in the $ADODB_CACHE_DIR directory, and $inputarr only accepts 1-dimensional arrays. 
+	If CacheExecute() is called again with the same $sql, $inputarr, 
+	and also the same database, same userid, and the cached recordset 
+	has not expired, the cached recordset is returned. 
+
    +  include('adodb.inc.php'); 
+  include('tohtml.inc.php');
+  $ADODB_CACHE_DIR = '/usr/local/ADOdbcache';
+  $conn = &ADONewConnection('mysql'); 
+  $conn->PConnect('localhost','userid','password','database');
+  $rs = $conn->CacheExecute(15, 'select * from table'); # cache 15 secs
+  rs2html($rs); /* recordset to html table */  
+
    
+
     Alternatively, since ADOdb 1.80, the $secs2cache parameter is optional:
    
+
    	$conn->Connect(...);
+   	$conn->cacheSecs = 3600*24; // cache 24 hours
+	$rs = $conn->CacheExecute('select * from table');
+
    
+If $secs2cache is omitted, we use the value 
+in $connection->cacheSecs (default is 3600 seconds, or 1 hour). Use CacheExecute() 
+only with SELECT statements. 
+
    Performance note: I have done some benchmarks and found that they vary so greatly 
+	that it's better to talk about when caching is of benefit. When your database 
+	server is much slower than your Web server or the database is very 
+	overloaded then ADOdb's caching is good because it reduces the load on 
+	your database server. If your database server is lightly loaded or much faster 
+	than your Web server, then caching could actually reduce performance. 
    
+
    ExecuteCursor($sql,$cursorName='rs',$parameters=false)
    
+
    Execute an Oracle stored procedure, and returns an Oracle REF cursor variable as 
+	a regular ADOdb recordset. Does not work with any other database except oci8. 
+	Thanks to Robert Tuttle for the design.
+
    +    $db = ADONewConnection("oci8"); 
+    $db->Connect("foo.com:1521", "uid", "pwd", "FOO"); 
+    $rs = $db->ExecuteCursor("begin :cursorvar := getdata(:param1); end;", 
+					'cursorvar',
+					array('param1'=>10)); 
+    # $rs is now just like any other ADOdb recordset object
        rs2html($rs);
    
+
    ExecuteCursor() is a helper function that does the following internally: 
+
    +	$stmt = $db->Prepare("BEGIN :RS := SP_FOO(); END;", true); 
+	$db->Parameter($stmt, $cur, 'RS', false, -1, OCI_B_CURSOR);
+	$rs = $db->Execute($stmt);
    
+
    SelectLimit($sql,$numrows=-1,$offset=-1,$inputarr=false)
    
+
    Returns a recordset if successful. Returns false otherwise. Performs a select 
+	statement, simulating PostgreSQL's SELECT statement, LIMIT $numrows OFFSET 
+	$offset clause.
    
+
    In PostgreSQL, SELECT * FROM TABLE LIMIT 3 will return the first 3 records 
+	only. The equivalent is $connection->SelectLimit('SELECT * FROM TABLE',3). 
+	This functionality is simulated for databases that do not possess this feature.
    
+
    And SELECT * FROM TABLE LIMIT 3 OFFSET 2 will return records 3, 4 and 5 (eg. 
+	after record 2, return 3 rows). The equivalent in ADOdb is $connection->SelectLimit('SELECT 
+	* FROM TABLE',3,2).
    
+
    Note that this is the opposite of MySQL's LIMIT clause. You can also 
+	set $connection->SelectLimit('SELECT * FROM TABLE',-1,10) to 
+	get rows 11 to the last row.
    
+
    The last parameter $inputarr is for databases that support variable binding 
+	such as Oracle oci8. This substantially reduces SQL compilation overhead. 
+	Below is an Oracle example:
    
+
    + $conn->SelectLimit("SELECT * FROM TABLE WHERE COND=:val", 100,-1,array('val'=> $val));
+ 
    
+
    The oci8po driver (oracle portable driver) uses the more standard bind variable 
+	of ?: 
+
    + $conn->SelectLimit("SELECT * FROM TABLE WHERE COND=?", 100,-1,array('val'=> $val));
+
    
+
     
+
    Ron Wilson reports that SelectLimit does not work with UNIONs. 
+
    CacheSelectLimit([$secs2cache,] $sql, $numrows=-1,$offset=-1,$inputarr=false)
    
+
    Similar to SelectLimit, except that the recordset returned is cached for $secs2cache 
+	seconds in the $ADODB_CACHE_DIR directory. 
    
+
    Since 1.80, $secs2cache has been optional, and you can define the caching time 
+	in $connection->cacheSecs.
    
+     
+
    	$conn->Connect(...);
+   $conn->cacheSecs = 3600*24; // cache 24 hours
+	$rs = $conn->CacheSelectLimit('select * from table',10);
    
+ 
+
    CacheFlush($sql=false,$inputarr=false)
    
+
    Flush (delete) any cached recordsets for the SQL statement $sql in $ADODB_CACHE_DIR. 
+
    If no parameter is passed in, then all adodb_*.cache files are deleted. 
+
     If you want to flush all cached recordsets manually, execute the following 
+	PHP code (works only under Unix): 
    
+	   system("rm -f `find ".$ADODB_CACHE_DIR." -name 
+	adodb_*.cache`");
    
+
    For general cleanup of all expired files, you should use crontab 
+	on Unix, or at.exe on Windows, and a shell script similar to the following:
    
+	#------------------------------------------------------ 
    
+	# This particular example deletes files in the TMPPATH 
    
+	# directory with the string ".cache" in their name that 
    
+	# are more than 7 days old. 
    
+	#------------------------------------------------------ 
    
+	AGED=7 
    
+	find ${TMPPATH} -mtime +$AGED | grep "\.cache" | xargs rm -f 
    
+	     
    
+
    MetaError($errno=false)
    
+
    Returns a virtualized error number, based on PEAR DB's error number system. You might
+need to include adodb-error.inc.php before you call this function. The parameter $errno
+is the native error number you want to convert. If you do not pass any parameter, MetaError
+will call ErrorNo() for you and convert it. If the error number cannot be virtualized, MetaError 
+will return -1 (DB_ERROR).
    
+
+
    MetaErrorMsg($errno)
    
+
    Pass the error number returned by MetaError() for the equivalent textual error message.
    
+
    ErrorMsg()
    
+
    Returns the last status or error message. The error message is reset after every 
+call to Execute(). 
+
    
+This can return a string even if 
+	no error occurs. In general you do not need to call this function unless an 
+	ADOdb function returns false on an error. 
    
+
    Note: If debug is enabled, the SQL error message is always displayed 
+	when the Execute function is called.
    
+
    ErrorNo()
    
+
    Returns the last error number. The error number is reset after every call to Execute(). 
+If 0 is returned, no error occurred.
+
    
+Note that old versions of PHP (pre 4.0.6) do 
+	not support error number for ODBC. In general you do not need to call this 
+	function unless an ADOdb function returns false on an error.
    
+    
+
    SetFetchMode($mode)
    
+
    Sets the current fetch mode for the connection and stores 
+	it in $db->fetchMode. Legal modes are ADODB_FETCH_ASSOC and ADODB_FETCH_NUM. 
+	For more info, see $ADODB_FETCH_MODE.
    
+
    Returns the previous fetch mode, which could be false 
+	if SetFetchMode( ) has not been called before.
    
+ 
+
    CreateSequence($seqName = 'adodbseq',$startID=1)
    
+
    Create a sequence. The next time GenID( ) is called, the value returned will 
+	be $startID. Added in 2.60. 
+
    DropSequenceD($seqName = 'adodbseq')
    
+
    Delete a sequence. Added in 2.60. 
+
    GenID($seqName = 'adodbseq',$startID=1)
    
+
    Generate a sequence number . Works for interbase, 
+	mysql, postgresql, oci8, oci8po, mssql, ODBC based (access,vfp,db2,etc) drivers 
+	currently. Uses $seqName as the name of the sequence. GenID() will automatically 
+	create the sequence for you if it does not exist (provided the userid has 
+	permission to do so). Otherwise you will have to create the sequence yourself. 
+
     If your database driver emulates sequences, the name of the table is the sequence 
+	name. The table has one column, "id" which should be of type integer, or if 
+	you need something larger - numeric(16). 
+
     For ODBC and databases that do not support sequences natively (eg mssql, mysql), 
+	we create a table for each sequence. If the sequence has not been defined 
+	earlier, it is created with the starting value set in $startID.
    
+
    Note that the mssql driver's GenID() before 1.90 used to generate 16 byte GUID's.
    
+
    UpdateBlob($table,$column,$val,$where)
    
+Allows you to store a blob (in $val) into $table into $column in a row at $where. 
+
     Usage: 
+
     
+
    +	# for oracle
+	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, empty_blob())');
+	$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
+	
+	# non oracle databases
+	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+	$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
+
    
+
     Returns true if succesful, false otherwise. Supported by MySQL, PostgreSQL, 
+	Oci8, Oci8po and Interbase drivers. Other drivers might work, depending on 
+	the state of development.
    
+
    Note that when an Interbase blob is retrieved using SELECT, it still needs 
+	to be decoded using $connection->DecodeBlob($blob); to derive the original 
+	value in versions of PHP before 4.1.0. 
+
    For PostgreSQL, you can store your blob using blob oid's or as a bytea field. 
+	You can use bytea fields but not blob oid's currently with UpdateBlob( ). 
+	Conversely UpdateBlobFile( ) supports oid's, but not bytea data.
    
+	
    
+	If you do not pass in an oid, then UpdateBlob() assumes that you are storing 
+	in bytea fields.
+
    UpdateClob($table,$column,$val,$where)
    
+Allows you to store a clob (in $val) into $table into $column in a row at $where. 
+Similar to UpdateBlob (see above), but for Character Large OBjects. 
+
     Usage:
+
    +	# for oracle
+	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, empty_clob())');
+	$conn->UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');
+	
+	# non oracle databases
+	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
+	$conn->UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');
+
    
+
    UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
    
+
    Similar to UpdateBlob, except that we pass in a file path to where the blob 
+	resides.
+
    For PostgreSQL, if you are using blob oid's, use this interface. This interface 
+	does not support bytea fields.
+
    Returns true if successful, false otherwise. 
+
    BlobEncode($blob) 
+
    Some databases require blob's to be encoded manually before upload. Note if 
+	you use UpdateBlob( ) or UpdateBlobFile( ) the conversion is done automatically 
+	for you and you do not have to call this function. For PostgreSQL, currently, 
+	BlobEncode() can only be used for bytea fields.
+
    Returns the encoded blob value.
+
    Note that there is a connection property called blobEncodeType which 
+	has 3 legal values: 
+
    false - no need to perform encoding or decoding.
    
+	'I' - blob encoding required, and returned encoded blob is a numeric value 
+	(no need to quote).
    
+	'C' - blob encoding required, and returned encoded blob is a character value 
+	(requires quoting).
+
    This is purely for documentation purposes, so that programs that accept multiple 
+	database drivers know what is the right thing to do when processing blobs.
+
    BlobDecode($blob) 
+
    Some databases require blob's to be decoded manually after doing a select statement. 
+	If the database does not require decoding, then this function will return 
+	the blob unchanged. Currently BlobDecode is only required for one database, 
+	PostgreSQL, and only if you are using blob oid's (if you are using bytea fields, 
+	we auto-decode for you).
+
    $rs = $db->Execute("select bloboid from postgres_table where id=$key");
+$blob = $db->BlobDecode( reset($rs->fields) );
    
+
    Replace($table, $arrFields, $keyCols,$autoQuote=false)
    
+
    Try to update a record, and if the record is not found, an insert statement 
+	is generated and executed. Returns 0 on failure, 1 if update statement worked, 
+	2 if no record was found and the insert was executed successfully. This differs 
+	from MySQL's replace which deletes the record and inserts a new record. This 
+	also means you cannot update the primary key. The only exception to this is 
+	Interbase and its derivitives, which uses delete and insert because of some 
+	Interbase API limitations. 
+
    The parameters are $table which is the table name, the $keyCols which is an 
+	associative array where the keys are the field names, and keyCols is the name 
+	of the primary key, or an array of field names if it is a compound key. If 
+	$autoQuote is set to true, then Replace() will quote all values that are non-numeric; 
+	auto-quoting will not quote nulls. Note that auto-quoting will not work if 
+	you use SQL functions or operators. 
+
    Examples: 
+
    +# single field primary key
+$ret = $db->Replace('atable', 
+	array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
+	'id',$autoquote = true);	
+# generates UPDATE atable SET firstname='Harun',lastname='Al-Rashid' WHERE id=1000
+# or INSERT INTO atable (id,firstname,lastname) VALUES (1000,'Harun','Al-Rashid')
+
+# compound key
+$ret = $db->Replace('atable2', 
+	array('firstname'=>'Harun','lastname'=>'Al-Rashid', 'age' => 33, 'birthday' => 'null'),
+	array('lastname','firstname'),
+	$autoquote = true);
+
+# no auto-quoting
+$ret = $db->Replace('atable2', 
+	array('firstname'=>"'Harun'",'lastname'=>"'Al-Rashid'", 'age' => 'null'),
+	array('lastname','firstname'));	
+
    
+
    GetUpdateSQL(&$rs, $arrFields, $forceUpdate=false,$magicq=false)
    
+
    Generate SQL to update a table given a recordset $rs, and the modified fields 
+	of the array $arrFields (which must be an associative array holding the column 
+	names and the new values) are compared with the current recordset. If $forceUpdate 
+	is true, then we also generate the SQL even if $arrFields is identical to 
+	$rs->fields. Requires the recordset to be associative. $magicq is used 
+	to indicate whether magic quotes are enabled (see qstr()). The field names in the array 
+	are case-insensitive.
    
+	
    Since 3.61, define('ADODB_FORCE_NULLS',1) and all PHP nulls will be auto-converted to SQL nulls.
+
    GetInsertSQL(&$rs, $arrFields,$magicq=false)
    
+
    Generate SQL to insert into a table given a recordset $rs. Requires the query 
+	to be associative. $magicq is used to indicate whether magic quotes are enabled 
+	(for qstr()). The field names in the array are case-insensitive.
    
+	
+
    Since 3.61, define('ADODB_FORCE_NULLS',1) and all PHP nulls will be auto-converted 
+  to SQL nulls. 
+
    PageExecute($sql, $nrows, $page, $inputarr=false) 
+
    Used for pagination of recordset. $page is 1-based. See Example 
+  8.
    
+     
+
    CachePageExecute($secs2cache, 
+  $sql, $nrows, $page, $inputarr=false) 
    
+
    Used for pagination of recordset. $page is 1-based. See 
+  Example 8. Caching version of PageExecute.
    
+ 
+
    
+
    Close( )
    
+
    Close the database connection. PHP4 proudly states that we no longer have to 
+  clean up at the end of the connection because the reference counting mechanism 
+  of PHP4 will automatically clean up for us.
    
+  
    StartTrans( )
    
+  
    Start a monitored transaction. As SQL statements are executed, ADOdb will monitor
+  for SQL errors, and if any are detected, when CompleteTrans() is called, we auto-rollback.
+  
    
+  
     To understand why StartTrans() is superior to BeginTrans(), 
+  let us examine a few ways of using BeginTrans().
+  The following is the wrong way to use transactions: 
+
    +$DB->BeginTrans();
+$DB->Execute("update table1 set val=$val1 where id=$id");
+$DB->Execute("update table2 set val=$val2 where id=$id");
+$DB->CommitTrans();
+
    
+
    because you perform no error checking. It is possible to update table1 and 
+  for the update on table2 to fail. Here is a better way: 
+
    +$DB->BeginTrans();
+$ok = $DB->Execute("update table1 set val=$val1 where id=$id");
+if ($ok) $ok = $DB->Execute("update table2 set val=$val2 where id=$id");
+if ($ok) $DB->CommitTrans();
+else $DB->RollbackTrans();
+
    
+
    Another way is (since ADOdb 2.0): 
+
    +$DB->BeginTrans();
+$ok = $DB->Execute("update table1 set val=$val1 where id=$id");
+if ($ok) $ok = $DB->Execute("update table2 set val=$val2 where id=$id");
+$DB->CommitTrans($ok);
+
    
+
     Now it is a headache monitoring $ok all over the place. StartTrans() is an
+improvement because it monitors all SQL errors for you. This is particularly
+useful if you are calling black-box functions in which SQL queries might be executed.
+ Also all BeginTrans, CommitTrans and RollbackTrans calls inside a StartTrans block 
+  will be disabled, so even if the black box function does a commit, it will be ignored.
+
    +$DB->StartTrans();
+CallBlackBox();
+$DB->Execute("update table1 set val=$val1 where id=$id");
+$DB->Execute("update table2 set val=$val2 where id=$id");
+$DB->CompleteTrans($ok);
+
    
+
    Note that a StartTrans blocks are nestable, the inner blocks are ignored.
+ 
    CompleteTrans($autoComplete=true)
    
+  
    Complete a transaction called with StartTrans(). This function monitors
+  for SQL errors, and will commit if no errors have occured, otherwise it will rollback. 
+  Returns true on commit, false on rollback. If the parameter $autoComplete is true
+  monitor sql errors and commit and rollback as appropriate. Set $autoComplete to false 
+  to force rollback even if no SQL error detected.
+  
    FailTrans( )
    
+  
    Fail a transaction started with StartTrans(). The rollback will only occur when
+  CompleteTrans() is called.
+    
    HasFailedTrans( )
    
+	
    Check whether smart transaction has failed, 
+	eg. returns true if there was an error in SQL execution or FailTrans() was called.
+	If not within smart transaction, returns false.
+
    BeginTrans( )
    
+
    Begin a transaction. Turns off autoCommit. Returns true if successful. Some 
+  databases will always return false if transaction support is not available. 
+   Any open transactions will be rolled back when the connection is closed. Among the
+   databases that support transactions are Oracle, PostgreSQL, Interbase, MSSQL, certain
+    versions of MySQL, DB2, Informix, Sybase, etc.
    
+ 
    Note that StartTrans() and CompleteTrans() is a superior method of 
+ handling transactions, available since ADOdb 3.40. For a explanation, see the StartTrans() documentation.
+
+
    You can also use the ADOdb error handler to die 
+  and rollback your transactions for you transparently. Some buggy database extensions 
+  are known to commit all outstanding tranasactions, so you might want to explicitly 
+  do a $DB->RollbackTrans() in your error handler for safety. 
+ 
    Detecting Transactions
    
+ 
    Since ADOdb 2.50, you are able to detect when you are inside a transaction. Check
+ that $connection->transCnt > 0. This variable is incremented whenever BeginTrans() is called,
+ and decremented whenever RollbackTrans() or CommitTrans() is called.
+
    CommitTrans($ok=true)
    
+
    End a transaction successfully. Returns true if successful. If the database 
+  does not support transactions, will return true also as data is always committed. 
+
    
+
    If you pass the parameter $ok=false, the data is rolled back. See example in 
+  BeginTrans().
    
+
    RollbackTrans( )
    
+
    End a transaction, rollback all changes. Returns true if successful. If the 
+  database does not support transactions, will return false as data is never rollbacked. 
+
    
+     
+
    GetAssoc($sql,$inputarr=false,$force_array=false,$first2cols=false)
    
+
    Returns an associative array for the given query $sql with optional bind parameters 
+  in $inputarr. If the number of columns returned is greater to two, a 2-dimensional 
+  array is returned, with the first column of the recordset becomes the keys 
+  to the rest of the rows. If the columns is equal to two, a 1-dimensional array 
+  is created, where the the keys directly map to the values (unless $force_array 
+  is set to true, when an array is created for each value).
+
     Examples:
    
+    
+
    We have the following data in a recordset:
    
+
    row1: Apple, Fruit, Edible
    
+  row2: Cactus, Plant, Inedible
    
+  row3: Rose, Flower, Edible
    
+
    GetAssoc will generate the following 2-dimensional associative 
+  array:
    
+
    Apple => array[Fruit, Edible]
    
+  Cactus => array[Plant, Inedible]
    
+  Rose => array[Flower,Edible]
    
+
    If the dataset is:
    
+
    row1: Apple, 
+  Fruit
    
+  row2: Cactus, Plant
    
+  row3: Rose, Flower     
    
+
    GetAssoc will generate the following 
+  1-dimensional associative array (with $force_array==false):
    
+
    Apple => Fruit
    
+  Cactus=>Plant
    
+  Rose=>Flower  
    
+
    The function returns:
    
+
    The associative array, or false if an error occurs.
    
+
+
    CacheGetAssoc([$secs2cache,] $sql,$inputarr=false,$force_array=false,$first2cols=false)
    
+     
+
    Caching version of GetAssoc function above.
+
    GetOne($sql,$inputarr=false)
    
+
    Executes the SQL and returns the first field of the first row. The recordset 
+  and remaining rows are discarded for you automatically. If an error occur, false 
+  is returned.
    
+
    GetRow($sql,$inputarr=false)
    
+
    Executes the SQL and returns the first row as an array. The recordset and remaining 
+  rows are discarded for you automatically. If an error occurs, false is returned.
    
+
    GetAll($sql)
    
+    
+
    Executes the SQL and returns the all the rows as a 2-dimensional 
+  array. The recordset is discarded for you automatically. If an error occurs, 
+  false is returned.
    
+ 
    GetCol($sql,$inputarr=false,$trim=false)
    
+
+
    Executes the SQL and returns all elements of the first column as a 
+1-dimensional array. The recordset is discarded for you automatically. If an error occurs, 
+  false is returned.
    
+
    CacheGetOne([$secs2cache,] 
+  $sql,$inputarr=false), CacheGetRow([$secs2cache,] $sql,$inputarr=false), CacheGetAll([$secs2cache,] 
+  $sql,$inputarr=false), CacheGetCol([$secs2cache,] 
+  $sql,$inputarr=false,$trim=false)
    
+ 
+
    Similar to above Get* functions, except that the recordset is serialized and 
+  cached in the $ADODB_CACHE_DIR directory for $secs2cache seconds. Good for speeding 
+  up queries on rarely changing data. Note that the $secs2cache parameter is optional. 
+  If omitted, we use the value in $connection->cacheSecs (default is 3600 seconds, 
+  or 1 hour).
    
+
    Prepare($sql )
    
+     
+
    Prepares (compiles) an SQL query for repeated execution. Bind parameters
+are denoted by ?, except for the oci8 driver, which uses the traditional Oracle :varname
+convention. 
+  
    
+
    Returns an array containing the original sql statement 
+  in the first array element; the remaining elements of the array are driver dependent. 
+  If there is an error, or we are emulating Prepare( ), we return the original 
+  $sql string. This is because all error-handling has been centralized in Execute( 
+  ).
    
+
    Prepare( ) cannot be used with functions that use SQL 
+  query rewriting techniques, e.g. PageExecute( ) and SelectLimit( ).
    
+
    Example:
    
+
    $stmt = $DB->Prepare('insert into table (col1,col2) values (?,?)');
+for ($i=0; $i < $max; $i++)
    	$DB->Execute($stmt,array((string) rand(), $i));
+
    
+ 
+
    Also see InParameter(), OutParameter() and PrepareSP() below. Only supported internally by interbase, 
+  oci8 and selected ODBC-based drivers, otherwise it is emulated. There is no 
+  performance advantage to using Prepare() with emulation. 
+
     Important: Due to limitations or bugs in PHP, if you are getting errors when 
+  you using prepared queries, try setting $ADODB_COUNTRECS = false before preparing. 
+  This behaviour has been observed with ODBC. 
+
    IfNull($field, $nullReplacementValue)
    
+
    Portable IFNULL function (NVL in Oracle). Returns a string that represents 
+  the function that checks whether a $field is null for the given database, and 
+  if null, change the value returned to $nullReplacementValue. Eg.
    
+
    $sql = 'SELECT '.$db->IfNull('name', "'- unknown -'"). ' FROM table';
    
+
+
    length
    
+
    This is not a function, but a property. Some databases have "length" and others "len"
+as the function to measure the length of a string. To use this property:
+
    +  $sql = "SELECT ".$db->length."(field) from table";
+  $rs = $db->Execute($sql);
+
    
+
+
    random
    
+
    This is not a function, but a property. This is a string that holds the sql to
+generate a random number between 0.0 and 1.0 inclusive.
+
+
    substr
    
+
    This is not a function, but a property. Some databases have "substr" and others "substring"
+as the function to retrieve a sub-string. To use this property:
+
    +  $sql = "SELECT ".$db->substr."(field, $offset, $length) from table";
+  $rs = $db->Execute($sql);
+
    
+
    For all databases, the 1st parameter of substr is the field, the 2nd is the
+offset (1-based) to the beginning of the sub-string, and the 3rd is the length of the sub-string.
+
+
+
    Param($name )
    
+
    Generates a bind placeholder portably. For most databases, the bind placeholder 
+  is "?". However some databases use named bind parameters such as Oracle, eg 
+  ":somevar". This allows us to portably define an SQL statement with bind parameters: 
+
    $sql = 'insert into table (col1,col2) values ('.$DB->Param('a').','.$DB->Param('b').')';
+# generates 'insert into table (col1,col2) values (?,?)'
+# or        'insert into table (col1,col2) values (:a,:b)'
+$stmt = $DB->Prepare($sql);
+$stmt = $DB->Execute($stmt,array('one','two'));
+
    
+ 
+
    
+
    PrepareSP($sql)
    
+
    When calling stored procedures in mssql and oci8 (oracle), and you might want 
+  to directly bind to parameters that return values, or for special LOB handling. 
+  PrepareSP() allows you to do so. 
+
    Returns the same array or $sql string as Prepare( ) above. If you do not need 
+  to bind to return values, you should use Prepare( ) instead.
    
+
    For examples of usage of PrepareSP( ), see InParameter( ) below. 
+
    Note: in the mssql driver, preparing stored procedures requires a special function 
+  call, mssql_init( ), which is called by this function. PrepareSP( ) is available 
+  in all other drivers, and is emulated by calling Prepare( ). 
    
+
     InParameter($stmt, $var, $name,
+  $maxLen = 4000, $type = false )
    
+Binds a PHP variable as input to a stored procedure variable. The parameter $stmt
+ is the value returned by PrepareSP(), $var is the PHP variable you want to bind, $name
+ is the name of the stored procedure variable. Optional is $maxLen, the maximum length of the
+ data to bind, and $type which is database dependant. 
+ Consult mssql_bind and ocibindbyname docs
+  at php.net for more info on legal values for $type. 
+ 
    
+InParameter() is a wrapper function that calls Parameter() with $isOutput=false. 
+The advantage of this function is that it is self-documenting, because
+the $isOutput parameter is no longer needed.  Only for mssql 
+  and oci8 currently.
+  
    Here is an example using oci8:
+  
    # For oracle, Prepare and PrepareSP are identical
+$stmt = $db->PrepareSP(
+	"declare RETVAL integer; 
+	begin
+	:RETVAL := SP_RUNSOMETHING(:myid,:group);
+	end;");
+$db->InParameter($stmt,$id,'myid');
+$db->InParameter($stmt,$group,'group',64);
+$db->OutParameter($stmt,$ret,'RETVAL');
    $db->Execute($stmt);
+
    
+
     The same example using mssql:
    
+     
+
    # @RETVAL = SP_RUNSOMETHING @myid,@group
+$stmt = $db->PrepareSP('SP_RUNSOMETHING'); 
    # note that the parameter name does not have @ in front!
+$db->InParameter($stmt,$id,'myid');
+$db->InParameter($stmt,$group,'group',64);
+# return value in mssql - RETVAL is hard-coded name 
+$db->OutParameter($stmt,$ret,'RETVAL');
+$db->Execute($stmt); 
    
+
+
    Note that the only difference between the oci8 and mssql implementations is $sql.
    
+  
    
+ If $type parameter is set to false, in mssql, $type will be dynamicly determined 
+based on the type of the PHP variable passed (string 
+=> SQLCHAR, boolean =>SQLINT1, integer =>SQLINT4 or float/double=>SQLFLT8).
+
     
+In oci8, $type can be set to OCI_B_FILE (Binary-File), OCI_B_CFILE (Character-File), 
+OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). To 
+pass in a null, use $db->Parameter($stmt, 
+$null=null, 'param'). 
+  
     OutParameter($stmt, $var, $name, 
+  $maxLen = 4000, $type = false )
    
+  Binds a PHP variable as output from a stored procedure variable. The parameter $stmt
+ is the value returned by PrepareSP(), $var is the PHP variable you want to bind, $name
+ is the name of the stored procedure variable. Optional is $maxLen, the maximum length of the
+ data to bind, and $type which is database dependant. 
+  
    
+  OutParameter() is a wrapper function that calls Parameter() with $isOutput=true. 
+  The advantage of this function is that it is self-documenting, because
+the $isOutput parameter is no longer needed.  Only for mssql 
+  and oci8 currently.
+
    
+For an example, see InParameter.
+
+
     Parameter($stmt, $var, $name, $isOutput=false, 
+  $maxLen = 4000, $type = false )
    
+
    Note: This function is deprecated, because of the new InParameter() and OutParameter() functions.
+These are superior because they are self-documenting, unlike Parameter().
+
    Adds a bind parameter suitable for return values or special data handling (eg. 
+  LOBs) after a statement has been prepared using PrepareSP(). Only for mssql 
+  and oci8 currently. The parameters are:
    
+  
    
+  $stmt Statement returned by Prepare() or PrepareSP().
    
+  $var PHP variable to bind to. Make sure you pre-initialize it!
    
+  $name Name of stored procedure variable name to bind to.
    
+  [$isOutput] Indicates direction of parameter 0/false=IN 1=OUT 
+  2= IN/OUT. This is ignored in oci8 as this driver auto-detects the direction.
    
+  [$maxLen] Maximum length of the parameter variable.
    
+  [$type] Consult mssql_bind and 
+  ocibindbyname docs at php.net for 
+  more info on legal values for type.
    
+
    Lastly, in oci8, bind parameters can be reused without calling PrepareSP( ) 
+  or Parameters again. This is not possible with mssql. An oci8 example:
    
+
    $id = 0; $i = 0;
+$stmt = $db->PrepareSP( "update table set val=:i where id=:id");
+$db->Parameter($stmt,$id,'id');
+$db->Parameter($stmt,$i, 'i');
+for ($cnt=0; $cnt < 1000; $cnt++) {
+	$id = $cnt; 
    	$i = $cnt * $cnt; # works with oci8!
+	$db->Execute($stmt); 
    }
    
+
    Bind($stmt, $var, $size=4001, $type=false, $name=false)
    
+     
+
    This is a low-level function supported only by the oci8 
+  driver. Avoid using unless you only want to support Oracle. The Parameter( 
+  ) function is the recommended way to go with bind variables.
    
+
    Bind( ) allows you to use bind variables in your sql 
+  statement. This binds a PHP variable to a name defined in an Oracle sql statement 
+  that was previously prepared using Prepare(). Oracle named variables begin with 
+  a colon, and ADOdb requires the named variables be called :0, :1, :2, :3, etc. 
+  The first invocation of Bind() will match :0, the second invocation will match 
+  :1, etc. Binding can provide 100% speedups for insert, select and update statements. 
+  
    
+
    The other variables, $size sets the buffer size for data storage, $type is 
+  the optional descriptor type OCI_B_FILE (Binary-File), OCI_B_CFILE (Character-File), 
+  OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). 
+  Lastly, instead of using the default :0, :1, etc names, you can define your 
+  own bind-name using $name. 
+
    The following example shows 3 bind variables being used: 
+  p1, p2 and p3. These variables are bound to :0, :1 and :2.
    
+
    $stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
+$DB->Bind($stmt, $p1);
+$DB->Bind($stmt, $p2);
+$DB->Bind($stmt, $p3);
+for ($i = 0; $i < $max; $i++) { 
+   $p1 = ?; $p2 = ?; $p3 = ?;
+   $DB->Execute($stmt);
+}
    
+
    You can also use named variables:
    
+
    +$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:name0, :name1, :name2)");
+$DB->Bind($stmt, $p1, "name0");
+$DB->Bind($stmt, $p2, "name1");
+$DB->Bind($stmt, $p3, "name2");
+for ($i = 0; $i < $max; $i++) { 
+   $p1 = ?; $p2 = ?; $p3 = ?;
+   $DB->Execute($stmt);
+}
    
+
    LogSQL($enable=true)
    
+Call this method to install a SQL logging and timing function (using fnExecute). 
+Then all SQL statements are logged into an adodb_logsql table in a database. If 
+the adodb_logsql table does not exist, ADOdb will create the table if you have 
+the appropriate permissions. Returns the previous logging value (true for enabled, 
+false for disabled). Here are samples of the DDL for selected databases: 
+
     
+
    +		mysql:
+		CREATE TABLE adodb_logsql (
+		  created datetime NOT NULL,
+		  sql0 varchar(250) NOT NULL,
+		  sql1 text NOT NULL,
+		  params text NOT NULL,
+		  tracer text NOT NULL,
+		  timer decimal(16,6) NOT NULL
+		)
+		
+		postgres:
+		CREATE TABLE adodb_logsql (
+		  created timestamp NOT NULL,
+		  sql0 varchar(250) NOT NULL,
+		  sql1 text NOT NULL,
+		  params text NOT NULL,
+		  tracer text NOT NULL,
+		  timer decimal(16,6) NOT NULL
+		)
+		
+		mssql:
+		CREATE TABLE adodb_logsql (
+		  created datetime NOT NULL,
+		  sql0 varchar(250) NOT NULL,
+		  sql1 varchar(4000) NOT NULL,
+		  params varchar(3000) NOT NULL,
+		  tracer varchar(500) NOT NULL,
+		  timer decimal(16,6) NOT NULL
+		)
+		
+		oci8:
+		CREATE TABLE adodb_logsql (
+		  created date NOT NULL,
+		  sql0 varchar(250) NOT NULL,
+		  sql1 varchar(4000) NOT NULL,
+		  params varchar(4000),
+		  tracer varchar(4000),
+		  timer decimal(16,6) NOT NULL
+		)
+
    
+Usage: 
+
    +	$conn->LogSQL(); // turn on logging
+	  :
+	$conn->Execute(...);
+	  :
+	$conn->LogSQL(false); // turn off logging
+	
+	# output summary of SQL logging results
+	$perf = NewPerfMonitor($conn);
+	echo $perf->SuspiciousSQL();
+	echo $perf->ExpensiveSQL();
+
    
+
    One limitation of logging is that rollback also prevents SQL from being logged.
+
    
+If you prefer to use another name for the table used to store the SQL, you can override it by calling 
+adodb_perf::table($tablename), where $tablename is the new table name (you will still need to manually
+create the table yourself). An example:
+
    +	include('adodb.inc.php');
+	include('adodb-perf.inc.php');
+	adodb_perf::table('my_logsql_table');
+
    
+Also see Performance Monitor. 
+
    fnExecute and fnCacheExecute properties
    
+
    These two properties allow you to define bottleneck functions for all sql statements 
+  processed by ADOdb. This allows you to perform statistical analysis and query-rewriting 
+  of your sql. 
+
    Examples of fnExecute
    
+
    Here is an example of using fnExecute, to count all cached queries and non-cached 
+  queries, you can do this:
    
+
    # $db is the connection object
+function CountExecs($db, $sql, $inputarray)
+{
+global $EXECS;
+
+if (!is_array(inputarray)) $EXECS++;
+# handle 2-dimensional input arrays
+else if (is_array(reset($inputarray))) $EXECS += sizeof($inputarray);
+else $EXECS++;
+}
+
+# $db is the connection object
+function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
+{
    global $CACHED; $CACHED++;
+}
+
    $db = NewADOConnection('mysql');
+$db->Connect(...);
+$db->fnExecute = 'CountExecs';
+$db->fnCacheExecute = 'CountCachedExecs';
+ :
+ :
    # After many sql statements:`
+printf("<p>Total queries=%d; total cached=%d</p>",$EXECS+$CACHED, $CACHED);
+
    
+
    The fnExecute function is called before the sql is parsed and executed, so 
+  you can perform a query rewrite. If you are passing in a prepared statement, 
+  then $sql is an array (see Prepare). The fnCacheExecute 
+  function is only called if the recordset returned was cached. 
+  The function parameters match the Execute and CacheExecute functions respectively, 
+  except that $this (the connection object) is passed as the first parameter.
    
+
    Since ADOdb 3.91, the behaviour of fnExecute varies depending on whether the 
+  defined function returns a value. If it does not return a value, then the $sql 
+  is executed as before. This is useful for query rewriting or counting sql queries. 
+
     On the other hand, you might want to replace the Execute function with one 
+  of your own design. If this is the case, then have your function return a value. 
+  If a value is returned, that value is returned immediately, without any further 
+  processing. This is used internally by ADOdb to implement LogSQL() functionality. 
+
      
+
    
+
    ADOConnection Utility Functions
    
+
    BlankRecordSet([$queryid])
    
+
    No longer available - removed since 1.99.
    
+
    Concat($s1,$s2,....)
    
+
    Generates the sql string used to concatenate $s1, $s2, etc together. Uses the 
+  string in the concat_operator field to generate the concatenation. Override 
+  this function if a concatenation operator is not used, eg. MySQL.
    
+
    Returns the concatenated string.
    
+
    DBDate($date)
    
+
    Format the $date in the format the database accepts. This is used in 
+  INSERT/UPDATE statements; for SELECT statements, use SQLDate. 
+  The $date parameter can be a Unix integer timestamp or an ISO format 
+  Y-m-d. Uses the fmtDate field, which holds the format to use. If null or false 
+  or '' is passed in, it will be converted to an SQL null.
    
+
    Returns the date as a quoted string.
    
+
    DBTimeStamp($ts)
    
+
    Format the timestamp $ts in the format the database accepts; this can 
+  be a Unix integer timestamp or an ISO format Y-m-d H:i:s. Uses the fmtTimeStamp 
+  field, which holds the format to use. If null or false or '' is passed in, it 
+  will be converted to an SQL null.
    
+
    Returns the timestamp as a quoted string.
    
+
    qstr($s,[$magic_quotes_enabled=false])
    
+
    Quotes a string to be sent to the database. The $magic_quotes_enabled 
+  parameter may look funny, but the idea is if you are quoting a string extracted 
+  from a POST/GET variable, then pass get_magic_quotes_gpc() as the second parameter. 
+  This will ensure that the variable is not quoted twice, once by qstr 
+  and once by the magic_quotes_gpc.
    
+
    Eg. $s = $db->qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());
    
+
    Returns the quoted string.
    
+
    Quote($s)
    
+
    Quotes the string $s, escaping the database specific quote character as appropriate. 
+  Formerly checked magic quotes setting, but this was disabled since 3.31 for 
+  compatibility with PEAR DB. 
+
    Affected_Rows( )
    
+
    Returns the number of rows affected by a update or delete statement. Returns 
+  false if function not supported.
    
+
    Not supported by interbase/firebird currently. 
    
+
    Insert_ID( )
    
+
    Returns the last autonumbering ID inserted. Returns false if function not supported. 
+
    
+
    Only supported by databases that support auto-increment or object id's, such 
+  as PostgreSQL, MySQL and MS SQL Server currently. PostgreSQL returns the OID, which 
+  can change on a database reload.
    
+
    RowLock($table,$where)
    
+
    Lock a table row for the duration of a transaction. For example to lock record $id in table1:
+
    +	$DB->StartTrans();
+	$DB->RowLock("table1","rowid=$id");
+	$DB->Execute($sql1);
+	$DB->Execute($sql2);
+	$DB->CompleteTrans();
+
    
+
    Supported in db2, interbase, informix, mssql, oci8, postgres, sybase.
+
    MetaDatabases()
    
+
    Returns a list of databases available on the server as an array. You have to 
+  connect to the server first. Only available for ODBC, MySQL and ADO.
    
+
    MetaTables($ttype = false, $showSchema = false, 
+  $mask=false)
    
+
    Returns an array of tables and views for the current database as an array. 
+  The array should exclude system catalog tables if possible. To only show tables, 
+  use $db->MetaTables('TABLES'). To show only views, use $db->MetaTables('VIEWS'). 
+  The $showSchema parameter currently works only for DB2, and when set to true, 
+  will add the schema name to the table, eg. "SCHEMA.TABLE". 
    
+
    You can define a mask for matching. For example, setting $mask = 'TMP%' will 
+  match all tables that begin with 'TMP'. Currently only mssql, oci8, odbc_mssql 
+  and postgres* support $mask. 
+
    MetaColumns($table,$toupper=true)
    
+
    Returns an array of ADOFieldObject's, one field object for every column of 
+  $table. A field object is a class instance with (name, type, max_length) defined.
+  Currently Sybase does not recognise date types, and ADO cannot identify 
+  the correct data type (so we default to varchar).   
+ 
     The $toupper parameter determines whether we uppercase the table name 
+ (required for some databases).
+ 
    For schema support, pass in the $table parameter, "$schema.$tablename". This is only
+ supported for selected databases.
+
    MetaColumnNames($table)
    
+
    Returns an array of column names for $table. 
+
    MetaPrimaryKeys($table, 
+  $owner=false) 
+
    Returns an array containing column names that are the 
+  primary keys of $table. Supported by mysql, odbc (including db2, odbc_mssql, 
+  etc), mssql, postgres, interbase/firebird, oci8 currently.  
+
    Views (and some tables) have primary keys, but sometimes this information is not available from the
+database. You can define a function  ADODB_View_PrimaryKeys($databaseType, $database, $view, $owner) that
+should return an array containing the fields that make up the primary key. If that function exists,
+it will be called when MetaPrimaryKeys() cannot find a primary key for a table or view.
+
    +// In this example: dbtype = 'oci8', $db = 'mydb', $view = 'dataView', $owner = false 
+function ADODB_View_PrimaryKeys($dbtype,$db,$view,$owner)
+{
+	switch(strtoupper($view)) {
+	case 'DATAVIEW': return array('DATAID');
+	default: return false;
+	}
+}
+
+$db = NewADOConnection('oci8');
+$db->Connect('localhost','root','','mydb'); 
+$db->MetaPrimaryKeys('dataView');
+
    
+
    ServerInfo($table) 
+
    Returns an array of containing two elements 'description' 
+  and 'version'. The 'description' element contains the string description of 
+  the database. The 'version' naturally holds the version number (which is also 
+  a string). 
+
    MetaForeignKeys($table, $owner=false, $upper=false) 
+
    Returns an associate array of foreign keys, or false if not supported. For 
+  example, if table employee has a foreign key where employee.deptkey points to 
+  dept_table.deptid, and employee.posn=posn_table.postionid and employee.poscategory=posn_table.category, 
+  then $conn->MetaForeignKeys('employee') will return 
+
    +	array(
+		'dept_table' => array('deptkey=deptid'),
+		'posn_table' => array('posn=positionid','poscategory=category')
+	)
+
    
+
    The optional schema or owner can be defined in $owner. If $upper is true, then 
+  the table names (array keys) are upper-cased. 
+
    
+
    ADORecordSet
    
+
    When an SQL statement successfully is executed by ADOConnection->Execute($sql),an 
+  ADORecordSet object is returned. This object contains a virtual cursor so we 
+  can move from row to row, functions to obtain information about the columns 
+  and column types, and helper functions to deal with formating the results to 
+  show to the user.
    
+
    ADORecordSet Fields
    
+
    fields: Array containing the current row. This is not associative, but 
+  is an indexed array from 0 to columns-1. See also the function Fields, 
+  which behaves like an associative array.
    
+
    dataProvider: The underlying mechanism used to connect to the database. 
+  Normally set to native, unless using odbc or ado.
    
+
    blobSize: Maximum size of a char, string or varchar object before it 
+  is treated as a Blob (Blob's should be shown with textarea's). See the MetaType 
+  function.
    
+
    sql: Holds the sql statement used to generate this record set.
    
+
    canSeek: Set to true if Move( ) function works.
    
+
    EOF: True if we have scrolled the cursor past the last record.
    
+
    ADORecordSet Functions
    
+
    ADORecordSet( )
    
+
    Constructer. Normally you never call this function yourself.
    
+
    GetAssoc([$force_array])
    
+
    Generates an associative array from the recordset. Note that is this function 
+  is also available in the connection object. More details 
+  can be found there.
    
+     
+
    GetArray([$number_of_rows])
    
+
    Generate a 2-dimensional array of records from the current cursor position, 
+  indexed from 0 to $number_of_rows - 1. If $number_of_rows is undefined, till 
+  EOF.
    
+
    GetRows([$number_of_rows])
    
+Generate a 2-dimensional array of records from the current cursor position. Synonym 
+for GetArray() for compatibility with Microsoft ADO. 
+
     GetMenu($name, [$default_str=''], [$blank1stItem=true], 
+  [$multiple_select=false], [$size=0], [$moreAttr=''])
    
+
    Generate a HTML menu (<select><option><option></select>). 
+  The first column of the recordset (fields[0]) will hold the string to display 
+  in the option tags. If the recordset has more than 1 column, the second column 
+  (fields[1]) is the value to send back to the web server.. The menu will be given 
+  the name $name. 
+
     If $default_str is defined, then if $default_str == fields[0], 
+  that field is selected. If $blank1stItem is true, the first option is 
+  empty. You can also set the first option strings by setting $blank1stItem = 
+  "$value:$text".
    
+
    $Default_str can be array for a multiple select listbox.
    
+
    To get a listbox, set the $size to a non-zero value (or pass $default_str 
+  as an array). If $multiple_select is true then a listbox will be generated 
+  with $size items (or if $size==0, then 5 items) visible, and we will 
+  return an array to a server. Lastly use $moreAttr  to add additional 
+  attributes such as javascript or styles. 
    
+
    Menu Example 1: GetMenu('menu1','A',true) will generate a menu: 
+  
+  for the data (A,1), (B,2), (C,3). Also see example 5.
    
+
    Menu Example 2: For the same data, GetMenu('menu1',array('A','B'),false) 
+  will generate a menu with both A and B selected: 
    
+  
+
     GetMenu2($name, [$default_str=''], [$blank1stItem=true], 
+  [$multiple_select=false], [$size=0], [$moreAttr=''])
    
+
    This is nearly identical to GetMenu, except that the $default_str is 
+  matched to fields[1] (the option values).
    
+
    Menu Example 3: Given the data in menu example 2, GetMenu2('menu1',array('1','2'),false) 
+  will generate a menu with both A and B selected in menu example 2, but this 
+  time the selection is based on the 2nd column, which holds the values to return 
+  to the Web server. 
+
    UserDate($str, [$fmt])
    
+
    Converts the date string $str to another format. The date format is Y-m-d,
+or Unix timestamp format. The default $fmt is Y-m-d.
    
+
    UserTimeStamp($str, [$fmt])
    
+
    Converts the timestamp string $str to another format. The timestamp 
+  format is Y-m-d H:i:s, as in '2002-02-28 23:00:12', or Unix timestamp format.
+   UserTimeStamp calls UnixTimeStamp to parse $str, and $fmt defaults to Y-m-d H:i:s if not defined. 
+
    
+
    UnixDate($str)
    
+
    Parses the date string $str and returns it in unix mktime format (eg. 
+  a number indicating the seconds after January 1st, 1970). Expects the date to 
+  be in Y-m-d H:i:s format, except for Sybase and Microsoft SQL Server, where 
+  M d Y is also accepted (the 3 letter month strings are controlled by a global 
+  array, which might need localisation).
    
+
    This function is available in both ADORecordSet and ADOConnection since 1.91.
    
+
    UnixTimeStamp($str)
    
+
    Parses the timestamp string $str and returns it in unix mktime format 
+  (eg. a number indicating the seconds after January 1st, 1970). Expects the date 
+  to be in "Y-m-d, H:i:s" (1970-12-24, 00:00:00) or "Y-m-d H:i:s" (1970-12-24 00:00:00) or "YmdHis" (19701225000000) format, except for Sybase and Microsoft SQL Server, where 
+  "M d Y h:i:sA" (Dec 25 1970 00:00:00AM) is also accepted (the 3 letter month strings are controlled by 
+  a global array, which might need localisation).
    
+     
+
    This function is available in both ADORecordSet and ADOConnection 
+  since 1.91. 
    
+
    OffsetDate($dayFraction, 
+  $basedate=false)
    
+
    Returns a string with the 
+  native SQL functions to calculate future and past dates based on $basedate in 
+  a portable fashion. If $basedate is not defined, then the current date (at 12 
+  midnight) is used. Returns the SQL string that performs the calculation when 
+  passed to Execute(). 
    
+
    For example, in Oracle, to find the date and time that 
+  is 2.5 days from today, you can use:
    
+
    # get date one week from now
+$fld = $conn->OffsetDate(7); // returns "(trunc(sysdate)+7")
    
+
    # get date and time that is 60 hours from current date and time
+$fld = $conn->OffsetDate(2.5, $conn->sysTimeStamp);	// returns "(sysdate+2.5)"
+
+$conn->Execute("UPDATE TABLE SET dodate=$fld WHERE ID=$id");
    
+
     This function is available for mysql, mssql, oracle, oci8 and postgresql drivers 
+  since 2.13. It might work with other drivers provided 
+  they allow performing numeric day arithmetic on dates.
    
+ 
+
    SQLDate($dateFormat, $basedate=false)
    
+Returns a string which contains the native SQL functions to format a date or date 
+column $basedate. This is used in SELECT statements. For INSERT/UPDATE statements, 
+use DBDate. It uses a case-sensitive $dateFormat, which 
+supports: 
+
    + Y: 4-digit Year
+ Q: Quarter (1-4)
+ m: Month (01-12)
+ d: Day (01-31)
+ H: Hour (00-23)
+ h: Hour (1-12)
+ i: Minute (00-59)
+ s: Second (00-60)
+ A: AM/PM indicator
    
+
    All other characters are treated as strings. You can also use \ to escape characters. 
+  Available on selected databases, including mysql, postgresql, mssql, oci8 and 
+  DB2. 
+
    This is useful in writing portable sql statements that GROUP BY on dates. For 
+  example to display total cost of goods sold broken by quarter (dates are stored 
+  in a field called postdate): 
+
    + $sqlfn = $db->SQLDate('Y-\QQ','postdate'); # get sql that formats postdate to output 2002-Q1
+ $sql = "SELECT $sqlfn,SUM(cogs) FROM table GROUP BY $sqlfn ORDER BY 1 desc";
+ 
    
+
    MoveNext( )
    
+
    Move the internal cursor to the next row. The $this->fields array is 
+  automatically updated. Returns false if unable to do so (normally because EOF 
+  has been reached), otherwise true. 
+
     If EOF is reached, then the $this->fields array is set to false (this was 
+  only implemented consistently in ADOdb 3.30). For the pre-3.30 behaviour of 
+  $this->fields (at EOF), set the global variable $ADODB_COMPAT_FETCH = true.
    
+
    Example:
    
+
    $rs = $db->Execute($sql);
+if ($rs) 
+	while (!$rs->EOF) {
+ 		ProcessArray($rs->fields);	
+		$rs->MoveNext();
+	} 
    
+
    Move($to)
    
+
    Moves the internal cursor to a specific row $to. Rows are zero-based 
+  eg. 0 is the first row. The fields array is automatically updated. For 
+  databases that do not support scrolling internally, ADOdb will simulate forward 
+  scrolling. Some databases do not support backward scrolling. If the $to 
+  position is after the EOF, $to will move to the end of the RecordSet 
+  for most databases. Some obscure databases using odbc might not behave this 
+  way.
    
+
    Note: This function uses absolute positioning, unlike Microsoft's ADO.
    
+
    Returns true or false. If false, the internal cursor is not moved in most implementations, 
+  so AbsolutePosition( ) will return the last cursor position before the Move( 
+  ). 
    
+
    MoveFirst()
    
+
    Internally calls Move(0). Note that some databases do not support this function.
    
+
    MoveLast()
    
+
    Internally calls Move(RecordCount()-1). Note that some databases do not support 
+  this function.
    
+
    GetRowAssoc($toUpper=true)
    
+
    Returns an associative array containing the current row. The keys to the array 
+  are the column names. The column names are upper-cased for easy access. To get 
+  the next row, you will still need to call MoveNext(). 
    
+
    For example:
    
+  Array ( [ID] => 1 [FIRSTNAME] => Caroline [LASTNAME] => Miranda [CREATED] => 
+  2001-07-05 ) 
    
+
    Note: do not use GetRowAssoc() with $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC. 
+  Because they have the same functionality, they will interfere with each other.
    
+     
+
    AbsolutePage($page=-1) 
+  
    
+
    Returns the current page. Requires PageExecute()/CachePageExecute() to be called. 
+  See Example 8.
    
+ 
+
    AtFirstPage($status='')
    
+
    Returns true if at first page (1-based). Requires PageExecute()/CachePageExecute() 
+  to be called. See Example 8.
    
+
    AtLastPage($status='')
    
+
    Returns true if at last page (1-based). Requires PageExecute()/CachePageExecute() 
+  to be called. See Example 8.
    
+
    Fields($colname)
    
+
    Returns the value of the 
+  associated column $colname for the current row. The column name is case-insensitive.
    
+
    This is a convenience function. For higher performance, use $ADODB_FETCH_MODE. 
    
+
    FetchRow()
    
+     
+
    Returns array containing current row, or false if EOF. 
+  FetchRow( ) internally moves to the next record after returning the current 
+  row. 
    
+
    Warning: Do not mix using FetchRow() with MoveNext().
    
+
    Usage:
    
+
    $rs = $db->Execute($sql);
+if ($rs)
+	while ($arr = $rs->FetchRow()) {
+	     # process $arr	
+	}
    
+
    FetchInto(&$array)
    
+
     Sets $array to the current row. Returns PEAR_Error object 
+  if EOF, 1 if ok (DB_OK constant). If PEAR is undefined, false is returned when 
+  EOF. FetchInto( ) internally moves to the next 
+  record after returning the current row. 
    
+
     FetchRow() is easier to use. See above.
    
+ 
+
    FetchField($column_number)
    
+
    Returns an object containing the name, type and max_length 
+  of the associated field. If the max_length cannot be determined reliably, it 
+  will be set to -1. The column numbers are zero-based. See example 
+  2.
    
+
    FieldCount( )
    
+
    Returns the number of fields (columns) in the record set.
    
+
    RecordCount( )
    
+
    Returns the number of rows in the record set. If the number of records returned 
+  cannot be determined from the database driver API, we will buffer all rows and 
+  return a count of the rows after all the records have been retrieved. This buffering 
+  can be disabled (for performance reasons) by setting the global variable $ADODB_COUNTRECS 
+  = false. When disabled, RecordCount( ) will return -1 for certain databases. 
+  See the supported databases list above for more details. 
    
+
     RowCount is a synonym for RecordCount.
    
+
    PO_RecordCount($table, $where)
    
+
    Returns the number of rows in the record set. If the database does not support 
+  this, it will perform a SELECT COUNT(*) on the table $table, with the given 
+  $where condition to return an estimate of the recordset size.
    
+
    $numrows = $rs->PO_RecordCount("articles_table", "group=$group");
    
+ NextRecordSet() 
+
    For databases that allow multiple recordsets to be returned in one query, this 
+  function allows you to switch to the next recordset. Currently only supported 
+  by mssql driver.
    
+
    +$rs = $db->Execute('execute return_multiple_rs');
+$arr1 = $rs->GetArray();
+$rs->NextRecordSet();
+$arr2 = $rs->GetArray();
    
+
    FetchObject($toupper=true)
    
+
    Returns the current row as an object. If you set $toupper to true, then the 
+  object fields are set to upper-case. Note: The newer FetchNextObject() is the 
+  recommended way of accessing rows as objects. See below.
    
+
    FetchNextObject($toupper=true)
    
+
    Gets the current row as an object and moves to the next row automatically. 
+  Returns false if at end-of-file. If you set $toupper to true, then the object 
+  fields are set to upper-case.
    
+
    +$rs = $db->Execute('select firstname,lastname from table');
+if ($rs) {
+	while ($o = $rs->FetchNextObject()) {
+		print "$o->FIRSTNAME, $o->LASTNAME<BR>";
+	}
+}
+
    
+
    There is some trade-off in speed in using FetchNextObject(). If performance 
+  is important, you should access rows with the fields[] array. FetchObj() 
+
    Returns the current record as an object. Fields are not upper-cased, unlike 
+  FetchObject.  
+
    FetchNextObj() 
+  
    
+
    Returns the current record as an object and moves to 
+  the next record. If EOF, false is returned. Fields are not upper-cased, unlike 
+  FetctNextObject. 
    
+ 
+
    CurrentRow( )
    
+
    Returns the current row of the record set. 0 is the first row.
    
+
    AbsolutePosition( )
    
+
    Synonym for CurrentRow for compatibility with ADO. Returns the current 
+  row of the record set. 0 is the first row.
    
+
    MetaType($nativeDBType[,$field_max_length],[$fieldobj])
    
+
    Determine what generic meta type a database field type is given its 
+  native type $nativeDBType as a string and the length of the field $field_max_length. 
+  Note that field_max_length can be -1 if it is not known. The field object returned 
+  by FetchField() can be passed in $fieldobj or as the 1st parameter $nativeDBType. 
+  This is useful for databases such as mysql which has additional properties 
+  in the field object such as primary_key. 
    
+
    Uses the field blobSize and compares it with $field_max_length 
+  to determine whether the character field is actually a blob.
    
+For example, $db->MetaType('char') will return 'C'. 
+
    Returns:
    
+
      
+  
    • C: Character fields that should be shown in a <input type="text"> 
+    tag. 
      • 
+  
    • X: Clob (character large objects), or large text fields that should 
+    be shown in a <textarea>
      • 
+  
    • D: Date field
      • 
+  
    • T: Timestamp field
      • 
+  
    • L: Logical field (boolean or bit-field)
      • 
+  
    • N: Numeric field. Includes decimal, numeric, floating point, and 
+    real. 
      • 
+  
    • I:  Integer field. 
      • 
+  
    • R: Counter or Autoincrement field. Must be numeric.
      • 
+  
    • B: Blob, or binary large objects. 
      • 
+
    
+     
+
     Since ADOdb 3.0, MetaType accepts $fieldobj as the first 
+  parameter, instead of $nativeDBType. 
    
+ 
+
    Close( )
    
+
    Closes the recordset, cleaning all memory and resources associated with the recordset. 
+
    
+If memory management is not an issue, you do not need to call this function as recordsets
+are closed for you by PHP at the end of the script. 
+SQL statements such as INSERT/UPDATE/DELETE do not really return a recordset, so you do not have to call Close()
+for such SQL statements.
    
+
    
+
    function rs2html($adorecordset,[$tableheader_attributes], 
+  [$col_titles])
    
+
    This is a standalone function (rs2html = recordset to html) that is similar 
+  to PHP's odbc_result_all function, it prints a ADORecordSet, $adorecordset 
+  as a HTML table. $tableheader_attributes allow you to control the table 
+  cellpadding, cellspacing and border attributes. Lastly 
+  you can replace the database column names with your own column titles with the 
+  array $col_titles. This is designed more as a quick debugging mechanism, 
+  not a production table recordset viewer.
    
+
    You will need to include the file tohtml.inc.php.
    
+
    Example of rs2html:
    
+
    <?
+include('tohtml.inc.php'); # load code common to ADOdb 
+include('adodb.inc.php'); # load code common to ADOdb 
+$conn = &ADONewConnection('mysql');   # create a connection 
+$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
+$sql = 'select CustomerName, CustomerID from customers'; 
+$rs   = $conn->Execute($sql); 
+rs2html($rs,'border=2 cellpadding=3',array('Customer Name','Customer ID'));
+?>
    
+
    
+
    Differences between this ADOdb library and Microsoft ADO
    
+
      
+  
    1. ADOdb only supports recordsets created by a connection object. Recordsets 
+    cannot be created independently.
      2. 
+  
    2. ADO properties are implemented as functions in ADOdb. This makes it easier 
+    to implement any enhanced ADO functionality in the future.
      3. 
+  
    3. ADOdb's ADORecordSet->Move() 
+    uses absolute positioning, not relative. Bookmarks are not supported.
      4. 
+  
    4. ADORecordSet->AbsolutePosition() 
+    cannot be used to move the record cursor.
      5. 
+  
    5. ADO Parameter objects are not supported. Instead we have the ADOConnection::Parameter( 
+    ) function, which provides a simpler interface for calling preparing parameters 
+    and calling stored procedures.
      6. 
+  
    6. Recordset properties for paging records are available, but implemented as 
+    in Example 8.
      7. 
+
    
+
    
+
    Database Driver Guide
    
+
    This describes how to create a class to connect to a new database. To ensure 
+  there is no duplication of work, kindly email me at jlim#natsoft.com.my if you 
+  decide to create such a class.
    
+
    First decide on a name in lower case to call the database type. Let's say we 
+  call it xbase. 
    
+
    Then we need to create two classes ADODB_xbase and ADORecordSet_xbase in the 
+  file adodb-xbase.inc.php.
    
+
    The simplest form of database driver is an adaptation of an existing ODBC driver. 
+  Then we just need to create the class ADODB_xbase extends ADODB_odbc 
+  to support the new date and timestamp formats, the concatenation 
+  operator used, true and false. For the ADORecordSet_xbase extends 
+  ADORecordSet_odbc we need to change the MetaType function. See 
+  adodb-vfp.inc.php as an example.
    
+
    More complicated is a totally new database driver that connects to a new PHP 
+  extension. Then you will need to implement several functions. Fortunately, you 
+  do not have to modify most of the complex code. You only need to override a 
+  few stub functions. See adodb-mysql.inc.php for example.
    
+
    The default date format of ADOdb internally is YYYY-MM-DD (Ansi-92). All dates 
+  should be converted to that format when passing to an ADOdb date function. See 
+  Oracle for an example how we use ALTER SESSION to change the default date format 
+  in _pconnect _connect.
    
+
    ADOConnection Functions to Override
    
+
    Defining a constructor for your ADOConnection derived function is optional. 
+  There is no need to call the base class constructor.
    
+
    _connect: Low level implementation of Connect. Returns true or false. 
+  Should set the _connectionID.
    
+
    _pconnect: Low level implemention of PConnect. Returns true or false. 
+  Should set the _connectionID.
    
+
    _query: Execute a query. Returns the queryID, or false.
    
+
    _close: Close the connection -- PHP should clean up all recordsets. 
+
    
+
    ErrorMsg: Stores the error message in the private variable _errorMsg. 
+
    
+
    ADOConnection Fields to Set
    
+
    _bindInputArray: Set to true if binding of parameters for SQL inserts 
+  and updates is allowed using ?, eg. as with ODBC.
    
+
    fmtDate
    
+
    fmtTimeStamp
    
+
    true
    
+
    false
    
+
    concat_operator
    
+
    replaceQuote
    
+
    hasLimit support SELECT * FROM TABLE LIMIT 10 of MySQL.
    
+
    hasTop support Microsoft style SELECT TOP 10 * FROM TABLE.
    
+
    ADORecordSet Functions to Override
    
+
    You will need to define a constructor for your ADORecordSet derived class that 
+  calls the parent class constructor.
    
+
    FetchField:  as documented above in ADORecordSet
    
+
    _initrs: low level initialization of the recordset: setup the _numOfRows 
+  and _numOfFields fields -- called by the constructor.
    
+
    _seek: seek to a particular row. Do not load the data into the fields 
+  array. This is done by _fetch. Returns true or false. Note that some implementations 
+  such as Interbase do not support seek. Set canSeek to false.
    
+
    _fetch: fetch a row using the database extension function and then move 
+  to the next row. Sets the fields array. If the parameter $ignore_fields 
+  is true then there is no need to populate the fields array, just move 
+  to the next row. then Returns true or false.
    
+
    _close: close the recordset
    
+
    Fields: If the array row returned by the PHP extension is not an associative 
+  one, you will have to override this. See adodb-odbc.inc.php for an example. 
+  For databases such as MySQL and MSSQL where an associative array is returned, 
+  there is no need to override this function.
    
+
    ADOConnection Fields to Set
    
+
    canSeek: Set to true if the _seek function works.
    
+
    ToDo:
    
+
    See the RoadMap article.
    
+
    Also see the ADOdb proxy article 
+  for bridging Windows and Unix databases using http remote procedure calls. For 
+  your education, visit palslib.com for database info, 
+  and read this article on Optimizing 
+  PHP. 
    
+    
+
    Change Log
    
+
    4.20 27 Feb 2004
+
    Updated to AXMLS 1.01.
+
    MetaForeignKeys for postgres7 modified by Edward Jaramilla, works on pg 7.4.
+
    Now numbers accepts function calls or sequences for GetInsertSQL/GetUpdateSQL numeric fields.
+
    Changed quotes of 'delete from $perf_table' to "". Thx Kehui (webmaster#kehui.net)
+
    Added ServerInfo() for ifx, and putenv trim fix. Thx Fernando Ortiz.
+
    Added addq(), which is analogous to addslashes().
+
    Tested with php5b4. Fix some php5 compat problems with exceptions and sybase.
+
    Carl-Christian Salvesen added patch to mssql _query to support binds greater than 4000 chars.
+
    Mike suggested patch to PHP5 exception handler. $errno must be numeric.
+
    Added double quotes (") to ADODB_TABLE_REGEX.
+
    For oci8, Prepare(...,$cursor), $cursor's meaning was accidentally inverted in 4.11. This causes problems with ExecuteCursor() too, which calls Prepare() internally. Thx to William Lovaton.
+
    Now dateHasTime property in connection object renamed to datetime for consistency. This could break bc.
+
    Csongor Halmai reports that db2 SelectLimit with input array is not working. Fixed..
+
    4.11 27 Jan 2004
+
    Csongor Halmai reports db2 binding not working. Reverted back to emulated binding.
+
    Dan Cech modifies datadict code. Adds support for DropIndex. Minor cleanups.
+
    Table misspelt in perf-oci8.inc.php. Changed v$conn_cache_advice to v$db_cache_advice. Reported by Steve W.
+
    UserTimeStamp and DBTimeStamp did not handle YYYYMMDDHHMMSS format properly. Reported by Mike Muir. Fixed.
+
    Changed oci8 Prepare(). Does not auto-allocate OCINewCursor automatically, unless 2nd param is set to true.
+This will break backward compat, if Prepare/Execute is used instead of ExecuteCursor. Reported by Chris Jones.
+
    Added InParameter() and OutParameter(). Wrapper functions to Parameter(), but nicer because they
+are self-documenting.
+
    Added 'R' handling in ActualType() to datadict-mysql.inc.php
+
    Added ADOConnection::SerializableRS($rs). Returns a recordset that can be serialized in a session.
+
    Added "Run SQL" to performance UI().
+
    Misc spelling corrections in adodb-mysqli.inc.php, adodb-oci8.inc.php and datadict-oci8.inc.php, from Heinz Hombergs.
+
    MetaIndexes() for ibase contributed by Heinz Hombergs.
+
    4.10 12 Jan 2004
+
    Dan Cech contributed extensive changes to data dictionary to support name quoting (with `), and drop table/index.
+
    Informix added cursorType property. Default remains IFX_SCROLL, but you can change to 0 (non-scrollable cursor) for performance.
+
    Added ADODB_View_PrimaryKeys() for returning view primary keys to MetaPrimaryKeys().
+
    Simplified chinese file, adodb-cn.inc.php from cysoft.
+
    Added check for ctype_alnum in adodb-datadict.inc.php. Thx to Jason Judge.
+
    Added connection parameter to ibase Prepare(). Fix by Daniel Hassan.
+
    Added nameQuote for quoting identifiers and names to connection obj. Requested by Jason Judge. Also the
+data dictionary parser now detects `field name` and generates column names with spaces correctly.
+
    BOOL type not recognised correctly as L. Fixed.
+
    Fixed paths in ADODB_DIR for session files, and back-ported it to 4.05 (15 Dec 2003)
+
    Added Schema to postgresql MetaTables. Thx to col#gear.hu
+
    Empty postgresql recordsets that had blob fields did not set EOF properly. Fixed.
+
    CacheSelectLimit internal parameters to SelectLimit were wrong. Thx to Nio.
+
    Modified adodb_pr() and adodb_backtrace() to support command-line usage (eg. no html).
+
    Fixed some fr and it lang errors. Thx to Gaetano G.
+
    Added contrib directory, with adodb rs to xmlrpc convertor by Gaetano G.
+
    Fixed array recordset bugs when _skiprow1 is true. Thx to Gaetano G.
+
    Fixed pivot table code when count is false.
+
    
+
+
    4.05 13 Dec 2003 
+
    Added MetaIndexes - thx to Dan Cech.
+
    Rewritten session code by Ross Smith. Moved code to adodb/session directory.
+
    Added function exists check on connecting to most drivers, so we don't crash with the unknown function error.
+
    Smart Transactions failed with GenID() when it no seq table has been created because the sql
+	statement fails. Fix by Mark Newnham.
+
    Added $db->length, which holds name of function that returns strlen.
+
    Fixed error handling for bad driver in ADONewConnection - passed too few params to error-handler.
+
    Datadict did not handle types like 16.0 properly in _GetSize. Fixed.
+
    Oci8 driver SelectLimit() bug &= instead of =& used. Thx to Swen Thümmler.
+
    Jesse Mullan suggested not flushing outp when output buffering enabled. Due to Apache 2.0 bug. Added.
+
    MetaTables/MetaColumns return ref bug with PHP5 fixed in adodb-datadict.inc.php.
+
    New mysqli driver contributed by Arjen de Rijke. Based on adodb 3.40 driver.
+Then jlim added BeginTrans, CommitTrans, RollbackTrans, IfNull, SQLDate. Also fixed return ref bug.
+
    $ADODB_FLUSH added, if true then force flush in debugging outp. Default is false.  In earlier
+versions, outp defaulted to flush, which is not compat with apache 2.0.
+
    Mysql driver's GenID() function did not work when when sql logging is on. Fixed.
+
    $ADODB_SESSION_TBL not declared as global var. Not available if adodb-session.inc.php included in function. Fixed.
+
    The input array not passed to Execute() in _adodb_getcount(). Fixed.
+
    4.04 13 Nov 2003 
+
    Switched back to foreach - faster than list-each.
+
    Fixed bug in ado driver - wiping out $this->fields with date fields.
+
    Performance Monitor, View SQL, Explain Plan did not work if strlen($SQL)>max($_GET length). Fixed.
+
    Performance monitor, oci8 driver added memory sort ratio.
+
    Added random property, returns SQL to generate a floating point number between 0 and 1;
+
    4.03 6 Nov 2003 
+
    The path to adodb-php4.inc.php and adodb-iterators.inc.php was not setup properly.
+
    Patched SQLDate in interbase to support hours/mins/secs. Thx to ari kuorikoski.
+
    Force autorollback for pgsql persistent connections - 
+apparently pgsql did not autorollback properly before 4.3.4. See http://bugs.php.net/bug.php?id=25404
+
    4.02 5 Nov 2003 
+
    Some errors in adodb_error_pg() fixed. Thx to Styve.
+
    Spurious Insert_ID() error was generated by LogSQL(). Fixed.
+
    Insert_ID was interfering with Affected_Rows() and Replace()  when LogSQL() enabled. Fixed.
+
    More foreach loops optimized with list/each.
+
    Null dates not handled properly in ADO driver (it becomes 31 Dec 1969!).
+
    Heinz Hombergs contributed patches for mysql MetaColumns - adding scale, made
+interbase MetaColumns work with firebird/interbase, and added lang/adodb-de.inc.php.
+
    Added INFORMIXSERVER environment variable.
+
    Added $ADODB_ANSI_PADDING_OFF for interbase/firebird.
+
    PHP 5 beta 2 compat check. Foreach (Iterator) support. Exceptions support.
+
    4.01 23 Oct 2003 
+
    Fixed bug in rs2html(), tohtml.inc.php, that generated blank table cells.
+
    Fixed insert_id() incorrectly generated when logsql() enabled.
+
    Modified PostgreSQL _fixblobs to use list/each instead of foreach.
+
    Informix ErrorNo() implemented correctly.
+
    Modified several places to use list/each, including GetRowAssoc().
+
    Added UserTimeStamp() to connection class.
+
    Added $ADODB_ANSI_PADDING_OFF for oci8po.
+
    4.00 20 Oct 2003 
+
    Upgraded adodb-xmlschema to 1 Oct 2003 snapshot.
+
    Fix to rs2html warning message. Thx to Filo.
+
    Fix for odbc_mssql/mssql SQLDate(), hours was wrong.
+
    Added MetaColumns and MetaPrimaryKeys for sybase. Thx to Chris Phillipson.
+
    Added autoquoting to datadict for MySQL and PostgreSQL. Suggestion by Karsten Dambekalns  
+
    3.94 11 Oct 2003 
+
    Create trigger in datadict-oci8.inc.php did not work, because all cr/lf's must be removed. 
+
    ErrorMsg()/ErrorNo() did not work for many databases when logging enabled. Fixed.
+
    Removed global variable $ADODB_LOGSQL as it does not work properly with multiple connections.
+
    Added SQLDate support for sybase. Thx to Chris Phillipson
+
    Postgresql checking of pgsql resultset resource was incorrect. Fix by Bharat Mediratta bharat#menalto.com.
+Same patch applied to  _insertid and _affectedrows for adodb-postgres64.inc.php.
+
    Added support for NConnect for postgresql.
+
    Added Sybase data dict support. Thx to Chris Phillipson  
+
    Extensive improvements in $perf->UI(), eg. Explain now opens in new window, we show scripts
+which call sql, etc.
+
    Perf Monitor UI works with magic quotes enabled.
+
    rsPrefix was declared twice. Removed.
+
    Oci8 stored procedure support, eg. "begin func(); end;" was incorrect in _query. Fixed.
+
    Tiraboschi Massimiliano contributed italian language file.
+
    Fernando Ortiz, fortiz#lacorona.com.mx, contributed informix performance monitor.
+
    Added _varchar (varchar arrays) support for postgresql. Reported by PREVOT Stéphane.
+
    3.92 22 Sept 2003 
+
    Added GetAssoc and CacheGetAssoc to connection object.
+
    Removed TextMax and CharMax functions from adodb.inc.php. 
+
    HasFailedTrans() returned false when trans failed. Fixed. 
+
    Moved perf driver classes into adodb/perf/*.php. 
+
    Misc improvements to performance monitoring, including UI(). 
+
    RETVAL in mssql Parameter(), we do not append @ now. 
+
    Added Param($name) to connection class, returns '?' or ":$name", for defining 
+  bind parameters portably. 
+
    LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8 
+  _stmt and _affectedrows() bugs. 
+
    Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT 
+  stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also 
+  added new $conn->datetime field to oci8, controls whether MetaType() returns 
+  'D' ($this->datetime==false) or 'T' ($this->datetime == true) for DATE type. 
+
    Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php. 
+
    Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL(). 
+
    Tuned include_once handling to reduce file-system checking overhead. 
+
    3.91 9 Sept 2003 
+
    Only released to InterAkt 
+
    Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory 
+  for driver instantiation. 
+
    Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com 
+
    Added portable substr support. 
+
    Now rs2html() has new parameter, $echo. Set to false to return $html instead 
+  of echoing it. 
+
    3.90 5 Sept 2003 
+
    First beta of performance monitoring released. 
+
    MySQL supports MetaTable() masking. 
+
    Fixed key_exists() bug in adodb-lib.inc.php 
+
    Added sp_executesql Prepare() support to mssql. 
+
    Added bind support to db2. 
+
    Added swedish language file - Christian Tiberg" christian#commsoft.nu 
+
    Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich. 
+
    Left join setting for oci8 was wrong. Thx to johnwilk#juno.com 
+
    3.80 27 Aug 2003 
+
    Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility. 
+
    Added matching mask for MetaTables. Only for oci8, mssql and postgres currently. 
+
    Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano. 
+
    Added better debugging for Smart Transactions. 
+
    Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP. 
+
    ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define 
+  it after including adodb.inc.php. 
+
    Added portugese (brazilian) to languages. Thx to "Levi Fukumori". 
+
    Removed arg3 parameter from Execute/SelectLimit/Cache* functions. 
+
    Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() 
+  to note change in sql query counting with 2-d arrays. 
+
    Added MONEY to MetaType in PostgreSQL. 
+
    Added more debugging output to CacheFlush(). 
+
    3.72 9 Aug 2003 
+
    Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes 
+  and does the right thing... 
+
    Fixed CacheFlush() bug - Thx to martin#gmx.de 
+
    Walt Boring contributed MetaForeignKeys for postgres7. 
+
    _fetch() called _BlobDecode() wrongly in interbase. Fixed. 
+
    adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980 
+
    3.71 4 Aug 2003 
+
    The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner 
+  == false. 
+
    Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru. 
+
    Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com. 
+
    Error handling in oci8 bugfix - if there was an error in Execute(), then when 
+  calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but 
+  the 2nd call would return no error. 
+
    Error handling in odbc bugfix. ODBC would always return the last error, even 
+  if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 
+  0 everytime before CacheExecute() and Execute(). 
+
    3.70 29 July 2003 
+
    Added new SQLite driver. Tested on PHP 4.3 and PHP 5. 
+
    Added limited "sapdb" driver support - mainly date support. 
+
    The oci8 driver did not identify NUMBER with no defined precision correctly. 
+
    Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls 
+  in GetInsertSQL/GetUpdateSQL. 
+
    DBDate() and DBTimeStamp() format for postgresql had problems. Fixed. 
+
    Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit. 
+
    Added charset support to postgresql. Thx to Julian Tarkhanov. 
+
    Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS) 
+
    Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn. 
+
    adodb-cryptsession.php includes wrong. Fixed. 
+
    Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8. 
+
    Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. 
+
    adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause checking 
+  in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. 
+
    Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring. 
+
    Upgraded to adodb-xmlschema.inc.php 0.0.2. 
+
    NConnect for mysql now returns value. Thx to Dennis Verspuij. 
+
    ADODB_FETCH_BOTH support added to interbase/firebird. 
+
    Czech language file contributed by Kamil Jakubovic jake#host.sk. 
+
    PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec. 
+
    Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it 
+
    ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed. 
+
    3.60 16 June 2003 
+
    We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with 
+  mssql driver. 
+
    The property $emptyDate missing from connection class. Also changed 1903 to 
+  constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. 
+
    ADOdb speedup optimization - we now return all arrays by reference. 
+
    Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. 
+  Suggested by vincent. 
+
    Added GetArray() to connection class. 
+
    Added not_null check in informix metacolumns(). 
+
    Connection parameters for postgresql did not work correctly when port was defined. 
+
    DB2 is now a tested driver, making adodb 100% compatible. Extensive changes 
+  to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching 
+  to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() 
+  fixes. 
+
    The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed. 
+
    Some bugs in adodb_backtrace() fixed. 
+
    Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql 
+  properly. 
+
    MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions 
+  to odbc MetaColumns() for vfp and db2 compat. 
+
    Added unsigned support to mysql datadict class. Thx to iamsure. 
+
    Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to 
+  Josh R, Night_Wulfe#hotmail.com. 
+
    ChangeTableSQL contributed by Florian Buzin. 
+
    The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with 
+  mssql driver. 
+
    
+
    0.10 Sept 9 2000 First release 
+
    Old changelog history moved to old-changelog.htm. 
+  
    
+
     
    
+
      
+
+
diff --git a/lib/adodb/docs-datadict.htm b/lib/adodb/docs-datadict.htm
index a5192d48ab2..aa795c0e76d 100644
--- a/lib/adodb/docs-datadict.htm
+++ b/lib/adodb/docs-datadict.htm
@@ -1,303 +1,551 @@
-
-
-ADODB Data Dictionary Manual
-
-
-	
-
-
-
    ADOdb Data Dictionary Library for PHP
    
-
     V4.11 27 Jan 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my)
    
-
    This software is dual licensed using BSD-Style and LGPL. This 
-  means you can use it in compiled proprietary and commercial products.
    
-
    Useful ADOdb links:  Download   Other Docs
-
-
    This documentation describes a class library to automate the creation of tables, 
-  indexes and foreign key constraints portably for multiple databases. 
-
    Currently the following databases are supported: 
-
     Well-tested: PostgreSQL, MySQL, Oracle, MSSQL. 
    
-Beta-quality: DB2, Informix, Sybase, Interbase, Firebird.
    
-Alpha-quality: MS Access (does not support DEFAULT values) and generic ODBC.
    
-
    Example Usage
    
-
    include_once('adodb.inc.php');
-
-# First create a normal connection
-$db->NewADOConnection('mysql');
-$db->Connect(...);
-
    
-# Then create a data dictionary object, using this connection
-$dict = NewDataDictionary($db);
-
-# We have a portable declarative data dictionary format in ADOdb 3.50, similar to SQL.
-# Field types use 1 character codes, and fields are separated by commas.
-# The following example creates three fields: "col1", "col2" and "col3":
-$flds = " 
- col1 C(32) NOTNULL DEFAULT 'abc',
- col2 I  DEFAULT 0,
- col3 N(12.2)
-";
    
-# We demonstrate creating tables and indexes
-$sqlarray = $dict->CreateTableSQL($tabname, $flds, $taboptarray);
-$dict->ExecuteSQLArray($sqlarray);
    
-$idxflds = 'co11, col2';
-$sqlarray = $dict->CreateIndexSQL($idxname, $tabname, $idxflds);
-$dict->ExecuteSQLArray($sqlarray);
-
    
-
    Functions
    
-
    function CreateDatabase($dbname, $optionsarray=false)
-
    Create a database with the name $dbname;
-
    function CreateTableSQL($tabname, $fldarray, $taboptarray=false)
-
    -	RETURNS:	an array of strings, the sql to be executed, or false
-	$tabname: 	name of table
-	$fldarray:	string (or array) containing field info
-	$taboptarray:	array containing table options
-
    
-
    
-	The new format of $fldarray uses a free text format, where each field is comma-delimited.
-	The first token for each field is the field name, followed by the type and optional
-	field size. Then optional keywords in $otheroptions:
-	
    	"$fieldname $type $colsize $otheroptions"
    
-
    	The older (and still supported) format of $fldarray is a 2-dimensional array, where each row in the 
-	1st dimension represents one field. Each row has this format:
-
    	array($fieldname, $type, [,$colsize] [,$otheroptions]*)
    
-	
-
    The first 2 fields must be the field name and the field type. The field type
-	can be a portable type codes or the actual type for that database.
    
-
    
-	Legal portable type codes include:
-
    -C:  varchar
-X:  Largest varchar size 
-XL: For Oracle, returns CLOB, otherwise same as 'X' above
-
-C2: Multibyte varchar
-X2: Multibyte varchar (largest size)
-
-B:  BLOB (binary large object)
    
-D:  Date (some databases do not support this, and we return a datetime type)
-T:  Datetime or Timestamp
-L:  Integer field suitable for storing booleans (0 or 1)
-I:  Integer (mapped to I4)
-I1: 1-byte integer
-I2: 2-byte integer
-I4: 4-byte integer
-I8: 8-byte integer
-F:  Floating point number
-N:  Numeric or decimal number
-
    
-
    	The $colsize field represents the size of the field. If a decimal number is 
-	used, then it is assumed that the number following the dot is the precision,
-	so 6.2 means a number of size 6 digits and 2 decimal places. It is 
-	recommended that the default for number types be represented as a string to 
-	avoid any rounding errors.
-
    
-	The $otheroptions include the following keywords (case-insensitive):
-
    -AUTO            For autoincrement number. Emulated with triggers if not available.
-				Sets NOTNULL also.
-AUTOINCREMENT   Same as auto.
-KEY             Primary key field. Sets NOTNULL also. Compound keys are supported.
-PRIMARY 		Same as KEY.
-DEF             Synonym for DEFAULT for lazy typists.
-DEFAULT         The default value. Character strings are auto-quoted unless
-                the string begins and ends with spaces, eg ' SYSDATE '.
-NOTNULL         If field is not null.
-DEFDATE         Set default value to call function to get today's date.
-DEFTIMESTAMP    Set default to call function to get today's datetime.
-NOQUOTE         Prevents autoquoting of default string values.
-CONSTRAINTS     Additional constraints defined at the end of the field
-                definition.
-
    
-
     The Data Dictonary accepts two formats, the older array specification: 
    
-
    -$flds = array(
-	array('COLNAME',   'DECIMAL', '8.4', 'DEFAULT' => 0, 'NotNull'),
-	array('id',        'I'      , 'AUTO'),
-	array('`MY DATE`', 'D'      , 'DEFDATE'),
-	array('NAME',      'C'      , '32', 
-		  'CONSTRAINTS' => 'FOREIGN KEY REFERENCES reftable')
-);  
    
-Or the simpler declarative format:
-
     $flds = "
- COLNAME DECIMAL(8.4) DEFAULT 0 NotNull,
- id I AUTO,
- `MY DATE` D DEFDATE, 
- NAME C(32) CONSTRAINTS 'FOREIGN KEY REFERENCES reftable' 
-"; 
-
    
-
    
-	Note that if you have special characters in the field name (e.g. My Date), you should enclose it in back-quotes. Normally field names are not case-sensitive, but if you enclose it in back-quotes, some databases treat the names as case-sensitive, and some don't. So be careful.
-
    The $taboptarray is the 3rd parameter of the CreateTableSQL function. 
-	This contains table specific settings. Legal keywords include:
-	 
-
      
-	
    • REPLACE 
      
-		Indicates that the previous table definition should be removed (dropped)together 
-		with ALL data. See first example below.
      
-	
      • 
-	
    • DROP 
      
-		Drop table. Useful for removing unused tables.
      
-	
      • 
-	
    • CONSTRAINTS 
      
-		Define this as the key, with the constraint as the value. See the postgresql 
-		example below. Additional constraints defined for the whole table. You 
-		will probably need to prefix this with a comma. 
      • 
-
    
-
     Database specific table options can be defined also using the name of the 
-	database type as the array key. In the following example, create the table 
-	as ISAM with MySQL, and store the table in the "users" tablespace 
-	if using Oracle. And if the table already exists, drop the table first.
-
     	$taboptarray = array('mysql' => 'TYPE=ISAM', 'oci8' => 'tablespace users', 'REPLACE'); 	
    
-
    
-	You can also define foreignkey constraints. The following is syntax for 
-	postgresql:
    -	$taboptarray = array('constraints' => 
-					', FOREIGN KEY (col1) REFERENCES reftable (refcol)');
-
    
-
    function ChangeTableSQL($tabname, $flds)
-
    Checks to see if table exists, if table does not exist, behaves like CreateTableSQL. 
-  If table exists, generates appropriate ALTER TABLE MODIFY COLUMN commands if 
-  field already exists, or ALTER TABLE ADD $column if field does not exist. 
-
    The class must be connected to the database for ChangeTableSQL to detect the 
-  existance of the table. Idea and code contributed by Florian Buzin.
-
    function CreateIndexSQL($idxname, $tabname, $flds, $idxoptarray=false) 
-
    
-	RETURNS:		an array of strings, the sql to be executed, or false
-	
    -	$idxname:		name of index
-	$tabname: 		name of table
-	$flds:  		list of fields as a comma delimited string or an array of strings
-	$idxoptarray:	array of index creation options
-	
    
-
    	$idxoptarray is similar to $taboptarray in that index specific information can
-	be embedded in the array. Other options include:
-	
    -	CLUSTERED		Create clustered index (only mssql)
-	BITMAP			Create bitmap index (only oci8)
-	UNIQUE			Make unique index
-	FULLTEXT		Make fulltext index (only mysql)
-	HASH			Create hash index (only postgres)
-	DROP            Drop legacy index
-	
    	
-
     function AddColumnSQL($tabname, $flds)
-
    Add one or more columns. Not guaranteed to work under all situations.
-
    function AlterColumnSQL($tabname, $flds)
-
    Warning, not all databases support this feature.
-
     function DropColumnSQL($tabname, $flds)
-
    Drop 1 or more columns.
-
     function ExecuteSQLArray($sqlarray, $contOnError = true) 
-
    -	RETURNS:		0 if failed, 1 if executed all but with errors, 2 if executed successfully
-	$sqlarray:		an array of strings with sql code (no semicolon at the end of string)
-	$contOnError:	if true, then continue executing even if error occurs
-
    	
-
    Executes an array of SQL strings returned by CreateTableSQL or CreateIndexSQL.
-
    
-
    XML Schema
    
-This is a class contributed by Richard Tango-Lowy that allows the user to quickly
- and easily build a database using the excellent 
-ADODB database library and a simple XML formatted file.
-
-
-
    Quick Start
    
-
    First, create an XML database schema. Let's call it "schema.xml:"
    -<?xml version="1.0"?>
-<schema>
-  <table name="mytable">
-    <field name="row1" type="I">
-      <descr>An integer row that's a primary key and autoincrements</descr>
-      <KEY/>
-      <AUTOINCREMENT/>
-    </field>
-    <field name="row2" type="C" size="16">
-      <descr>A 16 character varchar row that can't be null</descr>
-      <NOTNULL/>
-    </field>
-  </table>
-  <index name="myindex" table="mytable">
-    <col>row1</col>
-    <col>row2</col>
-  </index>
-  <sql>
-    <descr>SQL to be executed only on specific platforms</descr>
-    <query platform="postgres|postgres7">
-      insert into mytable ( row1, row2 ) values ( 12, 'stuff' )
-    </query>
-    <query platform="mysql">
-      insert into mytable ( row1, row2 ) values ( 12, 'different stuff' )
-    </query>
-  </sql>
-</schema>
-
    Create a new database using the appropriate tool for your platform.
-Executing the following PHP code will create the a mytable and myindex
-in the database and insert one row into mytable if the platform is postgres or mysql. 
    				
-include_once('/path/to/adodb.inc.php');
-include_once('/path/to/adodb-xmlschema.inc.php');
-
-// To build the schema, start by creating a normal ADOdb connection:
-$db->NewADOConnection( 'mysql' );
-$db->Connect( ... );
-
-// Create the schema object and build the query array.
-$schema = new adoSchema( $db );
-
-// Optionally, set a prefix for newly-created tables. In this example
-// the prefix "myprefix_" will result in a table named "myprefix_tablename".
-//$schema->setPrefix( "myprefix_" );
-	
-// Build the SQL array
-$sql = $schema->ParseSchema( "schema.xml" );
-
-// Execute the SQL on the database
-$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-$schema->Destroy();
-
-
    
-	
-
    XML Schema Format:
    
-
    (See ADOdb_schema.dtd for the full specification)
    
-
    -<?xml version="1.0"?>
-<schema>
-  <table name="tablename" platform="platform1|platform2|...">
-    <descr>Optional description</descr>
-    <field name="fieldname" type="datadict_type" size="size">
-      <KEY/>
-      <NOTNULL/>
-      <AUTOINCREMENT/>
-      <DEFAULT value="value"/>
-    </field>
-	... more fields
-  </table>
-  ... more tables
-  
-  <index name="indexname" platform="platform1|platform2|...">
-    <descr>Optional description</descr>
-    <col>fieldname</col>
-    ... more columns
-  </index>
-  ... more indices
-  
-  <sql platform="platform1|platform2|...">
-    <descr>Optional description</descr>
-    <query platform="platform1|platform2|...">SQL query</query>
-    ... more queries
-  </sql>
-  ... more SQL
-  </schema>
-
    
-
    
-
-
    If you have any questions or comments, please email them to me  at 
-richtl#arscognita.com.
    
-
-
-
+
+  
+    ADODB Data Dictionary Manual
+    
+    
+  	
+  
+
+
    ADOdb Data Dictionary Library for PHP
    
+
    V4.20 22 Feb 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my).
     AXMLS (c) 2004 ars Cognita, Inc
    
+
    This software is dual licensed using BSD-Style and LGPL. This means you can use it in compiled proprietary and commercial products.
    
+
    Useful ADOdb links:  Download   Other Docs
    
+
+
    This documentation describes a PHP class library to automate the creation of tables, 
+  indexes and foreign key constraints portably for multiple databases. Richard Tango-Lowy and Dan Cech
+  have been kind enough to contribute AXMLS, an XML schema system for defining databases.
    
+
+
    Currently the following databases are supported:
    
+
    
+  Well-tested: PostgreSQL, MySQL, Oracle, MSSQL.
    
+  Beta-quality: DB2, Informix, Sybase, Interbase, Firebird.
    
+  Alpha-quality: MS Access (does not support DEFAULT values) and generic ODBC.
+
    
+
+
    Example Usage
    
+
    +  include_once('adodb.inc.php');
+  # First create a normal connection
+  $db->NewADOConnection('mysql');
+  $db->Connect(...);
+
+  # Then create a data dictionary object, using this connection
+  $dict = NewDataDictionary($db);
+
+  # We have a portable declarative data dictionary format in ADOdb, similar to SQL.
+  # Field types use 1 character codes, and fields are separated by commas.
+  # The following example creates three fields: "col1", "col2" and "col3":
+  $flds = " 
+   col1 C(32) NOTNULL DEFAULT 'abc',
+   col2 I  DEFAULT 0,
+   col3 N(12.2)
+  ";
+
+  # We demonstrate creating tables and indexes
+  $sqlarray = $dict->CreateTableSQL($tabname, $flds, $taboptarray);
+  $dict->ExecuteSQLArray($sqlarray);
    
+  $idxflds = 'co11, col2';
+  $sqlarray = $dict->CreateIndexSQL($idxname, $tabname, $idxflds);
+  $dict->ExecuteSQLArray($sqlarray);
+
    
+
+
    Functions
    
+
+
    function CreateDatabase($dbname, $optionsarray=false)
    
+
    Create a database with the name $dbname;
    
+
+
    function CreateTableSQL($tabname, $fldarray, $taboptarray=false)
    
+
    +  RETURNS:      an array of strings, the sql to be executed, or false
+  $tabname:     name of table
+  $fldarray:    string (or array) containing field info
+  $taboptarray: array containing table options
+
    
+
    The new format of $fldarray uses a free text format, where each field is comma-delimited.
+The first token for each field is the field name, followed by the type and optional
+field size. Then optional keywords in $otheroptions:
    
+
      "$fieldname $type $colsize $otheroptions"
    
+
    The older (and still supported) format of $fldarray is a 2-dimensional array, where each row in the 1st dimension represents one field. Each row has this format:
    
+
      array($fieldname, $type, [,$colsize] [,$otheroptions]*)
    
+
+
    The first 2 fields must be the field name and the field type. The field type can be a portable type codes or the actual type for that database.
    
+
    Legal portable type codes include:
    
+
    +  C:  varchar
+  X:  Largest varchar size 
+  XL: For Oracle, returns CLOB, otherwise same as 'X' above
+
+  C2: Multibyte varchar
+  X2: Multibyte varchar (largest size)
+
+  B:  BLOB (binary large object)
+
+  D:  Date (some databases do not support this, and we return a datetime type)
+  T:  Datetime or Timestamp
+  L:  Integer field suitable for storing booleans (0 or 1)
+  I:  Integer (mapped to I4)
+  I1: 1-byte integer
+  I2: 2-byte integer
+  I4: 4-byte integer
+  I8: 8-byte integer
+  F:  Floating point number
+  N:  Numeric or decimal number
+
    
+
    The $colsize field represents the size of the field. If a decimal number is used, then it is assumed that the number following the dot is the precision, so 6.2 means a number of size 6 digits and 2 decimal places. It is recommended that the default for number types be represented as a string to avoid any rounding errors.
    
+
    The $otheroptions include the following keywords (case-insensitive):
    
+
    +  AUTO            For autoincrement number. Emulated with triggers if not available.
+                  Sets NOTNULL also.
+  AUTOINCREMENT   Same as auto.
+  KEY             Primary key field. Sets NOTNULL also. Compound keys are supported.
+  PRIMARY         Same as KEY.
+  DEF             Synonym for DEFAULT for lazy typists.
+  DEFAULT         The default value. Character strings are auto-quoted unless
+                  the string begins and ends with spaces, eg ' SYSDATE '.
+  NOTNULL         If field is not null.
+  DEFDATE         Set default value to call function to get today's date.
+  DEFTIMESTAMP    Set default to call function to get today's datetime.
+  NOQUOTE         Prevents autoquoting of default string values.
+  CONSTRAINTS     Additional constraints defined at the end of the field
+                  definition.
+
    
+
    The Data Dictonary accepts two formats, the older array specification:
    
+
    +  $flds = array(
+    array('COLNAME',   'DECIMAL', '8.4', 'DEFAULT' => 0, 'NOTNULL'),
+    array('id',        'I'      , 'AUTO'),
+    array('`MY DATE`', 'D'      , 'DEFDATE'),
+    array('NAME',      'C'      , '32', 'CONSTRAINTS' => 'FOREIGN KEY REFERENCES reftable')
+  );
+
    
+
    Or the simpler declarative format:
    
+
    +  $flds = "
+    COLNAME DECIMAL(8.4) DEFAULT 0 NOTNULL,
+    id I AUTO,
+    `MY DATE` D DEFDATE,
+    NAME C(32) CONSTRAINTS 'FOREIGN KEY REFERENCES reftable'
+  ";
+
    
+
    Note that if you have special characters in the field name (e.g. My Date), you should enclose it in back-quotes. Normally field names are not case-sensitive, but if you enclose it in back-quotes, some databases treat the names as case-sensitive, and some don't. So be careful.
    
+
+
    The $taboptarray is the 3rd parameter of the CreateTableSQL function. This contains table specific settings. Legal keywords include:
    
+
      
+  
    • REPLACE
      
+    Indicates that the previous table definition should be removed (dropped)together with ALL data. See first example below.
+  
      • 
+  
    • DROP
      
+    Drop table. Useful for removing unused tables.
+  
      • 
+  
    • CONSTRAINTS
      
+    Define this as the key, with the constraint as the value. See the postgresql example below.
+    Additional constraints defined for the whole table. You will probably need to prefix this with a comma.
+  
      • 
+
    
+
+
    Database specific table options can be defined also using the name of the database type as the array key. In the following example, create the table as ISAM with MySQL, and store the table in the "users" tablespace if using Oracle. And because we specified REPLACE, drop the table first.
    
+
      $taboptarray = array('mysql' => 'TYPE=ISAM', 'oci8' => 'tablespace users', 'REPLACE');
    
+
+
    You can also define foreignkey constraints. The following is syntax for postgresql:
+
      $taboptarray = array('constraints' => ', FOREIGN KEY (col1) REFERENCES reftable (refcol)');
    
+
+
    function DropTableSQL($tabname)
    
+
    Returns the SQL to drop the specified table.
    
+
+
    function ChangeTableSQL($tabname, $flds)
    
+
    Checks to see if table exists, if table does not exist, behaves like CreateTableSQL. 
+  If table exists, generates appropriate ALTER TABLE MODIFY COLUMN commands if 
+  field already exists, or ALTER TABLE ADD $column if field does not exist.
    
+
    The class must be connected to the database for ChangeTableSQL to detect the 
+  existence of the table. Idea and code contributed by Florian Buzin.
    
+
+
    function CreateIndexSQL($idxname, $tabname, $flds, $idxoptarray=false)
    
+
    +  RETURNS:      an array of strings, the sql to be executed, or false
+  $idxname:     name of index
+  $tabname:     name of table
+  $flds:        list of fields as a comma delimited string or an array of strings
+  $idxoptarray: array of index creation options
+
    
+
    $idxoptarray is similar to $taboptarray in that index specific information can be embedded in the array. Other options include:
    
+
    +  CLUSTERED     Create clustered index (only mssql)
+  BITMAP        Create bitmap index (only oci8)
+  UNIQUE        Make unique index
+  FULLTEXT      Make fulltext index (only mysql)
+  HASH          Create hash index (only postgres)
+  DROP          Drop legacy index
+
    
+
+
    function DropIndexSQL ($idxname, $tabname = NULL)
    
+
    Returns the SQL to drop the specified index.
    
+
+
    function AddColumnSQL($tabname, $flds)
    
+
    Add one or more columns. Not guaranteed to work under all situations.
    
+
+
    function AlterColumnSQL($tabname, $flds)
    
+
    Warning, not all databases support this feature.
    
+
+
    function DropColumnSQL($tabname, $flds)
    
+
    Drop 1 or more columns.
    
+
+
    function SetSchema($schema)
    
+
    Set the schema.
    
+
+
    function &MetaTables()
    
+
    function &MetaColumns($tab, $upper=true, $schema=false)
    
+
    function &MetaPrimaryKeys($tab,$owner=false,$intkey=false)
    
+
    function &MetaIndexes($table, $primary = false, $owner = false)
    
+
    These functions are wrappers for the corresponding functions in the connection object.  However, the table names will be autoquoted by the TableName function (see below) before being passed to the connection object.
    
+
+
    function NameQuote($name = NULL)
    
+
    If the provided name is quoted with backquotes (`) or contains special characters, returns the name quoted with the appropriate quote character, otherwise the name is returned unchanged.
    
+
+
    function TableName($name)
    
+
    The same as NameQuote, but will prepend the current schema if specified
    
+
+
    function MetaType($t,$len=-1,$fieldobj=false)
    
+
    function ActualType($meta)
    
+
    Convert between database-independent 'Meta' and database-specific 'Actual' type codes.
    
+
+
    function ExecuteSQLArray($sqlarray, $contOnError = true)
    
+
    +  RETURNS:      0 if failed, 1 if executed all but with errors, 2 if executed successfully
+  $sqlarray:    an array of strings with sql code (no semicolon at the end of string)
+  $contOnError: if true, then continue executing even if error occurs
+
    
+
    Executes an array of SQL strings returned by CreateTableSQL or CreateIndexSQL.
    
+
+
    
+
+
+
    ADOdb XML Schema (AXMLS)
    
+
    This is a class contributed by Richard Tango-Lowy and Dan Cech that allows the user to quickly
+and easily build a database using the excellent ADODB database library and a simple XML formatted file.
+You can download the latest version of AXMLS here.
    
+
+
    Quick Start
    
+
    First, create an XML database schema. Let's call it "schema.xml:"
    
+
    +  <?xml version="1.0"?>
+  <schema version="0.2">
+    <table name="mytable">
+      <field name="row1" type="I">
+        <descr>An integer row that's a primary key and autoincrements</descr>
+        <KEY/>
+        <AUTOINCREMENT/>
+      </field>
+      <field name="row2" type="C" size="16">
+        <descr>A 16 character varchar row that can't be null</descr>
+        <NOTNULL/>
+      </field>
+      <index name="myindex">
+        <col>row1</col>
+        <col>row2</col>
+      </index>
+    </table>
+    <sql>
+      <descr>SQL to be executed only on specific platforms</descr>
+      <query platform="postgres|postgres7">
+        insert into mytable ( row1, row2 ) values ( 12, 'stuff' )
+      </query>
+      <query platform="mysql">
+        insert into mytable ( row1, row2 ) values ( 12, 'different stuff' )
+      </query>
+    </sql>
+  </schema>
+
    
+
+
    Create a new database using the appropriate tool for your platform.
    
+Executing the following PHP code will create the a mytable and myindex
+in the database and insert one row into mytable if the platform is postgres or mysql.
    
+
+
    +  include_once('/path/to/adodb.inc.php');
+  include_once('/path/to/adodb-xmlschema.inc.php');
+
+  // To build the schema, start by creating a normal ADOdb connection:
+  $db->NewADOConnection( 'mysql' );
+  $db->Connect( ... );
+
+  // Create the schema object and build the query array.
+  $schema = new adoSchema( $db );
+
+  // Optionally, set a prefix for newly-created tables. In this example
+  // the prefix "myprefix_" will result in a table named "myprefix_tablename".
+  $schema->SetPrefix( 'myprefix_' );
+
+  // Build the SQL array
+  $schema->ParseSchema( 'schema.xml' );
+
+  // Execute the SQL on the database
+  $result = $schema->ExecuteSchema();
+
+  // Finally, clean up after the XML parser
+  // (PHP won't do this for you!)
+  $schema->Destroy();
+
    
+
+
+
    Using AXMLS in Your 
+			Application
    
+	
+	
    
+There are two steps involved in using 
+				AXMLS in your application: first, 
+				you must create a schema, or XML representation of your 
+				database, and second, you must create the PHP code that will 
+				parse and execute the schema.
    
+		
    Let's begin with a schema that describes a typical, if simplistic 
+			user management table for an application.
    
+		
    +<?xml version="1.0"?>
+<schema version="0.2">
+
+  <table name="users">
+    <desc>A typical users table for our application.</desc>
+    <field name="userId" type="I">
+      <descr>A unique ID assigned to each user.</descr>
+      <KEY/>
+      <AUTOINCREMENT/>
+    </field>
+    
+    <field name="userName" type="C" size="16"><NOTNULL/></field>
+    
+    <index name="userName">
+      <descr>Put a unique index on the user name</descr>
+      <col>userName</col>
+      <UNIQUE/>
+    </index>
+  </table>
+  
+  <sql>
+    <descr>Insert some data into the users table.</descr>
+    <query>insert into users (userName) values ( 'admin' )</query>
+    <query>insert into users (userName) values ( 'Joe' )</query>
+  </sql>
+</schema>			
+
    
+		
    Let's take a detailed look at this schema.
    
+		
    The opening <?xml version="1.0"?> tag is 
+					required by XML. The <schema> tag 
+					tells the parser that the enclosed markup defines an XML 
+					schema. The version="0.2" attribute sets 
+					the version of the AXMLS DTD used by the XML 
+					schema. 
    All versions of AXMLS prior 
+					to version 1.0 have a schema version of "0.1". The current 
+					schema version is "0.2".
    
+				
    +<?xml version="1.0"?>
+<schema version="0.2">
+  ...
+</schema>
+
    
+			
    Next we define one or more tables. A table consists of a 
+					fields (and other objects) enclosed by 
+					<table> tags. The 
+					name="" attribute specifies the name of 
+					the table that will be created in the database.
    
+				
    +<table name="users">
+
+    <desc>A typical users table for our application.</desc>
+    <field name="userId" type="I">
+      <descr>A unique ID assigned to each user.</descr>
+      <KEY/>
+      <AUTOINCREMENT/>
+    </field>
+    
+    <field name="userName" type="C" size="16"><NOTNULL/></field>
+    
+</table>
+
    
+				
    This table is called "users" and has a description and 
+					two fields. The description is optional, and is currently 
+					only for your own information; it is not applied to the 
+					database.
    
+				
    The first <field> tag will create 
+					a field named "userId" of type "I", or integer. (See the 
+					ADOdb Data Dictionary 
+					documentation for a list of valid types.) This 
+					<field> tag encloses two special 
+					field options: <KEY/>, which 
+					specifies this field as a primary key, and 
+					<AUTOINCREMENT/>, which specifies 
+					that the database engine should automatically fill this 
+					field with the next available value when a new row is 
+					inserted.
    
+				
    The second <field> tag will create 
+					a field named "userName" of type "C", or character, and of 
+					length 16 characters. The <NOTNULL/> 
+					option specifies that this field does not allow 
+					NULLs.
    
+			
    There are two ways to add indexes to a table. The 
+					simplest is to mark a field with the 
+					<KEY/> option as described above; a 
+					primary key is a unique index. The second and more powerful 
+					method uses the <index> tags.
    
+				
    +<table name="users">
+  ...
+    
+  <index name="userName">
+    <descr>Put a unique index on the user name</descr>
+    <col>userName</col>
+    <UNIQUE/>
+  </index>
+    
+</table>
+
    
+				
    The <index> tag specifies that an 
+					index should be created on the enclosing table. The 
+					name="" attribute provides the name of the 
+					index that will be created in the database. The 
+					description, as above, is for your information only. The 
+					<col> tags list each column that 
+					will be included in the index. Finally, the 
+					<UNIQUE/> tag specifies that this 
+					will be created as a unique index.
    
+			
    Finally, AXMLS allows you to include arbitrary SQL that 
+					will be applied to the database when the schema is 
+					executed.
    
+				
    +<sql>
+  <descr>Insert some data into the users table.</descr>
+  <query>insert into users (userName) values ( 'admin' )</query>
+  <query>insert into users (userName) values ( 'Joe' )</query>
+</sql>
+
    
+				
    The <sql> tag encloses any number 
+					of SQL queries that you define for your own use.
    
+		
    Now that we've defined an XML schema, you need to know how to 
+			apply it to your database. Here's a simple PHP script that shows 
+			how to load the schema.
    
+		
    +<?PHP
+/* You must tell the script where to find the ADOdb and
+ * the AXMLS libraries.
+ */
+require( "path_to_adodb/adodb.inc.php");
+require( "path_to_adodb/adodb-xmlschema.inc.php" );
+
+/* Configuration information. Define the schema filename,
+ * RDBMS platform (see the ADODB documentation for valid
+ * platform names), and database connection information here.
+ */
+$schemaFile = 'example.xml';
+$platform = 'mysql';
+$dbHost = 'localhost';
+$dbName = 'database';
+$dbUser = 'username';
+$dbPassword = 'password';
+
+/* Start by creating a normal ADODB connection.
+ */
+$db = ADONewConnection( $platform );
+$db->Connect( $dbHost, $dbUser, $dbPassword, $dbName );
+
+/* Use the database connection to create a new adoSchema object.
+ */
+$schema = new adoSchema( $db );
+
+/* Call ParseSchema() to build SQL from the XML schema file.
+ * Then call ExecuteSchema() to apply the resulting SQL to 
+ * the database.
+ */
+$sql = $schema->ParseSchema( $schemaFile );
+$result = $schema->ExecuteSchema();
+?>
+
    
+		
    Let's look at each part of the example in turn. After you 
+			manually create the database, there are three steps required to 
+			load (or upgrade) your schema.
    
+		
    First, create a normal ADOdb connection. The variables 
+					and values here should be those required to connect to your 
+					database.
    
+				
    +$db = ADONewConnection( 'mysql' );
+$db->Connect( 'host', 'user', 'password', 'database' );
+
    
+			
    Second, create the adoSchema object that load and 
+					manipulate your schema. You must pass an ADOdb database 
+					connection object in order to create the adoSchema 
+					object.
    
+				
    +$schema = new adoSchema( $db );
+
    
+			
    Third, call ParseSchema() to parse the 
+					schema and then ExecuteSchema() to apply 
+					it to the database. You must pass 
+					ParseSchema() the path and filename of 
+					your schema file.
    
+				
    +$schema->ParseSchema( $schemaFile ); 
+$schema->ExecuteSchema(); 
+
    
+		
    Execute the above code and then log into your database. If you've 
+			done all this right, you should see your tables, indexes, and 
+			SQL.
    
+		
    You can find the source files for this tutorial in the 
+			examples directory as 
+			tutorial_shema.xml and 
+			tutorial.php. See the class documentation for 
+			a more detailed description of the adoSchema methods, including 
+			methods and schema elements that are not described in this 
+			tutorial.
    
+
+
    XML Schema Format:
    
+
    (See xmlschema.dtd for the full specification)
    
+
    +  <?xml version="1.0"?>
+  <schema version="0.2">
+    <table name="tablename" platform="platform1|platform2|...">
+      <descr>Optional description</descr>
+      <field name="fieldname" type="datadict_type" size="size">
+        <KEY/>
+        <NOTNULL/>
+        <AUTOINCREMENT/>
+        <DEFAULT value="value"/>
+      </field>
+       ... more fields
+      <index name="indexname" platform="platform1|platform2|...">
+        <descr>Optional description</descr>
+        <col>fieldname</col>
+         ... more columns
+      </index>
+       ... more indexes
+    </table>
+     ... more tables
+
+    <sql platform="platform1|platform2|...">
+      <descr>Optional description</descr>
+      <query platform="platform1|platform2|...">SQL query</query>
+       ... more queries
+    </sql>
+     ... more SQL
+  </schema>
+
    
+
+
    Upgrading
    
+If your schema version is older, than XSLT is used to transform the schema to the newest version. 
+This means that if you are using an older XML schema format,  you need to have the XSLT extension installed.
+If you do not want to require your users to have the XSLT extension installed, make sure you 
+modify your XML schema to conform to the latest version.
+
    
+
+
    If you have any questions or comments, please email them to Richard at richtl#arscognita.com.
+
    
+
+
+
\ No newline at end of file
diff --git a/lib/adodb/docs-perf.htm b/lib/adodb/docs-perf.htm
index bfcaa774338..a7883cdb679 100644
--- a/lib/adodb/docs-perf.htm
+++ b/lib/adodb/docs-perf.htm
@@ -1,379 +1,386 @@
-
-
-
-
-	ADOdb Performance Monitoring Library
-
-
-
-
    The ADOdb Performance Monitoring Library
    
-
    V4.11 27 Jan 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my)
    
-
    This software is dual licensed using BSD-Style and LGPL. This 
-  means you can use it in compiled proprietary and commercial products.
    
-  
    Useful ADOdb links:  Download   Other Docs
-
    Introduction
    
-
    This module, part of the ADOdb package, provides both CLI and HTML interfaces 
-  for viewing key performance indicators of your database. This is very useful 
-  because web apps such as the popular phpMyAdmin currently do not provide effective 
-  database health monitoring tools. The module provides the following: 
-
      
-  
    • A quick health check of your database server using $perf->HealthCheck() 
-    or $perf->HealthCheckCLI(). 
-  
    • User interface for performance monitoring, $perf->UI(). 
-    This UI displays: 
-    
        
-      
      • the health check, 
        • 
-      
      • all SQL logged and their query plans, 
        • 
-      
      • a list of all tables in the current database
        • 
-      
      • an interface to continiously poll the server for key performance indicators 
-        such as CPU, Hit Ratio, Disk I/O
        • 
-    
      
-  
    • Gives you an API to build database monitoring tools for a server farm, for 
-    example calling $perf->DBParameter('data cache hit ratio') returns 
-    this very important statistic in a database independant manner. 
-
    
-
    ADOdb also has the ability to log all SQL executed, using LogSQL. 
-  All SQL logged can be analyzed through the performance monitor UI. 
-  In the View SQL mode, we categorize the SQL into 3 types:
-
      
-  
    • Suspicious SQL: queries with high average execution times, and are potential 
-    candidates for rewriting
      • 
-  
    • Expensive SQL: queries with high total execution times (#executions * avg 
-    execution time). Optimizing these queries will reduce your database server 
-    load.
      • 
-  
    • Invalid SQL: queries that generate errors.
      • 
-
    
-
    Each query is hyperlinked to a description of the query plan, and every PHP 
-  script that executed that query is also shown.
    
-
    Please note that the information presented is a very basic database health 
-  check, and does not provide a complete overview of database performance. Although 
-  some attempt has been made to make it work across multiple databases in the 
-  same way, it is impossible to do so. For the health check, we do try to display 
-  the following key database parameters for all drivers:
    
-
      
-  
    • data cache size - The amount of memory allocated to the cache.
      • 
-  
    • data cache hit ratio - A measure of how effective the cache is, as a percentage. 
-  The higher, the better.
      • 
-  
    • current connections - The number of sessions currently connected to the 
-    database. 
      • 
-
    
-
    You will need to connect to the database as an administrator to view most of 
-  the parameters. 
    
-
    Code improvements as very welcome, particularly adding new database parameters 
-  and automated tuning hints.
    
-
    Usage
    
-
    Currently, the following drivers: mysql, postgres, oci8, 
-  mssql, informix and db2 are supported. To create a 
-  new performance monitor, call NewPerfMonitor( ) as demonstrated below: 
    
-
    -<?php
-include_once('adodb.inc.php');
-session_start(); # session variables required for monitoring
-$conn = ADONewConnection($driver);
-$conn->Connect($server,$user,$pwd,$db);
-$perf =& NewPerfMonitor($conn);
-$perf->UI($pollsecs=5);
-?>
-
    
-
    It is also possible to retrieve a single database parameter:
    
-
    $size = $perf->DBParameter('data cache size');
-
    
-
    
-Thx to Fernando Ortiz for the informix module. 
-
    Methods
    
-
    function UI($pollsecs=5)
    
-
    Creates a web-based user interface for performance monitoring. When you click on Poll, 
-server statistics will be displayed every $pollsecs seconds.  See Usage 
-  above. Sample output follows below:
    
-
-
-    
-	  
     ADOdb Performance 
-      Monitor for localhost, db=test
    
-      PostgreSQL 7.3.2 on i686-pc-cygwin, compiled by GCC gcc (GCC) 
-      3.2 20020927 (prerelease)
    
-	Performance Stats   View SQL
-	   View Tables   Poll Stats
    
-
-
-
-
-
-
-
-
-
-
-
-
-
    postgres7
    ParameterValueDescription
    Ratios  
    statistics collectorTRUEValue must be TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level and stats_block_level must be set to true in postgresql.conf)
    data cache hit ratio99.7967555299239 
    IO  
    data reads125   
    data writes21.78125000000000000Count of inserts/updates/deletes * coef
    Data Cache  
    data cache buffers640Number of cache buffers. Tuning
    cache blocksize8192(estimate)
    data cache size5M 
    operating system cache size80M(effective cache size)
    Memory Usage  
    sort buffer size1MSize of sort buffer (per query)
    Connections  
    current connections0 
    max connections32 
    Parameters  
    rollback buffers8WAL buffers
    random page cost4Cost of doing a seek (default=4). See random_page_cost
    
-
    function HealthCheck()
     
-
    Returns database health check parameters as a HTML table. You will need to 
-  echo or print the output of this function,
    
-
    function HealthCheckCLI()
    
-
    Returns database health check parameters formatted for a command line interface. 
-  You will need to echo or print the output of this function. Sample output for 
-  mysql:
    
-
    --- Ratios -- 
-          MyISAM cache hit ratio => 56.5635738832 
-          InnoDB cache hit ratio => 0 
-             sql cache hit ratio => 0 
- -- IO -- 
-                      data reads => 2622 
-                     data writes => 2415.5 
- -- Data Cache -- 
-          MyISAM data cache size => 512K 
-             BDB data cache size => 8388600
-          InnoDB data cache size => 8M
- -- Memory Pools -- 
-                read buffer size => 131072 
-                sort buffer size => 65528 
-                     table cache => 4 
- -- Connections -- 
-             current connections => 3
-                 max connections => 100
    
-
    function Poll($pollSecs=5) 
-   
-
     Run in infinite loop, displaying the following information every $pollSecs. 
-  This will not work properly if output buffering is enabled. 
-  In the example below, $pollSecs=3:
-
    -Accumulating statistics...
- Time   WS-CPU%   Hit%   Sess        Reads/s          Writes/s
-11:08:30    0.7  56.56      1         0.0000            0.0000
-11:08:33    1.8  56.56      2         0.0000            0.0000
-11:08:36   11.1  56.55      3         2.5000            0.0000
-11:08:39    9.8  56.55      2         3.1121            0.0000
-11:08:42    2.8  56.55      1         0.0000            0.0000
-11:08:45    7.4  56.55      2         0.0000            1.5000
-
    
-
    WS-CPU% is the Web Server CPU load of the server that PHP is running 
-  from (eg. the database client), and not the database. The Hit% is the 
-  data cache hit ratio. Sess is the current number of sessions connected 
-  to the database. If you are using persistent connections, this should not change 
-  much. The Reads/s and Writes/s are synthetic values to give the 
-  viewer a rough guide to I/O, and are not to be taken literally. 
-
    function SuspiciousSQL($numsql=10)
    
-
    Returns SQL which have high average execution times as a HTML table. Each sql statement
-is hyperlinked to a new window which details the execution plan and the scripts that execute this SQL.
-
     The number of statements returned is determined by $numsql. Data is taken from the adodb_logsql table, where the sql statements are logged when
-$connection->LogSQL(true) is enabled. The adodb_logsql table is populated using $conn->LogSQL.
-
    For Oracle, Ixora Suspicious SQL returns a list of SQL statements that are most cache intensive as a HTML table. 
-  These are data intensive SQL statements that could benefit most from tuning. 
- 
-
    function ExpensiveSQL($numsql=10)
    
-
    Returns SQL whose total execution time (avg time * #executions) is high as a HTML table. Each sql statement
-is hyperlinked to a new window which details the execution plan and the scripts that execute this SQL.
-
     The number of statements returned is determined by $numsql. Data is taken from the adodb_logsql table, where the sql statements are logged when
-$connection->LogSQL(true) is enabled. The adodb_logsql table is populated using $conn->LogSQL.
-
-
    For Oracle, Ixora Expensive SQL returns a list of SQL statements that are taking the most CPU load 
-when run.
-
    function InvalidSQL($numsql=10)
    
-
    Returns a list of invalid SQL as an HTML table.
-
    Data is taken from the adodb_logsql table, where the sql statements are logged when
-$connection->LogSQL(true) is enabled.
-
    function Tables($orderby=1)
    
-
    Returns information on all tables in a database, with the first two fields 
-  containing the table name and table size, the remaining fields depend on the 
-  database driver. If $orderby is set to 1, it will sort by name. If $orderby 
-  is set to 2, then it will sort by table size. Some database drivers (mssql and 
-  mysql) will ignore the $orderby clause. For postgresql, the information is up-to-date 
-  since the last vacuum. Not supported currently for db2.
    
-
    Raw Functions
    
-
    Raw functions return values without any formatting.
    
-
    function DBParameter($paramname)
    
-
    Returns the value of a database parameter, such as $this->DBParameter("data 
-  cache size").
    
-
    function CPULoad()
    
-
    Returns the CPU load of the database client (NOT THE SERVER) as a percentage. 
-  Only works for Linux and Windows. For Windows, WMI must be available.
    
-
    Format of $settings Property
    
-
     To create new database parameters, you need to understand $settings. The $settings 
-  data structure is an associative array. Each element of the array defines a 
-  database parameter. The key is the name of the database parameter. If no key is defined,
-  then it is assumed to be a section break, and the value is the name of the section break.
-  If this is too confusing, looking at the source code will help a lot!
    
-
     Each database parameter is itself an array consisting of the following elements:
    
-
      
-  
    1.  Category code, used to group related db parameters. If the category code is 'HIDE', then
-the database parameter is not shown when HTML() is called. 
      
-  
      2. 
-  
    2.  either 
-    
        
-      
      1. sql string to retrieve value, eg. "select value from v\$parameter where 
-        name='db_block_size'", 
        2. 
-      
      2. array holding sql string and field to look for, e.g. array('show variables','table_cache'); 
-        optional 3rd parameter is the $rs->fields[$index] to use (otherwise 
-        $index=1), and optional 4th parameter is a constant to multiply the result 
-        with (typically 100 for percentage calculations),
        3. 
-      
      3. a string prefixed by =, then a PHP method of the class is invoked, e.g. 
-        to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue', 
-        
        
-      
        4. 
-    
      
-  
      3. 
-  
    3.  Description of database parameter. If description begins with an =, then 
-    it is interpreted as a method call, just as in (1c) above, taking one parameter, 
-    the current value. E.g. '=GetIndexDescription' will invoke $this->GetIndexDescription($val). 
-    This is useful for generating tuning suggestions. For an example, see WarnCacheRatio().
      4. 
-
    
-
    Example from MySQL, table_cache database parameter:
    
-
    'table cache' => array('CACHE',            # category code
-   array("show variables", 'table_cache'), # array (type 1b)
-   'Number of tables to keep open'),       # description
    
-
    Example Health Check Output
    
-
    db2 informix mysql mssql 
-  oci8 postgres
    
-
    
-
-   
-    
-  
-   
-    
-    
-    
-  
-   
-    
-  
-   
-    
-    
-    
-  
-  
-    
-  
-   
-    
-    
-    
-  
-   
-    
-    
-    
-  
-   
-    
-    
-    
-  
-   
-    
-  
-   
-    
-    
-    
-  
-
     
    db2
    ParameterValueDescription
    Ratios  
    data cache hit ratio0    
    Data Cache
    data cache buffers250   See tuning 
-      reference.
    cache blocksize4096    
    data cache size1000K    
    Connections
    current connections2    
    
-
     
    
-
-
-
-
-
-
    informix
    ParameterVal
-ueDescription
    Ratios  
    data cache hit
-ratio95.89 
    IO  
    data
-reads1883884Page reads
    data writes1716724Page writes
    Connections
- 
    current connections263.0Number of
-sessions
    
-
-
-
     
    
-
    
-
-
-
-
-
-
-
-
-
-
-
-
-
    mysql
    ParameterValueDescription
    Ratios  
    MyISAM cache hit ratio56.5658301822Cache ratio should be at least 90%
    InnoDB cache hit ratio0Cache ratio should be at least 90%
    sql cache hit ratio0 
    IO  
    data reads2622Number of selects (Key_reads is not accurate)
    data writes2415.5Number of inserts/updates/deletes * coef (Key_writes is not accurate)
    Data Cache  
    MyISAM data cache size512K 
    BDB data cache size8388600 
    InnoDB data cache size8M 
    Memory Pools  
    read buffer size131072(per session)
    sort buffer size65528Size of sort buffer (per session)
    table cache4Number of tables to keep open
    Connections  
    current connections3 
    max connections100 
    
-
     
    
-
    
-
-
-
-
-
-
-
-
-
-
    mssql
    ParameterValueDescription
    Ratios  
    data cache hit ratio99.9999694824 
    prepared sql hit ratio99.7738579828 
    adhoc sql hit ratio98.4540169133 
    IO  
    data reads2858   
    data writes1438   
    Data Cache  
    data cache size4362in K
    Connections  
    current connections14 
    max connections32767 
    
-
-
     
    
-
    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    oci8
    ParameterValueDescription
    Ratios  
    data cache hit ratio96.98 
    sql cache hit ratio99.96 
    IO  
    data reads842938   
    data writes16852   
    Data Cache  
    data cache buffers3072Number of cache buffers
    data cache blocksize8192 
    data cache size48Mshared_pool_size
    Memory Pools  
    java pool size0java_pool_size
    sort buffer size512Ksort_area_size (per query)
    user session buffer size8Mlarge_pool_size
    Connections  
    current connections1 
    max connections170 
    data cache utilization ratio88.46Percentage of data cache actually in use
    user cache utilization ratio91.76Percentage of user cache (large_pool) actually in use
    rollback segments11 
    Transactions  
    peak transactions24Taken from high-water-mark
    max transactions187max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)
    Parameters  
    cursor sharingEXACTCursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See cursor_sharing.
    index cache cost0% of indexed data blocks expected in the cache.
-			Recommended is 20-80. Default is 0. See optimizer_index_caching.
    random page cost100Recommended is 10-50 for TP, and 50 for data warehouses. Default is 100. See optimizer_index_cost_adj. 
    
-
    Suspicious SQL
    
-
-
-
-
-
-
-
    LOADEXECUTESSQL_TEXT
      .73%89select u.name, o.name, t.spare1, t.pctfree$    from sys.obj$ o, sys.user$ u, sys.tab$ t    where  (bitand(t.trigflag, 1048576) = 1048576) and           o.obj#=t.obj# and o.owner# = u.user# select i.obj#, i.flags, u.name, o.name     from sys.obj$ o, sys.user$ u, sys.ind$ i    where  (bitand(i.flags, 256) = 256 or bitand(i.flags, 512) = 512) and           (not((i.type# = 9) and bitand(i.flags,8) = 8)) and           o.obj#=i.obj# and o.owner# = u.user# 
      .84%3select /*+ RULE */ distinct tabs.table_name, tabs.owner , partitioned, iot_type  , TEMPORARY, table_type, table_type_owner  from DBA_ALL_TABLES tabs  where tabs.owner = :own  
     3.95%6SELECT round(count(1)*avg(buf.block_size)/1048576) FROM DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner = seg.owner and obj.object_name = seg.segment_name and obj.object_type = seg.segment_type and seg.buffer_pool = buf.name and buf.name = 'DEFAULT'  
     4.50%6SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner = seg.owner and obj.object_name = seg.segment_name and obj.object_type = seg.segment_type and seg.tablespace_name = tsp.tablespace_name  
    57.34%9267select t.schema, t.name, t.flags, q.name from system.aq$_queue_tables t, sys.aq$_queue_table_affinities aft,      system.aq$_queues q where aft.table_objno = t.objno and aft.owner_instance = :1 and        q.table_objno = t.objno and q.usage = 0 and       bitand(t.flags, 4+16+32+64+128+256) = 0 for update of t.name, aft.table_objno skip locked 
    
-
-
    Expensive SQL
    
-
-
-
-
-
-
-
    LOADEXECUTESSQL_TEXT
     5.24%1select round(sum(bytes)/1048576) from dba_segments  
     6.89%6SELECT round(count(1)*avg(buf.block_size)/1048576) FROM DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner = seg.owner and obj.object_name = seg.segment_name and obj.object_type = seg.segment_type and seg.buffer_pool = buf.name and buf.name = 'DEFAULT'  
     7.85%6SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner = seg.owner and obj.object_name = seg.segment_name and obj.object_type = seg.segment_type and seg.tablespace_name = tsp.tablespace_name  
    33.69%89select u.name, o.name, t.spare1, t.pctfree$    from sys.obj$ o, sys.user$ u, sys.tab$ t    where  (bitand(t.trigflag, 1048576) = 1048576) and           o.obj#=t.obj# and o.owner# = u.user# 
    36.44%89select i.obj#, i.flags, u.name, o.name     from sys.obj$ o, sys.user$ u, sys.ind$ i    where  (bitand(i.flags, 256) = 256 or bitand(i.flags, 512) = 512) and           (not((i.type# = 9) and bitand(i.flags,8) = 8)) and           o.obj#=i.obj# and o.owner# = u.user# 
    
-
-
    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    postgres7
    ParameterValueDescription
    Ratios  
    statistics collectorFALSEMust be set to TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level and stats_block_level must be set to true in postgresql.conf)
    data cache hit ratio99.9666031916603 
    IO  
    data reads15   
    data writes0.000000000000000000Count of inserts/updates/deletes * coef
    Data Cache  
    data cache buffers1280Number of cache buffers. Tuning
    cache blocksize8192(estimate)
    data cache size10M 
    operating system cache size80000K(effective cache size)
    Memory Pools  
    sort buffer size1MSize of sort buffer (per query)
    Connections  
    current connections13 
    max connections32 
    Parameters  
    rollback buffers8WAL buffers
    random page cost4Cost of doing a seek (default=4). See random_page_cost
    
-
-
-
+
+
+
+
+	ADOdb Performance Monitoring Library
+
+
+
+
    The ADOdb Performance Monitoring Library
    
+
    V4.20 22 Feb 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my)
    
+
    This software is dual licensed using BSD-Style and LGPL. This 
+  means you can use it in compiled proprietary and commercial products.
    
+  
    Useful ADOdb links:  Download   Other Docs
+
    Introduction
    
+
    This module, part of the ADOdb package, provides both CLI and HTML interfaces 
+  for viewing key performance indicators of your database. This is very useful 
+  because web apps such as the popular phpMyAdmin currently do not provide effective 
+  database health monitoring tools. The module provides the following: 
+
      
+  
    • A quick health check of your database server using $perf->HealthCheck() 
+    or $perf->HealthCheckCLI(). 
+  
    • User interface for performance monitoring, $perf->UI(). 
+    This UI displays: 
+    
        
+      
      • the health check, 
        • 
+      
      • all SQL logged and their query plans, 
        • 
+      
      • a list of all tables in the current database
        • 
+      
      • an interface to continiously poll the server for key performance indicators 
+        such as CPU, Hit Ratio, Disk I/O
        • 
+		
      • a form where you can enter and run SQL interactively.
        • 
+    
      
+  
    • Gives you an API to build database monitoring tools for a server farm, for 
+    example calling $perf->DBParameter('data cache hit ratio') returns 
+    this very important statistic in a database independant manner. 
+
    
+
    ADOdb also has the ability to log all SQL executed, using LogSQL. 
+  All SQL logged can be analyzed through the performance monitor UI. 
+  In the View SQL mode, we categorize the SQL into 3 types:
+
      
+  
    • Suspicious SQL: queries with high average execution times, and are potential 
+    candidates for rewriting
      • 
+  
    • Expensive SQL: queries with high total execution times (#executions * avg 
+    execution time). Optimizing these queries will reduce your database server 
+    load.
      • 
+  
    • Invalid SQL: queries that generate errors.
      • 
+
    
+
    Each query is hyperlinked to a description of the query plan, and every PHP 
+  script that executed that query is also shown.
    
+
    Please note that the information presented is a very basic database health 
+  check, and does not provide a complete overview of database performance. Although 
+  some attempt has been made to make it work across multiple databases in the 
+  same way, it is impossible to do so. For the health check, we do try to display 
+  the following key database parameters for all drivers:
    
+
      
+  
    • data cache size - The amount of memory allocated to the cache.
      • 
+  
    • data cache hit ratio - A measure of how effective the cache is, as a percentage. 
+  The higher, the better.
      • 
+  
    • current connections - The number of sessions currently connected to the 
+    database. 
      • 
+
    
+
    You will need to connect to the database as an administrator to view most of 
+  the parameters. 
    
+
    Code improvements as very welcome, particularly adding new database parameters 
+  and automated tuning hints.
    
+
    Usage
    
+
    Currently, the following drivers: mysql, postgres, oci8, 
+  mssql, informix and db2 are supported. To create a 
+  new performance monitor, call NewPerfMonitor( ) as demonstrated below: 
    
+
    +<?php
+include_once('adodb.inc.php');
+session_start(); # session variables required for monitoring
+$conn = ADONewConnection($driver);
+$conn->Connect($server,$user,$pwd,$db);
+$perf =& NewPerfMonitor($conn);
+$perf->UI($pollsecs=5);
+?>
+
    
+
    It is also possible to retrieve a single database parameter:
    
+
    $size = $perf->DBParameter('data cache size');
+
    
+
    
+Thx to Fernando Ortiz for the informix module. 
+
    Methods
    
+
    function UI($pollsecs=5)
    
+
    Creates a web-based user interface for performance monitoring. When you click on Poll, 
+server statistics will be displayed every $pollsecs seconds.  See Usage 
+  above. 
+  
    Since 4.11, we allow users to enter and run SQL interactively via the "Run SQL" link. To disable
+  this for security reasons, set this constant before calling $perf->UI().
+  
    
+    
    define('ADODB_PERF_NO_RUN_SQL',1);
    
+  
+ 
    Sample output follows below:
    
+
+
+    
+	  
     ADOdb Performance 
+      Monitor for localhost, db=test
    
+      PostgreSQL 7.3.2 on i686-pc-cygwin, compiled by GCC gcc (GCC) 
+      3.2 20020927 (prerelease)
    
+	Performance Stats   View SQL
+	   View Tables   Poll Stats
    
+
+
+
+
+
+
+
+
+
+
+
+
+
    postgres7
    ParameterValueDescription
    Ratios  
    statistics collectorTRUEValue must be TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level and stats_block_level must be set to true in postgresql.conf)
    data cache hit ratio99.7967555299239 
    IO  
    data reads125   
    data writes21.78125000000000000Count of inserts/updates/deletes * coef
    Data Cache  
    data cache buffers640Number of cache buffers. Tuning
    cache blocksize8192(estimate)
    data cache size5M 
    operating system cache size80M(effective cache size)
    Memory Usage  
    sort buffer size1MSize of sort buffer (per query)
    Connections  
    current connections0 
    max connections32 
    Parameters  
    rollback buffers8WAL buffers
    random page cost4Cost of doing a seek (default=4). See random_page_cost
    
+
    function HealthCheck()
     
+
    Returns database health check parameters as a HTML table. You will need to 
+  echo or print the output of this function,
    
+
    function HealthCheckCLI()
    
+
    Returns database health check parameters formatted for a command line interface. 
+  You will need to echo or print the output of this function. Sample output for 
+  mysql:
    
+
    +-- Ratios -- 
+          MyISAM cache hit ratio => 56.5635738832 
+          InnoDB cache hit ratio => 0 
+             sql cache hit ratio => 0 
+ -- IO -- 
+                      data reads => 2622 
+                     data writes => 2415.5 
+ -- Data Cache -- 
+          MyISAM data cache size => 512K 
+             BDB data cache size => 8388600
+          InnoDB data cache size => 8M
+ -- Memory Pools -- 
+                read buffer size => 131072 
+                sort buffer size => 65528 
+                     table cache => 4 
+ -- Connections -- 
+             current connections => 3
+                 max connections => 100
    
+
    function Poll($pollSecs=5) 
+   
+
     Run in infinite loop, displaying the following information every $pollSecs. 
+  This will not work properly if output buffering is enabled. 
+  In the example below, $pollSecs=3:
+
    +Accumulating statistics...
+ Time   WS-CPU%   Hit%   Sess        Reads/s          Writes/s
+11:08:30    0.7  56.56      1         0.0000            0.0000
+11:08:33    1.8  56.56      2         0.0000            0.0000
+11:08:36   11.1  56.55      3         2.5000            0.0000
+11:08:39    9.8  56.55      2         3.1121            0.0000
+11:08:42    2.8  56.55      1         0.0000            0.0000
+11:08:45    7.4  56.55      2         0.0000            1.5000
+
    
+
    WS-CPU% is the Web Server CPU load of the server that PHP is running 
+  from (eg. the database client), and not the database. The Hit% is the 
+  data cache hit ratio. Sess is the current number of sessions connected 
+  to the database. If you are using persistent connections, this should not change 
+  much. The Reads/s and Writes/s are synthetic values to give the 
+  viewer a rough guide to I/O, and are not to be taken literally. 
+
    function SuspiciousSQL($numsql=10)
    
+
    Returns SQL which have high average execution times as a HTML table. Each sql statement
+is hyperlinked to a new window which details the execution plan and the scripts that execute this SQL.
+
     The number of statements returned is determined by $numsql. Data is taken from the adodb_logsql table, where the sql statements are logged when
+$connection->LogSQL(true) is enabled. The adodb_logsql table is populated using $conn->LogSQL.
+
    For Oracle, Ixora Suspicious SQL returns a list of SQL statements that are most cache intensive as a HTML table. 
+  These are data intensive SQL statements that could benefit most from tuning. 
+ 
+
    function ExpensiveSQL($numsql=10)
    
+
    Returns SQL whose total execution time (avg time * #executions) is high as a HTML table. Each sql statement
+is hyperlinked to a new window which details the execution plan and the scripts that execute this SQL.
+
     The number of statements returned is determined by $numsql. Data is taken from the adodb_logsql table, where the sql statements are logged when
+$connection->LogSQL(true) is enabled. The adodb_logsql table is populated using $conn->LogSQL.
+
+
    For Oracle, Ixora Expensive SQL returns a list of SQL statements that are taking the most CPU load 
+when run.
+
    function InvalidSQL($numsql=10)
    
+
    Returns a list of invalid SQL as an HTML table.
+
    Data is taken from the adodb_logsql table, where the sql statements are logged when
+$connection->LogSQL(true) is enabled.
+
    function Tables($orderby=1)
    
+
    Returns information on all tables in a database, with the first two fields 
+  containing the table name and table size, the remaining fields depend on the 
+  database driver. If $orderby is set to 1, it will sort by name. If $orderby 
+  is set to 2, then it will sort by table size. Some database drivers (mssql and 
+  mysql) will ignore the $orderby clause. For postgresql, the information is up-to-date 
+  since the last vacuum. Not supported currently for db2.
    
+
    Raw Functions
    
+
    Raw functions return values without any formatting.
    
+
    function DBParameter($paramname)
    
+
    Returns the value of a database parameter, such as $this->DBParameter("data 
+  cache size").
    
+
    function CPULoad()
    
+
    Returns the CPU load of the database client (NOT THE SERVER) as a percentage. 
+  Only works for Linux and Windows. For Windows, WMI must be available.
    
+
    Format of $settings Property
    
+
     To create new database parameters, you need to understand $settings. The $settings 
+  data structure is an associative array. Each element of the array defines a 
+  database parameter. The key is the name of the database parameter. If no key is defined,
+  then it is assumed to be a section break, and the value is the name of the section break.
+  If this is too confusing, looking at the source code will help a lot!
    
+
     Each database parameter is itself an array consisting of the following elements:
    
+
      
+  
    1.  Category code, used to group related db parameters. If the category code is 'HIDE', then
+the database parameter is not shown when HTML() is called. 
      
+  
      2. 
+  
    2.  either 
+    
        
+      
      1. sql string to retrieve value, eg. "select value from v\$parameter where 
+        name='db_block_size'", 
        2. 
+      
      2. array holding sql string and field to look for, e.g. array('show variables','table_cache'); 
+        optional 3rd parameter is the $rs->fields[$index] to use (otherwise 
+        $index=1), and optional 4th parameter is a constant to multiply the result 
+        with (typically 100 for percentage calculations),
        3. 
+      
      3. a string prefixed by =, then a PHP method of the class is invoked, e.g. 
+        to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue', 
+        
        
+      
        4. 
+    
      
+  
      3. 
+  
    3.  Description of database parameter. If description begins with an =, then 
+    it is interpreted as a method call, just as in (1c) above, taking one parameter, 
+    the current value. E.g. '=GetIndexDescription' will invoke $this->GetIndexDescription($val). 
+    This is useful for generating tuning suggestions. For an example, see WarnCacheRatio().
      4. 
+
    
+
    Example from MySQL, table_cache database parameter:
    
+
    'table cache' => array('CACHE',            # category code
+   array("show variables", 'table_cache'), # array (type 1b)
+   'Number of tables to keep open'),       # description
    
+
    Example Health Check Output
    
+
    db2 informix mysql mssql 
+  oci8 postgres
    
+
    
+
+   
+    
+  
+   
+    
+    
+    
+  
+   
+    
+  
+   
+    
+    
+    
+  
+  
+    
+  
+   
+    
+    
+    
+  
+   
+    
+    
+    
+  
+   
+    
+    
+    
+  
+   
+    
+  
+   
+    
+    
+    
+  
+
     
    db2
    ParameterValueDescription
    Ratios  
    data cache hit ratio0    
    Data Cache
    data cache buffers250   See tuning 
+      reference.
    cache blocksize4096    
    data cache size1000K    
    Connections
    current connections2    
    
+
     
    
+
+
+
+
+
+
    informix
    ParameterVal
+ueDescription
    Ratios  
    data cache hit
+ratio95.89 
    IO  
    data
+reads1883884Page reads
    data writes1716724Page writes
    Connections
+ 
    current connections263.0Number of
+sessions
    
+
+
+
     
    
+
    
+
+
+
+
+
+
+
+
+
+
+
+
+
    mysql
    ParameterValueDescription
    Ratios  
    MyISAM cache hit ratio56.5658301822Cache ratio should be at least 90%
    InnoDB cache hit ratio0Cache ratio should be at least 90%
    sql cache hit ratio0 
    IO  
    data reads2622Number of selects (Key_reads is not accurate)
    data writes2415.5Number of inserts/updates/deletes * coef (Key_writes is not accurate)
    Data Cache  
    MyISAM data cache size512K 
    BDB data cache size8388600 
    InnoDB data cache size8M 
    Memory Pools  
    read buffer size131072(per session)
    sort buffer size65528Size of sort buffer (per session)
    table cache4Number of tables to keep open
    Connections  
    current connections3 
    max connections100 
    
+
     
    
+
    
+
+
+
+
+
+
+
+
+
+
    mssql
    ParameterValueDescription
    Ratios  
    data cache hit ratio99.9999694824 
    prepared sql hit ratio99.7738579828 
    adhoc sql hit ratio98.4540169133 
    IO  
    data reads2858   
    data writes1438   
    Data Cache  
    data cache size4362in K
    Connections  
    current connections14 
    max connections32767 
    
+
+
     
    
+
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    oci8
    ParameterValueDescription
    Ratios  
    data cache hit ratio96.98 
    sql cache hit ratio99.96 
    IO  
    data reads842938   
    data writes16852   
    Data Cache  
    data cache buffers3072Number of cache buffers
    data cache blocksize8192 
    data cache size48Mshared_pool_size
    Memory Pools  
    java pool size0java_pool_size
    sort buffer size512Ksort_area_size (per query)
    user session buffer size8Mlarge_pool_size
    Connections  
    current connections1 
    max connections170 
    data cache utilization ratio88.46Percentage of data cache actually in use
    user cache utilization ratio91.76Percentage of user cache (large_pool) actually in use
    rollback segments11 
    Transactions  
    peak transactions24Taken from high-water-mark
    max transactions187max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)
    Parameters  
    cursor sharingEXACTCursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See cursor_sharing.
    index cache cost0% of indexed data blocks expected in the cache.
+			Recommended is 20-80. Default is 0. See optimizer_index_caching.
    random page cost100Recommended is 10-50 for TP, and 50 for data warehouses. Default is 100. See optimizer_index_cost_adj. 
    
+
    Suspicious SQL
    
+
+
+
+
+
+
+
    LOADEXECUTESSQL_TEXT
      .73%89select u.name, o.name, t.spare1, t.pctfree$    from sys.obj$ o, sys.user$ u, sys.tab$ t    where  (bitand(t.trigflag, 1048576) = 1048576) and           o.obj#=t.obj# and o.owner# = u.user# select i.obj#, i.flags, u.name, o.name     from sys.obj$ o, sys.user$ u, sys.ind$ i    where  (bitand(i.flags, 256) = 256 or bitand(i.flags, 512) = 512) and           (not((i.type# = 9) and bitand(i.flags,8) = 8)) and           o.obj#=i.obj# and o.owner# = u.user# 
      .84%3select /*+ RULE */ distinct tabs.table_name, tabs.owner , partitioned, iot_type  , TEMPORARY, table_type, table_type_owner  from DBA_ALL_TABLES tabs  where tabs.owner = :own  
     3.95%6SELECT round(count(1)*avg(buf.block_size)/1048576) FROM DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner = seg.owner and obj.object_name = seg.segment_name and obj.object_type = seg.segment_type and seg.buffer_pool = buf.name and buf.name = 'DEFAULT'  
     4.50%6SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner = seg.owner and obj.object_name = seg.segment_name and obj.object_type = seg.segment_type and seg.tablespace_name = tsp.tablespace_name  
    57.34%9267select t.schema, t.name, t.flags, q.name from system.aq$_queue_tables t, sys.aq$_queue_table_affinities aft,      system.aq$_queues q where aft.table_objno = t.objno and aft.owner_instance = :1 and        q.table_objno = t.objno and q.usage = 0 and       bitand(t.flags, 4+16+32+64+128+256) = 0 for update of t.name, aft.table_objno skip locked 
    
+
+
    Expensive SQL
    
+
+
+
+
+
+
+
    LOADEXECUTESSQL_TEXT
     5.24%1select round(sum(bytes)/1048576) from dba_segments  
     6.89%6SELECT round(count(1)*avg(buf.block_size)/1048576) FROM DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner = seg.owner and obj.object_name = seg.segment_name and obj.object_type = seg.segment_type and seg.buffer_pool = buf.name and buf.name = 'DEFAULT'  
     7.85%6SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner = seg.owner and obj.object_name = seg.segment_name and obj.object_type = seg.segment_type and seg.tablespace_name = tsp.tablespace_name  
    33.69%89select u.name, o.name, t.spare1, t.pctfree$    from sys.obj$ o, sys.user$ u, sys.tab$ t    where  (bitand(t.trigflag, 1048576) = 1048576) and           o.obj#=t.obj# and o.owner# = u.user# 
    36.44%89select i.obj#, i.flags, u.name, o.name     from sys.obj$ o, sys.user$ u, sys.ind$ i    where  (bitand(i.flags, 256) = 256 or bitand(i.flags, 512) = 512) and           (not((i.type# = 9) and bitand(i.flags,8) = 8)) and           o.obj#=i.obj# and o.owner# = u.user# 
    
+
+
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    postgres7
    ParameterValueDescription
    Ratios  
    statistics collectorFALSEMust be set to TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level and stats_block_level must be set to true in postgresql.conf)
    data cache hit ratio99.9666031916603 
    IO  
    data reads15   
    data writes0.000000000000000000Count of inserts/updates/deletes * coef
    Data Cache  
    data cache buffers1280Number of cache buffers. Tuning
    cache blocksize8192(estimate)
    data cache size10M 
    operating system cache size80000K(effective cache size)
    Memory Pools  
    sort buffer size1MSize of sort buffer (per query)
    Connections  
    current connections13 
    max connections32 
    Parameters  
    rollback buffers8WAL buffers
    random page cost4Cost of doing a seek (default=4). See random_page_cost
    
+
+
+
diff --git a/lib/adodb/docs-session.htm b/lib/adodb/docs-session.htm
index 04204789a62..1ae6bbe8a31 100644
--- a/lib/adodb/docs-session.htm
+++ b/lib/adodb/docs-session.htm
@@ -1,213 +1,213 @@
-
-
-ADODB Session Management Manual
-
-
-    
-
-
    ADODB Session Management Manual
    
-
    
-V4.11 27 Jan 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my)
-
     This software is dual licensed using BSD-Style and LGPL. This 
-  means you can use it in compiled proprietary and commercial products.  
-
    Useful ADOdb links:  Download   Other Docs
-
-
    Introduction
    
-
     
-We store state information specific to a user or web client in session variables. These session variables 
- persist throughout a session, as the user moves from page to page. 
-
    
-To use session variables, call session_start() at the beginning of your web page, 
-before your HTTP headers are sent. Then for every variable you want to keep alive 
-for the duration of the session, call session_register($variable_name). By default, 
-the session handler will keep track of the session by using a cookie. You can save objects
- or arrays in session variables also.
-
    The default method of storing sessions is to store it in a file. However if 
-  you have special needs such as you:
-
      
-  
    • Have multiple web servers that need to share session info
      • 
-  
    • Need to do special processing of each session
      • 
-  
    • Require notification when a session expires
      • 
-
    
-
    Then the ADOdb session handler provides you with the above additional capabilities 
-  by storing the session information as records in a database table that can be 
-  shared across multiple servers. 
-
    Important Upgrade Notice: Since ADOdb 4.05, the session files have been moved to its own folder, adodb/session. This is a rewrite
-of the session code by Ross Smith. The old session code is in adodb/session/old. 
-
    ADOdb Session Handler Features
    
-
      
-
    • Ability to define a notification function that is called when a session expires. Typically
-used to detect session logout and release global resources.
-
    • Optimization of database writes. We crc32 the session data and only perform an update
-to the session data if there is a data change.
-
    • Support for large amounts of session data with CLOBs (see adodb-session-clob.php). Useful
-for Oracle.
-
    • Support for encrypted session data, see adodb-cryptsession.inc.php. Enabling encryption 
-is simply a matter of including adodb-cryptsession.inc.php instead of adodb-session.inc.php.
-
    
-
    Setup
    
-
    There are 3 session management files that you can use:
-
    -adodb-session.php        : The default
-adodb-session-clob.php   : Use this if you are storing DATA in clobs
-adodb-cryptsession.php   : Use this if you want to store encrypted session data in the database
-
-Examples
- 
-    include('adodb/adodb.inc.php');
-    
-    $ADODB_SESSION_DRIVER='mysql';
-    $ADODB_SESSION_CONNECT='localhost';
-    $ADODB_SESSION_USER ='scott';
-    $ADODB_SESSION_PWD ='tiger';
-    $ADODB_SESSION_DB ='sessiondb';
-    
-    include('adodb/session/adodb-session.php');
-    session_start();
-    
-    #
-    # Test session vars, the following should increment on refresh
-    #
-    $_SESSION['AVAR'] += 1;
-    print "<p>\$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
-To force non-persistent connections, call adodb_session_open first before session_start():
- 
-    include('adodb/adodb.inc.php');
-    
-    $ADODB_SESSION_DRIVER='mysql';
-    $ADODB_SESSION_CONNECT='localhost';
-    $ADODB_SESSION_USER ='scott';
-    $ADODB_SESSION_PWD ='tiger';
-    $ADODB_SESSION_DB ='sessiondb';
-    
-    include('adodb/session/adodb-session.php');
-    adodb_sess_open(false,false,false);
-    session_start();
- 
-To use a encrypted sessions, simply replace the file:
- 
-    include('adodb/adodb.inc.php');
-    
-    $ADODB_SESSION_DRIVER='mysql';
-    $ADODB_SESSION_CONNECT='localhost';
-    $ADODB_SESSION_USER ='scott';
-    $ADODB_SESSION_PWD ='tiger';
-    $ADODB_SESSION_DB ='sessiondb';
-    
-    include('adodb/session/adodb-cryptsession.php');
-    session_start();
-    
-And the same technique for adodb-session-clob.php:
- 
-    include('adodb/adodb.inc.php');
-    
-    $ADODB_SESSION_DRIVER='mysql';
-    $ADODB_SESSION_CONNECT='localhost';
-    $ADODB_SESSION_USER ='scott';
-    $ADODB_SESSION_PWD ='tiger';
-    $ADODB_SESSION_DB ='sessiondb';
-    
-    include('adodb/session/adodb-session-clob.php');
-    session_start();
-    
- 
    Installation
    
- 1. Create this table in your database (syntax might vary depending on your db):
-  
-  create table sessions (
-       SESSKEY char(32) not null,
-       EXPIRY int(11) unsigned not null,
-       EXPIREREF varchar(64),
-       DATA text not null,
-      primary key (sesskey)
-  );
-  
-  For the adodb-session-clob.php version, create this:
-   
-    create table sessions (
-       SESSKEY char(32) not null,
-       EXPIRY int(11) unsigned not null,
-       EXPIREREF varchar(64),
-       DATA CLOB,
-      primary key (sesskey)
-  );
-
-  2. Then define the following parameters. You can either modify
-     this file, or define them before this file is included:
-      
-    $ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
-    $ADODB_SESSION_CONNECT='server to connect to';
-    $ADODB_SESSION_USER ='user';
-    $ADODB_SESSION_PWD ='password';
-    $ADODB_SESSION_DB ='database';
-    $ADODB_SESSION_TBL = 'sessions'; # setting this is optional
-	
-    When the session is created, $ADODB_SESS_CONN holds the connection object.
-    
-  3. Recommended is PHP 4.0.6 or later. There are documented session bugs 
-  in earlier versions of PHP.
-
    
-
-    
    Notifications
    
-
    If you want to receive notification when a session expires, then
-     tag the session record with a EXPIREREF tag (see the 
-    definition of the sessions table above).  Before any session record is deleted,
-	ADOdb will call a notification function, passing in the EXPIREREF.
-
    
-When a session is first created, we check a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
-    This is an array with 2 elements, the first being the name of the session variable
-    you would like to store in the EXPIREREF field, and the 2nd is the 
-    notification function's name.
-	
    
-	 Suppose we want to be notified when a user's session 
-    has expired, based on the userid. The user id in the global session variable $USERID.
-	The function name is 'NotifyFn'. So we define:
-    
     
-        $ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-    
    
-    And when the NotifyFn is called (when the session expires), we pass the $USERID 
-    as the first parameter, eg. NotifyFn($userid, $sesskey). The session key (which is 
-	the primary key of the record in the sessions table) is the 2nd parameter.
-  
    
-    Here is an example of a Notification function that deletes some records in the database
-	and temporary files:
-    
    
-        function NotifyFn($expireref, $sesskey)
-        {
-        global $ADODB_SESS_CONN; # the session connection object
-
-          $user = $ADODB_SESS_CONN->qstr($expireref);
-          $ADODB_SESS_CONN->Execute("delete from shopping_cart where user=$user");
-          system("rm /work/tmpfiles/$expireref/*");
-        }
-    
    
-	
    
- 
-    
    
-    NOTE: If you want to change the EXPIREREF after the session record has been
-    created, you will need to modify any session variable to force a database
-    record update.
-
    Compression/Encryption Schemes
    
-Since ADOdb 4.05, thanks to Ross Smith,  multiple encryption and compression schemes are supported.
-  Currently, supported:
-
    -  MD5Crypt (crypt.inc.php)
-  MCrypt
-  Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
-  GZip
-  BZip2
-
    
-These are stackable. E.g. 
-
    -ADODB_Session::filter(new ADODB_Compress_Bzip2());
-ADODB_Session::filter(new ADODB_Encrypt_MD5());
-
    
-will compress and then encrypt the record in the database.
-
    
-Also see the core ADOdb documentation.
-
+
+
+ADODB Session Management Manual
+
+
+    
+
+
    ADODB Session Management Manual
    
+
    
+V4.20 22 Feb 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my)
+
     This software is dual licensed using BSD-Style and LGPL. This 
+  means you can use it in compiled proprietary and commercial products.  
+
    Useful ADOdb links:  Download   Other Docs
+
+
    Introduction
    
+
     
+We store state information specific to a user or web client in session variables. These session variables 
+ persist throughout a session, as the user moves from page to page. 
+
    
+To use session variables, call session_start() at the beginning of your web page, 
+before your HTTP headers are sent. Then for every variable you want to keep alive 
+for the duration of the session, call session_register($variable_name). By default, 
+the session handler will keep track of the session by using a cookie. You can save objects
+ or arrays in session variables also.
+
    The default method of storing sessions is to store it in a file. However if 
+  you have special needs such as you:
+
      
+  
    • Have multiple web servers that need to share session info
      • 
+  
    • Need to do special processing of each session
      • 
+  
    • Require notification when a session expires
      • 
+
    
+
    Then the ADOdb session handler provides you with the above additional capabilities 
+  by storing the session information as records in a database table that can be 
+  shared across multiple servers. 
+
    Important Upgrade Notice: Since ADOdb 4.05, the session files have been moved to its own folder, adodb/session. This is a rewrite
+of the session code by Ross Smith. The old session code is in adodb/session/old. 
+
    ADOdb Session Handler Features
    
+
      
+
    • Ability to define a notification function that is called when a session expires. Typically
+used to detect session logout and release global resources.
+
    • Optimization of database writes. We crc32 the session data and only perform an update
+to the session data if there is a data change.
+
    • Support for large amounts of session data with CLOBs (see adodb-session-clob.php). Useful
+for Oracle.
+
    • Support for encrypted session data, see adodb-cryptsession.inc.php. Enabling encryption 
+is simply a matter of including adodb-cryptsession.inc.php instead of adodb-session.inc.php.
+
    
+
    Setup
    
+
    There are 3 session management files that you can use:
+
    +adodb-session.php        : The default
+adodb-session-clob.php   : Use this if you are storing DATA in clobs
+adodb-cryptsession.php   : Use this if you want to store encrypted session data in the database
+
+Examples
+ 
+    include('adodb/adodb.inc.php');
+    
+    $ADODB_SESSION_DRIVER='mysql';
+    $ADODB_SESSION_CONNECT='localhost';
+    $ADODB_SESSION_USER ='scott';
+    $ADODB_SESSION_PWD ='tiger';
+    $ADODB_SESSION_DB ='sessiondb';
+    
+    include('adodb/session/adodb-session.php');
+    session_start();
+    
+    #
+    # Test session vars, the following should increment on refresh
+    #
+    $_SESSION['AVAR'] += 1;
+    print "<p>\$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
+
+To force non-persistent connections, call adodb_session_open first before session_start():
+ 
+    include('adodb/adodb.inc.php');
+    
+    $ADODB_SESSION_DRIVER='mysql';
+    $ADODB_SESSION_CONNECT='localhost';
+    $ADODB_SESSION_USER ='scott';
+    $ADODB_SESSION_PWD ='tiger';
+    $ADODB_SESSION_DB ='sessiondb';
+    
+    include('adodb/session/adodb-session.php');
+    adodb_sess_open(false,false,false);
+    session_start();
+ 
+To use a encrypted sessions, simply replace the file:
+ 
+    include('adodb/adodb.inc.php');
+    
+    $ADODB_SESSION_DRIVER='mysql';
+    $ADODB_SESSION_CONNECT='localhost';
+    $ADODB_SESSION_USER ='scott';
+    $ADODB_SESSION_PWD ='tiger';
+    $ADODB_SESSION_DB ='sessiondb';
+    
+    include('adodb/session/adodb-cryptsession.php');
+    session_start();
+    
+And the same technique for adodb-session-clob.php:
+ 
+    include('adodb/adodb.inc.php');
+    
+    $ADODB_SESSION_DRIVER='mysql';
+    $ADODB_SESSION_CONNECT='localhost';
+    $ADODB_SESSION_USER ='scott';
+    $ADODB_SESSION_PWD ='tiger';
+    $ADODB_SESSION_DB ='sessiondb';
+    
+    include('adodb/session/adodb-session-clob.php');
+    session_start();
+    
+ 
    Installation
    
+ 1. Create this table in your database (syntax might vary depending on your db):
+  
+  create table sessions (
+       SESSKEY char(32) not null,
+       EXPIRY int(11) unsigned not null,
+       EXPIREREF varchar(64),
+       DATA text not null,
+      primary key (sesskey)
+  );
+  
+  For the adodb-session-clob.php version, create this:
+   
+    create table sessions (
+       SESSKEY char(32) not null,
+       EXPIRY int(11) unsigned not null,
+       EXPIREREF varchar(64),
+       DATA CLOB,
+      primary key (sesskey)
+  );
+
+  2. Then define the following parameters. You can either modify
+     this file, or define them before this file is included:
+      
+    $ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+    $ADODB_SESSION_CONNECT='server to connect to';
+    $ADODB_SESSION_USER ='user';
+    $ADODB_SESSION_PWD ='password';
+    $ADODB_SESSION_DB ='database';
+    $ADODB_SESSION_TBL = 'sessions'; # setting this is optional
+	
+    When the session is created, $ADODB_SESS_CONN holds the connection object.
+    
+  3. Recommended is PHP 4.0.6 or later. There are documented session bugs 
+  in earlier versions of PHP.
+
    
+
+    
    Notifications
    
+
    If you want to receive notification when a session expires, then
+     tag the session record with a EXPIREREF tag (see the 
+    definition of the sessions table above).  Before any session record is deleted,
+	ADOdb will call a notification function, passing in the EXPIREREF.
+
    
+When a session is first created, we check a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
+    This is an array with 2 elements, the first being the name of the session variable
+    you would like to store in the EXPIREREF field, and the 2nd is the 
+    notification function's name.
+	
    
+	 Suppose we want to be notified when a user's session 
+    has expired, based on the userid. The user id in the global session variable $USERID.
+	The function name is 'NotifyFn'. So we define:
+    
     
+        $ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+    
    
+    And when the NotifyFn is called (when the session expires), we pass the $USERID 
+    as the first parameter, eg. NotifyFn($userid, $sesskey). The session key (which is 
+	the primary key of the record in the sessions table) is the 2nd parameter.
+  
    
+    Here is an example of a Notification function that deletes some records in the database
+	and temporary files:
+    
    
+        function NotifyFn($expireref, $sesskey)
+        {
+        global $ADODB_SESS_CONN; # the session connection object
+
+          $user = $ADODB_SESS_CONN->qstr($expireref);
+          $ADODB_SESS_CONN->Execute("delete from shopping_cart where user=$user");
+          system("rm /work/tmpfiles/$expireref/*");
+        }
+    
    
+	
    
+ 
+    
    
+    NOTE: If you want to change the EXPIREREF after the session record has been
+    created, you will need to modify any session variable to force a database
+    record update.
+
    Compression/Encryption Schemes
    
+Since ADOdb 4.05, thanks to Ross Smith,  multiple encryption and compression schemes are supported.
+  Currently, supported:
+
    +  MD5Crypt (crypt.inc.php)
+  MCrypt
+  Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
+  GZip
+  BZip2
+
    
+These are stackable. E.g. 
+
    +ADODB_Session::filter(new ADODB_Compress_Bzip2());
+ADODB_Session::filter(new ADODB_Encrypt_MD5());
+
    
+will compress and then encrypt the record in the database.
+
    
+Also see the core ADOdb documentation.
+
 
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-access.inc.php b/lib/adodb/drivers/adodb-access.inc.php
index fca5a832857..9e418b7fdee 100644
--- a/lib/adodb/drivers/adodb-access.inc.php
+++ b/lib/adodb/drivers/adodb-access.inc.php
@@ -1,79 +1,79 @@
-ADODB_odbc();
-	}
-	
-	function BeginTrans() { return false;}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " IIF(IsNull($field), $ifNull, $field) "; // if Access
-	}
-/*
-	function &MetaTables()
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
-		$rs = new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) return false;
-		
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr = &$rs->GetArray();
-		//print_pre($arr);
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][2] && $arr[$i][3] != 'SYSTEM TABLE')
-				$arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}*/
-}
-
- 
-class  ADORecordSet_access extends ADORecordSet_odbc {	
-	
-	var $databaseType = "access";		
-	
-	function ADORecordSet_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-}// class
-} 
+ADODB_odbc();
+	}
+	
+	function BeginTrans() { return false;}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " IIF(IsNull($field), $ifNull, $field) "; // if Access
+	}
+/*
+	function &MetaTables()
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = odbc_tables($this->_connectionID);
+		$rs = new ADORecordSet_odbc($qid);
+		$ADODB_FETCH_MODE = $savem;
+		if (!$rs) return false;
+		
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		
+		$arr = &$rs->GetArray();
+		//print_pre($arr);
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][2] && $arr[$i][3] != 'SYSTEM TABLE')
+				$arr2[] = $arr[$i][2];
+		}
+		return $arr2;
+	}*/
+}
+
+ 
+class  ADORecordSet_access extends ADORecordSet_odbc {	
+	
+	var $databaseType = "access";		
+	
+	function ADORecordSet_access($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbc($id,$mode);
+	}
+}// class
+} 
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-ado.inc.php b/lib/adodb/drivers/adodb-ado.inc.php
index ad49f6406ec..68ea5056abd 100644
--- a/lib/adodb/drivers/adodb-ado.inc.php
+++ b/lib/adodb/drivers/adodb-ado.inc.php
@@ -1,613 +1,613 @@
-_affectedRows = new VARIANT;
-	}
-
-	function ServerInfo()
-	{
-		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
-		return array('description' => $desc, 'version' => '');
-	}
-	
-	function _affectedrows()
-	{
-			return $this->_affectedRows->value;
-	}
-	
-	// you can also pass a connection string like this:
-	//
-	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
-	{
-		$u = 'UID';
-		$p = 'PWD';
-	
-		if (!empty($this->charPage))
-			$dbc = new COM('ADODB.Connection',null,$this->charPage);
-		else
-			$dbc = new COM('ADODB.Connection');
-			
-		if (! $dbc) return false;
-
-		/* special support if provider is mssql or access */
-		if ($argProvider=='mssql') {
-			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
-			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
-			// not yet
-			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
-			//use trusted conection for SQL if username not specified
-			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
-		} else if ($argProvider=='access')
-			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
-		
-		if ($argUsername) $argHostname .= ";$u=$argUsername";
-		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
-		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
    \n version=$dbc->version");
-		// @ added below for php 4.0.1 and earlier
-		@$dbc->Open((string) $argHostname);
-		
-		$this->_connectionID = $dbc;
-		
-		$dbc->CursorLocation = $this->_cursor_location;
-		return  $dbc->State > 0;
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
-	{
-		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
-/*
-	adSchemaCatalogs	= 1,
-	adSchemaCharacterSets	= 2,
-	adSchemaCollations	= 3,
-	adSchemaColumns	= 4,
-	adSchemaCheckConstraints	= 5,
-	adSchemaConstraintColumnUsage	= 6,
-	adSchemaConstraintTableUsage	= 7,
-	adSchemaKeyColumnUsage	= 8,
-	adSchemaReferentialContraints	= 9,
-	adSchemaTableConstraints	= 10,
-	adSchemaColumnsDomainUsage	= 11,
-	adSchemaIndexes	= 12,
-	adSchemaColumnPrivileges	= 13,
-	adSchemaTablePrivileges	= 14,
-	adSchemaUsagePrivileges	= 15,
-	adSchemaProcedures	= 16,
-	adSchemaSchemata	= 17,
-	adSchemaSQLLanguages	= 18,
-	adSchemaStatistics	= 19,
-	adSchemaTables	= 20,
-	adSchemaTranslations	= 21,
-	adSchemaProviderTypes	= 22,
-	adSchemaViews	= 23,
-	adSchemaViewColumnUsage	= 24,
-	adSchemaViewTableUsage	= 25,
-	adSchemaProcedureParameters	= 26,
-	adSchemaForeignKeys	= 27,
-	adSchemaPrimaryKeys	= 28,
-	adSchemaProcedureColumns	= 29,
-	adSchemaDBInfoKeywords	= 30,
-	adSchemaDBInfoLiterals	= 31,
-	adSchemaCubes	= 32,
-	adSchemaDimensions	= 33,
-	adSchemaHierarchies	= 34,
-	adSchemaLevels	= 35,
-	adSchemaMeasures	= 36,
-	adSchemaProperties	= 37,
-	adSchemaMembers	= 38
-
-*/
-	
-	function &MetaTables()
-	{
-		$arr= array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(20);//tables
-		if ($adors){
-			$f = $adors->Fields(2);//table/view name
-			$t = $adors->Fields(3);//table type
-			while (!$adors->EOF){
-				$tt=substr($t->value,0,6);
-				if ($tt!='SYSTEM' && $tt !='ACCESS')
-					$arr[]=$f->value;
-				//print $f->value . ' ' . $t->value.'
    ';
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		
-		return $arr;
-	}
-	
-	function &MetaColumns($table)
-	{
-		$table = strtoupper($table);
-		$arr= array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(4);//tables
-	
-		if ($adors){
-			$t = $adors->Fields(2);//table/view name
-			while (!$adors->EOF){
-				
-				
-				if (strtoupper($t->Value) == $table) {
-				
-					$fld = new ADOFieldObject();
-					$c = $adors->Fields(3);
-					$fld->name = $c->Value;
-					$fld->type = 'CHAR'; // cannot discover type in ADO!
-					$fld->max_length = -1;
-					$arr[strtoupper($fld->name)]=$fld;
-				}
-		
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		
-		return $arr;
-	}
-	
-
-
-	
-	/* returns queryID or false */
-	function &_query($sql,$inputarr=false) 
-	{
-		
-		$dbc = $this->_connectionID;
-		
-	//	return rs	
-		if ($inputarr) {
-			
-			if (!empty($this->charPage))
-				$oCmd = new COM('ADODB.Command',null,$this->charPage);
-			else
-				$oCmd = new COM('ADODB.Command');
-			$oCmd->ActiveConnection = $dbc;
-			$oCmd->CommandText = $sql;
-			$oCmd->CommandType = 1;
-
-			foreach($inputarr as $val) {
-				// name, type, direction 1 = input, len,
-				$this->adoParameterType = 130;
-				$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val);
-				//print $p->Type.' '.$p->value;
-				$oCmd->Parameters->Append($p);
-			}
-			$p = false;
-			$rs = $oCmd->Execute();
-			$e = $dbc->Errors;
-			if ($dbc->Errors->Count > 0) return false;
-			return $rs;
-		}
-		
-		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
-		/*
-			$rs =  new COM('ADODB.Recordset');
-			if ($rs) {
-				$rs->Open ($sql, $dbc, $this->_cursor_type,$this->_lock_type, $this->_execute_option);							
-			}
-		*/
-		if ($dbc->Errors->Count > 0) return false;
-		if (! $rs) return false;
-		
-		if ($rs->State == 0) return true; // 0 = adStateClosed means no records returned
-		return $rs;
-	}
-
-	
-	function BeginTrans() 
-	{ 
-		if ($this->transOff) return true;
-		
-		if (isset($this->_thisTransactions))
-			if (!$this->_thisTransactions) return false;
-		else {
-			$o = $this->_connectionID->Properties("Transaction DDL");
-			$this->_thisTransactions = $o ? true : false;
-			if (!$o) return false;
-		}
-		@$this->_connectionID->BeginTrans();
-		$this->transCnt += 1;
-		return true;
-	}
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		
-		@$this->_connectionID->CommitTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	function RollbackTrans() {
-		if ($this->transOff) return true;
-		@$this->_connectionID->RollbackTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
-
-	function ErrorMsg() 
-	{
-		$errc = $this->_connectionID->Errors;
-		if ($errc->Count == 0) return '';
-		$err = $errc->Item($errc->Count-1);
-		return $err->Description;
-	}
-	
-	function ErrorNo() 
-	{
-		$errc = $this->_connectionID->Errors;
-		if ($errc->Count == 0) return 0;
-		$err = $errc->Item($errc->Count-1);
-		return $err->NativeError;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		if ($this->_connectionID) $this->_connectionID->Close();
-		$this->_connectionID = false;
-		return true;
-	}
-	
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_ado extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
-	var $_tarr = false; // caches the types
-	var $_flds; // and field objects
-	var $canSeek = true;
-  	var $hideErrors = true;
-		  
-	function ADORecordSet_ado($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-
-
-	// returns the field object
-	function FetchField($fieldOffset = -1) {
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$rs = $this->_queryID;
-		$f = $rs->Fields($fieldOffset);
-		$o->name = $f->Name;
-		$t = $f->Type;
-		$o->type = $this->MetaType($t);
-		$o->max_length = $f->DefinedSize;
-		$o->ado_type = $t;
-		
-
-		//print "off=$off name=$o->name type=$o->type len=$o->max_length
    ";
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-		
-	function _initrs()
-	{
-		$rs = $this->_queryID;
-		$this->_numOfRows = $rs->RecordCount;
-		
-		$f = $rs->Fields;
-		$this->_numOfFields = $f->Count;
-	}
-	
-	
-	 // should only be used to move forward as we normally use forward-only cursors
-	function _seek($row)
-	{
-	   $rs = $this->_queryID; 
-		// absoluteposition doesn't work -- my maths is wrong ?
-		//	$rs->AbsolutePosition->$row-2;
-		//	return true;
-		if ($this->_currentRow > $row) return false;
-		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
-		return true;
-	}
-	
-/*
-	OLEDB types
-	
-	 enum DBTYPEENUM
-	{	DBTYPE_EMPTY	= 0,
-	DBTYPE_NULL	= 1,
-	DBTYPE_I2	= 2,
-	DBTYPE_I4	= 3,
-	DBTYPE_R4	= 4,
-	DBTYPE_R8	= 5,
-	DBTYPE_CY	= 6,
-	DBTYPE_DATE	= 7,
-	DBTYPE_BSTR	= 8,
-	DBTYPE_IDISPATCH	= 9,
-	DBTYPE_ERROR	= 10,
-	DBTYPE_BOOL	= 11,
-	DBTYPE_VARIANT	= 12,
-	DBTYPE_IUNKNOWN	= 13,
-	DBTYPE_DECIMAL	= 14,
-	DBTYPE_UI1	= 17,
-	DBTYPE_ARRAY	= 0x2000,
-	DBTYPE_BYREF	= 0x4000,
-	DBTYPE_I1	= 16,
-	DBTYPE_UI2	= 18,
-	DBTYPE_UI4	= 19,
-	DBTYPE_I8	= 20,
-	DBTYPE_UI8	= 21,
-	DBTYPE_GUID	= 72,
-	DBTYPE_VECTOR	= 0x1000,
-	DBTYPE_RESERVED	= 0x8000,
-	DBTYPE_BYTES	= 128,
-	DBTYPE_STR	= 129,
-	DBTYPE_WSTR	= 130,
-	DBTYPE_NUMERIC	= 131,
-	DBTYPE_UDT	= 132,
-	DBTYPE_DBDATE	= 133,
-	DBTYPE_DBTIME	= 134,
-	DBTYPE_DBTIMESTAMP	= 135
-	
-	ADO Types
-	
-   	adEmpty	= 0,
-	adTinyInt	= 16,
-	adSmallInt	= 2,
-	adInteger	= 3,
-	adBigInt	= 20,
-	adUnsignedTinyInt	= 17,
-	adUnsignedSmallInt	= 18,
-	adUnsignedInt	= 19,
-	adUnsignedBigInt	= 21,
-	adSingle	= 4,
-	adDouble	= 5,
-	adCurrency	= 6,
-	adDecimal	= 14,
-	adNumeric	= 131,
-	adBoolean	= 11,
-	adError	= 10,
-	adUserDefined	= 132,
-	adVariant	= 12,
-	adIDispatch	= 9,
-	adIUnknown	= 13,	
-	adGUID	= 72,
-	adDate	= 7,
-	adDBDate	= 133,
-	adDBTime	= 134,
-	adDBTimeStamp	= 135,
-	adBSTR	= 8,
-	adChar	= 129,
-	adVarChar	= 200,
-	adLongVarChar	= 201,
-	adWChar	= 130,
-	adVarWChar	= 202,
-	adLongVarWChar	= 203,
-	adBinary	= 128,
-	adVarBinary	= 204,
-	adLongVarBinary	= 205,
-	adChapter	= 136,
-	adFileTime	= 64,
-	adDBFileTime	= 137,
-	adPropVariant	= 138,
-	adVarNumeric	= 139
-*/
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		if (!is_numeric($t)) return $t;
-		
-		switch ($t) {
-		case 0:
-		case 12: // variant
-		case 8: // bstr
-		case 129: //char
-		case 130: //wc
-		case 200: // varc
-		case 202:// varWC
-		case 128: // bin
-		case 204: // varBin
-		case 72: // guid
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 201:
-		case 203:
-			return 'X';
-		case 128:
-		case 204:
-		case 205:
-			 return 'B';
-		case 7:
-		case 133: return 'D';
-		
-		case 134:
-		case 135: return 'T';
-		
-		case 11: return 'L';
-		
-		case 16://	adTinyInt	= 16,
-		case 2://adSmallInt	= 2,
-		case 3://adInteger	= 3,
-		case 4://adBigInt	= 20,
-		case 17://adUnsignedTinyInt	= 17,
-		case 18://adUnsignedSmallInt	= 18,
-		case 19://adUnsignedInt	= 19,
-		case 20://adUnsignedBigInt	= 21,
-			return 'I';
-		default: return 'N';
-		}
-	}
-	
-	// time stamp not supported yet
-	function _fetch()
-	{	
-		$rs = $this->_queryID;
-		if (!$rs or $rs->EOF) {
-			$this->fields = false;
-			return false;
-		}
-		$this->fields = array();
-	
-		if (!$this->_tarr) {
-			$tarr = array();
-			$flds = array();
-			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-				$f = $rs->Fields($i);
-				$flds[] = $f;
-				$tarr[] = $f->Type;
-			}
-			// bind types and flds only once
-			$this->_tarr = $tarr; 
-			$this->_flds = $flds;
-		}
-		$t = reset($this->_tarr);
-		$f = reset($this->_flds);
-		
-		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
-		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-
-			switch($t) {
-			case 135: // timestamp
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else $this->fields[] = adodb_date('Y-m-d H:i:s',(float)$f->value);
-				break;			
-			case 133:// A date value (yyyymmdd) 
-				if ($val = $f->value) {
-					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-				} else
-					$this->fields[] = false;
-				break;
-			case 7: // adDate
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else $this->fields[] = adodb_date('Y-m-d',(float)$f->value);
-				break;
-			case 1: // null
-				$this->fields[] = false;
-				break;
-			case 6: // currency is not supported properly;
-				ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP');
-				$this->fields[] = (float) $f->value;
-				break;
-			default:
-				$this->fields[] = $f->value; 
-				break;
-			}
-			//print " $f->value $t, ";
-			$f = next($this->_flds);
-			$t = next($this->_tarr);
-		} // for
-		if ($this->hideErrors) error_reporting($olde);
-		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		return true;
-	}
-	
-		function NextRecordSet()
-		{
-			$rs = $this->_queryID;
-			$this->_queryID = $rs->NextRecordSet();
-			//$this->_queryID = $this->_QueryId->NextRecordSet();
-			if ($this->_queryID == null) return false;
-			
-			$this->_currentRow = -1;
-			$this->_currentPage = -1;
-			$this->bind = false;
-			$this->fields = false;
-			$this->_flds = false;
-			$this->_tarr = false;
-			
-			$this->_inited = false;
-			$this->Init();
-			return true;
-		}
-
-	function _close() {
-		$this->_flds = false;
-		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
-		$this->_queryID = false;	
-	}
-
-}
-
+_affectedRows = new VARIANT;
+	}
+
+	function ServerInfo()
+	{
+		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
+		return array('description' => $desc, 'version' => '');
+	}
+	
+	function _affectedrows()
+	{
+			return $this->_affectedRows->value;
+	}
+	
+	// you can also pass a connection string like this:
+	//
+	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
+	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
+	{
+		$u = 'UID';
+		$p = 'PWD';
+	
+		if (!empty($this->charPage))
+			$dbc = new COM('ADODB.Connection',null,$this->charPage);
+		else
+			$dbc = new COM('ADODB.Connection');
+			
+		if (! $dbc) return false;
+
+		/* special support if provider is mssql or access */
+		if ($argProvider=='mssql') {
+			$u = 'User Id';  //User parameter name for OLEDB
+			$p = 'Password'; 
+			$argProvider = "SQLOLEDB"; // SQL Server Provider
+			
+			// not yet
+			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
+			
+			//use trusted conection for SQL if username not specified
+			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
+		} else if ($argProvider=='access')
+			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
+		
+		if ($argProvider) $dbc->Provider = $argProvider;	
+		
+		if ($argUsername) $argHostname .= ";$u=$argUsername";
+		if ($argPassword)$argHostname .= ";$p=$argPassword";
+		
+		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
    \n version=$dbc->version");
+		// @ added below for php 4.0.1 and earlier
+		@$dbc->Open((string) $argHostname);
+		
+		$this->_connectionID = $dbc;
+		
+		$dbc->CursorLocation = $this->_cursor_location;
+		return  $dbc->State > 0;
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
+	{
+		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
+	}	
+	
+/*
+	adSchemaCatalogs	= 1,
+	adSchemaCharacterSets	= 2,
+	adSchemaCollations	= 3,
+	adSchemaColumns	= 4,
+	adSchemaCheckConstraints	= 5,
+	adSchemaConstraintColumnUsage	= 6,
+	adSchemaConstraintTableUsage	= 7,
+	adSchemaKeyColumnUsage	= 8,
+	adSchemaReferentialContraints	= 9,
+	adSchemaTableConstraints	= 10,
+	adSchemaColumnsDomainUsage	= 11,
+	adSchemaIndexes	= 12,
+	adSchemaColumnPrivileges	= 13,
+	adSchemaTablePrivileges	= 14,
+	adSchemaUsagePrivileges	= 15,
+	adSchemaProcedures	= 16,
+	adSchemaSchemata	= 17,
+	adSchemaSQLLanguages	= 18,
+	adSchemaStatistics	= 19,
+	adSchemaTables	= 20,
+	adSchemaTranslations	= 21,
+	adSchemaProviderTypes	= 22,
+	adSchemaViews	= 23,
+	adSchemaViewColumnUsage	= 24,
+	adSchemaViewTableUsage	= 25,
+	adSchemaProcedureParameters	= 26,
+	adSchemaForeignKeys	= 27,
+	adSchemaPrimaryKeys	= 28,
+	adSchemaProcedureColumns	= 29,
+	adSchemaDBInfoKeywords	= 30,
+	adSchemaDBInfoLiterals	= 31,
+	adSchemaCubes	= 32,
+	adSchemaDimensions	= 33,
+	adSchemaHierarchies	= 34,
+	adSchemaLevels	= 35,
+	adSchemaMeasures	= 36,
+	adSchemaProperties	= 37,
+	adSchemaMembers	= 38
+
+*/
+	
+	function &MetaTables()
+	{
+		$arr= array();
+		$dbc = $this->_connectionID;
+		
+		$adors=@$dbc->OpenSchema(20);//tables
+		if ($adors){
+			$f = $adors->Fields(2);//table/view name
+			$t = $adors->Fields(3);//table type
+			while (!$adors->EOF){
+				$tt=substr($t->value,0,6);
+				if ($tt!='SYSTEM' && $tt !='ACCESS')
+					$arr[]=$f->value;
+				//print $f->value . ' ' . $t->value.'
    ';
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		
+		return $arr;
+	}
+	
+	function &MetaColumns($table)
+	{
+		$table = strtoupper($table);
+		$arr= array();
+		$dbc = $this->_connectionID;
+		
+		$adors=@$dbc->OpenSchema(4);//tables
+	
+		if ($adors){
+			$t = $adors->Fields(2);//table/view name
+			while (!$adors->EOF){
+				
+				
+				if (strtoupper($t->Value) == $table) {
+				
+					$fld = new ADOFieldObject();
+					$c = $adors->Fields(3);
+					$fld->name = $c->Value;
+					$fld->type = 'CHAR'; // cannot discover type in ADO!
+					$fld->max_length = -1;
+					$arr[strtoupper($fld->name)]=$fld;
+				}
+		
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		
+		return $arr;
+	}
+	
+
+
+	
+	/* returns queryID or false */
+	function &_query($sql,$inputarr=false) 
+	{
+		
+		$dbc = $this->_connectionID;
+		
+	//	return rs	
+		if ($inputarr) {
+			
+			if (!empty($this->charPage))
+				$oCmd = new COM('ADODB.Command',null,$this->charPage);
+			else
+				$oCmd = new COM('ADODB.Command');
+			$oCmd->ActiveConnection = $dbc;
+			$oCmd->CommandText = $sql;
+			$oCmd->CommandType = 1;
+
+			foreach($inputarr as $val) {
+				// name, type, direction 1 = input, len,
+				$this->adoParameterType = 130;
+				$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val);
+				//print $p->Type.' '.$p->value;
+				$oCmd->Parameters->Append($p);
+			}
+			$p = false;
+			$rs = $oCmd->Execute();
+			$e = $dbc->Errors;
+			if ($dbc->Errors->Count > 0) return false;
+			return $rs;
+		}
+		
+		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
+		/*
+			$rs =  new COM('ADODB.Recordset');
+			if ($rs) {
+				$rs->Open ($sql, $dbc, $this->_cursor_type,$this->_lock_type, $this->_execute_option);							
+			}
+		*/
+		if ($dbc->Errors->Count > 0) return false;
+		if (! $rs) return false;
+		
+		if ($rs->State == 0) return true; // 0 = adStateClosed means no records returned
+		return $rs;
+	}
+
+	
+	function BeginTrans() 
+	{ 
+		if ($this->transOff) return true;
+		
+		if (isset($this->_thisTransactions))
+			if (!$this->_thisTransactions) return false;
+		else {
+			$o = $this->_connectionID->Properties("Transaction DDL");
+			$this->_thisTransactions = $o ? true : false;
+			if (!$o) return false;
+		}
+		@$this->_connectionID->BeginTrans();
+		$this->transCnt += 1;
+		return true;
+	}
+	function CommitTrans($ok=true) 
+	{ 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transOff) return true;
+		
+		@$this->_connectionID->CommitTrans();
+		if ($this->transCnt) @$this->transCnt -= 1;
+		return true;
+	}
+	function RollbackTrans() {
+		if ($this->transOff) return true;
+		@$this->_connectionID->RollbackTrans();
+		if ($this->transCnt) @$this->transCnt -= 1;
+		return true;
+	}
+	
+	/*	Returns: the last error message from previous database operation	*/	
+
+	function ErrorMsg() 
+	{
+		$errc = $this->_connectionID->Errors;
+		if ($errc->Count == 0) return '';
+		$err = $errc->Item($errc->Count-1);
+		return $err->Description;
+	}
+	
+	function ErrorNo() 
+	{
+		$errc = $this->_connectionID->Errors;
+		if ($errc->Count == 0) return 0;
+		$err = $errc->Item($errc->Count-1);
+		return $err->NativeError;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		if ($this->_connectionID) $this->_connectionID->Close();
+		$this->_connectionID = false;
+		return true;
+	}
+	
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_ado extends ADORecordSet {	
+	
+	var $bind = false;
+	var $databaseType = "ado";	
+	var $dataProvider = "ado";	
+	var $_tarr = false; // caches the types
+	var $_flds; // and field objects
+	var $canSeek = true;
+  	var $hideErrors = true;
+		  
+	function ADORecordSet_ado($id,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		return $this->ADORecordSet($id,$mode);
+	}
+
+
+	// returns the field object
+	function FetchField($fieldOffset = -1) {
+		$off=$fieldOffset+1; // offsets begin at 1
+		
+		$o= new ADOFieldObject();
+		$rs = $this->_queryID;
+		$f = $rs->Fields($fieldOffset);
+		$o->name = $f->Name;
+		$t = $f->Type;
+		$o->type = $this->MetaType($t);
+		$o->max_length = $f->DefinedSize;
+		$o->ado_type = $t;
+		
+
+		//print "off=$off name=$o->name type=$o->type len=$o->max_length
    ";
+		return $o;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+		
+	function _initrs()
+	{
+		$rs = $this->_queryID;
+		$this->_numOfRows = $rs->RecordCount;
+		
+		$f = $rs->Fields;
+		$this->_numOfFields = $f->Count;
+	}
+	
+	
+	 // should only be used to move forward as we normally use forward-only cursors
+	function _seek($row)
+	{
+	   $rs = $this->_queryID; 
+		// absoluteposition doesn't work -- my maths is wrong ?
+		//	$rs->AbsolutePosition->$row-2;
+		//	return true;
+		if ($this->_currentRow > $row) return false;
+		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
+		return true;
+	}
+	
+/*
+	OLEDB types
+	
+	 enum DBTYPEENUM
+	{	DBTYPE_EMPTY	= 0,
+	DBTYPE_NULL	= 1,
+	DBTYPE_I2	= 2,
+	DBTYPE_I4	= 3,
+	DBTYPE_R4	= 4,
+	DBTYPE_R8	= 5,
+	DBTYPE_CY	= 6,
+	DBTYPE_DATE	= 7,
+	DBTYPE_BSTR	= 8,
+	DBTYPE_IDISPATCH	= 9,
+	DBTYPE_ERROR	= 10,
+	DBTYPE_BOOL	= 11,
+	DBTYPE_VARIANT	= 12,
+	DBTYPE_IUNKNOWN	= 13,
+	DBTYPE_DECIMAL	= 14,
+	DBTYPE_UI1	= 17,
+	DBTYPE_ARRAY	= 0x2000,
+	DBTYPE_BYREF	= 0x4000,
+	DBTYPE_I1	= 16,
+	DBTYPE_UI2	= 18,
+	DBTYPE_UI4	= 19,
+	DBTYPE_I8	= 20,
+	DBTYPE_UI8	= 21,
+	DBTYPE_GUID	= 72,
+	DBTYPE_VECTOR	= 0x1000,
+	DBTYPE_RESERVED	= 0x8000,
+	DBTYPE_BYTES	= 128,
+	DBTYPE_STR	= 129,
+	DBTYPE_WSTR	= 130,
+	DBTYPE_NUMERIC	= 131,
+	DBTYPE_UDT	= 132,
+	DBTYPE_DBDATE	= 133,
+	DBTYPE_DBTIME	= 134,
+	DBTYPE_DBTIMESTAMP	= 135
+	
+	ADO Types
+	
+   	adEmpty	= 0,
+	adTinyInt	= 16,
+	adSmallInt	= 2,
+	adInteger	= 3,
+	adBigInt	= 20,
+	adUnsignedTinyInt	= 17,
+	adUnsignedSmallInt	= 18,
+	adUnsignedInt	= 19,
+	adUnsignedBigInt	= 21,
+	adSingle	= 4,
+	adDouble	= 5,
+	adCurrency	= 6,
+	adDecimal	= 14,
+	adNumeric	= 131,
+	adBoolean	= 11,
+	adError	= 10,
+	adUserDefined	= 132,
+	adVariant	= 12,
+	adIDispatch	= 9,
+	adIUnknown	= 13,	
+	adGUID	= 72,
+	adDate	= 7,
+	adDBDate	= 133,
+	adDBTime	= 134,
+	adDBTimeStamp	= 135,
+	adBSTR	= 8,
+	adChar	= 129,
+	adVarChar	= 200,
+	adLongVarChar	= 201,
+	adWChar	= 130,
+	adVarWChar	= 202,
+	adLongVarWChar	= 203,
+	adBinary	= 128,
+	adVarBinary	= 204,
+	adLongVarBinary	= 205,
+	adChapter	= 136,
+	adFileTime	= 64,
+	adDBFileTime	= 137,
+	adPropVariant	= 138,
+	adVarNumeric	= 139
+*/
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		if (!is_numeric($t)) return $t;
+		
+		switch ($t) {
+		case 0:
+		case 12: // variant
+		case 8: // bstr
+		case 129: //char
+		case 130: //wc
+		case 200: // varc
+		case 202:// varWC
+		case 128: // bin
+		case 204: // varBin
+		case 72: // guid
+			if ($len <= $this->blobSize) return 'C';
+		
+		case 201:
+		case 203:
+			return 'X';
+		case 128:
+		case 204:
+		case 205:
+			 return 'B';
+		case 7:
+		case 133: return 'D';
+		
+		case 134:
+		case 135: return 'T';
+		
+		case 11: return 'L';
+		
+		case 16://	adTinyInt	= 16,
+		case 2://adSmallInt	= 2,
+		case 3://adInteger	= 3,
+		case 4://adBigInt	= 20,
+		case 17://adUnsignedTinyInt	= 17,
+		case 18://adUnsignedSmallInt	= 18,
+		case 19://adUnsignedInt	= 19,
+		case 20://adUnsignedBigInt	= 21,
+			return 'I';
+		default: return 'N';
+		}
+	}
+	
+	// time stamp not supported yet
+	function _fetch()
+	{	
+		$rs = $this->_queryID;
+		if (!$rs or $rs->EOF) {
+			$this->fields = false;
+			return false;
+		}
+		$this->fields = array();
+	
+		if (!$this->_tarr) {
+			$tarr = array();
+			$flds = array();
+			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
+				$f = $rs->Fields($i);
+				$flds[] = $f;
+				$tarr[] = $f->Type;
+			}
+			// bind types and flds only once
+			$this->_tarr = $tarr; 
+			$this->_flds = $flds;
+		}
+		$t = reset($this->_tarr);
+		$f = reset($this->_flds);
+		
+		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
+		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
+
+			switch($t) {
+			case 135: // timestamp
+				if (!strlen((string)$f->value)) $this->fields[] = false;
+				else $this->fields[] = adodb_date('Y-m-d H:i:s',(float)$f->value);
+				break;			
+			case 133:// A date value (yyyymmdd) 
+				if ($val = $f->value) {
+					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+				} else
+					$this->fields[] = false;
+				break;
+			case 7: // adDate
+				if (!strlen((string)$f->value)) $this->fields[] = false;
+				else $this->fields[] = adodb_date('Y-m-d',(float)$f->value);
+				break;
+			case 1: // null
+				$this->fields[] = false;
+				break;
+			case 6: // currency is not supported properly;
+				ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP');
+				$this->fields[] = (float) $f->value;
+				break;
+			default:
+				$this->fields[] = $f->value; 
+				break;
+			}
+			//print " $f->value $t, ";
+			$f = next($this->_flds);
+			$t = next($this->_tarr);
+		} // for
+		if ($this->hideErrors) error_reporting($olde);
+		@$rs->MoveNext(); // @ needed for some versions of PHP!
+		
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+		}
+		return true;
+	}
+	
+		function NextRecordSet()
+		{
+			$rs = $this->_queryID;
+			$this->_queryID = $rs->NextRecordSet();
+			//$this->_queryID = $this->_QueryId->NextRecordSet();
+			if ($this->_queryID == null) return false;
+			
+			$this->_currentRow = -1;
+			$this->_currentPage = -1;
+			$this->bind = false;
+			$this->fields = false;
+			$this->_flds = false;
+			$this->_tarr = false;
+			
+			$this->_inited = false;
+			$this->Init();
+			return true;
+		}
+
+	function _close() {
+		$this->_flds = false;
+		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
+		$this->_queryID = false;	
+	}
+
+}
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-ado_access.inc.php b/lib/adodb/drivers/adodb-ado_access.inc.php
index 946714defab..74b37a57760 100644
--- a/lib/adodb/drivers/adodb-ado_access.inc.php
+++ b/lib/adodb/drivers/adodb-ado_access.inc.php
@@ -1,46 +1,46 @@
-ADODB_ado();
-	}
-	
-	function BeginTrans() { return false;}
-
-}
-
- 
-class  ADORecordSet_ado_access extends ADORecordSet_ado {	
-	
-	var $databaseType = "ado_access";		
-	
-	function ADORecordSet_ado_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_ado($id,$mode);
-	}
-}
+ADODB_ado();
+	}
+	
+	function BeginTrans() { return false;}
+
+}
+
+ 
+class  ADORecordSet_ado_access extends ADORecordSet_ado {	
+	
+	var $databaseType = "ado_access";		
+	
+	function ADORecordSet_ado_access($id,$mode=false)
+	{
+		return $this->ADORecordSet_ado($id,$mode);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-ado_mssql.inc.php b/lib/adodb/drivers/adodb-ado_mssql.inc.php
index e09bca54d1a..fec181abc88 100644
--- a/lib/adodb/drivers/adodb-ado_mssql.inc.php
+++ b/lib/adodb/drivers/adodb-ado_mssql.inc.php
@@ -1,62 +1,62 @@
-ADODB_ado();
-	}
-	
-	function _insertid()
-	{
-		return $this->GetOne('select @@identity');
-	}
-	
-	function _affectedrows()
-	{
-		return $this->GetOne('select @@rowcount');
-	}
-	
-}
- 
-class  ADORecordSet_ado_mssql extends ADORecordSet_ado {	
-	
-	var $databaseType = 'ado_mssql';
-	
-	function ADORecordSet_ado_mssql($id,$mode=false)
-	{
-		return $this->ADORecordSet_ado($id,$mode);
-	}
-}
+ADODB_ado();
+	}
+	
+	function _insertid()
+	{
+		return $this->GetOne('select @@identity');
+	}
+	
+	function _affectedrows()
+	{
+		return $this->GetOne('select @@rowcount');
+	}
+	
+}
+ 
+class  ADORecordSet_ado_mssql extends ADORecordSet_ado {	
+	
+	var $databaseType = 'ado_mssql';
+	
+	function ADORecordSet_ado_mssql($id,$mode=false)
+	{
+		return $this->ADORecordSet_ado($id,$mode);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-borland_ibase.inc.php b/lib/adodb/drivers/adodb-borland_ibase.inc.php
index 8598e16e7e7..4030c7189be 100644
--- a/lib/adodb/drivers/adodb-borland_ibase.inc.php
+++ b/lib/adodb/drivers/adodb-borland_ibase.inc.php
@@ -1,79 +1,79 @@
-ADODB_ibase();
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 6.5, Dialect 1'; break;
-		case '2': $s = 'Interbase 6.5, Dialect 2'; break;
-		default:
-		case '3': $s = 'Interbase 6.5, Dialect 3'; break;
-		}
-		$arr['version'] = '6.5';
-		$arr['description'] = $s;
-		return $arr;
-	}
-	
-	// Note that Interbase 6.5 uses ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
-	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
-	// Firebird uses
-	//		SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0) {
-			if ($offset <= 0) $str = " ROWS $nrows "; 
-			else {
-				$a = $offset+1;
-				$b = $offset+$nrows;
-				$str = " ROWS $a TO $b";
-			}
-		} else {
-			// ok, skip 
-			$a = $offset + 1;
-			$str = " ROWS $a TO 999999999"; // 999 million
-		}
-		$sql .= $str;
-		
-		return ($secs2cache) ? 
-				$this->CacheExecute($secs2cache,$sql,$inputarr)
-			:
-				$this->Execute($sql,$inputarr);
-	}
-	
-};
- 
-
-class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {	
-	
-	var $databaseType = "borland_ibase";		
-	
-	function ADORecordSet_borland_ibase($id,$mode=false)
-	{
-		$this->ADORecordSet_ibase($id,$mode);
-	}
-}
+ADODB_ibase();
+	}
+	
+	function ServerInfo()
+	{
+		$arr['dialect'] = $this->dialect;
+		switch($arr['dialect']) {
+		case '': 
+		case '1': $s = 'Interbase 6.5, Dialect 1'; break;
+		case '2': $s = 'Interbase 6.5, Dialect 2'; break;
+		default:
+		case '3': $s = 'Interbase 6.5, Dialect 3'; break;
+		}
+		$arr['version'] = '6.5';
+		$arr['description'] = $s;
+		return $arr;
+	}
+	
+	// Note that Interbase 6.5 uses ROWS instead - don't you love forking wars!
+	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
+	// Firebird uses
+	//		SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
+		if ($nrows > 0) {
+			if ($offset <= 0) $str = " ROWS $nrows "; 
+			else {
+				$a = $offset+1;
+				$b = $offset+$nrows;
+				$str = " ROWS $a TO $b";
+			}
+		} else {
+			// ok, skip 
+			$a = $offset + 1;
+			$str = " ROWS $a TO 999999999"; // 999 million
+		}
+		$sql .= $str;
+		
+		return ($secs2cache) ? 
+				$this->CacheExecute($secs2cache,$sql,$inputarr)
+			:
+				$this->Execute($sql,$inputarr);
+	}
+	
+};
+ 
+
+class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {	
+	
+	var $databaseType = "borland_ibase";		
+	
+	function ADORecordSet_borland_ibase($id,$mode=false)
+	{
+		$this->ADORecordSet_ibase($id,$mode);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-csv.inc.php b/lib/adodb/drivers/adodb-csv.inc.php
index d0b61014c1f..a444d9e0f93 100644
--- a/lib/adodb/drivers/adodb-csv.inc.php
+++ b/lib/adodb/drivers/adodb-csv.inc.php
@@ -1,200 +1,200 @@
-_insertid;
-	}
-	
-	function _affectedrows()
-	{
-			return $this->_affectedrows;
-	}
-  
-  	function &MetaDatabases()
-	{
-		return false;
-	}
-
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
-		$this->_url = $argHostname;
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
-		$this->_url = $argHostname;
-		return true;
-	}
-	
- 	function &MetaColumns($table) 
-	{
-		return false;
-	}
-		
-		
-	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,$nrows=-1,$offset=-1)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
-			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE).
-			"&offset=$offset";
-		$err = false;
-		$rs = csv2rs($url,$err,false);
-		
-		if ($this->debug) print "$url
    $err
    ";
-
-		$at = strpos($err,'::::');
-		if ($at === false) {
-			$this->_errorMsg = $err;
-			$this->_errorNo = (integer)$err;
-		} else {
-			$this->_errorMsg = substr($err,$at+4,1024);
-			$this->_errorNo = -9999;
-		}
-		if ($this->_errorNo) 
-			if ($fn = $this->raiseErrorFn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
-			}
-			
-		if (is_object($rs)) {	
-		
-			$rs->databaseType='csv';		
-			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
-			$rs->connection = &$this;
-		}
-		return $rs;
-	}
-	
-	// returns queryID or false
-	function &_Execute($sql,$inputarr=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if (!$this->_bindInputArray && $inputarr) {
-			$sqlarr = explode('?',$sql);
-			$sql = '';
-			$i = 0;
-			foreach($inputarr as $v) {
-
-				$sql .= $sqlarr[$i];
-				if (gettype($v) == 'string')
-					$sql .= $this->qstr($v);
-				else if ($v === null)
-					$sql .= 'NULL';
-				else
-					$sql .= $v;
-				$i += 1;
-	
-			}
-			$sql .= $sqlarr[$i];
-			if ($i+1 != sizeof($sqlarr))	
-				print "Input Array does not match ?: ".htmlspecialchars($sql);
-			$inputarr = false;
-		}
-		
-		$url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
-			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
-		$err = false;
-		
-		
-		$rs = csv2rs($url,$err,false);
-		if ($this->debug) print urldecode($url)."
    $err
    ";
-		$at = strpos($err,'::::');
-		if ($at === false) {		
-			$this->_errorMsg = $err;
-			$this->_errorNo = (integer)$err;
-		} else {
-			$this->_errorMsg = substr($err,$at+4,1024);
-			$this->_errorNo = -9999;
-		}
-		
-		if ($this->_errorNo) 
-			if ($fn = $this->raiseErrorFn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
-			}
-		if (is_object($rs)) {
-			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
-			
-			$this->_affectedrows = $rs->affectedrows;
-			$this->_insertid = $rs->insertid;
-			$rs->databaseType='csv';
-			$rs->connection = &$this;
-		}
-		return $rs;
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-			return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		return $this->_errorNo;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return true;
-	}
-} // class
-
-class ADORecordset_csv extends ADORecordset {
-	function ADORecordset_csv($id,$mode=false)
-	{
-		$this->ADORecordset($id,$mode);
-	}
-	
-	function _close()
-	{
-		return true;
-	}
-}
-
-} // define
-	
+_insertid;
+	}
+	
+	function _affectedrows()
+	{
+			return $this->_affectedrows;
+	}
+  
+  	function &MetaDatabases()
+	{
+		return false;
+	}
+
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
+		$this->_url = $argHostname;
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
+		$this->_url = $argHostname;
+		return true;
+	}
+	
+ 	function &MetaColumns($table) 
+	{
+		return false;
+	}
+		
+		
+	// parameters use PostgreSQL convention, not MySQL
+	function &SelectLimit($sql,$nrows=-1,$offset=-1)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
+			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE).
+			"&offset=$offset";
+		$err = false;
+		$rs = csv2rs($url,$err,false);
+		
+		if ($this->debug) print "$url
    $err
    ";
+
+		$at = strpos($err,'::::');
+		if ($at === false) {
+			$this->_errorMsg = $err;
+			$this->_errorNo = (integer)$err;
+		} else {
+			$this->_errorMsg = substr($err,$at+4,1024);
+			$this->_errorNo = -9999;
+		}
+		if ($this->_errorNo) 
+			if ($fn = $this->raiseErrorFn) {
+				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
+			}
+			
+		if (is_object($rs)) {	
+		
+			$rs->databaseType='csv';		
+			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
+			$rs->connection = &$this;
+		}
+		return $rs;
+	}
+	
+	// returns queryID or false
+	function &_Execute($sql,$inputarr=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		if (!$this->_bindInputArray && $inputarr) {
+			$sqlarr = explode('?',$sql);
+			$sql = '';
+			$i = 0;
+			foreach($inputarr as $v) {
+
+				$sql .= $sqlarr[$i];
+				if (gettype($v) == 'string')
+					$sql .= $this->qstr($v);
+				else if ($v === null)
+					$sql .= 'NULL';
+				else
+					$sql .= $v;
+				$i += 1;
+	
+			}
+			$sql .= $sqlarr[$i];
+			if ($i+1 != sizeof($sqlarr))	
+				print "Input Array does not match ?: ".htmlspecialchars($sql);
+			$inputarr = false;
+		}
+		
+		$url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
+			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
+		$err = false;
+		
+		
+		$rs = csv2rs($url,$err,false);
+		if ($this->debug) print urldecode($url)."
    $err
    ";
+		$at = strpos($err,'::::');
+		if ($at === false) {		
+			$this->_errorMsg = $err;
+			$this->_errorNo = (integer)$err;
+		} else {
+			$this->_errorMsg = substr($err,$at+4,1024);
+			$this->_errorNo = -9999;
+		}
+		
+		if ($this->_errorNo) 
+			if ($fn = $this->raiseErrorFn) {
+				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
+			}
+		if (is_object($rs)) {
+			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
+			
+			$this->_affectedrows = $rs->affectedrows;
+			$this->_insertid = $rs->insertid;
+			$rs->databaseType='csv';
+			$rs->connection = &$this;
+		}
+		return $rs;
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+			return $this->_errorMsg;
+	}
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	{
+		return $this->_errorNo;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return true;
+	}
+} // class
+
+class ADORecordset_csv extends ADORecordset {
+	function ADORecordset_csv($id,$mode=false)
+	{
+		$this->ADORecordset($id,$mode);
+	}
+	
+	function _close()
+	{
+		return true;
+	}
+}
+
+} // define
+	
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-db2.inc.php b/lib/adodb/drivers/adodb-db2.inc.php
index 24f67020339..d901abf8aaa 100644
--- a/lib/adodb/drivers/adodb-db2.inc.php
+++ b/lib/adodb/drivers/adodb-db2.inc.php
@@ -1,326 +1,313 @@
-curMode = SQL_CUR_USE_ODBC;
-$db->Connect($dsn, $userid, $pwd);
-
-*/
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-if (!defined('ADODB_DB2')){
-define('ADODB_DB2',1);
-
-class ADODB_DB2 extends ADODB_odbc {
-	var $databaseType = "db2";	
-	var $concat_operator = '||';
-	var $sysDate = 'CURRENT_DATE';
-	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	// The complete string representation of a timestamp has the form 
-	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
-	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
-	var $ansiOuter = true;
-	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
-	var $_bindInputArray = true;
-	var $upperCase = 'upper';
-	
-	
-	function ADODB_DB2()
-	{
-		if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
-		$this->ADODB_odbc();
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " COALESCE($field, $ifNull) "; // if DB2 UDB
-	}
-	
-	function ServerInfo()
-	{
-		//odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
-		$vers = $this->GetOne('select versionnumber from sysibm.sysversions');
-		//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
-		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
-	}
-	
-	function _insertid()
-	{
-		return $this->GetOne($this->identitySQL);
-	}
-	
-	function RowLock($tables,$where)
-	{
-		if ($this->_autocommit) $this->BeginTrans();
-		return $this->GetOne("select 1 as ignore from $tables where $where for update");
-	}
-	/*
-	function &MetaTables($showSchema=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
-		
-		$rs = new ADORecordSet_odbc($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) return false;
-		
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		//print_r($rs);
-		$arr =& $rs->GetArray();
-		$rs->Close();
-		$arr2 = array();
-		//print_r($arr);
-		for ($i=0; $i < sizeof($arr); $i++) {
-			$row = $arr[$i];
-			if ($row[2] && strncmp($row[1],'SYS',3) != 0)
-				 if ($showSchema) $arr2[] = $row[1].'.'.$row[2];
-				 else $arr2[] = $row[2];
-		}
-		return $arr2;
-	}*/
-	
-	function &MetaTables($ttype=false,$showSchema=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
-		
-		$rs = new ADORecordSet_odbc($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) return false;
-		
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
-		//print_r($arr);
-		
-		$rs->Close();
-		$arr2 = array();
-		
-		if ($ttype) {
-			$isview = strncmp($ttype,'V',1) === 0;
-		}
-		for ($i=0; $i < sizeof($arr); $i++) {
-		
-			if (!$arr[$i][2]) continue;
-			if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
-			
-			$type = $arr[$i][3];
-			
-			if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2];
-			
-			if ($ttype) { 
-				if ($isview) {
-					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
-				} else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
-			} else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-	// use right() and replace() ?
-		if (!$col) $col = $this->sysDate;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '||';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "char(year($col))";
-				break;
-			case 'M':
-				$s .= "substr(monthname($col),1,3)";
-				break;
-			case 'm':
-				$s .= "right(digits(month($col)),2)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "right(digits(day($col)),2)";
-				break;
-			case 'H':
-			case 'h':
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
-				else $s .= "''";
-				break;
-			case 'i':
-			case 'I':
-				if ($col != $this->sysDate)
-					$s .= "right(digits(minute($col)),2)";
-					else $s .= "''";
-				break;
-			case 'S':
-			case 's':
-				if ($col != $this->sysDate)
-					$s .= "right(digits(second($col)),2)";
-				else $s .= "''";
-				break;
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-			}
-		}
-		return $s;
-	} 
- 
-	
-		function &SelectLimit($sql,$nrows=-1,$offset=-1)
-		{
-			if ($offset <= 0) {
-			// could also use " OPTIMIZE FOR $nrows ROWS "
-				if ($nrows >= 0) $sql .=  " FETCH FIRST $nrows ROWS ONLY ";
-				$rs =& $this->Execute($sql,false);
-			} else {
-				if ($offset > 0 && $nrows < 0);
-				else {
-					$nrows += $offset;
-					$sql .=  " FETCH FIRST $nrows ROWS ONLY ";
-				}
-				$rs =& ADOConnection::SelectLimit($sql,-1,$offset);
-			}
-			
-			return $rs;
-		}
-	
-};
- 
-
-class  ADORecordSet_db2 extends ADORecordSet_odbc {	
-	
-	var $databaseType = "db2";		
-	
-	function ADORecordSet_db2($id,$mode=false)
-	{
-		$this->ADORecordSet_odbc($id,$mode);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		switch (strtoupper($t)) {
-		case 'VARCHAR':
-		case 'CHAR':
-		case 'CHARACTER':
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 'LONGCHAR':
-		case 'TEXT':
-		case 'CLOB':
-		case 'DBCLOB': // double-byte
-			return 'X';
-		
-		case 'BLOB':
-		case 'GRAPHIC':
-		case 'VARGRAPHIC':
-			return 'B';
-			
-		case 'DATE':
-			return 'D';
-		
-		case 'TIME':
-		case 'TIMESTAMP':
-			return 'T';
-		
-		//case 'BOOLEAN': 
-		//case 'BIT':
-		//	return 'L';
-			
-		//case 'COUNTER':
-		//	return 'R';
-			
-		case 'INT':
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'SMALLINT':
-			return 'I';
-			
-		default: return 'N';
-		}
-	}
-}
-
-} //define
+curMode = SQL_CUR_USE_ODBC;
+$db->Connect($dsn, $userid, $pwd);
+
+
+
+USING CLI INTERFACE
+===================
+
+I have had reports that the $host and $database params have to be reversed in 
+Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
+
+> The symptom is that if I change the database engine from postgres or any other to DB2 then the following
+> connection command becomes wrong despite being described this version to be correct in the docs. 
+>
+> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
+>
+> In case of DB2 I had to swap the first and last arguments in order to connect properly. 
+
+
+*/
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+}
+if (!defined('ADODB_DB2')){
+define('ADODB_DB2',1);
+
+class ADODB_DB2 extends ADODB_odbc {
+	var $databaseType = "db2";	
+	var $concat_operator = '||';
+	var $sysDate = 'CURRENT_DATE';
+	var $sysTimeStamp = 'CURRENT TIMESTAMP';
+	// The complete string representation of a timestamp has the form 
+	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
+	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
+	var $ansiOuter = true;
+	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
+	var $_bindInputArray = false;
+	var $upperCase = 'upper';
+	
+	
+	function ADODB_DB2()
+	{
+		if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
+		$this->ADODB_odbc();
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " COALESCE($field, $ifNull) "; // if DB2 UDB
+	}
+	
+	function ServerInfo()
+	{
+		//odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
+		$vers = $this->GetOne('select versionnumber from sysibm.sysversions');
+		//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
+		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
+	}
+	
+	function _insertid()
+	{
+		return $this->GetOne($this->identitySQL);
+	}
+	
+	function RowLock($tables,$where)
+	{
+		if ($this->_autocommit) $this->BeginTrans();
+		return $this->GetOne("select 1 as ignore from $tables where $where for update");
+	}
+	
+	function &MetaTables($ttype=false,$showSchema=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = odbc_tables($this->_connectionID);
+		
+		$rs = new ADORecordSet_odbc($qid);
+		
+		$ADODB_FETCH_MODE = $savem;
+		if (!$rs) return false;
+		
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		
+		$arr =& $rs->GetArray();
+		//print_r($arr);
+		
+		$rs->Close();
+		$arr2 = array();
+		
+		if ($ttype) {
+			$isview = strncmp($ttype,'V',1) === 0;
+		}
+		for ($i=0; $i < sizeof($arr); $i++) {
+		
+			if (!$arr[$i][2]) continue;
+			if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
+			
+			$type = $arr[$i][3];
+			
+			if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2];
+			
+			if ($ttype) { 
+				if ($isview) {
+					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
+				} else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
+			} else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
+		}
+		return $arr2;
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+	// use right() and replace() ?
+		if (!$col) $col = $this->sysDate;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '||';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "char(year($col))";
+				break;
+			case 'M':
+				$s .= "substr(monthname($col),1,3)";
+				break;
+			case 'm':
+				$s .= "right(digits(month($col)),2)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "right(digits(day($col)),2)";
+				break;
+			case 'H':
+			case 'h':
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				else $s .= "''";
+				break;
+			case 'i':
+			case 'I':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(minute($col)),2)";
+					else $s .= "''";
+				break;
+			case 'S':
+			case 's':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(second($col)),2)";
+				else $s .= "''";
+				break;
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+			}
+		}
+		return $s;
+	} 
+ 
+	
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
+	{
+		if ($offset <= 0) {
+		// could also use " OPTIMIZE FOR $nrows ROWS "
+			if ($nrows >= 0) $sql .=  " FETCH FIRST $nrows ROWS ONLY ";
+			$rs =& $this->Execute($sql,$inputArr);
+		} else {
+			if ($offset > 0 && $nrows < 0);
+			else {
+				$nrows += $offset;
+				$sql .=  " FETCH FIRST $nrows ROWS ONLY ";
+			}
+			$rs =& ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
+		}
+		
+		return $rs;
+	}
+	
+};
+ 
+
+class  ADORecordSet_db2 extends ADORecordSet_odbc {	
+	
+	var $databaseType = "db2";		
+	
+	function ADORecordSet_db2($id,$mode=false)
+	{
+		$this->ADORecordSet_odbc($id,$mode);
+	}
+
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		switch (strtoupper($t)) {
+		case 'VARCHAR':
+		case 'CHAR':
+		case 'CHARACTER':
+			if ($len <= $this->blobSize) return 'C';
+		
+		case 'LONGCHAR':
+		case 'TEXT':
+		case 'CLOB':
+		case 'DBCLOB': // double-byte
+			return 'X';
+		
+		case 'BLOB':
+		case 'GRAPHIC':
+		case 'VARGRAPHIC':
+			return 'B';
+			
+		case 'DATE':
+			return 'D';
+		
+		case 'TIME':
+		case 'TIMESTAMP':
+			return 'T';
+		
+		//case 'BOOLEAN': 
+		//case 'BIT':
+		//	return 'L';
+			
+		//case 'COUNTER':
+		//	return 'R';
+			
+		case 'INT':
+		case 'INTEGER':
+		case 'BIGINT':
+		case 'SMALLINT':
+			return 'I';
+			
+		default: return 'N';
+		}
+	}
+}
+
+} //define
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-fbsql.inc.php b/lib/adodb/drivers/adodb-fbsql.inc.php
index 46a4460db87..4221070cd2e 100644
--- a/lib/adodb/drivers/adodb-fbsql.inc.php
+++ b/lib/adodb/drivers/adodb-fbsql.inc.php
@@ -1,262 +1,262 @@
-. 
-  Set tabs to 8.
-*/ 
-
-if (! defined("_ADODB_FBSQL_LAYER")) {
- define("_ADODB_FBSQL_LAYER", 1 );
-
-class ADODB_fbsql extends ADOConnection {
-	var $databaseType = 'fbsql';
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
-	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasLimit = false;
-	
-	function ADODB_fbsql() 
-	{			
-	}
-	
-	function _insertid()
-	{
-			return fbsql_insert_id($this->_connectionID);
-	}
-	
-	function _affectedrows()
-	{
-			return fbsql_affected_rows($this->_connectionID);
-	}
-  
-  	function &MetaDatabases()
-	{
-		$qid = fbsql_list_dbs($this->_connectionID);
-		$arr = array();
-		$i = 0;
-		$max = fbsql_num_rows($qid);
-		while ($i < $max) {
-			$arr[] = fbsql_tablename($qid,$i);
-			$i += 1;
-		}
-		return $arr;
-	}
-
-	// returns concatenated string
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		$first = true;
-
-		$s = implode(',',$arr);
-		if (sizeof($arr) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
- 	function &MetaColumns($table) 
-	{
-		if ($this->metaColumnsSQL) {
-			
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			
-			if ($rs === false) return false;
-			
-			$retarr = array();
-			while (!$rs->EOF){
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$fld->type = $rs->fields[1];
-					
-				// split type into type(length):
-				if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) {
-					$fld->type = $query_array[1];
-					$fld->max_length = $query_array[2];
-				} else {
-					$fld->max_length = -1;
-				}
-				$fld->not_null = ($rs->fields[2] != 'YES');
-				$fld->primary_key = ($rs->fields[3] == 'PRI');
-				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-				$fld->binary = (strpos($fld->type,'blob') !== false);
-				
-				$retarr[strtoupper($fld->name)] = $fld;	
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return false;
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-		$this->databaseName = $dbName;
-		if ($this->_connectionID) {
-			return @fbsql_select_db($dbName,$this->_connectionID);		
-		}
-		else return false;	
-	}
-	
-	
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-		return fbsql_query("$sql;",$this->_connectionID);
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-		$this->_errorMsg = @fbsql_error($this->_connectionID);
-			return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		return @fbsql_errno($this->_connectionID);
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return @fbsql_close($this->_connectionID);
-	}
-		
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_fbsql extends ADORecordSet{	
-	
-	var $databaseType = "fbsql";
-	var $canSeek = true;
-	
-	function ADORecordSet_fbsql($queryID,$mode=false) 
-	{
-		if (!$mode) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
-		default:
-		case ADODB_FETCH_BOTH: $this->fetchMode = FBSQL_BOTH; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
-		}
-		return $this->ADORecordSet($queryID);
-	}
-	
-	function _initrs()
-	{
-	GLOBAL $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @fbsql_num_fields($this->_queryID);
-	}
-	
-
-
-	function &FetchField($fieldOffset = -1) {
-		if ($fieldOffset != -1) {
-			$o =  @fbsql_fetch_field($this->_queryID, $fieldOffset);
-			//$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable
-			$f = @fbsql_field_flags($this->_queryID,$fieldOffset);
-			$o->binary = (strpos($f,'binary')!== false);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable
-			//$o->max_length = -1;
-		}
-		
-		return $o;
-	}
-		
-	function _seek($row)
-	{
-		return @fbsql_data_seek($this->_queryID,$row);
-	}
-	
-	function _fetch($ignore_fields=false)
-	{
-		$this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode);
-		return ($this->fields == true);
-	}
-	
-	function _close() {
-		return @fbsql_free_result($this->_queryID);		
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		$len = -1; // fbsql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'CHARACTER':
-		case 'CHARACTER VARYING': 
-		case 'BLOB': 
-		case 'CLOB': 
-		case 'BIT': 
-		case 'BIT VARYING': 
-			if ($len <= $this->blobSize) return 'C';
-			
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'TIME WITH TIME ZONE':
-		case 'TIMESTAMP': 
-		case 'TIMESTAMP WITH TIME ZONE': return 'T';
-		
-		case 'PRIMARY_KEY':
-			return 'R';
-		case 'INTEGER':
-		case 'SMALLINT': 
-		case 'BOOLEAN':
-			
-			if (!empty($fieldobj->primary_key)) return 'R';
-			else return 'I';
-		
-		default: return 'N';
-		}
-	}
-
-} //class
-} // defined
+. 
+  Set tabs to 8.
+*/ 
+
+if (! defined("_ADODB_FBSQL_LAYER")) {
+ define("_ADODB_FBSQL_LAYER", 1 );
+
+class ADODB_fbsql extends ADOConnection {
+	var $databaseType = 'fbsql';
+	var $hasInsertID = true;
+	var $hasAffectedRows = true;	
+	var $metaTablesSQL = "SHOW TABLES";	
+	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $hasLimit = false;
+	
+	function ADODB_fbsql() 
+	{			
+	}
+	
+	function _insertid()
+	{
+			return fbsql_insert_id($this->_connectionID);
+	}
+	
+	function _affectedrows()
+	{
+			return fbsql_affected_rows($this->_connectionID);
+	}
+  
+  	function &MetaDatabases()
+	{
+		$qid = fbsql_list_dbs($this->_connectionID);
+		$arr = array();
+		$i = 0;
+		$max = fbsql_num_rows($qid);
+		while ($i < $max) {
+			$arr[] = fbsql_tablename($qid,$i);
+			$i += 1;
+		}
+		return $arr;
+	}
+
+	// returns concatenated string
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+		$first = true;
+
+		$s = implode(',',$arr);
+		if (sizeof($arr) > 0) return "CONCAT($s)";
+		else return '';
+	}
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+ 	function &MetaColumns($table) 
+	{
+		if ($this->metaColumnsSQL) {
+			
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+			
+			if ($rs === false) return false;
+			
+			$retarr = array();
+			while (!$rs->EOF){
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+					
+				// split type into type(length):
+				if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) {
+					$fld->type = $query_array[1];
+					$fld->max_length = $query_array[2];
+				} else {
+					$fld->max_length = -1;
+				}
+				$fld->not_null = ($rs->fields[2] != 'YES');
+				$fld->primary_key = ($rs->fields[3] == 'PRI');
+				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
+				$fld->binary = (strpos($fld->type,'blob') !== false);
+				
+				$retarr[strtoupper($fld->name)] = $fld;	
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+		
+	// returns true or false
+	function SelectDB($dbName) 
+	{
+		$this->databaseName = $dbName;
+		if ($this->_connectionID) {
+			return @fbsql_select_db($dbName,$this->_connectionID);		
+		}
+		else return false;	
+	}
+	
+	
+	// returns queryID or false
+	function _query($sql,$inputarr)
+	{
+		return fbsql_query("$sql;",$this->_connectionID);
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+		$this->_errorMsg = @fbsql_error($this->_connectionID);
+			return $this->_errorMsg;
+	}
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	{
+		return @fbsql_errno($this->_connectionID);
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return @fbsql_close($this->_connectionID);
+	}
+		
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_fbsql extends ADORecordSet{	
+	
+	var $databaseType = "fbsql";
+	var $canSeek = true;
+	
+	function ADORecordSet_fbsql($queryID,$mode=false) 
+	{
+		if (!$mode) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode) {
+		case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
+		default:
+		case ADODB_FETCH_BOTH: $this->fetchMode = FBSQL_BOTH; break;
+		case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
+		}
+		return $this->ADORecordSet($queryID);
+	}
+	
+	function _initrs()
+	{
+	GLOBAL $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @fbsql_num_fields($this->_queryID);
+	}
+	
+
+
+	function &FetchField($fieldOffset = -1) {
+		if ($fieldOffset != -1) {
+			$o =  @fbsql_fetch_field($this->_queryID, $fieldOffset);
+			//$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable
+			$f = @fbsql_field_flags($this->_queryID,$fieldOffset);
+			$o->binary = (strpos($f,'binary')!== false);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable
+			//$o->max_length = -1;
+		}
+		
+		return $o;
+	}
+		
+	function _seek($row)
+	{
+		return @fbsql_data_seek($this->_queryID,$row);
+	}
+	
+	function _fetch($ignore_fields=false)
+	{
+		$this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode);
+		return ($this->fields == true);
+	}
+	
+	function _close() {
+		return @fbsql_free_result($this->_queryID);		
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		$len = -1; // fbsql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'CHARACTER':
+		case 'CHARACTER VARYING': 
+		case 'BLOB': 
+		case 'CLOB': 
+		case 'BIT': 
+		case 'BIT VARYING': 
+			if ($len <= $this->blobSize) return 'C';
+			
+		// so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+			return !empty($fieldobj->binary) ? 'B' : 'X';
+			
+		case 'DATE': return 'D';
+		
+		case 'TIME':
+		case 'TIME WITH TIME ZONE':
+		case 'TIMESTAMP': 
+		case 'TIMESTAMP WITH TIME ZONE': return 'T';
+		
+		case 'PRIMARY_KEY':
+			return 'R';
+		case 'INTEGER':
+		case 'SMALLINT': 
+		case 'BOOLEAN':
+			
+			if (!empty($fieldobj->primary_key)) return 'R';
+			else return 'I';
+		
+		default: return 'N';
+		}
+	}
+
+} //class
+} // defined
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-firebird.inc.php b/lib/adodb/drivers/adodb-firebird.inc.php
index 58ea10f9e1f..b5f10be2d68 100644
--- a/lib/adodb/drivers/adodb-firebird.inc.php
+++ b/lib/adodb/drivers/adodb-firebird.inc.php
@@ -1,69 +1,69 @@
-ADODB_ibase();
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Firebird Dialect 1'; break;
-		case '2': $s = 'Firebird Dialect 2'; break;
-		default:
-		case '3': $s = 'Firebird Dialect 3'; break;
-		}
-		$arr['version'] = ADOConnection::_findvers($s);
-		$arr['description'] = $s;
-		return $arr;
-	}
-	
-	// Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
-	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0)
-	{
-		$str = 'SELECT ';
-		if ($nrows >= 0) $str .= "FIRST $nrows "; 
-		$str .=($offset>=0) ? "SKIP $offset " : '';
-		
-		$sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
-		if ($secs)
-			$rs =& $this->CacheExecute($secs,$sql,$inputarr);
-		else
-			$rs =& $this->Execute($sql,$inputarr);
-			
-		return $rs;
-	}
-	
-	
-};
- 
-
-class  ADORecordSet_firebird extends ADORecordSet_ibase {	
-	
-	var $databaseType = "firebird";		
-	
-	function ADORecordSet_firebird($id,$mode=false)
-	{
-		$this->ADORecordSet_ibase($id,$mode);
-	}
-}
+ADODB_ibase();
+	}
+	
+	function ServerInfo()
+	{
+		$arr['dialect'] = $this->dialect;
+		switch($arr['dialect']) {
+		case '': 
+		case '1': $s = 'Firebird Dialect 1'; break;
+		case '2': $s = 'Firebird Dialect 2'; break;
+		default:
+		case '3': $s = 'Firebird Dialect 3'; break;
+		}
+		$arr['version'] = ADOConnection::_findvers($s);
+		$arr['description'] = $s;
+		return $arr;
+	}
+	
+	// Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars!
+	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0)
+	{
+		$str = 'SELECT ';
+		if ($nrows >= 0) $str .= "FIRST $nrows "; 
+		$str .=($offset>=0) ? "SKIP $offset " : '';
+		
+		$sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
+		if ($secs)
+			$rs =& $this->CacheExecute($secs,$sql,$inputarr);
+		else
+			$rs =& $this->Execute($sql,$inputarr);
+			
+		return $rs;
+	}
+	
+	
+};
+ 
+
+class  ADORecordSet_firebird extends ADORecordSet_ibase {	
+	
+	var $databaseType = "firebird";		
+	
+	function ADORecordSet_firebird($id,$mode=false)
+	{
+		$this->ADORecordSet_ibase($id,$mode);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-ibase.inc.php b/lib/adodb/drivers/adodb-ibase.inc.php
index d42b1d70892..e9e7c94eea7 100644
--- a/lib/adodb/drivers/adodb-ibase.inc.php
+++ b/lib/adodb/drivers/adodb-ibase.inc.php
@@ -1,813 +1,812 @@
-
-  	changed transaction handling and added experimental blob stuff
-  
-  Docs to interbase at the website
-   http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html
-   
-  To use gen_id(), see
-   http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen
-   
-   $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database');
-   $id = $rs->fields[0];
-   $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
-*/
-
-
-class ADODB_ibase extends ADOConnection {
-	var $databaseType = "ibase";
-	var $dataProvider = "ibase";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $ibase_timefmt = '%Y-%m-%d'; // For hours,mins,secs change to '%Y-%m-%d %H:%M:%S';
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, H:i:s'";
-	var $concat_operator='||';
-	var $_transactionID;
-	var $metaTablesSQL = "select rdb\$relation_name from rdb\$relations where rdb\$relation_name not like 'RDB\$%'";
-	//OPN STUFF start
-	var $metaColumnsSQL = "select a.rdb\$field_name, a.rdb\$null_flag, a.rdb\$default_source, b.rdb\$field_length, b.rdb\$field_scale, b.rdb\$field_sub_type, b.rdb\$field_precision, b.rdb\$field_type from rdb\$relation_fields a, rdb\$fields b where a.rdb\$field_source = b.rdb\$field_name and a.rdb\$relation_name = '%s' order by a.rdb\$field_position asc";
-	//OPN STUFF end
-	var $ibasetrans;
-	var $hasGenID = true;
-	var $_bindInputArray = true;
-	var $buffers = 0;
-	var $dialect = 1;
-	var $sysDate = "cast('TODAY' as date)";
-	var $sysTimeStamp = "cast('NOW' as timestamp)";
-	var $ansiOuter = true;
-	var $hasAffectedRows = false;
-	var $poorAffectedRows = true;
-	var $blobEncodeType = 'C';
-	
-	function ADODB_ibase() 
-	{
-		 if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT;
-  	}
-	
-	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
-	{	
-		if ($internalKey) return array('RDB$DB_KEY');
-		
-		$table = strtoupper($table);
-		
-		$sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
-	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
-	WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
-	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
-
-		$a = $this->GetCol($sql,false,true);
-		if ($a && sizeof($a)>0) return $a;
-		return false;	  
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 5.5 or earlier'; break;
-		case '2': $s = 'Interbase 5.6'; break;
-		default:
-		case '3': $s = 'Interbase 6.0'; break;
-		}
-		$arr['version'] = ADOConnection::_findvers($s);
-		$arr['description'] = $s;
-		return $arr;
-	}
-
-	function BeginTrans()
-	{	 
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
-		return $this->_transactionID;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = false;
-		$this->autoCommit = true;
-		if ($this->_transactionID) {
-			   		//print ' commit ';
-			$ret = ibase_commit($this->_transactionID);
-		}
-		$this->_transactionID = false;
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = false;
-		$this->autoCommit = true;
-		if ($this->_transactionID) 
-				  $ret = ibase_rollback($this->_transactionID);
-		$this->_transactionID = false;   
-		
-		return $ret;
-	}
-	
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        $table = strtoupper($table);
-        $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'";
-        if (!$primary) {
-        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
-        } else {
-        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
-        }
-        // get index details
-        $rs = $this->Execute($sql);
-        if (!is_object($rs)) {
-	        // restore fetchmode
-	        if (isset($savem)) {
-	            $this->SetFetchMode($savem);
-	        }
-	        $ADODB_FETCH_MODE = $save;
-            return FALSE;
-        }
-        
-        $indexes = array ();
-		while ($row = $rs->FetchRow()) {
-			$index = $row[0];
-             if (!isset($indexes[$index])) {
-             		if (is_null($row[3])) {$row[3] = 0;}
-                     $indexes[$index] = array(
-                             'unique' => ($row[3] == 1),
-                             'columns' => array()
-                     );
-             }
-			$sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '".$name."' ORDER BY RDB\$FIELD_POSITION ASC";
-			$rs1 = $this->Execute($sql);
-            while ($row1 = $rs1->FetchRow()) {
-             	$indexes[$index]['columns'][$row1[2]] = $row1[1];
-        	}
-		}
-        // restore fetchmode
-        if (isset($savem)) {
-            $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        return $indexes;
-	}
-
-	
-	// See http://community.borland.com/article/0,1410,25844,00.html
-	function RowLock($tables,$where,$col)
-	{
-		if ($this->autoCommit) $this->BeginTrans();
-		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
-		return 1;
-	}
-	
-	
-	function CreateSequence($seqname,$startID=1)
-	{
-		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-		if (!$ok) return false;
-		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
-	}
-	
-	function DropSequence($seqname)
-	{
-		$seqname = strtoupper($seqname);
-		$this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'");
-	}
-	
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			$this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-			$this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
-			$rs = $this->Execute($getnext);
-		}
-		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
-		else $this->genID = 0; // false
-		
-		if ($rs) $rs->Close();
-		
-		return $this->genID;
-	}
-
-	function SelectDB($dbName) 
-	{
-		   return false;
-	}
-
-	function _handleerror()
-	{
-		$this->_errorMsg = ibase_errmsg();
-	}
-
-	function ErrorNo() 
-	{
-		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
-		else return 0;
-	}
-
-	function ErrorMsg() 
-	{
-			return $this->_errorMsg;
-	}
-
-	   // returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{  
-		if (!function_exists('ibase_pconnect')) return false;
-		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
-		$this->_connectionID = ibase_connect($argHostname,$argUsername,$argPassword,$this->charSet,$this->buffers,$this->dialect);
-	 	if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
-			$this->replaceQuote = "''";
-		}
-		if ($this->_connectionID === false) {
-			$this->_handleerror();
-			return false;
-		}
-		
-		ibase_timefmt($this->ibase_timefmt);	
-		return true;
-	}
-	   // returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('ibase_pconnect')) return false;
-		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
-		$this->_connectionID = ibase_pconnect($argHostname,$argUsername,$argPassword,$this->charSet,$this->buffers,$this->dialect);
-		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
-			$this->replaceQuote = "''";
-		}
-		if ($this->_connectionID === false) {
-			$this->_handleerror();
-			return false;
-		}
-		
-		ibase_timefmt($this->ibase_timefmt);
-		return true;
-	}	
-	
-	function Prepare($sql)
-	{
-	//	return $sql;
-		$stmt = ibase_prepare($this->_connectionID,$sql);
-		if (!$stmt) return false;
-		return array($sql,$stmt);
-	}
-
-	   // returns query ID if successful, otherwise false
-	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
-	function _query($sql,$iarr=false)
-	{ 
-
-		if (!$this->autoCommit && $this->_transactionID) {
-			$conn = $this->_transactionID;
-			$docommit = false;
-		} else {
-			$conn = $this->_connectionID;
-			$docommit = true;
-		}
-		if (is_array($sql)) {
-			$fn = 'ibase_execute';
-			$sql = $sql[1];
-			
-			if (is_array($iarr)) {	
-				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					$fnarr =& array_merge( array($sql) , $iarr);
-					$ret = call_user_func_array($fn,$fnarr);
-				} else {
-					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($sql,$iarr[0]); break;
-					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
-					}
-				}
-			} else $ret = $fn($sql); 
-		} else {
-			$fn = 'ibase_query';
-		
-			if (is_array($iarr)) {	
-				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					$fnarr =& array_merge( array($conn,$sql) , $iarr);
-					$ret = call_user_func_array($fn,$fnarr);
-				} else {
-					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
-					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
-					}
-				}
-			} else $ret = $fn($conn,$sql); 
-		}
-		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
-
-		$this->_handleerror();
-		return $ret;
-	}
-
-	 // returns true or false
-	 function _close()
-	 {	   
-		if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
-		return @ibase_close($this->_connectionID);
-	 }
-	
-	//OPN STUFF start
-	function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $isInterbase6)
-	{
-		$fscale = abs($fscale);
-		$fld->max_length = $flen;
-		$fld->scale = null;
-		switch($ftype){
-			case 7: 
-			case 8:
-				if ($isInterbase6) {
-				    switch($fsubtype){
-				    	case 0: 
-				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
-				    		break;
-				    	case 1: 
-				    		$fld->type = 'numeric';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    	case 2:
-				    		$fld->type = 'decimal';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    } // switch
-				} else {
-					if ($fscale !=0) {
-					    $fld->type = 'decimal';
-						$fld->scale = $fscale;
-						$fld->max_length = ($ftype == 7 ? 4 : 9);
-					} else {
-						$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
-					}
-				}
-				break;
-			case 16: 
-				if ($isInterbase6) {
-				    switch($fsubtype){
-				    	case 0: 
-				    		$fld->type = 'decimal';
-							$fld->max_length = 18;
-							$fld->scale = 0;
-				    		break;
-				    	case 1: 
-				    		$fld->type = 'numeric';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    	case 2:
-				    		$fld->type = 'decimal';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    } // switch
-				}
-				break;
-			case 10:
-				$fld->type = 'float';
-				break;
-			case 14:
-				$fld->type = 'char';
-				break;
-			case 27:
-				if ($fscale !=0) {
-				    $fld->type = 'decimal';
-					$fld->max_length = 15;
-					$fld->scale = 5;
-				} else {
-					$fld->type = 'double';
-				}
-				break;
-			case 35:
-				if ($isInterbase6) {
-				    $fld->type = 'timestamp';
-				} else {
-					$fld->type = 'date';
-				}
-				break;
-			case 12:
-			case 13:
-				$fld->type = 'date';
-				break;
-			case 37:
-				$fld->type = 'varchar';
-				break;
-			case 40:
-				$fld->type = 'cstring';
-				break;
-			case 261:
-				$fld->type = 'blob';
-				$fld->max_length = -1;
-				break;
-		} // switch
-	}
-	//OPN STUFF end
-		// returns array of ADOFieldObjects for current table
-	function &MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-		
-		if ($this->metaColumnsSQL) {
-		
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
-			$ADODB_FETCH_MODE = $save;
-			if ($rs === false) return false;
-
-			$retarr = array();
-			//OPN STUFF start
-			$isInterbase6 = ($this->dialect==3 ? true : false);
-			//OPN STUFF end
-			while (!$rs->EOF) { //print_r($rs->fields);
-				$fld = new ADOFieldObject();
-				$fld->name = trim($rs->fields[0]);
-				//OPN STUFF start
-				$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $isInterbase6);
-				if (isset($rs->fields[1]) && $rs->fields[1]) {
-					$fld->not_null = true;
-				}				
-				if (isset($rs->fields[2])) {
-					
-					$fld->has_default = true;
-					$d = substr($rs->fields[2],strlen('default '));
-					switch ($fld->type)
-					{
-					case 'smallint':
-					case 'integer': $fld->default_value = (int) $d; break;
-					case 'char': 
-					case 'blob':
-					case 'text':
-					case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
-					case 'double':
-					case 'float': $fld->default_value = (float) $d; break;
-					default: $fld->default_value = $d; break;
-					}
-			//	case 35:$tt = 'TIMESTAMP'; break;
-				}
-				if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
-					$fld->sub_type = $rs->fields[5];
-				} else {
-					$fld->sub_type = null;
-				}
-				//OPN STUFF end
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-				else $retarr[strtoupper($fld->name)] = $fld;
-				
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return false;
-	}
-	
-	function BlobEncode( $blob ) 
-	{
-		$blobid = ibase_blob_create( $this->_connectionID);
-		ibase_blob_add( $blobid, $blob );
-		return ibase_blob_close( $blobid );
-	}
-	
-	// since we auto-decode all blob's since 2.42, 
-	// BlobDecode should not do any transforms
-	function BlobDecode($blob)
-	{
-		return $blob; 
-	}
-	
-	
-	
-	
-	// old blobdecode function
-	// still used to auto-decode all blob's
-	function _BlobDecode( $blob ) 
-	{
-		$blobid = ibase_blob_open( $blob );
-		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet 
-		while($string = ibase_blob_get($blobid, 8192)){ 
-			$realblob .= $string; 
-		}
-		ibase_blob_close( $blobid );
-
-		return( $realblob );
-	} 
-	
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		$fd = fopen($path,'rb'); 
-		if ($fd === false) return false; 
-		$blob_id = ibase_blob_create($this->_connectionID); 
-		
-		/* fill with data */ 
-		
-		while ($val = fread($fd,32768)){ 
-			ibase_blob_add($blob_id, $val); 
-		} 
-		
-		/* close and get $blob_id_str for inserting into table */ 
-		$blob_id_str = ibase_blob_close($blob_id); 
-		
-		fclose($fd); 
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	} 
-	
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-		
-		Usage:
-		 
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
-	{ 
-	$blob_id = ibase_blob_create($this->_connectionID); 
-	
-	// ibase_blob_add($blob_id, $val); 
-	
-	// replacement that solves the problem by which only the first modulus 64K / 
-	// of $val are stored at the blob field //////////////////////////////////// 
-	// Thx Abel Berenstein  aberenstein#afip.gov.ar
-	$len = strlen($val); 
-	$chunk_size = 32768; 
-	$tail_size = $len % $chunk_size; 
-	$n_chunks = ($len - $tail_size) / $chunk_size; 
-	
-	for ($n = 0; $n < $n_chunks; $n++) { 
-		$start = $n * $chunk_size; 
-		$data = substr($val, $start, $chunk_size); 
-		ibase_blob_add($blob_id, $data); 
-	} 
-	
-	if ($tail_size) {
-		$start = $n_chunks * $chunk_size; 
-		$data = substr($val, $start, $tail_size); 
-		ibase_blob_add($blob_id, $data); 
-	}
-	// end replacement ///////////////////////////////////////////////////////// 
-	
-	$blob_id_str = ibase_blob_close($blob_id); 
-	
-	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	
-	} 
-	
-	
-	function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		$blob_id = ibase_blob_create($this->_connectionID);
-		ibase_blob_add($blob_id, $val);
-		$blob_id_str = ibase_blob_close($blob_id);
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	// Only since Interbase 6.0 - uses EXTRACT
-	// problem - does not zero-fill the day and month yet
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysDate;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '||';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "extract(year from $col)";
-				break;
-			case 'M':
-			case 'm':
-				$s .= "extract(month from $col)";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "(extract(day from $col))";
-				break;
-			case 'H':
-			case 'h':
-			  $s .= "(extract(hour from $col))";
-			  break;                        
-			case 'I':
-			case 'i':
-			  $s .= "(extract(minute from $col))";
-			  break;                
-			case 'S':
-			case 's':
-			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
-			  break;        
-
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_ibase extends ADORecordSet 
-{
-
-	var $databaseType = "ibase";
-	var $bind=false;
-	var $_cacheType;
-	
-	function ADORecordset_ibase($id,$mode=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-			$this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode;
-			return $this->ADORecordSet($id);
-	}
-
-	/*		Returns: an object containing field information.
-			Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			fetchField() is retrieved.		*/
-
-	function &FetchField($fieldOffset = -1)
-	{
-			 $fld = new ADOFieldObject;
-			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
-			 $fld->name = strtolower($ibf['alias']);
-			 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
-			 $fld->type = $ibf['type'];
-			 $fld->max_length = $ibf['length'];
-			 return $fld;
-	}
-
-	function _initrs()
-	{
-			$this->_numOfRows = -1;
-			$this->_numOfFields = @ibase_num_fields($this->_queryID);
-			
-			// cache types for blob decode check
-			for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-				$f1 = $this->FetchField($i); 
-				$this->_cacheType[] = $f1->type;
-			}				
-	}
-
-	function _seek($row)
-	{
-		return false;
-	}
-
-	
-	
-	function _fetch() 
-	{
-		$f = @ibase_fetch_row($this->_queryID); 
-		if ($f === false) {
-			$this->fields = false;
-			return false;
-		}
-		// OPN stuff start - optimized
-		// fix missing nulls and decode blobs automatically
-	
-		global $ADODB_ANSI_PADDING_OFF;
-		//$ADODB_ANSI_PADDING_OFF=1;
-		$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
-		
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			if ($this->_cacheType[$i]=="BLOB") {
-				if (isset($f[$i])) { 
-					$f[$i] = $this->connection->_BlobDecode($f[$i]); 
-				} else { 
-					$f[$i] = null; 
-				} 
-			} else { 
-				if (!isset($f[$i])) { 
-					$f[$i] = null; 
-				} else if ($rtrim && is_string($f[$i])) {
-					$f[$i] = rtrim($f[$i]);
-				}
-			} 
-		} 
-		// OPN stuff end 
-		
-		$this->fields = $f;
-		if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
-		} else if ($this->fetchMode == ADODB_FETCH_BOTH) {
-			$this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
-		}
-		return true;
-	}
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-		
-	}
-	
-
-	function _close() 
-	{
-			return @ibase_free_result($this->_queryID);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-		case 'CHAR':
-			return 'C';
-			
-		case 'TEXT':
-		case 'VARCHAR':
-		case 'VARYING':
-		if ($len <= $this->blobSize) return 'C';
-			return 'X';
-		case 'BLOB':
-			return 'B';
-			   
-		case 'TIMESTAMP':
-		case 'DATE': return 'D';
-				
-				//case 'T': return 'T';
-
-				//case 'L': return 'L';
-		case 'INT': 
-		case 'SHORT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
-		}
-	}
-
-}
+
+  	changed transaction handling and added experimental blob stuff
+  
+  Docs to interbase at the website
+   http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html
+   
+  To use gen_id(), see
+   http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen
+   
+   $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database');
+   $id = $rs->fields[0];
+   $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
+*/
+
+
+class ADODB_ibase extends ADOConnection {
+	var $databaseType = "ibase";
+	var $dataProvider = "ibase";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $ibase_timefmt = '%Y-%m-%d'; // For hours,mins,secs change to '%Y-%m-%d %H:%M:%S';
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d, H:i:s'";
+	var $concat_operator='||';
+	var $_transactionID;
+	var $metaTablesSQL = "select rdb\$relation_name from rdb\$relations where rdb\$relation_name not like 'RDB\$%'";
+	//OPN STUFF start
+	var $metaColumnsSQL = "select a.rdb\$field_name, a.rdb\$null_flag, a.rdb\$default_source, b.rdb\$field_length, b.rdb\$field_scale, b.rdb\$field_sub_type, b.rdb\$field_precision, b.rdb\$field_type from rdb\$relation_fields a, rdb\$fields b where a.rdb\$field_source = b.rdb\$field_name and a.rdb\$relation_name = '%s' order by a.rdb\$field_position asc";
+	//OPN STUFF end
+	var $ibasetrans;
+	var $hasGenID = true;
+	var $_bindInputArray = true;
+	var $buffers = 0;
+	var $dialect = 1;
+	var $sysDate = "cast('TODAY' as date)";
+	var $sysTimeStamp = "cast('NOW' as timestamp)";
+	var $ansiOuter = true;
+	var $hasAffectedRows = false;
+	var $poorAffectedRows = true;
+	var $blobEncodeType = 'C';
+	
+	function ADODB_ibase() 
+	{
+		 if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT;
+  	}
+	
+	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
+	{	
+		if ($internalKey) return array('RDB$DB_KEY');
+		
+		$table = strtoupper($table);
+		
+		$sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
+	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
+	WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
+	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
+
+		$a = $this->GetCol($sql,false,true);
+		if ($a && sizeof($a)>0) return $a;
+		return false;	  
+	}
+	
+	function ServerInfo()
+	{
+		$arr['dialect'] = $this->dialect;
+		switch($arr['dialect']) {
+		case '': 
+		case '1': $s = 'Interbase 5.5 or earlier'; break;
+		case '2': $s = 'Interbase 5.6'; break;
+		default:
+		case '3': $s = 'Interbase 6.0'; break;
+		}
+		$arr['version'] = ADOConnection::_findvers($s);
+		$arr['description'] = $s;
+		return $arr;
+	}
+
+	function BeginTrans()
+	{	 
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->autoCommit = false;
+	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
+		return $this->_transactionID;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ret = false;
+		$this->autoCommit = true;
+		if ($this->_transactionID) {
+			   		//print ' commit ';
+			$ret = ibase_commit($this->_transactionID);
+		}
+		$this->_transactionID = false;
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ret = false;
+		$this->autoCommit = true;
+		if ($this->_transactionID) 
+				  $ret = ibase_rollback($this->_transactionID);
+		$this->_transactionID = false;   
+		
+		return $ret;
+	}
+	
+	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+	{
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+        
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+        $table = strtoupper($table);
+        $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'";
+        if (!$primary) {
+        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
+        } else {
+        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
+        }
+        // get index details
+        $rs = $this->Execute($sql);
+        if (!is_object($rs)) {
+	        // restore fetchmode
+	        if (isset($savem)) {
+	            $this->SetFetchMode($savem);
+	        }
+	        $ADODB_FETCH_MODE = $save;
+            return FALSE;
+        }
+        
+        $indexes = array ();
+		while ($row = $rs->FetchRow()) {
+			$index = $row[0];
+             if (!isset($indexes[$index])) {
+             		if (is_null($row[3])) {$row[3] = 0;}
+                     $indexes[$index] = array(
+                             'unique' => ($row[3] == 1),
+                             'columns' => array()
+                     );
+             }
+			$sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '".$name."' ORDER BY RDB\$FIELD_POSITION ASC";
+			$rs1 = $this->Execute($sql);
+            while ($row1 = $rs1->FetchRow()) {
+             	$indexes[$index]['columns'][$row1[2]] = $row1[1];
+        	}
+		}
+        // restore fetchmode
+        if (isset($savem)) {
+            $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+        
+        return $indexes;
+	}
+
+	
+	// See http://community.borland.com/article/0,1410,25844,00.html
+	function RowLock($tables,$where,$col)
+	{
+		if ($this->autoCommit) $this->BeginTrans();
+		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
+		return 1;
+	}
+	
+	
+	function CreateSequence($seqname,$startID=1)
+	{
+		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
+		if (!$ok) return false;
+		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
+	}
+	
+	function DropSequence($seqname)
+	{
+		$seqname = strtoupper($seqname);
+		$this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'");
+	}
+	
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			$this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
+			$this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
+			$rs = $this->Execute($getnext);
+		}
+		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
+		else $this->genID = 0; // false
+		
+		if ($rs) $rs->Close();
+		
+		return $this->genID;
+	}
+
+	function SelectDB($dbName) 
+	{
+		   return false;
+	}
+
+	function _handleerror()
+	{
+		$this->_errorMsg = ibase_errmsg();
+	}
+
+	function ErrorNo() 
+	{
+		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
+		else return 0;
+	}
+
+	function ErrorMsg() 
+	{
+			return $this->_errorMsg;
+	}
+
+	   // returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{  
+		if (!function_exists('ibase_pconnect')) return false;
+		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
+		$this->_connectionID = ibase_connect($argHostname,$argUsername,$argPassword,$this->charSet,$this->buffers,$this->dialect);
+	 	if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
+			$this->replaceQuote = "''";
+		}
+		if ($this->_connectionID === false) {
+			$this->_handleerror();
+			return false;
+		}
+		
+		ibase_timefmt($this->ibase_timefmt);	
+		return true;
+	}
+	   // returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('ibase_pconnect')) return false;
+		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
+		$this->_connectionID = ibase_pconnect($argHostname,$argUsername,$argPassword,$this->charSet,$this->buffers,$this->dialect);
+		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
+			$this->replaceQuote = "''";
+		}
+		if ($this->_connectionID === false) {
+			$this->_handleerror();
+			return false;
+		}
+		
+		ibase_timefmt($this->ibase_timefmt);
+		return true;
+	}	
+	
+	function Prepare($sql)
+	{
+		$stmt = ibase_prepare($this->_connectionID,$sql);
+		if (!$stmt) return false;
+		return array($sql,$stmt);
+	}
+
+	   // returns query ID if successful, otherwise false
+	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
+	function _query($sql,$iarr=false)
+	{ 
+
+		if (!$this->autoCommit && $this->_transactionID) {
+			$conn = $this->_transactionID;
+			$docommit = false;
+		} else {
+			$conn = $this->_connectionID;
+			$docommit = true;
+		}
+		if (is_array($sql)) {
+			$fn = 'ibase_execute';
+			$sql = $sql[1];
+			
+			if (is_array($iarr)) {	
+				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
+					$fnarr =& array_merge( array($sql) , $iarr);
+					$ret = call_user_func_array($fn,$fnarr);
+				} else {
+					switch(sizeof($iarr)) {
+					case 1: $ret = $fn($sql,$iarr[0]); break;
+					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
+					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
+					case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+					case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+					case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+					case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
+					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+					}
+				}
+			} else $ret = $fn($sql); 
+		} else {
+			$fn = 'ibase_query';
+		
+			if (is_array($iarr)) {	
+				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
+					$fnarr =& array_merge( array($conn,$sql) , $iarr);
+					$ret = call_user_func_array($fn,$fnarr);
+				} else {
+					switch(sizeof($iarr)) {
+					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
+					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
+					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
+					case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+					case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+					case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+					case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
+					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+					}
+				}
+			} else $ret = $fn($conn,$sql); 
+		}
+		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
+
+		$this->_handleerror();
+		return $ret;
+	}
+
+	 // returns true or false
+	 function _close()
+	 {	   
+		if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
+		return @ibase_close($this->_connectionID);
+	 }
+	
+	//OPN STUFF start
+	function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $isInterbase6)
+	{
+		$fscale = abs($fscale);
+		$fld->max_length = $flen;
+		$fld->scale = null;
+		switch($ftype){
+			case 7: 
+			case 8:
+				if ($isInterbase6) {
+				    switch($fsubtype){
+				    	case 0: 
+				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
+				    		break;
+				    	case 1: 
+				    		$fld->type = 'numeric';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+				    		break;
+				    	case 2:
+				    		$fld->type = 'decimal';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+				    		break;
+				    } // switch
+				} else {
+					if ($fscale !=0) {
+					    $fld->type = 'decimal';
+						$fld->scale = $fscale;
+						$fld->max_length = ($ftype == 7 ? 4 : 9);
+					} else {
+						$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
+					}
+				}
+				break;
+			case 16: 
+				if ($isInterbase6) {
+				    switch($fsubtype){
+				    	case 0: 
+				    		$fld->type = 'decimal';
+							$fld->max_length = 18;
+							$fld->scale = 0;
+				    		break;
+				    	case 1: 
+				    		$fld->type = 'numeric';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+				    		break;
+				    	case 2:
+				    		$fld->type = 'decimal';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+				    		break;
+				    } // switch
+				}
+				break;
+			case 10:
+				$fld->type = 'float';
+				break;
+			case 14:
+				$fld->type = 'char';
+				break;
+			case 27:
+				if ($fscale !=0) {
+				    $fld->type = 'decimal';
+					$fld->max_length = 15;
+					$fld->scale = 5;
+				} else {
+					$fld->type = 'double';
+				}
+				break;
+			case 35:
+				if ($isInterbase6) {
+				    $fld->type = 'timestamp';
+				} else {
+					$fld->type = 'date';
+				}
+				break;
+			case 12:
+			case 13:
+				$fld->type = 'date';
+				break;
+			case 37:
+				$fld->type = 'varchar';
+				break;
+			case 40:
+				$fld->type = 'cstring';
+				break;
+			case 261:
+				$fld->type = 'blob';
+				$fld->max_length = -1;
+				break;
+		} // switch
+	}
+	//OPN STUFF end
+		// returns array of ADOFieldObjects for current table
+	function &MetaColumns($table) 
+	{
+	global $ADODB_FETCH_MODE;
+		
+		if ($this->metaColumnsSQL) {
+		
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+		
+			$ADODB_FETCH_MODE = $save;
+			if ($rs === false) return false;
+
+			$retarr = array();
+			//OPN STUFF start
+			$isInterbase6 = ($this->dialect==3 ? true : false);
+			//OPN STUFF end
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = trim($rs->fields[0]);
+				//OPN STUFF start
+				$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $isInterbase6);
+				if (isset($rs->fields[1]) && $rs->fields[1]) {
+					$fld->not_null = true;
+				}				
+				if (isset($rs->fields[2])) {
+					
+					$fld->has_default = true;
+					$d = substr($rs->fields[2],strlen('default '));
+					switch ($fld->type)
+					{
+					case 'smallint':
+					case 'integer': $fld->default_value = (int) $d; break;
+					case 'char': 
+					case 'blob':
+					case 'text':
+					case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
+					case 'double':
+					case 'float': $fld->default_value = (float) $d; break;
+					default: $fld->default_value = $d; break;
+					}
+			//	case 35:$tt = 'TIMESTAMP'; break;
+				}
+				if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
+					$fld->sub_type = $rs->fields[5];
+				} else {
+					$fld->sub_type = null;
+				}
+				//OPN STUFF end
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+				else $retarr[strtoupper($fld->name)] = $fld;
+				
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+	
+	function BlobEncode( $blob ) 
+	{
+		$blobid = ibase_blob_create( $this->_connectionID);
+		ibase_blob_add( $blobid, $blob );
+		return ibase_blob_close( $blobid );
+	}
+	
+	// since we auto-decode all blob's since 2.42, 
+	// BlobDecode should not do any transforms
+	function BlobDecode($blob)
+	{
+		return $blob; 
+	}
+	
+	
+	
+	
+	// old blobdecode function
+	// still used to auto-decode all blob's
+	function _BlobDecode( $blob ) 
+	{
+		$blobid = ibase_blob_open( $blob );
+		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet 
+		while($string = ibase_blob_get($blobid, 8192)){ 
+			$realblob .= $string; 
+		}
+		ibase_blob_close( $blobid );
+
+		return( $realblob );
+	} 
+	
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
+	{ 
+		$fd = fopen($path,'rb'); 
+		if ($fd === false) return false; 
+		$blob_id = ibase_blob_create($this->_connectionID); 
+		
+		/* fill with data */ 
+		
+		while ($val = fread($fd,32768)){ 
+			ibase_blob_add($blob_id, $val); 
+		} 
+		
+		/* close and get $blob_id_str for inserting into table */ 
+		$blob_id_str = ibase_blob_close($blob_id); 
+		
+		fclose($fd); 
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
+	} 
+	
+	/*
+		Insert a null into the blob field of the table first.
+		Then use UpdateBlob to store the blob.
+		
+		Usage:
+		 
+		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
+	{ 
+	$blob_id = ibase_blob_create($this->_connectionID); 
+	
+	// ibase_blob_add($blob_id, $val); 
+	
+	// replacement that solves the problem by which only the first modulus 64K / 
+	// of $val are stored at the blob field //////////////////////////////////// 
+	// Thx Abel Berenstein  aberenstein#afip.gov.ar
+	$len = strlen($val); 
+	$chunk_size = 32768; 
+	$tail_size = $len % $chunk_size; 
+	$n_chunks = ($len - $tail_size) / $chunk_size; 
+	
+	for ($n = 0; $n < $n_chunks; $n++) { 
+		$start = $n * $chunk_size; 
+		$data = substr($val, $start, $chunk_size); 
+		ibase_blob_add($blob_id, $data); 
+	} 
+	
+	if ($tail_size) {
+		$start = $n_chunks * $chunk_size; 
+		$data = substr($val, $start, $tail_size); 
+		ibase_blob_add($blob_id, $data); 
+	}
+	// end replacement ///////////////////////////////////////////////////////// 
+	
+	$blob_id_str = ibase_blob_close($blob_id); 
+	
+	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
+	
+	} 
+	
+	
+	function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		$blob_id = ibase_blob_create($this->_connectionID);
+		ibase_blob_add($blob_id, $val);
+		$blob_id_str = ibase_blob_close($blob_id);
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	// Only since Interbase 6.0 - uses EXTRACT
+	// problem - does not zero-fill the day and month yet
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysDate;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '||';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "extract(year from $col)";
+				break;
+			case 'M':
+			case 'm':
+				$s .= "extract(month from $col)";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "(extract(day from $col))";
+				break;
+			case 'H':
+			case 'h':
+			  $s .= "(extract(hour from $col))";
+			  break;                        
+			case 'I':
+			case 'i':
+			  $s .= "(extract(minute from $col))";
+			  break;                
+			case 'S':
+			case 's':
+			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
+			  break;        
+
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_ibase extends ADORecordSet 
+{
+
+	var $databaseType = "ibase";
+	var $bind=false;
+	var $_cacheType;
+	
+	function ADORecordset_ibase($id,$mode=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+			$this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode;
+			return $this->ADORecordSet($id);
+	}
+
+	/*		Returns: an object containing field information.
+			Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+			fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+			fetchField() is retrieved.		*/
+
+	function &FetchField($fieldOffset = -1)
+	{
+			 $fld = new ADOFieldObject;
+			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
+			 $fld->name = strtolower($ibf['alias']);
+			 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
+			 $fld->type = $ibf['type'];
+			 $fld->max_length = $ibf['length'];
+			 return $fld;
+	}
+
+	function _initrs()
+	{
+			$this->_numOfRows = -1;
+			$this->_numOfFields = @ibase_num_fields($this->_queryID);
+			
+			// cache types for blob decode check
+			for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+				$f1 = $this->FetchField($i); 
+				$this->_cacheType[] = $f1->type;
+			}				
+	}
+
+	function _seek($row)
+	{
+		return false;
+	}
+
+	
+	
+	function _fetch() 
+	{
+		$f = @ibase_fetch_row($this->_queryID); 
+		if ($f === false) {
+			$this->fields = false;
+			return false;
+		}
+		// OPN stuff start - optimized
+		// fix missing nulls and decode blobs automatically
+	
+		global $ADODB_ANSI_PADDING_OFF;
+		//$ADODB_ANSI_PADDING_OFF=1;
+		$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
+		
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+			if ($this->_cacheType[$i]=="BLOB") {
+				if (isset($f[$i])) { 
+					$f[$i] = $this->connection->_BlobDecode($f[$i]); 
+				} else { 
+					$f[$i] = null; 
+				} 
+			} else { 
+				if (!isset($f[$i])) { 
+					$f[$i] = null; 
+				} else if ($rtrim && is_string($f[$i])) {
+					$f[$i] = rtrim($f[$i]);
+				}
+			} 
+		} 
+		// OPN stuff end 
+		
+		$this->fields = $f;
+		if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+		} else if ($this->fetchMode == ADODB_FETCH_BOTH) {
+			$this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
+		}
+		return true;
+	}
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+		
+	}
+	
+
+	function _close() 
+	{
+			return @ibase_free_result($this->_queryID);
+	}
+
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+		case 'CHAR':
+			return 'C';
+			
+		case 'TEXT':
+		case 'VARCHAR':
+		case 'VARYING':
+		if ($len <= $this->blobSize) return 'C';
+			return 'X';
+		case 'BLOB':
+			return 'B';
+			   
+		case 'TIMESTAMP':
+		case 'DATE': return 'D';
+				
+				//case 'T': return 'T';
+
+				//case 'L': return 'L';
+		case 'INT': 
+		case 'SHORT':
+		case 'INTEGER': return 'I';
+		default: return 'N';
+		}
+	}
+
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-informix.inc.php b/lib/adodb/drivers/adodb-informix.inc.php
index 0473f950028..2f1bd3256df 100644
--- a/lib/adodb/drivers/adodb-informix.inc.php
+++ b/lib/adodb/drivers/adodb-informix.inc.php
@@ -1,30 +1,30 @@
-ADORecordset_informix72($id,$mode);
-	}
-}
+ADORecordset_informix72($id,$mode);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-informix72.inc.php b/lib/adodb/drivers/adodb-informix72.inc.php
index f9110793544..78228168149 100644
--- a/lib/adodb/drivers/adodb-informix72.inc.php
+++ b/lib/adodb/drivers/adodb-informix72.inc.php
@@ -1,380 +1,392 @@
-
-
-*/
-
-if (!defined('IFX_SCROLL')) define('IFX_SCROLL',1);
-
-class ADODB_informix72 extends ADOConnection {
-	var $databaseType = "informix72";
-	var $dataProvider = "informix";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;
-	var $upperCase = 'upper';
-    var $substr = 'substr';
-	var $metaTablesSQL="select tabname from systables";
-	var $metaColumnsSQL = 
-"select c.colname, c.coltype, c.collength, d.default 
-	from syscolumns c, systables t,sysdefaults d 
-	where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno and tabname='%s'";
-
-//	var $metaColumnsSQL = "select colname, coltype, collength from syscolumns c, systables t where c.tabid=t.tabid and tabname='%s'";
-	var $concat_operator = '||';
-
-	var $lastQuery = false;
-	var $has_insertid = true;
-
-	var $_autocommit = true;
-	var $_bindInputArray = true;  // set to true if ADOConnection.Execute() permits binding of array parameters.
-	var $sysDate = 'TODAY';
-	var $sysTimeStamp = 'CURRENT';
-	var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0
-   
-	function ADODB_informix72()
-	{
-		// alternatively, use older method:
-		//putenv("DBDATE=Y4MD-");
-
-		// force ISO date format
-		putenv('GL_DATE=%Y-%m-%d');
-		
-		if (function_exists('ifx_byteasvarchar')) {
-			ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
-        	ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
-        	ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in memory, and mode "1" means save Byte-Blobs in a file.
-		}
-	}
-
-	function _insertid()
-	{
-		$sqlca =ifx_getsqlca($this->lastQuery);
-		return @$sqlca["sqlerrd1"];
-	}
-
-	function _affectedrows()
-	{
-		if ($this->lastQuery) {
-		   return @ifx_affected_rows ($this->lastQuery);
-		}
-		return 0;
-	}
-
-	function BeginTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->Execute('BEGIN');
-		$this->_autocommit = false;
-		return true;
-	}
-
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->_autocommit = true;
-		return true;
-	}
-
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		$this->_autocommit = true;
-		return true;
-	}
-
-	function RowLock($tables,$where)
-	{
-		if ($this->_autocommit) $this->BeginTrans();
-		return $this->GetOne("select 1 as ignore from $tables where $where for update");
-	}
-
-	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/
-
-	function ErrorMsg() 
-	{
-		if (!empty($this->_logsql)) return $this->_errorMsg;
-		$this->_errorMsg = ifx_errormsg();
-		return $this->_errorMsg;
-	}
-
-	function ErrorNo()
-	{
-		preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse); //!EOS
-		if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; 
-		return 0;
-	}
-
-   
-    function &MetaColumns($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if (!empty($this->metaColumnsSQL)) {
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-          		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			if ($rs === false) return false;
-
-			$retarr = array();
-			while (!$rs->EOF) { //print_r($rs->fields);
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$fld->type = $rs->fields[1];
-				$fld->max_length = $rs->fields[2];
-				if (trim($rs->fields[3]) != "AAAAAA 0") {
-	                    		$fld->has_default = 1;
-	                    		$fld->default_value = $rs->fields[3];
-				} else {
-					$fld->has_default = 0;
-				}
-
-                $retarr[strtolower($fld->name)] = $fld;	
-				$rs->MoveNext();
-			}
-
-			$rs->Close();
-			return $retarr;	
-		}
-
-		return false;
-	}
-	
-   function &xMetaColumns($table)
-   {
-		return ADOConnection::MetaColumns($table,false);
-   }
-
-   function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
-   {
-   		$type = ($blobtype == 'TEXT') ? 1 : 0;
-		$blobid = ifx_create_blob($type,0,$val);
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blobid));
-   }
-
-   function BlobDecode($blobid)
-   {
-   		return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid);
-   }
-   
-	// returns true or false
-   function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('ifx_connect')) return false;
-		
-		$dbs = $argDatabasename . "@" . $argHostname;
-		if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
-		putenv("INFORMIXSERVER=$argHostname"); 
-		$this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;
-	}
-
-	// returns true or false
-   function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('ifx_connect')) return false;
-		
-		$dbs = $argDatabasename . "@" . $argHostname;
-		if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
-		$this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;
-	}
-/*
-	// ifx_do does not accept bind parameters - wierd ???
-	function Prepare($sql)
-	{
-		$stmt = ifx_prepare($sql);
-		if (!$stmt) return $sql;
-		else return array($sql,$stmt);
-	}
-*/
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-	global $ADODB_COUNTRECS;
-	
-	  // String parameters have to be converted using ifx_create_char
-	  if ($inputarr) {
-		 foreach($inputarr as $v) {
-			if (gettype($v) == 'string') {
-			   $tab[] = ifx_create_char($v);
-			}
-			else {
-			   $tab[] = $v;
-			}
-		 }
-	  }
-
-	  // In case of select statement, we use a scroll cursor in order
-	  // to be able to call "move", or "movefirst" statements
-	  if (!$ADODB_COUNTRECS && preg_match("/^\s*select/is", $sql)) {
-		 if ($inputarr) {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType, $tab);
-		 }
-		 else {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType);
-		 }
-	  }
-	  else {
-		 if ($inputarr) {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $tab);
-		 }
-		 else {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID);
-		 }
-	  }
-
-	  // Following line have been commented because autocommit mode is
-	  // not supported by informix SE 7.2
-
-	  //if ($this->_autocommit) ifx_query('COMMIT',$this->_connectionID);
-
-		return $this->lastQuery;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		$this->lastQuery = false;
-		return ifx_close($this->_connectionID);
-	}
-}
-
-
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_informix72 extends ADORecordSet {
-
-	var $databaseType = "informix72";
-	var $canSeek = true;
-	var $_fieldprops = false;
-
-	function ADORecordset_informix72($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id);
-	}
-
-
-
-	/*	Returns: an object containing field information.
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-	function &FetchField($fieldOffset = -1)
-	{
-		if (empty($this->_fieldprops)) {
-			$fp = ifx_fieldproperties($this->_queryID);
-			foreach($fp as $k => $v) {
-				$o = new ADOFieldObject;
-				$o->name = $k;
-				$arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
-				$o->type = $arr[0];
-				$o->max_length = $arr[1];
-				$this->_fieldprops[] = $o;
-				$o->not_null = $arr[4]=="N";
-			}
-		}
-		return $this->_fieldprops[$fieldOffset];
-	}
-
-	function _initrs()
-	{
-		$this->_numOfRows = -1; // ifx_affected_rows not reliable, only returns estimate -- ($ADODB_COUNTRECS)? ifx_affected_rows($this->_queryID):-1;
-		$this->_numOfFields = ifx_num_fields($this->_queryID);
-	}
-
-	function _seek($row)
-	{
-		return @ifx_fetch_row($this->_queryID, $row);
-	}
-
-   function MoveLast()
-   {
-	  $this->fields = @ifx_fetch_row($this->_queryID, "LAST");
-	  if ($this->fields) $this->EOF = false;
-	  $this->_currentRow = -1;
-
-	  if ($this->fetchMode == ADODB_FETCH_NUM) {
-		 foreach($this->fields as $v) {
-			$arr[] = $v;
-		 }
-		 $this->fields = $arr;
-	  }
-
-	  return true;
-   }
-
-   function MoveFirst()
-	{
-	  $this->fields = @ifx_fetch_row($this->_queryID, "FIRST");
-	  if ($this->fields) $this->EOF = false;
-	  $this->_currentRow = 0;
-
-	  if ($this->fetchMode == ADODB_FETCH_NUM) {
-		 foreach($this->fields as $v) {
-			$arr[] = $v;
-		 }
-		 $this->fields = $arr;
-	  }
-
-	  return true;
-   }
-
-   function _fetch($ignore_fields=false)
-   {
-
-		$this->fields = @ifx_fetch_row($this->_queryID);
-
-		if (!is_array($this->fields)) return false;
-
-		if ($this->fetchMode == ADODB_FETCH_NUM) {
-			foreach($this->fields as $v) {
-				$arr[] = $v;
-			}
-			$this->fields = $arr;
-		}
-		return true;
-	}
-
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close()
-	{
-		return ifx_free_result($this->_queryID);
-	}
-
-}
+
+
+*/
+
+if (!defined('IFX_SCROLL')) define('IFX_SCROLL',1);
+
+class ADODB_informix72 extends ADOConnection {
+	var $databaseType = "informix72";
+	var $dataProvider = "informix";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $hasInsertID = true;
+	var $hasAffectedRows = true;
+	var $upperCase = 'upper';
+    var $substr = 'substr';
+	var $metaTablesSQL="select tabname from systables";
+	var $metaColumnsSQL = 
+"select c.colname, c.coltype, c.collength, d.default 
+	from syscolumns c, systables t,sysdefaults d 
+	where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno and tabname='%s'";
+
+//	var $metaColumnsSQL = "select colname, coltype, collength from syscolumns c, systables t where c.tabid=t.tabid and tabname='%s'";
+	var $concat_operator = '||';
+
+	var $lastQuery = false;
+	var $has_insertid = true;
+
+	var $_autocommit = true;
+	var $_bindInputArray = true;  // set to true if ADOConnection.Execute() permits binding of array parameters.
+	var $sysDate = 'TODAY';
+	var $sysTimeStamp = 'CURRENT';
+	var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0
+   
+	function ADODB_informix72()
+	{
+		// alternatively, use older method:
+		//putenv("DBDATE=Y4MD-");
+
+		// force ISO date format
+		putenv('GL_DATE=%Y-%m-%d');
+		
+		if (function_exists('ifx_byteasvarchar')) {
+			ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
+        	ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
+        	ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in memory, and mode "1" means save Byte-Blobs in a file.
+		}
+	}
+	
+	function ServerInfo()
+	{
+	    if (isset($this->version)) return $this->version;
+	
+	    $arr['description'] = $this->GetOne("select DBINFO('version','full') from systables where tabid = 1");
+	    $arr['version'] = $this->GetOne("select DBINFO('version','major')||"."||DBINFO('version','minor') from systables where tabid = 1");
+	    $this->version = $arr;
+	    return $arr;
+	}
+
+
+
+	function _insertid()
+	{
+		$sqlca =ifx_getsqlca($this->lastQuery);
+		return @$sqlca["sqlerrd1"];
+	}
+
+	function _affectedrows()
+	{
+		if ($this->lastQuery) {
+		   return @ifx_affected_rows ($this->lastQuery);
+		}
+		return 0;
+	}
+
+	function BeginTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->Execute('BEGIN');
+		$this->_autocommit = false;
+		return true;
+	}
+
+	function CommitTrans($ok=true) 
+	{ 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('COMMIT');
+		$this->_autocommit = true;
+		return true;
+	}
+
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('ROLLBACK');
+		$this->_autocommit = true;
+		return true;
+	}
+
+	function RowLock($tables,$where)
+	{
+		if ($this->_autocommit) $this->BeginTrans();
+		return $this->GetOne("select 1 as ignore from $tables where $where for update");
+	}
+
+	/*	Returns: the last error message from previous database operation
+		Note: This function is NOT available for Microsoft SQL Server.	*/
+
+	function ErrorMsg() 
+	{
+		if (!empty($this->_logsql)) return $this->_errorMsg;
+		$this->_errorMsg = ifx_errormsg();
+		return $this->_errorMsg;
+	}
+
+	function ErrorNo()
+	{
+		preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse); //!EOS
+		if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; 
+		return 0;
+	}
+
+   
+    function &MetaColumns($table)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		if (!empty($this->metaColumnsSQL)) {
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+          		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			if ($rs === false) return false;
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+				$fld->max_length = $rs->fields[2];
+				if (trim($rs->fields[3]) != "AAAAAA 0") {
+	                    		$fld->has_default = 1;
+	                    		$fld->default_value = $rs->fields[3];
+				} else {
+					$fld->has_default = 0;
+				}
+
+                $retarr[strtolower($fld->name)] = $fld;	
+				$rs->MoveNext();
+			}
+
+			$rs->Close();
+			return $retarr;	
+		}
+
+		return false;
+	}
+	
+   function &xMetaColumns($table)
+   {
+		return ADOConnection::MetaColumns($table,false);
+   }
+
+   function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
+   {
+   		$type = ($blobtype == 'TEXT') ? 1 : 0;
+		$blobid = ifx_create_blob($type,0,$val);
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blobid));
+   }
+
+   function BlobDecode($blobid)
+   {
+   		return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid);
+   }
+   
+	// returns true or false
+   function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('ifx_connect')) return false;
+		
+		$dbs = $argDatabasename . "@" . $argHostname;
+		if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
+		putenv("INFORMIXSERVER=".trim($argHostname)); 
+		$this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;
+	}
+
+	// returns true or false
+   function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('ifx_connect')) return false;
+		
+		$dbs = $argDatabasename . "@" . $argHostname;
+		putenv("INFORMIXSERVER=".trim($argHostname)); 
+		$this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;
+	}
+/*
+	// ifx_do does not accept bind parameters - weird ???
+	function Prepare($sql)
+	{
+		$stmt = ifx_prepare($sql);
+		if (!$stmt) return $sql;
+		else return array($sql,$stmt);
+	}
+*/
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr)
+	{
+	global $ADODB_COUNTRECS;
+	
+	  // String parameters have to be converted using ifx_create_char
+	  if ($inputarr) {
+		 foreach($inputarr as $v) {
+			if (gettype($v) == 'string') {
+			   $tab[] = ifx_create_char($v);
+			}
+			else {
+			   $tab[] = $v;
+			}
+		 }
+	  }
+
+	  // In case of select statement, we use a scroll cursor in order
+	  // to be able to call "move", or "movefirst" statements
+	  if (!$ADODB_COUNTRECS && preg_match("/^\s*select/is", $sql)) {
+		 if ($inputarr) {
+			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType, $tab);
+		 }
+		 else {
+			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType);
+		 }
+	  }
+	  else {
+		 if ($inputarr) {
+			$this->lastQuery = ifx_query($sql,$this->_connectionID, $tab);
+		 }
+		 else {
+			$this->lastQuery = ifx_query($sql,$this->_connectionID);
+		 }
+	  }
+
+	  // Following line have been commented because autocommit mode is
+	  // not supported by informix SE 7.2
+
+	  //if ($this->_autocommit) ifx_query('COMMIT',$this->_connectionID);
+
+		return $this->lastQuery;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		$this->lastQuery = false;
+		return ifx_close($this->_connectionID);
+	}
+}
+
+
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_informix72 extends ADORecordSet {
+
+	var $databaseType = "informix72";
+	var $canSeek = true;
+	var $_fieldprops = false;
+
+	function ADORecordset_informix72($id,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		return $this->ADORecordSet($id);
+	}
+
+
+
+	/*	Returns: an object containing field information.
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+	function &FetchField($fieldOffset = -1)
+	{
+		if (empty($this->_fieldprops)) {
+			$fp = ifx_fieldproperties($this->_queryID);
+			foreach($fp as $k => $v) {
+				$o = new ADOFieldObject;
+				$o->name = $k;
+				$arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
+				$o->type = $arr[0];
+				$o->max_length = $arr[1];
+				$this->_fieldprops[] = $o;
+				$o->not_null = $arr[4]=="N";
+			}
+		}
+		return $this->_fieldprops[$fieldOffset];
+	}
+
+	function _initrs()
+	{
+		$this->_numOfRows = -1; // ifx_affected_rows not reliable, only returns estimate -- ($ADODB_COUNTRECS)? ifx_affected_rows($this->_queryID):-1;
+		$this->_numOfFields = ifx_num_fields($this->_queryID);
+	}
+
+	function _seek($row)
+	{
+		return @ifx_fetch_row($this->_queryID, $row);
+	}
+
+   function MoveLast()
+   {
+	  $this->fields = @ifx_fetch_row($this->_queryID, "LAST");
+	  if ($this->fields) $this->EOF = false;
+	  $this->_currentRow = -1;
+
+	  if ($this->fetchMode == ADODB_FETCH_NUM) {
+		 foreach($this->fields as $v) {
+			$arr[] = $v;
+		 }
+		 $this->fields = $arr;
+	  }
+
+	  return true;
+   }
+
+   function MoveFirst()
+	{
+	  $this->fields = @ifx_fetch_row($this->_queryID, "FIRST");
+	  if ($this->fields) $this->EOF = false;
+	  $this->_currentRow = 0;
+
+	  if ($this->fetchMode == ADODB_FETCH_NUM) {
+		 foreach($this->fields as $v) {
+			$arr[] = $v;
+		 }
+		 $this->fields = $arr;
+	  }
+
+	  return true;
+   }
+
+   function _fetch($ignore_fields=false)
+   {
+
+		$this->fields = @ifx_fetch_row($this->_queryID);
+
+		if (!is_array($this->fields)) return false;
+
+		if ($this->fetchMode == ADODB_FETCH_NUM) {
+			foreach($this->fields as $v) {
+				$arr[] = $v;
+			}
+			$this->fields = $arr;
+		}
+		return true;
+	}
+
+	/*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+	function _close()
+	{
+		return ifx_free_result($this->_queryID);
+	}
+
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-mssql.inc.php b/lib/adodb/drivers/adodb-mssql.inc.php
index 7a0247b6499..30325f39848 100644
--- a/lib/adodb/drivers/adodb-mssql.inc.php
+++ b/lib/adodb/drivers/adodb-mssql.inc.php
@@ -1,921 +1,928 @@
-= 0x4300) {
-// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-	ini_set('mssql.datetimeconvert',0); 
-} else {
-global $ADODB_mssql_mths;		// array, months must be upper-case
-
-
-	$ADODB_mssql_date_order = 'mdy'; 
-	$ADODB_mssql_mths = array(
-		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
-		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
-}
-
-//---------------------------------------------------------------------------
-// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
-// just after you connect to the database. Supports mdy and dmy only.
-// Not required for PHP 4.2.0 and above.
-function AutoDetect_MSSQL_Date_Order($conn)
-{
-global $ADODB_mssql_date_order;
-	$adate = $conn->GetOne('select getdate()');
-	if ($adate) {
-		$anum = (int) $adate;
-		if ($anum > 0) {
-			if ($anum > 31) {
-				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
-			} else
-				$ADODB_mssql_date_order = 'dmy';
-		} else
-			$ADODB_mssql_date_order = 'mdy';
-	}
-}
-
-class ADODB_mssql extends ADOConnection {
-	var $databaseType = "mssql";	
-	var $dataProvider = "mssql";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d h:i:sA'";
-	var $hasInsertID = true;
-	var $substr = "substring";
-	var $length = 'len';
-	var $upperCase = 'upper';
-	var $hasAffectedRows = true;
-	var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'";
-	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
-	var $metaColumnsSQL = # xtype==61 is datetime
-"select c.name,t.name,c.length,
-	(case when c.xusertype=61 then 0 else c.xprec end),
-	(case when c.xusertype=61 then 0 else c.xscale end) 
-	from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
-	var $hasGenID = true;
-	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-	var $sysTimeStamp = 'GetDate()';
-	var $_has_mssql_init;
-	var $maxParameterLen = 4000;
-	var $arrayClass = 'ADORecordSet_array_mssql';
-	var $uniqueSort = true;
-	var $leftOuter = '*=';
-	var $rightOuter = '=*';
-	var $ansiOuter = true; // for mssql7 or later
-	var $poorAffectedRows = true;
-	var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # for mssql 2000
-	var $uniqueOrderBy = true;
-	var $_bindInputArray = true;
-	
-	
-	function ADODB_mssql() 
-	{		
-		$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
-	}
-
-	function ServerInfo()
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$stmt = $this->PrepareSP('sp_server_info');
-		$val = 2;
-		if ($this->fetchMode === false) {
-			$savem = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		} else 
-			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
-		
-		
-		$this->Parameter($stmt,$val,'attribute_id');
-		$row = $this->GetRow($stmt);
-		
-		//$row = $this->GetRow("execute sp_server_info 2");
-		
-		if ($this->fetchMode === false) {
-			$ADODB_FETCH_MODE = $savem;
-		} else
-			$this->SetFetchMode($savem);
-		
-		$arr['description'] = $row[2];
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " ISNULL($field, $ifNull) "; // if MS SQL Server
-	}
-	
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
-	// they are in the same stored procedure, function, or batch.
-			return $this->GetOne($this->identitySQL);
-	}
-
-	function _affectedrows()
-	{
-		return $this->GetOne('select @@rowcount');
-	}
-
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seq='adodbseq',$start=1)
-	{
-		$start -= 1;
-		$this->Execute("create table $seq (id float(53))");
-		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-		if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-		}
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return true;
-	}
-
-	function GenID($seq='adodbseq',$start=1)
-	{
-		//$this->debug=1;
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
-		if (!$ok) {
-			$this->Execute("create table $seq (id float(53))");
-			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-			if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-			}
-			$this->Execute('COMMIT TRANSACTION adodbseq'); 
-			return $start;
-		}
-		$num = $this->GetOne("select id from $seq");
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return $num;
-		
-		// in old implementation, pre 1.90, we returned GUID...
-		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
-	}
-	
-
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0 && $offset <= 0) {
-			$sql = preg_replace(
-				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-			$rs =& $this->Execute($sql,$inputarr);
-		} else
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-	
-		return $rs;
-	}
-	
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '+';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
-			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
-				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-
-	
-	function BeginTrans()
-	{
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-	   	$this->Execute('BEGIN TRAN');
-	   	return true;
-	}
-		
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT TRAN');
-		return true;
-	}
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK TRAN');
-		return true;
-	}
-	
-	/*
-		Usage:
-		
-		$this->BeginTrans();
-		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
-		
-		# some operation on both tables table1 and table2
-		
-		$this->CommitTrans();
-		
-		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
-	*/
-	function RowLock($tables,$where) 
-	{
-		if (!$this->transCnt) $this->BeginTrans();
-		return $this->GetOne("select top 1 null as ignore from $tables with (ROWLOCK,HOLDLOCK) where $where");
-	}
-	
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
-"select object_name(constid) as constraint_name,
-	col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where upper(object_name(fkeyid)) = $table
-order by constraint_name, referenced_table_name, keyno";
-		
-		$constraints =& $this->GetArray($sql);
-		
-		$ADODB_FETCH_MODE = $save;
-		
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
-		}
-		if (!$arr) return false;
-		
-		$arr2 = false;
-		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-
-	//From: Fernando Moreira 
-	function MetaDatabases() 
-	{ 
-		if(@mssql_select_db("master")) { 
-				 $qry=$this->metaDatabasesSQL; 
-				 if($rs=@mssql_query($qry)){ 
-						 $tmpAr=$ar=array(); 
-						 while($tmpAr=@mssql_fetch_row($rs)) 
-								 $ar[]=$tmpAr[0]; 
-						@mssql_select_db($this->databaseName); 
-						 if(sizeof($ar)) 
-								 return($ar); 
-						 else 
-								 return(false); 
-				 } else { 
-						 @mssql_select_db($this->databaseName); 
-						 return(false); 
-				 } 
-		 } 
-		 return(false); 
-	} 
-
-	// "Stein-Aksel Basma" 
-	// tested with MSSQL 2000
-	function MetaPrimaryKeys($table)
-	{
-		$sql = "select k.column_name from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
-		where tc.constraint_name = k.constraint_name and tc.constraint_type =
-		'PRIMARY KEY' and k.table_name = '$table'";
-		
-		$a = $this->GetCol($sql);
-		if ($a && sizeof($a)>0) return $a;
-		return false;	  
-	}
-
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(($mask));
-			$this->metaTablesSQL .= " AND name like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
- 
-	function SelectDB($dbName) 
-	{
-		$this->databaseName = $dbName;
-		if ($this->_connectionID) {
-			return @mssql_select_db($dbName);		
-		}
-		else return false;	
-	}
-	
-	function ErrorMsg() 
-	{
-		if (empty($this->_errorMsg)){
-			$this->_errorMsg = mssql_get_last_message();
-		}
-		return $this->_errorMsg;
-	}
-	
-	function ErrorNo() 
-	{
-		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
-		if (empty($this->_errorMsg)) {
-			$this->_errorMsg = mssql_get_last_message();
-		}
-		$id = @mssql_query("select @@ERROR",$this->_connectionID);
-		if (!$id) return false;
-		$arr = mssql_fetch_array($id);
-		@mssql_free_result($id);
-		if (is_array($arr)) return $arr[0];
-	   else return -1;
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('mssql_pconnect')) return false;
-		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('mssql_pconnect')) return false;
-		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		
-		// persistent connections can forget to rollback on crash, so we do it here.
-		if ($this->autoRollback) {
-			$cnt = $this->GetOne('select @@TRANCOUNT');
-			while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
-		}
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	function Prepare($sql)
-	{
-		$sqlarr = explode('?',$sql);
-		if (sizeof($sqlarr) <= 1) return $sql;
-		$sql2 = $sqlarr[0];
-		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-			$sql2 .=  '@P'.($i-1) . $sqlarr[$i];
-		} 
-		return array($sql,$this->qstr($sql2),$max);
-	}
-	
-	function PrepareSP($sql)
-	{
-		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
-			return $sql;
-		}
-		$stmt = mssql_init($sql,$this->_connectionID);
-		if (!$stmt)  return $sql;
-		return array($sql,$stmt);
-	}
-	
-	/* 
-	Usage:
-		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
-		
-		# note that the parameter does not have @ in front!
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group',false,64);
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to. Can set to null (for isNull support).
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See mssql_bind documentation at php.net.
-	*/
-	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
-	{
-		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0");
-			return $sql;
-		}
-
-		$isNull = is_null($var); // php 4.0.4 and above...
-			
-		if ($type === false) 
-			switch(gettype($var)) {
-			default:
-			case 'string': $type = SQLCHAR; break;
-			case 'double': $type = SQLFLT8; break;
-			case 'integer': $type = SQLINT4; break;
-			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
-			}
-		
-		if  ($this->debug) {
-			$prefix = ($isOutput) ? 'Out' : 'In';
-			$ztype = (empty($type)) ? 'false' : $type;
-			ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
-		}
-		/*
-			See http://phplens.com/lens/lensforum/msgs.php?id=7231
-			
-			RETVAL is HARD CODED into php_mssql extension:
-			The return value (a long integer value) is treated like a special OUTPUT parameter, 
-			called "RETVAL" (without the @). See the example at mssql_execute to 
-			see how it works. - type: one of this new supported PHP constants. 
-				SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 
-		*/
-		if ($name !== 'RETVAL') $name = '@'.$name;
-		return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen);
-	}
-	
-	/* 
-		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
-		So all your blobs must be of type "image".
-		
-		Remember to set in php.ini the following...
-		
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textlimit = 0 ; zero to pass through 
-
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textsize = 0 ; zero to pass through 
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
-		return $this->Execute($sql) != false;
-	}
-	
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-		$this->_errorMsg = false;
-		if (is_array($inputarr)) {
-			
-			# bind input params with sp_executesql: 
-			# see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
-			# works only with sql server 7 and newer
-			if (!is_array($sql)) $sql = $this->Prepare($sql);
-			$params = '';
-			$decl = '';
-			$i = 0;
-			foreach($inputarr as $v) {
-				if ($decl) {
-					$decl .= ', ';
-					$params .= ', ';
-				}	
-				if (is_string($v)) {
-					$len = strlen($v);
-					if ($len == 0) $len = 1;
-					$decl .= "@P$i NVARCHAR($len)";
-					$params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
-				} else if (is_integer($v)) {
-					$decl .= "@P$i INT";
-					$params .= "@P$i=".$v;
-				} else {
-					$decl .= "@P$i FLOAT";
-					$params .= "@P$i=".$v;
-				}
-				$i += 1;
-			}
-			$decl = $this->qstr($decl);
-			if ($this->debug) ADOConnection::outp("sp_executesql N{$sql[1]},N$decl,$params");
-			$rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params");
-			
-		} else if (is_array($sql)) {
-			# PrepareSP()
-			$rez = mssql_execute($sql[1]);
-			
-		} else {
-			$rez = mssql_query($sql,$this->_connectionID);
-		}
-		return $rez;
-	}
-	
-	// returns true or false
-	function _close()
-	{ 
-		if ($this->transCnt) $this->RollbackTrans();
-		$rez = @mssql_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $rez;
-	}
-	
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_mssql::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_mssql extends ADORecordSet {	
-
-	var $databaseType = "mssql";
-	var $canSeek = true;
-	var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083
-	// _mths works only in non-localised system
-	
-	function ADORecordset_mssql($id,$mode=false)
-	{
-		// freedts check...
-		$this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
-
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-	
-	
-	function _initrs()
-	{
-	GLOBAL $ADODB_COUNTRECS;	
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @mssql_num_fields($this->_queryID);
-	}
-	
-
-	//Contributed by "Sven Axelsson" 
-	// get next resultset - requires PHP 4.0.5 or later
-	function NextRecordSet()
-	{
-		if (!mssql_next_result($this->_queryID)) return false;
-		$this->_inited = false;
-		$this->bind = false;
-		$this->_currentRow = -1;
-		$this->Init();
-		return true;
-	}
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	/*	Returns: an object containing field information. 
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-
-	function FetchField($fieldOffset = -1) 
-	{
-		if ($fieldOffset != -1) {
-			return @mssql_fetch_field($this->_queryID, $fieldOffset);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			return @mssql_fetch_field($this->_queryID);
-		}
-		return null;
-	}
-	
-	function _seek($row) 
-	{
-		return @mssql_data_seek($this->_queryID, $row);
-	}
-
-	// speedup
-	function MoveNext() 
-	{
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
-				//ADODB_FETCH_BOTH mode
-				$this->fields = @mssql_fetch_array($this->_queryID);
-			}
-			else {
-				if ($this->hasFetchAssoc) {// only for PHP 4.2.0 or later
-					 $this->fields = @mssql_fetch_assoc($this->_queryID);
-				} else {
-					$flds = @mssql_fetch_array($this->_queryID);
-					if (is_array($flds)) {
-						$fassoc = array();
-						foreach($flds as $k => $v) {
-							if (is_numeric($k)) continue;
-							$fassoc[$k] = $v;
-						}
-						$this->fields = $fassoc;
-					} else
-						$this->fields = false;
-				}
-			}
-			
-			if (is_array($this->fields)) {
-				if (ADODB_ASSOC_CASE == 0) {
-					foreach($this->fields as $k=>$v) {
-						$this->fields[strtolower($k)] = $v;
-					}
-				} else if (ADODB_ASSOC_CASE == 1) {
-					foreach($this->fields as $k=>$v) {
-						$this->fields[strtoupper($k)] = $v;
-					}
-				}
-			}
-		} else {
-			$this->fields = @mssql_fetch_row($this->_queryID);
-		}
-		if ($this->fields) return true;
-		$this->EOF = true;
-		
-		return false;
-	}
-
-	
-	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
-	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
-				//ADODB_FETCH_BOTH mode
-				$this->fields = @mssql_fetch_array($this->_queryID);
-			} else {
-				if ($this->hasFetchAssoc) // only for PHP 4.2.0 or later
-					$this->fields = @mssql_fetch_assoc($this->_queryID);
-				else {
-					$this->fields = @mssql_fetch_array($this->_queryID);
-					if (is_array($$this->fields)) {
-						$fassoc = array();
-						foreach($$this->fields as $k => $v) {
-							if (is_integer($k)) continue;
-							$fassoc[$k] = $v;
-						}
-						$this->fields = $fassoc;
-					}
-				}
-			}
-			
-			if (!$this->fields) {
-			} else if (ADODB_ASSOC_CASE == 0) {
-				foreach($this->fields as $k=>$v) {
-					$this->fields[strtolower($k)] = $v;
-				}
-			} else if (ADODB_ASSOC_CASE == 1) {
-				foreach($this->fields as $k=>$v) {
-					$this->fields[strtoupper($k)] = $v;
-				}
-			}
-		} else {
-			$this->fields = @mssql_fetch_row($this->_queryID);
-		}
-		return $this->fields;
-	}
-	
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-
-	function _close() 
-	{
-		$rez = mssql_free_result($this->_queryID);	
-		$this->_queryID = false;
-		return $rez;
-	}
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_mssql::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}
-	
-}
-
-
-class ADORecordSet_array_mssql extends ADORecordSet_array {
-	function ADORecordSet_array_mssql($id=-1,$mode=false) 
-	{
-		$this->ADORecordSet_array($id,$mode);
-	}
-	
-		// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-		
-	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM 
-		if ($ADODB_mssql_date_order == 'dmy') {
-			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$theday,$rr[3]);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-		
-	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM
-		 if ($ADODB_mssql_date_order == 'dmy') {
-			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		
-		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
-		}
-		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
-	}
-}
-
-/*
-Code Example 1:
-
-select 	object_name(constid) as constraint_name,
-       	object_name(fkeyid) as table_name, 
-        col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where object_name(fkeyid) = x
-order by constraint_name, table_name, referenced_table_name,  keyno
-
-Code Example 2:
-select 	constraint_name,
-	column_name,
-	ordinal_position
-from information_schema.key_column_usage
-where constraint_catalog = db_name()
-and table_name = x
-order by constraint_name, ordinal_position
-
-http://www.databasejournal.com/scripts/article.php/1440551
-*/
-
+= 0x4300) {
+// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
+	ini_set('mssql.datetimeconvert',0); 
+} else {
+global $ADODB_mssql_mths;		// array, months must be upper-case
+
+
+	$ADODB_mssql_date_order = 'mdy'; 
+	$ADODB_mssql_mths = array(
+		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
+		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+}
+
+//---------------------------------------------------------------------------
+// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
+// just after you connect to the database. Supports mdy and dmy only.
+// Not required for PHP 4.2.0 and above.
+function AutoDetect_MSSQL_Date_Order($conn)
+{
+global $ADODB_mssql_date_order;
+	$adate = $conn->GetOne('select getdate()');
+	if ($adate) {
+		$anum = (int) $adate;
+		if ($anum > 0) {
+			if ($anum > 31) {
+				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
+			} else
+				$ADODB_mssql_date_order = 'dmy';
+		} else
+			$ADODB_mssql_date_order = 'mdy';
+	}
+}
+
+class ADODB_mssql extends ADOConnection {
+	var $databaseType = "mssql";	
+	var $dataProvider = "mssql";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d h:i:sA'";
+	var $hasInsertID = true;
+	var $substr = "substring";
+	var $length = 'len';
+	var $upperCase = 'upper';
+	var $hasAffectedRows = true;
+	var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'";
+	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
+	var $metaColumnsSQL = # xtype==61 is datetime
+"select c.name,t.name,c.length,
+	(case when c.xusertype=61 then 0 else c.xprec end),
+	(case when c.xusertype=61 then 0 else c.xscale end) 
+	from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
+	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
+	var $hasGenID = true;
+	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+	var $sysTimeStamp = 'GetDate()';
+	var $_has_mssql_init;
+	var $maxParameterLen = 4000;
+	var $arrayClass = 'ADORecordSet_array_mssql';
+	var $uniqueSort = true;
+	var $leftOuter = '*=';
+	var $rightOuter = '=*';
+	var $ansiOuter = true; // for mssql7 or later
+	var $poorAffectedRows = true;
+	var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # for mssql 2000
+	var $uniqueOrderBy = true;
+	var $_bindInputArray = true;
+	
+	
+	function ADODB_mssql() 
+	{		
+		$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
+	}
+
+	function ServerInfo()
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$stmt = $this->PrepareSP('sp_server_info');
+		$val = 2;
+		if ($this->fetchMode === false) {
+			$savem = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		} else 
+			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+		
+		
+		$this->Parameter($stmt,$val,'attribute_id');
+		$row = $this->GetRow($stmt);
+		
+		//$row = $this->GetRow("execute sp_server_info 2");
+		
+		if ($this->fetchMode === false) {
+			$ADODB_FETCH_MODE = $savem;
+		} else
+			$this->SetFetchMode($savem);
+		
+		$arr['description'] = $row[2];
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " ISNULL($field, $ifNull) "; // if MS SQL Server
+	}
+	
+	function _insertid()
+	{
+	// SCOPE_IDENTITY()
+	// Returns the last IDENTITY value inserted into an IDENTITY column in 
+	// the same scope. A scope is a module -- a stored procedure, trigger, 
+	// function, or batch. Thus, two statements are in the same scope if 
+	// they are in the same stored procedure, function, or batch.
+			return $this->GetOne($this->identitySQL);
+	}
+
+	function _affectedrows()
+	{
+		return $this->GetOne('select @@rowcount');
+	}
+
+	var $_dropSeqSQL = "drop table %s";
+	
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		$start -= 1;
+		$this->Execute("create table $seq (id float(53))");
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+		}
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return true;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		//$this->debug=1;
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$this->Execute("create table $seq (id float(53))");
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+			}
+			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			return $start;
+		}
+		$num = $this->GetOne("select id from $seq");
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return $num;
+		
+		// in old implementation, pre 1.90, we returned GUID...
+		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
+	}
+	
+
+	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		if ($nrows > 0 && $offset <= 0) {
+			$sql = preg_replace(
+				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
+			$rs =& $this->Execute($sql,$inputarr);
+		} else
+			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+	
+		return $rs;
+	}
+	
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '+';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "datename(yyyy,$col)";
+				break;
+			case 'M':
+				$s .= "convert(char(3),$col,0)";
+				break;
+			case 'm':
+				$s .= "replace(str(month($col),2),' ','0')";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "datename(quarter,$col)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "replace(str(day($col),2),' ','0')";
+				break;
+			case 'h':
+				$s .= "substring(convert(char(14),$col,0),13,2)";
+				break;
+			
+			case 'H':
+				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
+				break;
+				
+			case 'i':
+				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
+				break;
+			case 's':
+				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
+				break;
+			case 'a':
+			case 'A':
+				$s .= "substring(convert(char(19),$col,0),18,2)";
+				break;
+				
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+
+	
+	function BeginTrans()
+	{
+		if ($this->transOff) return true; 
+		$this->transCnt += 1;
+	   	$this->Execute('BEGIN TRAN');
+	   	return true;
+	}
+		
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('COMMIT TRAN');
+		return true;
+	}
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true; 
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('ROLLBACK TRAN');
+		return true;
+	}
+	
+	/*
+		Usage:
+		
+		$this->BeginTrans();
+		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
+		
+		# some operation on both tables table1 and table2
+		
+		$this->CommitTrans();
+		
+		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
+	*/
+	function RowLock($tables,$where) 
+	{
+		if (!$this->transCnt) $this->BeginTrans();
+		return $this->GetOne("select top 1 null as ignore from $tables with (ROWLOCK,HOLDLOCK) where $where");
+	}
+	
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$table = $this->qstr(strtoupper($table));
+		
+		$sql = 
+"select object_name(constid) as constraint_name,
+	col_name(fkeyid, fkey) as column_name,
+	object_name(rkeyid) as referenced_table_name,
+   	col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where upper(object_name(fkeyid)) = $table
+order by constraint_name, referenced_table_name, keyno";
+		
+		$constraints =& $this->GetArray($sql);
+		
+		$ADODB_FETCH_MODE = $save;
+		
+		$arr = false;
+		foreach($constraints as $constr) {
+			//print_r($constr);
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+		}
+		if (!$arr) return false;
+		
+		$arr2 = false;
+		
+		foreach($arr as $k => $v) {
+			foreach($v as $a => $b) {
+				if ($upper) $a = strtoupper($a);
+				$arr2[$a] = $b;
+			}
+		}
+		return $arr2;
+	}
+
+	//From: Fernando Moreira 
+	function MetaDatabases() 
+	{ 
+		if(@mssql_select_db("master")) { 
+				 $qry=$this->metaDatabasesSQL; 
+				 if($rs=@mssql_query($qry)){ 
+						 $tmpAr=$ar=array(); 
+						 while($tmpAr=@mssql_fetch_row($rs)) 
+								 $ar[]=$tmpAr[0]; 
+						@mssql_select_db($this->databaseName); 
+						 if(sizeof($ar)) 
+								 return($ar); 
+						 else 
+								 return(false); 
+				 } else { 
+						 @mssql_select_db($this->databaseName); 
+						 return(false); 
+				 } 
+		 } 
+		 return(false); 
+	} 
+
+	// "Stein-Aksel Basma" 
+	// tested with MSSQL 2000
+	function MetaPrimaryKeys($table)
+	{
+		$sql = "select k.column_name from information_schema.key_column_usage k,
+		information_schema.table_constraints tc 
+		where tc.constraint_name = k.constraint_name and tc.constraint_type =
+		'PRIMARY KEY' and k.table_name = '$table'";
+		
+		$a = $this->GetCol($sql);
+		if ($a && sizeof($a)>0) return $a;
+		return false;	  
+	}
+
+	
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(($mask));
+			$this->metaTablesSQL .= " AND name like $mask";
+		}
+		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+ 
+	function SelectDB($dbName) 
+	{
+		$this->databaseName = $dbName;
+		if ($this->_connectionID) {
+			return @mssql_select_db($dbName);		
+		}
+		else return false;	
+	}
+	
+	function ErrorMsg() 
+	{
+		if (empty($this->_errorMsg)){
+			$this->_errorMsg = mssql_get_last_message();
+		}
+		return $this->_errorMsg;
+	}
+	
+	function ErrorNo() 
+	{
+		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
+		if (empty($this->_errorMsg)) {
+			$this->_errorMsg = mssql_get_last_message();
+		}
+		$id = @mssql_query("select @@ERROR",$this->_connectionID);
+		if (!$id) return false;
+		$arr = mssql_fetch_array($id);
+		@mssql_free_result($id);
+		if (is_array($arr)) return $arr[0];
+	   else return -1;
+	}
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('mssql_pconnect')) return false;
+		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('mssql_pconnect')) return false;
+		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		
+		// persistent connections can forget to rollback on crash, so we do it here.
+		if ($this->autoRollback) {
+			$cnt = $this->GetOne('select @@TRANCOUNT');
+			while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
+		}
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	function Prepare($sql)
+	{
+		$sqlarr = explode('?',$sql);
+		if (sizeof($sqlarr) <= 1) return $sql;
+		$sql2 = $sqlarr[0];
+		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
+			$sql2 .=  '@P'.($i-1) . $sqlarr[$i];
+		} 
+		return array($sql,$this->qstr($sql2),$max);
+	}
+	
+	function PrepareSP($sql)
+	{
+		if (!$this->_has_mssql_init) {
+			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
+			return $sql;
+		}
+		$stmt = mssql_init($sql,$this->_connectionID);
+		if (!$stmt)  return $sql;
+		return array($sql,$stmt);
+	}
+	
+	/* 
+	Usage:
+		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
+		
+		# note that the parameter does not have @ in front!
+		$db->Parameter($stmt,$id,'myid');
+		$db->Parameter($stmt,$group,'group',false,64);
+		$db->Execute($stmt);
+		
+		@param $stmt Statement returned by Prepare() or PrepareSP().
+		@param $var PHP variable to bind to. Can set to null (for isNull support).
+		@param $name Name of stored procedure variable name to bind to.
+		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
+		@param [$maxLen] Holds an maximum length of the variable.
+		@param [$type] The data type of $var. Legal values depend on driver.
+		
+		See mssql_bind documentation at php.net.
+	*/
+	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
+	{
+		if (!$this->_has_mssql_init) {
+			ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0");
+			return $sql;
+		}
+
+		$isNull = is_null($var); // php 4.0.4 and above...
+			
+		if ($type === false) 
+			switch(gettype($var)) {
+			default:
+			case 'string': $type = SQLCHAR; break;
+			case 'double': $type = SQLFLT8; break;
+			case 'integer': $type = SQLINT4; break;
+			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
+			}
+		
+		if  ($this->debug) {
+			$prefix = ($isOutput) ? 'Out' : 'In';
+			$ztype = (empty($type)) ? 'false' : $type;
+			ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
+		}
+		/*
+			See http://phplens.com/lens/lensforum/msgs.php?id=7231
+			
+			RETVAL is HARD CODED into php_mssql extension:
+			The return value (a long integer value) is treated like a special OUTPUT parameter, 
+			called "RETVAL" (without the @). See the example at mssql_execute to 
+			see how it works. - type: one of this new supported PHP constants. 
+				SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 
+		*/
+		if ($name !== 'RETVAL') $name = '@'.$name;
+		return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen);
+	}
+	
+	/* 
+		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
+		So all your blobs must be of type "image".
+		
+		Remember to set in php.ini the following...
+		
+		; Valid range 0 - 2147483647. Default = 4096. 
+		mssql.textlimit = 0 ; zero to pass through 
+
+		; Valid range 0 - 2147483647. Default = 4096. 
+		mssql.textsize = 0 ; zero to pass through 
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
+		return $this->Execute($sql) != false;
+	}
+	
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr)
+	{
+		$this->_errorMsg = false;
+		if (is_array($inputarr)) {
+			
+			# bind input params with sp_executesql: 
+			# see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
+			# works only with sql server 7 and newer
+			if (!is_array($sql)) $sql = $this->Prepare($sql);
+			$params = '';
+			$decl = '';
+			$i = 0;
+			foreach($inputarr as $v) {
+				if ($decl) {
+					$decl .= ', ';
+					$params .= ', ';
+				}	
+				if (is_string($v)) {
+					$len = strlen($v);
+					if ($len == 0) $len = 1;
+					
+					if ($len > 4000 ) {
+						// NVARCHAR is max 4000 chars. Let's use NTEXT
+						$decl .= "@P$i NTEXT";
+					} else {
+						$decl .= "@P$i NVARCHAR($len)";
+					}
+
+					$params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
+				} else if (is_integer($v)) {
+					$decl .= "@P$i INT";
+					$params .= "@P$i=".$v;
+				} else {
+					$decl .= "@P$i FLOAT";
+					$params .= "@P$i=".$v;
+				}
+				$i += 1;
+			}
+			$decl = $this->qstr($decl);
+			if ($this->debug) ADOConnection::outp("sp_executesql N{$sql[1]},N$decl,$params");
+			$rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params");
+			
+		} else if (is_array($sql)) {
+			# PrepareSP()
+			$rez = mssql_execute($sql[1]);
+			
+		} else {
+			$rez = mssql_query($sql,$this->_connectionID);
+		}
+		return $rez;
+	}
+	
+	// returns true or false
+	function _close()
+	{ 
+		if ($this->transCnt) $this->RollbackTrans();
+		$rez = @mssql_close($this->_connectionID);
+		$this->_connectionID = false;
+		return $rez;
+	}
+	
+	// mssql uses a default date like Dec 30 2000 12:00AM
+	function UnixDate($v)
+	{
+		return ADORecordSet_array_mssql::UnixDate($v);
+	}
+	
+	function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_mssql::UnixTimeStamp($v);
+	}	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_mssql extends ADORecordSet {	
+
+	var $databaseType = "mssql";
+	var $canSeek = true;
+	var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083
+	// _mths works only in non-localised system
+	
+	function ADORecordset_mssql($id,$mode=false)
+	{
+		// freedts check...
+		$this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
+
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		return $this->ADORecordSet($id,$mode);
+	}
+	
+	
+	function _initrs()
+	{
+	GLOBAL $ADODB_COUNTRECS;	
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @mssql_num_fields($this->_queryID);
+	}
+	
+
+	//Contributed by "Sven Axelsson" 
+	// get next resultset - requires PHP 4.0.5 or later
+	function NextRecordSet()
+	{
+		if (!mssql_next_result($this->_queryID)) return false;
+		$this->_inited = false;
+		$this->bind = false;
+		$this->_currentRow = -1;
+		$this->Init();
+		return true;
+	}
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	/*	Returns: an object containing field information. 
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+
+	function FetchField($fieldOffset = -1) 
+	{
+		if ($fieldOffset != -1) {
+			return @mssql_fetch_field($this->_queryID, $fieldOffset);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			return @mssql_fetch_field($this->_queryID);
+		}
+		return null;
+	}
+	
+	function _seek($row) 
+	{
+		return @mssql_data_seek($this->_queryID, $row);
+	}
+
+	// speedup
+	function MoveNext() 
+	{
+		if ($this->EOF) return false;
+		
+		$this->_currentRow++;
+		
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			if ($this->fetchMode & ADODB_FETCH_NUM) {
+				//ADODB_FETCH_BOTH mode
+				$this->fields = @mssql_fetch_array($this->_queryID);
+			}
+			else {
+				if ($this->hasFetchAssoc) {// only for PHP 4.2.0 or later
+					 $this->fields = @mssql_fetch_assoc($this->_queryID);
+				} else {
+					$flds = @mssql_fetch_array($this->_queryID);
+					if (is_array($flds)) {
+						$fassoc = array();
+						foreach($flds as $k => $v) {
+							if (is_numeric($k)) continue;
+							$fassoc[$k] = $v;
+						}
+						$this->fields = $fassoc;
+					} else
+						$this->fields = false;
+				}
+			}
+			
+			if (is_array($this->fields)) {
+				if (ADODB_ASSOC_CASE == 0) {
+					foreach($this->fields as $k=>$v) {
+						$this->fields[strtolower($k)] = $v;
+					}
+				} else if (ADODB_ASSOC_CASE == 1) {
+					foreach($this->fields as $k=>$v) {
+						$this->fields[strtoupper($k)] = $v;
+					}
+				}
+			}
+		} else {
+			$this->fields = @mssql_fetch_row($this->_queryID);
+		}
+		if ($this->fields) return true;
+		$this->EOF = true;
+		
+		return false;
+	}
+
+	
+	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
+	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
+	function _fetch($ignore_fields=false) 
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			if ($this->fetchMode & ADODB_FETCH_NUM) {
+				//ADODB_FETCH_BOTH mode
+				$this->fields = @mssql_fetch_array($this->_queryID);
+			} else {
+				if ($this->hasFetchAssoc) // only for PHP 4.2.0 or later
+					$this->fields = @mssql_fetch_assoc($this->_queryID);
+				else {
+					$this->fields = @mssql_fetch_array($this->_queryID);
+					if (is_array($$this->fields)) {
+						$fassoc = array();
+						foreach($$this->fields as $k => $v) {
+							if (is_integer($k)) continue;
+							$fassoc[$k] = $v;
+						}
+						$this->fields = $fassoc;
+					}
+				}
+			}
+			
+			if (!$this->fields) {
+			} else if (ADODB_ASSOC_CASE == 0) {
+				foreach($this->fields as $k=>$v) {
+					$this->fields[strtolower($k)] = $v;
+				}
+			} else if (ADODB_ASSOC_CASE == 1) {
+				foreach($this->fields as $k=>$v) {
+					$this->fields[strtoupper($k)] = $v;
+				}
+			}
+		} else {
+			$this->fields = @mssql_fetch_row($this->_queryID);
+		}
+		return $this->fields;
+	}
+	
+	/*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+
+	function _close() 
+	{
+		$rez = mssql_free_result($this->_queryID);	
+		$this->_queryID = false;
+		return $rez;
+	}
+	// mssql uses a default date like Dec 30 2000 12:00AM
+	function UnixDate($v)
+	{
+		return ADORecordSet_array_mssql::UnixDate($v);
+	}
+	
+	function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_mssql::UnixTimeStamp($v);
+	}
+	
+}
+
+
+class ADORecordSet_array_mssql extends ADORecordSet_array {
+	function ADORecordSet_array_mssql($id=-1,$mode=false) 
+	{
+		$this->ADORecordSet_array($id,$mode);
+	}
+	
+		// mssql uses a default date like Dec 30 2000 12:00AM
+	function UnixDate($v)
+	{
+	
+		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
+		
+	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+	
+		//Dec 30 2000 12:00AM 
+		if ($ADODB_mssql_date_order == 'dmy') {
+			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+				return parent::UnixDate($v);
+			}
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			
+			$theday = $rr[1];
+			$themth =  substr(strtoupper($rr[2]),0,3);
+		} else {
+			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+				return parent::UnixDate($v);
+			}
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			
+			$theday = $rr[2];
+			$themth = substr(strtoupper($rr[1]),0,3);
+		}
+		$themth = $ADODB_mssql_mths[$themth];
+		if ($themth <= 0) return false;
+		// h-m-s-MM-DD-YY
+		return  mktime(0,0,0,$themth,$theday,$rr[3]);
+	}
+	
+	function UnixTimeStamp($v)
+	{
+	
+		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
+		
+	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+	
+		//Dec 30 2000 12:00AM
+		 if ($ADODB_mssql_date_order == 'dmy') {
+			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+			$theday = $rr[1];
+			$themth =  substr(strtoupper($rr[2]),0,3);
+		} else {
+			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+			$theday = $rr[2];
+			$themth = substr(strtoupper($rr[1]),0,3);
+		}
+		
+		$themth = $ADODB_mssql_mths[$themth];
+		if ($themth <= 0) return false;
+		
+		switch (strtoupper($rr[6])) {
+		case 'P':
+			if ($rr[4]<12) $rr[4] += 12;
+			break;
+		case 'A':
+			if ($rr[4]==12) $rr[4] = 0;
+			break;
+		default:
+			break;
+		}
+		// h-m-s-MM-DD-YY
+		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
+	}
+}
+
+/*
+Code Example 1:
+
+select 	object_name(constid) as constraint_name,
+       	object_name(fkeyid) as table_name, 
+        col_name(fkeyid, fkey) as column_name,
+	object_name(rkeyid) as referenced_table_name,
+   	col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where object_name(fkeyid) = x
+order by constraint_name, table_name, referenced_table_name,  keyno
+
+Code Example 2:
+select 	constraint_name,
+	column_name,
+	ordinal_position
+from information_schema.key_column_usage
+where constraint_catalog = db_name()
+and table_name = x
+order by constraint_name, ordinal_position
+
+http://www.databasejournal.com/scripts/article.php/1440551
+*/
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-mssqlpo.inc.php b/lib/adodb/drivers/adodb-mssqlpo.inc.php
index d727def5fe0..4eca7226724 100644
--- a/lib/adodb/drivers/adodb-mssqlpo.inc.php
+++ b/lib/adodb/drivers/adodb-mssqlpo.inc.php
@@ -1,59 +1,59 @@
-_has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
-			return $sql;
-		}
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		$stmt = mssql_init($sql,$this->_connectionID);
-		if (!$stmt)  return $sql;
-		return array($sql,$stmt);
-	}
-	
-	function _query($sql,$inputarr)
-	{
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		return ADODB_mssql::_query($sql,$inputarr);
-	}
-}
-
-class ADORecordset_mssqlpo extends ADORecordset_mssql {
-	var $databaseType = "mssqlpo";
-	function ADORecordset_mssqlpo($id,$mode=false)
-	{
-		$this->ADORecordset_mssql($id,$mode);
-	}
-}
+_has_mssql_init) {
+			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
+			return $sql;
+		}
+		if (is_string($sql)) $sql = str_replace('||','+',$sql);
+		$stmt = mssql_init($sql,$this->_connectionID);
+		if (!$stmt)  return $sql;
+		return array($sql,$stmt);
+	}
+	
+	function _query($sql,$inputarr)
+	{
+		if (is_string($sql)) $sql = str_replace('||','+',$sql);
+		return ADODB_mssql::_query($sql,$inputarr);
+	}
+}
+
+class ADORecordset_mssqlpo extends ADORecordset_mssql {
+	var $databaseType = "mssqlpo";
+	function ADORecordset_mssqlpo($id,$mode=false)
+	{
+		$this->ADORecordset_mssql($id,$mode);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-mysql.inc.php b/lib/adodb/drivers/adodb-mysql.inc.php
index e5b79ad631c..354845a010a 100644
--- a/lib/adodb/drivers/adodb-mysql.inc.php
+++ b/lib/adodb/drivers/adodb-mysql.inc.php
@@ -1,671 +1,671 @@
-metaTablesSQL;
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        
-        // get index details
-        $rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
-        
-        // restore fetchmode
-        if (isset($savem)) {
-                $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        if (!is_object($rs)) {
-                return FALSE;
-        }
-        
-        $indexes = array ();
-        
-        // parse index data into array
-        while ($row = $rs->FetchRow()) {
-                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-                        continue;
-                }
-                
-                if (!isset($indexes[$row[2]])) {
-                        $indexes[$row[2]] = array(
-                                'unique' => ($row[1] == 0),
-                                'columns' => array()
-                        );
-                }
-                
-                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-        }
-        
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index )
-        {
-                ksort ($indexes[$index]['columns']);
-        }
-        
-        return $indexes;
-	}
-
-	
-	// if magic quotes disabled, use mysql_real_escape_string()
-	function qstr($s,$magic_quotes=false)
-	{
-		if (!$magic_quotes) {
-		
-			if (ADODB_PHPVER >= 0x4300) {
-				if (is_resource($this->_connectionID))
-					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
-			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
-	}
-	
-	function _insertid()
-	{
-		return mysql_insert_id($this->_connectionID);
-	}
-	
-	function GetOne($sql,$inputarr=false)
-	{
-		$rs =& $this->SelectLimit($sql,1,-1,$inputarr);
-		if ($rs) {
-			$rs->Close();
-			if ($rs->EOF) return false;
-			return reset($rs->fields);
-		}
-		
-		return false;
-	}
-	
-	function _affectedrows()
-	{
-			return mysql_affected_rows($this->_connectionID);
-	}
-  
- 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
-	// Reference on Last_Insert_ID on the recommended way to simulate sequences
- 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
-	var $_genSeqSQL = "create table %s (id int not null)";
-	var $_genSeq2SQL = "insert into %s values (%s)";
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$u = strtoupper($seqname);
-		
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-	}
-	
-
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		// post-nuke sets hasGenID to false
-		if (!$this->hasGenID) return false;
-		
-		$savelog = $this->_logsql;
-		$this->_logsql = false;
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		$holdtransOK = $this->_transOK; // save the current status
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
-			$u = strtoupper($seqname);
-			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
-			$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-			$rs = $this->Execute($getnext);
-		}
-		$this->genID = mysql_insert_id($this->_connectionID);
-		
-		if ($rs) $rs->Close();
-		
-		$this->_logsql = $savelog;
-		return $this->genID;
-	}
-	
-  	function &MetaDatabases()
-	{
-		$qid = mysql_list_dbs($this->_connectionID);
-		$arr = array();
-		$i = 0;
-		$max = mysql_num_rows($qid);
-		while ($i < $max) {
-			$db = mysql_tablename($qid,$i);
-			if ($db != 'mysql') $arr[] = $db;
-			$i += 1;
-		}
-		return $arr;
-	}
-	
-		
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'DATE_FORMAT('.$col.",'";
-		$concat = false;
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= '%Y';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "'),Quarter($col)";
-				
-				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-				else $s .= ",('";
-				$concat = true;
-				break;
-			case 'M':
-				$s .= '%b';
-				break;
-				
-			case 'm':
-				$s .= '%m';
-				break;
-			case 'D':
-			case 'd':
-				$s .= '%d';
-				break;
-			
-			case 'H': 
-				$s .= '%H';
-				break;
-				
-			case 'h':
-				$s .= '%I';
-				break;
-				
-			case 'i':
-				$s .= '%i';
-				break;
-				
-			case 's':
-				$s .= '%s';
-				break;
-				
-			case 'a':
-			case 'A':
-				$s .= '%p';
-				break;
-				
-			default:
-				
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $ch;
-				break;
-			}
-		}
-		$s.="')";
-		if ($concat) $s = "CONCAT($s)";
-		return $s;
-	}
-	
-
-	// returns concatenated string
-	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		
-		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
-		if (strlen($s) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		return "from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect,$this->clientFlags);
-		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect);
-		else
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
-	
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
-		else
-			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($this->autoRollback) $this->RollbackTrans();
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->forceNewConnect = true;
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
-	}
-	
- 	function &MetaColumns($table) 
-	{
-	
-		if ($this->metaColumnsSQL) {
-		global $ADODB_FETCH_MODE;
-		
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			if ($rs === false) return false;
-			
-			$retarr = array();
-			while (!$rs->EOF){
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$type = $rs->fields[1];
-				
-				
-				// split type into type(length):
-				$fld->scale = null;
-				if (strpos($type,',') && preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
-					$fld->type = $query_array[1];
-					$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-					$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
-				} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
-					$fld->type = $query_array[1];
-					$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-				} else {
-					$fld->max_length = -1;
-					$fld->type = $type;
-				}
-				/*
-				// split type into type(length):
-				if (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
-					$fld->type = $query_array[1];
-					$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-				} else {
-					$fld->max_length = -1;
-					$fld->type = $type;
-				}*/
-				$fld->not_null = ($rs->fields[2] != 'YES');
-				$fld->primary_key = ($rs->fields[3] == 'PRI');
-				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-				$fld->binary = (strpos($fld->type,'blob') !== false);
-				
-				if (!$fld->binary) {
-					$d = $rs->fields[4];
-					if ($d != "" && $d != "NULL") {
-						$fld->has_default = true;
-						$fld->default_value = $d;
-					} else {
-						$fld->has_default = false;
-					}
-				}
-				if ($save == ADODB_FETCH_NUM) $retarr[] = $fld;	
-				else $retarr[strtoupper($fld->name)] = $fld;
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return false;
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-		$this->databaseName = $dbName;
-		if ($this->_connectionID) {
-			return @mysql_select_db($dbName,$this->_connectionID);		
-		}
-		else return false;	
-	}
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
-	{
-		$offsetStr =($offset>=0) ? "$offset," : '';
-		
-		if ($secs)
-			$rs =& $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
-		else
-			$rs =& $this->Execute($sql." LIMIT $offsetStr$nrows",$inputarr);
-		return $rs;
-	}
-	
-	
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-	//global $ADODB_COUNTRECS;
-		//if($ADODB_COUNTRECS) 
-		return mysql_query($sql,$this->_connectionID);
-		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-	
-		if ($this->_logsql) return $this->_errorMsg;
-		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
-		else $this->_errorMsg = @mysql_error($this->_connectionID);
-		return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		if ($this->_logsql) return $this->_errorCode;
-		if (empty($this->_connectionID))  return @mysql_errno();
-		else return @mysql_errno($this->_connectionID);
-	}
-	
-
-	
-	// returns true or false
-	function _close()
-	{
-		@mysql_close($this->_connectionID);
-		$this->_connectionID = false;
-	}
-
-	
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 255; 
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-		return 4294967295; 
-	}
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_mysql extends ADORecordSet{	
-	
-	var $databaseType = "mysql";
-	var $canSeek = true;
-	
-	function ADORecordSet_mysql($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		default:
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = MYSQL_BOTH; break;
-		}
-	
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function _initrs()
-	{
-	//GLOBAL $ADODB_COUNTRECS;
-	//	$this->_numOfRows = ($ADODB_COUNTRECS) ? @mysql_num_rows($this->_queryID):-1;
-		$this->_numOfRows = @mysql_num_rows($this->_queryID);
-		$this->_numOfFields = @mysql_num_fields($this->_queryID);
-	}
-	
-	function &FetchField($fieldOffset = -1) 
-	{	
-	
-		if ($fieldOffset != -1) {
-			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
-			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
-			$o->max_length = @mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson (jnich@att.com)
-			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
-			$o->binary = (strpos($f,'binary')!== false);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @mysql_fetch_field($this->_queryID);
-			$o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich@att.com)
-			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
-		}
-			
-		return $o;
-	}
-
-	function &GetRowAssoc($upper=true)
-	{
-		if ($this->fetchMode == MYSQL_ASSOC && !$upper) return $this->fields;
-		$row =& ADORecordSet::GetRowAssoc($upper);
-		return $row;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{	
-		// added @ by "Michael William Miller" 
-		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	function _seek($row)
-	{
-		if ($this->_numOfRows == 0) return false;
-		return @mysql_data_seek($this->_queryID,$row);
-	}
-	
-	
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return adodb_movenext($this);
-	
-		if ($this->EOF) return false;
-				
-		$this->_currentRow++;
-		$this->fields = @mysql_fetch_array($this->_queryID,$this->fetchMode);
-		if (is_array($this->fields)) return true;
-		
-		$this->EOF = true;
-		
-		/* -- tested raising an error -- appears pointless
-		$conn = $this->connection;
-		if ($conn && $conn->raiseErrorFn && ($errno = $conn->ErrorNo())) {
-			$fn = $conn->raiseErrorFn;
-			$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' ('.$this->sql.')',$conn->host,$conn->database);
-		}
-		*/
-		return false;
-	}	
-	
-	function _fetch()
-	{
-		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
-		return is_array($this->fields);
-	}
-	
-	function _close() {
-		@mysql_free_result($this->_queryID);	
-		$this->_queryID = false;	
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'STRING': 
-		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET': 
-			if ($len <= $this->blobSize) return 'C';
-			
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-			return 'X';
-			
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'YEAR':
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		case 'SMALLINT': 
-			
-			if (!empty($fieldobj->primary_key)) return 'R';
-			else return 'I';
-		
-		default: return 'N';
-		}
-	}
-
-}
-}
+metaTablesSQL;
+			$mask = $this->qstr($mask);
+			$this->metaTablesSQL .= " like $mask";
+		}
+		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	
+	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+	{
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+        
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+        
+        // get index details
+        $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
+        
+        // restore fetchmode
+        if (isset($savem)) {
+                $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+        
+        if (!is_object($rs)) {
+                return FALSE;
+        }
+        
+        $indexes = array ();
+        
+        // parse index data into array
+        while ($row = $rs->FetchRow()) {
+                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+                        continue;
+                }
+                
+                if (!isset($indexes[$row[2]])) {
+                        $indexes[$row[2]] = array(
+                                'unique' => ($row[1] == 0),
+                                'columns' => array()
+                        );
+                }
+                
+                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
+        }
+        
+        // sort columns by order in the index
+        foreach ( array_keys ($indexes) as $index )
+        {
+                ksort ($indexes[$index]['columns']);
+        }
+        
+        return $indexes;
+	}
+
+	
+	// if magic quotes disabled, use mysql_real_escape_string()
+	function qstr($s,$magic_quotes=false)
+	{
+		if (!$magic_quotes) {
+		
+			if (ADODB_PHPVER >= 0x4300) {
+				if (is_resource($this->_connectionID))
+					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
+			}
+			if ($this->replaceQuote[0] == '\\'){
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		return "'$s'";
+	}
+	
+	function _insertid()
+	{
+		return mysql_insert_id($this->_connectionID);
+	}
+	
+	function GetOne($sql,$inputarr=false)
+	{
+		$rs =& $this->SelectLimit($sql,1,-1,$inputarr);
+		if ($rs) {
+			$rs->Close();
+			if ($rs->EOF) return false;
+			return reset($rs->fields);
+		}
+		
+		return false;
+	}
+	
+	function _affectedrows()
+	{
+			return mysql_affected_rows($this->_connectionID);
+	}
+  
+ 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
+	// Reference on Last_Insert_ID on the recommended way to simulate sequences
+ 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
+	var $_genSeqSQL = "create table %s (id int not null)";
+	var $_genSeq2SQL = "insert into %s values (%s)";
+	var $_dropSeqSQL = "drop table %s";
+	
+	function CreateSequence($seqname='adodbseq',$startID=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$u = strtoupper($seqname);
+		
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+	}
+	
+
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		// post-nuke sets hasGenID to false
+		if (!$this->hasGenID) return false;
+		
+		$savelog = $this->_logsql;
+		$this->_logsql = false;
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		$holdtransOK = $this->_transOK; // save the current status
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
+			$u = strtoupper($seqname);
+			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
+			$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+			$rs = $this->Execute($getnext);
+		}
+		$this->genID = mysql_insert_id($this->_connectionID);
+		
+		if ($rs) $rs->Close();
+		
+		$this->_logsql = $savelog;
+		return $this->genID;
+	}
+	
+  	function &MetaDatabases()
+	{
+		$qid = mysql_list_dbs($this->_connectionID);
+		$arr = array();
+		$i = 0;
+		$max = mysql_num_rows($qid);
+		while ($i < $max) {
+			$db = mysql_tablename($qid,$i);
+			if ($db != 'mysql') $arr[] = $db;
+			$i += 1;
+		}
+		return $arr;
+	}
+	
+		
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = 'DATE_FORMAT('.$col.",'";
+		$concat = false;
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= '%Y';
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "'),Quarter($col)";
+				
+				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+				else $s .= ",('";
+				$concat = true;
+				break;
+			case 'M':
+				$s .= '%b';
+				break;
+				
+			case 'm':
+				$s .= '%m';
+				break;
+			case 'D':
+			case 'd':
+				$s .= '%d';
+				break;
+			
+			case 'H': 
+				$s .= '%H';
+				break;
+				
+			case 'h':
+				$s .= '%I';
+				break;
+				
+			case 'i':
+				$s .= '%i';
+				break;
+				
+			case 's':
+				$s .= '%s';
+				break;
+				
+			case 'a':
+			case 'A':
+				$s .= '%p';
+				break;
+				
+			default:
+				
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $ch;
+				break;
+			}
+		}
+		$s.="')";
+		if ($concat) $s = "CONCAT($s)";
+		return $s;
+	}
+	
+
+	// returns concatenated string
+	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+		
+		// suggestion by andrew005@mnogo.ru
+		$s = implode(',',$arr); 
+		if (strlen($s) > 0) return "CONCAT($s)";
+		else return '';
+	}
+	
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) $date = $this->sysDate;
+		return "from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
+	}
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (ADODB_PHPVER >= 0x4300)
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect,$this->clientFlags);
+		else if (ADODB_PHPVER >= 0x4200)
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect);
+		else
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
+	
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (ADODB_PHPVER >= 0x4300)
+			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
+		else
+			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($this->autoRollback) $this->RollbackTrans();
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->forceNewConnect = true;
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+	}
+	
+ 	function &MetaColumns($table) 
+	{
+	
+		if ($this->metaColumnsSQL) {
+		global $ADODB_FETCH_MODE;
+		
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+			
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+			
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			
+			if ($rs === false) return false;
+			
+			$retarr = array();
+			while (!$rs->EOF){
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$type = $rs->fields[1];
+				
+				
+				// split type into type(length):
+				$fld->scale = null;
+				if (strpos($type,',') && preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
+					$fld->type = $query_array[1];
+					$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+					$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
+				} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
+					$fld->type = $query_array[1];
+					$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+				} else {
+					$fld->max_length = -1;
+					$fld->type = $type;
+				}
+				/*
+				// split type into type(length):
+				if (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
+					$fld->type = $query_array[1];
+					$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+				} else {
+					$fld->max_length = -1;
+					$fld->type = $type;
+				}*/
+				$fld->not_null = ($rs->fields[2] != 'YES');
+				$fld->primary_key = ($rs->fields[3] == 'PRI');
+				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
+				$fld->binary = (strpos($fld->type,'blob') !== false);
+				
+				if (!$fld->binary) {
+					$d = $rs->fields[4];
+					if ($d != "" && $d != "NULL") {
+						$fld->has_default = true;
+						$fld->default_value = $d;
+					} else {
+						$fld->has_default = false;
+					}
+				}
+				if ($save == ADODB_FETCH_NUM) $retarr[] = $fld;	
+				else $retarr[strtoupper($fld->name)] = $fld;
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+		
+	// returns true or false
+	function SelectDB($dbName) 
+	{
+		$this->databaseName = $dbName;
+		if ($this->_connectionID) {
+			return @mysql_select_db($dbName,$this->_connectionID);		
+		}
+		else return false;	
+	}
+	
+	// parameters use PostgreSQL convention, not MySQL
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
+	{
+		$offsetStr =($offset>=0) ? "$offset," : '';
+		
+		if ($secs)
+			$rs =& $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
+		else
+			$rs =& $this->Execute($sql." LIMIT $offsetStr$nrows",$inputarr);
+		return $rs;
+	}
+	
+	
+	// returns queryID or false
+	function _query($sql,$inputarr)
+	{
+	//global $ADODB_COUNTRECS;
+		//if($ADODB_COUNTRECS) 
+		return mysql_query($sql,$this->_connectionID);
+		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+	
+		if ($this->_logsql) return $this->_errorMsg;
+		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
+		else $this->_errorMsg = @mysql_error($this->_connectionID);
+		return $this->_errorMsg;
+	}
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	{
+		if ($this->_logsql) return $this->_errorCode;
+		if (empty($this->_connectionID))  return @mysql_errno();
+		else return @mysql_errno($this->_connectionID);
+	}
+	
+
+	
+	// returns true or false
+	function _close()
+	{
+		@mysql_close($this->_connectionID);
+		$this->_connectionID = false;
+	}
+
+	
+	/*
+	* Maximum size of C field
+	*/
+	function CharMax()
+	{
+		return 255; 
+	}
+	
+	/*
+	* Maximum size of X field
+	*/
+	function TextMax()
+	{
+		return 4294967295; 
+	}
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_mysql extends ADORecordSet{	
+	
+	var $databaseType = "mysql";
+	var $canSeek = true;
+	
+	function ADORecordSet_mysql($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+		default:
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:$this->fetchMode = MYSQL_BOTH; break;
+		}
+	
+		$this->ADORecordSet($queryID);	
+	}
+	
+	function _initrs()
+	{
+	//GLOBAL $ADODB_COUNTRECS;
+	//	$this->_numOfRows = ($ADODB_COUNTRECS) ? @mysql_num_rows($this->_queryID):-1;
+		$this->_numOfRows = @mysql_num_rows($this->_queryID);
+		$this->_numOfFields = @mysql_num_fields($this->_queryID);
+	}
+	
+	function &FetchField($fieldOffset = -1) 
+	{	
+	
+		if ($fieldOffset != -1) {
+			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
+			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
+			$o->max_length = @mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson (jnich@att.com)
+			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
+			$o->binary = (strpos($f,'binary')!== false);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$o = @mysql_fetch_field($this->_queryID);
+			$o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich@att.com)
+			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
+		}
+			
+		return $o;
+	}
+
+	function &GetRowAssoc($upper=true)
+	{
+		if ($this->fetchMode == MYSQL_ASSOC && !$upper) return $this->fields;
+		$row =& ADORecordSet::GetRowAssoc($upper);
+		return $row;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{	
+		// added @ by "Michael William Miller" 
+		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
+		
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	function _seek($row)
+	{
+		if ($this->_numOfRows == 0) return false;
+		return @mysql_data_seek($this->_queryID,$row);
+	}
+	
+	
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return adodb_movenext($this);
+	
+		if ($this->EOF) return false;
+				
+		$this->_currentRow++;
+		$this->fields = @mysql_fetch_array($this->_queryID,$this->fetchMode);
+		if (is_array($this->fields)) return true;
+		
+		$this->EOF = true;
+		
+		/* -- tested raising an error -- appears pointless
+		$conn = $this->connection;
+		if ($conn && $conn->raiseErrorFn && ($errno = $conn->ErrorNo())) {
+			$fn = $conn->raiseErrorFn;
+			$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' ('.$this->sql.')',$conn->host,$conn->database);
+		}
+		*/
+		return false;
+	}	
+	
+	function _fetch()
+	{
+		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
+		return is_array($this->fields);
+	}
+	
+	function _close() {
+		@mysql_free_result($this->_queryID);	
+		$this->_queryID = false;	
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'STRING': 
+		case 'CHAR':
+		case 'VARCHAR': 
+		case 'TINYBLOB': 
+		case 'TINYTEXT': 
+		case 'ENUM': 
+		case 'SET': 
+			if ($len <= $this->blobSize) return 'C';
+			
+		case 'TEXT':
+		case 'LONGTEXT': 
+		case 'MEDIUMTEXT':
+			return 'X';
+			
+		// php_mysql extension always returns 'blob' even if 'text'
+		// so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+			return !empty($fieldobj->binary) ? 'B' : 'X';
+			
+		case 'YEAR':
+		case 'DATE': return 'D';
+		
+		case 'TIME':
+		case 'DATETIME':
+		case 'TIMESTAMP': return 'T';
+		
+		case 'INT': 
+		case 'INTEGER':
+		case 'BIGINT':
+		case 'TINYINT':
+		case 'MEDIUMINT':
+		case 'SMALLINT': 
+			
+			if (!empty($fieldobj->primary_key)) return 'R';
+			else return 'I';
+		
+		default: return 'N';
+		}
+	}
+
+}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-mysqli.inc.php b/lib/adodb/drivers/adodb-mysqli.inc.php
index a9daa02e482..28ecd594793 100644
--- a/lib/adodb/drivers/adodb-mysqli.inc.php
+++ b/lib/adodb/drivers/adodb-mysqli.inc.php
@@ -1,828 +1,828 @@
-GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	
-	function BeginTrans()
-	{	  
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->Execute('SET AUTOCOMMIT=0');
-		$this->Execute('BEGIN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	// if magic quotes disabled, use mysql_real_escape_string()
-	// From readme.htm:
-	// Quotes a string to be sent to the database. The $magic_quotes_enabled
-	// parameter may look funny, but the idea is if you are quoting a 
-	// string extracted from a POST/GET variable, then 
-	// pass get_magic_quotes_gpc() as the second parameter. This will 
-	// ensure that the variable is not quoted twice, once by qstr and once 
-	// by the magic_quotes_gpc.
-	//
-	//Eg. $s = $db->qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());
-	function qstr($s, $magic_quotes = false)
-	{
-	  if (!$magic_quotes) {
-	    if (ADODB_PHPVER >= 0x5000) {
-	    //  $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
-	      return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";
-	    }
-	    else
-	      {
-		trigger_error("phpver < 5 not implemented", E_USER_ERROR);
-	      }
-	    
-	    if ($this->replaceQuote[0] == '\\')
-	      {
-		$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-	      }
-	    return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-	  }
-	  // undo magic quotes for "
-	  $s = str_replace('\\"','"',$s);
-	  return "'$s'";
-	}
-	
-	function _insertid()
-	{
-//	  $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
-	  $result = @mysqli_insert_id($this->_connectionID);
-	  if ($result == -1){
-	      if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : "  . $this->ErrorMsg());
-	  }
-	  return $result;
-	}
-	
-	// Only works for INSERT, UPDATE and DELETE query's
-	function _affectedrows()
-	{
-	//  $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
-	  $result =  @mysqli_affected_rows($this->_connectionID);
-	  if ($result == -1) {
-	      if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : "  . $this->ErrorMsg());
-	  }
-	  return $result;
-	}
-  
- 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
-	// Reference on Last_Insert_ID on the recommended way to simulate sequences
- 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
-	var $_genSeqSQL = "create table %s (id int not null)";
-	var $_genSeq2SQL = "insert into %s values (%s)";
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$u = strtoupper($seqname);
-		
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-	}
-	
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		// post-nuke sets hasGenID to false
-		if (!$this->hasGenID) return false;
-		
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		$holdtransOK = $this->_transOK; // save the current status
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
-			$u = strtoupper($seqname);
-			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
-			$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-			$rs = $this->Execute($getnext);
-		}
-		$this->genID = mysqli_insert_id($this->_connectionID);
-		
-		if ($rs) $rs->Close();
-		
-		return $this->genID;
-	}
-	
-  	function &MetaDatabases()
-	  {
-	    $query = "SHOW DATABASES";
-	    $ret =& $this->Execute($query);
-		return $ret;
-	  }
-
-	  
-	function &MetaIndexes ($table, $primary = FALSE)
-	{
-	        // save old fetch mode
-	        global $ADODB_FETCH_MODE;
-	        
-	        $save = $ADODB_FETCH_MODE;
-	        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	        if ($this->fetchMode !== FALSE) {
-	               $savem = $this->SetFetchMode(FALSE);
-	        }
-	        
-	        // get index details
-	        $rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
-	        
-	        // restore fetchmode
-	        if (isset($savem)) {
-	                $this->SetFetchMode($savem);
-	        }
-	        $ADODB_FETCH_MODE = $save;
-	        
-	        if (!is_object($rs)) {
-	                return FALSE;
-	        }
-	        
-	        $indexes = array ();
-	        
-	        // parse index data into array
-	        while ($row = $rs->FetchRow()) {
-	                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-	                        continue;
-	                }
-	                
-	                if (!isset($indexes[$row[2]])) {
-	                        $indexes[$row[2]] = array(
-	                                'unique' => ($row[1] == 0),
-	                                'columns' => array()
-	                        );
-	                }
-	                
-	                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-	        }
-	        
-	        // sort columns by order in the index
-	        foreach ( array_keys ($indexes) as $index )
-	        {
-	                ksort ($indexes[$index]['columns']);
-	        }
-	        
-	        return $indexes;
-	}
-
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'DATE_FORMAT('.$col.",'";
-		$concat = false;
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= '%Y';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "'),Quarter($col)";
-				
-				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-				else $s .= ",('";
-				$concat = true;
-				break;
-			case 'M':
-				$s .= '%b';
-				break;
-				
-			case 'm':
-				$s .= '%m';
-				break;
-			case 'D':
-			case 'd':
-				$s .= '%d';
-				break;
-			
-			case 'H': 
-				$s .= '%H';
-				break;
-				
-			case 'h':
-				$s .= '%I';
-				break;
-				
-			case 'i':
-				$s .= '%i';
-				break;
-				
-			case 's':
-				$s .= '%s';
-				break;
-				
-			case 'a':
-			case 'A':
-				$s .= '%p';
-				break;
-				
-			default:
-				
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $ch;
-				break;
-			}
-		}
-		$s.="')";
-		if ($concat) $s = "CONCAT($s)";
-		return $s;
-	}
-	
-	// returns concatenated string
-	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		
-		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
-		if (strlen($s) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	// dayFraction is a day in floating point
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) 
-		  $date = $this->sysDate;
-		return "from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
-	}
-	
-	// returns true or false
-	// To add: parameter int $port,
-	//         parameter string $socket
-	function _connect($argHostname = NULL, 
-			  $argUsername = NULL, 
-			  $argPassword = NULL, 
-			  $argDatabasename = NULL)
-	  {
-	    // @ means: error surpression on
-	    $this->_connectionID = @mysqli_init();
-	    
-	    if (is_null($this->_connectionID))
-	    {
-	      // mysqli_init only fails if insufficient memory
-	      if ($this->debug) 
-		ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
-	      return false;
-	    }
-	    // Set connection options
-	    // Not implemented now
-	    // mysqli_options($this->_connection,,);
- 	    if (mysqli_real_connect($this->_connectionID,
- 				    $argHostname,
- 				    $argUsername,
- 				    $argPassword,
- 				    $argDatabasename))
- 	      {
- 		if ($argDatabasename) 
-		  {
-		    return $this->SelectDB($argDatabasename);
-		  }
-		
- 		return true;
- 	      }
- 	    else
-	      {
-		if ($this->debug) 
-		  ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
-		return false;
-	      }
-	  }
-	
-	// returns true or false
-	// How to force a persistent connection
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	  {
-	    // not implemented in mysqli (yet)?
-	    $this->_connectionID = mysqli_connect($argHostname,
-						  $argUsername,
-						  $argPassword,
-						  $argDatabasename);
-	    if ($this->_connectionID === false) return false;
-	    //	    if ($this->autoRollback) $this->RollbackTrans();
-	    if ($argDatabasename) return $this->SelectDB($argDatabasename);
-	    return true;	
-	  }
-	
-	// When is this used? Close old connection first?
-	// In _connect(), check $this->forceNewConnect? 
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	  {
-	    $this->forceNewConnect = true;
-	    $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
-	  }
-	
- 	function &MetaColumns($table) 
-	{
-	  if ($this->metaColumnsSQL) {
-	    global $ADODB_FETCH_MODE;
-	    $save = $ADODB_FETCH_MODE;
-	    $rs = false;
-	    switch($ADODB_FETCH_MODE)
-	      {
-	      case ADODB_FETCH_NUM:
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,
-					     $table));
-		
-		$ADODB_FETCH_MODE = $save;
-		if ($rs === false) break;
-		$retarr = array();
-		while (!$rs->EOF){
-		  $fld = new ADOFieldObject();
-		  $fld->name = $rs->fields[0];
-		  $fld->type = $rs->fields[1];
-		  // split type into type(length):
-		  if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array))
-		    {
-		      $fld->type = $query_array[1];
-		      $fld->max_length = $query_array[2];
-		    }
-		  else
-		    {
-		      $fld->max_length = -1;
-		    }
-		  $fld->not_null = ($rs->fields[2] != 'YES');
-		  $fld->primary_key = ($rs->fields[3] == 'PRI');
-		  $fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-		  $fld->binary = (strpos($fld->type,'blob') !== false);
-		  if (!$fld->binary) 
-		    {
-		      $d = $rs->fields[4];
-		      $d = $rs->fields['Default'];
-		      if ($d != "" && $d != "NULL")
-			{
-			  $fld->has_default = true;
-			  $fld->default_value = $d;
-			} 
-		      else 
-			{
-			  $fld->has_default = false;
-			}
-		    }
-		  $retarr[strtoupper($fld->name)] = $fld;	
-		  $rs->MoveNext();
-		}
-		break;
-	      case ADODB_FETCH_ASSOC:
-	      case ADODB_FETCH_DEFAULT:
-	      case ADODB_FETCH_BOTH:
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,
-					     $table));
-		$ADODB_FETCH_MODE = $save;
-		if ($rs === false) break;
-		$retarr = array();
-		while (!$rs->EOF){
-		  $fld = new ADOFieldObject();
-		  $fld->name = $rs->fields['Field'];
-		  $fld->type = $rs->fields['Type'];
-				
-		  // split type into type(length):
-		  if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array))
-		    {
-		      $fld->type = $query_array[1];
-		      $fld->max_length = $query_array[2];
-		    }
-		  else
-		    {
-		      $fld->max_length = -1;
-		    }
-		  $fld->not_null = ($rs->fields['Null'] != 'YES');
-		  $fld->primary_key = ($rs->fields['Key'] == 'PRI');
-		  $fld->auto_increment = (strpos($rs->fields['Extra'], 'auto_increment') !== false);
-		  $fld->binary = (strpos($fld->type,'blob') !== false);
-		  if (!$fld->binary) 
-		    {
-		      $d = $rs->fields['Default'];
-		      if ($d != "" && $d != "NULL")
-			{
-			  $fld->has_default = true;
-			  $fld->default_value = $d;
-			} 
-		      else 
-			{
-			  $fld->has_default = false;
-			}
-		    }
-		  $retarr[strtoupper($fld->name)] = $fld;	
-		  $rs->MoveNext();
-		}
-		break;
-	      default:
-	      }
-	    
-	    if ($rs === false) return false;
-	    $rs->Close();
-	    return $retarr;	
-	  }
-	  return false;
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-//	    $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
-	    $this->databaseName = $dbName;
-	    if ($this->_connectionID) {
-        	$result = @mysqli_select_db($this->_connectionID, $dbName);
-			if (!$result) {
-		    	ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->ErrorMsg());
-			}
-			return $result;		
-		}
-	    return false;	
-	}
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,
-			      $nrows = -1,
-			      $offset = -1,
-			      $inputarr = false, 
-			      $arg3 = false,
-			      $secs = 0)
-	{
-		$offsetStr = ($offset >= 0) ? "$offset," : '';
-		
-		if ($secs)
-			$rs =& $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
-		else
-			$rs =& $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
-			
-		return $rs;
-	}
-	
-	
-	function Prepare($sql)
-	{
-		return $sql;
-		
-		$stmt = mysqli_prepare($this->_connectionID,$sql);
-		if (!$stmt) return false;
-		return array($sql,$stmt);
-	}
-	
-	
-	// returns queryID or false
-	function _query($sql, $inputarr)
-	{
-	global $ADODB_COUNTRECS;
-	
-		if (is_array($sql)) {
-			$stmt = $sql[1];
-			foreach($inputarr as $k => $v) {
-				if (is_string($v)) $a[] = MYSQLI_BIND_STRING;
-				else if (is_integer($v)) $a[] = MYSQLI_BIND_INT; 
-				else $a[] = MYSQLI_BIND_DOUBLE;
-				
-				$fnarr =& array_merge( array($stmt,$a) , $inputarr);
-				$ret = call_user_func_array('mysqli_bind_param',$fnarr);
-			}
-			$ret = mysqli_execute($stmt);
-			return $ret;
-		}
-		if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
-		    if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
-		    return false;
-		}
-		
-		return $mysql_res;
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	  {
-	    if (empty($this->_connectionID)) 
-	      $this->_errorMsg = @mysqli_error();
-	    else 
-	      $this->_errorMsg = @mysqli_error($this->_connectionID);
-	    return $this->_errorMsg;
-	  }
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	  {
-	    if (empty($this->_connectionID))  
-	      return @mysqli_errno();
-	    else 
-	      return @mysqli_errno($this->_connectionID);
-	  }
-	
-	// returns true or false
-	function _close()
-	  {
-	    @mysqli_close($this->_connectionID);
-	    $this->_connectionID = false;
-	  }
-
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 255; 
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-	  return 4294967295; 
-	}
-
-
-}
- 
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_mysqli extends ADORecordSet{	
-	
-	var $databaseType = "mysqli";
-	var $canSeek = true;
-	
-	function ADORecordSet_mysqli($queryID, $mode = false) 
-	{
-	  if ($mode === false) 
-	    { 
-	      global $ADODB_FETCH_MODE;
-	      $mode = $ADODB_FETCH_MODE;
-	    }
-	  switch ($mode)
-	    {
-	    case ADODB_FETCH_NUM: 
-	      $this->fetchMode = MYSQLI_NUM; 
-	      break;
-	    case ADODB_FETCH_ASSOC:
-	      $this->fetchMode = MYSQLI_ASSOC; 
-	      break;
-	    case ADODB_FETCH_DEFAULT:
-	    case ADODB_FETCH_BOTH:
-	    default:
-	      $this->fetchMode = MYSQLI_ASSOC; 
-	      break;
-	    }
-	  $this->ADORecordSet($queryID);	
-	}
-	
-	function _initrs()
-	{
-	    // mysqli_num_rows only return correct number, depens
-	    // on the use of mysql_store_result and mysql_use_result
-	    if (!$this->Connection->executeOnly) {
-			$this->_numOfRows = @mysqli_num_rows($this->_queryID);
-			$this->_numOfFields = @mysqli_num_fields($this->_queryID);
-	    }
-	    else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-	    }
-	}
-	
-	function &FetchField($fieldOffset = -1) 
-	{	
-	  $fieldnr = $fieldOffset;
-	  if ($fieldOffset != -1) {
-	    $fieldOffset = mysqi_field_seek($this->_queryID, $fieldnr);
-	  }
-	  $o = mysqli_fetch_field($this->_queryID);
-	  return $o;
-	}
-
-	function &GetRowAssoc($upper = true)
-	{
-	  if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
-	    return $this->fields;
-	  $row =& ADORecordSet::GetRowAssoc($upper);
-	  return $row;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{	
-	  if ($this->fetchMode != MYSQLI_NUM) 
-	    return @$this->fields[$colname];
-		
-	  if (!$this->bind) {
-	    $this->bind = array();
-	    for ($i = 0; $i < $this->_numOfFields; $i++) {
-	      $o = $this->FetchField($i);
-	      $this->bind[strtoupper($o->name)] = $i;
-	    }
-	  }
-	  return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	function _seek($row)
-	{
-	  if ($this->_numOfRows == 0) 
-	    return false;
-
-	  if ($row < 0)
-	    return false;
-
-	  mysqli_data_seek($this->_queryID, $row);
-	  $this->EOF = false;
-	  return true;
-	}
-		
-	// 10% speedup to move MoveNext to child class
-	// This is the only implementation that works now (23-10-2003).
-	// Other functions return no or the wrong results.
-	function MoveNext() 
-	{
-	  if ($this->EOF) 
-	    return false;
-	  $this->_currentRow++;
-	  switch($this->fetchMode)
-	    {
-	    case MYSQLI_NUM:
-	      $this->fields = mysqli_fetch_array($this->_queryID);
-	      break;
-	    case MYSQLI_ASSOC:
-	    case MYSQLI_BOTH:
-	      $this->fields = mysqli_fetch_assoc($this->_queryID);
-	      break;
-	    default:
-	    }
-	  if (is_array($this->fields)) 
-	    return true;
-	  $this->EOF = true;
-	  return false;
-	}	
-	
-	function _fetch()
-	{
-	  // mysqli_fetch_array($this->_queryID, MYSQLI_NUM) does not
-	  // work (22-10-2003). But mysqli_fetch_array($this->_queryID) gives
-	  // int resulttype should default to MYSQLI_BOTH,but give MYSQLI_NUM.
-
-	  //	  $this->fields =  mysqli_fetch_fields($this->_queryID);
-	  //	  $this->fields =  mysqli_fetch_array($this->_queryID); //, $this->fetchMode);
-		  
-	  $this->fields =  mysqli_fetch_assoc($this->_queryID); // $this->fetchMode);
-	  return is_array($this->fields);
-	}
-	
-	function _close() 
-	{
-	  mysqli_free_result($this->_queryID); 
-	  $this->_queryID = false;	
-	}
-	
-	function MetaType($t, $len = -1, $fieldobj = false)
-	{
-	  if (is_object($t)) 
-	    {
-	      $fieldobj = $t;
-	      $t = $fieldobj->type;
-	      $len = $fieldobj->max_length;
-	    }
-		
-	  $len = -1; // mysql max_length is not accurate
-	  switch (strtoupper($t)) {
-	  case 'STRING': 
-	  case 'CHAR':
-	  case 'VARCHAR': 
-	  case 'TINYBLOB': 
-	  case 'TINYTEXT': 
-	  case 'ENUM': 
-	  case 'SET': 
-	    if ($len <= $this->blobSize) return 'C';
-	    
-	  case 'TEXT':
-	  case 'LONGTEXT': 
-	  case 'MEDIUMTEXT':
-	    return 'X';
-			
-	    // php_mysql extension always returns 'blob' even if 'text'
-	    // so we have to check whether binary...
-	  case 'IMAGE':
-	  case 'LONGBLOB': 
-	  case 'BLOB':
-	  case 'MEDIUMBLOB':
-	    return !empty($fieldobj->binary) ? 'B' : 'X';
-	  case 'YEAR':
-	  case 'DATE': 
-	    return 'D';
-		
-	  case 'TIME':
-	  case 'DATETIME':
-	  case 'TIMESTAMP': return 'T';
-		
-	  case 'INT': 
-	  case 'INTEGER':
-	  case 'BIGINT':
-	  case 'TINYINT':
-	  case 'MEDIUMINT':
-	  case 'SMALLINT': 
-			
-	    if (!empty($fieldobj->primary_key)) return 'R';
-	    else return 'I';
-	    // Added floating-point types
-	    // Maybe not necessery.
-	  case 'FLOAT':
-	  case 'DOUBLE':
-	    //		case 'DOUBLE PRECISION':
-	  case 'DECIMAL':
-	  case 'DEC':
-	  case 'FIXED':
-	  default: 
-	    return 'N';
-	  }
-	}
-	
-
-}
- 
-}
-
+GetOne("select version()");
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+	
+	
+	function BeginTrans()
+	{	  
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->Execute('SET AUTOCOMMIT=0');
+		$this->Execute('BEGIN');
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('COMMIT');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('ROLLBACK');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+	
+	// if magic quotes disabled, use mysql_real_escape_string()
+	// From readme.htm:
+	// Quotes a string to be sent to the database. The $magic_quotes_enabled
+	// parameter may look funny, but the idea is if you are quoting a 
+	// string extracted from a POST/GET variable, then 
+	// pass get_magic_quotes_gpc() as the second parameter. This will 
+	// ensure that the variable is not quoted twice, once by qstr and once 
+	// by the magic_quotes_gpc.
+	//
+	//Eg. $s = $db->qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());
+	function qstr($s, $magic_quotes = false)
+	{
+	  if (!$magic_quotes) {
+	    if (ADODB_PHPVER >= 0x5000) {
+	    //  $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
+	      return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";
+	    }
+	    else
+	      {
+		trigger_error("phpver < 5 not implemented", E_USER_ERROR);
+	      }
+	    
+	    if ($this->replaceQuote[0] == '\\')
+	      {
+		$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+	      }
+	    return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+	  }
+	  // undo magic quotes for "
+	  $s = str_replace('\\"','"',$s);
+	  return "'$s'";
+	}
+	
+	function _insertid()
+	{
+//	  $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
+	  $result = @mysqli_insert_id($this->_connectionID);
+	  if ($result == -1){
+	      if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : "  . $this->ErrorMsg());
+	  }
+	  return $result;
+	}
+	
+	// Only works for INSERT, UPDATE and DELETE query's
+	function _affectedrows()
+	{
+	//  $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
+	  $result =  @mysqli_affected_rows($this->_connectionID);
+	  if ($result == -1) {
+	      if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : "  . $this->ErrorMsg());
+	  }
+	  return $result;
+	}
+  
+ 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
+	// Reference on Last_Insert_ID on the recommended way to simulate sequences
+ 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
+	var $_genSeqSQL = "create table %s (id int not null)";
+	var $_genSeq2SQL = "insert into %s values (%s)";
+	var $_dropSeqSQL = "drop table %s";
+	
+	function CreateSequence($seqname='adodbseq',$startID=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$u = strtoupper($seqname);
+		
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+	}
+	
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		// post-nuke sets hasGenID to false
+		if (!$this->hasGenID) return false;
+		
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		$holdtransOK = $this->_transOK; // save the current status
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
+			$u = strtoupper($seqname);
+			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
+			$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+			$rs = $this->Execute($getnext);
+		}
+		$this->genID = mysqli_insert_id($this->_connectionID);
+		
+		if ($rs) $rs->Close();
+		
+		return $this->genID;
+	}
+	
+  	function &MetaDatabases()
+	  {
+	    $query = "SHOW DATABASES";
+	    $ret =& $this->Execute($query);
+		return $ret;
+	  }
+
+	  
+	function &MetaIndexes ($table, $primary = FALSE)
+	{
+	        // save old fetch mode
+	        global $ADODB_FETCH_MODE;
+	        
+	        $save = $ADODB_FETCH_MODE;
+	        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	        if ($this->fetchMode !== FALSE) {
+	               $savem = $this->SetFetchMode(FALSE);
+	        }
+	        
+	        // get index details
+	        $rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
+	        
+	        // restore fetchmode
+	        if (isset($savem)) {
+	                $this->SetFetchMode($savem);
+	        }
+	        $ADODB_FETCH_MODE = $save;
+	        
+	        if (!is_object($rs)) {
+	                return FALSE;
+	        }
+	        
+	        $indexes = array ();
+	        
+	        // parse index data into array
+	        while ($row = $rs->FetchRow()) {
+	                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+	                        continue;
+	                }
+	                
+	                if (!isset($indexes[$row[2]])) {
+	                        $indexes[$row[2]] = array(
+	                                'unique' => ($row[1] == 0),
+	                                'columns' => array()
+	                        );
+	                }
+	                
+	                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
+	        }
+	        
+	        // sort columns by order in the index
+	        foreach ( array_keys ($indexes) as $index )
+	        {
+	                ksort ($indexes[$index]['columns']);
+	        }
+	        
+	        return $indexes;
+	}
+
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = 'DATE_FORMAT('.$col.",'";
+		$concat = false;
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= '%Y';
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "'),Quarter($col)";
+				
+				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+				else $s .= ",('";
+				$concat = true;
+				break;
+			case 'M':
+				$s .= '%b';
+				break;
+				
+			case 'm':
+				$s .= '%m';
+				break;
+			case 'D':
+			case 'd':
+				$s .= '%d';
+				break;
+			
+			case 'H': 
+				$s .= '%H';
+				break;
+				
+			case 'h':
+				$s .= '%I';
+				break;
+				
+			case 'i':
+				$s .= '%i';
+				break;
+				
+			case 's':
+				$s .= '%s';
+				break;
+				
+			case 'a':
+			case 'A':
+				$s .= '%p';
+				break;
+				
+			default:
+				
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $ch;
+				break;
+			}
+		}
+		$s.="')";
+		if ($concat) $s = "CONCAT($s)";
+		return $s;
+	}
+	
+	// returns concatenated string
+	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+		
+		// suggestion by andrew005@mnogo.ru
+		$s = implode(',',$arr); 
+		if (strlen($s) > 0) return "CONCAT($s)";
+		else return '';
+	}
+	
+	// dayFraction is a day in floating point
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) 
+		  $date = $this->sysDate;
+		return "from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
+	}
+	
+	// returns true or false
+	// To add: parameter int $port,
+	//         parameter string $socket
+	function _connect($argHostname = NULL, 
+			  $argUsername = NULL, 
+			  $argPassword = NULL, 
+			  $argDatabasename = NULL)
+	  {
+	    // @ means: error surpression on
+	    $this->_connectionID = @mysqli_init();
+	    
+	    if (is_null($this->_connectionID))
+	    {
+	      // mysqli_init only fails if insufficient memory
+	      if ($this->debug) 
+		ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
+	      return false;
+	    }
+	    // Set connection options
+	    // Not implemented now
+	    // mysqli_options($this->_connection,,);
+ 	    if (mysqli_real_connect($this->_connectionID,
+ 				    $argHostname,
+ 				    $argUsername,
+ 				    $argPassword,
+ 				    $argDatabasename))
+ 	      {
+ 		if ($argDatabasename) 
+		  {
+		    return $this->SelectDB($argDatabasename);
+		  }
+		
+ 		return true;
+ 	      }
+ 	    else
+	      {
+		if ($this->debug) 
+		  ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
+		return false;
+	      }
+	  }
+	
+	// returns true or false
+	// How to force a persistent connection
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	  {
+	    // not implemented in mysqli (yet)?
+	    $this->_connectionID = mysqli_connect($argHostname,
+						  $argUsername,
+						  $argPassword,
+						  $argDatabasename);
+	    if ($this->_connectionID === false) return false;
+	    //	    if ($this->autoRollback) $this->RollbackTrans();
+	    if ($argDatabasename) return $this->SelectDB($argDatabasename);
+	    return true;	
+	  }
+	
+	// When is this used? Close old connection first?
+	// In _connect(), check $this->forceNewConnect? 
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	  {
+	    $this->forceNewConnect = true;
+	    $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+	  }
+	
+ 	function &MetaColumns($table) 
+	{
+	  if ($this->metaColumnsSQL) {
+	    global $ADODB_FETCH_MODE;
+	    $save = $ADODB_FETCH_MODE;
+	    $rs = false;
+	    switch($ADODB_FETCH_MODE)
+	      {
+	      case ADODB_FETCH_NUM:
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,
+					     $table));
+		
+		$ADODB_FETCH_MODE = $save;
+		if ($rs === false) break;
+		$retarr = array();
+		while (!$rs->EOF){
+		  $fld = new ADOFieldObject();
+		  $fld->name = $rs->fields[0];
+		  $fld->type = $rs->fields[1];
+		  // split type into type(length):
+		  if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array))
+		    {
+		      $fld->type = $query_array[1];
+		      $fld->max_length = $query_array[2];
+		    }
+		  else
+		    {
+		      $fld->max_length = -1;
+		    }
+		  $fld->not_null = ($rs->fields[2] != 'YES');
+		  $fld->primary_key = ($rs->fields[3] == 'PRI');
+		  $fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
+		  $fld->binary = (strpos($fld->type,'blob') !== false);
+		  if (!$fld->binary) 
+		    {
+		      $d = $rs->fields[4];
+		      $d = $rs->fields['Default'];
+		      if ($d != "" && $d != "NULL")
+			{
+			  $fld->has_default = true;
+			  $fld->default_value = $d;
+			} 
+		      else 
+			{
+			  $fld->has_default = false;
+			}
+		    }
+		  $retarr[strtoupper($fld->name)] = $fld;	
+		  $rs->MoveNext();
+		}
+		break;
+	      case ADODB_FETCH_ASSOC:
+	      case ADODB_FETCH_DEFAULT:
+	      case ADODB_FETCH_BOTH:
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,
+					     $table));
+		$ADODB_FETCH_MODE = $save;
+		if ($rs === false) break;
+		$retarr = array();
+		while (!$rs->EOF){
+		  $fld = new ADOFieldObject();
+		  $fld->name = $rs->fields['Field'];
+		  $fld->type = $rs->fields['Type'];
+				
+		  // split type into type(length):
+		  if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array))
+		    {
+		      $fld->type = $query_array[1];
+		      $fld->max_length = $query_array[2];
+		    }
+		  else
+		    {
+		      $fld->max_length = -1;
+		    }
+		  $fld->not_null = ($rs->fields['Null'] != 'YES');
+		  $fld->primary_key = ($rs->fields['Key'] == 'PRI');
+		  $fld->auto_increment = (strpos($rs->fields['Extra'], 'auto_increment') !== false);
+		  $fld->binary = (strpos($fld->type,'blob') !== false);
+		  if (!$fld->binary) 
+		    {
+		      $d = $rs->fields['Default'];
+		      if ($d != "" && $d != "NULL")
+			{
+			  $fld->has_default = true;
+			  $fld->default_value = $d;
+			} 
+		      else 
+			{
+			  $fld->has_default = false;
+			}
+		    }
+		  $retarr[strtoupper($fld->name)] = $fld;	
+		  $rs->MoveNext();
+		}
+		break;
+	      default:
+	      }
+	    
+	    if ($rs === false) return false;
+	    $rs->Close();
+	    return $retarr;	
+	  }
+	  return false;
+	}
+		
+	// returns true or false
+	function SelectDB($dbName) 
+	{
+//	    $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
+	    $this->databaseName = $dbName;
+	    if ($this->_connectionID) {
+        	$result = @mysqli_select_db($this->_connectionID, $dbName);
+			if (!$result) {
+		    	ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->ErrorMsg());
+			}
+			return $result;		
+		}
+	    return false;	
+	}
+	
+	// parameters use PostgreSQL convention, not MySQL
+	function &SelectLimit($sql,
+			      $nrows = -1,
+			      $offset = -1,
+			      $inputarr = false, 
+			      $arg3 = false,
+			      $secs = 0)
+	{
+		$offsetStr = ($offset >= 0) ? "$offset," : '';
+		
+		if ($secs)
+			$rs =& $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
+		else
+			$rs =& $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
+			
+		return $rs;
+	}
+	
+	
+	function Prepare($sql)
+	{
+		return $sql;
+		
+		$stmt = mysqli_prepare($this->_connectionID,$sql);
+		if (!$stmt) return false;
+		return array($sql,$stmt);
+	}
+	
+	
+	// returns queryID or false
+	function _query($sql, $inputarr)
+	{
+	global $ADODB_COUNTRECS;
+	
+		if (is_array($sql)) {
+			$stmt = $sql[1];
+			foreach($inputarr as $k => $v) {
+				if (is_string($v)) $a[] = MYSQLI_BIND_STRING;
+				else if (is_integer($v)) $a[] = MYSQLI_BIND_INT; 
+				else $a[] = MYSQLI_BIND_DOUBLE;
+				
+				$fnarr =& array_merge( array($stmt,$a) , $inputarr);
+				$ret = call_user_func_array('mysqli_bind_param',$fnarr);
+			}
+			$ret = mysqli_execute($stmt);
+			return $ret;
+		}
+		if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
+		    if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
+		    return false;
+		}
+		
+		return $mysql_res;
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	  {
+	    if (empty($this->_connectionID)) 
+	      $this->_errorMsg = @mysqli_error();
+	    else 
+	      $this->_errorMsg = @mysqli_error($this->_connectionID);
+	    return $this->_errorMsg;
+	  }
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	  {
+	    if (empty($this->_connectionID))  
+	      return @mysqli_errno();
+	    else 
+	      return @mysqli_errno($this->_connectionID);
+	  }
+	
+	// returns true or false
+	function _close()
+	  {
+	    @mysqli_close($this->_connectionID);
+	    $this->_connectionID = false;
+	  }
+
+	/*
+	* Maximum size of C field
+	*/
+	function CharMax()
+	{
+		return 255; 
+	}
+	
+	/*
+	* Maximum size of X field
+	*/
+	function TextMax()
+	{
+	  return 4294967295; 
+	}
+
+
+}
+ 
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_mysqli extends ADORecordSet{	
+	
+	var $databaseType = "mysqli";
+	var $canSeek = true;
+	
+	function ADORecordSet_mysqli($queryID, $mode = false) 
+	{
+	  if ($mode === false) 
+	    { 
+	      global $ADODB_FETCH_MODE;
+	      $mode = $ADODB_FETCH_MODE;
+	    }
+	  switch ($mode)
+	    {
+	    case ADODB_FETCH_NUM: 
+	      $this->fetchMode = MYSQLI_NUM; 
+	      break;
+	    case ADODB_FETCH_ASSOC:
+	      $this->fetchMode = MYSQLI_ASSOC; 
+	      break;
+	    case ADODB_FETCH_DEFAULT:
+	    case ADODB_FETCH_BOTH:
+	    default:
+	      $this->fetchMode = MYSQLI_ASSOC; 
+	      break;
+	    }
+	  $this->ADORecordSet($queryID);	
+	}
+	
+	function _initrs()
+	{
+	    // mysqli_num_rows only return correct number, depens
+	    // on the use of mysql_store_result and mysql_use_result
+	    if (!$this->Connection->executeOnly) {
+			$this->_numOfRows = @mysqli_num_rows($this->_queryID);
+			$this->_numOfFields = @mysqli_num_fields($this->_queryID);
+	    }
+	    else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+	    }
+	}
+	
+	function &FetchField($fieldOffset = -1) 
+	{	
+	  $fieldnr = $fieldOffset;
+	  if ($fieldOffset != -1) {
+	    $fieldOffset = mysqi_field_seek($this->_queryID, $fieldnr);
+	  }
+	  $o = mysqli_fetch_field($this->_queryID);
+	  return $o;
+	}
+
+	function &GetRowAssoc($upper = true)
+	{
+	  if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
+	    return $this->fields;
+	  $row =& ADORecordSet::GetRowAssoc($upper);
+	  return $row;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{	
+	  if ($this->fetchMode != MYSQLI_NUM) 
+	    return @$this->fields[$colname];
+		
+	  if (!$this->bind) {
+	    $this->bind = array();
+	    for ($i = 0; $i < $this->_numOfFields; $i++) {
+	      $o = $this->FetchField($i);
+	      $this->bind[strtoupper($o->name)] = $i;
+	    }
+	  }
+	  return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	function _seek($row)
+	{
+	  if ($this->_numOfRows == 0) 
+	    return false;
+
+	  if ($row < 0)
+	    return false;
+
+	  mysqli_data_seek($this->_queryID, $row);
+	  $this->EOF = false;
+	  return true;
+	}
+		
+	// 10% speedup to move MoveNext to child class
+	// This is the only implementation that works now (23-10-2003).
+	// Other functions return no or the wrong results.
+	function MoveNext() 
+	{
+	  if ($this->EOF) 
+	    return false;
+	  $this->_currentRow++;
+	  switch($this->fetchMode)
+	    {
+	    case MYSQLI_NUM:
+	      $this->fields = mysqli_fetch_array($this->_queryID);
+	      break;
+	    case MYSQLI_ASSOC:
+	    case MYSQLI_BOTH:
+	      $this->fields = mysqli_fetch_assoc($this->_queryID);
+	      break;
+	    default:
+	    }
+	  if (is_array($this->fields)) 
+	    return true;
+	  $this->EOF = true;
+	  return false;
+	}	
+	
+	function _fetch()
+	{
+	  // mysqli_fetch_array($this->_queryID, MYSQLI_NUM) does not
+	  // work (22-10-2003). But mysqli_fetch_array($this->_queryID) gives
+	  // int resulttype should default to MYSQLI_BOTH,but give MYSQLI_NUM.
+
+	  //	  $this->fields =  mysqli_fetch_fields($this->_queryID);
+	  //	  $this->fields =  mysqli_fetch_array($this->_queryID); //, $this->fetchMode);
+		  
+	  $this->fields =  mysqli_fetch_assoc($this->_queryID); // $this->fetchMode);
+	  return is_array($this->fields);
+	}
+	
+	function _close() 
+	{
+	  mysqli_free_result($this->_queryID); 
+	  $this->_queryID = false;	
+	}
+	
+	function MetaType($t, $len = -1, $fieldobj = false)
+	{
+	  if (is_object($t)) 
+	    {
+	      $fieldobj = $t;
+	      $t = $fieldobj->type;
+	      $len = $fieldobj->max_length;
+	    }
+		
+	  $len = -1; // mysql max_length is not accurate
+	  switch (strtoupper($t)) {
+	  case 'STRING': 
+	  case 'CHAR':
+	  case 'VARCHAR': 
+	  case 'TINYBLOB': 
+	  case 'TINYTEXT': 
+	  case 'ENUM': 
+	  case 'SET': 
+	    if ($len <= $this->blobSize) return 'C';
+	    
+	  case 'TEXT':
+	  case 'LONGTEXT': 
+	  case 'MEDIUMTEXT':
+	    return 'X';
+			
+	    // php_mysql extension always returns 'blob' even if 'text'
+	    // so we have to check whether binary...
+	  case 'IMAGE':
+	  case 'LONGBLOB': 
+	  case 'BLOB':
+	  case 'MEDIUMBLOB':
+	    return !empty($fieldobj->binary) ? 'B' : 'X';
+	  case 'YEAR':
+	  case 'DATE': 
+	    return 'D';
+		
+	  case 'TIME':
+	  case 'DATETIME':
+	  case 'TIMESTAMP': return 'T';
+		
+	  case 'INT': 
+	  case 'INTEGER':
+	  case 'BIGINT':
+	  case 'TINYINT':
+	  case 'MEDIUMINT':
+	  case 'SMALLINT': 
+			
+	    if (!empty($fieldobj->primary_key)) return 'R';
+	    else return 'I';
+	    // Added floating-point types
+	    // Maybe not necessery.
+	  case 'FLOAT':
+	  case 'DOUBLE':
+	    //		case 'DOUBLE PRECISION':
+	  case 'DECIMAL':
+	  case 'DEC':
+	  case 'FIXED':
+	  default: 
+	    return 'N';
+	  }
+	}
+	
+
+}
+ 
+}
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-mysqlt.inc.php b/lib/adodb/drivers/adodb-mysqlt.inc.php
index 8b82ea50ba7..5d8fcdaf46f 100644
--- a/lib/adodb/drivers/adodb-mysqlt.inc.php
+++ b/lib/adodb/drivers/adodb-mysqlt.inc.php
@@ -1,76 +1,76 @@
-
-  
-  Requires mysql client. Works on Windows and Unix.
-*/
-
-
-include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
-
-
-class ADODB_mysqlt extends ADODB_mysql {
-	var $databaseType = 'mysqlt';
-	var $ansiOuter = true; // for Version 3.23.17 or later
-	var $hasTransactions = true;
-	
-	function BeginTrans()
-	{	  
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->Execute('SET AUTOCOMMIT=0');
-		$this->Execute('BEGIN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-}
-
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
-	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) {
-		return $this->ADORecordSet_mysql($queryID,$mode);
-	}
-	
-	function MoveNext() 
-	{	
-		if ($this->EOF) return false;
-
-		$this->_currentRow++;
-		// using & below slows things down by 20%!
-		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
-		if ($this->fields) return true;
-		$this->EOF = true;
-		
-		return false;
-	}	
-}
+
+  
+  Requires mysql client. Works on Windows and Unix.
+*/
+
+
+include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
+
+
+class ADODB_mysqlt extends ADODB_mysql {
+	var $databaseType = 'mysqlt';
+	var $ansiOuter = true; // for Version 3.23.17 or later
+	var $hasTransactions = true;
+	
+	function BeginTrans()
+	{	  
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->Execute('SET AUTOCOMMIT=0');
+		$this->Execute('BEGIN');
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('COMMIT');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('ROLLBACK');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+	
+}
+
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+	var $databaseType = "mysqlt";
+	
+	function ADORecordSet_mysqlt($queryID,$mode=false) {
+		return $this->ADORecordSet_mysql($queryID,$mode);
+	}
+	
+	function MoveNext() 
+	{	
+		if ($this->EOF) return false;
+
+		$this->_currentRow++;
+		// using & below slows things down by 20%!
+		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
+		if ($this->fields) return true;
+		$this->EOF = true;
+		
+		return false;
+	}	
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-oci8.inc.php b/lib/adodb/drivers/adodb-oci8.inc.php
index ae6563e2d8a..efabaf4b38a 100644
--- a/lib/adodb/drivers/adodb-oci8.inc.php
+++ b/lib/adodb/drivers/adodb-oci8.inc.php
@@ -1,1172 +1,1172 @@
-
-  
-  13 Nov 2000 jlim - removed all ora_* references.
-*/
-
-/*
-NLS_Date_Format
-Allows you to use a date format other than the Oracle Lite default. When a literal
-character string appears where a date value is expected, the Oracle Lite database
-tests the string to see if it matches the formats of Oracle, SQL-92, or the value
-specified for this parameter in the POLITE.INI file. Setting this parameter also
-defines the default format used in the TO_CHAR or TO_DATE functions when no
-other format string is supplied.
-
-For Oracle the default is dd-mon-yy or dd-mon-yyyy, and for SQL-92 the default is
-yy-mm-dd or yyyy-mm-dd.
-
-Using 'RR' in the format forces two-digit years less than or equal to 49 to be
-interpreted as years in the 21st century (2000–2049), and years over 50 as years in
-the 20th century (1950–1999). Setting the RR format as the default for all two-digit
-year entries allows you to become year-2000 compliant. For example:
-NLS_DATE_FORMAT='RR-MM-DD'
-
-You can also modify the date format using the ALTER SESSION command. 
-*/
-
-class ADODB_oci8 extends ADOConnection {
-	var $databaseType = 'oci8';
-	var $dataProvider = 'oci8';
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
-	var $sysDate = "TRUNC(SYSDATE)";
-	var $sysTimeStamp = 'SYSDATE';
-	var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
-	var $_stmt;
-	var $_commit = OCI_COMMIT_ON_SUCCESS;
-	var $_initdate = true; // init date to YYYY-MM-DD
-	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW')";
-	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
-	var $_bindInputArray = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $hasAffectedRows = true;
-	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
-	var $noNullStrings = false;
-	var $connectSID = false;
-	var $_bind = false;
-	var $_hasOCIFetchStatement = false;
-	var $_getarray = false; // currently not working
-	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
-	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
-	var $firstrows = true; // enable first rows optimization on SelectLimit()
-	var $selectOffsetAlg1 = 100; // when to use 1st algorithm of selectlimit.
-	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
- 	var $useDBDateFormatForTextInput=false;
-	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
-	
-	// var $ansiOuter = true; // if oracle9
-    
-	function ADODB_oci8() 
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-	}
-	
-	/*  Function &MetaColumns($table) added by smondino@users.sourceforge.net*/
-	function &MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!$rs) return false;
-		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-	   		$fld->name = $rs->fields[0];
-	   		$fld->type = $rs->fields[1];
-	   		$fld->max_length = $rs->fields[2];
-			$fld->scale = $rs->fields[3];
-			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
-				$fld->type ='INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
-			$fld->binary = (strpos($fld->type,'BLOB') !== false);
-			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		return $retarr;
-	}
- 
-/*
-
-  Multiple modes of connection are supported:
-  
-  a. Local Database
-    $conn->Connect(false,'scott','tiger');
-  
-  b. From tnsnames.ora
-    $conn->Connect(false,'scott','tiger',$tnsname); 
-    $conn->Connect($tnsname,'scott','tiger'); 
-  
-  c. Server + service name
-    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
-  
-  d. Server + SID
-  	$conn->connectSID = true;
-	$conn->Connect($serveraddress,'scott,'tiger',$SID);
-
-
-Example TNSName:
----------------
-NATSOFT.DOMAIN =
-  (DESCRIPTION =
-	(ADDRESS_LIST =
-	  (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
-	)
-	(CONNECT_DATA =
-	  (SERVICE_NAME = natsoft.domain)
-	)
-  )
-  
-  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
-	
-*/
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
-	{
-		if (!function_exists('OCIPLogon')) return false;
-		
-		
-        $this->_errorMsg = false;
-		$this->_errorCode = false;
-		
-		if($argHostname) { // added by Jorma Tuomainen 
-			if (empty($argDatabasename)) $argDatabasename = $argHostname;
-			else {
-				if(strpos($argHostname,":")) {
-					$argHostinfo=explode(":",$argHostname);
-				   	$argHostname=$argHostinfo[0];
-					$argHostport=$argHostinfo[1];
-			 	} else {
-					$argHostport="1521";
-	   			}
-				
-				if ($this->connectSID) {
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-				} else
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
-			}
-		}
-				
- 		//if ($argHostname) print "
    Connect: 1st argument should be left blank for $this->databaseType
    ";
-		if ($mode==1) {
-			$this->_connectionID = OCIPLogon($argUsername,$argPassword, $argDatabasename);
-			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
-		} else if ($mode==2) {
-			$this->_connectionID = OCINLogon($argUsername,$argPassword, $argDatabasename);
-		} else {
-			$this->_connectionID = OCILogon($argUsername,$argPassword, $argDatabasename);
-		}
-		if ($this->_connectionID === false) return false;
-		if ($this->_initdate) {
-			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
-		}
-		
-		// looks like: 
-		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
-		// $vers = OCIServerVersion($this->_connectionID);
-		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
-		return true;
-   	}
-	
-	function ServerInfo()
-	{
-		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
-		$arr['description'] = @OCIServerVersion($this->_connectionID);
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-		// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
-	}
-	
-	
-	
-	// returns true or false
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
-	}
-	
-	function _affectedrows()
-	{
-		if (is_resource($this->_stmt)) return OCIRowCount($this->_stmt);
-		return 0;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " NVL($field, $ifNull) "; // if Oracle
-	}
-	
-	// format and return date string in database date format
-	function DBDate($d)
-	{
-		if (empty($d) && $d !== 0) return 'null';
-		
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
-	}
-
-	
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
-	}
-	
-	function RowLock($tables,$where) 
-	{
-		if ($this->autoCommit) $this->BeginTrans();
-		return $this->GetOne("select 1 as ignore from $tables where $where for update");
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtoupper($mask));
-			$this->metaTablesSQL .= " AND table_name like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	function BeginTrans()
-	{	
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-		$this->_commit = OCI_DEFAULT;
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIcommit($this->_connectionID);
-		$this->_commit = OCI_COMMIT_ON_SUCCESS;
-		$this->autoCommit = true;
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIrollback($this->_connectionID);
-		$this->_commit = OCI_COMMIT_ON_SUCCESS;
-		$this->autoCommit = true;
-		return $ret;
-	}
-	
-	
-	function SelectDB($dbName) 
-	{
-		return false;
-	}
-
-	function ErrorMsg() 
-	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-		if (is_resource($this->_stmt)) $arr = @OCIerror($this->_stmt);
-		if (empty($arr)) {
-			$arr = @OCIerror($this->_connectionID);
-			if ($arr === false) $arr = @OCIError();
-			if ($arr === false) return '';
-		}
-		$this->_errorMsg = $arr['message'];
-		$this->_errorCode = $arr['code'];
-		return $this->_errorMsg;
-	}
-
-	function ErrorNo() 
-	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
-		
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-		if (empty($arr)) {
-			$arr = @OCIError($this->_connectionID);
-			if ($arr == false) $arr = @OCIError();
-			if ($arr == false) return '';
-		}
-		
-		$this->_errorMsg = $arr['message'];
-		$this->_errorCode = $arr['code'];
-		
-		return $arr['code'];
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'TO_CHAR('.$col.",'";
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
-				
-			case 'M':
-				$s .= 'Mon';
-				break;
-				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-			
-			case 'H':
-				$s.= 'HH24';
-				break;
-				
-			case 'h':
-				$s .= 'HH';
-				break;
-				
-			case 'i':
-				$s .= 'MI';
-				break;
-			
-			case 's':
-				$s .= 'SS';
-				break;
-			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-				
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
-				
-			}
-		}
-		return $s. "')";
-	}
-	
-	
-	/*
-	This algorithm makes use of
-	
-	a. FIRST_ROWS hint
-	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
-	that is, minimum resource usage to return the first row. Results will be returned 
-	as soon as they are identified. 
-
-	b. Uses rownum tricks to obtain only the required rows from a given offset.
-	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
-	 This idea by Tomas V V Cox.
-	 
-	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
-	 out this function then, and the slower SelectLimit() in the base class will be used.
-	*/
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// seems that oracle only supports 1 hint comment in 8i
-		if ($this->firstrows) {
-			if (strpos($sql,'/*+') !== false)
-				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-			else
-				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		}
-		
-		if ($offset < $this->selectOffsetAlg1) {
-			if ($nrows > 0) {	
-				if ($offset > 0) $nrows += $offset;
-				//$inputarr['adodb_rownum'] = $nrows;
-				if ($this->databaseType == 'oci8po') {
-					$sql = "select * from ($sql) where rownum <= ?";
-				} else {
-					$sql = "select * from ($sql) where rownum <= :adodb_offset";
-				} 
-				$inputarr['adodb_offset'] = $nrows;
-				$nrows = -1;
-			}
-			// note that $nrows = 0 still has to work ==> no rows returned
-
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			return $rs;
-			
-		} else {
-			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
-			
-			 // Let Oracle return the name of the columns
-			 $q_fields = "SELECT * FROM ($sql) WHERE NULL = NULL";
-			 if (!$stmt = OCIParse($this->_connectionID, $q_fields)) {
-				 return false;
-			 }
-			 
-			 if (is_array($inputarr)) {
-			 	foreach($inputarr as $k => $v) {
-					if (is_array($v)) {
-						if (sizeof($v) == 2) // suggested by g.giunta@libero.
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-						else
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					} else {
-						$len = -1;
-						if ($v === ' ') $len = 1;
-						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
-							$bindarr[$k] = $v;
-						} else { 				// dynamic sql, so rebind every time
-							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-						}
-					}
-				}
-			}
-			
-			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
-				 OCIFreeStatement($stmt); 
-				 return false;
-			 }
-			 
-			 $ncols = OCINumCols($stmt);
-			 for ( $i = 1; $i <= $ncols; $i++ ) {
-				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
-			 }
-			 $result = false;
-			
-			 OCIFreeStatement($stmt); 
-			 $fields = implode(',', $cols);
-			 $nrows += $offset;
-			 $offset += 1; // in Oracle rownum starts at 1
-			
-			if ($this->databaseType == 'oci8po') {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= ?".
-					  ") WHERE adodb_rownum >= ?";
-				} else {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= :adodb_nrows".
-					  ") WHERE adodb_rownum >= :adodb_offset";
-				} 
-				$inputarr['adodb_nrows'] = $nrows;
-				$inputarr['adodb_offset'] = $offset;
-				
-			if ($secs2cache>0) $rs =& $this->CacheExecute($secs2cache, $sql,$inputarr);
-			else $rs =& $this->Execute($sql,$inputarr);
-			return $rs;
-		}
-	
-	}
-	
-	/**
-	* Usage:
-	* Store BLOBs and CLOBs
-	*
-	* Example: to store $var in a blob
-	*
-	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
-	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
-	*
-	*  to get length of LOB:
-	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
-	*
-	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
-	* under oracle 8.1.7.0. Run:
-	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-	* before UpdateBlob() then...
-	*/
-
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		
-		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
-		
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp("UpdateBlob: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
-		}
-		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-		$commit = $this->autoCommit;
-		if ($commit) $this->BeginTrans();
-		$rs = ADODB_oci8::Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->save($val);
-		$desc->free();
-		if ($commit) $this->CommitTrans();
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
-		
-		if ($rez) $rs->Close();
-		return $rez;
-	}
-	
-	/**
-	* Usage:  store file pointed to by $var in a blob
-	*/
-	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp( "UpdateBlob: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
-		}
-		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
-		
-		$this->BeginTrans();
-		$rs = ADODB_oci8::Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->savefile($val);
-		$desc->free();
-		$this->CommitTrans();
-		
-		if ($rez) $rs->Close();
-		return $rez;
-	}
-	
-	/*
-		Example of usage:
-		
-		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
-	*/
-	function Prepare($sql,$cursor=false)
-	{
-	static $BINDNUM = 0;
-	
-		$stmt = OCIParse($this->_connectionID,$sql);
-
-		if (!$stmt) return $sql; // error in statement, let Execute() handle the error
-		
-		$BINDNUM += 1;
-		
-		if (@OCIStatementType($stmt) == 'BEGIN') {
-			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? false : OCINewCursor($this->_connectionID));
-		} 
-		
-		return array($sql,$stmt,0,$BINDNUM);
-	}
-	
-	/*
-		Call an oracle stored procedure and return a cursor variable. 
-		Convert the cursor variable into a recordset. 
-		Concept by Robert Tuttle robert@ud.com
-		
-		Example:
-			Note: we return a cursor variable in :RS2
-			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
-			
-			$rs = $db->ExecuteCursor(
-				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
-				'RS2',
-				array('VAR1' => 'Mr Bean'));
-			
-	*/
-	function &ExecuteCursor($sql,$cursorName='rs',$params=false)
-	{
-		$stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
-			
-		if (is_array($stmt) && sizeof($stmt) >= 5) {
-			$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
-			if ($params) {
-				foreach($params as $k => $v) {
-					$this->Parameter($stmt,$params[$k], $k);
-				}
-			}
-		}
-		return $this->Execute($stmt);
-	}
-	
-	/*
-		Bind a variable -- very, very fast for executing repeated statements in oracle. 
-		Better than using
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
-					array($p1,$p2,$p3));
-			}
-		
-		Usage:
-			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
-			$DB->Bind($stmt, $p1);
-			$DB->Bind($stmt, $p2);
-			$DB->Bind($stmt, $p3);
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$DB->Execute($stmt);
-			}
-			
-		Some timings:		
-			** Test table has 3 cols, and 1 index. Test to insert 1000 records
-			Time 0.6081s (1644.60 inserts/sec) with direct OCIParse/OCIExecute
-			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
-			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
-			
-		Now if PHP only had batch/bulk updating like Java or PL/SQL...
-	
-		Note that the order of parameters differs from OCIBindByName,
-		because we default the names to :0, :1, :2
-	*/
-	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false)
-	{
-		if (!is_array($stmt)) return false;
-        
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
-        }
-        
-		if ($name == false) {
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
-			$stmt[2] += 1;
-		} else {
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
-		}
-		
-		return $rez;
-	}
-	
-	function Param($name)
-	{
-		return ':'.$name;
-	}
-	
-	/* 
-	Usage:
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group');
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See OCIBindByName documentation at php.net.
-	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-	{
-			if  ($this->debug) {
-				$prefix = ($isOutput) ? 'Out' : 'In';
-				$ztype = (empty($type)) ? 'false' : $type;
-				ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
-			}
-			return $this->Bind($stmt,$var,$maxLen,$type,$name);
-	}
-	
-	/*
-	returns query ID if successful, otherwise false
-	this version supports:
-	
-	   1. $db->execute('select * from table');
-	   
-	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->execute($prepared_statement, array(1,2,3));
-		  
-	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-	   
-	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->$bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
-		  $db->execute($stmt);
-	*/ 
-	function _query($sql,$inputarr)
-	{
-		
-		if (is_array($sql)) { // is prepared sql
-			$stmt = $sql[1];
-			
-			// we try to bind to permanent array, so that OCIBindByName is persistent
-			// and carried out once only - note that max array element size is 4000 chars
-			if (is_array($inputarr)) {
-				$bindpos = $sql[3];
-				if (isset($this->_bind[$bindpos])) {
-				// all tied up already
-					$bindarr = &$this->_bind[$bindpos];
-				} else {
-				// one statement to bind them all
-					$bindarr = array();
-					foreach($inputarr as $k => $v) {
-						$bindarr[$k] = $v;
-						OCIBindByName($stmt,":$k",$bindarr[$k],4000);
-					}
-					$this->_bind[$bindpos] = &$bindarr;
-				}
-			}
-		} else {
-			$stmt=OCIParse($this->_connectionID,$sql);
-		}
-			
-		$this->_stmt = $stmt;
-		if (!$stmt) return false;
-	
-		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
-			
-		if (is_array($inputarr)) {
-			foreach($inputarr as $k => $v) {
-				if (is_array($v)) {
-					if (sizeof($v) == 2) // suggested by g.giunta@libero.
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-					else
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					
-					if ($this->debug==99) echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'
    ';
-				} else {
-					$len = -1;
-					if ($v === ' ') $len = 1;
-					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
-						$bindarr[$k] = $v;
-					} else { 				// dynamic sql, so rebind every time
-						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-					}
-				}
-			}
-		}
-		
-        $this->_errorMsg = false;
-		$this->_errorCode = false;
-		if (OCIExecute($stmt,$this->_commit)) {
-		
-            switch (@OCIStatementType($stmt)) {
-                case "SELECT":
-					return $stmt;
-					
-                case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
-						$cursor = $sql[4];
-						if (is_resource($cursor)) {
-							$ok = OCIExecute($cursor);	
-	                        return $cursor;
-						}
-						return $stmt;
-                    } else {
-						if (is_resource($stmt)) {
-							OCIFreeStatement($stmt);
-							return true;
-						}
-                        return $stmt;
-                    }
-                    break;
-                default :
-					// ociclose -- no because it could be used in a LOB?
-                    return true;
-            }
-		}
-		return false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		if (!$this->autoCommit) OCIRollback($this->_connectionID);
-		OCILogoff($this->_connectionID);
-		$this->_stmt = false;
-		$this->_connectionID = false;
-	}
-	
-	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
-	{
-		if ($internalKey) return array('ROWID');
-		
-	// tested with oracle 8.1.7
-		$table = strtoupper($table);
-		if ($owner) {
-			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
-			$ptab = 'ALL_';
-		} else {
-			$owner_clause = '';
-			$ptab = 'USER_';
-		}
-		$sql = "
-SELECT /*+ RULE */ distinct b.column_name
-   FROM {$ptab}CONSTRAINTS a
-	  , {$ptab}CONS_COLUMNS b
-  WHERE ( UPPER(b.table_name) = ('$table'))
-	AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
-	$owner_clause
-	AND (a.constraint_name = b.constraint_name)";
-
- 		$rs = $this->Execute($sql);
-		if ($rs && !$rs->EOF) {
-			$arr =& $rs->GetArray();
-			$a = array();
-			foreach($arr as $v) {
-				$a[] = reset($v);
-			}
-			return $a;
-		}
-		else return false;
-	}
-	
-	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
-	function MetaForeignKeys($table, $owner=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		if (!$owner) {
-			$owner = $this->user;
-			$tabp = 'user_';
-		} else
-			$tabp = 'all_';
-			
-		$owner = ' and owner='.$this->qstr(strtoupper($owner));
-		
-		$sql = 
-"select constraint_name,r_owner,r_constraint_name 
-	from {$tabp}constraints
-	where constraint_type = 'R' and table_name = $table $owner";
-		
-		$constraints =& $this->GetArray($sql);
-		$arr = false;
-		foreach($constraints as $constr) {
-			$cons = $this->qstr($constr[0]);
-			$rowner = $this->qstr($constr[1]);
-			$rcons = $this->qstr($constr[2]);
-			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
-			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
-			
-			if ($cols && $tabcol) 
-				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
-					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
-				}
-		}
-		$ADODB_FETCH_MODE = $save;
-		
-		return $arr;
-	}
-
-	
-	function CharMax()
-	{
-		return 4000;
-	}
-	
-	function TextMax()
-	{
-		return 4000;
-	}
-	
-	/**
-	 * Quotes a string.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
-	 *
-	 * @return  quoted string to be sent back to database
-	 */
-	function qstr($s,$magic_quotes=false)
-	{	
-	$nofixquotes=false;
-	
-		if (is_array($s)) adodb_backtrace();
-		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
-		if (!$magic_quotes) {	
-			if ($this->replaceQuote[0] == '\\'){
-				$s = str_replace('\\','\\\\',$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
-			return "'$s'";
-		else {// change \' to '' for sybase/mssql
-			$s = str_replace('\\\\','\\',$s);
-			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		}
-	}
-	
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8 extends ADORecordSet {
-
-	var $databaseType = 'oci8';
-	var $bind=false;
-	var $_fieldobjs;
-	//var $_arr = false;
-		
-	function ADORecordset_oci8($queryID,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		default:
-		case ADODB_FETCH_NUM: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		}
-
-		$this->_queryID = $queryID;
-	}
-
-
-	function Init()
-	{
-		if ($this->_inited) return;
-		
-		$this->_inited = true;
-		if ($this->_queryID) {
-			
-			$this->_currentRow = 0;
-			@$this->_initrs();
-			$this->EOF = !$this->_fetch();
-			
-			/*
-			// based on idea by Gaetano Giunta to detect unusual oracle errors
-			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
-			$err = OCIError($this->_queryID);
-			if ($err && $this->connection->debug) ADOConnection::outp($err);
-			*/
-			
-			if (!is_array($this->fields)) {
-				$this->_numOfRows = 0;
-				$this->fields = array();
-			}
-		} else {
-			$this->fields = array();
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-	}
-	
-	function _initrs()
-	{
-		$this->_numOfRows = -1;
-		$this->_numOfFields = OCInumcols($this->_queryID);
-		if ($this->_numOfFields>0) {
-			$this->_fieldobjs = array();
-			$max = $this->_numOfFields;
-			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
-		}
-	}
-
-	  /*		Returns: an object containing field information.
-			  Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			  fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			  fetchField() is retrieved.		*/
-
-	function &_FetchField($fieldOffset = -1)
-	{
-		$fld = new ADOFieldObject;
-		$fieldOffset += 1;
-		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
-		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-	 	if ($fld->type == 'NUMBER') {
-	 		$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($p != 0 && $sc == 0) $fld->type = 'INT';
-			//echo " $this->name ($p.$sc) ";
-	 	}
-		return $fld;
-	}
-	
-	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
-	function &FetchField($fieldOffset = -1)
-	{
-		return $this->_fieldobjs[$fieldOffset];
-	}
-	
-	
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
-		
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
-			return true;
-		$this->EOF = true;
-		
-		return false;
-	}	
-	
-	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$arr =& $this->GetArray($nrows);
-			return $arr;
-		}
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) return array();
-			
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return array();
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-
-
-	function _seek($row)
-	{
-		return false;
-	}
-
-	function _fetch() 
-	{
-		return OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-	}
-
-	/*		close() only needs to be called if you are worried about using too much memory while your script
-			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
-
-	function _close() 
-	{
-		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
-		OCIFreeStatement($this->_queryID);
- 		$this->_queryID = false;
-		
-	}
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-		case 'NCHAR':
-		case 'NVARCHAR':
-		case 'NVARCHAR2':
-				 if (isset($this) && $len <= $this->blobSize) return 'C';
-		
-		case 'NCLOB':
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
-		
-		case 'DATE': 
-			return  ($this->connection->datetime) ? 'T' : 'D';
-		
-		
-		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
-			
-		default: return 'N';
-		}
-	}
-}
+
+  
+  13 Nov 2000 jlim - removed all ora_* references.
+*/
+
+/*
+NLS_Date_Format
+Allows you to use a date format other than the Oracle Lite default. When a literal
+character string appears where a date value is expected, the Oracle Lite database
+tests the string to see if it matches the formats of Oracle, SQL-92, or the value
+specified for this parameter in the POLITE.INI file. Setting this parameter also
+defines the default format used in the TO_CHAR or TO_DATE functions when no
+other format string is supplied.
+
+For Oracle the default is dd-mon-yy or dd-mon-yyyy, and for SQL-92 the default is
+yy-mm-dd or yyyy-mm-dd.
+
+Using 'RR' in the format forces two-digit years less than or equal to 49 to be
+interpreted as years in the 21st century (2000–2049), and years over 50 as years in
+the 20th century (1950–1999). Setting the RR format as the default for all two-digit
+year entries allows you to become year-2000 compliant. For example:
+NLS_DATE_FORMAT='RR-MM-DD'
+
+You can also modify the date format using the ALTER SESSION command. 
+*/
+
+class ADODB_oci8 extends ADOConnection {
+	var $databaseType = 'oci8';
+	var $dataProvider = 'oci8';
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $concat_operator='||';
+	var $sysDate = "TRUNC(SYSDATE)";
+	var $sysTimeStamp = 'SYSDATE';
+	var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
+	var $_stmt;
+	var $_commit = OCI_COMMIT_ON_SUCCESS;
+	var $_initdate = true; // init date to YYYY-MM-DD
+	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW')";
+	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
+	var $_bindInputArray = true;
+	var $hasGenID = true;
+	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
+	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
+	var $_dropSeqSQL = "DROP SEQUENCE %s";
+	var $hasAffectedRows = true;
+	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
+	var $noNullStrings = false;
+	var $connectSID = false;
+	var $_bind = false;
+	var $_hasOCIFetchStatement = false;
+	var $_getarray = false; // currently not working
+	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
+	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
+	var $firstrows = true; // enable first rows optimization on SelectLimit()
+	var $selectOffsetAlg1 = 100; // when to use 1st algorithm of selectlimit.
+	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
+ 	var $useDBDateFormatForTextInput=false;
+	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
+	
+	// var $ansiOuter = true; // if oracle9
+    
+	function ADODB_oci8() 
+	{
+		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
+	}
+	
+	/*  Function &MetaColumns($table) added by smondino@users.sourceforge.net*/
+	function &MetaColumns($table) 
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+		
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		if (!$rs) return false;
+		$retarr = array();
+		while (!$rs->EOF) { //print_r($rs->fields);
+			$fld = new ADOFieldObject();
+	   		$fld->name = $rs->fields[0];
+	   		$fld->type = $rs->fields[1];
+	   		$fld->max_length = $rs->fields[2];
+			$fld->scale = $rs->fields[3];
+			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
+				$fld->type ='INT';
+	     		$fld->max_length = $rs->fields[4];
+	    	}	
+		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
+			$fld->binary = (strpos($fld->type,'BLOB') !== false);
+			$fld->default_value = $rs->fields[6];
+			
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[strtoupper($fld->name)] = $fld;
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		return $retarr;
+	}
+ 
+/*
+
+  Multiple modes of connection are supported:
+  
+  a. Local Database
+    $conn->Connect(false,'scott','tiger');
+  
+  b. From tnsnames.ora
+    $conn->Connect(false,'scott','tiger',$tnsname); 
+    $conn->Connect($tnsname,'scott','tiger'); 
+  
+  c. Server + service name
+    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
+  
+  d. Server + SID
+  	$conn->connectSID = true;
+	$conn->Connect($serveraddress,'scott,'tiger',$SID);
+
+
+Example TNSName:
+---------------
+NATSOFT.DOMAIN =
+  (DESCRIPTION =
+	(ADDRESS_LIST =
+	  (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
+	)
+	(CONNECT_DATA =
+	  (SERVICE_NAME = natsoft.domain)
+	)
+  )
+  
+  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
+	
+*/
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
+	{
+		if (!function_exists('OCIPLogon')) return false;
+		
+		
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+		
+		if($argHostname) { // added by Jorma Tuomainen 
+			if (empty($argDatabasename)) $argDatabasename = $argHostname;
+			else {
+				if(strpos($argHostname,":")) {
+					$argHostinfo=explode(":",$argHostname);
+				   	$argHostname=$argHostinfo[0];
+					$argHostport=$argHostinfo[1];
+			 	} else {
+					$argHostport="1521";
+	   			}
+				
+				if ($this->connectSID) {
+					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
+				} else
+					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
+			}
+		}
+				
+ 		//if ($argHostname) print "
    Connect: 1st argument should be left blank for $this->databaseType
    ";
+		if ($mode==1) {
+			$this->_connectionID = OCIPLogon($argUsername,$argPassword, $argDatabasename);
+			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
+		} else if ($mode==2) {
+			$this->_connectionID = OCINLogon($argUsername,$argPassword, $argDatabasename);
+		} else {
+			$this->_connectionID = OCILogon($argUsername,$argPassword, $argDatabasename);
+		}
+		if ($this->_connectionID === false) return false;
+		if ($this->_initdate) {
+			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
+		}
+		
+		// looks like: 
+		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
+		// $vers = OCIServerVersion($this->_connectionID);
+		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
+		return true;
+   	}
+	
+	function ServerInfo()
+	{
+		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
+		$arr['description'] = @OCIServerVersion($this->_connectionID);
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+		// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
+	}
+	
+	
+	
+	// returns true or false
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
+	}
+	
+	function _affectedrows()
+	{
+		if (is_resource($this->_stmt)) return @OCIRowCount($this->_stmt);
+		return 0;
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " NVL($field, $ifNull) "; // if Oracle
+	}
+	
+	// format and return date string in database date format
+	function DBDate($d)
+	{
+		if (empty($d) && $d !== 0) return 'null';
+		
+		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
+	}
+
+	
+	// format and return date string in database timestamp format
+	function DBTimeStamp($ts)
+	{
+		if (empty($ts) && $ts !== 0) return 'null';
+		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+	}
+	
+	function RowLock($tables,$where) 
+	{
+		if ($this->autoCommit) $this->BeginTrans();
+		return $this->GetOne("select 1 as ignore from $tables where $where for update");
+	}
+	
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(strtoupper($mask));
+			$this->metaTablesSQL .= " AND table_name like $mask";
+		}
+		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	function BeginTrans()
+	{	
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->autoCommit = false;
+		$this->_commit = OCI_DEFAULT;
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true;
+		if (!$ok) return $this->RollbackTrans();
+		
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ret = OCIcommit($this->_connectionID);
+		$this->_commit = OCI_COMMIT_ON_SUCCESS;
+		$this->autoCommit = true;
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ret = OCIrollback($this->_connectionID);
+		$this->_commit = OCI_COMMIT_ON_SUCCESS;
+		$this->autoCommit = true;
+		return $ret;
+	}
+	
+	
+	function SelectDB($dbName) 
+	{
+		return false;
+	}
+
+	function ErrorMsg() 
+	{
+		if ($this->_errorMsg !== false) return $this->_errorMsg;
+
+		if (is_resource($this->_stmt)) $arr = @OCIerror($this->_stmt);
+		if (empty($arr)) {
+			$arr = @OCIerror($this->_connectionID);
+			if ($arr === false) $arr = @OCIError();
+			if ($arr === false) return '';
+		}
+		$this->_errorMsg = $arr['message'];
+		$this->_errorCode = $arr['code'];
+		return $this->_errorMsg;
+	}
+
+	function ErrorNo() 
+	{
+		if ($this->_errorCode !== false) return $this->_errorCode;
+		
+		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
+		if (empty($arr)) {
+			$arr = @OCIError($this->_connectionID);
+			if ($arr == false) $arr = @OCIError();
+			if ($arr == false) return '';
+		}
+		
+		$this->_errorMsg = $arr['message'];
+		$this->_errorCode = $arr['code'];
+		
+		return $arr['code'];
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = 'TO_CHAR('.$col.",'";
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= 'YYYY';
+				break;
+			case 'Q':
+			case 'q':
+				$s .= 'Q';
+				break;
+				
+			case 'M':
+				$s .= 'Mon';
+				break;
+				
+			case 'm':
+				$s .= 'MM';
+				break;
+			case 'D':
+			case 'd':
+				$s .= 'DD';
+				break;
+			
+			case 'H':
+				$s.= 'HH24';
+				break;
+				
+			case 'h':
+				$s .= 'HH';
+				break;
+				
+			case 'i':
+				$s .= 'MI';
+				break;
+			
+			case 's':
+				$s .= 'SS';
+				break;
+			
+			case 'a':
+			case 'A':
+				$s .= 'AM';
+				break;
+				
+			default:
+			// handle escape characters...
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+				else $s .= '"'.$ch.'"';
+				
+			}
+		}
+		return $s. "')";
+	}
+	
+	
+	/*
+	This algorithm makes use of
+	
+	a. FIRST_ROWS hint
+	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
+	that is, minimum resource usage to return the first row. Results will be returned 
+	as soon as they are identified. 
+
+	b. Uses rownum tricks to obtain only the required rows from a given offset.
+	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
+	 This idea by Tomas V V Cox.
+	 
+	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
+	 out this function then, and the slower SelectLimit() in the base class will be used.
+	*/
+	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		// seems that oracle only supports 1 hint comment in 8i
+		if ($this->firstrows) {
+			if (strpos($sql,'/*+') !== false)
+				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
+			else
+				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
+		}
+		
+		if ($offset < $this->selectOffsetAlg1) {
+			if ($nrows > 0) {	
+				if ($offset > 0) $nrows += $offset;
+				//$inputarr['adodb_rownum'] = $nrows;
+				if ($this->databaseType == 'oci8po') {
+					$sql = "select * from ($sql) where rownum <= ?";
+				} else {
+					$sql = "select * from ($sql) where rownum <= :adodb_offset";
+				} 
+				$inputarr['adodb_offset'] = $nrows;
+				$nrows = -1;
+			}
+			// note that $nrows = 0 still has to work ==> no rows returned
+
+			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			return $rs;
+			
+		} else {
+			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
+			
+			 // Let Oracle return the name of the columns
+			 $q_fields = "SELECT * FROM ($sql) WHERE NULL = NULL";
+			 if (!$stmt = OCIParse($this->_connectionID, $q_fields)) {
+				 return false;
+			 }
+			 
+			 if (is_array($inputarr)) {
+			 	foreach($inputarr as $k => $v) {
+					if (is_array($v)) {
+						if (sizeof($v) == 2) // suggested by g.giunta@libero.
+							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
+						else
+							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+					} else {
+						$len = -1;
+						if ($v === ' ') $len = 1;
+						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
+							$bindarr[$k] = $v;
+						} else { 				// dynamic sql, so rebind every time
+							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+						}
+					}
+				}
+			}
+			
+			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
+				 OCIFreeStatement($stmt); 
+				 return false;
+			 }
+			 
+			 $ncols = OCINumCols($stmt);
+			 for ( $i = 1; $i <= $ncols; $i++ ) {
+				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
+			 }
+			 $result = false;
+			
+			 OCIFreeStatement($stmt); 
+			 $fields = implode(',', $cols);
+			 $nrows += $offset;
+			 $offset += 1; // in Oracle rownum starts at 1
+			
+			if ($this->databaseType == 'oci8po') {
+					 $sql = "SELECT $fields FROM".
+					  "(SELECT rownum as adodb_rownum, $fields FROM".
+					  " ($sql) WHERE rownum <= ?".
+					  ") WHERE adodb_rownum >= ?";
+				} else {
+					 $sql = "SELECT $fields FROM".
+					  "(SELECT rownum as adodb_rownum, $fields FROM".
+					  " ($sql) WHERE rownum <= :adodb_nrows".
+					  ") WHERE adodb_rownum >= :adodb_offset";
+				} 
+				$inputarr['adodb_nrows'] = $nrows;
+				$inputarr['adodb_offset'] = $offset;
+				
+			if ($secs2cache>0) $rs =& $this->CacheExecute($secs2cache, $sql,$inputarr);
+			else $rs =& $this->Execute($sql,$inputarr);
+			return $rs;
+		}
+	
+	}
+	
+	/**
+	* Usage:
+	* Store BLOBs and CLOBs
+	*
+	* Example: to store $var in a blob
+	*
+	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
+	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
+	*	
+	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
+	*
+	*  to get length of LOB:
+	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
+	*
+	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
+	* under oracle 8.1.7.0. Run:
+	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+	* before UpdateBlob() then...
+	*/
+
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		
+		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
+		
+		switch(strtoupper($blobtype)) {
+		default: ADOConnection::outp("UpdateBlob: Unknown blobtype=$blobtype"); return false;
+		case 'BLOB': $type = OCI_B_BLOB; break;
+		case 'CLOB': $type = OCI_B_CLOB; break;
+		}
+		
+		if ($this->databaseType == 'oci8po') 
+			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
+		else 
+			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		
+		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
+		$arr['blob'] = array($desc,-1,$type);
+		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+		$commit = $this->autoCommit;
+		if ($commit) $this->BeginTrans();
+		$rs = ADODB_oci8::Execute($sql,$arr);
+		if ($rez = !empty($rs)) $desc->save($val);
+		$desc->free();
+		if ($commit) $this->CommitTrans();
+		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
+		
+		if ($rez) $rs->Close();
+		return $rez;
+	}
+	
+	/**
+	* Usage:  store file pointed to by $var in a blob
+	*/
+	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		switch(strtoupper($blobtype)) {
+		default: ADOConnection::outp( "UpdateBlob: Unknown blobtype=$blobtype"); return false;
+		case 'BLOB': $type = OCI_B_BLOB; break;
+		case 'CLOB': $type = OCI_B_CLOB; break;
+		}
+		
+		if ($this->databaseType == 'oci8po') 
+			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
+		else 
+			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		
+		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
+		$arr['blob'] = array($desc,-1,$type);
+		
+		$this->BeginTrans();
+		$rs = ADODB_oci8::Execute($sql,$arr);
+		if ($rez = !empty($rs)) $desc->savefile($val);
+		$desc->free();
+		$this->CommitTrans();
+		
+		if ($rez) $rs->Close();
+		return $rez;
+	}
+	
+	/*
+		Example of usage:
+		
+		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
+	*/
+	function Prepare($sql,$cursor=false)
+	{
+	static $BINDNUM = 0;
+	
+		$stmt = OCIParse($this->_connectionID,$sql);
+
+		if (!$stmt) return false;
+
+		$BINDNUM += 1;
+		
+		if (@OCIStatementType($stmt) == 'BEGIN') {
+			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
+		} 
+		
+		return array($sql,$stmt,0,$BINDNUM);
+	}
+	
+	/*
+		Call an oracle stored procedure and return a cursor variable. 
+		Convert the cursor variable into a recordset. 
+		Concept by Robert Tuttle robert@ud.com
+		
+		Example:
+			Note: we return a cursor variable in :RS2
+			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
+			
+			$rs = $db->ExecuteCursor(
+				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
+				'RS2',
+				array('VAR1' => 'Mr Bean'));
+			
+	*/
+	function &ExecuteCursor($sql,$cursorName='rs',$params=false)
+	{
+		$stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
+			
+		if (is_array($stmt) && sizeof($stmt) >= 5) {
+			$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
+			if ($params) {
+				foreach($params as $k => $v) {
+					$this->Parameter($stmt,$params[$k], $k);
+				}
+			}
+		}
+		return $this->Execute($stmt);
+	}
+	
+	/*
+		Bind a variable -- very, very fast for executing repeated statements in oracle. 
+		Better than using
+			for ($i = 0; $i < $max; $i++) {	
+				$p1 = ?; $p2 = ?; $p3 = ?;
+				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
+					array($p1,$p2,$p3));
+			}
+		
+		Usage:
+			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
+			$DB->Bind($stmt, $p1);
+			$DB->Bind($stmt, $p2);
+			$DB->Bind($stmt, $p3);
+			for ($i = 0; $i < $max; $i++) {	
+				$p1 = ?; $p2 = ?; $p3 = ?;
+				$DB->Execute($stmt);
+			}
+			
+		Some timings:		
+			** Test table has 3 cols, and 1 index. Test to insert 1000 records
+			Time 0.6081s (1644.60 inserts/sec) with direct OCIParse/OCIExecute
+			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
+			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
+			
+		Now if PHP only had batch/bulk updating like Java or PL/SQL...
+	
+		Note that the order of parameters differs from OCIBindByName,
+		because we default the names to :0, :1, :2
+	*/
+	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false)
+	{
+		if (!is_array($stmt)) return false;
+        
+        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
+            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
+        }
+        
+		if ($name == false) {
+			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
+			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
+			$stmt[2] += 1;
+		} else {
+			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
+			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
+		}
+		
+		return $rez;
+	}
+	
+	function Param($name)
+	{
+		return ':'.$name;
+	}
+	
+	/* 
+	Usage:
+		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
+		$db->Parameter($stmt,$id,'myid');
+		$db->Parameter($stmt,$group,'group');
+		$db->Execute($stmt);
+		
+		@param $stmt Statement returned by Prepare() or PrepareSP().
+		@param $var PHP variable to bind to
+		@param $name Name of stored procedure variable name to bind to.
+		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
+		@param [$maxLen] Holds an maximum length of the variable.
+		@param [$type] The data type of $var. Legal values depend on driver.
+		
+		See OCIBindByName documentation at php.net.
+	*/
+	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
+	{
+			if  ($this->debug) {
+				$prefix = ($isOutput) ? 'Out' : 'In';
+				$ztype = (empty($type)) ? 'false' : $type;
+				ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
+			}
+			return $this->Bind($stmt,$var,$maxLen,$type,$name);
+	}
+	
+	/*
+	returns query ID if successful, otherwise false
+	this version supports:
+	
+	   1. $db->execute('select * from table');
+	   
+	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+		  $db->execute($prepared_statement, array(1,2,3));
+		  
+	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
+	   
+	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+		  $db->$bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
+		  $db->execute($stmt);
+	*/ 
+	function _query($sql,$inputarr)
+	{
+		
+		if (is_array($sql)) { // is prepared sql
+			$stmt = $sql[1];
+			
+			// we try to bind to permanent array, so that OCIBindByName is persistent
+			// and carried out once only - note that max array element size is 4000 chars
+			if (is_array($inputarr)) {
+				$bindpos = $sql[3];
+				if (isset($this->_bind[$bindpos])) {
+				// all tied up already
+					$bindarr = &$this->_bind[$bindpos];
+				} else {
+				// one statement to bind them all
+					$bindarr = array();
+					foreach($inputarr as $k => $v) {
+						$bindarr[$k] = $v;
+						OCIBindByName($stmt,":$k",$bindarr[$k],4000);
+					}
+					$this->_bind[$bindpos] = &$bindarr;
+				}
+			}
+		} else {
+			$stmt=OCIParse($this->_connectionID,$sql);
+		}
+			
+		$this->_stmt = $stmt;
+		if (!$stmt) return false;
+	
+		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
+			
+		if (is_array($inputarr)) {
+			foreach($inputarr as $k => $v) {
+				if (is_array($v)) {
+					if (sizeof($v) == 2) // suggested by g.giunta@libero.
+						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
+					else
+						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+					
+					if ($this->debug==99) echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'
    ';
+				} else {
+					$len = -1;
+					if ($v === ' ') $len = 1;
+					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
+						$bindarr[$k] = $v;
+					} else { 				// dynamic sql, so rebind every time
+						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+					}
+				}
+			}
+		}
+		
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+		if (OCIExecute($stmt,$this->_commit)) {
+		
+            switch (@OCIStatementType($stmt)) {
+                case "SELECT":
+					return $stmt;
+					
+                case "BEGIN":
+                    if (is_array($sql) && !empty($sql[4])) {
+						$cursor = $sql[4];
+						if (is_resource($cursor)) {
+							$ok = OCIExecute($cursor);	
+	                        return $cursor;
+						}
+						return $stmt;
+                    } else {
+						if (is_resource($stmt)) {
+							OCIFreeStatement($stmt);
+							return true;
+						}
+                        return $stmt;
+                    }
+                    break;
+                default :
+					// ociclose -- no because it could be used in a LOB?
+                    return true;
+            }
+		}
+		return false;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		if (!$this->autoCommit) OCIRollback($this->_connectionID);
+		OCILogoff($this->_connectionID);
+		$this->_stmt = false;
+		$this->_connectionID = false;
+	}
+	
+	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
+	{
+		if ($internalKey) return array('ROWID');
+		
+	// tested with oracle 8.1.7
+		$table = strtoupper($table);
+		if ($owner) {
+			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
+			$ptab = 'ALL_';
+		} else {
+			$owner_clause = '';
+			$ptab = 'USER_';
+		}
+		$sql = "
+SELECT /*+ RULE */ distinct b.column_name
+   FROM {$ptab}CONSTRAINTS a
+	  , {$ptab}CONS_COLUMNS b
+  WHERE ( UPPER(b.table_name) = ('$table'))
+	AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
+	$owner_clause
+	AND (a.constraint_name = b.constraint_name)";
+
+ 		$rs = $this->Execute($sql);
+		if ($rs && !$rs->EOF) {
+			$arr =& $rs->GetArray();
+			$a = array();
+			foreach($arr as $v) {
+				$a[] = reset($v);
+			}
+			return $a;
+		}
+		else return false;
+	}
+	
+	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
+	function MetaForeignKeys($table, $owner=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$table = $this->qstr(strtoupper($table));
+		if (!$owner) {
+			$owner = $this->user;
+			$tabp = 'user_';
+		} else
+			$tabp = 'all_';
+			
+		$owner = ' and owner='.$this->qstr(strtoupper($owner));
+		
+		$sql = 
+"select constraint_name,r_owner,r_constraint_name 
+	from {$tabp}constraints
+	where constraint_type = 'R' and table_name = $table $owner";
+		
+		$constraints =& $this->GetArray($sql);
+		$arr = false;
+		foreach($constraints as $constr) {
+			$cons = $this->qstr($constr[0]);
+			$rowner = $this->qstr($constr[1]);
+			$rcons = $this->qstr($constr[2]);
+			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
+			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
+			
+			if ($cols && $tabcol) 
+				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
+					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
+				}
+		}
+		$ADODB_FETCH_MODE = $save;
+		
+		return $arr;
+	}
+
+	
+	function CharMax()
+	{
+		return 4000;
+	}
+	
+	function TextMax()
+	{
+		return 4000;
+	}
+	
+	/**
+	 * Quotes a string.
+	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
+	 * 
+	 * @param s			the string to quote
+	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
+	 *				This undoes the stupidity of magic quotes for GPC.
+	 *
+	 * @return  quoted string to be sent back to database
+	 */
+	function qstr($s,$magic_quotes=false)
+	{	
+	$nofixquotes=false;
+	
+		if (is_array($s)) adodb_backtrace();
+		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
+		if (!$magic_quotes) {	
+			if ($this->replaceQuote[0] == '\\'){
+				$s = str_replace('\\','\\\\',$s);
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		
+		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
+			return "'$s'";
+		else {// change \' to '' for sybase/mssql
+			$s = str_replace('\\\\','\\',$s);
+			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+		}
+	}
+	
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8 extends ADORecordSet {
+
+	var $databaseType = 'oci8';
+	var $bind=false;
+	var $_fieldobjs;
+	//var $_arr = false;
+		
+	function ADORecordset_oci8($queryID,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		default:
+		case ADODB_FETCH_NUM: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		}
+
+		$this->_queryID = $queryID;
+	}
+
+
+	function Init()
+	{
+		if ($this->_inited) return;
+		
+		$this->_inited = true;
+		if ($this->_queryID) {
+			
+			$this->_currentRow = 0;
+			@$this->_initrs();
+			$this->EOF = !$this->_fetch();
+			
+			/*
+			// based on idea by Gaetano Giunta to detect unusual oracle errors
+			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
+			$err = OCIError($this->_queryID);
+			if ($err && $this->connection->debug) ADOConnection::outp($err);
+			*/
+			
+			if (!is_array($this->fields)) {
+				$this->_numOfRows = 0;
+				$this->fields = array();
+			}
+		} else {
+			$this->fields = array();
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+	}
+	
+	function _initrs()
+	{
+		$this->_numOfRows = -1;
+		$this->_numOfFields = OCInumcols($this->_queryID);
+		if ($this->_numOfFields>0) {
+			$this->_fieldobjs = array();
+			$max = $this->_numOfFields;
+			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
+		}
+	}
+
+	  /*		Returns: an object containing field information.
+			  Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+			  fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+			  fetchField() is retrieved.		*/
+
+	function &_FetchField($fieldOffset = -1)
+	{
+		$fld = new ADOFieldObject;
+		$fieldOffset += 1;
+		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
+		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
+		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
+	 	if ($fld->type == 'NUMBER') {
+	 		$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
+			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
+			if ($p != 0 && $sc == 0) $fld->type = 'INT';
+			//echo " $this->name ($p.$sc) ";
+	 	}
+		return $fld;
+	}
+	
+	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
+	function &FetchField($fieldOffset = -1)
+	{
+		return $this->_fieldobjs[$fieldOffset];
+	}
+	
+	
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
+		
+		if ($this->EOF) return false;
+		
+		$this->_currentRow++;
+		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
+			return true;
+		$this->EOF = true;
+		
+		return false;
+	}	
+	
+	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
+	function &GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) {
+			$arr =& $this->GetArray($nrows);
+			return $arr;
+		}
+		for ($i=1; $i < $offset; $i++) 
+			if (!@OCIFetch($this->_queryID)) return array();
+			
+		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return array();
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+
+
+	function _seek($row)
+	{
+		return false;
+	}
+
+	function _fetch() 
+	{
+		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
+	}
+
+	/*		close() only needs to be called if you are worried about using too much memory while your script
+			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
+
+	function _close() 
+	{
+		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
+		OCIFreeStatement($this->_queryID);
+ 		$this->_queryID = false;
+		
+	}
+
+	function MetaType($t,$len=-1)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+	 	case 'VARCHAR':
+	 	case 'VARCHAR2':
+		case 'CHAR':
+		case 'VARBINARY':
+		case 'BINARY':
+		case 'NCHAR':
+		case 'NVARCHAR':
+		case 'NVARCHAR2':
+				 if (isset($this) && $len <= $this->blobSize) return 'C';
+		
+		case 'NCLOB':
+		case 'LONG':
+		case 'LONG VARCHAR':
+		case 'CLOB':
+		return 'X';
+		
+		case 'LONG RAW':
+		case 'LONG VARBINARY':
+		case 'BLOB':
+			return 'B';
+		
+		case 'DATE': 
+			return  ($this->connection->datetime) ? 'T' : 'D';
+		
+		
+		case 'TIMESTAMP': return 'T';
+		
+		case 'INT': 
+		case 'SMALLINT':
+		case 'INTEGER': 
+			return 'I';
+			
+		default: return 'N';
+		}
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-oci805.inc.php b/lib/adodb/drivers/adodb-oci805.inc.php
index 4dde2b363b8..51f61d44cca 100644
--- a/lib/adodb/drivers/adodb-oci805.inc.php
+++ b/lib/adodb/drivers/adodb-oci805.inc.php
@@ -1,56 +1,56 @@
-ADODB_oci8();
-	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// seems that oracle only supports 1 hint comment in 8i
-		if (strpos($sql,'/*+') !== false)
-			$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-		else
-			$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		
-		/* 
-			The following is only available from 8.1.5 because order by in inline views not 
-			available before then...
-			http://www.jlcomp.demon.co.uk/faq/top_sql.html
-		if ($nrows > 0) {	
-			if ($offset > 0) $nrows += $offset;
-			$sql = "select * from ($sql) where rownum <= $nrows";
-			$nrows = -1;
-		}
-		*/
-
-		return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-	}
-}
-
-class ADORecordset_oci805 extends ADORecordset_oci8 {	
-	var $databaseType = "oci805";
-	function ADORecordset_oci805($id,$mode=false)
-	{
-		$this->ADORecordset_oci8($id,$mode);
-	}
-}
+ADODB_oci8();
+	}
+	
+	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		// seems that oracle only supports 1 hint comment in 8i
+		if (strpos($sql,'/*+') !== false)
+			$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
+		else
+			$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
+		
+		/* 
+			The following is only available from 8.1.5 because order by in inline views not 
+			available before then...
+			http://www.jlcomp.demon.co.uk/faq/top_sql.html
+		if ($nrows > 0) {	
+			if ($offset > 0) $nrows += $offset;
+			$sql = "select * from ($sql) where rownum <= $nrows";
+			$nrows = -1;
+		}
+		*/
+
+		return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+	}
+}
+
+class ADORecordset_oci805 extends ADORecordset_oci8 {	
+	var $databaseType = "oci805";
+	function ADORecordset_oci805($id,$mode=false)
+	{
+		$this->ADORecordset_oci8($id,$mode);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-oci8po.inc.php b/lib/adodb/drivers/adodb-oci8po.inc.php
index 2d91f8a722f..1cccd8efe39 100644
--- a/lib/adodb/drivers/adodb-oci8po.inc.php
+++ b/lib/adodb/drivers/adodb-oci8po.inc.php
@@ -1,190 +1,190 @@
-
-
-   Should some emulation of RecordCount() be implemented?
-  
-*/
-
-include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
-
-class ADODB_oci8po extends ADODB_oci8 {
-	var $databaseType = 'oci8po';
-	var $dataProvider = 'oci8';
-	var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
-	var $metaTablesSQL = "select lower(table_name),table_type from cat where table_type in ('TABLE','VIEW')";
-	
-	function ADODB_oci8po()
-	{
-		$this->ADODB_oci8();
-	}
-	
-	function Param($name)
-	{
-		return '?';
-	}
-	
-	function Prepare($sql)
-	{
-		$sqlarr = explode('?',$sql);
-		$sql = $sqlarr[0];
-		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-			$sql .=  ':'.($i-1) . $sqlarr[$i];
-		} 
-		return ADODB_oci8::Prepare($sql);
-	}
-	
-	// emulate handling of parameters ? ?, replacing with :bind0 :bind1
-	function _query($sql,$inputarr)
-	{
-		if (is_array($inputarr)) {
-			$i = 0;
-			if (is_array($sql)) {
-				foreach($inputarr as $v) {
-					$arr['bind'.$i++] = $v;
-				} 
-			} else {
-				$sqlarr = explode('?',$sql);
-				$sql = $sqlarr[0];
-				foreach($inputarr as $k => $v) {
-					$sql .=  ":$k" . $sqlarr[++$i];
-				}
-			}
-		}
-		return ADODB_oci8::_query($sql,$inputarr);
-	}
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8po extends ADORecordset_oci8 {
-
-	var $databaseType = 'oci8po';
-	
-		function ADORecordset_oci8po($queryID,$mode=false)
-		{
-			$this->ADORecordset_oci8($queryID,$mode);
-		}
-
-		function Fields($colname)
-		{
-			if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname];
-			
-			if (!$this->bind) {
-				$this->bind = array();
-				for ($i=0; $i < $this->_numOfFields; $i++) {
-					$o = $this->FetchField($i);
-					$this->bind[strtoupper($o->name)] = $i;
-				}
-			}
-			 return $this->fields[$this->bind[strtoupper($colname)]];
-		}
-		
-		// lowercase field names...
- 		function &_FetchField($fieldOffset = -1)
-		{
-				 $fld = new ADOFieldObject;
-		 		 $fieldOffset += 1;
-				 $fld->name = strtolower(OCIcolumnname($this->_queryID, $fieldOffset));
-				 $fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-				 $fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-				 if ($fld->type == 'NUMBER') {
-				 	//$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-					$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-					if ($sc == 0) $fld->type = 'INT';
-				 }
-				 return $fld;
-		}
-
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-	
-		if (!$this->EOF) {		
-			$this->_currentRow++;
-			if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			global $ADODB_ANSI_PADDING_OFF;
-	
-				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-				if (!empty($ADODB_ANSI_PADDING_OFF)) {
-					foreach($this->fields as $k => $v) {
-						if (is_string($v)) $this->fields[$k] = rtrim($v);
-					}
-				}
-				return true;
-			}
-			$this->EOF = true;
-		}
-		return false;
-	}	
-	
-	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) return $this->GetArray($nrows);
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) return array();
-			
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return array();
-		if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-
-	// Create associative array
-	function _updatefields()
-	{
-		if (ADODB_ASSOC_CASE == 2) return; // native
-	
-		$arr = array();
-		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
-		foreach($this->fields as $k => $v) {
-			if (is_integer($k)) $arr[$k] = $v;
-			else {
-				if ($lowercase)
-					$arr[strtolower($k)] = $v;
-				else
-					$arr[strtoupper($k)] = $v;
-			}
-		}
-		$this->fields = $arr;
-	}
-	
-	function _fetch() 
-	{
-		$ret = @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-		if ($ret) {
-		global $ADODB_ANSI_PADDING_OFF;
-	
-				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-				if (!empty($ADODB_ANSI_PADDING_OFF)) {
-					foreach($this->fields as $k => $v) {
-						if (is_string($v)) $this->fields[$k] = rtrim($v);
-					}
-				}
-		}
-		return $ret;
-	}
-	
-}
+
+
+   Should some emulation of RecordCount() be implemented?
+  
+*/
+
+include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
+
+class ADODB_oci8po extends ADODB_oci8 {
+	var $databaseType = 'oci8po';
+	var $dataProvider = 'oci8';
+	var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
+	var $metaTablesSQL = "select lower(table_name),table_type from cat where table_type in ('TABLE','VIEW')";
+	
+	function ADODB_oci8po()
+	{
+		$this->ADODB_oci8();
+	}
+	
+	function Param($name)
+	{
+		return '?';
+	}
+	
+	function Prepare($sql,$cursor=false)
+	{
+		$sqlarr = explode('?',$sql);
+		$sql = $sqlarr[0];
+		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
+			$sql .=  ':'.($i-1) . $sqlarr[$i];
+		} 
+		return ADODB_oci8::Prepare($sql,$cursor);
+	}
+	
+	// emulate handling of parameters ? ?, replacing with :bind0 :bind1
+	function _query($sql,$inputarr)
+	{
+		if (is_array($inputarr)) {
+			$i = 0;
+			if (is_array($sql)) {
+				foreach($inputarr as $v) {
+					$arr['bind'.$i++] = $v;
+				} 
+			} else {
+				$sqlarr = explode('?',$sql);
+				$sql = $sqlarr[0];
+				foreach($inputarr as $k => $v) {
+					$sql .=  ":$k" . $sqlarr[++$i];
+				}
+			}
+		}
+		return ADODB_oci8::_query($sql,$inputarr);
+	}
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8po extends ADORecordset_oci8 {
+
+	var $databaseType = 'oci8po';
+	
+		function ADORecordset_oci8po($queryID,$mode=false)
+		{
+			$this->ADORecordset_oci8($queryID,$mode);
+		}
+
+		function Fields($colname)
+		{
+			if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname];
+			
+			if (!$this->bind) {
+				$this->bind = array();
+				for ($i=0; $i < $this->_numOfFields; $i++) {
+					$o = $this->FetchField($i);
+					$this->bind[strtoupper($o->name)] = $i;
+				}
+			}
+			 return $this->fields[$this->bind[strtoupper($colname)]];
+		}
+		
+		// lowercase field names...
+ 		function &_FetchField($fieldOffset = -1)
+		{
+				 $fld = new ADOFieldObject;
+		 		 $fieldOffset += 1;
+				 $fld->name = strtolower(OCIcolumnname($this->_queryID, $fieldOffset));
+				 $fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
+				 $fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
+				 if ($fld->type == 'NUMBER') {
+				 	//$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
+					$sc = OCIColumnScale($this->_queryID, $fieldOffset);
+					if ($sc == 0) $fld->type = 'INT';
+				 }
+				 return $fld;
+		}
+
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+	
+		if (!$this->EOF) {		
+			$this->_currentRow++;
+			if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+			global $ADODB_ANSI_PADDING_OFF;
+	
+				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+				if (!empty($ADODB_ANSI_PADDING_OFF)) {
+					foreach($this->fields as $k => $v) {
+						if (is_string($v)) $this->fields[$k] = rtrim($v);
+					}
+				}
+				return true;
+			}
+			$this->EOF = true;
+		}
+		return false;
+	}	
+	
+	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
+	function &GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) return $this->GetArray($nrows);
+		for ($i=1; $i < $offset; $i++) 
+			if (!@OCIFetch($this->_queryID)) return array();
+			
+		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return array();
+		if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+
+	// Create associative array
+	function _updatefields()
+	{
+		if (ADODB_ASSOC_CASE == 2) return; // native
+	
+		$arr = array();
+		$lowercase = (ADODB_ASSOC_CASE == 0);
+		
+		foreach($this->fields as $k => $v) {
+			if (is_integer($k)) $arr[$k] = $v;
+			else {
+				if ($lowercase)
+					$arr[strtolower($k)] = $v;
+				else
+					$arr[strtoupper($k)] = $v;
+			}
+		}
+		$this->fields = $arr;
+	}
+	
+	function _fetch() 
+	{
+		$ret = @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
+		if ($ret) {
+		global $ADODB_ANSI_PADDING_OFF;
+	
+				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+				if (!empty($ADODB_ANSI_PADDING_OFF)) {
+					foreach($this->fields as $k => $v) {
+						if (is_string($v)) $this->fields[$k] = rtrim($v);
+					}
+				}
+		}
+		return $ret;
+	}
+	
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-odbc.inc.php b/lib/adodb/drivers/adodb-odbc.inc.php
index aff3efa390f..79aadef54b4 100644
--- a/lib/adodb/drivers/adodb-odbc.inc.php
+++ b/lib/adodb/drivers/adodb-odbc.inc.php
@@ -1,712 +1,710 @@
-_haserrorfunctions = ADODB_PHPVER >= 0x4050;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}
-	
-	function ServerInfo()
-	{
-	
-		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
-			$dsn = strtoupper($this->host);
-			$first = true;
-			$found = false;
-			
-			if (!function_exists('odbc_data_source')) return false;
-			
-			while(true) {
-				
-				$rez = odbc_data_source($this->_connectionID,
-					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
-				$first = false;
-				if (!is_array($rez)) break;
-				if (strtoupper($rez['server']) == $dsn) {
-					$found = true;
-					break;
-				}
-			} 
-			if (!$found) return ADOConnection::ServerInfo();
-			if (!isset($rez['version'])) $rez['version'] = '';
-			return $rez;
-		} else {
-			return ADOConnection::ServerInfo();
-		}
-	}
-
-	
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		$start -= 1;
-		return $this->Execute("insert into $seqname values($start)");
-	}
-	
-	var $_dropSeqSQL = 'drop table %s';
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-	
-	/*
-		This algorithm is not very efficient, but works even if table locking
-		is not available.
-		
-		Will return false if unable to generate an ID after $MAXLOOPS attempts.
-	*/
-	function GenID($seq='adodbseq',$start=1)
-	{	
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$MAXLOOPS = 100;
-		//$this->debug=1;
-		while (--$MAXLOOPS>=0) {
-			$num = $this->GetOne("select id from $seq");
-			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
-				$start -= 1;
-				$num = '0';
-				$ok = $this->Execute("insert into $seq values($start)");
-				if (!$ok) return false;
-			} 
-			$this->Execute("update $seq set id=id+1 where id=$num");
-			
-			if ($this->affected_rows() > 0) {
-				$num += 1;
-				$this->genID = $num;
-				return $num;
-			}
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-		}
-		return false;
-	}
-
-
-	function ErrorMsg()
-	{
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorMsg !== false) return $this->_errorMsg;
-			if (empty($this->_connectionID)) return @odbc_errormsg();
-			return @odbc_errormsg($this->_connectionID);
-		} else return ADOConnection::ErrorMsg();
-	}
-	
-	function ErrorNo()
-	{
-		
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorCode !== false) {
-				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
-			}
-
-			if (empty($this->_connectionID)) $e = @odbc_error(); 
-			else $e = @odbc_error($this->_connectionID);
-			
-			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-			 // so we check and patch
-			if (strlen($e)<=2) return 0;
-			return $e;
-		} else return ADOConnection::ErrorNo();
-	}
-	
-	
-	// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-		
-		if (!function_exists('odbc_connect')) return false;
-		
-		if ($this->debug && $argDatabasename) {
-			ADOConnection::outp("For odbc Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
-		}
-		$php_errormsg = '';
-		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
-		else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
-		$this->_errorMsg = $php_errormsg;
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
-		return $this->_connectionID != false;
-	}
-	
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-	
-		if (!function_exists('odbc_connect')) return false;
-		
-		$php_errormsg = '';
-		if ($this->debug && $argDatabasename) {
-			ADOConnection::outp("For odbc PConnect(), $argDatabasename is not used. Place dsn in 1st parameter.");
-		}
-	//	print "dsn=$argDSN u=$argUsername p=$argPassword
    "; flush();
-		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
-		else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
-		
-		$this->_errorMsg = $php_errormsg;
-		if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-
-	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-		$this->_autocommit = false;
-		return odbc_autocommit($this->_connectionID,false);
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = odbc_commit($this->_connectionID);
-		odbc_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = odbc_rollback($this->_connectionID);
-		odbc_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = @odbc_primarykeys($this->_connectionID,'','',$table);
-		
-		if (!$qid) {
-			$ADODB_FETCH_MODE = $savem;
-			return false;
-		}
-		$rs = new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return false;
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
-		$rs->Close();
-		//print_r($arr);
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-		}
-		return $arr2;
-	}
-	
-	
-	
-	function &MetaTables($ttype=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
-		
-		$rs = new ADORecordSet_odbc($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) return false;
-		
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
-		//print_r($arr);
-		
-		$rs->Close();
-		$arr2 = array();
-		
-		if ($ttype) {
-			$isview = strncmp($ttype,'V',1) === 0;
-		}
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if (!$arr[$i][2]) continue;
-			$type = $arr[$i][3];
-			if ($ttype) { 
-				if ($isview) {
-					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
-				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
-			} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}
-	
-/*
-/ SQL data type codes /
-#define	SQL_UNKNOWN_TYPE	0
-#define SQL_CHAR			1
-#define SQL_NUMERIC		 2
-#define SQL_DECIMAL		 3
-#define SQL_INTEGER		 4
-#define SQL_SMALLINT		5
-#define SQL_FLOAT		   6
-#define SQL_REAL			7
-#define SQL_DOUBLE		  8
-#if (ODBCVER >= 0x0300)
-#define SQL_DATETIME		9
-#endif
-#define SQL_VARCHAR		12
-
-/ One-parameter shortcuts for date/time data types /
-#if (ODBCVER >= 0x0300)
-#define SQL_TYPE_DATE	  91
-#define SQL_TYPE_TIME	  92
-#define SQL_TYPE_TIMESTAMP 93
-
-#define SQL_UNICODE                             (-95)
-#define SQL_UNICODE_VARCHAR                     (-96)
-#define SQL_UNICODE_LONGVARCHAR                 (-97)
-*/
-	function ODBCTypes($t)
-	{
-		switch ((integer)$t) {
-		case 1:	
-		case 12:
-		case 0:
-		case -95:
-		case -96:
-			return 'C';
-		case -97:
-		case -1: //text
-			return 'X';
-		case -4: //image
-			return 'B';
-				
-		case 91:
-		case 11:
-			return 'D';
-			
-		case 92:
-		case 93:
-		case 9:	return 'T';
-		case 4:
-		case 5:
-		case -6:
-			return 'I';
-			
-		case -11: // uniqidentifier
-			return 'R';
-		case -7: //bit
-			return 'L';
-		
-		default:
-			return 'N';
-		}
-	}
-	
-	function &MetaColumns($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$table = strtoupper($table);
-		$schema = false;
-		$this->_findschema($table,$schema);
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-		if (false) { // after testing, confirmed that the following does not work becoz of a bug
-			$qid2 = odbc_tables($this->_connectionID);
-			$rs = new ADORecordSet_odbc($qid2);		
-			$ADODB_FETCH_MODE = $savem;
-			if (!$rs) return false;
-			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-			$rs->_fetch();
-			
-			while (!$rs->EOF) {
-				if ($table == strtoupper($rs->fields[2])) {
-					$q = $rs->fields[0];
-					$o = $rs->fields[1];
-					break;
-				}
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			
-			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
-		} else switch ($this->databaseType) {
-		case 'access':
-		case 'vfp':
-		case 'db2':
-			$qid = odbc_columns($this->_connectionID);
-			break;
-			
-		default:
-			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
-			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
-			break;
-		}
-		if (empty($qid)) return false;
-		
-		$rs = new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return false;
-		
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		$rs->_fetch();
-		$retarr = array();
-		
-		/*
-		$rs->fields indices
-		0 TABLE_QUALIFIER
-		1 TABLE_SCHEM
-		2 TABLE_NAME
-		3 COLUMN_NAME
-		4 DATA_TYPE
-		5 TYPE_NAME
-		6 PRECISION
-		7 LENGTH
-		8 SCALE
-		9 RADIX
-		10 NULLABLE
-		11 REMARKS
-		*/
-		while (!$rs->EOF) {
-			//adodb_pr($rs->fields);
-			if (strtoupper($rs->fields[2]) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[3];
-				$fld->type = $this->ODBCTypes($rs->fields[4]);
-				
-				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
-				// access uses precision to store length for char/varchar
-				if ($fld->type == 'C' or $fld->type == 'X') {
-					if ($this->databaseType == 'access') 
-						$fld->max_length = $rs->fields[6];
-					else if ($rs->fields[4] <= -95) // UNICODE
-						$fld->max_length = $rs->fields[7]/2;
-					else
-						$fld->max_length = $rs->fields[7];
-				} else 
-					$fld->max_length = $rs->fields[7];
-				$fld->not_null = !empty($rs->fields[10]);
-				$fld->scale = $rs->fields[8];
-				$retarr[strtoupper($fld->name)] = $fld;	
-			} else if (sizeof($retarr)>0)
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close(); //-- crashes 4.03pl1 -- why?
-		
-		return $retarr;
-	}
-	
-	function Prepare($sql)
-	{
-		if (! $this->_bindInputArray) return $sql; // no binding
-		$stmt = odbc_prepare($this->_connectionID,$sql);
-		if (!$stmt) {
-		//	print "Prepare Error for ($sql) ".$this->ErrorMsg()."
    ";
-			return $sql;
-		}
-		return array($sql,$stmt,false);
-	}
-
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-	GLOBAL $php_errormsg;
-		$php_errormsg = '';
-		$this->_error = '';
-		
-		if ($inputarr) {
-			if (is_array($sql)) {
-				$stmtid = $sql[1];
-			} else {
-				$stmtid = odbc_prepare($this->_connectionID,$sql);
-	
-				if ($stmtid == false) {
-					$this->_errorMsg = $php_errormsg;
-					return false;
-				}
-			}
-			
-			if (! odbc_execute($stmtid,$inputarr)) {
-				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
-				return false;
-			}
-		
-		} else if (is_array($sql)) {
-			$stmtid = $sql[1];
-			if (!odbc_execute($stmtid)) {
-				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
-				return false;
-			}
-		} else
-			$stmtid = odbc_exec($this->_connectionID,$sql);
-		
-		$this->_lastAffectedRows = 0;
-		if ($stmtid) {
-			if (@odbc_num_fields($stmtid) == 0) {
-				$this->_lastAffectedRows = odbc_num_rows($stmtid);
-				$stmtid = true;
-			} else {
-				$this->_lastAffectedRows = 0;
-				odbc_binmode($stmtid,$this->binmode);
-				odbc_longreadlen($stmtid,$this->maxblobsize);
-			}
-			
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = '';
-				$this->_errorCode = 0;
-			} else
-				$this->_errorMsg = $php_errormsg;
-		} else {
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = odbc_errormsg();
-				$this->_errorCode = odbc_error();
-			} else
-				$this->_errorMsg = $php_errormsg;
-		}
-		
-		
-		return $stmtid;
-	}
-
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-		
-		Usage:
-		 
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		$ret = @odbc_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $ret;
-	}
-
-	function _affectedrows()
-	{
-		return $this->_lastAffectedRows;
-	}
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_odbc extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "odbc";		
-	var $dataProvider = "odbc";
-	var $useFetchArray;
-	var $_has_stupid_odbc_fetch_api_change;
-	
-	function ADORecordSet_odbc($id,$mode=false)
-	{
-		if ($mode === false) {  
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $id;
-		
-		// the following is required for mysql odbc driver in 4.3.1 -- why?
-		$this->EOF = false;
-		$this->_currentRow = -1;
-		//$this->ADORecordSet($id);
-	}
-
-
-	// returns the field object
-	function &FetchField($fieldOffset = -1) 
-	{
-		
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$o->name = @odbc_field_name($this->_queryID,$off);
-		$o->type = @odbc_field_type($this->_queryID,$off);
-		$o->max_length = @odbc_field_len($this->_queryID,$off);
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-		
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @odbc_num_rows($this->_queryID) : -1;
-		$this->_numOfFields = @odbc_num_fields($this->_queryID);
-		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
-		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
-		//$this->useFetchArray = $this->connection->useFetchArray;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}	
-	
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$rs =& $this->GetArray($nrows);
-			return $rs;
-		}
-		$savem = $this->fetchMode;
-		$this->fetchMode = ADODB_FETCH_NUM;
-		$this->Move($offset);
-		$this->fetchMode = $savem;
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-	
-	
-	function MoveNext() 
-	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
-			$this->_currentRow++;
-			$row = 0;
-			if ($this->_has_stupid_odbc_fetch_api_change)
-				$rez = @odbc_fetch_into($this->_queryID,$this->fields);
-			else 
-				$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
-			if ($rez) {
-				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-					$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				}
-				return true;
-			}
-		}
-		$this->fields = false;
-		$this->EOF = true;
-		return false;
-	}	
-	
-	function _fetch()
-	{
-		$row = 0;
-		if ($this->_has_stupid_odbc_fetch_api_change)
-			$rez = @odbc_fetch_into($this->_queryID,$this->fields,$row);
-		else 
-			$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
-		
-		if ($rez) {
-			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-				$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-			}
-			return true;
-		}
-		$this->fields = false;
-		return false;
-	}
-	
-	function _close() 
-	{
-		return @odbc_free_result($this->_queryID);		
-	}
-
-}
-
-?>
+_haserrorfunctions = ADODB_PHPVER >= 0x4050;
+		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
+	}
+	
+	function ServerInfo()
+	{
+	
+		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
+			$dsn = strtoupper($this->host);
+			$first = true;
+			$found = false;
+			
+			if (!function_exists('odbc_data_source')) return false;
+			
+			while(true) {
+				
+				$rez = odbc_data_source($this->_connectionID,
+					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
+				$first = false;
+				if (!is_array($rez)) break;
+				if (strtoupper($rez['server']) == $dsn) {
+					$found = true;
+					break;
+				}
+			} 
+			if (!$found) return ADOConnection::ServerInfo();
+			if (!isset($rez['version'])) $rez['version'] = '';
+			return $rez;
+		} else {
+			return ADOConnection::ServerInfo();
+		}
+	}
+
+	
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		$start -= 1;
+		return $this->Execute("insert into $seqname values($start)");
+	}
+	
+	var $_dropSeqSQL = 'drop table %s';
+	function DropSequence($seqname)
+	{
+		if (empty($this->_dropSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+	
+	/*
+		This algorithm is not very efficient, but works even if table locking
+		is not available.
+		
+		Will return false if unable to generate an ID after $MAXLOOPS attempts.
+	*/
+	function GenID($seq='adodbseq',$start=1)
+	{	
+		// if you have to modify the parameter below, your database is overloaded,
+		// or you need to implement generation of id's yourself!
+		$MAXLOOPS = 100;
+		//$this->debug=1;
+		while (--$MAXLOOPS>=0) {
+			$num = $this->GetOne("select id from $seq");
+			if ($num === false) {
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$start -= 1;
+				$num = '0';
+				$ok = $this->Execute("insert into $seq values($start)");
+				if (!$ok) return false;
+			} 
+			$this->Execute("update $seq set id=id+1 where id=$num");
+			
+			if ($this->affected_rows() > 0) {
+				$num += 1;
+				$this->genID = $num;
+				return $num;
+			}
+		}
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
+		}
+		return false;
+	}
+
+
+	function ErrorMsg()
+	{
+		if ($this->_haserrorfunctions) {
+			if ($this->_errorMsg !== false) return $this->_errorMsg;
+			if (empty($this->_connectionID)) return @odbc_errormsg();
+			return @odbc_errormsg($this->_connectionID);
+		} else return ADOConnection::ErrorMsg();
+	}
+	
+	function ErrorNo()
+	{
+		
+		if ($this->_haserrorfunctions) {
+			if ($this->_errorCode !== false) {
+				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
+			}
+
+			if (empty($this->_connectionID)) $e = @odbc_error(); 
+			else $e = @odbc_error($this->_connectionID);
+			
+			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+			 // so we check and patch
+			if (strlen($e)<=2) return 0;
+			return $e;
+		} else return ADOConnection::ErrorNo();
+	}
+	
+	
+	// returns true or false
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+		
+		if (!function_exists('odbc_connect')) return false;
+		
+		if ($this->debug && $argDatabasename) {
+			ADOConnection::outp("For odbc Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
+		}
+		$php_errormsg = '';
+		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
+		else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
+		$this->_errorMsg = $php_errormsg;
+		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+		
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+	
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+	
+		if (!function_exists('odbc_connect')) return false;
+		
+		$php_errormsg = '';
+		if ($this->debug && $argDatabasename) {
+			ADOConnection::outp("For odbc PConnect(), $argDatabasename is not used. Place dsn in 1st parameter.");
+		}
+	//	print "dsn=$argDSN u=$argUsername p=$argPassword
    "; flush();
+		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
+		else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
+		
+		$this->_errorMsg = $php_errormsg;
+		if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
+		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+		
+		return $this->_connectionID != false;
+	}
+
+	function BeginTrans()
+	{	
+		if (!$this->hasTransactions) return false;
+		if ($this->transOff) return true; 
+		$this->transCnt += 1;
+		$this->_autocommit = false;
+		return odbc_autocommit($this->_connectionID,false);
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->_autocommit = true;
+		$ret = odbc_commit($this->_connectionID);
+		odbc_autocommit($this->_connectionID,true);
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true; 
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->_autocommit = true;
+		$ret = odbc_rollback($this->_connectionID);
+		odbc_autocommit($this->_connectionID,true);
+		return $ret;
+	}
+	
+	function MetaPrimaryKeys($table)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = @odbc_primarykeys($this->_connectionID,'','',$table);
+		
+		if (!$qid) {
+			$ADODB_FETCH_MODE = $savem;
+			return false;
+		}
+		$rs = new ADORecordSet_odbc($qid);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if (!$rs) return false;
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		
+		$arr =& $rs->GetArray();
+		$rs->Close();
+		//print_r($arr);
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
+		}
+		return $arr2;
+	}
+	
+	
+	
+	function &MetaTables($ttype=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = odbc_tables($this->_connectionID);
+		
+		$rs = new ADORecordSet_odbc($qid);
+		
+		$ADODB_FETCH_MODE = $savem;
+		if (!$rs) return false;
+		
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		
+		$arr =& $rs->GetArray();
+		//print_r($arr);
+		
+		$rs->Close();
+		$arr2 = array();
+		
+		if ($ttype) {
+			$isview = strncmp($ttype,'V',1) === 0;
+		}
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if (!$arr[$i][2]) continue;
+			$type = $arr[$i][3];
+			if ($ttype) { 
+				if ($isview) {
+					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
+				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+			} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+		}
+		return $arr2;
+	}
+	
+/*
+/ SQL data type codes /
+#define	SQL_UNKNOWN_TYPE	0
+#define SQL_CHAR			1
+#define SQL_NUMERIC		 2
+#define SQL_DECIMAL		 3
+#define SQL_INTEGER		 4
+#define SQL_SMALLINT		5
+#define SQL_FLOAT		   6
+#define SQL_REAL			7
+#define SQL_DOUBLE		  8
+#if (ODBCVER >= 0x0300)
+#define SQL_DATETIME		9
+#endif
+#define SQL_VARCHAR		12
+
+/ One-parameter shortcuts for date/time data types /
+#if (ODBCVER >= 0x0300)
+#define SQL_TYPE_DATE	  91
+#define SQL_TYPE_TIME	  92
+#define SQL_TYPE_TIMESTAMP 93
+
+#define SQL_UNICODE                             (-95)
+#define SQL_UNICODE_VARCHAR                     (-96)
+#define SQL_UNICODE_LONGVARCHAR                 (-97)
+*/
+	function ODBCTypes($t)
+	{
+		switch ((integer)$t) {
+		case 1:	
+		case 12:
+		case 0:
+		case -95:
+		case -96:
+			return 'C';
+		case -97:
+		case -1: //text
+			return 'X';
+		case -4: //image
+			return 'B';
+				
+		case 91:
+		case 11:
+			return 'D';
+			
+		case 92:
+		case 93:
+		case 9:	return 'T';
+		case 4:
+		case 5:
+		case -6:
+			return 'I';
+			
+		case -11: // uniqidentifier
+			return 'R';
+		case -7: //bit
+			return 'L';
+		
+		default:
+			return 'N';
+		}
+	}
+	
+	function &MetaColumns($table)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$table = strtoupper($table);
+		$schema = false;
+		$this->_findschema($table,$schema);
+		
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	
+		if (false) { // after testing, confirmed that the following does not work becoz of a bug
+			$qid2 = odbc_tables($this->_connectionID);
+			$rs = new ADORecordSet_odbc($qid2);		
+			$ADODB_FETCH_MODE = $savem;
+			if (!$rs) return false;
+			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+			$rs->_fetch();
+			
+			while (!$rs->EOF) {
+				if ($table == strtoupper($rs->fields[2])) {
+					$q = $rs->fields[0];
+					$o = $rs->fields[1];
+					break;
+				}
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			
+			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
+		} else switch ($this->databaseType) {
+		case 'access':
+		case 'vfp':
+		case 'db2':
+			$qid = odbc_columns($this->_connectionID);
+			break;
+			
+		default:
+			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
+			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
+			break;
+		}
+		if (empty($qid)) return false;
+		
+		$rs = new ADORecordSet_odbc($qid);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if (!$rs) return false;
+		
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		$rs->_fetch();
+		$retarr = array();
+		
+		/*
+		$rs->fields indices
+		0 TABLE_QUALIFIER
+		1 TABLE_SCHEM
+		2 TABLE_NAME
+		3 COLUMN_NAME
+		4 DATA_TYPE
+		5 TYPE_NAME
+		6 PRECISION
+		7 LENGTH
+		8 SCALE
+		9 RADIX
+		10 NULLABLE
+		11 REMARKS
+		*/
+		while (!$rs->EOF) {
+			//adodb_pr($rs->fields);
+			if (strtoupper($rs->fields[2]) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[3];
+				$fld->type = $this->ODBCTypes($rs->fields[4]);
+				
+				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
+				// access uses precision to store length for char/varchar
+				if ($fld->type == 'C' or $fld->type == 'X') {
+					if ($this->databaseType == 'access') 
+						$fld->max_length = $rs->fields[6];
+					else if ($rs->fields[4] <= -95) // UNICODE
+						$fld->max_length = $rs->fields[7]/2;
+					else
+						$fld->max_length = $rs->fields[7];
+				} else 
+					$fld->max_length = $rs->fields[7];
+				$fld->not_null = !empty($rs->fields[10]);
+				$fld->scale = $rs->fields[8];
+				$retarr[strtoupper($fld->name)] = $fld;	
+			} else if (sizeof($retarr)>0)
+				break;
+			$rs->MoveNext();
+		}
+		$rs->Close(); //-- crashes 4.03pl1 -- why?
+		
+		return $retarr;
+	}
+	
+	function Prepare($sql)
+	{
+		if (! $this->_bindInputArray) return $sql; // no binding
+		$stmt = odbc_prepare($this->_connectionID,$sql);
+		if (!$stmt) {
+			// we don't know whether odbc driver is parsing prepared stmts, so just return sql
+			return $sql;
+		}
+		return array($sql,$stmt,false);
+	}
+
+	/* returns queryID or false */
+	function _query($sql,$inputarr=false) 
+	{
+	GLOBAL $php_errormsg;
+		$php_errormsg = '';
+		$this->_error = '';
+		
+		if ($inputarr) {
+			if (is_array($sql)) {
+				$stmtid = $sql[1];
+			} else {
+				$stmtid = odbc_prepare($this->_connectionID,$sql);
+	
+				if ($stmtid == false) {
+					$this->_errorMsg = $php_errormsg;
+					return false;
+				}
+			}
+			
+			if (! odbc_execute($stmtid,$inputarr)) {
+				//@odbc_free_result($stmtid);
+				if ($this->_haserrorfunctions) {
+					$this->_errorMsg = odbc_errormsg();
+					$this->_errorCode = odbc_error();
+				}
+				return false;
+			}
+		
+		} else if (is_array($sql)) {
+			$stmtid = $sql[1];
+			if (!odbc_execute($stmtid)) {
+				//@odbc_free_result($stmtid);
+				if ($this->_haserrorfunctions) {
+					$this->_errorMsg = odbc_errormsg();
+					$this->_errorCode = odbc_error();
+				}
+				return false;
+			}
+		} else
+			$stmtid = odbc_exec($this->_connectionID,$sql);
+		
+		$this->_lastAffectedRows = 0;
+		if ($stmtid) {
+			if (@odbc_num_fields($stmtid) == 0) {
+				$this->_lastAffectedRows = odbc_num_rows($stmtid);
+				$stmtid = true;
+			} else {
+				$this->_lastAffectedRows = 0;
+				odbc_binmode($stmtid,$this->binmode);
+				odbc_longreadlen($stmtid,$this->maxblobsize);
+			}
+			
+			if ($this->_haserrorfunctions) {
+				$this->_errorMsg = '';
+				$this->_errorCode = 0;
+			} else
+				$this->_errorMsg = $php_errormsg;
+		} else {
+			if ($this->_haserrorfunctions) {
+				$this->_errorMsg = odbc_errormsg();
+				$this->_errorCode = odbc_error();
+			} else
+				$this->_errorMsg = $php_errormsg;
+		}
+		return $stmtid;
+	}
+
+	/*
+		Insert a null into the blob field of the table first.
+		Then use UpdateBlob to store the blob.
+		
+		Usage:
+		 
+		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		$ret = @odbc_close($this->_connectionID);
+		$this->_connectionID = false;
+		return $ret;
+	}
+
+	function _affectedrows()
+	{
+		return $this->_lastAffectedRows;
+	}
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_odbc extends ADORecordSet {	
+	
+	var $bind = false;
+	var $databaseType = "odbc";		
+	var $dataProvider = "odbc";
+	var $useFetchArray;
+	var $_has_stupid_odbc_fetch_api_change;
+	
+	function ADORecordSet_odbc($id,$mode=false)
+	{
+		if ($mode === false) {  
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		
+		$this->_queryID = $id;
+		
+		// the following is required for mysql odbc driver in 4.3.1 -- why?
+		$this->EOF = false;
+		$this->_currentRow = -1;
+		//$this->ADORecordSet($id);
+	}
+
+
+	// returns the field object
+	function &FetchField($fieldOffset = -1) 
+	{
+		
+		$off=$fieldOffset+1; // offsets begin at 1
+		
+		$o= new ADOFieldObject();
+		$o->name = @odbc_field_name($this->_queryID,$off);
+		$o->type = @odbc_field_type($this->_queryID,$off);
+		$o->max_length = @odbc_field_len($this->_queryID,$off);
+		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+		return $o;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+		
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @odbc_num_rows($this->_queryID) : -1;
+		$this->_numOfFields = @odbc_num_fields($this->_queryID);
+		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
+		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
+		//$this->useFetchArray = $this->connection->useFetchArray;
+		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
+	}	
+	
+	function _seek($row)
+	{
+		return false;
+	}
+	
+	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
+	function &GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) {
+			$rs =& $this->GetArray($nrows);
+			return $rs;
+		}
+		$savem = $this->fetchMode;
+		$this->fetchMode = ADODB_FETCH_NUM;
+		$this->Move($offset);
+		$this->fetchMode = $savem;
+		
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+		}
+		
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+	
+	
+	function MoveNext() 
+	{
+		if ($this->_numOfRows != 0 && !$this->EOF) {		
+			$this->_currentRow++;
+			$row = 0;
+			if ($this->_has_stupid_odbc_fetch_api_change)
+				$rez = @odbc_fetch_into($this->_queryID,$this->fields);
+			else 
+				$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
+			if ($rez) {
+				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+					$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+				}
+				return true;
+			}
+		}
+		$this->fields = false;
+		$this->EOF = true;
+		return false;
+	}	
+	
+	function _fetch()
+	{
+		$row = 0;
+		if ($this->_has_stupid_odbc_fetch_api_change)
+			$rez = @odbc_fetch_into($this->_queryID,$this->fields,$row);
+		else 
+			$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
+		
+		if ($rez) {
+			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+				$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+			}
+			return true;
+		}
+		$this->fields = false;
+		return false;
+	}
+	
+	function _close() 
+	{
+		return @odbc_free_result($this->_queryID);		
+	}
+
+}
+
+?>
diff --git a/lib/adodb/drivers/adodb-odbc_mssql.inc.php b/lib/adodb/drivers/adodb-odbc_mssql.inc.php
index 435bd73465f..4b3161245b9 100644
--- a/lib/adodb/drivers/adodb-odbc_mssql.inc.php
+++ b/lib/adodb/drivers/adodb-odbc_mssql.inc.php
@@ -1,239 +1,239 @@
-ADODB_odbc();
-		$this->curmode = SQL_CUR_USE_ODBC;	
-	}
-
-	// crashes php...
-	function ServerInfo()
-	{
-	global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$row = $this->GetRow("execute sp_server_info 2");
-		$ADODB_FETCH_MODE = $save;
-		if (!is_array($row)) return false;
-		$arr['description'] = $row[2];
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-
-	function IfNull( $field, $ifNull ) 
-	{
-		return " ISNULL($field, $ifNull) "; // if MS SQL Server
-	}
-	
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
-	// they are in the same stored procedure, function, or batch.
-			return $this->GetOne($this->identitySQL);
-	}
-	
-	
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
-"select object_name(constid) as constraint_name,
-	col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where upper(object_name(fkeyid)) = $table
-order by constraint_name, referenced_table_name, keyno";
-		
-		$constraints =& $this->GetArray($sql);
-		
-		$ADODB_FETCH_MODE = $save;
-		
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
-		}
-		if (!$arr) return false;
-		
-		$arr2 = false;
-		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {$this->debug=1;
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " AND name like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	function &MetaColumns($table)
-	{
-		return ADOConnection::MetaColumns($table);
-	}
-	
-	function _query($sql,$inputarr)
-	{
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		return ADODB_odbc::_query($sql,$inputarr);
-	}
-	
-	// "Stein-Aksel Basma" 
-	// tested with MSSQL 2000
-	function &MetaPrimaryKeys($table)
-	{
-		$sql = "select k.column_name from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
-		where tc.constraint_name = k.constraint_name and tc.constraint_type =
-		'PRIMARY KEY' and k.table_name = '$table'";
-		
-		$a = $this->GetCol($sql);
-		if ($a && sizeof($a)>0) return $a;
-		return false;	  
-	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0 && $offset <= 0) {
-			$sql = preg_replace(
-				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-			$rs =& $this->Execute($sql,$inputarr);
-		} else
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			
-		return $rs;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '+';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
-			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
-				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-
-} 
- 
-class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
-	
-	var $databaseType = 'odbc_mssql';
-	
-	function ADORecordSet_odbc_mssql($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}	
-}
+ADODB_odbc();
+		$this->curmode = SQL_CUR_USE_ODBC;	
+	}
+
+	// crashes php...
+	function ServerInfo()
+	{
+	global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$row = $this->GetRow("execute sp_server_info 2");
+		$ADODB_FETCH_MODE = $save;
+		if (!is_array($row)) return false;
+		$arr['description'] = $row[2];
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+
+	function IfNull( $field, $ifNull ) 
+	{
+		return " ISNULL($field, $ifNull) "; // if MS SQL Server
+	}
+	
+	function _insertid()
+	{
+	// SCOPE_IDENTITY()
+	// Returns the last IDENTITY value inserted into an IDENTITY column in 
+	// the same scope. A scope is a module -- a stored procedure, trigger, 
+	// function, or batch. Thus, two statements are in the same scope if 
+	// they are in the same stored procedure, function, or batch.
+			return $this->GetOne($this->identitySQL);
+	}
+	
+	
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$table = $this->qstr(strtoupper($table));
+		
+		$sql = 
+"select object_name(constid) as constraint_name,
+	col_name(fkeyid, fkey) as column_name,
+	object_name(rkeyid) as referenced_table_name,
+   	col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where upper(object_name(fkeyid)) = $table
+order by constraint_name, referenced_table_name, keyno";
+		
+		$constraints =& $this->GetArray($sql);
+		
+		$ADODB_FETCH_MODE = $save;
+		
+		$arr = false;
+		foreach($constraints as $constr) {
+			//print_r($constr);
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+		}
+		if (!$arr) return false;
+		
+		$arr2 = false;
+		
+		foreach($arr as $k => $v) {
+			foreach($v as $a => $b) {
+				if ($upper) $a = strtoupper($a);
+				$arr2[$a] = $b;
+			}
+		}
+		return $arr2;
+	}
+	
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		if ($mask) {$this->debug=1;
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr($mask);
+			$this->metaTablesSQL .= " AND name like $mask";
+		}
+		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	function &MetaColumns($table)
+	{
+		return ADOConnection::MetaColumns($table);
+	}
+	
+	function _query($sql,$inputarr)
+	{
+		if (is_string($sql)) $sql = str_replace('||','+',$sql);
+		return ADODB_odbc::_query($sql,$inputarr);
+	}
+	
+	// "Stein-Aksel Basma" 
+	// tested with MSSQL 2000
+	function &MetaPrimaryKeys($table)
+	{
+		$sql = "select k.column_name from information_schema.key_column_usage k,
+		information_schema.table_constraints tc 
+		where tc.constraint_name = k.constraint_name and tc.constraint_type =
+		'PRIMARY KEY' and k.table_name = '$table'";
+		
+		$a = $this->GetCol($sql);
+		if ($a && sizeof($a)>0) return $a;
+		return false;	  
+	}
+	
+	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		if ($nrows > 0 && $offset <= 0) {
+			$sql = preg_replace(
+				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
+			$rs =& $this->Execute($sql,$inputarr);
+		} else
+			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			
+		return $rs;
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '+';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "datename(yyyy,$col)";
+				break;
+			case 'M':
+				$s .= "convert(char(3),$col,0)";
+				break;
+			case 'm':
+				$s .= "replace(str(month($col),2),' ','0')";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "datename(quarter,$col)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "replace(str(day($col),2),' ','0')";
+				break;
+			case 'h':
+				$s .= "substring(convert(char(14),$col,0),13,2)";
+				break;
+			
+			case 'H':
+				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
+				break;
+				
+			case 'i':
+				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
+				break;
+			case 's':
+				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
+				break;
+			case 'a':
+			case 'A':
+				$s .= "substring(convert(char(19),$col,0),18,2)";
+				break;
+				
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+
+} 
+ 
+class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
+	
+	var $databaseType = 'odbc_mssql';
+	
+	function ADORecordSet_odbc_mssql($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbc($id,$mode);
+	}	
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-odbc_oracle.inc.php b/lib/adodb/drivers/adodb-odbc_oracle.inc.php
index 293af7653f0..80c6ae8cba6 100644
--- a/lib/adodb/drivers/adodb-odbc_oracle.inc.php
+++ b/lib/adodb/drivers/adodb-odbc_oracle.inc.php
@@ -1,115 +1,115 @@
-ADODB_odbc();
-	}
-		
-	function &MetaTables() 
-	{
-		if ($this->metaTablesSQL) {
-			$rs = $this->Execute($this->metaTablesSQL);
-			if ($rs === false) return false;
-			$arr = $rs->GetArray();
-			$arr2 = array();
-			for ($i=0; $i < sizeof($arr); $i++) {
-				$arr2[] = $arr[$i][0];
-			}
-			$rs->Close();
-			return $arr2;
-		}
-		return false;
-	}
-	
-	function &MetaColumns($table) 
-	{
-		if (!empty($this->metaColumnsSQL)) {
-		
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-			if ($rs === false) return false;
-
-			$retarr = array();
-			while (!$rs->EOF) { //print_r($rs->fields);
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$fld->type = $rs->fields[1];
-				$fld->max_length = $rs->fields[2];
-				
-				
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-				else $retarr[strtoupper($fld->name)] = $fld;
-				
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return false;
-	}
-
-	// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-	
-		$php_errormsg = '';
-		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
-		$this->_errorMsg = $php_errormsg;
-		
-		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
-		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
-		return $this->_connectionID != false;
-	}
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-		$php_errormsg = '';
-		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
-		$this->_errorMsg = $php_errormsg;
-		
-		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
-		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
-		return $this->_connectionID != false;
-	}
-} 
- 
-class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
-	
-	var $databaseType = 'odbc_oracle';
-	
-	function ADORecordSet_odbc_oracle($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-}
+ADODB_odbc();
+	}
+		
+	function &MetaTables() 
+	{
+		if ($this->metaTablesSQL) {
+			$rs = $this->Execute($this->metaTablesSQL);
+			if ($rs === false) return false;
+			$arr = $rs->GetArray();
+			$arr2 = array();
+			for ($i=0; $i < sizeof($arr); $i++) {
+				$arr2[] = $arr[$i][0];
+			}
+			$rs->Close();
+			return $arr2;
+		}
+		return false;
+	}
+	
+	function &MetaColumns($table) 
+	{
+		if (!empty($this->metaColumnsSQL)) {
+		
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+			if ($rs === false) return false;
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+				$fld->max_length = $rs->fields[2];
+				
+				
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+				else $retarr[strtoupper($fld->name)] = $fld;
+				
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+
+	// returns true or false
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+	
+		$php_errormsg = '';
+		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
+		$this->_errorMsg = $php_errormsg;
+		
+		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+		$php_errormsg = '';
+		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
+		$this->_errorMsg = $php_errormsg;
+		
+		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+} 
+ 
+class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
+	
+	var $databaseType = 'odbc_oracle';
+	
+	function ADORecordSet_odbc_oracle($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbc($id,$mode);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-oracle.inc.php b/lib/adodb/drivers/adodb-oracle.inc.php
index ec7b81165b0..bcc49118d7e 100644
--- a/lib/adodb/drivers/adodb-oracle.inc.php
+++ b/lib/adodb/drivers/adodb-oracle.inc.php
@@ -1,299 +1,299 @@
-fmtDate,$d).",'YYYY-MM-DD')";
-	}
-	
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
-	{
-
-		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
-	}
-
-	
-	function BeginTrans()
-	{	  
-		 $this->autoCommit = false;
-		 ora_commitoff($this->_connectionID);
-		 return true;
-	}
-
-	
-	function CommitTrans($ok=true) 
-	{ 
-		   if (!$ok) return $this->RollbackTrans();
-		   $ret = ora_commit($this->_connectionID);
-		   ora_commiton($this->_connectionID);
-		   return $ret;
-	}
-
-	
-	function RollbackTrans()
-	{
-		$ret = ora_rollback($this->_connectionID);
-		ora_commiton($this->_connectionID);
-		return $ret;
-	}
-
-
-	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
-	function ErrorMsg() 
- 	{
-		$this->_errorMsg = @ora_error($this->_curs);
- 		if (!$this->_errorMsg) $this->_errorMsg = @ora_error($this->_connectionID);
-		return $this->_errorMsg;
-	}
-
- 
-	function ErrorNo() 
-	{
-		$err = @ora_errorcode($this->_curs);
-		if (!$err) return @ora_errorcode($this->_connectionID);
-	}
-
-	
-
-		// returns true or false
-		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
-		{
-            // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
-            // the oracle home to the host name of remote DB?
-//			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
-
-			if($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen 
-				if (empty($argDatabasename)) $argDatabasename = $argHostname;
-				else {
-					if(strpos($argHostname,":")) {
-						$argHostinfo=explode(":",$argHostname);
-						$argHostname=$argHostinfo[0];
-						$argHostport=$argHostinfo[1];
-					} else {
-						$argHostport="1521";
-					}
-
-
-					if ($this->connectSID) {
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-						.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-					} else
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-						.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
-				}
-
-			}
-
-			if ($argDatabasename) $argUsername .= "@$argDatabasename";
-
-		//if ($argHostname) print "
    Connect: 1st argument should be left blank for $this->databaseType
    ";
-			if ($mode = 1)
-				$this->_connectionID = ora_plogon($argUsername,$argPassword);
-			else
-				$this->_connectionID = ora_logon($argUsername,$argPassword);
-			if ($this->_connectionID === false) return false;
-			if ($this->autoCommit) ora_commiton($this->_connectionID);
-			if ($this->_initdate) {
-				$rs = $this->_query("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
-				if ($rs) ora_close($rs);
-			}
-
-			return true;
-		}
-
-
-		// returns true or false
-		function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-		{
-			return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
-		}
-
-
-		// returns query ID if successful, otherwise false
-		function _query($sql,$inputarr=false)
-		{
-			$curs = ora_open($this->_connectionID);
-		 
-		 	if ($curs === false) return false;
-			$this->_curs = $curs;
-			if (!ora_parse($curs,$sql)) return false;
-			if (ora_exec($curs)) return $curs;
-		
-		 	@ora_close($curs);
-			return false;
-		}
-
-
-		// returns true or false
-		function _close()
-		{
-			return @ora_logoff($this->_connectionID);
-		}
-
-
-
-}
-
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oracle extends ADORecordSet {
-
-	var $databaseType = "oracle";
-	var $bind = false;
-
-	function ADORecordset_oracle($queryID,$mode=false)
-	{
-		
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $queryID;
-	
-		$this->_inited = true;
-		$this->fields = array();
-		if ($queryID) {
-			$this->_currentRow = 0;
-			$this->EOF = !$this->_fetch();
-			@$this->_initrs();
-		} else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-		
-		return $this->_queryID;
-	}
-
-
-
-	   /*		Returns: an object containing field information.
-			   Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			   fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			   fetchField() is retrieved.		*/
-
-	   function FetchField($fieldOffset = -1)
-	   {
-			$fld = new ADOFieldObject;
-			$fld->name = ora_columnname($this->_queryID, $fieldOffset);
-			$fld->type = ora_columntype($this->_queryID, $fieldOffset);
-			$fld->max_length = ora_columnsize($this->_queryID, $fieldOffset);
-			return $fld;
-	   }
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-   function _initrs()
-   {
-		   $this->_numOfRows = -1;
-		   $this->_numOfFields = @ora_numcols($this->_queryID);
-   }
-
-
-   function _seek($row)
-   {
-		   return false;
-   }
-
-   function _fetch($ignore_fields=false) {
-// should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
-		if ($this->fetchMode & ADODB_FETCH_ASSOC)
-			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
-   		else 
-			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS);
-   }
-
-   /*		close() only needs to be called if you are worried about using too much memory while your script
-		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
-
-   function _close() 
-{
-		   return @ora_close($this->_queryID);
-   }
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		switch (strtoupper($t)) {
-		case 'VARCHAR':
-		case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-				if ($len <= $this->blobSize) return 'C';
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-				return 'B';
-		
-		case 'DATE': return 'D';
-		
-		//case 'T': return 'T';
-		
-		case 'BIT': return 'L';
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
-		}
-	}
-}
+fmtDate,$d).",'YYYY-MM-DD')";
+	}
+	
+	// format and return date string in database timestamp format
+	function DBTimeStamp($ts)
+	{
+
+		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
+		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+	}
+
+	
+	function BeginTrans()
+	{	  
+		 $this->autoCommit = false;
+		 ora_commitoff($this->_connectionID);
+		 return true;
+	}
+
+	
+	function CommitTrans($ok=true) 
+	{ 
+		   if (!$ok) return $this->RollbackTrans();
+		   $ret = ora_commit($this->_connectionID);
+		   ora_commiton($this->_connectionID);
+		   return $ret;
+	}
+
+	
+	function RollbackTrans()
+	{
+		$ret = ora_rollback($this->_connectionID);
+		ora_commiton($this->_connectionID);
+		return $ret;
+	}
+
+
+	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
+	function ErrorMsg() 
+ 	{
+		$this->_errorMsg = @ora_error($this->_curs);
+ 		if (!$this->_errorMsg) $this->_errorMsg = @ora_error($this->_connectionID);
+		return $this->_errorMsg;
+	}
+
+ 
+	function ErrorNo() 
+	{
+		$err = @ora_errorcode($this->_curs);
+		if (!$err) return @ora_errorcode($this->_connectionID);
+	}
+
+	
+
+		// returns true or false
+		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
+		{
+            // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
+            // the oracle home to the host name of remote DB?
+//			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
+
+			if($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen 
+				if (empty($argDatabasename)) $argDatabasename = $argHostname;
+				else {
+					if(strpos($argHostname,":")) {
+						$argHostinfo=explode(":",$argHostname);
+						$argHostname=$argHostinfo[0];
+						$argHostport=$argHostinfo[1];
+					} else {
+						$argHostport="1521";
+					}
+
+
+					if ($this->connectSID) {
+						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+						.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
+					} else
+						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+						.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
+				}
+
+			}
+
+			if ($argDatabasename) $argUsername .= "@$argDatabasename";
+
+		//if ($argHostname) print "
    Connect: 1st argument should be left blank for $this->databaseType
    ";
+			if ($mode = 1)
+				$this->_connectionID = ora_plogon($argUsername,$argPassword);
+			else
+				$this->_connectionID = ora_logon($argUsername,$argPassword);
+			if ($this->_connectionID === false) return false;
+			if ($this->autoCommit) ora_commiton($this->_connectionID);
+			if ($this->_initdate) {
+				$rs = $this->_query("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
+				if ($rs) ora_close($rs);
+			}
+
+			return true;
+		}
+
+
+		// returns true or false
+		function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+		{
+			return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
+		}
+
+
+		// returns query ID if successful, otherwise false
+		function _query($sql,$inputarr=false)
+		{
+			$curs = ora_open($this->_connectionID);
+		 
+		 	if ($curs === false) return false;
+			$this->_curs = $curs;
+			if (!ora_parse($curs,$sql)) return false;
+			if (ora_exec($curs)) return $curs;
+		
+		 	@ora_close($curs);
+			return false;
+		}
+
+
+		// returns true or false
+		function _close()
+		{
+			return @ora_logoff($this->_connectionID);
+		}
+
+
+
+}
+
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oracle extends ADORecordSet {
+
+	var $databaseType = "oracle";
+	var $bind = false;
+
+	function ADORecordset_oracle($queryID,$mode=false)
+	{
+		
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		
+		$this->_queryID = $queryID;
+	
+		$this->_inited = true;
+		$this->fields = array();
+		if ($queryID) {
+			$this->_currentRow = 0;
+			$this->EOF = !$this->_fetch();
+			@$this->_initrs();
+		} else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+		
+		return $this->_queryID;
+	}
+
+
+
+	   /*		Returns: an object containing field information.
+			   Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+			   fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+			   fetchField() is retrieved.		*/
+
+	   function FetchField($fieldOffset = -1)
+	   {
+			$fld = new ADOFieldObject;
+			$fld->name = ora_columnname($this->_queryID, $fieldOffset);
+			$fld->type = ora_columntype($this->_queryID, $fieldOffset);
+			$fld->max_length = ora_columnsize($this->_queryID, $fieldOffset);
+			return $fld;
+	   }
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+   function _initrs()
+   {
+		   $this->_numOfRows = -1;
+		   $this->_numOfFields = @ora_numcols($this->_queryID);
+   }
+
+
+   function _seek($row)
+   {
+		   return false;
+   }
+
+   function _fetch($ignore_fields=false) {
+// should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
+		if ($this->fetchMode & ADODB_FETCH_ASSOC)
+			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
+   		else 
+			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS);
+   }
+
+   /*		close() only needs to be called if you are worried about using too much memory while your script
+		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
+
+   function _close() 
+{
+		   return @ora_close($this->_queryID);
+   }
+
+	function MetaType($t,$len=-1)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		switch (strtoupper($t)) {
+		case 'VARCHAR':
+		case 'VARCHAR2':
+		case 'CHAR':
+		case 'VARBINARY':
+		case 'BINARY':
+				if ($len <= $this->blobSize) return 'C';
+		case 'LONG':
+		case 'LONG VARCHAR':
+		case 'CLOB':
+		return 'X';
+		case 'LONG RAW':
+		case 'LONG VARBINARY':
+		case 'BLOB':
+				return 'B';
+		
+		case 'DATE': return 'D';
+		
+		//case 'T': return 'T';
+		
+		case 'BIT': return 'L';
+		case 'INT': 
+		case 'SMALLINT':
+		case 'INTEGER': return 'I';
+		default: return 'N';
+		}
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-postgres.inc.php b/lib/adodb/drivers/adodb-postgres.inc.php
index 81ad7a0d4e6..f269b9a9105 100644
--- a/lib/adodb/drivers/adodb-postgres.inc.php
+++ b/lib/adodb/drivers/adodb-postgres.inc.php
@@ -1,14 +1,14 @@
-
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-postgres64.inc.php b/lib/adodb/drivers/adodb-postgres64.inc.php
index a259257d697..257947f98bb 100644
--- a/lib/adodb/drivers/adodb-postgres64.inc.php
+++ b/lib/adodb/drivers/adodb-postgres64.inc.php
@@ -1,938 +1,954 @@
-
-					jlim - changed concat operator to || and data types to MetaType to match documented pgsql types 
-		 	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm  
-  22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" 
-  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" 
-  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk. 
-  31 Jan 2002 jlim - finally installed postgresql. testing
-  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-  
-  See http://www.varlena.com/varlena/GeneralBits/47.php
-  
-	-- What indexes are on my table?
-	select * from pg_indexes where tablename = 'tablename';
-	
-	-- What triggers are on my table?
-	select c.relname as "Table", t.tgname as "Trigger Name", 
-	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
-	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
-	   p.proname as "Function Name"
-	from pg_trigger t, pg_class c, pg_class cc, pg_proc p
-	where t.tgfoid = p.oid and t.tgrelid = c.oid
-	   and t.tgconstrrelid = cc.oid
-	   and c.relname = 'tablename';
-	
-	-- What constraints are on my table?
-	select r.relname as "Table", c.conname as "Constraint Name",
-	   contype as "Constraint Type", conkey as "Key Columns",
-	   confkey as "Foreign Columns", consrc as "Source"
-	from pg_class r, pg_constraint c
-	where r.oid = c.conrelid
-	   and relname = 'tablename';
-
-*/
-
-function adodb_addslashes($s)
-{
-	$len = strlen($s);
-	if ($len == 0) return "''";
-	if (strncmp($s,"'",1) === 0 && substr(s,$len-1) == "'") return $s; // already quoted
-	
-	return "'".addslashes($s)."'";
-}
-
-class ADODB_postgres64 extends ADOConnection{
-	var $databaseType = 'postgres64';
-	var $dataProvider = 'postgres';
-	var $hasInsertID = true;
-	var $_resultid = false;
-  	var $concat_operator='||';
-	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
-    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%' union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
-	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
-	var $isoDates = true; // accepts dates in ISO format
-	var $sysDate = "CURRENT_DATE";
-	var $sysTimeStamp = "CURRENT_TIMESTAMP";
-	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-		FROM pg_class c, pg_attribute a,pg_type t 
-		WHERE relkind = 'r' AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
-AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind = 'r' AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
-	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
-	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
-	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
-	var $hasAffectedRows = true;
-	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
-	var $true = 't';		// string that represents TRUE for a database
-	var $false = 'f';		// string that represents FALSE for a database
-	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
-	var $hasMoveFirst = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT NEXTVAL('%s')";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
-	var $random = 'random()';		/// random function
-	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
-							// http://bugs.php.net/bug.php?id=25404
-	
-	// The last (fmtTimeStamp is not entirely correct: 
-	// PostgreSQL also has support for time zones, 
-	// and writes these time in this format: "2001-03-01 18:59:26+02". 
-	// There is no code for the "+02" time zone information, so I just left that out. 
-	// I'm not familiar enough with both ADODB as well as Postgres 
-	// to know what the concequences are. The other values are correct (wheren't in 0.94)
-	// -- Freek Dijkstra 
-
-	function ADODB_postgres64() 
-	{
-	// changes the metaColumnsSQL, adds columns: attnum[6]
-	}
-	
-	function ServerInfo()
-	{
-		if (isset($this->version)) return $this->version;
-		
-		$arr['description'] = $this->GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		$this->version = $arr;
-		return $arr;
-	}
-/*
-	function IfNull( $field, $ifNull ) 
-	{
-		return " NULLIF($field, $ifNull) "; // if PGSQL
-	}
-*/
-	// get the last id - never tested
-	function pg_insert_id($tablename,$fieldname)
-	{
-		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
-		if ($result) {
-			$arr = @pg_fetch_row($result,0);
-			pg_freeresult($result);
-			if (isset($arr[0])) return $arr[0];
-		}
-		return false;
-	}
-	
-/* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
-Using a OID as a unique identifier is not generally wise. 
-Unless you are very careful, you might end up with a tuple having 
-a different OID if a database must be reloaded. */
-	function _insertid()
-	{
-		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-	   	return pg_getlastoid($this->_resultid);
-	}
-
-// I get this error with PHP before 4.0.6 - jlim
-// Warning: This compilation does not support pg_cmdtuples() in d:/inetpub/wwwroot/php/adodb/adodb-postgres.inc.php on line 44
-   function _affectedrows()
-   {
-   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-	   	return pg_cmdtuples($this->_resultid);
-   }
-   
-	
-		// returns true/false
-	function BeginTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		return @pg_Exec($this->_connectionID, "begin");
-	}
-	
-	function RowLock($tables,$where) 
-	{
-		if (!$this->transCnt) $this->BeginTrans();
-		return $this->GetOne("select 1 as ignore from $tables where $where for update");
-	}
-
-	// returns true/false. 
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		
-		$this->transCnt -= 1;
-		return @pg_Exec($this->_connectionID, "commit");
-	}
-	
-	// returns true/false
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt -= 1;
-		return @pg_Exec($this->_connectionID, "rollback");
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtolower($mask));
-			$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask union 
-select viewname,'V' from pg_views where viewname like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	/*
-	// if magic quotes disabled, use pg_escape_string()
-	function qstr($s,$magic_quotes=false)
-	{
-		if (!$magic_quotes) {
-			if (ADODB_PHPVER >= 0x4200) {
-				return  "'".pg_escape_string($s)."'";
-			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
-	}
-	*/
-	
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'TO_CHAR('.$col.",'";
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
-				
-			case 'M':
-				$s .= 'Mon';
-				break;
-				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-			
-			case 'H':
-				$s.= 'HH24';
-				break;
-				
-			case 'h':
-				$s .= 'HH';
-				break;
-				
-			case 'i':
-				$s .= 'MI';
-				break;
-			
-			case 's':
-				$s .= 'SS';
-				break;
-			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-				
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
-				
-			}
-		}
-		return $s. "')";
-	}
-	
-	
-	
-	/* 
-	* Load a Large Object from a file 
-	* - the procedure stores the object id in the table and imports the object using 
-	* postgres proprietary blob handling routines 
-	*
-	* contributed by Mattia Rossi mattia@technologist.com
-	* modified for safe mode by juraj chlebec
-	*/ 
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		pg_exec ($this->_connectionID, "begin"); 
-		
-		$fd = fopen($path,'r');
-		$contents = fread($fd,filesize($path));
-		fclose($fd);
-		
-		$oid = pg_lo_create($this->_connectionID);
-		$handle = pg_lo_open($this->_connectionID, $oid, 'w');
-		pg_lo_write($handle, $contents);
-		pg_lo_close($handle);
-		
-		// $oid = pg_lo_import ($path); 
-		pg_exec($this->_connectionID, "commit"); 
-		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
-		$rez = !empty($rs); 
-		return $rez; 
-	} 
-	
-	/* 
-	* If an OID is detected, then we use pg_lo_* to open the oid file and read the
-	* real blob from the db using the oid supplied as a parameter. If you are storing
-	* blobs using bytea, we autodetect and process it so this function is not needed.
-	*
-	* contributed by Mattia Rossi mattia@technologist.com
-	*
-	* see http://www.postgresql.org/idocs/index.php?largeobjects.html
-	*/ 
-	function BlobDecode( $blob) 
-	{ 
-		if (strlen($blob) > 24) return $blob;
-		
-		@pg_exec($this->_connectionID,"begin"); 
-		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
-		if ($fd === false) {
-			@pg_exec($this->_connectionID,"commit");
-			return $blob;
-		}
-		$realblob = @pg_loreadall($fd); 
-		@pg_loclose($fd); 
-		@pg_exec($this->_connectionID,"commit"); 
-		return $realblob;
-	} 
-	
-	/* 
-		See http://www.postgresql.org/idocs/index.php?datatype-binary.html
-	 	
-		NOTE: SQL string literals (input strings) must be preceded with two backslashes 
-		due to the fact that they must pass through two parsers in the PostgreSQL 
-		backend.
-	*/
-	function BlobEncode($blob)
-	{
-		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
-		
-		/*92=backslash, 0=null, 39=single-quote*/
-		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
-		$fixch = array('\\\\134','\\\\000','\\\\047');
-		return adodb_str_replace($badch,$fixch,$blob);
-		
-		// note that there is a pg_escape_bytea function only for php 4.2.0 or later
-	}
-	
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		// do not use bind params which uses qstr(), as blobencode() already quotes data
-		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
-	}
-	
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		return "($date+interval'$dayFraction days')";
-	}
-	
-
-	// for schema support, pass in the $table param "$schema.$tabname".
-	// converts field names to lowercase, $upper is ignored
-	function &MetaColumns($table,$upper=true) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = false;
-		$this->_findschema($table,$schema);
-		
-		$table = strtolower($table);
-
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		if ($schema) $rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ($rs === false) return false;
-		
-		if (!empty($this->metaKeySQL)) {
-			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
-			// not support OUTER JOINS. So here is the clumsy way.
-			
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
-			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
-			// fetch all result in once for performance.
-			$keys =& $rskey->GetArray();
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			$rskey->Close();
-			unset($rskey);
-		}
-
-		$rsdefa = array();
-		if (!empty($this->metaDefaultsSQL)) {
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			$sql = sprintf($this->metaDefaultsSQL, ($table));
-			$rsdef = $this->Execute($sql);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			if ($rsdef) {
-				while (!$rsdef->EOF) {
-					$num = $rsdef->fields['num'];
-					$s = $rsdef->fields['def'];
-					if (substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
-						$s = substr($s, 1);
-						$s = substr($s, 0, strlen($s) - 1);
-					}
-
-					$rsdefa[$num] = $s;
-					$rsdef->MoveNext();
-				}
-			} else {
-				ADOConnection::outp( "==> SQL => " . $sql);
-			}
-			unset($rsdef);
-		}
-	
-		$retarr = array();
-		while (!$rs->EOF) { 	
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$fld->type = $rs->fields[1];
-			$fld->max_length = $rs->fields[2];
-			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
-			if ($fld->max_length <= 0) $fld->max_length = -1;
-			
-			// dannym
-			// 5 hasdefault; 6 num-of-column
-			$fld->has_default = ($rs->fields[5] == 't');
-			if ($fld->has_default) {
-				$fld->default_value = $rsdefa[$rs->fields[6]];
-			}
-
-			//Freek
-			if ($rs->fields[4] == $this->true) {
-				$fld->not_null = true;
-			}
-			
-			// Freek
-			if (is_array($keys)) {
-				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
-						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
-						$fld->unique = true; // What name is more compatible?
-				}
-			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		return $retarr;	
-		
-	}
-
-	  function &MetaIndexes ($table, $primary = FALSE)
-      {
-         global $ADODB_FETCH_MODE;
-                
-				$schema = false;
-				$this->_findschema($table,$schema);
-				
-				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
-					$sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
-FROM pg_catalog.pg_class c 
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-	,pg_namespace n 
-WHERE c2.relname=\'%s\' and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\' AND i.indisprimary=false';
-				} else {
-	                $sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
-FROM pg_catalog.pg_class c
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-WHERE c2.relname=\'%s\'';
-    			}
-				            
-                if ($primary == FALSE) {
-                        $sql .= ' AND i.indisprimary=false;';
-                }
-                
-                $save = $ADODB_FETCH_MODE;
-                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                if ($this->fetchMode !== FALSE) {
-                        $savem = $this->SetFetchMode(FALSE);
-                }
-                
-                $rs = $this->Execute(sprintf($sql,$table,$schema));
-                
-                if (isset($savem)) {
-                        $this->SetFetchMode($savem);
-                }
-                $ADODB_FETCH_MODE = $save;
-                
-                if (!is_object($rs)) {
-                        return FALSE;
-                }
-                
-                $col_names = $this->MetaColumnNames($table);
-                $indexes = array();
-                
-                while ($row = $rs->FetchRow()) {
-                        $columns = array();
-                        
-                        foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col - 1];
-                        }
-                        
-                        $indexes[$row[0]] = array(
-                                'unique' => ($row[1] == 't'),
-                                'columns' => $columns
-                        );
-                }
-                
-                return $indexes;
-        }
-
-	// returns true or false
-	//
-	// examples:
-	// 	$db->Connect("host=host1 user=user1 password=secret port=4341");
-	// 	$db->Connect('host1','user1','secret');
-	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
-	{
-		
-		if (!function_exists('pg_pconnect')) return false;
-		
-		$this->_errorMsg = false;
-		
-		if ($user || $pwd || $db) {
-			$user = adodb_addslashes($user);
-			$pwd = adodb_addslashes($pwd);
-			if (strlen($db) == 0) $db = 'template1';
-			$db = adodb_addslashes($db);
-		   	if ($str)  {
-			 	$host = split(":", $str);
-				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
-				else $str = 'host=localhost';
-				if (isset($host[1])) $str .= " port=$host[1]";
-			}
-		   		if ($user) $str .= " user=".$user;
-		   		if ($pwd)  $str .= " password=".$pwd;
-				if ($db)   $str .= " dbname=".$db;
-		}
-
-		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
-		
-		if ($ctype === 1) { // persistent
-			$this->_connectionID = pg_pconnect($str);
-		} else {
-			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
-			static $ncnt;
-			
-				if (empty($ncnt)) $ncnt = 1;
-				else $ncnt += 1;
-				
-				$str .= str_repeat(' ',$ncnt);
-			}
-			$this->_connectionID = pg_connect($str);
-		}
-		if ($this->_connectionID === false) return false;
-		$this->Execute("set datestyle='ISO'");
-		return true;
-	}
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
-	{
-	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
-	}
-	 
-	// returns true or false
-	//
-	// examples:
-	// 	$db->PConnect("host=host1 user=user1 password=secret port=4341");
-	// 	$db->PConnect('host1','user1','secret');
-	function _pconnect($str,$user='',$pwd='',$db='')
-	{
-		return $this->_connect($str,$user,$pwd,$db,1);
-	}
-
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-		/*
-		if (is_array($sql)) {
-			if (!$sql[1]) {
-			
-				$sqltxt = $sql[0];
-				$plan = $sql[1] = 'P'.md5($sqltxt);
-				$params = '';
-				foreach($inputarr as $v) {
-					if ($params) $params .= ',';
-					if (is_string($v)) {
-						$params .= 'VARCHAR';
-					} else if (is_integer($v)) {
-						$params .= 'INTEGER';
-					} else {
-						$params .= "REAL";
-					}
-				}
-				$sqlarr = explode('?',$sqltxt);
-				$sqltxt = '';
-				$i = 1;
-				foreach($sqlarr as $v) {
-					$sqltxt .= $v.'$'.$i;
-					$i++;
-				}
-				$s = "PREPARE $plan ($params) AS ".substr($sqltxt,0,strlen($sqltxt)-2);		
-				adodb_pr($s);
-				pg_exec($this->_connectionID,$s);
-				echo $this->ErrorMsg();
-			} else {
-				$plan = $sql[1];
-			}
-			$params = '';
-			foreach($inputarr as $v) {
-				if ($params) $params .= ',';
-				if (is_string($v)) {
-					if (strncmp($v,"'",1) !== 0) $params .= $this->qstr($v.'TEST');
-				} else {
-					$params .= $v;
-				}
-			}
-			
-			if ($params) $sql = "EXECUTE $plan ($params)";
-			else $sql = "EXECUTE $plan";
-			
-			adodb_pr(">>>>>".$sql);
-			pg_exec($this->_connectionID,$s);
-		}*/
-		
-		$this->_errorMsg = false;
-		
-		$rez = pg_exec($this->_connectionID,$sql);
-		// check if no data returned, then no need to create real recordset
-		if ($rez && pg_numfields($rez) <= 0) {
-			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
-				pg_freeresult($this->_resultid);
-			}
-			$this->_resultid = $rez;
-			return true;
-		}
-		
-		return $rez;
-	}
-	
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-		if (ADODB_PHPVER >= 0x4300) {
-			if (!empty($this->_resultid)) {
-				$this->_errorMsg = @pg_result_error($this->_resultid);
-				if ($this->_errorMsg) return $this->_errorMsg;
-			}
-			
-			if (!empty($this->_connectionID)) {
-				$this->_errorMsg = @pg_last_error($this->_connectionID);
-			} else $this->_errorMsg = @pg_last_error();
-		} else {
-			if (empty($this->_connectionID)) $this->_errorMsg = @pg_errormessage();
-			else $this->_errorMsg = @pg_errormessage($this->_connectionID);
-		}
-		return $this->_errorMsg;
-	}
-	
-	function ErrorNo()
-	{
-		$e = $this->ErrorMsg();
-		return strlen($e) ? $e : 0;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		if ($this->transCnt) $this->RollbackTrans();
-		if ($this->_resultid) {
-			@pg_freeresult($this->_resultid);
-			$this->_resultid = false;
-		}
-		@pg_close($this->_connectionID);
-		$this->_connectionID = false;
-		return true;
-	}
-	
-	
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 1000000000;  // should be 1 Gb?
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-		return 1000000000; // should be 1 Gb?
-	}
-	
-		
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres64 extends ADORecordSet{
-	var $_blobArr;
-	var $databaseType = "postgres64";
-	var $canSeek = true;
-	function ADORecordSet_postgres64($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		default:
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = PGSQL_BOTH; break;
-		}
-		$this->ADORecordSet($queryID);
-	}
-	
-	function &GetRowAssoc($upper=true)
-	{
-		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
-		$row =& ADORecordSet::GetRowAssoc($upper);
-		return $row;
-	}
-
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($this->_queryID):-1;
-		$this->_numOfFields = @pg_numfields($this->_queryID);
-		
-		// cache types for blob decode check
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			$f1 = $this->FetchField($i);
-			//print_r($f1);
-			if ($f1->type == 'bytea') $this->_blobArr[$i] = $f1->name;
-		}		
-	}
-
-		/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-	function &FetchField($fieldOffset = 0) 
-	{
-		$off=$fieldOffset; // offsets begin at 0
-		
-		$o= new ADOFieldObject();
-		$o->name = @pg_fieldname($this->_queryID,$off);
-		$o->type = @pg_fieldtype($this->_queryID,$off);
-		$o->max_length = @pg_fieldsize($this->_queryID,$off);
-		//print_r($o);		
-		//print "off=$off name=$o->name type=$o->type len=$o->max_length
    ";
-		return $o;	
-	}
-
-	function _seek($row)
-	{
-		return @pg_fetch_row($this->_queryID,$row);
-	}
-	
-	function _decode($blob)
-	{
-		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
-		return $realblob;	
-	}
-	
-	function _fixblobs()
-	{
-		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
-				$this->fields[$k] = ADORecordSet_postgres64::_decode($this->fields[$k]);
-			}
-		}
-		if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
-				$this->fields[$v] = ADORecordSet_postgres64::_decode($this->fields[$v]);
-			}
-		}
-	}
-	
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-				if (is_array($this->fields) && $this->fields) {
-					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-					return true;
-				}
-			}
-			$this->fields = false;
-			$this->EOF = true;
-		}
-		return false;
-	}		
-	
-	function _fetch()
-	{
-				
-		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
-
-		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
-	if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-			
-		return (is_array($this->fields));
-	}
-
-	function _close() 
-	{ 
-		return @pg_freeresult($this->_queryID);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-				case 'MONEY': // stupid, postgres expects money to be a string
-				case 'INTERVAL':
-				case 'CHAR':
-				case 'CHARACTER':
-				case 'VARCHAR':
-				case 'NAME':
-		   		case 'BPCHAR':
-				case '_VARCHAR':
-					if ($len <= $this->blobSize) return 'C';
-				
-				case 'TEXT':
-					return 'X';
-		
-				case 'IMAGE': // user defined type
-				case 'BLOB': // user defined type
-				case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
-				case 'VARBIT':
-				case 'BYTEA':
-					return 'B';
-				
-				case 'BOOL':
-				case 'BOOLEAN':
-					return 'L';
-				
-				case 'DATE':
-					return 'D';
-				
-				case 'TIME':
-				case 'DATETIME':
-				case 'TIMESTAMP':
-				case 'TIMESTAMPTZ':
-					return 'T';
-				
-				case 'SMALLINT': 
-				case 'BIGINT': 
-				case 'INTEGER': 
-				case 'INT8': 
-				case 'INT4':
-				case 'INT2':
-					if (isset($fieldobj) &&
-				empty($fieldobj->primary_key) && empty($fieldobj->unique)) return 'I';
-				
-				case 'OID':
-				case 'SERIAL':
-					return 'R';
-				
-				 default:
-				 	return 'N';
-			}
-	}
-
-}
-?>
+
+					jlim - changed concat operator to || and data types to MetaType to match documented pgsql types 
+		 	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm  
+  22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" 
+  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" 
+  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk. 
+  31 Jan 2002 jlim - finally installed postgresql. testing
+  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
+  
+  See http://www.varlena.com/varlena/GeneralBits/47.php
+  
+	-- What indexes are on my table?
+	select * from pg_indexes where tablename = 'tablename';
+	
+	-- What triggers are on my table?
+	select c.relname as "Table", t.tgname as "Trigger Name", 
+	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
+	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
+	   p.proname as "Function Name"
+	from pg_trigger t, pg_class c, pg_class cc, pg_proc p
+	where t.tgfoid = p.oid and t.tgrelid = c.oid
+	   and t.tgconstrrelid = cc.oid
+	   and c.relname = 'tablename';
+	
+	-- What constraints are on my table?
+	select r.relname as "Table", c.conname as "Constraint Name",
+	   contype as "Constraint Type", conkey as "Key Columns",
+	   confkey as "Foreign Columns", consrc as "Source"
+	from pg_class r, pg_constraint c
+	where r.oid = c.conrelid
+	   and relname = 'tablename';
+
+*/
+
+function adodb_addslashes($s)
+{
+	$len = strlen($s);
+	if ($len == 0) return "''";
+	if (strncmp($s,"'",1) === 0 && substr(s,$len-1) == "'") return $s; // already quoted
+	
+	return "'".addslashes($s)."'";
+}
+
+class ADODB_postgres64 extends ADOConnection{
+	var $databaseType = 'postgres64';
+	var $dataProvider = 'postgres';
+	var $hasInsertID = true;
+	var $_resultid = false;
+  	var $concat_operator='||';
+	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
+    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%' union 
+        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
+	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
+	var $isoDates = true; // accepts dates in ISO format
+	var $sysDate = "CURRENT_DATE";
+	var $sysTimeStamp = "CURRENT_TIMESTAMP";
+	var $blobEncodeType = 'C';
+	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
+		FROM pg_class c, pg_attribute a,pg_type t 
+		WHERE relkind = 'r' AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
+AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+WHERE relkind = 'r' AND (c.relname='%s' or c.relname = lower('%s'))
+ and c.relnamespace=n.oid and n.nspname='%s' 
+	and a.attname not like '....%%' AND a.attnum > 0 
+	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+	
+	// get primary key etc -- from Freek Dijkstra
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
+	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
+	
+	var $hasAffectedRows = true;
+	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	// below suggested by Freek Dijkstra 
+	var $true = 't';		// string that represents TRUE for a database
+	var $false = 'f';		// string that represents FALSE for a database
+	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
+	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
+	var $hasMoveFirst = true;
+	var $hasGenID = true;
+	var $_genIDSQL = "SELECT NEXTVAL('%s')";
+	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
+	var $_dropSeqSQL = "DROP SEQUENCE %s";
+	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
+	var $random = 'random()';		/// random function
+	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
+							// http://bugs.php.net/bug.php?id=25404
+							
+	var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
+	
+	// The last (fmtTimeStamp is not entirely correct: 
+	// PostgreSQL also has support for time zones, 
+	// and writes these time in this format: "2001-03-01 18:59:26+02". 
+	// There is no code for the "+02" time zone information, so I just left that out. 
+	// I'm not familiar enough with both ADODB as well as Postgres 
+	// to know what the concequences are. The other values are correct (wheren't in 0.94)
+	// -- Freek Dijkstra 
+
+	function ADODB_postgres64() 
+	{
+	// changes the metaColumnsSQL, adds columns: attnum[6]
+	}
+	
+	function ServerInfo()
+	{
+		if (isset($this->version)) return $this->version;
+		
+		$arr['description'] = $this->GetOne("select version()");
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		$this->version = $arr;
+		return $arr;
+	}
+/*
+	function IfNull( $field, $ifNull ) 
+	{
+		return " NULLIF($field, $ifNull) "; // if PGSQL
+	}
+*/
+	// get the last id - never tested
+	function pg_insert_id($tablename,$fieldname)
+	{
+		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
+		if ($result) {
+			$arr = @pg_fetch_row($result,0);
+			pg_freeresult($result);
+			if (isset($arr[0])) return $arr[0];
+		}
+		return false;
+	}
+	
+/* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
+Using a OID as a unique identifier is not generally wise. 
+Unless you are very careful, you might end up with a tuple having 
+a different OID if a database must be reloaded. */
+	function _insertid()
+	{
+		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
+	   	return pg_getlastoid($this->_resultid);
+	}
+
+// I get this error with PHP before 4.0.6 - jlim
+// Warning: This compilation does not support pg_cmdtuples() in d:/inetpub/wwwroot/php/adodb/adodb-postgres.inc.php on line 44
+   function _affectedrows()
+   {
+   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
+	   	return pg_cmdtuples($this->_resultid);
+   }
+   
+	
+		// returns true/false
+	function BeginTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		return @pg_Exec($this->_connectionID, "begin");
+	}
+	
+	function RowLock($tables,$where) 
+	{
+		if (!$this->transCnt) $this->BeginTrans();
+		return $this->GetOne("select 1 as ignore from $tables where $where for update");
+	}
+
+	// returns true/false. 
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true;
+		if (!$ok) return $this->RollbackTrans();
+		
+		$this->transCnt -= 1;
+		return @pg_Exec($this->_connectionID, "commit");
+	}
+	
+	// returns true/false
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt -= 1;
+		return @pg_Exec($this->_connectionID, "rollback");
+	}
+	
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{	
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(strtolower($mask));
+			$this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask union 
+select viewname,'V' from pg_views where viewname like $mask";
+		}
+		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	/*
+	// if magic quotes disabled, use pg_escape_string()
+	function qstr($s,$magic_quotes=false)
+	{
+		if (!$magic_quotes) {
+			if (ADODB_PHPVER >= 0x4200) {
+				return  "'".pg_escape_string($s)."'";
+			}
+			if ($this->replaceQuote[0] == '\\'){
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		return "'$s'";
+	}
+	*/
+	
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = 'TO_CHAR('.$col.",'";
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= 'YYYY';
+				break;
+			case 'Q':
+			case 'q':
+				$s .= 'Q';
+				break;
+				
+			case 'M':
+				$s .= 'Mon';
+				break;
+				
+			case 'm':
+				$s .= 'MM';
+				break;
+			case 'D':
+			case 'd':
+				$s .= 'DD';
+				break;
+			
+			case 'H':
+				$s.= 'HH24';
+				break;
+				
+			case 'h':
+				$s .= 'HH';
+				break;
+				
+			case 'i':
+				$s .= 'MI';
+				break;
+			
+			case 's':
+				$s .= 'SS';
+				break;
+			
+			case 'a':
+			case 'A':
+				$s .= 'AM';
+				break;
+				
+			default:
+			// handle escape characters...
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+				else $s .= '"'.$ch.'"';
+				
+			}
+		}
+		return $s. "')";
+	}
+	
+	
+	
+	/* 
+	* Load a Large Object from a file 
+	* - the procedure stores the object id in the table and imports the object using 
+	* postgres proprietary blob handling routines 
+	*
+	* contributed by Mattia Rossi mattia@technologist.com
+	* modified for safe mode by juraj chlebec
+	*/ 
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
+	{ 
+		pg_exec ($this->_connectionID, "begin"); 
+		
+		$fd = fopen($path,'r');
+		$contents = fread($fd,filesize($path));
+		fclose($fd);
+		
+		$oid = pg_lo_create($this->_connectionID);
+		$handle = pg_lo_open($this->_connectionID, $oid, 'w');
+		pg_lo_write($handle, $contents);
+		pg_lo_close($handle);
+		
+		// $oid = pg_lo_import ($path); 
+		pg_exec($this->_connectionID, "commit"); 
+		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
+		$rez = !empty($rs); 
+		return $rez; 
+	} 
+	
+	/* 
+	* If an OID is detected, then we use pg_lo_* to open the oid file and read the
+	* real blob from the db using the oid supplied as a parameter. If you are storing
+	* blobs using bytea, we autodetect and process it so this function is not needed.
+	*
+	* contributed by Mattia Rossi mattia@technologist.com
+	*
+	* see http://www.postgresql.org/idocs/index.php?largeobjects.html
+	*/ 
+	function BlobDecode( $blob) 
+	{ 
+		if (strlen($blob) > 24) return $blob;
+		
+		@pg_exec($this->_connectionID,"begin"); 
+		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
+		if ($fd === false) {
+			@pg_exec($this->_connectionID,"commit");
+			return $blob;
+		}
+		$realblob = @pg_loreadall($fd); 
+		@pg_loclose($fd); 
+		@pg_exec($this->_connectionID,"commit"); 
+		return $realblob;
+	} 
+	
+	/* 
+		See http://www.postgresql.org/idocs/index.php?datatype-binary.html
+	 	
+		NOTE: SQL string literals (input strings) must be preceded with two backslashes 
+		due to the fact that they must pass through two parsers in the PostgreSQL 
+		backend.
+	*/
+	function BlobEncode($blob)
+	{
+		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
+		
+		/*92=backslash, 0=null, 39=single-quote*/
+		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
+		$fixch = array('\\\\134','\\\\000','\\\\047');
+		return adodb_str_replace($badch,$fixch,$blob);
+		
+		// note that there is a pg_escape_bytea function only for php 4.2.0 or later
+	}
+	
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		// do not use bind params which uses qstr(), as blobencode() already quotes data
+		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
+	}
+	
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) $date = $this->sysDate;
+		return "($date+interval'$dayFraction days')";
+	}
+	
+
+	// for schema support, pass in the $table param "$schema.$tabname".
+	// converts field names to lowercase, $upper is ignored
+	function &MetaColumns($table,$upper=true) 
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$schema = false;
+		$this->_findschema($table,$schema);
+		
+		$table = strtolower($table);
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		
+		if ($schema) $rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
+		else $rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if ($rs === false) return false;
+		
+		if (!empty($this->metaKeySQL)) {
+			// If we want the primary keys, we have to issue a separate query
+			// Of course, a modified version of the metaColumnsSQL query using a 
+			// LEFT JOIN would have been much more elegant, but postgres does 
+			// not support OUTER JOINS. So here is the clumsy way.
+			
+			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+			
+			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
+			// fetch all result in once for performance.
+			$keys =& $rskey->GetArray();
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			
+			$rskey->Close();
+			unset($rskey);
+		}
+
+		$rsdefa = array();
+		if (!empty($this->metaDefaultsSQL)) {
+			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+			$sql = sprintf($this->metaDefaultsSQL, ($table));
+			$rsdef = $this->Execute($sql);
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			
+			if ($rsdef) {
+				while (!$rsdef->EOF) {
+					$num = $rsdef->fields['num'];
+					$s = $rsdef->fields['def'];
+					if (substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
+						$s = substr($s, 1);
+						$s = substr($s, 0, strlen($s) - 1);
+					}
+
+					$rsdefa[$num] = $s;
+					$rsdef->MoveNext();
+				}
+			} else {
+				ADOConnection::outp( "==> SQL => " . $sql);
+			}
+			unset($rsdef);
+		}
+	
+		$retarr = array();
+		while (!$rs->EOF) { 	
+			$fld = new ADOFieldObject();
+			$fld->name = $rs->fields[0];
+			$fld->type = $rs->fields[1];
+			$fld->max_length = $rs->fields[2];
+			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
+			if ($fld->max_length <= 0) $fld->max_length = -1;
+			
+			// dannym
+			// 5 hasdefault; 6 num-of-column
+			$fld->has_default = ($rs->fields[5] == 't');
+			if ($fld->has_default) {
+				$fld->default_value = $rsdefa[$rs->fields[6]];
+			}
+
+			//Freek
+			if ($rs->fields[4] == $this->true) {
+				$fld->not_null = true;
+			}
+			
+			// Freek
+			if (is_array($keys)) {
+				foreach($keys as $key) {
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
+						$fld->primary_key = true;
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
+						$fld->unique = true; // What name is more compatible?
+				}
+			}
+			
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
+			
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		return $retarr;	
+		
+	}
+
+	  function &MetaIndexes ($table, $primary = FALSE)
+      {
+         global $ADODB_FETCH_MODE;
+                
+				$schema = false;
+				$this->_findschema($table,$schema);
+				
+				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
+					$sql = '
+SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
+FROM pg_catalog.pg_class c 
+JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
+JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+	,pg_namespace n 
+WHERE c2.relname=\'%s\' and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\' AND i.indisprimary=false';
+				} else {
+	                $sql = '
+SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+FROM pg_catalog.pg_class c
+JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+WHERE c2.relname=\'%s\'';
+    			}
+				            
+                if ($primary == FALSE) {
+                        $sql .= ' AND i.indisprimary=false;';
+                }
+                
+                $save = $ADODB_FETCH_MODE;
+                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+                if ($this->fetchMode !== FALSE) {
+                        $savem = $this->SetFetchMode(FALSE);
+                }
+                
+                $rs = $this->Execute(sprintf($sql,$table,$schema));
+                
+                if (isset($savem)) {
+                        $this->SetFetchMode($savem);
+                }
+                $ADODB_FETCH_MODE = $save;
+                
+                if (!is_object($rs)) {
+                        return FALSE;
+                }
+                
+                $col_names = $this->MetaColumnNames($table);
+                $indexes = array();
+                
+                while ($row = $rs->FetchRow()) {
+                        $columns = array();
+                        
+                        foreach (explode(' ', $row[2]) as $col) {
+                                $columns[] = $col_names[$col - 1];
+                        }
+                        
+                        $indexes[$row[0]] = array(
+                                'unique' => ($row[1] == 't'),
+                                'columns' => $columns
+                        );
+                }
+                
+                return $indexes;
+        }
+
+	// returns true or false
+	//
+	// examples:
+	// 	$db->Connect("host=host1 user=user1 password=secret port=4341");
+	// 	$db->Connect('host1','user1','secret');
+	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
+	{
+		
+		if (!function_exists('pg_pconnect')) return false;
+		
+		$this->_errorMsg = false;
+		
+		if ($user || $pwd || $db) {
+			$user = adodb_addslashes($user);
+			$pwd = adodb_addslashes($pwd);
+			if (strlen($db) == 0) $db = 'template1';
+			$db = adodb_addslashes($db);
+		   	if ($str)  {
+			 	$host = split(":", $str);
+				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
+				else $str = 'host=localhost';
+				if (isset($host[1])) $str .= " port=$host[1]";
+			}
+		   		if ($user) $str .= " user=".$user;
+		   		if ($pwd)  $str .= " password=".$pwd;
+				if ($db)   $str .= " dbname=".$db;
+		}
+
+		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
+		
+		if ($ctype === 1) { // persistent
+			$this->_connectionID = pg_pconnect($str);
+		} else {
+			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
+			static $ncnt;
+			
+				if (empty($ncnt)) $ncnt = 1;
+				else $ncnt += 1;
+				
+				$str .= str_repeat(' ',$ncnt);
+			}
+			$this->_connectionID = pg_connect($str);
+		}
+		if ($this->_connectionID === false) return false;
+		$this->Execute("set datestyle='ISO'");
+		return true;
+	}
+	
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
+	{
+	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
+	}
+	 
+	// returns true or false
+	//
+	// examples:
+	// 	$db->PConnect("host=host1 user=user1 password=secret port=4341");
+	// 	$db->PConnect('host1','user1','secret');
+	function _pconnect($str,$user='',$pwd='',$db='')
+	{
+		return $this->_connect($str,$user,$pwd,$db,1);
+	}
+	
+
+	// returns queryID or false
+	function _query($sql,$inputarr)
+	{
+		
+		if ($inputarr) {
+		/*
+			It appears that PREPARE/EXECUTE is slower for many queries.
+			
+			For query executed 1000 times:
+			"select id,firstname,lastname from adoxyz 
+				where firstname not like ? and lastname not like ? and id = ?"
+				
+			with plan = 1.51861286163 secs
+			no plan =   1.26903700829 secs
+
+			
+
+		*/
+			$plan = 'P'.md5($sql);
+				
+			$execp = '';
+			foreach($inputarr as $v) {
+				if ($execp) $execp .= ',';
+				if (is_string($v)) {
+					if (strncmp($v,"'",1) !== 0) $execp .= $this->qstr($v);
+				} else {
+					$execp .= $v;
+				}
+			}
+			
+			if ($execp) $exsql = "EXECUTE $plan ($execp)";
+			else $exsql = "EXECUTE $plan";
+			
+			$rez = @pg_exec($this->_connectionID,$exsql);
+			if (!$rez) {
+			# Perhaps plan does not exist? Prepare/compile plan.
+				$params = '';
+				foreach($inputarr as $v) {
+					if ($params) $params .= ',';
+					if (is_string($v)) {
+						$params .= 'VARCHAR';
+					} else if (is_integer($v)) {
+						$params .= 'INTEGER';
+					} else {
+						$params .= "REAL";
+					}
+				}
+				$sqlarr = explode('?',$sql);
+				//print_r($sqlarr);
+				$sql = '';
+				$i = 1;
+				foreach($sqlarr as $v) {
+					$sql .= $v.' $'.$i;
+					$i++;
+				}
+				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
+				//adodb_pr($s);
+				pg_exec($this->_connectionID,$s);
+				echo $this->ErrorMsg();
+			}
+			
+			$rez = pg_exec($this->_connectionID,$exsql);
+		} else {
+			$this->_errorMsg = false;
+			//adodb_backtrace();
+			$rez = pg_exec($this->_connectionID,$sql);
+		}
+		// check if no data returned, then no need to create real recordset
+		if ($rez && pg_numfields($rez) <= 0) {
+			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
+				pg_freeresult($this->_resultid);
+			}
+			$this->_resultid = $rez;
+			return true;
+		}
+		
+		return $rez;
+	}
+	
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+		if ($this->_errorMsg !== false) return $this->_errorMsg;
+		if (ADODB_PHPVER >= 0x4300) {
+			if (!empty($this->_resultid)) {
+				$this->_errorMsg = @pg_result_error($this->_resultid);
+				if ($this->_errorMsg) return $this->_errorMsg;
+			}
+			
+			if (!empty($this->_connectionID)) {
+				$this->_errorMsg = @pg_last_error($this->_connectionID);
+			} else $this->_errorMsg = @pg_last_error();
+		} else {
+			if (empty($this->_connectionID)) $this->_errorMsg = @pg_errormessage();
+			else $this->_errorMsg = @pg_errormessage($this->_connectionID);
+		}
+		return $this->_errorMsg;
+	}
+	
+	function ErrorNo()
+	{
+		$e = $this->ErrorMsg();
+		return strlen($e) ? $e : 0;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		if ($this->transCnt) $this->RollbackTrans();
+		if ($this->_resultid) {
+			@pg_freeresult($this->_resultid);
+			$this->_resultid = false;
+		}
+		@pg_close($this->_connectionID);
+		$this->_connectionID = false;
+		return true;
+	}
+	
+	
+	/*
+	* Maximum size of C field
+	*/
+	function CharMax()
+	{
+		return 1000000000;  // should be 1 Gb?
+	}
+	
+	/*
+	* Maximum size of X field
+	*/
+	function TextMax()
+	{
+		return 1000000000; // should be 1 Gb?
+	}
+	
+		
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres64 extends ADORecordSet{
+	var $_blobArr;
+	var $databaseType = "postgres64";
+	var $canSeek = true;
+	function ADORecordSet_postgres64($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+		default:
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:$this->fetchMode = PGSQL_BOTH; break;
+		}
+		$this->ADORecordSet($queryID);
+	}
+	
+	function &GetRowAssoc($upper=true)
+	{
+		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
+		$row =& ADORecordSet::GetRowAssoc($upper);
+		return $row;
+	}
+
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($this->_queryID):-1;
+		$this->_numOfFields = @pg_numfields($this->_queryID);
+		
+		// cache types for blob decode check
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+			$f1 = $this->FetchField($i);
+			//print_r($f1);
+			if ($f1->type == 'bytea') $this->_blobArr[$i] = $f1->name;
+		}		
+	}
+
+		/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
+		
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+	function &FetchField($fieldOffset = 0) 
+	{
+		$off=$fieldOffset; // offsets begin at 0
+		
+		$o= new ADOFieldObject();
+		$o->name = @pg_fieldname($this->_queryID,$off);
+		$o->type = @pg_fieldtype($this->_queryID,$off);
+		$o->max_length = @pg_fieldsize($this->_queryID,$off);
+		//print_r($o);		
+		//print "off=$off name=$o->name type=$o->type len=$o->max_length
    ";
+		return $o;	
+	}
+
+	function _seek($row)
+	{
+		return @pg_fetch_row($this->_queryID,$row);
+	}
+	
+	function _decode($blob)
+	{
+		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
+		return $realblob;	
+	}
+	
+	function _fixblobs()
+	{
+		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
+			foreach($this->_blobArr as $k => $v) {
+				$this->fields[$k] = ADORecordSet_postgres64::_decode($this->fields[$k]);
+			}
+		}
+		if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == PGSQL_BOTH) {
+			foreach($this->_blobArr as $k => $v) {
+				$this->fields[$v] = ADORecordSet_postgres64::_decode($this->fields[$v]);
+			}
+		}
+	}
+	
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
+				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+				if (is_array($this->fields) && $this->fields) {
+					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+					return true;
+				}
+			}
+			$this->fields = false;
+			$this->EOF = true;
+		}
+		return false;
+	}		
+	
+	function _fetch()
+	{
+				
+		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
+        	return false;
+
+		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+		
+	if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+			
+		return (is_array($this->fields));
+	}
+
+	function _close() 
+	{ 
+		return @pg_freeresult($this->_queryID);
+	}
+
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+				case 'MONEY': // stupid, postgres expects money to be a string
+				case 'INTERVAL':
+				case 'CHAR':
+				case 'CHARACTER':
+				case 'VARCHAR':
+				case 'NAME':
+		   		case 'BPCHAR':
+				case '_VARCHAR':
+					if ($len <= $this->blobSize) return 'C';
+				
+				case 'TEXT':
+					return 'X';
+		
+				case 'IMAGE': // user defined type
+				case 'BLOB': // user defined type
+				case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
+				case 'VARBIT':
+				case 'BYTEA':
+					return 'B';
+				
+				case 'BOOL':
+				case 'BOOLEAN':
+					return 'L';
+				
+				case 'DATE':
+					return 'D';
+				
+				case 'TIME':
+				case 'DATETIME':
+				case 'TIMESTAMP':
+				case 'TIMESTAMPTZ':
+					return 'T';
+				
+				case 'SMALLINT': 
+				case 'BIGINT': 
+				case 'INTEGER': 
+				case 'INT8': 
+				case 'INT4':
+				case 'INT2':
+					if (isset($fieldobj) &&
+				empty($fieldobj->primary_key) && empty($fieldobj->unique)) return 'I';
+				
+				case 'OID':
+				case 'SERIAL':
+					return 'R';
+				
+				 default:
+				 	return 'N';
+			}
+	}
+
+}
+?>
diff --git a/lib/adodb/drivers/adodb-postgres7.inc.php b/lib/adodb/drivers/adodb-postgres7.inc.php
index 2b9eb235f03..82ea97acf62 100644
--- a/lib/adodb/drivers/adodb-postgres7.inc.php
+++ b/lib/adodb/drivers/adodb-postgres7.inc.php
@@ -1,151 +1,189 @@
-ADODB_postgres64();
-	}
-
-	// the following should be compat with postgresql 7.2, 
-	// which makes obsolete the LIMIT limit,offset syntax
-	 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	 {
-		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
-		 if ($secs2cache)
-		  	$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-		 else
-		  	$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
-		return $rs;
-	 }
- 	/*
- 	function Prepare($sql)
-	{
-		$info = $this->ServerInfo();
-		if ($info['version']>=7.3) {
-			return array($sql,false);
-		}
-		return $sql;
-	}
- 	*/
-    function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-
-        $sql = '
-SELECT t.tgargs as args
-   FROM pg_trigger t,
-        pg_class c,
-        pg_class c2,
-        pg_proc f
-   WHERE t.tgenabled
-   AND t.tgrelid=c.oid
-   AND t.tgconstrrelid=c2.oid
-   AND t.tgfoid=f.oid
-   AND f.proname ~ \'^RI_FKey_check_ins\'
-   AND t.tgargs like \'$1\\\000'.strtolower($table).'%\'
-   ORDER BY t.tgrelid';
-
-        $rs = $this->Execute($sql);
-		if ($rs && !$rs->EOF) {
-			$arr =& $rs->GetArray();
-			$a = array();
-			foreach($arr as $v) {
-                $data = explode(chr(0), $v['args']);
-                if ($upper) {
-                    $a[] = array(strtoupper($data[2]) => strtoupper($data[4].'='.$data[5]));
-                } else {
-                    $a[] = array($data[2] => $data[4].'='.$data[5]);
-                }
-                
-			}
-			return $a;
-		}
-		else return false;
-    }
-	
- 	 // this is a set of functions for managing client encoding - very important if the encodings
-	// of your database and your output target (i.e. HTML) don't match
-	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
-	// GetCharSet - get the name of the character set the client is using now
-	// the functions should work with Postgres 7.0 and above, the set of charsets supported
-	// depends on compile flags of postgres distribution - if no charsets were compiled into the server
-	// it will return 'SQL_ANSI' always
-	function GetCharSet()
-	{
-		//we will use ADO's builtin property charSet
-		$this->charSet = @pg_client_encoding($this->_connectionID);
-		if (!$this->charSet) {
-			return false;
-		} else {
-			return $this->charSet;
-		}
-	}
-	
-	// SetCharSet - switch the client encoding
-	function SetCharSet($charset_name)
-	{
-		$this->GetCharSet();
-		if ($this->charSet !== $charset_name) {
-			$if = pg_set_client_encoding($this->_connectionID, $charset_name);
-			if ($if == "0" & $this->GetCharSet() == $charset_name) {
-				return true;
-			} else return false;
-		} else return true;
-	}
-
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
-
-	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_postgres7($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
-	}
-	
-	 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
-				if (is_array($this->fields)) {
-					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-					return true;
-				}
-			}
-			$this->fields = false;
-			$this->EOF = true;
-		}
-		return false;
-	}		
-
-}
+ADODB_postgres64();
+	}
+
+	
+	// the following should be compat with postgresql 7.2, 
+	// which makes obsolete the LIMIT limit,offset syntax
+	 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	 {
+		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
+		 if ($secs2cache)
+		  	$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		 else
+		  	$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+		
+		return $rs;
+	 }
+ 	/*
+ 	function Prepare($sql)
+	{
+		$info = $this->ServerInfo();
+		if ($info['version']>=7.3) {
+			return array($sql,false);
+		}
+		return $sql;
+	}
+ 	*/
+
+	// from  Edward Jaramilla, improved version - works on pg 7.4
+function MetaForeignKeys($table, $owner=false, $upper=false)
+{
+	$sql = 'SELECT t.tgargs as args
+	FROM
+	pg_trigger t,pg_class c,pg_proc p
+	WHERE
+	t.tgenabled AND
+	t.tgrelid = c.oid AND
+	t.tgfoid = p.oid AND
+	p.proname = \'RI_FKey_check_ins\' AND
+	c.relname = \''.strtolower($table).'\'
+	ORDER BY
+		t.tgrelid';
+	
+	$rs = $this->Execute($sql);
+	
+	if ($rs && !$rs->EOF) {
+		$arr =& $rs->GetArray();
+		$a = array();
+		foreach($arr as $v)
+		{
+			$data = explode(chr(0), $v['args']);
+			if ($upper) {
+				$a[strtoupper($data[2])][] = strtoupper($data[4].'='.$data[5]);
+			} else {
+			$a[$data[2]][] = $data[4].'='.$data[5];
+			}
+		}
+		return $a;
+	}
+	return false;
+}
+
+
+
+    function xMetaForeignKeys($table, $owner=false, $upper=false)
+	{
+
+        $sql = '
+SELECT t.tgargs as args
+   FROM pg_trigger t,
+        pg_class c,
+        pg_class c2,
+        pg_proc f
+   WHERE t.tgenabled
+   AND t.tgrelid=c.oid
+   AND t.tgconstrrelid=c2.oid
+   AND t.tgfoid=f.oid
+   AND f.proname ~ \'^RI_FKey_check_ins\'
+   AND t.tgargs like \'$1\\\000'.strtolower($table).'%\'
+   ORDER BY t.tgrelid';
+
+        $rs = $this->Execute($sql);
+		if ($rs && !$rs->EOF) {
+			$arr =& $rs->GetArray();
+			$a = array();
+			foreach($arr as $v) {
+                $data = explode(chr(0), $v['args']);
+                if ($upper) {
+                    $a[] = array(strtoupper($data[2]) => strtoupper($data[4].'='.$data[5]));
+                } else {
+                    $a[] = array($data[2] => $data[4].'='.$data[5]);
+                }
+                
+			}
+			return $a;
+		}
+		else return false;
+    }
+	
+ 	 // this is a set of functions for managing client encoding - very important if the encodings
+	// of your database and your output target (i.e. HTML) don't match
+	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
+	// GetCharSet - get the name of the character set the client is using now
+	// the functions should work with Postgres 7.0 and above, the set of charsets supported
+	// depends on compile flags of postgres distribution - if no charsets were compiled into the server
+	// it will return 'SQL_ANSI' always
+	function GetCharSet()
+	{
+		//we will use ADO's builtin property charSet
+		$this->charSet = @pg_client_encoding($this->_connectionID);
+		if (!$this->charSet) {
+			return false;
+		} else {
+			return $this->charSet;
+		}
+	}
+	
+	// SetCharSet - switch the client encoding
+	function SetCharSet($charset_name)
+	{
+		$this->GetCharSet();
+		if ($this->charSet !== $charset_name) {
+			$if = pg_set_client_encoding($this->_connectionID, $charset_name);
+			if ($if == "0" & $this->GetCharSet() == $charset_name) {
+				return true;
+			} else return false;
+		} else return true;
+	}
+
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
+
+	var $databaseType = "postgres7";
+	
+	
+	function ADORecordSet_postgres7($queryID,$mode=false) 
+	{
+		$this->ADORecordSet_postgres64($queryID,$mode);
+	}
+	
+	 	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
+				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+			
+				if (is_array($this->fields)) {
+					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+					return true;
+				}
+			}
+			$this->fields = false;
+			$this->EOF = true;
+		}
+		return false;
+	}		
+
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-proxy.inc.php b/lib/adodb/drivers/adodb-proxy.inc.php
index c589ce96ada..44f448e8c5c 100644
--- a/lib/adodb/drivers/adodb-proxy.inc.php
+++ b/lib/adodb/drivers/adodb-proxy.inc.php
@@ -1,30 +1,30 @@
-ADORecordset($id,$mode);
-		}
-	};
-} // define
-	
+ADORecordset($id,$mode);
+		}
+	};
+} // define
+	
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-sapdb.inc.php b/lib/adodb/drivers/adodb-sapdb.inc.php
index c7408968c8c..320671e836e 100644
--- a/lib/adodb/drivers/adodb-sapdb.inc.php
+++ b/lib/adodb/drivers/adodb-sapdb.inc.php
@@ -1,63 +1,63 @@
-curmode = SQL_CUR_USE_ODBC;
-		$this->ADODB_odbc();
-	}
-	
-	/*
-		SelectLimit implementation problems:
-	
-	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
-	 	which is not ideal...
-		
-	  		select * from table where rowno < 10 order by 1
-	  
-	  	This means that we have to use the adoconnection base class SelectLimit when
-	  	there is an "order by".
-		
-		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
-	 */
-	
-};
- 
-
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {	
-	
-	var $databaseType = "sapdb";		
-	
-	function ADORecordSet_sapdb($id,$mode=false)
-	{
-		$this->ADORecordSet_odbc($id,$mode);
-	}
-}
-
-} //define
+curmode = SQL_CUR_USE_ODBC;
+		$this->ADODB_odbc();
+	}
+	
+	/*
+		SelectLimit implementation problems:
+	
+	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
+	 	which is not ideal...
+		
+	  		select * from table where rowno < 10 order by 1
+	  
+	  	This means that we have to use the adoconnection base class SelectLimit when
+	  	there is an "order by".
+		
+		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
+	 */
+	
+};
+ 
+
+class  ADORecordSet_sapdb extends ADORecordSet_odbc {	
+	
+	var $databaseType = "sapdb";		
+	
+	function ADORecordSet_sapdb($id,$mode=false)
+	{
+		$this->ADORecordSet_odbc($id,$mode);
+	}
+}
+
+} //define
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-sqlanywhere.inc.php b/lib/adodb/drivers/adodb-sqlanywhere.inc.php
index d68de25825a..0008f187361 100644
--- a/lib/adodb/drivers/adodb-sqlanywhere.inc.php
+++ b/lib/adodb/drivers/adodb-sqlanywhere.inc.php
@@ -1,166 +1,166 @@
-create_blobvar($blobVarName);
-
-	  b) load blob var from file.  $filename must be complete path
-
-	  $dbcon->load_blobvar_from_file($blobVarName, $filename);
-
-	  c) Use the $blobVarName in SQL insert or update statement in the values
-	  clause:
-
-		$recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, blobcol) '
-		.
-	   'VALUES (\'test\', ' . $blobVarName . ')');
-
-	 instead of loading blob from a file, you can also load from 
-	  an unformatted (raw) blob variable:
-	  $dbcon->load_blobvar_from_var($blobVarName, $varName);
-
-	  d) drop blob variable on db server to free up resources:
-	  $dbconn->drop_blobvar($blobVarName);
-
-  Sybase_SQLAnywhere data driver. Requires ODBC.
-
-*/
-
-if (!defined('_ADODB_ODBC_LAYER')) {
- include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-
-if (!defined('ADODB_SYBASE_SQLANYWHERE')){
-
- define('ADODB_SYBASE_SQLANYWHERE',1);
-
- class ADODB_sqlanywhere extends ADODB_odbc {
-  	var $databaseType = "sqlanywhere";	
-	var $hasInsertID = true;
-	
-	function ADODB_sqlanywhere()
-	{
-		$this->ADODB_odbc();
-	}
-
-	 function _insertid() {
-  	   return $this->GetOne('select @@identity');
-	 }
-
-  function create_blobvar($blobVarName) {
-   $this->Execute("create variable $blobVarName long binary");
-   return;
-  }
-
-  function drop_blobvar($blobVarName) {
-   $this->Execute("drop variable $blobVarName");
-   return;
-  }
-
-  function load_blobvar_from_file($blobVarName, $filename) {
-   $chunk_size = 1000;
-
-   $fd = fopen ($filename, "rb");
-
-   $integer_chunks = (integer)filesize($filename) / $chunk_size;
-   $modulus = filesize($filename) % $chunk_size;
-   if ($modulus != 0){
-	$integer_chunks += 1;
-   }
-
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-	$contents = fread ($fd, $chunk_size);
-	$contents = bin2hex($contents);
-
-	$hexstring = '';
-
-	for($loop2=0;$loop2qstr($hexstring);
-
-	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
-   }
-
-   fclose ($fd);
-   return;
-  }
-
-  function load_blobvar_from_var($blobVarName, &$varName) {
-   $chunk_size = 1000;
-
-   $integer_chunks = (integer)strlen($varName) / $chunk_size;
-   $modulus = strlen($varName) % $chunk_size;
-   if ($modulus != 0){
-	$integer_chunks += 1;
-   }
-
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-	$contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
-	$contents = bin2hex($contents);
-
-	$hexstring = '';
-
-	for($loop2=0;$loop2qstr($hexstring);
-
-	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
-   }
-
-   return;
-  }
-
- /*
-  Insert a null into the blob field of the table first.
-  Then use UpdateBlob to store the blob.
-
-  Usage:
-
-  $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-  $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
- */
-  function UpdateBlob($table,$column,&$val,$where,$blobtype='BLOB')
-  {
-   $blobVarName = 'hold_blob';
-   $this->create_blobvar($blobVarName);
-   $this->load_blobvar_from_var($blobVarName, $val);
-   $this->Execute("UPDATE $table SET $column=$blobVarName WHERE $where");
-   $this->drop_blobvar($blobVarName);
-   return true;
-  }
- }; //class
-
- class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
-
-  var $databaseType = "sqlanywhere";		
-
- function ADORecordSet_sqlanywhere($id,$mode=false)
- {
-  $this->ADORecordSet_odbc($id,$mode);
- }
-
-
- }; //class
-
-
-} //define
-?>
+create_blobvar($blobVarName);
+
+	  b) load blob var from file.  $filename must be complete path
+
+	  $dbcon->load_blobvar_from_file($blobVarName, $filename);
+
+	  c) Use the $blobVarName in SQL insert or update statement in the values
+	  clause:
+
+		$recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, blobcol) '
+		.
+	   'VALUES (\'test\', ' . $blobVarName . ')');
+
+	 instead of loading blob from a file, you can also load from 
+	  an unformatted (raw) blob variable:
+	  $dbcon->load_blobvar_from_var($blobVarName, $varName);
+
+	  d) drop blob variable on db server to free up resources:
+	  $dbconn->drop_blobvar($blobVarName);
+
+  Sybase_SQLAnywhere data driver. Requires ODBC.
+
+*/
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+ include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+}
+
+if (!defined('ADODB_SYBASE_SQLANYWHERE')){
+
+ define('ADODB_SYBASE_SQLANYWHERE',1);
+
+ class ADODB_sqlanywhere extends ADODB_odbc {
+  	var $databaseType = "sqlanywhere";	
+	var $hasInsertID = true;
+	
+	function ADODB_sqlanywhere()
+	{
+		$this->ADODB_odbc();
+	}
+
+	 function _insertid() {
+  	   return $this->GetOne('select @@identity');
+	 }
+
+  function create_blobvar($blobVarName) {
+   $this->Execute("create variable $blobVarName long binary");
+   return;
+  }
+
+  function drop_blobvar($blobVarName) {
+   $this->Execute("drop variable $blobVarName");
+   return;
+  }
+
+  function load_blobvar_from_file($blobVarName, $filename) {
+   $chunk_size = 1000;
+
+   $fd = fopen ($filename, "rb");
+
+   $integer_chunks = (integer)filesize($filename) / $chunk_size;
+   $modulus = filesize($filename) % $chunk_size;
+   if ($modulus != 0){
+	$integer_chunks += 1;
+   }
+
+   for($loop=1;$loop<=$integer_chunks;$loop++){
+	$contents = fread ($fd, $chunk_size);
+	$contents = bin2hex($contents);
+
+	$hexstring = '';
+
+	for($loop2=0;$loop2qstr($hexstring);
+
+	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
+   }
+
+   fclose ($fd);
+   return;
+  }
+
+  function load_blobvar_from_var($blobVarName, &$varName) {
+   $chunk_size = 1000;
+
+   $integer_chunks = (integer)strlen($varName) / $chunk_size;
+   $modulus = strlen($varName) % $chunk_size;
+   if ($modulus != 0){
+	$integer_chunks += 1;
+   }
+
+   for($loop=1;$loop<=$integer_chunks;$loop++){
+	$contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
+	$contents = bin2hex($contents);
+
+	$hexstring = '';
+
+	for($loop2=0;$loop2qstr($hexstring);
+
+	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
+   }
+
+   return;
+  }
+
+ /*
+  Insert a null into the blob field of the table first.
+  Then use UpdateBlob to store the blob.
+
+  Usage:
+
+  $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+  $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+ */
+  function UpdateBlob($table,$column,&$val,$where,$blobtype='BLOB')
+  {
+   $blobVarName = 'hold_blob';
+   $this->create_blobvar($blobVarName);
+   $this->load_blobvar_from_var($blobVarName, $val);
+   $this->Execute("UPDATE $table SET $column=$blobVarName WHERE $where");
+   $this->drop_blobvar($blobVarName);
+   return true;
+  }
+ }; //class
+
+ class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
+
+  var $databaseType = "sqlanywhere";		
+
+ function ADORecordSet_sqlanywhere($id,$mode=false)
+ {
+  $this->ADORecordSet_odbc($id,$mode);
+ }
+
+
+ }; //class
+
+
+} //define
+?>
diff --git a/lib/adodb/drivers/adodb-sqlite.inc.php b/lib/adodb/drivers/adodb-sqlite.inc.php
index db2d3d8c49c..447f664da4d 100644
--- a/lib/adodb/drivers/adodb-sqlite.inc.php
+++ b/lib/adodb/drivers/adodb-sqlite.inc.php
@@ -1,318 +1,319 @@
-fmtDate)."'";
-	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
-	}
-  }*/
-	
-	function ServerInfo()
-	{
-		$arr['version'] = sqlite_libversion();
-		$arr['description'] = 'SQLite ';
-		$arr['encoding'] = sqlite_libencoding();
-		return $arr;
-	}
-	
-	function BeginTrans()
-	{	  
-		 if ($this->transOff) return true; 
-		 $ret = $this->Execute("BEGIN TRANSACTION");
-		 $this->transCnt += 1;
-		 return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		$ret = $this->Execute("COMMIT");
-		if ($this->transCnt>0)$this->transCnt -= 1;
-		return !empty($ret);
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		$ret = $this->Execute("ROLLBACK");
-		if ($this->transCnt>0)$this->transCnt -= 1;
-		return !empty($ret);
-	}
-
-	function _insertid()
-	{
-		return sqlite_last_insert_rowid($this->_connectionID);
-	}
-	
-	function _affectedrows()
-	{
-        return sqlite_changes($this->_connectionID);
-    }
-	
-	function ErrorMsg() 
- 	{
-		if ($this->_logsql) return $this->_errorMsg;
-		return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) : '';
-	}
- 
-	function ErrorNo() 
-	{
-		return $this->_errorNo;
-	}
-	
-	function SQLDate($fmt, $col=false)
-	{
-		$fmt = $this->qstr($fmt);
-		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
-	}
-	
-	function &MetaColumns($tab)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$rs = $this->Execute("select * from $tab limit 1");
-		if (!$rs) return false;
-		$arr = array();
-		for ($i=0,$max=$rs->_numOfFields; $i < $max; $i++) {
-			$fld =& $rs->FetchField($i);
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] =& $fld;	
-			else $arr[strtoupper($fld->name)] =& $fld;
-		}
-		$rs->Close();
-		return $arr;
-	}
-	
-	function _createFunctions()
-	{
-		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
-		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
-	}
-	
-
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sqlite_open')) return false;
-		
-		$this->_connectionID = sqlite_open($argHostname);
-		if ($this->_connectionID === false) return false;
-		$this->_createFunctions();
-		return true;
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sqlite_open')) return false;
-		
-		$this->_connectionID = sqlite_popen($argHostname);
-		if ($this->_connectionID === false) return false;
-		$this->_createFunctions();
-		return true;
-	}
-
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr=false)
-	{
-		$rez = sqlite_query($sql,$this->_connectionID);
-		if (!$rez) {
-			$this->_errorNo = sqlite_last_error($this->_connectionID);
-		}
-		
-		return $rez;
-	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{
-		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
-	  	if ($secs2cache)
-	   		$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-	  	else
-	   		$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-			
-		return $rs;
-	}
-	
-	/*
-		This algorithm is not very efficient, but works even if table locking
-		is not available.
-		
-		Will return false if unable to generate an ID after $MAXLOOPS attempts.
-	*/
-	var $_genSeqSQL = "create table %s (id integer)";
-	
-	function GenID($seq='adodbseq',$start=1)
-	{	
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$MAXLOOPS = 100;
-		//$this->debug=1;
-		while (--$MAXLOOPS>=0) {
-			$num = $this->GetOne("select id from $seq");
-			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
-				$start -= 1;
-				$num = '0';
-				$ok = $this->Execute("insert into $seq values($start)");
-				if (!$ok) return false;
-			} 
-			$this->Execute("update $seq set id=id+1 where id=$num");
-			
-			if ($this->affected_rows() > 0) {
-				$num += 1;
-				$this->genID = $num;
-				return $num;
-			}
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-		}
-		return false;
-	}
-
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		$start -= 1;
-		return $this->Execute("insert into $seqname values($start)");
-	}
-	
-	var $_dropSeqSQL = 'drop table %s';
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return @sqlite_close($this->_connectionID);
-	}
-
-
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_sqlite extends ADORecordSet {
-
-	var $databaseType = "sqlite";
-	var $bind = false;
-
-	function ADORecordset_sqlite($queryID,$mode=false)
-	{
-		
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
-		default: $this->fetchMode = SQLITE_BOTH; break;
-		}
-		
-		$this->_queryID = $queryID;
-	
-		$this->_inited = true;
-		$this->fields = array();
-		if ($queryID) {
-			$this->_currentRow = 0;
-			$this->EOF = !$this->_fetch();
-			@$this->_initrs();
-		} else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-		
-		return $this->_queryID;
-	}
-
-
-	function &FetchField($fieldOffset = -1)
-	{
-		$fld = new ADOFieldObject;
-		$fld->name = sqlite_field_name($this->_queryID, $fieldOffset);
-		$fld->type = 'VARCHAR';
-		$fld->max_length = -1;
-		return $fld;
-	}
-	
-   function _initrs()
-   {
-		$this->_numOfRows = @sqlite_num_rows($this->_queryID);
-		$this->_numOfFields = @sqlite_num_fields($this->_queryID);
-   }
-
-	function Fields($colname)
-	{
-		if ($this->fetchMode != SQLITE_NUM) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-   function _seek($row)
-   {
-   		return sqlite_seek($this->_queryID, $row);
-   }
-
-	function _fetch($ignore_fields=false) 
-	{
-		$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
-		return !empty($this->fields);
-	}
-	
-	function _close() 
-	{
-	}
-
-}
+fmtDate)."'";
+	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
+	}
+  }*/
+	
+	function ServerInfo()
+	{
+		$arr['version'] = sqlite_libversion();
+		$arr['description'] = 'SQLite ';
+		$arr['encoding'] = sqlite_libencoding();
+		return $arr;
+	}
+	
+	function BeginTrans()
+	{	  
+		 if ($this->transOff) return true; 
+		 $ret = $this->Execute("BEGIN TRANSACTION");
+		 $this->transCnt += 1;
+		 return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		$ret = $this->Execute("COMMIT");
+		if ($this->transCnt>0)$this->transCnt -= 1;
+		return !empty($ret);
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true; 
+		$ret = $this->Execute("ROLLBACK");
+		if ($this->transCnt>0)$this->transCnt -= 1;
+		return !empty($ret);
+	}
+
+	function _insertid()
+	{
+		return sqlite_last_insert_rowid($this->_connectionID);
+	}
+	
+	function _affectedrows()
+	{
+        return sqlite_changes($this->_connectionID);
+    }
+	
+	function ErrorMsg() 
+ 	{
+		if ($this->_logsql) return $this->_errorMsg;
+		return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) : '';
+	}
+ 
+	function ErrorNo() 
+	{
+		return $this->_errorNo;
+	}
+	
+	function SQLDate($fmt, $col=false)
+	{
+		$fmt = $this->qstr($fmt);
+		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
+	}
+	
+	function &MetaColumns($tab)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$rs = $this->Execute("select * from $tab limit 1");
+		if (!$rs) return false;
+		$arr = array();
+		for ($i=0,$max=$rs->_numOfFields; $i < $max; $i++) {
+			$fld =& $rs->FetchField($i);
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] =& $fld;	
+			else $arr[strtoupper($fld->name)] =& $fld;
+		}
+		$rs->Close();
+		return $arr;
+	}
+	
+	function _createFunctions()
+	{
+		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
+		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
+	}
+	
+
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sqlite_open')) return false;
+		
+		$this->_connectionID = sqlite_open($argHostname);
+		if ($this->_connectionID === false) return false;
+		$this->_createFunctions();
+		return true;
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sqlite_open')) return false;
+		
+		$this->_connectionID = sqlite_popen($argHostname);
+		if ($this->_connectionID === false) return false;
+		$this->_createFunctions();
+		return true;
+	}
+
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr=false)
+	{
+		$rez = sqlite_query($sql,$this->_connectionID);
+		if (!$rez) {
+			$this->_errorNo = sqlite_last_error($this->_connectionID);
+		}
+		
+		return $rez;
+	}
+	
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	{
+		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
+	  	if ($secs2cache)
+	   		$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+	  	else
+	   		$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+			
+		return $rs;
+	}
+	
+	/*
+		This algorithm is not very efficient, but works even if table locking
+		is not available.
+		
+		Will return false if unable to generate an ID after $MAXLOOPS attempts.
+	*/
+	var $_genSeqSQL = "create table %s (id integer)";
+	
+	function GenID($seq='adodbseq',$start=1)
+	{	
+		// if you have to modify the parameter below, your database is overloaded,
+		// or you need to implement generation of id's yourself!
+		$MAXLOOPS = 100;
+		//$this->debug=1;
+		while (--$MAXLOOPS>=0) {
+			$num = $this->GetOne("select id from $seq");
+			if ($num === false) {
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$start -= 1;
+				$num = '0';
+				$ok = $this->Execute("insert into $seq values($start)");
+				if (!$ok) return false;
+			} 
+			$this->Execute("update $seq set id=id+1 where id=$num");
+			
+			if ($this->affected_rows() > 0) {
+				$num += 1;
+				$this->genID = $num;
+				return $num;
+			}
+		}
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
+		}
+		return false;
+	}
+
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		$start -= 1;
+		return $this->Execute("insert into $seqname values($start)");
+	}
+	
+	var $_dropSeqSQL = 'drop table %s';
+	function DropSequence($seqname)
+	{
+		if (empty($this->_dropSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return @sqlite_close($this->_connectionID);
+	}
+
+
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_sqlite extends ADORecordSet {
+
+	var $databaseType = "sqlite";
+	var $bind = false;
+
+	function ADORecordset_sqlite($queryID,$mode=false)
+	{
+		
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch($mode) {
+		case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
+		case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
+		default: $this->fetchMode = SQLITE_BOTH; break;
+		}
+		
+		$this->_queryID = $queryID;
+	
+		$this->_inited = true;
+		$this->fields = array();
+		if ($queryID) {
+			$this->_currentRow = 0;
+			$this->EOF = !$this->_fetch();
+			@$this->_initrs();
+		} else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+		
+		return $this->_queryID;
+	}
+
+
+	function &FetchField($fieldOffset = -1)
+	{
+		$fld = new ADOFieldObject;
+		$fld->name = sqlite_field_name($this->_queryID, $fieldOffset);
+		$fld->type = 'VARCHAR';
+		$fld->max_length = -1;
+		return $fld;
+	}
+	
+   function _initrs()
+   {
+		$this->_numOfRows = @sqlite_num_rows($this->_queryID);
+		$this->_numOfFields = @sqlite_num_fields($this->_queryID);
+   }
+
+	function Fields($colname)
+	{
+		if ($this->fetchMode != SQLITE_NUM) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+   function _seek($row)
+   {
+   		return sqlite_seek($this->_queryID, $row);
+   }
+
+	function _fetch($ignore_fields=false) 
+	{
+		$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
+		return !empty($this->fields);
+	}
+	
+	function _close() 
+	{
+	}
+
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-sybase.inc.php b/lib/adodb/drivers/adodb-sybase.inc.php
index b1626674978..2c8982210fb 100644
--- a/lib/adodb/drivers/adodb-sybase.inc.php
+++ b/lib/adodb/drivers/adodb-sybase.inc.php
@@ -1,408 +1,405 @@
-GetOne('select @@identity');
-	}
-	  // might require begintrans -- committrans
-	function _affectedrows()
-	{
-	   return $this->GetOne('select @@rowcount');
-	}
-
-			  
-	function BeginTrans()
-	{	
-	
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		   
-		$this->Execute('BEGIN TRAN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		
-		if (!$ok) return $this->RollbackTrans();
-	
-		$this->transCnt -= 1;
-		$this->Execute('COMMIT TRAN');
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt -= 1;
-		$this->Execute('ROLLBACK TRAN');
-		return true;
-	}
-	
-	// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
-	function RowLock($tables,$where) 
-	{
-		if (!$this->_hastrans) $this->BeginTrans();
-		$tables = str_replace(',',' HOLDLOCK,',$tables);
-		return $this->GetOne("select top 1 null as ignore from $tables HOLDLOCK where $where");
-		
-	}	
-		
-	function SelectDB($dbName) {
-		$this->databaseName = $dbName;
-		if ($this->_connectionID) {
-			return @sybase_select_db($dbName);		
-		}
-		else return false;	
-	}
-
-	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/	
-
-	function ErrorMsg() 
-	{
-		if ($this->_logsql) return $this->_errorMsg;
-		$this->_errorMsg = sybase_get_last_message();
-		return $this->_errorMsg;
-	}
-
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sybase_connect')) return false;
-		
-		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sybase_connect')) return false;
-		
-		$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-	global $ADODB_COUNTRECS;
-	
-		if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
-			return sybase_unbuffered_query($sql,$this->_connectionID);
-		else
-			return sybase_query($sql,$this->_connectionID);
-	}
-	
-	// See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{
-		if ($secs2cache > 0) {// we do not cache rowcount, so we have to load entire recordset
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			return $rs;
-		}
-		$cnt = ($nrows > 0) ? $nrows : 0;
-		if ($offset > 0 && $cnt) $cnt += $offset;
-		
-		$this->Execute("set rowcount $cnt"); 
-		$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		$this->Execute("set rowcount 0"); 
-		
-		return $rs;
-	}
-
-	// returns true or false
-	function _close()
-	{ 
-		return @sybase_close($this->_connectionID);
-	}
-	
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_sybase::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}	
-	
-	
-
-	# Added 2003-10-05 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    // Format date column in sql string given an input format that understands Y M D
-    function SQLDate($fmt, $col=false)
-    {
-        if (!$col) $col = $this->sysTimeStamp;
-        $s = '';
-
-        $len = strlen($fmt);
-        for ($i=0; $i < $len; $i++) {
-            if ($s) $s .= '+';
-            $ch = $fmt[$i];
-            switch($ch) {
-            case 'Y':
-            case 'y':
-                $s .= "datename(yy,$col)";
-                break;
-            case 'M':
-                $s .= "convert(char(3),$col,0)";
-                break;
-            case 'm':
-                $s .= "replace(str(month($col),2),' ','0')";
-                break;
-            case 'Q':
-            case 'q':
-                $s .= "datename(qq,$col)";
-                break;
-            case 'D':
-            case 'd':
-                $s .= "replace(str(datepart(dd,$col),2),' ','0')";
-                break;
-            case 'h':
-                $s .= "substring(convert(char(14),$col,0),13,2)";
-                break;
-
-            case 'H':
-                $s .= "replace(str(datepart(hh,$col),2),' ','0')";
-                break;
-
-            case 'i':
-                $s .= "replace(str(datepart(mi,$col),2),' ','0')";
-                break;
-            case 's':
-                $s .= "replace(str(datepart(ss,$col),2),' ','0')";
-                break;
-            case 'a':
-            case 'A':
-                $s .= "substring(convert(char(19),$col,0),18,2)";
-                break;
-
-            default:
-                if ($ch == '\\') {
-                    $i++;
-                    $ch = substr($fmt,$i,1);
-                }
-                $s .= $this->qstr($ch);
-                break;
-            }
-        }
-        return $s;
-    }
-	
-	# Added 2003-10-07 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    function MetaPrimaryKeys($table)
-    {
-        $sql = "SELECT c.column_name " .
-               "FROM syscolumn c, systable t " .
-               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
-               "AND t.table_type='BASE' " .
-               "AND c.pkey = 'Y' " .
-               "ORDER BY c.column_id";
-
-        $a = $this->GetCol($sql);
-        if ($a && sizeof($a)>0) return $a;
-        return false;
-    }
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-global $ADODB_sybase_mths;
-$ADODB_sybase_mths = array(
-	'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
-	'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
-
-class ADORecordset_sybase extends ADORecordSet {	
-
-	var $databaseType = "sybase";
-	var $canSeek = true;
-	// _mths works only in non-localised system
-	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
-
-	function ADORecordset_sybase($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
-		else $this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-	
-	/*	Returns: an object containing field information. 
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-	function &FetchField($fieldOffset = -1) 
-	{
-		if ($fieldOffset != -1) {
-			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @sybase_fetch_field($this->_queryID);
-		}
-		// older versions of PHP did not support type, only numeric
-		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
-		return $o;
-	}
-	
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @sybase_num_fields($this->_queryID);
-	}
-	
-	function _seek($row) 
-	{
-		return @sybase_data_seek($this->_queryID, $row);
-	}		
-
-	function _fetch($ignore_fields=false) 
-	{
-		if ($this->fetchMode == ADODB_FETCH_NUM) {
-			$this->fields = @sybase_fetch_row($this->_queryID);
-		} else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-			$this->fields = @sybase_fetch_row($this->_queryID);
-			if (is_array($this->fields)) {
-				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				return true;
-			}
-			return false;
-		}  else {
-			$this->fields = @sybase_fetch_array($this->_queryID);
-		}
-		if ( is_array($this->fields)) {
-			return true;
-		}
-
-		return false;
-	}
-	
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close() {
-		return @sybase_free_result($this->_queryID);		
-	}
-	
-	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_sybase::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}
-}
-
-class ADORecordSet_array_sybase extends ADORecordSet_array {
-	function ADORecordSet_array_sybase($id=-1)
-	{
-		$this->ADORecordSet_array($id);
-	}
-	
-		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-	global $ADODB_sybase_mths;
-	
-		//Dec 30 2000 12:00AM
-		if (!ereg( "([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})"
-			,$v, $rr)) return parent::UnixDate($v);
-			
-		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-		$themth = substr(strtoupper($rr[1]),0,3);
-		$themth = $ADODB_sybase_mths[$themth];
-		if ($themth <= 0) return false;
-		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-	global $ADODB_sybase_mths;
-		//11.02.2001 Toni Tunkkari toni.tunkkari@finebyte.com
-		//Changed [0-9] to [0-9 ] in day conversion
-		if (!ereg( "([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-		$themth = substr(strtoupper($rr[1]),0,3);
-		$themth = $ADODB_sybase_mths[$themth];
-		if ($themth <= 0) return false;
-		
-		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
-		}
-		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
-	}
-}
-?>
+GetOne('select @@identity');
+	}
+	  // might require begintrans -- committrans
+	function _affectedrows()
+	{
+	   return $this->GetOne('select @@rowcount');
+	}
+
+			  
+	function BeginTrans()
+	{	
+	
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		   
+		$this->Execute('BEGIN TRAN');
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true;
+		
+		if (!$ok) return $this->RollbackTrans();
+	
+		$this->transCnt -= 1;
+		$this->Execute('COMMIT TRAN');
+		return true;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt -= 1;
+		$this->Execute('ROLLBACK TRAN');
+		return true;
+	}
+	
+	// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
+	function RowLock($tables,$where) 
+	{
+		if (!$this->_hastrans) $this->BeginTrans();
+		$tables = str_replace(',',' HOLDLOCK,',$tables);
+		return $this->GetOne("select top 1 null as ignore from $tables HOLDLOCK where $where");
+		
+	}	
+		
+	function SelectDB($dbName) {
+		$this->databaseName = $dbName;
+		if ($this->_connectionID) {
+			return @sybase_select_db($dbName);		
+		}
+		else return false;	
+	}
+
+	/*	Returns: the last error message from previous database operation
+		Note: This function is NOT available for Microsoft SQL Server.	*/	
+
+	function ErrorMsg() 
+	{
+		if ($this->_logsql) return $this->_errorMsg;
+		$this->_errorMsg = sybase_get_last_message();
+		return $this->_errorMsg;
+	}
+
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sybase_connect')) return false;
+		
+		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sybase_connect')) return false;
+		
+		$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr)
+	{
+	global $ADODB_COUNTRECS;
+	
+		if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
+			return sybase_unbuffered_query($sql,$this->_connectionID);
+		else
+			return sybase_query($sql,$this->_connectionID);
+	}
+	
+	// See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	{
+		if ($secs2cache > 0) {// we do not cache rowcount, so we have to load entire recordset
+			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			return $rs;
+		}
+		$cnt = ($nrows > 0) ? $nrows : 0;
+		if ($offset > 0 && $cnt) $cnt += $offset;
+		
+		$this->Execute("set rowcount $cnt"); 
+		$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		$this->Execute("set rowcount 0"); 
+		
+		return $rs;
+	}
+
+	// returns true or false
+	function _close()
+	{ 
+		return @sybase_close($this->_connectionID);
+	}
+	
+	function UnixDate($v)
+	{
+		return ADORecordSet_array_sybase::UnixDate($v);
+	}
+	
+	function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_sybase::UnixTimeStamp($v);
+	}	
+	
+	
+
+	# Added 2003-10-05 by Chris Phillipson
+    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
+    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
+    // Format date column in sql string given an input format that understands Y M D
+    function SQLDate($fmt, $col=false)
+    {
+        if (!$col) $col = $this->sysTimeStamp;
+        $s = '';
+
+        $len = strlen($fmt);
+        for ($i=0; $i < $len; $i++) {
+            if ($s) $s .= '+';
+            $ch = $fmt[$i];
+            switch($ch) {
+            case 'Y':
+            case 'y':
+                $s .= "datename(yy,$col)";
+                break;
+            case 'M':
+                $s .= "convert(char(3),$col,0)";
+                break;
+            case 'm':
+                $s .= "replace(str(month($col),2),' ','0')";
+                break;
+            case 'Q':
+            case 'q':
+                $s .= "datename(qq,$col)";
+                break;
+            case 'D':
+            case 'd':
+                $s .= "replace(str(datepart(dd,$col),2),' ','0')";
+                break;
+            case 'h':
+                $s .= "substring(convert(char(14),$col,0),13,2)";
+                break;
+
+            case 'H':
+                $s .= "replace(str(datepart(hh,$col),2),' ','0')";
+                break;
+
+            case 'i':
+                $s .= "replace(str(datepart(mi,$col),2),' ','0')";
+                break;
+            case 's':
+                $s .= "replace(str(datepart(ss,$col),2),' ','0')";
+                break;
+            case 'a':
+            case 'A':
+                $s .= "substring(convert(char(19),$col,0),18,2)";
+                break;
+
+            default:
+                if ($ch == '\\') {
+                    $i++;
+                    $ch = substr($fmt,$i,1);
+                }
+                $s .= $this->qstr($ch);
+                break;
+            }
+        }
+        return $s;
+    }
+	
+	# Added 2003-10-07 by Chris Phillipson
+    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
+    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
+    function MetaPrimaryKeys($table)
+    {
+        $sql = "SELECT c.column_name " .
+               "FROM syscolumn c, systable t " .
+               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
+               "AND t.table_type='BASE' " .
+               "AND c.pkey = 'Y' " .
+               "ORDER BY c.column_id";
+
+        $a = $this->GetCol($sql);
+        if ($a && sizeof($a)>0) return $a;
+        return false;
+    }
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+global $ADODB_sybase_mths;
+$ADODB_sybase_mths = array(
+	'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
+	'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+
+class ADORecordset_sybase extends ADORecordSet {	
+
+	var $databaseType = "sybase";
+	var $canSeek = true;
+	// _mths works only in non-localised system
+	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
+
+	function ADORecordset_sybase($id,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
+		else $this->fetchMode = $mode;
+		return $this->ADORecordSet($id,$mode);
+	}
+	
+	/*	Returns: an object containing field information. 
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+	function &FetchField($fieldOffset = -1) 
+	{
+		if ($fieldOffset != -1) {
+			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$o = @sybase_fetch_field($this->_queryID);
+		}
+		// older versions of PHP did not support type, only numeric
+		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
+		return $o;
+	}
+	
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @sybase_num_fields($this->_queryID);
+	}
+	
+	function _seek($row) 
+	{
+		return @sybase_data_seek($this->_queryID, $row);
+	}		
+
+	function _fetch($ignore_fields=false) 
+	{
+		if ($this->fetchMode == ADODB_FETCH_NUM) {
+			$this->fields = @sybase_fetch_row($this->_queryID);
+		} else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+			$this->fields = @sybase_fetch_row($this->_queryID);
+			if (is_array($this->fields)) {
+				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+				return true;
+			}
+			return false;
+		}  else {
+			$this->fields = @sybase_fetch_array($this->_queryID);
+		}
+		if ( is_array($this->fields)) {
+			return true;
+		}
+
+		return false;
+	}
+	
+	/*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+	function _close() {
+		return @sybase_free_result($this->_queryID);		
+	}
+	
+	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
+	function UnixDate($v)
+	{
+		return ADORecordSet_array_sybase::UnixDate($v);
+	}
+	
+	function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_sybase::UnixTimeStamp($v);
+	}
+}
+
+class ADORecordSet_array_sybase extends ADORecordSet_array {
+	function ADORecordSet_array_sybase($id=-1)
+	{
+		$this->ADORecordSet_array($id);
+	}
+	
+		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
+	function UnixDate($v)
+	{
+	global $ADODB_sybase_mths;
+	
+		//Dec 30 2000 12:00AM
+		if (!ereg( "([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})"
+			,$v, $rr)) return parent::UnixDate($v);
+			
+		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+		$themth = substr(strtoupper($rr[1]),0,3);
+		$themth = $ADODB_sybase_mths[$themth];
+		if ($themth <= 0) return false;
+		// h-m-s-MM-DD-YY
+		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
+	}
+	
+	function UnixTimeStamp($v)
+	{
+	global $ADODB_sybase_mths;
+		//11.02.2001 Toni Tunkkari toni.tunkkari@finebyte.com
+		//Changed [0-9] to [0-9 ] in day conversion
+		if (!ereg( "([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+		$themth = substr(strtoupper($rr[1]),0,3);
+		$themth = $ADODB_sybase_mths[$themth];
+		if ($themth <= 0) return false;
+		
+		switch (strtoupper($rr[6])) {
+		case 'P':
+			if ($rr[4]<12) $rr[4] += 12;
+			break;
+		case 'A':
+			if ($rr[4]==12) $rr[4] = 0;
+			break;
+		default:
+			break;
+		}
+		// h-m-s-MM-DD-YY
+		return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
+	}
+}
+?>
diff --git a/lib/adodb/drivers/adodb-vfp.inc.php b/lib/adodb/drivers/adodb-vfp.inc.php
index 86e1e752abb..2032ea4541a 100644
--- a/lib/adodb/drivers/adodb-vfp.inc.php
+++ b/lib/adodb/drivers/adodb-vfp.inc.php
@@ -1,98 +1,98 @@
-ADODB_odbc();
-	}
-	
-	function BeginTrans() { return false;}
-	
-	// quote string to be sent back to database
-	function qstr($s,$nofixquotes=false)
-	{
-		if (!$nofixquotes) return  "'".str_replace("\r\n","'+chr(13)+'",str_replace("'",$this->replaceQuote,$s))."'";
-		return "'".$s."'";
-	}
-
-	
-	// TOP requires ORDER BY for VFP
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if (!preg_match('/ORDER[ \t\r\n]+BY/is',$sql)) $sql .= ' ORDER BY 1';
-		return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-	}
-
-
-};
- 
-
-class  ADORecordSet_vfp extends ADORecordSet_odbc {	
-	
-	var $databaseType = "vfp";		
-
-	
-	function ADORecordSet_vfp($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-		case 'C':
-			if ($len <= $this->blobSize) return 'C';
-		case 'M':
-			return 'X';
-			 
-		case 'D': return 'D';
-		
-		case 'T': return 'T';
-		
-		case 'L': return 'L';
-		
-		case 'I': return 'I';
-		
-		default: return 'N';
-		}
-	}
-}
-
-} //define
+ADODB_odbc();
+	}
+	
+	function BeginTrans() { return false;}
+	
+	// quote string to be sent back to database
+	function qstr($s,$nofixquotes=false)
+	{
+		if (!$nofixquotes) return  "'".str_replace("\r\n","'+chr(13)+'",str_replace("'",$this->replaceQuote,$s))."'";
+		return "'".$s."'";
+	}
+
+	
+	// TOP requires ORDER BY for VFP
+	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		if (!preg_match('/ORDER[ \t\r\n]+BY/is',$sql)) $sql .= ' ORDER BY 1';
+		return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+	}
+
+
+};
+ 
+
+class  ADORecordSet_vfp extends ADORecordSet_odbc {	
+	
+	var $databaseType = "vfp";		
+
+	
+	function ADORecordSet_vfp($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbc($id,$mode);
+	}
+
+	function MetaType($t,$len=-1)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+		case 'C':
+			if ($len <= $this->blobSize) return 'C';
+		case 'M':
+			return 'X';
+			 
+		case 'D': return 'D';
+		
+		case 'T': return 'T';
+		
+		case 'L': return 'L';
+		
+		case 'I': return 'I';
+		
+		default: return 'N';
+		}
+	}
+}
+
+} //define
 ?>
\ No newline at end of file
diff --git a/lib/adodb/license.txt b/lib/adodb/license.txt
index 65831629fa7..786fc32bfe6 100644
--- a/lib/adodb/license.txt
+++ b/lib/adodb/license.txt
@@ -1,182 +1,182 @@
-ADOdb is dual licensed using BSD and LGPL. 
-
-In plain English, you do not need to distribute your application  in source code form, nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license.
-
-Commercial use of ADOdb is encouraged. Make money and multiply!
-
-BSD Style-License
-=================
-
-Copyright (c) 2000, 2001, 2002, 2003 John Lim
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list 
-of conditions and the following disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list 
-of conditions and the following disclaimer in the documentation and/or other materials 
-provided with the distribution. 
-
-Neither the name of the John Lim nor the names of its contributors may be used to 
-endorse or promote products derived from this software without specific prior written 
-permission. 
-
-DISCLAIMER:
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-==========================================================
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999 
- 
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
- 
- 
-Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
-
-
-a) The modified work must itself be a software library. 
-b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
-c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
-d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
-(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
-
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
-
-
-a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
-b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
-c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
-d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
-e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
-
-
-a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
-b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
-
-NO WARRANTY 
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-
-
+ADOdb is dual licensed using BSD and LGPL. 
+
+In plain English, you do not need to distribute your application  in source code form, nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license.
+
+Commercial use of ADOdb is encouraged. Make money and multiply!
+
+BSD Style-License
+=================
+
+Copyright (c) 2000, 2001, 2002, 2003 John Lim
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list 
+of conditions and the following disclaimer. 
+
+Redistributions in binary form must reproduce the above copyright notice, this list 
+of conditions and the following disclaimer in the documentation and/or other materials 
+provided with the distribution. 
+
+Neither the name of the John Lim nor the names of its contributors may be used to 
+endorse or promote products derived from this software without specific prior written 
+permission. 
+
+DISCLAIMER:
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+==========================================================
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999 
+ 
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+ 
+ 
+Preamble
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
+
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
+
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
+
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
+
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
+
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
+
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
+
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
+
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
+
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
+
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
+
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
+
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
+
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
+
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
+
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
+
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
+
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+
+
+a) The modified work must itself be a software library. 
+b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
+c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
+d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
+(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
+
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
+
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
+
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
+
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
+
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
+
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
+
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
+
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
+
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
+
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
+
+
+a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
+b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
+c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
+d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
+e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
+
+
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
+b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
+
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+
+NO WARRANTY 
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+
+
 END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/lib/adodb/perf/perf-db2.inc.php b/lib/adodb/perf/perf-db2.inc.php
index 64e26222d07..75bc51149c7 100644
--- a/lib/adodb/perf/perf-db2.inc.php
+++ b/lib/adodb/perf/perf-db2.inc.php
@@ -1,100 +1,100 @@
- array('RATIO',
-			"SELECT 
-				case when sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0 
-				else 100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)) end 
-				FROM TABLE(SNAPSHOT_APPL('',-2)) as t",
-			'=WarnCacheRatio'),
-			
-	'Data Cache',
-		'data cache buffers' => array('DATAC',
-		'select sum(npages) from SYSCAT.BUFFERPOOLS',
-			'See tuning reference.' ),
-		'cache blocksize' => array('DATAC',
-		'select avg(pagesize) from SYSCAT.BUFFERPOOLS',
-			'' ),
-		'data cache size' => array('DATAC',
-		'select sum(npages*pagesize) from SYSCAT.BUFFERPOOLS',
-			'' ),
-	'Connections',
-		'current connections' => array('SESS',
-			"SELECT count(*) FROM TABLE(SNAPSHOT_APPL_INFO('',-2)) as t",
-			''),
-
-		false
-	);
-
-
-	function perf_db2(&$conn)
-	{
-		$this->conn =& $conn;
-	}
-	
-	function Explain($sql,$partial=false)
-	{
-		$save = $this->conn->LogSQL(false);
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		$qno = rand();
-		$ok = $this->conn->Execute("EXPLAIN PLAN SET QUERYNO=$qno FOR $sql");
-		ob_start();
-		if (!$ok) echo "
    Have EXPLAIN tables been created?
    ";
-		else {
-			$rs = $this->conn->Execute("select * from explain_statement where queryno=$qno");
-			if ($rs) rs2html($rs);
-		}
-		$s = ob_get_contents();
-		ob_end_clean();
-		$this->conn->LogSQL($save);
-		
-		$s .= $this->Tracer($sql);
-		return $s;
-	}
-	
-	
-	function Tables()
-	{
-		$rs = $this->conn->Execute("select tabschema,tabname,card as rows,
-			npages pages_used,fpages pages_allocated, tbspace tablespace  
-			from syscat.tables where tabschema not in ('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
-		return rs2html($rs,false,false,false,false);
-	}
-}
+ array('RATIO',
+			"SELECT 
+				case when sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0 
+				else 100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)) end 
+				FROM TABLE(SNAPSHOT_APPL('',-2)) as t",
+			'=WarnCacheRatio'),
+			
+	'Data Cache',
+		'data cache buffers' => array('DATAC',
+		'select sum(npages) from SYSCAT.BUFFERPOOLS',
+			'See tuning reference.' ),
+		'cache blocksize' => array('DATAC',
+		'select avg(pagesize) from SYSCAT.BUFFERPOOLS',
+			'' ),
+		'data cache size' => array('DATAC',
+		'select sum(npages*pagesize) from SYSCAT.BUFFERPOOLS',
+			'' ),
+	'Connections',
+		'current connections' => array('SESS',
+			"SELECT count(*) FROM TABLE(SNAPSHOT_APPL_INFO('',-2)) as t",
+			''),
+
+		false
+	);
+
+
+	function perf_db2(&$conn)
+	{
+		$this->conn =& $conn;
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		$save = $this->conn->LogSQL(false);
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		$qno = rand();
+		$ok = $this->conn->Execute("EXPLAIN PLAN SET QUERYNO=$qno FOR $sql");
+		ob_start();
+		if (!$ok) echo "
    Have EXPLAIN tables been created?
    ";
+		else {
+			$rs = $this->conn->Execute("select * from explain_statement where queryno=$qno");
+			if ($rs) rs2html($rs);
+		}
+		$s = ob_get_contents();
+		ob_end_clean();
+		$this->conn->LogSQL($save);
+		
+		$s .= $this->Tracer($sql);
+		return $s;
+	}
+	
+	
+	function Tables()
+	{
+		$rs = $this->conn->Execute("select tabschema,tabname,card as rows,
+			npages pages_used,fpages pages_allocated, tbspace tablespace  
+			from syscat.tables where tabschema not in ('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
+		return rs2html($rs,false,false,false,false);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/perf/perf-informix.inc.php b/lib/adodb/perf/perf-informix.inc.php
index 2b2923b8687..b6ac4492835 100644
--- a/lib/adodb/perf/perf-informix.inc.php
+++ b/lib/adodb/perf/perf-informix.inc.php
@@ -1,67 +1,67 @@
- array('RATIOH',
-		"select round((1-(wt.value / (rd.value + wr.value)))*100,2)
-		from sysmaster:sysprofile wr, sysmaster:sysprofile rd, sysmaster:sysprofile wt
-		where rd.name = 'pagreads' and
-		wr.name = 'pagwrites' and
-		wt.name = 'buffwts'",
-		'=WarnCacheRatio'),
-	'IO',
-		'data reads' => array('IO',
-		"select value from sysmaster:sysprofile where name='pagreads'",
-		'Page reads'),
-		
-		'data writes' => array('IO',
-		"select value from sysmaster:sysprofile where name='pagwrites'",
-		'Page writes'),
-	
-	'Connections',
-		'current connections' => array('SESS',
-		'select count(*) from sysmaster:syssessions',
-		'Number of sessions'),
-	
-	false
-	
-	);
-	
-	function perf_informix(&$conn)
-	{
-		$this->conn =& $conn;
-	}
-
-}
-?>
+ array('RATIOH',
+		"select round((1-(wt.value / (rd.value + wr.value)))*100,2)
+		from sysmaster:sysprofile wr, sysmaster:sysprofile rd, sysmaster:sysprofile wt
+		where rd.name = 'pagreads' and
+		wr.name = 'pagwrites' and
+		wt.name = 'buffwts'",
+		'=WarnCacheRatio'),
+	'IO',
+		'data reads' => array('IO',
+		"select value from sysmaster:sysprofile where name='pagreads'",
+		'Page reads'),
+		
+		'data writes' => array('IO',
+		"select value from sysmaster:sysprofile where name='pagwrites'",
+		'Page writes'),
+	
+	'Connections',
+		'current connections' => array('SESS',
+		'select count(*) from sysmaster:syssessions',
+		'Number of sessions'),
+	
+	false
+	
+	);
+	
+	function perf_informix(&$conn)
+	{
+		$this->conn =& $conn;
+	}
+
+}
+?>
diff --git a/lib/adodb/perf/perf-mssql.inc.php b/lib/adodb/perf/perf-mssql.inc.php
index 1cf7d6906a9..9ea5c497ef6 100644
--- a/lib/adodb/perf/perf-mssql.inc.php
+++ b/lib/adodb/perf/perf-mssql.inc.php
@@ -1,161 +1,161 @@
- array('RATIO',
-			"select round((a.cntr_value*100.0)/b.cntr_value,2) from master.dbo.sysperfinfo a, master.dbo.sysperfinfo b where a.counter_name = 'Buffer cache hit ratio' and b.counter_name='Buffer cache hit ratio base'",
-			'=WarnCacheRatio'),
-		'prepared sql hit ratio' => array('RATIO',
-			array('dbcc cachestats','Prepared',1,100),
-			''),
-		'adhoc sql hit ratio' => array('RATIO',
-			array('dbcc cachestats','Adhoc',1,100),
-			''),
-	'IO',
-		'data reads' => array('IO',
-		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
-		'data writes' => array('IO',
-		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
-			
-	'Data Cache',
-		'data cache size' => array('DATAC',
-		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
-			'' ),
-		'data cache blocksize' => array('DATAC',
-			"select 8192",'page size'),
-	'Connections',
-		'current connections' => array('SESS',
-			'=sp_who',
-			''),
-		'max connections' => array('SESS',
-			"SELECT @@MAX_CONNECTIONS",
-			''),
-
-		false
-	);
-	
-	
-	function perf_mssql(&$conn)
-	{
-		if ($conn->dataProvider == 'odbc') {
-			$this->sql1 = 'sql1';
-			//$this->explain = false;
-		}
-		$this->conn =& $conn;
-	}
-	
-	function Explain($sql,$partial=false)
-	{
-		
-		$save = $this->conn->LogSQL(false);
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		
-		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
-		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
-		$sql = str_replace('?',"''",$sql);
-		global $ADODB_FETCH_MODE;
-		
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$rs =& $this->conn->Execute($sql);
-		//adodb_printr($rs);
-		$ADODB_FETCH_MODE = $save;
-		if ($rs) {
-			$rs->MoveNext();
-			$s .= '';
-			while (!$rs->EOF) {
-				$s .= '\n"; ## NOTE CORRUPT  tag is intentional!!!!
-				$rs->MoveNext();
-			}
-			$s .= '
     Rows IO CPU     Plan
    '.round($rs->fields[8],1).''.round($rs->fields[9],3).''.round($rs->fields[10],3).'
    '.htmlspecialchars($rs->fields[0])."
    ';
-			
-			$rs->NextRecordSet();
-		}
-		
-		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
-		$this->conn->LogSQL($save);
-		$s .= $this->Tracer($sql);
-		return $s;
-	}
-	
-	function Tables()
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		//$this->conn->debug=1;
-		$s = '';
-		$rs1 = $this->conn->Execute("select distinct name from sysobjects where xtype='U'");
-		if ($rs1) {
-			while (!$rs1->EOF) {
-				$tab = $rs1->fields[0];
-				$tabq = $this->conn->qstr($tab);
-				$rs2 = $this->conn->Execute("sp_spaceused $tabq");
-				if ($rs2) {
-					$s .= '';
-					$rs2->Close();
-				}
-				$rs1->MoveNext();
-			}
-			$rs1->Close();
-		}
-		$ADODB_FETCH_MODE = $save;
-		return $s.'
    tablenamesize_in_kindex sizereserved size
    '.$tab.''.$rs2->fields[3].''.$rs2->fields[4].''.$rs2->fields[2].'
    ';
-	}
-	
-	function sp_who()
-	{
-		$arr = $this->conn->GetArray('sp_who');
-		return sizeof($arr);
-	}
-	
-	function HealthCheck($cli=false)
-	{
-		
-		$this->conn->Execute('dbcc traceon(3604)');
-		$html =  adodb_perf::HealthCheck($cli);
-		$this->conn->Execute('dbcc traceoff(3604)');
-		return $html;
-	}
-	
-	
-}
-
+ array('RATIO',
+			"select round((a.cntr_value*100.0)/b.cntr_value,2) from master.dbo.sysperfinfo a, master.dbo.sysperfinfo b where a.counter_name = 'Buffer cache hit ratio' and b.counter_name='Buffer cache hit ratio base'",
+			'=WarnCacheRatio'),
+		'prepared sql hit ratio' => array('RATIO',
+			array('dbcc cachestats','Prepared',1,100),
+			''),
+		'adhoc sql hit ratio' => array('RATIO',
+			array('dbcc cachestats','Adhoc',1,100),
+			''),
+	'IO',
+		'data reads' => array('IO',
+		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
+		'data writes' => array('IO',
+		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
+			
+	'Data Cache',
+		'data cache size' => array('DATAC',
+		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
+			'' ),
+		'data cache blocksize' => array('DATAC',
+			"select 8192",'page size'),
+	'Connections',
+		'current connections' => array('SESS',
+			'=sp_who',
+			''),
+		'max connections' => array('SESS',
+			"SELECT @@MAX_CONNECTIONS",
+			''),
+
+		false
+	);
+	
+	
+	function perf_mssql(&$conn)
+	{
+		if ($conn->dataProvider == 'odbc') {
+			$this->sql1 = 'sql1';
+			//$this->explain = false;
+		}
+		$this->conn =& $conn;
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		
+		$save = $this->conn->LogSQL(false);
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		
+		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
+		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
+		$sql = str_replace('?',"''",$sql);
+		global $ADODB_FETCH_MODE;
+		
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$rs =& $this->conn->Execute($sql);
+		//adodb_printr($rs);
+		$ADODB_FETCH_MODE = $save;
+		if ($rs) {
+			$rs->MoveNext();
+			$s .= '';
+			while (!$rs->EOF) {
+				$s .= '\n"; ## NOTE CORRUPT  tag is intentional!!!!
+				$rs->MoveNext();
+			}
+			$s .= '
     Rows IO CPU     Plan
    '.round($rs->fields[8],1).''.round($rs->fields[9],3).''.round($rs->fields[10],3).'
    '.htmlspecialchars($rs->fields[0])."
    ';
+			
+			$rs->NextRecordSet();
+		}
+		
+		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
+		$this->conn->LogSQL($save);
+		$s .= $this->Tracer($sql);
+		return $s;
+	}
+	
+	function Tables()
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		//$this->conn->debug=1;
+		$s = '';
+		$rs1 = $this->conn->Execute("select distinct name from sysobjects where xtype='U'");
+		if ($rs1) {
+			while (!$rs1->EOF) {
+				$tab = $rs1->fields[0];
+				$tabq = $this->conn->qstr($tab);
+				$rs2 = $this->conn->Execute("sp_spaceused $tabq");
+				if ($rs2) {
+					$s .= '';
+					$rs2->Close();
+				}
+				$rs1->MoveNext();
+			}
+			$rs1->Close();
+		}
+		$ADODB_FETCH_MODE = $save;
+		return $s.'
    tablenamesize_in_kindex sizereserved size
    '.$tab.''.$rs2->fields[3].''.$rs2->fields[4].''.$rs2->fields[2].'
    ';
+	}
+	
+	function sp_who()
+	{
+		$arr = $this->conn->GetArray('sp_who');
+		return sizeof($arr);
+	}
+	
+	function HealthCheck($cli=false)
+	{
+		
+		$this->conn->Execute('dbcc traceon(3604)');
+		$html =  adodb_perf::HealthCheck($cli);
+		$this->conn->Execute('dbcc traceoff(3604)');
+		return $html;
+	}
+	
+	
+}
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/perf/perf-mysql.inc.php b/lib/adodb/perf/perf-mysql.inc.php
index bfa1883d4f1..274bca9b30c 100644
--- a/lib/adodb/perf/perf-mysql.inc.php
+++ b/lib/adodb/perf/perf-mysql.inc.php
@@ -1,255 +1,256 @@
- array('RATIO',
-			'=GetKeyHitRatio',
-			'=WarnCacheRatio'),
-		'InnoDB cache hit ratio' => array('RATIO',
-			'=GetInnoDBHitRatio',
-			'=WarnCacheRatio'),
-		'data cache hit ratio' => array('HIDE', # only if called
-			'=FindDBHitRatio',
-			'=WarnCacheRatio'),
-		'sql cache hit ratio' => array('RATIO',
-			'=GetQHitRatio',
-			''),
-	'IO',
-		'data reads' => array('IO',
-			'=GetReads',
-			'Number of selects (Key_reads is not accurate)'),
-		'data writes' => array('IO',
-			'=GetWrites',
-			'Number of inserts/updates/deletes * coef (Key_writes is not accurate)'),
-		
-	'Data Cache',
-		'MyISAM data cache size' => array('DATAC',
-			array("show variables", 'key_buffer_size'),
-			'' ),
-		'BDB data cache size' => array('DATAC',
-			array("show variables", 'bdb_cache_size'),
-			'' ),
-		'InnoDB data cache size' => array('DATAC',
-			array("show variables", 'innodb_buffer_pool_size'),
-			'' ),
-	'Memory Usage',
-		'read buffer size' => array('CACHE',
-			array("show variables", 'read_buffer_size'),
-			'(per session)'),
-		'sort buffer size' => array('CACHE',
-			array("show variables", 'sort_buffer_size'),
-			'Size of sort buffer (per session)' ),
-		'table cache' => array('CACHE',
-			array("show variables", 'table_cache'),
-			'Number of tables to keep open'),
-	'Connections',	
-		'current connections' => array('SESS',
-			array('show status','Threads_connected'),
-			''),
-		'max connections' => array( 'SESS',
-			array("show variables",'max_connections'),
-			''),
-	
-		false
-	);
-	
-	function perf_mysql(&$conn)
-	{
-		$this->conn =& $conn;
-	}
-	
-	function Explain($sql,$partial=false)
-	{
-		
-		if (strtoupper(substr(trim($sql),0,6)) !== 'SELECT') return '
    Unable to EXPLAIN non-select statement
    ';
-		$save = $this->conn->LogSQL(false);
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		$sql = str_replace('?',"''",$sql);
-		
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$sql = $this->conn->GetOne("select sql1 from adodb_logsql where sql1 like $sqlq");
-		}
-		
-		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
-		$rs = $this->conn->Execute('EXPLAIN '.$sql);
-		$s .= rs2html($rs,false,false,false,false);
-		$this->conn->LogSQL($save);
-		$s .= $this->Tracer($sql);
-		return $s;
-	}
-	
-	function Tables()
-	{
-		if (!$this->tablesSQL) return false;
-		
-		$rs = $this->conn->Execute($this->tablesSQL);
-		if (!$rs) return false;
-		
-		$html = rs2html($rs,false,false,false,false);
-		return $html;
-	}
-	
-	function GetReads()
-	{
-	global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$rs = $this->conn->Execute('show status');
-		$ADODB_FETCH_MODE = $save;
-		
-		if (!$rs) return 0;
-		$val = 0;
-		while (!$rs->EOF) {
-			switch($rs->fields[0]) {
-			case 'Com_select': 
-				$val = $rs->fields[1];
-				$rs->Close();
-				return $val;
-			}
-			$rs->MoveNext();
-		} 
-		
-		$rs->Close();
-		
-		return $val;
-	}
-	
-	function GetWrites()
-	{
-	global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$rs = $this->conn->Execute('show status');
-		$ADODB_FETCH_MODE = $save;
-		
-		if (!$rs) return 0;
-		$val = 0.0;
-		while (!$rs->EOF) {
-			switch($rs->fields[0]) {
-			case 'Com_insert': 
-				$val += $rs->fields[1]; break;
-			case 'Com_delete': 
-				$val += $rs->fields[1]; break;
-			case 'Com_update': 
-				$val += $rs->fields[1]/2;
-				$rs->Close();
-				return $val;
-			}
-			$rs->MoveNext();
-		} 
-		
-		$rs->Close();
-		
-		return $val;
-	}
-	
-	function FindDBHitRatio()
-	{
-		// first find out type of table
-		//$this->conn->debug=1;
-		$rs = $this->conn->Execute('show table status');
-		if (!$rs) return '';
-		$type = strtoupper($rs->fields[1]);
-		$rs->Close();
-		switch($type){
-		case 'MYISAM':
-		case 'ISAM':
-			return $this->DBParameter('MyISAM cache hit ratio').' (MyISAM)';
-		case 'INNODB':
-			return $this->DBParameter('InnoDB cache hit ratio').' (InnoDB)';
-		default:
-			return $type.' not supported';
-		}
-		
-	}
-	
-	function GetQHitRatio()
-	{
-		//Total number of queries = Qcache_inserts + Qcache_hits + Qcache_not_cached
-		$hits = $this->_DBParameter(array("show status","Qcache_hits"));
-		$total = $this->_DBParameter(array("show status","Qcache_inserts"));
-		$total += $this->_DBParameter(array("show status","Qcache_not_cached"));
-		
-		$total += $hits;
-		if ($total) return ($hits*100)/$total;
-		return 0;
-	}
-	
-	/*
-		Use session variable to store Hit percentage, because MySQL
-		does not remember last value of SHOW INNODB STATUS hit ratio
-		
-		# 1st query to SHOW INNODB STATUS
-		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
-		Buffer pool hit rate 1000 / 1000
-		
-		# 2nd query to SHOW INNODB STATUS
-		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
-		No buffer pool activity since the last printout
-	*/
-	function GetInnoDBHitRatio()
-	{
-	global $HTTP_SESSION_VARS;
-	
-		$rs = $this->conn->Execute('show innodb status');
-		if (!$rs || $rs->EOF) return 0;
-		$stat = $rs->fields[0];
-		$at = strpos($stat,'Buffer pool hit rate');
-		$stat = substr($stat,$at,200);
-		if (preg_match('!Buffer pool hit rate\s*([0-9]*) / ([0-9]*)!',$stat,$arr)) {
-			$val = 100*$arr[1]/$arr[2];
-			$HTTP_SESSION_VARS['INNODB_HIT_PCT'] = $val;
-			return $val;
-		} else {
-			if (isset($HTTP_SESSION_VARS['INNODB_HIT_PCT'])) return $HTTP_SESSION_VARS['INNODB_HIT_PCT'];
-			return 0;
-		}
-		return 0;
-	}
-	
-	function GetKeyHitRatio()
-	{
-		$hits = $this->_DBParameter(array("show status","Key_read_requests"));
-		$reqs = $this->_DBParameter(array("show status","Key_reads"));
-		if ($reqs == 0) return 0;
-		
-		return ($hits/($reqs+$hits))*100;
-	}
-	
-}
+ array('RATIO',
+			'=GetKeyHitRatio',
+			'=WarnCacheRatio'),
+		'InnoDB cache hit ratio' => array('RATIO',
+			'=GetInnoDBHitRatio',
+			'=WarnCacheRatio'),
+		'data cache hit ratio' => array('HIDE', # only if called
+			'=FindDBHitRatio',
+			'=WarnCacheRatio'),
+		'sql cache hit ratio' => array('RATIO',
+			'=GetQHitRatio',
+			''),
+	'IO',
+		'data reads' => array('IO',
+			'=GetReads',
+			'Number of selects (Key_reads is not accurate)'),
+		'data writes' => array('IO',
+			'=GetWrites',
+			'Number of inserts/updates/deletes * coef (Key_writes is not accurate)'),
+		
+	'Data Cache',
+		'MyISAM data cache size' => array('DATAC',
+			array("show variables", 'key_buffer_size'),
+			'' ),
+		'BDB data cache size' => array('DATAC',
+			array("show variables", 'bdb_cache_size'),
+			'' ),
+		'InnoDB data cache size' => array('DATAC',
+			array("show variables", 'innodb_buffer_pool_size'),
+			'' ),
+	'Memory Usage',
+		'read buffer size' => array('CACHE',
+			array("show variables", 'read_buffer_size'),
+			'(per session)'),
+		'sort buffer size' => array('CACHE',
+			array("show variables", 'sort_buffer_size'),
+			'Size of sort buffer (per session)' ),
+		'table cache' => array('CACHE',
+			array("show variables", 'table_cache'),
+			'Number of tables to keep open'),
+	'Connections',	
+		'current connections' => array('SESS',
+			array('show status','Threads_connected'),
+			''),
+		'max connections' => array( 'SESS',
+			array("show variables",'max_connections'),
+			''),
+	
+		false
+	);
+	
+	function perf_mysql(&$conn)
+	{
+		$this->conn =& $conn;
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		
+		if (strtoupper(substr(trim($sql),0,6)) !== 'SELECT') return '
    Unable to EXPLAIN non-select statement
    ';
+		$save = $this->conn->LogSQL(false);
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		$sql = str_replace('?',"''",$sql);
+		
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$sql = $this->conn->GetOne("select sql1 from adodb_logsql where sql1 like $sqlq");
+		}
+		
+		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
+		$rs = $this->conn->Execute('EXPLAIN '.$sql);
+		$s .= rs2html($rs,false,false,false,false);
+		$this->conn->LogSQL($save);
+		$s .= $this->Tracer($sql);
+		return $s;
+	}
+	
+	function Tables()
+	{
+		if (!$this->tablesSQL) return false;
+		
+		$rs = $this->conn->Execute($this->tablesSQL);
+		if (!$rs) return false;
+		
+		$html = rs2html($rs,false,false,false,false);
+		return $html;
+	}
+	
+	function GetReads()
+	{
+	global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$rs = $this->conn->Execute('show status');
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!$rs) return 0;
+		$val = 0;
+		while (!$rs->EOF) {
+			switch($rs->fields[0]) {
+			case 'Com_select': 
+				$val = $rs->fields[1];
+				$rs->Close();
+				return $val;
+			}
+			$rs->MoveNext();
+		} 
+		
+		$rs->Close();
+		
+		return $val;
+	}
+	
+	function GetWrites()
+	{
+	global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$rs = $this->conn->Execute('show status');
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!$rs) return 0;
+		$val = 0.0;
+		while (!$rs->EOF) {
+			switch($rs->fields[0]) {
+			case 'Com_insert': 
+				$val += $rs->fields[1]; break;
+			case 'Com_delete': 
+				$val += $rs->fields[1]; break;
+			case 'Com_update': 
+				$val += $rs->fields[1]/2;
+				$rs->Close();
+				return $val;
+			}
+			$rs->MoveNext();
+		} 
+		
+		$rs->Close();
+		
+		return $val;
+	}
+	
+	function FindDBHitRatio()
+	{
+		// first find out type of table
+		//$this->conn->debug=1;
+		$rs = $this->conn->Execute('show table status');
+		if (!$rs) return '';
+		$type = strtoupper($rs->fields[1]);
+		$rs->Close();
+		switch($type){
+		case 'MYISAM':
+		case 'ISAM':
+			return $this->DBParameter('MyISAM cache hit ratio').' (MyISAM)';
+		case 'INNODB':
+			return $this->DBParameter('InnoDB cache hit ratio').' (InnoDB)';
+		default:
+			return $type.' not supported';
+		}
+		
+	}
+	
+	function GetQHitRatio()
+	{
+		//Total number of queries = Qcache_inserts + Qcache_hits + Qcache_not_cached
+		$hits = $this->_DBParameter(array("show status","Qcache_hits"));
+		$total = $this->_DBParameter(array("show status","Qcache_inserts"));
+		$total += $this->_DBParameter(array("show status","Qcache_not_cached"));
+		
+		$total += $hits;
+		if ($total) return ($hits*100)/$total;
+		return 0;
+	}
+	
+	/*
+		Use session variable to store Hit percentage, because MySQL
+		does not remember last value of SHOW INNODB STATUS hit ratio
+		
+		# 1st query to SHOW INNODB STATUS
+		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
+		Buffer pool hit rate 1000 / 1000
+		
+		# 2nd query to SHOW INNODB STATUS
+		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
+		No buffer pool activity since the last printout
+	*/
+	function GetInnoDBHitRatio()
+	{
+	global $HTTP_SESSION_VARS;
+	
+		$rs = $this->conn->Execute('show innodb status');
+		if (!$rs || $rs->EOF) return 0;
+		$stat = $rs->fields[0];
+		$rs->Close();
+		$at = strpos($stat,'Buffer pool hit rate');
+		$stat = substr($stat,$at,200);
+		if (preg_match('!Buffer pool hit rate\s*([0-9]*) / ([0-9]*)!',$stat,$arr)) {
+			$val = 100*$arr[1]/$arr[2];
+			$HTTP_SESSION_VARS['INNODB_HIT_PCT'] = $val;
+			return $val;
+		} else {
+			if (isset($HTTP_SESSION_VARS['INNODB_HIT_PCT'])) return $HTTP_SESSION_VARS['INNODB_HIT_PCT'];
+			return 0;
+		}
+		return 0;
+	}
+	
+	function GetKeyHitRatio()
+	{
+		$hits = $this->_DBParameter(array("show status","Key_read_requests"));
+		$reqs = $this->_DBParameter(array("show status","Key_reads"));
+		if ($reqs == 0) return 0;
+		
+		return ($hits/($reqs+$hits))*100;
+	}
+	
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/perf/perf-oci8.inc.php b/lib/adodb/perf/perf-oci8.inc.php
index cc1151ea575..ba278e1182e 100644
--- a/lib/adodb/perf/perf-oci8.inc.php
+++ b/lib/adodb/perf/perf-oci8.inc.php
@@ -1,476 +1,476 @@
- array('RATIOH',
-			"select round((1-(phy.value / (cur.value + con.value)))*100,2) 
-			from v\$sysstat cur, v\$sysstat con, v\$sysstat phy
-			where cur.name = 'db block gets' and
-			      con.name = 'consistent gets' and
-			      phy.name = 'physical reads'",
-			'=WarnCacheRatio'),
-		
-		'sql cache hit ratio' => array( 'RATIOH',
-			'select round(100*(sum(pins)-sum(reloads))/sum(pins),2)  from v$librarycache',
-			'increase shared_pool_size if too ratio low'),
-			
-		'datadict cache hit ratio' => array('RATIOH',
-		"select      
-           round((1 - (sum(getmisses) / (sum(gets) +          
-   		 sum(getmisses))))*100,2)
-		from  v\$rowcache",
-		'increase shared_pool_size if too ratio low'),
-		
-		'memory sort ratio' => array('RATIOH',
-		"SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE), 
-       0,1,(a.VALUE + b.VALUE)),2)
-FROM   v\$sysstat a, 
-       v\$sysstat b
-WHERE  a.name = 'sorts (disk)'
-AND    b.name = 'sorts (memory)'",
-	"% of memory sorts compared to disk sorts - should be over 95%"),
-
-	'IO',
-		'data reads' => array('IO',
-		"select value from v\$sysstat where name='physical reads'"),
-	
-	'data writes' => array('IO',
-		"select value from v\$sysstat where name='physical writes'"),
-	
-	'Data Cache',
-		'data cache buffers' => array( 'DATAC',
-		"select a.value/b.value  from v\$parameter a, v\$parameter b 
-			where a.name = 'db_cache_size' and b.name= 'db_block_size'",
-			'Number of cache buffers. Tune db_cache_size if the data cache hit ratio is too low.'),
-		'data cache blocksize' => array('DATAC',
-			"select value from v\$parameter where name='db_block_size'",
-			'' ),			
-	'Memory Pools',
-		'data cache size' => array('DATAC',
-			"select value from v\$parameter where name = 'db_cache_size'",
-			'db_cache_size' ),
-		'shared pool size' => array('DATAC',
-			"select value from v\$parameter where name = 'shared_pool_size'",
-			'shared_pool_size, which holds shared cursors, stored procedures and similar shared structs' ),
-		'java pool size' => array('DATAJ',
-			"select value from v\$parameter where name = 'java_pool_size'",
-			'java_pool_size' ),
-		'large pool buffer size' => array('CACHE',
-			"select value from v\$parameter where name='large_pool_size'",
-			'this pool is for large mem allocations (not because it is larger than shared pool), for MTS sessions, parallel queries, io buffers (large_pool_size) ' ),
-
-		'pga buffer size' => array('CACHE',			
-			"select value from v\$parameter where name='pga_aggregate_target'",
-			'program global area is private memory for sorting, and hash and bitmap merges - since oracle 9i (pga_aggregate_target)' ),
-
-		
-		'Connections',
-		'current connections' => array('SESS',
-			'select count(*) from sys.v_$session where username is not null',
-			''),
-		'max connections' => array( 'SESS',
-			"select value from v\$parameter where name='sessions'",
-			''),
-
-	'Memory Utilization',		
-		'data cache utilization ratio' => array('RATIOU',
-			"select round((1-bytes/sgasize)*100, 2)
-			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
-			where name = 'free memory' and pool = 'shared pool'",
-		'Percentage of data cache actually in use - too low is bad, too high is worse'),
-		
-		'shared pool utilization ratio' => array('RATIOU',
-		'select round((sga.bytes/p.value)*100,2)
-		from v$sgastat sga, v$parameter p
-		where sga.name = \'free memory\' and sga.pool = \'shared pool\'
-		and p.name = \'shared_pool_size\'',
-		'Percentage of shared pool actually used - too low is bad, too high is worse'),
-		
-		'large pool utilization ratio' => array('RATIOU',
-			"select round((1-bytes/sgasize)*100, 2)
-			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
-			where name = 'free memory' and pool = 'large pool'",
-		'Percentage of large_pool actually in use - too low is bad, too high is worse'),
-		'sort buffer size' => array('CACHE',
-			"select value from v\$parameter where name='sort_area_size'",
-			'sort_area_size (per query), uses memory in pga' ),
-
-		'pga usage at peak' => array('RATIOU',
-		'=PGA','Mb utilization at peak transactions (requires Oracle 9i+)'),
-	'Transactions',
-		'rollback segments' => array('ROLLBACK',
-			"select count(*) from sys.v_\$rollstat",
-			''),
-	
-		'peak transactions' => array('ROLLBACK',
-			"select max_utilization  tx_hwm
-    		from sys.v_\$resource_limit
-    		where resource_name = 'transactions'",
-			'Taken from high-water-mark'),
-		'max transactions' => array('ROLLBACK',
-			"select value from v\$parameter where name = 'transactions'",
-			'max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)'),
-	'Parameters',	
-		'cursor sharing' => array('CURSOR',
-			"select value from v\$parameter where name = 'cursor_sharing'",
-			'Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See cursor_sharing.'),
-			
-		'index cache cost' => array('COST',
-			"select value from v\$parameter where name = 'optimizer_index_caching'",
-			'% of indexed data blocks expected in the cache.
-			Recommended is 20-80. Default is 0. See optimizer_index_caching.'),
-		
-		'random page cost' => array('COST',
-			"select value from v\$parameter where name = 'optimizer_index_cost_adj'",
-			'Recommended is 10-50 for TP, and 50 for data warehouses. Default is 100. See optimizer_index_cost_adj. '),		
-		
-		false
-		
-	);
-	
-	
-	function perf_oci8(&$conn)
-	{
-		$savelog = $conn->LogSQL(false);	
-		$this->version = $conn->ServerInfo();
-		$conn->LogSQL($savelog);	
-		$this->conn =& $conn;
-	}
-	
-	
-	function PGA()
-	{
-		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
-		
-		$rs = $this->conn->Execute("select a.mb,a.targ as pga_size_pct,a.pct from 
-	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
-	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
-	   	   from v\$pga_target_advice) a left join
-	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
-	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
-	   	   from v\$pga_target_advice) b on 
-	  a.r = b.r+1 where 
-  		b.pct < 100");
-		if (!$rs) return "Only in 9i or later";
-		$rs->Close();
-		if ($rs->EOF) return "PGA could be too big";
-		
-		return reset($rs->fields);
-	}
-	
-	function Explain($sql,$partial=false) 
-	{
-		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
-		if (!$rs) {
-			echo "
    Missing PLAN_TABLE
    
-
    -CREATE TABLE PLAN_TABLE (
-  STATEMENT_ID                    VARCHAR2(30),
-  TIMESTAMP                       DATE,
-  REMARKS                         VARCHAR2(80),
-  OPERATION                       VARCHAR2(30),
-  OPTIONS                         VARCHAR2(30),
-  OBJECT_NODE                     VARCHAR2(128),
-  OBJECT_OWNER                    VARCHAR2(30),
-  OBJECT_NAME                     VARCHAR2(30),
-  OBJECT_INSTANCE                 NUMBER(38),
-  OBJECT_TYPE                     VARCHAR2(30),
-  OPTIMIZER                       VARCHAR2(255),
-  SEARCH_COLUMNS                  NUMBER,
-  ID                              NUMBER(38),
-  PARENT_ID                       NUMBER(38),
-  POSITION                        NUMBER(38),
-  COST                            NUMBER(38),
-  CARDINALITY                     NUMBER(38),
-  BYTES                           NUMBER(38),
-  OTHER_TAG                       VARCHAR2(255),
-  PARTITION_START                 VARCHAR2(255),
-  PARTITION_STOP                  VARCHAR2(255),
-  PARTITION_ID                    NUMBER(38),
-  OTHER                           LONG,
-  DISTRIBUTION                    VARCHAR2(30)
-);
-
    ";
-			return false;
-		}
-		
-		$rs->Close();
-	//	$this->conn->debug=1;
-	
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		
-		$s = "
    Explain: ".htmlspecialchars($sql)."
    ";	
-		
-		$this->conn->BeginTrans();
-		$id = "ADODB ".microtime();
-		$rs =& $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
-		$m = $this->conn->ErrorMsg();
-		if ($m) {
-			$this->conn->RollbackTrans();
-			$this->conn->LogSQL($savelog);
-			$s .= "
    $m
    ";
-			return $s;
-		}
-		$rs = $this->conn->Execute("
-		select 
-  '
    '||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'
    '  as Operation, 
-  object_name,COST,CARDINALITY,bytes
-		FROM plan_table 
-START WITH id = 0  and STATEMENT_ID='$id'  
-CONNECT BY prior id=parent_id and statement_id='$id'");
-		
-		$s .= rs2html($rs,false,false,false,false);
-		$this->conn->RollbackTrans();
-		$this->conn->LogSQL($savelog);
-		$s .= $this->Tracer($sql,$partial);
-		return $s;
-	}
-	
-	
-	function CheckMemory()
-	{
-		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
-		
-		 $rs =& $this->conn->Execute("
-select  a.size_for_estimate as cache_mb_estimate,
-	case when a.size_factor=1 then 
-   		'<<= current'
-	 when a.estd_physical_read_factor-b.estd_physical_read_factor > 0 and a.estd_physical_read_factor<1 then
-		'- BETTER - '
-	else ' ' end as currsize, 
-   a.estd_physical_read_factor-b.estd_physical_read_factor as best_when_0
-   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r from v\$db_cache_advice) a , 
-   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r from v\$db_cache_advice) b where a.r = b.r-1");
-		if (!$rs) return false;
-		
-		/*
-		The v$db_cache_advice utility show the marginal changes in physical data block reads for different sizes of db_cache_size
-		*/
-		$s = "
    Data Cache Estimate
    ";
-		if ($rs->EOF) {
-			$s .= "
    Cache that is 50% of current size is still too big
    ";
-		} else {
-			$s .= "Ideal size of Data Cache is when \"best_when_0\" changes from a positive number and becomes zero.";
-			$s .= rs2html($rs,false,false,false,false);
-		}
-		return $s;
-	}
-	
-	/*
-		Generate html for suspicious/expensive sql
-	*/
-	function tohtml(&$rs,$type)
-	{
-		$o1 = $rs->FetchField(0);
-		$o2 = $rs->FetchField(1);
-		$o3 = $rs->FetchField(2);
-		if ($rs->EOF) return '
    None found
    ';
-		$check = '';
-		$sql = '';
-		$s = "\n\n';
-		while (!$rs->EOF) {
-			if ($check != $rs->fields[0].'::'.$rs->fields[1]) {
-				if ($check) {
-					$carr = explode('::',$check);
-					$prefix = "';
-					$suffix = '';
-					if (strlen($prefix)>2000) {
-						$prefix = '';
-						$suffix = '';
-					}
-					
-					$s .=  "\n';
-				}
-				$sql = $rs->fields[2];
-				$check = $rs->fields[0].'::'.$rs->fields[1];			
-			} else
-				$sql .= $rs->fields[2];
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		
-		$carr = explode('::',$check);
-		$prefix = "';
-		$suffix = '';
-		if (strlen($prefix)>2000) {
-			$prefix = '';
-			$suffix = '';
-		}
-		$s .=  "\n';
-					
-		return $s."
    ".$o1->name.''.$o2->name.''.$o3->name.'
    ".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'
    ".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'
    \n\n";
-	}
-	
-	// code thanks to Ixora. 
-	// http://www.ixora.com.au/scripts/query_opt.htm
-	// requires oracle 8.1.7 or later
-	function SuspiciousSQL($numsql=10)
-	{
-		$sql = "
-select
-  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
-  s.executions  executes,
-  p.sql_text
-from
-  ( 
-    select
-      address,
-      buffer_gets,
-      executions,
-      pct,
-      rank() over (order by buffer_gets desc)  ranking
-    from
-      ( 
-	select
-	  address,
-	  buffer_gets,
-	  executions,
-	  100 * ratio_to_report(buffer_gets) over ()  pct
-	from
-	  sys.v_\$sql
-	where
-	  command_type != 47 and module != 'T.O.A.D.'
-      )
-    where
-      buffer_gets > 50 * executions
-  )  s,
-  sys.v_\$sqltext  p
-where
-  s.ranking <= $numsql and
-  p.address = s.address
-order by
-  1 desc, s.address, p.piece";
-
-  		global $ADODB_CACHE_MODE,$HTTP_GET_VARS;
-  		if (isset($HTTP_GET_VARS['expsixora']) && isset($HTTP_GET_VARS['sql'])) {
-				$partial = empty($HTTP_GET_VARS['part']);
-				echo "".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
-		}
-
-		if (isset($HTTP_GET_VARS['sql'])) return $this->_SuspiciousSQL();
-		
-		$save = $ADODB_CACHE_MODE;
-		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
-		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->SelectLimit($sql);
-		$this->conn->LogSQL($savelog);
-		$ADODB_CACHE_MODE = $save;
-		if ($rs) {
-			$s = "\n
    Ixora Suspicious SQL
    ";
-			$s .= $this->tohtml($rs,'expsixora');
-		} else 
-			$s = '';
-		
-		if ($s) $s .= '
    ';
-		$s .= $this->_SuspiciousSQL();
-		return $s;
-	}
-	
-	// code thanks to Ixora. 
-	// http://www.ixora.com.au/scripts/query_opt.htm
-	// requires oracle 8.1.7 or later
-	function ExpensiveSQL($numsql = 10)
-	{
-		$sql = "
-select
-  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
-  s.executions  executes,
-  p.sql_text
-from
-  ( 
-    select
-      address,
-      disk_reads,
-      executions,
-      pct,
-      rank() over (order by disk_reads desc)  ranking
-    from
-      (
-	select
-	  address,
-	  disk_reads,
-	  executions,
-	  100 * ratio_to_report(disk_reads) over ()  pct
-	from
-	  sys.v_\$sql
-	where
-	  command_type != 47 and module != 'T.O.A.D.'
-      )
-    where
-      disk_reads > 50 * executions
-  )  s,
-  sys.v_\$sqltext  p
-where
-  s.ranking <= $numsql and
-  p.address = s.address
-order by
-  1 desc, s.address, p.piece
-";
-		global $ADODB_CACHE_MODE,$HTTP_GET_VARS;
-  		if (isset($HTTP_GET_VARS['expeixora']) && isset($HTTP_GET_VARS['sql'])) {
-			$partial = empty($HTTP_GET_VARS['part']);	
-			echo "".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
-		}
-		
-		if (isset($HTTP_GET_VARS['sql'])) {
-			 $var =& $this->_ExpensiveSQL();
-			 return $var;
-		}
-		$save = $ADODB_CACHE_MODE;
-		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
-		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->Execute($sql);
-		$this->conn->LogSQL($savelog);
-		$ADODB_CACHE_MODE = $save;
-		if ($rs) {
-			$s = "\n
    Ixora Expensive SQL
    ";
-			$s .= $this->tohtml($rs,'expeixora');
-		} else 
-			$s = '';
-		
-		
-		if ($s) $s .= '
    ';
-		$s .= $this->_ExpensiveSQL();
-		return $s;
-	}
-	
-}
+ array('RATIOH',
+			"select round((1-(phy.value / (cur.value + con.value)))*100,2) 
+			from v\$sysstat cur, v\$sysstat con, v\$sysstat phy
+			where cur.name = 'db block gets' and
+			      con.name = 'consistent gets' and
+			      phy.name = 'physical reads'",
+			'=WarnCacheRatio'),
+		
+		'sql cache hit ratio' => array( 'RATIOH',
+			'select round(100*(sum(pins)-sum(reloads))/sum(pins),2)  from v$librarycache',
+			'increase shared_pool_size if too ratio low'),
+			
+		'datadict cache hit ratio' => array('RATIOH',
+		"select      
+           round((1 - (sum(getmisses) / (sum(gets) +          
+   		 sum(getmisses))))*100,2)
+		from  v\$rowcache",
+		'increase shared_pool_size if too ratio low'),
+		
+		'memory sort ratio' => array('RATIOH',
+		"SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE), 
+       0,1,(a.VALUE + b.VALUE)),2)
+FROM   v\$sysstat a, 
+       v\$sysstat b
+WHERE  a.name = 'sorts (disk)'
+AND    b.name = 'sorts (memory)'",
+	"% of memory sorts compared to disk sorts - should be over 95%"),
+
+	'IO',
+		'data reads' => array('IO',
+		"select value from v\$sysstat where name='physical reads'"),
+	
+	'data writes' => array('IO',
+		"select value from v\$sysstat where name='physical writes'"),
+	
+	'Data Cache',
+		'data cache buffers' => array( 'DATAC',
+		"select a.value/b.value  from v\$parameter a, v\$parameter b 
+			where a.name = 'db_cache_size' and b.name= 'db_block_size'",
+			'Number of cache buffers. Tune db_cache_size if the data cache hit ratio is too low.'),
+		'data cache blocksize' => array('DATAC',
+			"select value from v\$parameter where name='db_block_size'",
+			'' ),			
+	'Memory Pools',
+		'data cache size' => array('DATAC',
+			"select value from v\$parameter where name = 'db_cache_size'",
+			'db_cache_size' ),
+		'shared pool size' => array('DATAC',
+			"select value from v\$parameter where name = 'shared_pool_size'",
+			'shared_pool_size, which holds shared cursors, stored procedures and similar shared structs' ),
+		'java pool size' => array('DATAJ',
+			"select value from v\$parameter where name = 'java_pool_size'",
+			'java_pool_size' ),
+		'large pool buffer size' => array('CACHE',
+			"select value from v\$parameter where name='large_pool_size'",
+			'this pool is for large mem allocations (not because it is larger than shared pool), for MTS sessions, parallel queries, io buffers (large_pool_size) ' ),
+
+		'pga buffer size' => array('CACHE',			
+			"select value from v\$parameter where name='pga_aggregate_target'",
+			'program global area is private memory for sorting, and hash and bitmap merges - since oracle 9i (pga_aggregate_target)' ),
+
+		
+		'Connections',
+		'current connections' => array('SESS',
+			'select count(*) from sys.v_$session where username is not null',
+			''),
+		'max connections' => array( 'SESS',
+			"select value from v\$parameter where name='sessions'",
+			''),
+
+	'Memory Utilization',		
+		'data cache utilization ratio' => array('RATIOU',
+			"select round((1-bytes/sgasize)*100, 2)
+			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
+			where name = 'free memory' and pool = 'shared pool'",
+		'Percentage of data cache actually in use - too low is bad, too high is worse'),
+		
+		'shared pool utilization ratio' => array('RATIOU',
+		'select round((sga.bytes/p.value)*100,2)
+		from v$sgastat sga, v$parameter p
+		where sga.name = \'free memory\' and sga.pool = \'shared pool\'
+		and p.name = \'shared_pool_size\'',
+		'Percentage of shared pool actually used - too low is bad, too high is worse'),
+		
+		'large pool utilization ratio' => array('RATIOU',
+			"select round((1-bytes/sgasize)*100, 2)
+			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
+			where name = 'free memory' and pool = 'large pool'",
+		'Percentage of large_pool actually in use - too low is bad, too high is worse'),
+		'sort buffer size' => array('CACHE',
+			"select value from v\$parameter where name='sort_area_size'",
+			'sort_area_size (per query), uses memory in pga' ),
+
+		'pga usage at peak' => array('RATIOU',
+		'=PGA','Mb utilization at peak transactions (requires Oracle 9i+)'),
+	'Transactions',
+		'rollback segments' => array('ROLLBACK',
+			"select count(*) from sys.v_\$rollstat",
+			''),
+	
+		'peak transactions' => array('ROLLBACK',
+			"select max_utilization  tx_hwm
+    		from sys.v_\$resource_limit
+    		where resource_name = 'transactions'",
+			'Taken from high-water-mark'),
+		'max transactions' => array('ROLLBACK',
+			"select value from v\$parameter where name = 'transactions'",
+			'max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)'),
+	'Parameters',	
+		'cursor sharing' => array('CURSOR',
+			"select value from v\$parameter where name = 'cursor_sharing'",
+			'Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See cursor_sharing.'),
+			
+		'index cache cost' => array('COST',
+			"select value from v\$parameter where name = 'optimizer_index_caching'",
+			'% of indexed data blocks expected in the cache.
+			Recommended is 20-80. Default is 0. See optimizer_index_caching.'),
+		
+		'random page cost' => array('COST',
+			"select value from v\$parameter where name = 'optimizer_index_cost_adj'",
+			'Recommended is 10-50 for TP, and 50 for data warehouses. Default is 100. See optimizer_index_cost_adj. '),		
+		
+		false
+		
+	);
+	
+	
+	function perf_oci8(&$conn)
+	{
+		$savelog = $conn->LogSQL(false);	
+		$this->version = $conn->ServerInfo();
+		$conn->LogSQL($savelog);	
+		$this->conn =& $conn;
+	}
+	
+	
+	function PGA()
+	{
+		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
+		
+		$rs = $this->conn->Execute("select a.mb,a.targ as pga_size_pct,a.pct from 
+	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
+	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
+	   	   from v\$pga_target_advice) a left join
+	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
+	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
+	   	   from v\$pga_target_advice) b on 
+	  a.r = b.r+1 where 
+  		b.pct < 100");
+		if (!$rs) return "Only in 9i or later";
+		$rs->Close();
+		if ($rs->EOF) return "PGA could be too big";
+		
+		return reset($rs->fields);
+	}
+	
+	function Explain($sql,$partial=false) 
+	{
+		$savelog = $this->conn->LogSQL(false);
+		$rs =& $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
+		if (!$rs) {
+			echo "
    Missing PLAN_TABLE
    
+
    +CREATE TABLE PLAN_TABLE (
+  STATEMENT_ID                    VARCHAR2(30),
+  TIMESTAMP                       DATE,
+  REMARKS                         VARCHAR2(80),
+  OPERATION                       VARCHAR2(30),
+  OPTIONS                         VARCHAR2(30),
+  OBJECT_NODE                     VARCHAR2(128),
+  OBJECT_OWNER                    VARCHAR2(30),
+  OBJECT_NAME                     VARCHAR2(30),
+  OBJECT_INSTANCE                 NUMBER(38),
+  OBJECT_TYPE                     VARCHAR2(30),
+  OPTIMIZER                       VARCHAR2(255),
+  SEARCH_COLUMNS                  NUMBER,
+  ID                              NUMBER(38),
+  PARENT_ID                       NUMBER(38),
+  POSITION                        NUMBER(38),
+  COST                            NUMBER(38),
+  CARDINALITY                     NUMBER(38),
+  BYTES                           NUMBER(38),
+  OTHER_TAG                       VARCHAR2(255),
+  PARTITION_START                 VARCHAR2(255),
+  PARTITION_STOP                  VARCHAR2(255),
+  PARTITION_ID                    NUMBER(38),
+  OTHER                           LONG,
+  DISTRIBUTION                    VARCHAR2(30)
+);
+
    ";
+			return false;
+		}
+		
+		$rs->Close();
+	//	$this->conn->debug=1;
+	
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		
+		$s = "
    Explain: ".htmlspecialchars($sql)."
    ";	
+		
+		$this->conn->BeginTrans();
+		$id = "ADODB ".microtime();
+		$rs =& $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
+		$m = $this->conn->ErrorMsg();
+		if ($m) {
+			$this->conn->RollbackTrans();
+			$this->conn->LogSQL($savelog);
+			$s .= "
    $m
    ";
+			return $s;
+		}
+		$rs = $this->conn->Execute("
+		select 
+  '
    '||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'
    '  as Operation, 
+  object_name,COST,CARDINALITY,bytes
+		FROM plan_table 
+START WITH id = 0  and STATEMENT_ID='$id'  
+CONNECT BY prior id=parent_id and statement_id='$id'");
+		
+		$s .= rs2html($rs,false,false,false,false);
+		$this->conn->RollbackTrans();
+		$this->conn->LogSQL($savelog);
+		$s .= $this->Tracer($sql,$partial);
+		return $s;
+	}
+	
+	
+	function CheckMemory()
+	{
+		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
+		
+		 $rs =& $this->conn->Execute("
+select  a.size_for_estimate as cache_mb_estimate,
+	case when a.size_factor=1 then 
+   		'<<= current'
+	 when a.estd_physical_read_factor-b.estd_physical_read_factor > 0 and a.estd_physical_read_factor<1 then
+		'- BETTER - '
+	else ' ' end as currsize, 
+   a.estd_physical_read_factor-b.estd_physical_read_factor as best_when_0
+   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r from v\$db_cache_advice) a , 
+   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r from v\$db_cache_advice) b where a.r = b.r-1");
+		if (!$rs) return false;
+		
+		/*
+		The v$db_cache_advice utility show the marginal changes in physical data block reads for different sizes of db_cache_size
+		*/
+		$s = "
    Data Cache Estimate
    ";
+		if ($rs->EOF) {
+			$s .= "
    Cache that is 50% of current size is still too big
    ";
+		} else {
+			$s .= "Ideal size of Data Cache is when \"best_when_0\" changes from a positive number and becomes zero.";
+			$s .= rs2html($rs,false,false,false,false);
+		}
+		return $s;
+	}
+	
+	/*
+		Generate html for suspicious/expensive sql
+	*/
+	function tohtml(&$rs,$type)
+	{
+		$o1 = $rs->FetchField(0);
+		$o2 = $rs->FetchField(1);
+		$o3 = $rs->FetchField(2);
+		if ($rs->EOF) return '
    None found
    ';
+		$check = '';
+		$sql = '';
+		$s = "\n\n';
+		while (!$rs->EOF) {
+			if ($check != $rs->fields[0].'::'.$rs->fields[1]) {
+				if ($check) {
+					$carr = explode('::',$check);
+					$prefix = "';
+					$suffix = '';
+					if (strlen($prefix)>2000) {
+						$prefix = '';
+						$suffix = '';
+					}
+					
+					$s .=  "\n';
+				}
+				$sql = $rs->fields[2];
+				$check = $rs->fields[0].'::'.$rs->fields[1];			
+			} else
+				$sql .= $rs->fields[2];
+			
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		
+		$carr = explode('::',$check);
+		$prefix = "';
+		$suffix = '';
+		if (strlen($prefix)>2000) {
+			$prefix = '';
+			$suffix = '';
+		}
+		$s .=  "\n';
+					
+		return $s."
    ".$o1->name.''.$o2->name.''.$o3->name.'
    ".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'
    ".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'
    \n\n";
+	}
+	
+	// code thanks to Ixora. 
+	// http://www.ixora.com.au/scripts/query_opt.htm
+	// requires oracle 8.1.7 or later
+	function SuspiciousSQL($numsql=10)
+	{
+		$sql = "
+select
+  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
+  s.executions  executes,
+  p.sql_text
+from
+  ( 
+    select
+      address,
+      buffer_gets,
+      executions,
+      pct,
+      rank() over (order by buffer_gets desc)  ranking
+    from
+      ( 
+	select
+	  address,
+	  buffer_gets,
+	  executions,
+	  100 * ratio_to_report(buffer_gets) over ()  pct
+	from
+	  sys.v_\$sql
+	where
+	  command_type != 47 and module != 'T.O.A.D.'
+      )
+    where
+      buffer_gets > 50 * executions
+  )  s,
+  sys.v_\$sqltext  p
+where
+  s.ranking <= $numsql and
+  p.address = s.address
+order by
+  1 desc, s.address, p.piece";
+
+  		global $ADODB_CACHE_MODE,$HTTP_GET_VARS;
+  		if (isset($HTTP_GET_VARS['expsixora']) && isset($HTTP_GET_VARS['sql'])) {
+				$partial = empty($HTTP_GET_VARS['part']);
+				echo "".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
+		}
+
+		if (isset($HTTP_GET_VARS['sql'])) return $this->_SuspiciousSQL();
+		
+		$save = $ADODB_CACHE_MODE;
+		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
+		$savelog = $this->conn->LogSQL(false);
+		$rs =& $this->conn->SelectLimit($sql);
+		$this->conn->LogSQL($savelog);
+		$ADODB_CACHE_MODE = $save;
+		if ($rs) {
+			$s = "\n
    Ixora Suspicious SQL
    ";
+			$s .= $this->tohtml($rs,'expsixora');
+		} else 
+			$s = '';
+		
+		if ($s) $s .= '
    ';
+		$s .= $this->_SuspiciousSQL();
+		return $s;
+	}
+	
+	// code thanks to Ixora. 
+	// http://www.ixora.com.au/scripts/query_opt.htm
+	// requires oracle 8.1.7 or later
+	function ExpensiveSQL($numsql = 10)
+	{
+		$sql = "
+select
+  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
+  s.executions  executes,
+  p.sql_text
+from
+  ( 
+    select
+      address,
+      disk_reads,
+      executions,
+      pct,
+      rank() over (order by disk_reads desc)  ranking
+    from
+      (
+	select
+	  address,
+	  disk_reads,
+	  executions,
+	  100 * ratio_to_report(disk_reads) over ()  pct
+	from
+	  sys.v_\$sql
+	where
+	  command_type != 47 and module != 'T.O.A.D.'
+      )
+    where
+      disk_reads > 50 * executions
+  )  s,
+  sys.v_\$sqltext  p
+where
+  s.ranking <= $numsql and
+  p.address = s.address
+order by
+  1 desc, s.address, p.piece
+";
+		global $ADODB_CACHE_MODE,$HTTP_GET_VARS;
+  		if (isset($HTTP_GET_VARS['expeixora']) && isset($HTTP_GET_VARS['sql'])) {
+			$partial = empty($HTTP_GET_VARS['part']);	
+			echo "".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
+		}
+		
+		if (isset($HTTP_GET_VARS['sql'])) {
+			 $var =& $this->_ExpensiveSQL();
+			 return $var;
+		}
+		$save = $ADODB_CACHE_MODE;
+		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
+		$savelog = $this->conn->LogSQL(false);
+		$rs =& $this->conn->Execute($sql);
+		$this->conn->LogSQL($savelog);
+		$ADODB_CACHE_MODE = $save;
+		if ($rs) {
+			$s = "\n
    Ixora Expensive SQL
    ";
+			$s .= $this->tohtml($rs,'expeixora');
+		} else 
+			$s = '';
+		
+		
+		if ($s) $s .= '
    ';
+		$s .= $this->_ExpensiveSQL();
+		return $s;
+	}
+	
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/perf/perf-postgres.inc.php b/lib/adodb/perf/perf-postgres.inc.php
index 5ae20e4d2a7..2d5912ce5a1 100644
--- a/lib/adodb/perf/perf-postgres.inc.php
+++ b/lib/adodb/perf/perf-postgres.inc.php
@@ -1,120 +1,120 @@
- array('RATIO',
-			"select case when count(*)=3 then 'TRUE' else 'FALSE' end from pg_settings where (name='stats_block_level' or name='stats_row_level' or name='stats_start_collector') and setting='on' ",
-			'Value must be TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level and stats_block_level must be set to true in postgresql.conf)'),
-		'data cache hit ratio' => array('RATIO',
-			"select case when blks_hit=0 then 0 else (1-blks_read::float/blks_hit)*100 end from pg_stat_database where datname='\$DATABASE'",
-			'=WarnCacheRatio'),
-	'IO',
-		'data reads' => array('IO',
-		'select sum(heap_blks_read+toast_blks_read) from pg_statio_user_tables',
-		),
-		'data writes' => array('IO',
-		'select sum(n_tup_ins/4.0+n_tup_upd/8.0+n_tup_del/4.0)/16 from pg_stat_user_tables',
-		'Count of inserts/updates/deletes * coef'),
-
-	'Data Cache',
-		'data cache buffers' => array('DATAC',
-			"select setting from pg_settings where name='shared_buffers'",
-			'Number of cache buffers. Tuning'),
-		'cache blocksize' => array('DATAC',
-			'select 8192',
-			'(estimate)' ),
-		'data cache size' => array( 'DATAC',
-		"select setting::integer*8192 from pg_settings where name='shared_buffers'",
-			'' ),
-		'operating system cache size' => array( 'DATA',
-		"select setting::integer*8192 from pg_settings where name='effective_cache_size'",
-			'(effective cache size)' ),
-	'Memory Usage',
-		'sort buffer size' => array('CACHE',
-			"select setting::integer*1024 from pg_settings where name='sort_mem'",
-			'Size of sort buffer (per query)' ),
-	'Connections',
-		'current connections' => array('SESS',
-			'select count(*) from pg_stat_activity',
-			''),
-		'max connections' => array('SESS',
-			"select setting from pg_settings where name='max_connections'",
-			''),
-	'Parameters',
-		'rollback buffers' => array('COST',
-			"select setting from pg_settings where name='wal_buffers'",
-			'WAL buffers'),
-		'random page cost' => array('COST',
-			"select setting from pg_settings where name='random_page_cost'",
-			'Cost of doing a seek (default=4). See random_page_cost'),
-		false
-	);
-	
-	function perf_postgres(&$conn)
-	{
-		$this->conn =& $conn;
-	}
-	
-	function Explain($sql,$partial=false)
-	{
-		$save = $this->conn->LogSQL(false);
-		
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		$sql = str_replace('?',"''",$sql);
-		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
-		$rs = $this->conn->Execute('EXPLAIN '.$sql);
-		$this->conn->LogSQL($save);
-		$s .= '
    ';
-		if ($rs)
-			while (!$rs->EOF) {
-				$s .= reset($rs->fields)."\n";
-				$rs->MoveNext();
-			}
-		$s .= '
    ';
-		$s .= $this->Tracer($sql,$partial);
-		return $s;
-	}
-}
+ array('RATIO',
+			"select case when count(*)=3 then 'TRUE' else 'FALSE' end from pg_settings where (name='stats_block_level' or name='stats_row_level' or name='stats_start_collector') and setting='on' ",
+			'Value must be TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level and stats_block_level must be set to true in postgresql.conf)'),
+		'data cache hit ratio' => array('RATIO',
+			"select case when blks_hit=0 then 0 else (1-blks_read::float/blks_hit)*100 end from pg_stat_database where datname='\$DATABASE'",
+			'=WarnCacheRatio'),
+	'IO',
+		'data reads' => array('IO',
+		'select sum(heap_blks_read+toast_blks_read) from pg_statio_user_tables',
+		),
+		'data writes' => array('IO',
+		'select sum(n_tup_ins/4.0+n_tup_upd/8.0+n_tup_del/4.0)/16 from pg_stat_user_tables',
+		'Count of inserts/updates/deletes * coef'),
+
+	'Data Cache',
+		'data cache buffers' => array('DATAC',
+			"select setting from pg_settings where name='shared_buffers'",
+			'Number of cache buffers. Tuning'),
+		'cache blocksize' => array('DATAC',
+			'select 8192',
+			'(estimate)' ),
+		'data cache size' => array( 'DATAC',
+		"select setting::integer*8192 from pg_settings where name='shared_buffers'",
+			'' ),
+		'operating system cache size' => array( 'DATA',
+		"select setting::integer*8192 from pg_settings where name='effective_cache_size'",
+			'(effective cache size)' ),
+	'Memory Usage',
+		'sort buffer size' => array('CACHE',
+			"select setting::integer*1024 from pg_settings where name='sort_mem'",
+			'Size of sort buffer (per query)' ),
+	'Connections',
+		'current connections' => array('SESS',
+			'select count(*) from pg_stat_activity',
+			''),
+		'max connections' => array('SESS',
+			"select setting from pg_settings where name='max_connections'",
+			''),
+	'Parameters',
+		'rollback buffers' => array('COST',
+			"select setting from pg_settings where name='wal_buffers'",
+			'WAL buffers'),
+		'random page cost' => array('COST',
+			"select setting from pg_settings where name='random_page_cost'",
+			'Cost of doing a seek (default=4). See random_page_cost'),
+		false
+	);
+	
+	function perf_postgres(&$conn)
+	{
+		$this->conn =& $conn;
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		$save = $this->conn->LogSQL(false);
+		
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		$sql = str_replace('?',"''",$sql);
+		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
+		$rs = $this->conn->Execute('EXPLAIN '.$sql);
+		$this->conn->LogSQL($save);
+		$s .= '
    ';
+		if ($rs)
+			while (!$rs->EOF) {
+				$s .= reset($rs->fields)."\n";
+				$rs->MoveNext();
+			}
+		$s .= '
    ';
+		$s .= $this->Tracer($sql,$partial);
+		return $s;
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/pivottable.inc.php b/lib/adodb/pivottable.inc.php
index f9c547f11b7..8d0f7a7b040 100644
--- a/lib/adodb/pivottable.inc.php
+++ b/lib/adodb/pivottable.inc.php
@@ -1,164 +1,164 @@
-GetCol("select distinct $colfield from $tables $where order by 1");
-	if (!$aggfield) $hidecnt = false;
-	
-	$sel = "$rowfields, ";
-	if (is_array($colfield)) {
-		foreach ($colfield as $k => $v) {
-			if (!$hidecnt) $sel .= "\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
-			if ($aggfield)
-				$sel .= "\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
-		} 
-	} else {
-		foreach ($colarr as $v) {
-			if (!is_numeric($v)) $vq = $db->qstr($v);
-			else $vq = $v;
-			if (strlen($v) == 0	) $v = 'null';
-			if (!$hidecnt) $sel .= "\n\t$aggfn(CASE WHEN $colfield=$vq THEN 1 ELSE 0 END) AS \"$v\", ";
-			if ($aggfield) {
-				if ($hidecnt) $label = $v;
-				else $label = "{$v}_$aggfield";
-				$sel .= "\n\t$aggfn(CASE WHEN $colfield=$vq THEN $aggfield ELSE 0 END) AS \"$label\", ";
-			}
-		}
-	}
-	if ($aggfield && $aggfield != '1'){
-		$agg = "$aggfn($aggfield)";
-		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";		
-	}
-	
-	if ($showcount)
-		$sel .= "\n\tSUM(1) as Total";
-	else
-		$sel = substr($sel,0,strlen($sel)-2);
-	
-	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
-	return $sql;
- }
-
-/* EXAMPLES USING MS NORTHWIND DATABASE */
-if (0) {
-
-# example1
-#
-# Query the main "product" table
-# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the Categories
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
-
- $sql = PivotTableSQL(
- 	$gDB,  											# adodb connection
- 	'products p ,categories c ,suppliers s',  		# tables
-	'CompanyName,QuantityPerUnit',					# row fields
-	'CategoryName',									# column fields 
-	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
-);
- print "
    $sql";
- $rs = $gDB->Execute($sql);
- rs2html($rs);
- 
-/*
-Generated SQL:
-
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
-	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
-	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
-	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products", 
-	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
-	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
-	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
-GROUP BY CompanyName,QuantityPerUnit
-*/
-//=====================================================================
-
-# example2
-#
-# Query the main "product" table
-# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the UnitsInStock for different ranges
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
- $sql = PivotTableSQL(
- 	$gDB,										# adodb connection
- 	'products p ,categories c ,suppliers s',	# tables
-	'CompanyName,QuantityPerUnit',				# row fields
-												# column ranges
-array(										
-' 0 ' => 'UnitsInStock <= 0',
-"1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
-"6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
-"11 to 15"  => '10 < UnitsInStock and UnitsInStock <= 15',
-"16+" =>'15 < UnitsInStock'
-),
-	' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
-	'UnitsInStock', 							# sum this field
-	'Sum'										# sum label prefix
-);
- print "
    $sql";
- $rs = $gDB->Execute($sql);
- rs2html($rs);
- /*
- Generated SQL:
- 
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ", 
-	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5", 
-	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10", 
-	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
-	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 16+",
-	SUM(UnitsInStock) AS "Sum UnitsInStock", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
-GROUP BY CompanyName,QuantityPerUnit
- */
-}
+GetCol("select distinct $colfield from $tables $where order by 1");
+	if (!$aggfield) $hidecnt = false;
+	
+	$sel = "$rowfields, ";
+	if (is_array($colfield)) {
+		foreach ($colfield as $k => $v) {
+			if (!$hidecnt) $sel .= "\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
+			if ($aggfield)
+				$sel .= "\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
+		} 
+	} else {
+		foreach ($colarr as $v) {
+			if (!is_numeric($v)) $vq = $db->qstr($v);
+			else $vq = $v;
+			if (strlen($v) == 0	) $v = 'null';
+			if (!$hidecnt) $sel .= "\n\t$aggfn(CASE WHEN $colfield=$vq THEN 1 ELSE 0 END) AS \"$v\", ";
+			if ($aggfield) {
+				if ($hidecnt) $label = $v;
+				else $label = "{$v}_$aggfield";
+				$sel .= "\n\t$aggfn(CASE WHEN $colfield=$vq THEN $aggfield ELSE 0 END) AS \"$label\", ";
+			}
+		}
+	}
+	if ($aggfield && $aggfield != '1'){
+		$agg = "$aggfn($aggfield)";
+		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";		
+	}
+	
+	if ($showcount)
+		$sel .= "\n\tSUM(1) as Total";
+	else
+		$sel = substr($sel,0,strlen($sel)-2);
+	
+	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
+	return $sql;
+ }
+
+/* EXAMPLES USING MS NORTHWIND DATABASE */
+if (0) {
+
+# example1
+#
+# Query the main "product" table
+# Set the rows to CompanyName and QuantityPerUnit
+# and the columns to the Categories
+# and define the joins to link to lookup tables 
+# "categories" and "suppliers"
+#
+
+ $sql = PivotTableSQL(
+ 	$gDB,  											# adodb connection
+ 	'products p ,categories c ,suppliers s',  		# tables
+	'CompanyName,QuantityPerUnit',					# row fields
+	'CategoryName',									# column fields 
+	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
+);
+ print "
    $sql";
+ $rs = $gDB->Execute($sql);
+ rs2html($rs);
+ 
+/*
+Generated SQL:
+
+SELECT CompanyName,QuantityPerUnit, 
+	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
+	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
+	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
+	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products", 
+	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
+	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
+	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
+	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
+	SUM(1) as Total 
+FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
+GROUP BY CompanyName,QuantityPerUnit
+*/
+//=====================================================================
+
+# example2
+#
+# Query the main "product" table
+# Set the rows to CompanyName and QuantityPerUnit
+# and the columns to the UnitsInStock for different ranges
+# and define the joins to link to lookup tables 
+# "categories" and "suppliers"
+#
+ $sql = PivotTableSQL(
+ 	$gDB,										# adodb connection
+ 	'products p ,categories c ,suppliers s',	# tables
+	'CompanyName,QuantityPerUnit',				# row fields
+												# column ranges
+array(										
+' 0 ' => 'UnitsInStock <= 0',
+"1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
+"6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
+"11 to 15"  => '10 < UnitsInStock and UnitsInStock <= 15',
+"16+" =>'15 < UnitsInStock'
+),
+	' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
+	'UnitsInStock', 							# sum this field
+	'Sum'										# sum label prefix
+);
+ print "
    $sql";
+ $rs = $gDB->Execute($sql);
+ rs2html($rs);
+ /*
+ Generated SQL:
+ 
+SELECT CompanyName,QuantityPerUnit, 
+	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ", 
+	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5", 
+	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10", 
+	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
+	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 16+",
+	SUM(UnitsInStock) AS "Sum UnitsInStock", 
+	SUM(1) as Total 
+FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
+GROUP BY CompanyName,QuantityPerUnit
+ */
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/rsfilter.inc.php b/lib/adodb/rsfilter.inc.php
index 25ff1c71fa0..8f377cf1c90 100644
--- a/lib/adodb/rsfilter.inc.php
+++ b/lib/adodb/rsfilter.inc.php
@@ -1,54 +1,54 @@
- $v) {
-			$arr[$k] = ucwords($v);
-		}
-	}
-	$rs = RSFilter($rs,'do_ucwords');
- */
-function &RSFilter($rs,$fn)
-{
-	if ($rs->databaseType != 'array') {
-		if (!$rs->connection) return false;
-		
-		$rs = &$rs->connection->_rs2rs($rs);
-	}
-	$rows = $rs->RecordCount();
-	for ($i=0; $i < $rows; $i++) {
-		$fn($rs->_array[$i],$rs);
-	}
-	if (!$rs->EOF) {
-		$rs->_currentRow = 0;
-		$rs->fields = $rs->_array[0];
-	}
-	
-	return $rs;
-}
+ $v) {
+			$arr[$k] = ucwords($v);
+		}
+	}
+	$rs = RSFilter($rs,'do_ucwords');
+ */
+function &RSFilter($rs,$fn)
+{
+	if ($rs->databaseType != 'array') {
+		if (!$rs->connection) return false;
+		
+		$rs = &$rs->connection->_rs2rs($rs);
+	}
+	$rows = $rs->RecordCount();
+	for ($i=0; $i < $rows; $i++) {
+		$fn($rs->_array[$i],$rs);
+	}
+	if (!$rs->EOF) {
+		$rs->_currentRow = 0;
+		$rs->fields = $rs->_array[0];
+	}
+	
+	return $rs;
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/server.php b/lib/adodb/server.php
index dc5c4ff89c8..57ee71cbf19 100644
--- a/lib/adodb/server.php
+++ b/lib/adodb/server.php
@@ -1,98 +1,98 @@
-Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($HTTP_GET_VARS['sql']);
-
-if (isset($HTTP_GET_VARS['fetch']))
-	$ADODB_FETCH_MODE = $HTTP_GET_VARS['fetch'];
-	
-if (isset($HTTP_GET_VARS['nrows'])) {
-	$nrows = $HTTP_GET_VARS['nrows'];
-	$offset = isset($HTTP_GET_VARS['offset']) ? $HTTP_GET_VARS['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else 
-	$rs = $conn->Execute($sql);
-if ($rs){ 
-	//$rs->timeToLive = 1;
-	echo _rs2serialize($rs,$conn,$sql);
-	$rs->Close();
-} else
-	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
-
+Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
+$sql = undomq($HTTP_GET_VARS['sql']);
+
+if (isset($HTTP_GET_VARS['fetch']))
+	$ADODB_FETCH_MODE = $HTTP_GET_VARS['fetch'];
+	
+if (isset($HTTP_GET_VARS['nrows'])) {
+	$nrows = $HTTP_GET_VARS['nrows'];
+	$offset = isset($HTTP_GET_VARS['offset']) ? $HTTP_GET_VARS['offset'] : -1;
+	$rs = $conn->SelectLimit($sql,$nrows,$offset);
+} else 
+	$rs = $conn->Execute($sql);
+if ($rs){ 
+	//$rs->timeToLive = 1;
+	echo _rs2serialize($rs,$conn,$sql);
+	$rs->Close();
+} else
+	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/benchmark.php b/lib/adodb/tests/benchmark.php
index 484b9cc78b9..53636cbf45d 100644
--- a/lib/adodb/tests/benchmark.php
+++ b/lib/adodb/tests/benchmark.php
@@ -1,84 +1,84 @@
-
-
-
-
-	ADODB Benchmarks
- 
-
-
-ADODB Version: $ADODB_version Host: $db->host   Database: $db->database";
-	
-	// perform query once to cache results so we are only testing throughput 
-	$rs = $db->Execute($sql);
-	if (!$rs){
-		print "Error in recordset
    ";
-		return;
-	}	
-	$arr = $rs->GetArray();
-	//$db->debug = true;
-	global $ADODB_COUNTRECS;
-	$ADODB_COUNTRECS = false;
-	$start = microtime();
-	for ($i=0; $i < $max; $i++) {
-		$rs =& $db->Execute($sql);	
-		$arr =& $rs->GetArray();
-	   //		 print $arr[0][1];
-	}
-	$end =  microtime();
-	$start = explode(' ',$start);
-	$end = explode(' ',$end);
-	
-	//print_r($start);
-	//print_r($end);
-	
-	  //  print_r($arr);
-	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
-	printf ("
    seconds = %8.2f for %d iterations each with %d records
    ",$total,$max, sizeof($arr));
-	flush();
-
-
-		//$db->Close();
-}
-include("testdatabases.inc.php");
-
-?>
-
-
-
-
+
+
+
+
+	ADODB Benchmarks
+ 
+
+
+ADODB Version: $ADODB_version Host: $db->host   Database: $db->database";
+	
+	// perform query once to cache results so we are only testing throughput 
+	$rs = $db->Execute($sql);
+	if (!$rs){
+		print "Error in recordset
    ";
+		return;
+	}	
+	$arr = $rs->GetArray();
+	//$db->debug = true;
+	global $ADODB_COUNTRECS;
+	$ADODB_COUNTRECS = false;
+	$start = microtime();
+	for ($i=0; $i < $max; $i++) {
+		$rs =& $db->Execute($sql);	
+		$arr =& $rs->GetArray();
+	   //		 print $arr[0][1];
+	}
+	$end =  microtime();
+	$start = explode(' ',$start);
+	$end = explode(' ',$end);
+	
+	//print_r($start);
+	//print_r($end);
+	
+	  //  print_r($arr);
+	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
+	printf ("
    seconds = %8.2f for %d iterations each with %d records
    ",$total,$max, sizeof($arr));
+	flush();
+
+
+		//$db->Close();
+}
+include("testdatabases.inc.php");
+
+?>
+
+
+
+
diff --git a/lib/adodb/tests/client.php b/lib/adodb/tests/client.php
index c89051ade33..c7cca950351 100644
--- a/lib/adodb/tests/client.php
+++ b/lib/adodb/tests/client.php
@@ -1,194 +1,194 @@
-
-
-$url
    ";
-	$rs = csv2rs($url,$err);
-	if ($err) print $err;
-	return $rs;
- }
- 
- function print_pre($s)
- {
- 	print "
    ";print_r($s);print "
    ";
- }
-
-
-$serverURL = 'http://localhost/php/phplens/adodb/server.php';
-$testhttp = false;
-
-$sql1 = "insertz into products (productname) values ('testprod 1')";
-$sql2 = "insert into products (productname) values ('testprod 1')";
-$sql3 = "insert into products (productname) values ('testprod 2')";
-$sql4 = "delete from products where productid>80";
-$sql5 = 'select * from products';
-	
-if ($testhttp) {
-	print "Client Driver Tests
    ";
-	print "
    Test Error
    ";
-	$rs = send2server($serverURL,$sql1);
-	print_pre($rs);
-	print "
    ";
-	
-	print "
    Test Insert
    ";
-	
-	$rs = send2server($serverURL,$sql2);
-	print_pre($rs);
-	print "
    ";
-	
-	print "
    Test Insert2
    ";
-	
-	$rs = send2server($serverURL,$sql3);
-	print_pre($rs);
-	print "
    ";
-	
-	print "
    Test Delete
    ";
-	
-	$rs = send2server($serverURL,$sql4);
-	print_pre($rs);
-	print "
    ";
-	
-	
-	print "
    Test Select
    ";
-	$rs = send2server($serverURL,$sql5);
-	if ($rs) rs2html($rs);
-	
-	print "
    ";
-}
-
-
-print "
    CLIENT Driver Tests
    ";
-$conn = ADONewConnection('csv');
-$conn->Connect($serverURL);
-$conn->debug = true;
-
-print "
    Bad SQL
    ";
-
-$rs = $conn->Execute($sql1);
-
-print "
    Insert SQL 1
    ";
-$rs = $conn->Execute($sql2);
-
-print "
    Insert SQL 2
    ";
-$rs = $conn->Execute($sql3);
-
-print "
    Select SQL
    ";
-$rs = $conn->Execute($sql5);
-if ($rs) rs2html($rs);
-
-print "
    Delete SQL
    ";
-$rs = $conn->Execute($sql4);
-
-print "
    Select SQL
    ";
-$rs = $conn->Execute($sql5);
-if ($rs) rs2html($rs);
-
-
-/* EXPECTED RESULTS FOR HTTP TEST:
-
-Test Insert
-http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
-
-adorecordset Object
-(
-	[dataProvider] => native
-	[fields] => 
-	[blobSize] => 64
-	[canSeek] => 
-	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
-	[timeToLive] => 0
-	[bind] => 
-	[_numOfRows] => -1
-	[_numOfFields] => 0
-	[_queryID] => 1
-	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
-	[sql] => insert into products (productname) values ('testprod')
-	[affectedrows] => 1
-	[insertid] => 81
-)
-
-
---------------------------------------------------------------------------------
-
-Test Insert2
-http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
-
-adorecordset Object
-(
-	[dataProvider] => native
-	[fields] => 
-	[blobSize] => 64
-	[canSeek] => 
-	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
-	[timeToLive] => 0
-	[bind] => 
-	[_numOfRows] => -1
-	[_numOfFields] => 0
-	[_queryID] => 1
-	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
-	[sql] => insert into products (productname) values ('testprod')
-	[affectedrows] => 1
-	[insertid] => 82
-)
-
-
---------------------------------------------------------------------------------
-
-Test Delete
-http://localhost/php/adodb/server.php?sql=delete+from+products+where+productid%3E80
-
-adorecordset Object
-(
-	[dataProvider] => native
-	[fields] => 
-	[blobSize] => 64
-	[canSeek] => 
-	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
-	[timeToLive] => 0
-	[bind] => 
-	[_numOfRows] => -1
-	[_numOfFields] => 0
-	[_queryID] => 1
-	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
-	[sql] => delete from products where productid>80
-	[affectedrows] => 2
-	[insertid] => 0
-)
-
-[more stuff deleted]
- .
- . 
- .
-*/
-?>
+
+
+$url
    ";
+	$rs = csv2rs($url,$err);
+	if ($err) print $err;
+	return $rs;
+ }
+ 
+ function print_pre($s)
+ {
+ 	print "
    ";print_r($s);print "
    ";
+ }
+
+
+$serverURL = 'http://localhost/php/phplens/adodb/server.php';
+$testhttp = false;
+
+$sql1 = "insertz into products (productname) values ('testprod 1')";
+$sql2 = "insert into products (productname) values ('testprod 1')";
+$sql3 = "insert into products (productname) values ('testprod 2')";
+$sql4 = "delete from products where productid>80";
+$sql5 = 'select * from products';
+	
+if ($testhttp) {
+	print "    Client Driver Tests
    ";
+	print "
    Test Error
    ";
+	$rs = send2server($serverURL,$sql1);
+	print_pre($rs);
+	print "
    ";
+	
+	print "
    Test Insert
    ";
+	
+	$rs = send2server($serverURL,$sql2);
+	print_pre($rs);
+	print "
    ";
+	
+	print "
    Test Insert2
    ";
+	
+	$rs = send2server($serverURL,$sql3);
+	print_pre($rs);
+	print "
    ";
+	
+	print "
    Test Delete
    ";
+	
+	$rs = send2server($serverURL,$sql4);
+	print_pre($rs);
+	print "
    ";
+	
+	
+	print "
    Test Select
    ";
+	$rs = send2server($serverURL,$sql5);
+	if ($rs) rs2html($rs);
+	
+	print "
    ";
+}
+
+
+print "
    CLIENT Driver Tests
    ";
+$conn = ADONewConnection('csv');
+$conn->Connect($serverURL);
+$conn->debug = true;
+
+print "
    Bad SQL
    ";
+
+$rs = $conn->Execute($sql1);
+
+print "
    Insert SQL 1
    ";
+$rs = $conn->Execute($sql2);
+
+print "
    Insert SQL 2
    ";
+$rs = $conn->Execute($sql3);
+
+print "
    Select SQL
    ";
+$rs = $conn->Execute($sql5);
+if ($rs) rs2html($rs);
+
+print "
    Delete SQL
    ";
+$rs = $conn->Execute($sql4);
+
+print "
    Select SQL
    ";
+$rs = $conn->Execute($sql5);
+if ($rs) rs2html($rs);
+
+
+/* EXPECTED RESULTS FOR HTTP TEST:
+
+Test Insert
+http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
+
+adorecordset Object
+(
+	[dataProvider] => native
+	[fields] => 
+	[blobSize] => 64
+	[canSeek] => 
+	[EOF] => 1
+	[emptyTimeStamp] =>  
+	[emptyDate] =>  
+	[debug] => 
+	[timeToLive] => 0
+	[bind] => 
+	[_numOfRows] => -1
+	[_numOfFields] => 0
+	[_queryID] => 1
+	[_currentRow] => -1
+	[_closed] => 
+	[_inited] => 
+	[sql] => insert into products (productname) values ('testprod')
+	[affectedrows] => 1
+	[insertid] => 81
+)
+
+
+--------------------------------------------------------------------------------
+
+Test Insert2
+http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
+
+adorecordset Object
+(
+	[dataProvider] => native
+	[fields] => 
+	[blobSize] => 64
+	[canSeek] => 
+	[EOF] => 1
+	[emptyTimeStamp] =>  
+	[emptyDate] =>  
+	[debug] => 
+	[timeToLive] => 0
+	[bind] => 
+	[_numOfRows] => -1
+	[_numOfFields] => 0
+	[_queryID] => 1
+	[_currentRow] => -1
+	[_closed] => 
+	[_inited] => 
+	[sql] => insert into products (productname) values ('testprod')
+	[affectedrows] => 1
+	[insertid] => 82
+)
+
+
+--------------------------------------------------------------------------------
+
+Test Delete
+http://localhost/php/adodb/server.php?sql=delete+from+products+where+productid%3E80
+
+adorecordset Object
+(
+	[dataProvider] => native
+	[fields] => 
+	[blobSize] => 64
+	[canSeek] => 
+	[EOF] => 1
+	[emptyTimeStamp] =>  
+	[emptyDate] =>  
+	[debug] => 
+	[timeToLive] => 0
+	[bind] => 
+	[_numOfRows] => -1
+	[_numOfFields] => 0
+	[_queryID] => 1
+	[_currentRow] => -1
+	[_closed] => 
+	[_inited] => 
+	[sql] => delete from products where productid>80
+	[affectedrows] => 2
+	[insertid] => 0
+)
+
+[more stuff deleted]
+ .
+ . 
+ .
+*/
+?>
diff --git a/lib/adodb/tests/test-datadict.php b/lib/adodb/tests/test-datadict.php
index 176a1f3fd30..8a6563de1ce 100644
--- a/lib/adodb/tests/test-datadict.php
+++ b/lib/adodb/tests/test-datadict.php
@@ -1,225 +1,233 @@
-$dbType
    ";
-	$db = NewADOConnection($dbType);
-	$dict = NewDataDictionary($db);
-
-	if (!$dict) continue;
-	$dict->debug = 1;
-	
-	$opts = array('REPLACE','mysql' => 'TYPE=ISAM', 'oci8' => 'TABLESPACE USERS');
-	
-/*	$flds = array(
-		array('id',	'I',								
-							'AUTO','KEY'),
-							
-		array('name' => 'firstname', 'type' => 'varchar','size' => 30,
-							'DEFAULT'=>'Joan'),
-							
-		array('lastname','varchar',28,
-							'DEFAULT'=>'Chen','key'),
-							
-		array('averylonglongfieldname','X',1024,
-							'NOTNULL','default' => 'test'),
-							
-		array('price','N','7.2',
-							'NOTNULL','default' => '0.00'),
-							
-		array('MYDATE', 'D', 
-							'DEFDATE'),
-		array('TS','T',
-							'DEFTIMESTAMP')
-	);*/
-	
-	$flds = "
-ID            I           AUTO KEY,
-FIRSTNAME     VARCHAR(30) DEFAULT 'Joan',
-LASTNAME      VARCHAR(28) DEFAULT 'Chen' key,
-averylonglongfieldname X(1024) DEFAULT 'test',
-price         N(7.2)  DEFAULT '0.00',
-MYDATE        D      DEFDATE,
-BIGFELLOW     X      NOTNULL,
-TS            T      DEFTIMESTAMP";
-
-
-	$sqla = $dict->CreateDatabase('KUTU',array('postgres'=>"LOCATION='/u01/postdata'"));
-	$dict->SetSchema('KUTU');
-	
-	$sqli = ($dict->CreateTableSQL('testtable',$flds, $opts));
-	$sqla =& array_merge($sqla,$sqli);
-	
-	$sqli = $dict->CreateIndexSQL('idx','testtable','firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
-	$sqla =& array_merge($sqla,$sqli);
-	$sqli = $dict->CreateIndexSQL('idx2','testtable','price,lastname');//,array('BITMAP','FULLTEXT','CLUSTERED'));
-	$sqla =& array_merge($sqla,$sqli);
-	
-	$addflds = array(array('height', 'F'),array('weight','F'));
-	$sqli = $dict->AddColumnSQL('testtable',$addflds);
-	$sqla =& array_merge($sqla,$sqli);
-	$addflds = array(array('height', 'F','NOTNULL'),array('weight','F','NOTNULL'));
-	$sqli = $dict->AlterColumnSQL('testtable',$addflds);
-	$sqla =& array_merge($sqla,$sqli);
-	
-	
-	printsqla($dbType,$sqla);
-	
-	if ($dbType == 'mysql') {
-		$db->Connect('localhost', "root", "", "test");
-		$dict->SetSchema('');
-		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
-		if ($sqla2) printsqla($dbType,$sqla2);
-	}
-		if ($dbType == 'postgres') {
-		$db->Connect('localhost', "tester", "test", "test");
-		$dict->SetSchema('');
-		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
-		if ($sqla2) printsqla($dbType,$sqla2);
-	}
-	
-}
-
-function printsqla($dbType,$sqla)
-{
-	print "
    ";
-	//print_r($dict->MetaTables());
-	foreach($sqla as $s) {
-		$s = htmlspecialchars($s);
-		print "$s;\n";
-		if ($dbType == 'oci8') print "/\n";
-	}
-	print "
    ";
-}
-
-/***
-
-Generated SQL:
-
-mysql
-
-CREATE DATABASE KUTU;
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               INTEGER NOT NULL AUTO_INCREMENT,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) NOT NULL DEFAULT 'Chen',
-averylonglongfieldname LONGTEXT NOT NULL,
-price            NUMERIC(7,2) NOT NULL DEFAULT 0.00,
-MYDATE           DATE DEFAULT CURDATE(),
-                 PRIMARY KEY (id, lastname)
-)TYPE=ISAM;
-CREATE FULLTEXT INDEX idx ON KUTU.testtable (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD height           DOUBLE;
-ALTER TABLE KUTU.testtable  ADD weight           DOUBLE;
-ALTER TABLE KUTU.testtable  MODIFY COLUMN height           DOUBLE NOT NULL;
-ALTER TABLE KUTU.testtable  MODIFY COLUMN weight           DOUBLE NOT NULL;
-
-
---------------------------------------------------------------------------------
-
-oci8
-
-CREATE USER KUTU IDENTIFIED BY tiger;
-/
-GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO KUTU;
-/
-DROP TABLE KUTU.testtable CASCADE CONSTRAINTS;
-/
-CREATE TABLE KUTU.testtable (
-id               NUMBER(16) NOT NULL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname CLOB NOT NULL,
-price            NUMBER(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATE DEFAULT TRUNC(SYSDATE),
-                 PRIMARY KEY (id, lastname)
-)TABLESPACE USERS;
-/
-DROP SEQUENCE KUTU.SEQ_testtable;
-/
-CREATE SEQUENCE KUTU.SEQ_testtable;
-/
-CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON KUTU.testtable 
-		FOR EACH ROW
-		BEGIN
-		  select KUTU.SEQ_testtable.nextval into :new.id from dual;
-		END;
-/
-CREATE BITMAP INDEX idx ON KUTU.testtable (firstname,lastname);
-/
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-/
-ALTER TABLE testtable ADD (
- height           NUMBER,
- weight           NUMBER);
-/
-ALTER TABLE testtable MODIFY(
- height           NUMBER NOT NULL,
- weight           NUMBER NOT NULL);
-/
-
-
---------------------------------------------------------------------------------
-
-postgres
-AlterColumnSQL not supported for PostgreSQL
-
-
-CREATE DATABASE KUTU LOCATION='/u01/postdata';
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               SERIAL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname TEXT NOT NULL,
-price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATE DEFAULT CURRENT_DATE,
-                 PRIMARY KEY (id, lastname)
-);
-CREATE INDEX idx ON KUTU.testtable USING HASH (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD height           FLOAT8;
-ALTER TABLE KUTU.testtable  ADD weight           FLOAT8;
-
-
---------------------------------------------------------------------------------
-
-odbc_mssql
-
-CREATE DATABASE KUTU;
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               INT IDENTITY(1,1) NOT NULL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname TEXT NOT NULL,
-price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATETIME DEFAULT GetDate(),
-                 PRIMARY KEY (id, lastname)
-);
-CREATE CLUSTERED INDEX idx ON KUTU.testtable (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD
- height           REAL,
- weight           REAL;
-ALTER TABLE KUTU.testtable  ALTER COLUMN height           REAL NOT NULL;
-ALTER TABLE KUTU.testtable  ALTER COLUMN weight           REAL NOT NULL;
-
-
---------------------------------------------------------------------------------
-*/
+$dbType
    ";
+	$db = NewADOConnection($dbType);
+	$dict = NewDataDictionary($db);
+
+	if (!$dict) continue;
+	$dict->debug = 1;
+	
+	$opts = array('REPLACE','mysql' => 'TYPE=ISAM', 'oci8' => 'TABLESPACE USERS');
+	
+/*	$flds = array(
+		array('id',	'I',								
+							'AUTO','KEY'),
+							
+		array('name' => 'firstname', 'type' => 'varchar','size' => 30,
+							'DEFAULT'=>'Joan'),
+							
+		array('lastname','varchar',28,
+							'DEFAULT'=>'Chen','key'),
+							
+		array('averylonglongfieldname','X',1024,
+							'NOTNULL','default' => 'test'),
+							
+		array('price','N','7.2',
+							'NOTNULL','default' => '0.00'),
+							
+		array('MYDATE', 'D', 
+							'DEFDATE'),
+		array('TS','T',
+							'DEFTIMESTAMP')
+	);*/
+	
+	$flds = "
+ID            I           AUTO KEY,
+FIRSTNAME     VARCHAR(30) DEFAULT 'Joan',
+LASTNAME      VARCHAR(28) DEFAULT 'Chen' key,
+averylonglongfieldname X(1024) DEFAULT 'test',
+price         N(7.2)  DEFAULT '0.00',
+MYDATE        D      DEFDATE,
+BIGFELLOW     X      NOTNULL,
+TS            T      DEFTIMESTAMP";
+
+
+	$sqla = $dict->CreateDatabase('KUTU',array('postgres'=>"LOCATION='/u01/postdata'"));
+	$dict->SetSchema('KUTU');
+	
+	$sqli = ($dict->CreateTableSQL('testtable',$flds, $opts));
+	$sqla =& array_merge($sqla,$sqli);
+	
+	$sqli = $dict->CreateIndexSQL('idx','testtable','firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
+	$sqla =& array_merge($sqla,$sqli);
+	$sqli = $dict->CreateIndexSQL('idx2','testtable','price,lastname');//,array('BITMAP','FULLTEXT','CLUSTERED'));
+	$sqla =& array_merge($sqla,$sqli);
+	
+	$addflds = array(array('height', 'F'),array('weight','F'));
+	$sqli = $dict->AddColumnSQL('testtable',$addflds);
+	$sqla =& array_merge($sqla,$sqli);
+	$addflds = array(array('height', 'F','NOTNULL'),array('weight','F','NOTNULL'));
+	$sqli = $dict->AlterColumnSQL('testtable',$addflds);
+	$sqla =& array_merge($sqla,$sqli);
+	
+	
+	printsqla($dbType,$sqla);
+	
+	if (file_exists('d:\inetpub\wwwroot\php\phplens\adodb\adodb.inc.php'))
+	if ($dbType == 'mysql') {
+		$db->Connect('localhost', "root", "", "test");
+		$dict->SetSchema('');
+		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+		if ($sqla2) printsqla($dbType,$sqla2);
+	}
+		if ($dbType == 'postgres') {
+		$db->Connect('localhost', "tester", "test", "test");
+		$dict->SetSchema('');
+		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+		if ($sqla2) printsqla($dbType,$sqla2);
+	}
+	
+}
+
+function printsqla($dbType,$sqla)
+{
+	print "
    ";
+	//print_r($dict->MetaTables());
+	foreach($sqla as $s) {
+		$s = htmlspecialchars($s);
+		print "$s;\n";
+		if ($dbType == 'oci8') print "/\n";
+	}
+	print "
    ";
+}
+
+/***
+
+Generated SQL:
+
+mysql
+
+CREATE DATABASE KUTU;
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               INTEGER NOT NULL AUTO_INCREMENT,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) NOT NULL DEFAULT 'Chen',
+averylonglongfieldname LONGTEXT NOT NULL,
+price            NUMERIC(7,2) NOT NULL DEFAULT 0.00,
+MYDATE           DATE DEFAULT CURDATE(),
+                 PRIMARY KEY (id, lastname)
+)TYPE=ISAM;
+CREATE FULLTEXT INDEX idx ON KUTU.testtable (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD height           DOUBLE;
+ALTER TABLE KUTU.testtable  ADD weight           DOUBLE;
+ALTER TABLE KUTU.testtable  MODIFY COLUMN height           DOUBLE NOT NULL;
+ALTER TABLE KUTU.testtable  MODIFY COLUMN weight           DOUBLE NOT NULL;
+
+
+--------------------------------------------------------------------------------
+
+oci8
+
+CREATE USER KUTU IDENTIFIED BY tiger;
+/
+GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO KUTU;
+/
+DROP TABLE KUTU.testtable CASCADE CONSTRAINTS;
+/
+CREATE TABLE KUTU.testtable (
+id               NUMBER(16) NOT NULL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname CLOB NOT NULL,
+price            NUMBER(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATE DEFAULT TRUNC(SYSDATE),
+                 PRIMARY KEY (id, lastname)
+)TABLESPACE USERS;
+/
+DROP SEQUENCE KUTU.SEQ_testtable;
+/
+CREATE SEQUENCE KUTU.SEQ_testtable;
+/
+CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON KUTU.testtable 
+		FOR EACH ROW
+		BEGIN
+		  select KUTU.SEQ_testtable.nextval into :new.id from dual;
+		END;
+/
+CREATE BITMAP INDEX idx ON KUTU.testtable (firstname,lastname);
+/
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+/
+ALTER TABLE testtable ADD (
+ height           NUMBER,
+ weight           NUMBER);
+/
+ALTER TABLE testtable MODIFY(
+ height           NUMBER NOT NULL,
+ weight           NUMBER NOT NULL);
+/
+
+
+--------------------------------------------------------------------------------
+
+postgres
+AlterColumnSQL not supported for PostgreSQL
+
+
+CREATE DATABASE KUTU LOCATION='/u01/postdata';
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               SERIAL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname TEXT NOT NULL,
+price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATE DEFAULT CURRENT_DATE,
+                 PRIMARY KEY (id, lastname)
+);
+CREATE INDEX idx ON KUTU.testtable USING HASH (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD height           FLOAT8;
+ALTER TABLE KUTU.testtable  ADD weight           FLOAT8;
+
+
+--------------------------------------------------------------------------------
+
+odbc_mssql
+
+CREATE DATABASE KUTU;
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               INT IDENTITY(1,1) NOT NULL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname TEXT NOT NULL,
+price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATETIME DEFAULT GetDate(),
+                 PRIMARY KEY (id, lastname)
+);
+CREATE CLUSTERED INDEX idx ON KUTU.testtable (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD
+ height           REAL,
+ weight           REAL;
+ALTER TABLE KUTU.testtable  ALTER COLUMN height           REAL NOT NULL;
+ALTER TABLE KUTU.testtable  ALTER COLUMN weight           REAL NOT NULL;
+
+
+--------------------------------------------------------------------------------
+*/
+
+echo "
    Test XML Schema
    ";
+$ff = file('xmlschema.xml');
+echo "
    ";
+foreach($ff as $xml) echo htmlspecialchars($xml);
+echo "
    ";
+include_once('test-xmlschema.php');
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/test-pgblob.php b/lib/adodb/tests/test-pgblob.php
index b592757ae29..029669f5191 100644
--- a/lib/adodb/tests/test-pgblob.php
+++ b/lib/adodb/tests/test-pgblob.php
@@ -1,10 +1,63 @@
 Param(false);
+		$x = (rand() % 10) + 1;
+		$db->debug= ($i==1);
+		$id = $db->GetOne($sql,
+			array('Z%','Z%',$x));
+		if($id != $offset+$x) {
+			print "
    Error at $x";
+			break;
+		}
+	}
+}
+
 include_once('../adodb.inc.php');
 $db = NewADOConnection('postgres7');
-$db->Connect('localhost','tester','test','test') || die("failed connection");
+$db->PConnect('localhost','tester','test','test') || die("failed connection");
 
 $enc = "GIF89a%01%00%01%00%80%FF%00%C0%C0%C0%00%00%00%21%F9%04%01%00%00%00%00%2C%00%00%00%00%01%00%01%00%00%01%012%00%3Bt_clear.gif%0D";
 $val = rawurldecode($enc);
+
+$MAX = 1000;
+
+adodb_pr($db->ServerInfo());
+
+echo "
    Testing PREPARE/EXECUTE PLAN
    ";
+
+
+$db->_bindInputArray = true; // requires postgresql 7.3+ and ability to modify database
+$t = getmicrotime();
+doloop();
+echo '
    ',$MAX,' times, with plan=',getmicrotime() - $t,'
    ';
+
+
+$db->_bindInputArray = false;
+$t = getmicrotime();
+doloop();
+echo '
    ',$MAX,' times, no plan=',getmicrotime() - $t,'
    ';
+
+
+
+echo "
    Testing UPDATEBLOB
    ";
 $db->debug=1;
 
 ### TEST BEGINS
diff --git a/lib/adodb/tests/test-php5.php b/lib/adodb/tests/test-php5.php
index 033f667a243..c735aa73865 100644
--- a/lib/adodb/tests/test-php5.php
+++ b/lib/adodb/tests/test-php5.php
@@ -1,56 +1,58 @@
-Connect('','scott','natsoft');
-	break;
-default:
-case 'mysql':
-	$db = NewADOConnection("mysql");
-	$db->Connect('localhost','root','','test');
-	break;
-}
-
-$db->debug=1;
-
-$cnt = $db->GetOne("select count(*) from adoxyz");
-$rs = $db->Execute("select * from adoxyz order by id");
-
-$i = 0;
-foreach($rs as  $v) {
-	$i += 1;
-	echo "$i: "; adodb_pr($v); adodb_pr($rs->fields);
-	flush();
-}
-
-if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
-
-
-$rs = $db->Execute("select bad from badder");
-
-} catch (exception $e) {
-	adodb_pr($e);
-	$e = adodb_backtrace($e->trace);
-}
-
+PHP ".PHP_VERSION."\n";
+try {
+
+$dbt = 'oci8';
+
+switch($dbt) {
+case 'oci8':
+	$db = NewADOConnection("oci8");
+	$db->Connect('','scott','natsoft');
+	break;
+default:
+case 'mysql':
+	$db = NewADOConnection("mysql");
+	$db->Connect('localhost','root','','test');
+	break;
+}
+
+$db->debug=1;
+
+$cnt = $db->GetOne("select count(*) from adoxyz");
+$rs = $db->Execute("select * from adoxyz order by id");
+
+$i = 0;
+foreach($rs as  $v) {
+	$i += 1;
+	echo "$i: "; adodb_pr($v); adodb_pr($rs->fields);
+	flush();
+}
+
+if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
+
+
+$rs = $db->Execute("select bad from badder");
+
+} catch (exception $e) {
+	adodb_pr($e);
+	echo "
    adodb_backtrace:
    \n";
+	$e = adodb_backtrace($e->gettrace());
+}
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/test-xmlschema.php b/lib/adodb/tests/test-xmlschema.php
index aa3b4e8be9b..cb3f1fb65f9 100644
--- a/lib/adodb/tests/test-xmlschema.php
+++ b/lib/adodb/tests/test-xmlschema.php
@@ -1,34 +1,34 @@
-Connect( 'localhost', 'root', '', 'schematest' );
-
-// To create a schema object and build the query array.
-$schema = new adoSchema( $db );
-
-// To upgrade an existing schema object, use the following 
-// To upgrade an existing database to the provided schema,
-// uncomment the following line:
-#$schema->upgradeSchema();
-
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-print "Here's the SQL to do the build:\n
    ";
-print_r( $sql );
-print "
    \n";
-
-// Execute the SQL on the database
-//$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-//$schema->Destroy();
+Connect( 'localhost', 'root', '', 'schematest' );
+
+// To create a schema object and build the query array.
+$schema = new adoSchema( $db );
+
+// To upgrade an existing schema object, use the following 
+// To upgrade an existing database to the provided schema,
+// uncomment the following line:
+#$schema->upgradeSchema();
+
+// Build the SQL array
+$sql = $schema->ParseSchema( "xmlschema.xml" );
+
+print "Here's the SQL to do the build:\n
    ";
+print_r( $sql );
+print "
    \n";
+
+// Execute the SQL on the database
+//$result = $schema->ExecuteSchema( $sql );
+
+// Finally, clean up after the XML parser
+// (PHP won't do this for you!)
+//$schema->Destroy();
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/test.php b/lib/adodb/tests/test.php
index d1d6fe3f58a..fdcc8ad5da1 100644
--- a/lib/adodb/tests/test.php
+++ b/lib/adodb/tests/test.php
@@ -1,1449 +1,1463 @@
-$msg
    ";
-	flush();
-}
-
-function CheckWS($conn)
-{
-global $ADODB_EXTENSION;
-
-	include_once('../session/adodb-session.php');
-	
-	$saved = $ADODB_EXTENSION;
-	$db = ADONewConnection($conn);
-	$ADODB_EXTENSION = $saved;
-	if (headers_sent()) {
-		print "
    White space detected in adodb-$conn.inc.php or include file...
    ";
-		die();
-	}
-}
-
-function do_strtolower(&$arr)
-{
-	foreach($arr as $k => $v) {
-		$arr[$k] = strtolower($v);
-	}
-}
-
-
-function CountExecs($db, $sql, $inputarray)
-{
-global $EXECS;  $EXECS++;
-}
-
-function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
-{
-global $CACHED; $CACHED++;
-}
-
-// the table creation code is specific to the database, so we allow the user 
-// to define their own table creation stuff
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-GLOBAL $ADODB_vers,$ADODB_CACHE_DIR,$ADODB_FETCH_MODE, $HTTP_GET_VARS,$ADODB_COUNTRECS;
-
-?>	
    
-	
    
-	
     
    
-	
    
-Execute('select lastname,firstname,lastname,id from adoxyz');
-	$arr = $rs->GetAssoc();
-	echo "
    ";print_r($arr);
-	die();*/
-	
-	GLOBAL $EXECS, $CACHED;
-	
-	$EXECS = 0;
-	$CACHED = 0;
-	if ((rand()%3) == 0) @$db->Execute("delete from adodb_logsql");
-	$db->debug=1;
-	
-	$db->fnExecute = 'CountExecs';
-	$db->fnCacheExecute = 'CountCachedExecs';
-	
-	if (empty($_GET['nolog'])) {
-		echo "
    SQL Logging enabled
    ";
-		$db->LogSQL();/*
-		$sql =
-"SELECT t1.sid, t1.sid, t1.title, t1.hometext, t1.notes, t1.aid, t1.informant, 
-t2.url, t2.email, t1.catid, t3.title, t1.topic, t4.topicname, t4.topicimage, 
-t4.topictext, t1.score, t1.ratings, t1.counter, t1.comments, t1.acomm 
-FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_topics` `t4` 
-	WHERE ((t2.aid=t1.aid) AND (t3.catid=t1.catid) AND (t4.topicid=t1.topic) 
-	AND ((t1.alanguage='german') OR (t1.alanguage='')) AND (t1.ihome='0')) 
-	ORDER BY t1.time DESC";
-		$db->SelectLimit($sql);
-		echo $db->ErrorMsg();*/
-	}
-	$ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
-	$db->debug = false;
-	
-	//print $db->UnixTimeStamp('2003-7-22 23:00:00');
-	
-	$phpv = phpversion();
-	if (defined('ADODB_EXTENSION')) $ext = '   Extension '.ADODB_EXTENSION.' installed';
-	else $ext = '';
-	print "
    ADODB Version: $ADODB_vers Host: $db->host   Database: $db->database   PHP: $phpv $ext
    ";
-	flush();
-	$arr = $db->ServerInfo();
-	print_r($arr);
-	echo "
    ";
-	$e = error_reporting(E_ALL-E_WARNING);
-	flush();
-	print "date1 (1969-02-20) = ".$db->DBDate('1969-2-20');
-	print "
    date1 (1999-02-20) = ".$db->DBDate('1999-2-20');
-	print "
    date1.1 1999 = ".$db->DBDate("'1999'");
-	print "
    date2 (1970-1-2) = ".$db->DBDate(24*3600)."
    ";
-	print "ts1 (1999-02-20 13:40:50) = ".$db->DBTimeStamp('1999-2-20 1:40:50 pm');
-	print "
    ts1.1 (1999-02-20 13:40:00) = ".$db->DBTimeStamp('1999-2-20 13:40');
-	print "
    ts2 (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
-	print "
    ts3 (1970-1-2 +/- timezone) = ".$db->DBTimeStamp(24*3600);
-	print "
     Fractional TS (1999-2-20 13:40:50.91): ".$db->DBTimeStamp($db->UnixTimeStamp('1999-2-20 13:40:50.91+1'));
-	 $dd = $db->UnixDate('1999-02-20');
-	print "
    unixdate 1999-02-20 = ".date('Y-m-d',$dd)."
    ";
-	print "
    ts4 =".($db->UnixTimeStamp("19700101000101")+8*3600);
-	print "
    ts5 =".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
-	print "
    ts6 =".$db->UserTimeStamp("20040110092123");
-	print "
    ts6 =".$db->DBTimeStamp("20040110092123");
-	flush();
-	// mssql too slow in failing bad connection
-	if (false && $db->databaseType != 'mssql') {
-		print "
    Testing bad connection. Ignore following error msgs:
    ";
-		$db2 = ADONewConnection();
-		$rez = $db2->Connect("bad connection");
-		$err = $db2->ErrorMsg();
-		print "Error='$err'
    ";
-		if ($rez) print "Cannot check if connection failed. The Connect() function returned true.
    ";
-	}
-	error_reporting($e);
-	flush();
-	
-	//$ADODB_COUNTRECS=false;
-	$rs=$db->Execute('select * from adoxyz order by id');
-
-	//print_r($rs);
-	//OCIFetchStatement($rs->_queryID,$rez,0,-1);//,OCI_ASSOC | OCI_FETCHSTATEMENT_BY_ROW);
-	//print_r($rez);
-	//die();
-	if($rs === false) $create = true;
-	else $rs->Close();
-		
-	//if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
-	
-	if ($create) {
-		if (false && $db->databaseType == 'ibase') {
-			print "Please create the following table for testing:
    $createtab
    ";
-			return;
-		} else {
-			$db->debug = 1;
-			$e = error_reporting(E_ALL-E_WARNING);
-			$db->Execute($createtab);
-			error_reporting($e);
-		}
-	}
-	$rs = &$db->Execute("delete from ADOXYZ"); // some ODBC drivers will fail the drop so we delete
-	if ($rs) {
-		if(! $rs->EOF) print "Error: RecordSet returned by Execute('delete...') should show EOF
    ";
-		$rs->Close();
-	} else print "err=".$db->ErrorMsg();
-
-	print "
    Test select on empty table
    ";
-	$rs = &$db->Execute("select * from ADOXYZ where id=9999");
-	if ($rs && !$rs->EOF) print "Error: RecordSet returned by Execute(select...') on empty table should show EOF
    ";
-	if ($rs) $rs->Close();
-	flush();
-	//$db->debug=true;	
-	print "
    Testing Commit: ";
-	$time = $db->DBDate(time());
-	if (!$db->BeginTrans()) {
-		print 'Transactions not supported
    ';
-		if ($db->hasTransactions) Err("hasTransactions should be false");
-	} else { /* COMMIT */
-		if (!$db->hasTransactions) Err("hasTransactions should be true");
-		if ($db->transCnt != 1) Err("Invalid transCnt = $db->transCnt (should be 1)");
-		$rs = $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (99,'Should Not','Exist (Commit)',$time)");
-		if ($rs && $db->CommitTrans()) {
-			$rs->Close();
-			$rs = &$db->Execute("select * from ADOXYZ where id=99");
-			if ($rs === false || $rs->EOF) {
-				print 'Data not saved
    ';
-				$rs = &$db->Execute("select * from ADOXYZ where id=99");
-				print_r($rs);
-				die();
-			} else print 'OK
    ';
-			if ($rs) $rs->Close();
-		} else {
-			if (!$rs) {
-				print "Insert failed
    ";
-				$db->RollbackTrans();
-			} else print "Commit failed
    ";
-		}
-		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
-		
-		/* ROLLBACK */	
-		if (!$db->BeginTrans()) print "
    Error in BeginTrans()
    ";
-		print "
    Testing Rollback: ";
-		$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (100,'Should Not','Exist (Rollback)',$time)");
-		if ($db->RollbackTrans()) {
-			$rs = $db->Execute("select * from ADOXYZ where id=100");
-			if ($rs && !$rs->EOF) print 'Fail: Data should rollback
    ';
-			else print 'OK
    ';
-			if ($rs) $rs->Close();
-		} else
-			print "Commit failed
    ";
-			
-		$rs = &$db->Execute('delete from ADOXYZ where id>50');
-		if ($rs) $rs->Close();
-		
-		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
-	}
-	
-	if (1) {
-		print "
    Testing MetaDatabases()
    ";
-		print_r( $db->MetaDatabases());
-		
-		print "
    Testing MetaTables() and MetaColumns()
    ";
-		$a = $db->MetaTables();
-		if ($a===false) print "MetaTables not supported
    ";
-		else {
-			print "Array of tables and views: "; 
-			foreach($a as $v) print " ($v) ";
-			print '
    ';
-		}
-		
-		$a = $db->MetaTables('VIEW');
-		if ($a===false) print "MetaTables not supported
    ";
-		else {
-			print "Array of views: "; 
-			foreach($a as $v) print " ($v) ";
-			print '
    ';
-		}
-		
-		$a = $db->MetaTables(false,false,'aDo%');
-		if ($a===false) print "MetaTables not supported
    ";
-		else {
-			print "Array of ado%: "; 
-			foreach($a as $v) print " ($v) ";
-			print '
    ';
-		}
-		
-		$a = $db->MetaTables('TABLE');
-		if ($a===false) print "MetaTables not supported
    ";
-		else {
-			print "Array of tables: "; 
-			foreach($a as $v) print " ($v) ";
-			print '
    ';
-		}
-		
-		$db->debug=1;
-		$a = $db->MetaColumns('ADOXYZ');
-		if ($a===false) print "MetaColumns not supported
    ";
-		else {
-			print "
    Columns of ADOXYZ: 
    ";
-			foreach($a as $v) {print_r($v); echo "
    ";}
-			echo "    ";
-		}
-		
-		print "
    Testing MetaIndexes
    ";
-		$a = $db->MetaIndexes('ADOXYZ',true);
-		if ($a===false) print "MetaIndexes not supported
    ";
-		else {
-			print "
    Indexes of ADOXYZ: 
    ";
-			foreach($a as $v) {print_r($v); echo "
    ";}
-			echo "    ";
-		}
-		print "
    Testing MetaPrimaryKeys
    ";
-		$a = $db->MetaPrimaryKeys('ADOXYZ');
-		var_dump($a);
-	}
-	$rs = &$db->Execute('delete from ADOXYZ');
-	if ($rs) $rs->Close();
-	
-	$db->debug = false;
-	
-	
-	switch ($db->databaseType) {
-	case 'postgres7':
-	case 'postgres64':
-	case 'postgres':
-	case 'ibase':
-		print "
    Encode=".$db->BlobEncode("abc\0d\"'
-ef")."
    ";//'
-
-		print "
    Testing Foreign Keys
    ";
-		$arr = $db->MetaForeignKeys('adoxyz',false,true);
-		print_r($arr);
-		if (!$arr) Err("Bad MetaForeignKeys");
-		break;
-	
-	case 'odbc_mssql':
-	case 'mssqlpo':
-		print "
    Testing Foreign Keys
    ";
-		$arr = $db->MetaForeignKeys('Orders',false,true);
-		print_r($arr);
-		if (!$arr) Err("Bad MetaForeignKeys");
-		if ($db->databaseType == 'odbc_mssql') break;
-	
-	case 'mssql': 
-	
-		
-/*
-ASSUME Northwind available...
-
-CREATE PROCEDURE SalesByCategory
-	@CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
-AS
-IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
-BEGIN
-	SELECT @OrdYear = '1998'
-END
-
-SELECT ProductName,
-	TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * (1-OD.Discount) * OD.UnitPrice)), 0)
-FROM [Order Details] OD, Orders O, Products P, Categories C
-WHERE OD.OrderID = O.OrderID 
-	AND OD.ProductID = P.ProductID 
-	AND P.CategoryID = C.CategoryID
-	AND C.CategoryName = @CategoryName
-	AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
-GROUP BY ProductName
-ORDER BY ProductName
-GO
-*/
-		print "
    Testing Stored Procedures for mssql
    ";
-		$saved = $db->debug;
-		$db->debug=true;
-		
-		$cat = 'Dairy Products';
-		$yr = '1998';
-		
-		$stmt = $db->PrepareSP('SalesByCategory');
-		$db->InParameter($stmt,$cat,'CategoryName');
-		$db->InParameter($stmt,$yr,'OrdYear');
-		$rs = $db->Execute($stmt);
-		rs2html($rs);
-		
-		$cat = 'Grains/Cereals';
-		$yr = 1998;
-		
-		$stmt = $db->PrepareSP('SalesByCategory');
-		$db->InParameter($stmt,$cat,'CategoryName');
-		$db->InParameter($stmt,$yr,'OrdYear');
-		$rs = $db->Execute($stmt);
-		rs2html($rs);
-		
-		/*
-		Test out params - works in 4.2.3 but not 4.3.0???:
-		
-			CREATE PROCEDURE at_date_interval 
-				@days INTEGER, 
-				@start VARCHAR(20) OUT, 
-				@end VARCHAR(20) OUT 	
-			AS 
-			BEGIN 
-				set @start = CONVERT(VARCHAR(20), getdate(), 101) 
-				set @end =CONVERT(VARCHAR(20), dateadd(day, @days, getdate()), 101 ) 
-			END
-			GO
-		*/
-		$db->debug=1;
-		$stmt = $db->PrepareSP('at_date_interval');
-		$days = 10;
-		$begin_date = '';
-		$end_date = '';
-		$db->InParameter($stmt,$days,'days', 4, SQLINT4); 
-		$db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR ); 
-		$db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR ); 
-		$db->Execute($stmt);
-		if (empty($begin_date) or empty($end_date)) {
-			Err("MSSQL SP Test for OUT Failed");
-			print "begin=$begin_date end=$end_date
    ";
-		} else print "(Today +10days) = (begin=$begin_date end=$end_date)
    ";
-	
-		$db->debug = $saved;
-		break;
-	case 'oci8': 
-	case 'oci8po':
-		$saved = $db->debug;
-		$db->debug=true;
-		
-		print "
    Testing Foreign Keys
    ";
-		$arr = $db->MetaForeignKeys('emp');
-		print_r($arr);
-		if (!$arr) Err("Bad MetaForeignKeys");
-		print "
    Testing Cursor Variables
    ";
-/*
--- TEST PACKAGE
-CREATE OR REPLACE PACKAGE adodb AS
-TYPE TabType IS REF CURSOR RETURN tab%ROWTYPE;
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar);
-PROCEDURE data_out(input IN varchar, output OUT varchar); 
-END adodb;
-/
-
-CREATE OR REPLACE PACKAGE BODY adodb AS
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM tab where tname like tablenames;
-	END open_tab;
-	
-PROCEDURE data_out(input IN varchar, output OUT varchar) IS
-	BEGIN
-		output := 'Cinta Hati '||input;
-	END;
-END adodb;
-/
-*/
-		$stmt = $db->Prepare("BEGIN adodb.open_tab(:RS,'A%'); END;");
-		$db->InParameter($stmt, $cur, 'RS', -1, OCI_B_CURSOR);
-		$rs = $db->Execute($stmt);
-	
-		if ($rs && !$rs->EOF) {
-			print "Test 1 RowCount: ".$rs->RecordCount()."
    ";
-		} else {
-			print "Error in using Cursor Variables 1
    ";
-		}
-		
-		
-		print "
    Testing Stored Procedures for oci8
    ";
-		
-		$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
-		$a1 = 'Malaysia';
-		//$a2 = ''; # a2 doesn't even need to be defined!
-		$db->InParameter($stmt,$a1,'a1');
-		$db->OutParameter($stmt,$a2,'a2');
-		$rs = $db->Execute($stmt);
-		if ($rs) {
-			if ($a2 !== 'Cinta Hati Malaysia') print "Stored Procedure Error: a2 = $a2
    ";
-			else echo  "OK: a2=$a2
    ";
-		} else {
-			print "Error in using Stored Procedure IN/Out Variables
    ";
-		}
-		
-		
-		$tname = 'A%';
-		
-		$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
-		$db->Parameter($stmt,$tname,'tablename');
-		$rs = $db->Execute($stmt);
-		rs2html($rs);
-		
-		$db->debug = $saved;
-		break;
-	
-	default:
-		break;
-	}
-	$arr = array(
-		array(1,'Caroline','Miranda'),
-		array(2,'John','Lim'),
-		array(3,'Wai Hun','See')
-	);
-	$db->debug=1;
-	print "
    Testing Bulk Insert of 3 rows
    ";
-
-	$sql = "insert into ADOXYZ (id,firstname,lastname) values (?,?,?)";
-	$db->StartTrans();
-	$db->Execute($sql,$arr);
-	$db->CompleteTrans();
-	$rs = $db->Execute('select * from ADOXYZ order by id');
-	if ($rs->RecordCount() != 3) Err("Bad bulk insert");
-	rs2html($rs);
-	
-	$db->Execute('delete from ADOXYZ');
-		
-	print "
    Inserting 50 rows
    ";
-
-	for ($i = 0; $i < 5; $i++) {	
-
-	$time = $db->DBDate(time());
-	if (empty($HTTP_GET_VARS['hide'])) $db->debug = true;
-	switch($db->databaseType){
-	case 'mssqlpo':
-	case 'mssql':
-		$sqlt = "CREATE TABLE mytable (
-  row1 INT  IDENTITY(1,1) NOT NULL,
-  row2 varchar(16),
-  PRIMARY KEY  (row1))";
-  		//$db->debug=1;
-  		if (!$db->Execute("delete from mytable")) 
-			$db->Execute($sqlt);
-			
-		$ok = $db->Execute("insert into mytable (row2) values ('test')");
-		$ins_id=$db->Insert_ID();
-		echo "Insert ID=";var_dump($ins_id);
-		if ($ins_id == 0) Err("Bad Insert_ID()");
-		$ins_id2 = $db->GetOne("select row1 from mytable");
-		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-		
-		$arr = array(0=>'Caroline',1=>'Miranda');
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
-		break;
-		
-	case 'mysql':
-		$sqlt = "CREATE TABLE `mytable` (
-  `row1` int(11) NOT NULL auto_increment,
-  `row2` varchar(16) NOT NULL default '',
-  PRIMARY KEY  (`row1`),
-  KEY `myindex` (`row1`,`row2`)
-) ";
-		if (!$db->Execute("delete from mytable")) 
-			$db->Execute($sqlt);
-			
-		$ok = $db->Execute("insert into mytable (row2) values ('test')");
-		$ins_id=$db->Insert_ID();
-		echo "Insert ID=";var_dump($ins_id);
-		if ($ins_id == 0) Err("Bad Insert_ID()");
-		$ins_id2 = $db->GetOne("select row1 from mytable");
-		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-		
-	default:
-		$arr = array(0=>'Caroline',1=>'Miranda');
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
-		break;
-	
-	case 'oci8':
-	case 'oci805':
-		$arr = array('first'=>'Caroline','last'=>'Miranda');
-		$amt = rand() % 100;
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created,amount) values ($i*10+0,:first,:last,$time,$amt)";		
-		break;
-	}
-	if ($i & 1) {
-		$sql = $db->Prepare($sql);
-	}
-	$rs = $db->Execute($sql,$arr);
-		
-	if ($rs === false) Err( 'Error inserting with parameters');
-	else $rs->Close();
-	$db->debug = false;
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+1,'John','Lim',$time)");
-	/*$ins_id=$db->Insert_ID();
-	echo "Insert ID=";var_dump($ins_id);*/
-	if ($db->databaseType == 'mysql') if ($ins_id == 0) Err('Bad Insert_ID');
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+2,'Mary','Lamb',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+3,'George','Washington',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+4,'Mr. Alan','Tam',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+5,'Alan',".$db->quote("Turing'ton").",$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created)values ($i*10+6,'Serena','Williams',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+7,'Yat Sun','Sun',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+8,'Wai Hun','See',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+9,'Steven','Oey',$time )");
-	} // for
-	if (1) {
-	$db->debug=1;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$cnt = $db->GetOne("select count(*) from ADOXYZ");
-	$rs = $db->Execute('update ADOXYZ set id=id+1');	
-	if (!is_object($rs)) {
-		print_r($rs);
-		err("Update should return object");
-	}
-	if (!$rs) err("Update generated error");
-	
-	$nrows = $db->Affected_Rows();   
-	if ($nrows === false) print "
    Affected_Rows() not supported
    ";
-	else if ($nrows != $cnt)  print "
    Affected_Rows() Error: $nrows returned (should be 50) 
    ";
-	else print "
    Affected_Rows() passed
    ";
-	}
-	$db->debug = false;
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- //////////////////////////////////////////////////////////////////////////////////////////
-	
-	$rs = $db->Execute("select * from ADOXYZ where firstname = 'not known'");
-	if (!$rs ||  !$rs->EOF) print "
    Error on empty recordset
    ";
-	else if ($rs->RecordCount() != 0) {
-		print "
    Error on RecordCount. Should be 0. Was ".$rs->RecordCount()."
    "; 
-		print_r($rs->fields);
-	}
-	if ($db->databaseType !== 'odbc') {
-		$rs = &$db->Execute("select id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
-		if ($rs) {
-			if ($rs->RecordCount() != 50) {
-				print "
    RecordCount returns ".$rs->RecordCount()."
    ";
-				$poc = $rs->PO_RecordCount('ADOXYZ');
-				if ($poc == 50) print "
         PO_RecordCount passed
    ";
-				else print "
    PO_RecordCount returns wrong value: $poc
    ";
-			} else print "
    RecordCount() passed
    ";
-			if (isset($rs->fields['firstname'])) print '
    The fields columns can be indexed by column name.
    ';
-			else {
-				Err( '
    The fields columns cannot be indexed by column name.
    ');
-				print_r($rs->fields);
-			}
-			if (empty($HTTP_GET_VARS['hide'])) rs2html($rs);
-		}
-		else print "Error in Execute of SELECT with random
    ";
-	}
-	$val = $db->GetOne("select count(*) from ADOXYZ");
-	 if ($val == 50) print "
    GetOne returns ok
    ";
-	 else print "
    Fail: GetOne returns $val
    ";
-
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$val = $db->GetRow("select count(*) from ADOXYZ");
-	 if ($val[0] == 50 and sizeof($val) == 1) print "
    GetRow returns ok
    ";
-	 else {
-	 	print_r($val);
-	 	print "
    Fail: GetRow returns {$val[0]}
    ";
-	}
-
-	print "
    FetchObject/FetchNextObject Test
    ";
-	$rs = &$db->Execute('select * from ADOXYZ');
-	
-	if (empty($rs->connection)) print "Connection object missing from recordset
    ";
-	
-	while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
-		if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
-			print_r($o);
-			print "
    Firstname is not string
    ";
-			break;
-		}
-	}
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	print "
    FetchObject/FetchNextObject Test 2
    ";
-	
-	$rs = &$db->Execute('select * from ADOXYZ');
-	if (empty($rs->connection)) print "Connection object missing from recordset
    ";
-	print_r($rs->fields);
-	while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
-		if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
-			print_r($o);
-			print "
    Firstname is not string
    ";
-			break;
-		}
-	}
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	$savefetch = $ADODB_FETCH_MODE;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	
-	print "
    CacheSelectLimit  Test
    ";
-	$db->debug=1;
-	$rs = $db->CacheSelectLimit('  select  id, firstname from  ADOXYZ order by id',2);
-	if ($rs && !$rs->EOF) {
-		if (isset($rs->fields[0])) {
-			Err("ASSOC has numeric fields");
-			print_r($rs->fields);
-		}
-		if ($rs->fields['id'] != 1)  {Err("Error"); print_r($rs->fields);};
-		if (trim($rs->fields['firstname']) != 'Caroline')  {print Err("Error 2"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if ($rs->fields['id'] != 2)  {Err("Error 3"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if (!$rs->EOF) {
-			Err("Error EOF");
-			print_r($rs);
-		}
-	}
-	
-	print "
    FETCH_MODE = ASSOC: Should get 1, Caroline
    ";
-	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',2);
-	if ($rs && !$rs->EOF) {
-		if ($rs->fields['id'] != 1)  {Err("Error 1"); print_r($rs->fields);};
-		if (trim($rs->fields['firstname']) != 'Caroline')  {Err("Error 2"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if ($rs->fields['id'] != 2)  {Err("Error 3"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if (!$rs->EOF) Err("Error EOF");
-		else if (is_array($rs->fields) || $rs->fields) {
-			Err("Error: ## fields should be set to false on EOF");
-			print_r($rs->fields);
-		}
-	}
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	print "
    FETCH_MODE = NUM: Should get 1, Caroline
    ";
-	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		if (isset($rs->fields['id'])) Err("FETCH_NUM has ASSOC fields");
-		if ($rs->fields[0] != 1)  {Err("Error 1"); print_r($rs->fields);};
-		if (trim($rs->fields[1]) != 'Caroline')  {Err("Error 2");print_r($rs->fields);};
-		$rs->MoveNext();
-		if (!$rs->EOF) Err("Error EOF");
-
-	}
-	$ADODB_FETCH_MODE = $savefetch;
-	
-	$db->debug = false;
-	print "
    GetRowAssoc Upper: Should get 1, Caroline
    ";
-	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		$arr = &$rs->GetRowAssoc();
-		if ($arr['ID'] != 1) {Err("Error 1");print_r($arr);};
-		if (trim($arr['FIRSTNAME']) != 'Caroline') {Err("Error 2"); print_r($arr);};
-		$rs->MoveNext();
-		if (!$rs->EOF) Err("Error EOF");
-
-	}
-	print "
    GetRowAssoc Lower: Should get 1, Caroline
    ";
-	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		$arr = &$rs->GetRowAssoc(false);
-		if ($arr['id'] != 1) {Err("Error 1"); print_r($arr);};
-		if (trim($arr['firstname']) != 'Caroline') {Err("Error 2"); print_r($arr);};
-
-	}
-	
-	print "
    GetCol Test
    ";
-	$col = $db->GetCol('select distinct firstname from adoxyz order by 1');
-	if (!is_array($col)) Err("Col size is wrong");
-	if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col elements wrong");
-
-	$db->debug = true;
-	print "
    SelectLimit Distinct Test 1: Should see Caroline, John and Mary
    ";
-	$rs = &$db->SelectLimit('select distinct * from ADOXYZ order by id',3);
-	$db->debug=false;
-
-	if ($rs && !$rs->EOF) {
-		if (trim($rs->fields[1]) != 'Caroline') Err("Error 1");
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'John') Err("Error 2");
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'Mary') Err("Error 3");
-		$rs->MoveNext();
-		if (! $rs->EOF) Err("Error EOF");
-		//rs2html($rs);
-	} else Err("Failed SelectLimit Test 1");
-	
-	print "
    SelectLimit Test 2: Should see Mary, George and Mr. Alan
    ";
-	$rs = &$db->SelectLimit('select * from ADOXYZ order by id',3,2);
-	if ($rs && !$rs->EOF) {
-		if (trim($rs->fields[1]) != 'Mary') Err("Error 1");
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'George')Err("Error 2");
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3");
-		$rs->MoveNext();
-		if (! $rs->EOF) Err("Error EOF");
-	//	rs2html($rs);
-	}
-	 else Err("Failed SelectLimit Test 2");
-	
-	print "
    SelectLimit Test 3: Should see Wai Hun and Steven
    ";
-	$db->debug=1;
-	global $A; $A=1;
-	$rs = &$db->SelectLimit('select * from ADOXYZ order by id',-1,48);
-	$A=0;
-	if ($rs && !$rs->EOF) {
-		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
-		if (trim($rs->fields[1]) != 'Wai Hun') Err("Error 1 ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'Steven') Err("Error 2 ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (! $rs->EOF) {
-			Err("Error EOF");
-		}
-		//rs2html($rs);
-	}
-	 else Err("Failed SelectLimit Test 3");
-		$db->debug = false;
-	
-	
-	$rs = &$db->Execute("select * from ADOXYZ order by id");
-	print "
    Testing Move()
    ";	
-	if (!$rs)Err( "Failed Move SELECT");
-	else {
-		if (!$rs->Move(2)) {
-			if (!$rs->canSeek) print "
    $db->databaseType: Move(), MoveFirst() nor MoveLast() not supported.
    ";
-			else print '
    RecordSet->canSeek property should be set to false
    ';
-		} else {
-			$rs->MoveFirst();
-			if (trim($rs->Fields("firstname")) != 'Caroline') {
-				print "
    $db->databaseType: MoveFirst failed -- probably cannot scroll backwards
    ";
-			}
-			else print "MoveFirst() OK
    ";
-						
-						// Move(3) tests error handling -- MoveFirst should not move cursor
-			$rs->Move(3);
-			if (trim($rs->Fields("firstname")) != 'George') {
-				print '
    '.$rs->Fields("id")."$db->databaseType: Move(3) failed
    ";
-			} else print "Move(3) OK
    ";
-						
-			$rs->Move(7);
-			if (trim($rs->Fields("firstname")) != 'Yat Sun') {
-				print '
    '.$rs->Fields("id")."$db->databaseType: Move(7) failed
    ";
-				print_r($rs);
-			} else print "Move(7) OK
    ";
-			if ($rs->EOF) Err("Move(7) is EOF already");
-			$rs->MoveLast();
-			if (trim($rs->Fields("firstname")) != 'Steven'){
-				 print '
    '.$rs->Fields("id")."$db->databaseType: MoveLast() failed
    ";
-				 print_r($rs);
-			}else print "MoveLast() OK
    ";
-			$rs->MoveNext();
-			if (!$rs->EOF) err("Bad MoveNext");
-			if ($rs->canSeek) {
-				$rs->Move(3);
-				if (trim($rs->Fields("firstname")) != 'George') {
-					print '
    '.$rs->Fields("id")."$db->databaseType: Move(3) after MoveLast failed
    ";
-					
-				} else print "Move(3) after MoveLast() OK
    ";
-			}
-			
-			print "
    Empty Move Test";
-			$rs = $db->Execute("select * from ADOXYZ where id > 0 and id < 0");
-			$rs->MoveFirst();
-			if (!$rs->EOF || $rs->fields) Err("Error in empty move first");
-		}
-	}
-	
-	$rs = $db->Execute('select * from ADOXYZ where id = 2');
-	if ($rs->EOF || !is_array($rs->fields)) Err("Error in select");
-	$rs->MoveNext();
-	if (!$rs->EOF) Err("Error in EOF (xx) ");
- //	$db->debug=true;
-	print "
    Testing ADODB_FETCH_ASSOC and concat: concat firstname and lastname
    ";
-
-	$save = $ADODB_FETCH_MODE;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	if ($db->dataProvider == 'postgres') {
-		$sql = "select ".$db->Concat('cast(firstname as varchar)',$db->qstr(' '),'lastname')." as fullname,id from ADOXYZ";
-		$rs = &$db->Execute($sql);
-	} else {
-		$sql = "select distinct ".$db->Concat('firstname',$db->qstr(' '),'lastname')." as fullname,id from ADOXYZ";
-		$rs = &$db->Execute($sql);
-	}
-	if ($rs) {
-		if (empty($HTTP_GET_VARS['hide'])) rs2html($rs);
-	} else {
-		Err( "Failed Concat:".$sql);
-	}
-	$ADODB_FETCH_MODE = $save;
-	print "
    Testing GetArray() ";
-	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	
-	$rs = &$db->Execute("select * from ADOXYZ order by id");
-	if ($rs) {
-		$arr = &$rs->GetArray(10);
-		if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' || trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]."   ERROR
    ";
-		else print " OK
    ";
-	}
-	
-	$arr = $db->GetArray("select x from ADOXYZ");
-	$e = $db->ErrorMsg(); $e2 = $db->ErrorNo();
-	echo "Testing error handling, should see illegal column 'x' error=$e ($e2) 
    ";
-	if (!$e || !$e2) Err("Error handling did not work");
-	print "Testing FetchNextObject for 1 object ";
-	$rs = &$db->Execute("select distinct lastname,firstname from ADOXYZ where firstname='Caroline'");
-	$fcnt = 0;
-	if ($rs)
-	while ($o = $rs->FetchNextObject()) {
-		$fcnt += 1;	
-	}
-	if ($fcnt == 1) print " OK
    ";
-	else print "FAILED
    ";
-	
-	$stmt = $db->Prepare("select * from ADOXYZ where id < 3");
-	$rs = $db->Execute($stmt);
-	if (!$rs) Err("Prepare failed");
-	else {
-		$arr = $rs->GetArray();
-		if (!$arr) Err("Prepare failed 2");
-		if (sizeof($arr) != 2) Err("Prepare failed 3");
-	}
-	print "Testing GetAssoc() ";
-	$savecrecs = $ADODB_COUNTRECS;
-	$ADODB_COUNTRECS = false;
-	$rs = &$db->Execute("select distinct lastname,firstname from ADOXYZ");
-	if ($rs) {
-		$arr = $rs->GetAssoc();
-		//print_r($arr);
-		if (trim($arr['See']) != 'Wai Hun') print $arr['See']."   ERROR
    ";
-		else print " OK 1";
-	}
-	
-	$arr = &$db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
-	if ($arr) {
-		//print_r($arr);
-		if (trim($arr['See']) != 'Wai Hun') print $arr['See']."   ERROR
    ";
-		else print " OK 2
    ";
-	}
-	// Comment this out to test countrecs = false
-	$ADODB_COUNTRECS = $savecrecs;
-	
-	for ($loop=0; $loop < 1; $loop++) {
-	print "Testing GetMenu() and CacheExecute
    ";
-	$db->debug = true;
-	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	
-	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu('menu','Steven').'
    '; 
-	else print " Fail
    ";
-	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	
-	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu('menu','Steven',false).'
    ';
-	else print " Fail
    ";
-	
-	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'
    ';
-	else print " Fail
    ";
-	print '
    ';
-	
-	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) {
-		print ' Multiple, Alan and George selected: '. $rs->GetMenu('menu',array('Alan','George'),false,true);
-		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
-	} else print " Fail
    ";
-	print '
    ';
-	
-	print "Testing GetMenu2() 
    ";
-	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu2('menu',('Oey')).'
    '; 
-	else print " Fail
    ";
-	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu2('menu',('Oey'),false).'
    ';
-	else print " Fail
    ";
-	}
-	
-	$db->debug = false;
-	
-	// phplens
-	
-	$sql = 'select * from ADOXYZ where 0=1';
-	echo "
    **Testing '$sql' (phplens compat 1)
    ";
-	$rs = &$db->Execute($sql);
-	if (!$rs) err( "No recordset returned for '$sql'");
-	if (!$rs->FieldCount()) err( "No fields returned for $sql");
-	if (!$rs->FetchField(1)) err( "FetchField failed for $sql");
-	
-	$sql = 'select * from ADOXYZ order by 1';
-	echo "
    **Testing '$sql' (phplens compat 2)
    ";
-	$rs = &$db->Execute($sql);
-	if (!$rs) err( "No recordset returned for '$sql'
    ".$db->ErrorMsg()."    ");
-	
-	
-	$sql = 'select * from ADOXYZ order by 1,1';
-	echo "
    **Testing '$sql' (phplens compat 3)
    ";
-	$rs = &$db->Execute($sql);
-	if (!$rs) err( "No recordset returned for '$sql'
    ".$db->ErrorMsg()."    ");
-	
-	
-	// Move
-	$rs1 = &$db->Execute("select id from ADOXYZ where id <= 2 order by 1");
-	$rs2 = &$db->Execute("select id from ADOXYZ where id = 3 or id = 4 order by 1");
-
-	if ($rs1) $rs1->MoveLast();
-	if ($rs2) $rs2->MoveLast();
-	
-	if (empty($rs1) || empty($rs2) || $rs1->fields[0] != 2 || $rs2->fields[0] != 4) {
-		$a = $rs1->fields[0];
-		$b = $rs2->fields[0];
-		print "
    Error in multiple recordset test rs1=$a rs2=$b (should be rs1=2 rs2=4)
    ";
-	} else
-		print "
    Testing multiple recordsets OK
    ";
-		
-	
-	echo "
     GenID test: ";
-	for ($i=1; $i <= 10; $i++) 
-		echo  "($i: ",$val = $db->GenID($db->databaseType.'abcseq6' ,5), ") ";
-	if ($val == 0) Err("GenID not supported");
-	
-	if ($val) {
-		$db->DropSequence('abc_seq2');
-		$db->CreateSequence('abc_seq2');
-		$val = $db->GenID('abc_seq2');
-		$db->DropSequence('abc_seq2');
-		$db->CreateSequence('abc_seq2');
-		$val = $db->GenID('abc_seq2');
-		if ($val != 1) Err("Drop and Create Sequence not supported ($val)");
-	}
-	echo "
    ";
-	
-	if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
-		$sql = "select firstnames from adoxyz";
-		print "
    Testing execution of illegal statement: $sql
    ";
-		if ($db->Execute($sql) === false) {
-			print "
    This returns the following ErrorMsg(): ".$db->ErrorMsg()." and ErrorNo(): ".$db->ErrorNo().'
    ';
-		} else 
-			print "
    Error in error handling -- Execute() should return false
    ";
-	} else 
-		print "
    ADO skipped error handling of bad select statement
    ";
-	
-	print "
    ASSOC TEST 2
    ";
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->query('select * from adoxyz order by id');
-	if ($ee = $db->ErrorMsg()) {
-		Err("Error message=$ee");
-	}
-	if ($ee = $db->ErrorNo()) {
-		Err("Error No = $ee");
-	}
-	print_r($rs->fields);
-	for($i=0;$i<$rs->FieldCount();$i++) 
-	{ 
-		$fld=$rs->FetchField($i); 
-		print "
     Field name is ".$fld->name; 
-		print " ".$rs->Fields($fld->name); 
-	} 
-
-		
-	print "
    BOTH TEST 2
    ";
-	if ($db->dataProvider == 'ado') {
-		print "ADODB_FETCH_BOTH not supported for dataProvider=".$db->dataProvider."
    ";
-	} else {
-		$ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
-		$rs = $db->query('select * from adoxyz order by id');
-		for($i=0;$i<$rs->FieldCount();$i++) 
-		{ 
-			$fld=$rs->FetchField($i); 
-			print "
     Field name is ".$fld->name; 
-			print " ".$rs->Fields($fld->name); 
-		} 
-	}
-	
-	print "
    NUM TEST 2
    ";
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$rs = $db->query('select * from adoxyz order by id');
-	for($i=0;$i<$rs->FieldCount();$i++) 
-	{ 
-		$fld=$rs->FetchField($i); 
-		print "
     Field name is ".$fld->name; 
-		print " ".$rs->Fields($fld->name); 
-	} 
-	
-	print "
    ASSOC Test of SelectLimit
    ";
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->selectlimit('select * from adoxyz order by id',3,4);
-	$cnt = 0;
-	while ($rs && !$rs->EOF) {
-		$cnt += 1;
-		if (!isset($rs->fields['firstname'])) {
-			print "
    ASSOC returned numeric field
    ";
-			break;
-		}
-		$rs->MoveNext();
-	}
-	if ($cnt != 3) print "
    Count should be 3, instead it was $cnt
    ";
-	
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	if ($db->sysDate) {
-		$saved = $db->debug;
-		$db->debug = 1;
-		$rs = $db->Execute("select {$db->sysDate} from adoxyz where id=1");
-		if (ADORecordSet::UnixDate(date('Y-m-d')) != $rs->UnixDate($rs->fields[0])) {
-			print "
    Invalid date {$rs->fields[0]}
    ";
-		} else
-			print "
    Passed \$sysDate test ({$rs->fields[0]})
    ";
-		
-		print_r($rs->FetchField(0));
-		print time();
-		$db->debug=$saved;
-	} else {
-		print "
    \$db->sysDate not defined
    ";
-	}
-
-	print "
    Test CSV
    ";
-	include_once('../toexport.inc.php');
-	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' he,\'"\' q  from adoxyz',10);	
-	
-	print "
    ";
-	print rs2csv($rs);
-	print "
    ";
-	
-	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'The	"young man", he said\' from adoxyz',10);	
-	
-	print "
    ";
-	rs2tabout($rs);
-	print "
    ";
-	
-	//print " CacheFlush ";
-	//$db->CacheFlush();
-	
-	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A');
-	$sql = "SELECT $date from ADOXYZ";
-	print "
    Test SQLDate: ".htmlspecialchars($sql)."
    ";
-	$rs = $db->SelectLimit($sql,1);
-	$d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
-	if (!$rs) Err("SQLDate query returned no recordset");
-	else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: 
    act:$d 
    sql:".$rs->fields[0]);
-	
-	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
-	$sql = "SELECT $date from ADOXYZ";
-	print "
    Test SQLDate: ".htmlspecialchars($sql)."
    ";
-	$rs = $db->SelectLimit($sql,1);
-	$ts = ADOConnection::UnixDate('1974-02-25');
-	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
-	if (!$rs) Err("SQLDate query returned no recordset");
-	else if ($d != $rs->fields[0]) Err("SQLDate 2 failed expected: 
    act:$d 
    sql:".$rs->fields[0]);
-	
-	
-	print "
    Test Filter
    ";
-	$db->debug = 1;
-	
-	$rs = $db->SelectLimit('select * from ADOXYZ where id < 3 order by id');
-	
-	$rs = RSFilter($rs,'do_strtolower');
-	if (trim($rs->fields[1]) != 'caroline'  && trim($rs->fields[2]) != 'miranda') {
-		err('**** RSFilter failed');
-		print_r($rs->fields);
-	}
-	
-	rs2html($rs);
-		
-	$db->debug=1;
-	
-	
-	print "
    Test Replace
    ";
-	
-	$ret = $db->Replace('adoxyz', 
-		array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
-		array('id'),
-		$autoq = true);
-	if (!$ret) echo "
    Error in replacing existing record
    ";
-	else {
-		$saved = $db->debug;
-		$db->debug = 0;
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = true;
-		$rs = $db->Execute('select * FROM ADOXYZ where id=1');
-		$db->debug = $saved;
-		if ($rs->RecordCount() != 1) {
-			$cnt = $rs->RecordCount();
-			rs2html($rs);
-			print "Error - Replace failed, count=$cnt
    ";
-		}
-		$ADODB_COUNTRECS = $savec;
-	}
-	$ret = $db->Replace('adoxyz', 
-		array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
-		array('id','firstname'),
-		$autoq = true);
-	if ($ret != 2) print "Replace failed: ";
-	print "test A return value=$ret (2 expected) 
    ";
-	
-	$ret = $db->Replace('adoxyz', 
-		array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
-		'id',
-		$autoq = true);
-	if ($ret != 1) 
-		if ($db->dataProvider == 'ibase' && $ret == 2);
-		else print "Replace failed: ";
-	print "test B return value=$ret (1 or if ibase then 2 expected) 
    ";
-	
-	print "
    rs2rs Test
    ";
-	
-	$rs = $db->Execute('select * from adoxyz order by id');
-	$rs = $db->_rs2rs($rs);
-	$rs->valueX = 'X';
-	$rs->MoveNext();
-	$rs = $db->_rs2rs($rs);
-	if (!isset($rs->valueX)) err("rs2rs does not preserve array recordsets");
-	if (reset($rs->fields) != 1) err("rs2rs does not move to first row");
-
-	/////////////////////////////////////////////////////////////
-	include_once('../pivottable.inc.php');
-	print "
    Pivot Test
    ";
-	$db->debug=true;
- 	$sql = PivotTableSQL(
- 		$db,  			# adodb connection
- 		'adoxyz',  		# tables
-		'firstname',	# row fields
-		'lastname',		# column fields 
-		false,			# join
-		'ID', 			# sum
-		'Sum ',			# label for sum
-		'sum',			# aggregate function
-		true
-	);
-	$rs = $db->Execute($sql);
-	if ($rs) rs2html($rs);
-	else Err("Pivot sql error");
-	
-	$db->debug=false;
-	include_once "PEAR.php";
-	
-	// PEAR TESTS BELOW
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$pear = true;
-	$rs = $db->query('select * from adoxyz where id>0 and id<10 order by id');
-	
-	$i = 0;
-	if ($rs && !$rs->EOF) {
-		while ($arr = $rs->fetchRow()) {
-			$i++;
-			//print "$i ";
-			if ($arr[0] != $i) {
-				print_r($arr);
-				print "
    PEAR DB emulation error 1.
    ";
-				$pear = false;
-				break;
-			}
-		}
-		$rs->Close();
-	}
-	
-	
-	if ($i != $db->GetOne('select count(*) from adoxyz where id>0 and id<10')) {
-		print "
    PEAR DB emulation error 1.1 EOF ($i)
    ";
-		$pear = false;
-	}
-	
-	$rs = $db->limitQuery('select * from adoxyz where id>0 order by id',$i=3,$top=3);
-	$i2 = $i;
-	if ($rs && !$rs->EOF) {
-
-		while (!is_object($rs->fetchInto($arr))) {
-			$i2++;
-			
-	//			print_r($arr);
-	//		print "$i ";print_r($arr);
-			if ($arr[0] != $i2) {
-				print "
    PEAR DB emulation error 2.
    ";
-				$pear = false;
-				break;
-			}
-		}
-		$rs->Close();
-	}
-	if ($i2 != $i+$top) {
-		print "
    PEAR DB emulation error 2.1 EOF (correct=$i+$top, actual=$i2)
    ";
-		$pear = false;
-	}
-	
-	if ($pear) print "
    PEAR DB emulation passed.
    ";
-	
-	$rs = $db->SelectLimit("select ".$db->sysDate." from adoxyz",1);
-	$date = $rs->fields[0];
-	if (!$date) Err("Bad sysDate");
-	else {
-		$ds = $db->UserDate($date,"d m Y");
-		if ($ds != date("d m Y")) Err("Bad UserDate: ".$ds);
-		else echo "Passed UserDate: $ds
    ";
-	}
-	$db->debug=1;
-	if ($db->dataProvider == 'oci8') 
-		$rs = $db->SelectLimit("select to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from adoxyz",1);
-	else 
-		$rs = $db->SelectLimit("select ".$db->sysTimeStamp." from adoxyz",1);
-	$date = $rs->fields[0];
-	if (!$date) Err("Bad sysTimeStamp");
-	else {
-		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
-		if ($ds != date("H \\h\\r\\s-d m Y")) Err("Bad UserTimeStamp: ".$ds.", correct is ".date("H \\h\\r\\s-d m Y"));
-		else echo "Passed UserTimeStamp: $ds
    ";
-		
-		$date = 100;
-		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
-		$ds2 = date("H \\h\\r\\s-d m Y",$date);
-		if ($ds != $ds2) Err("Bad UserTimeStamp 2: $ds: $ds2");
-		else echo "Passed UserTimeStamp 2: $ds
    ";
-	}
-	if ($db->hasTransactions) {
-		//$db->debug=1;
-		echo "
    Testing StartTrans CompleteTrans
    ";
-		$db->raiseErrorFn = false;
-		$db->StartTrans();
-		$rs = $db->Execute('select * from notable');
-			$db->StartTrans();
-				$db->BeginTrans();
-			$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
-				$db->CommitTrans();
-			$db->CompleteTrans();
-		$rez = $db->CompleteTrans();
-		if ($rez !== false) {
-			if (is_null($rez)) Err("Error: _transOK not modified");
-			else Err("Error: CompleteTrans (1) should have failed");
-		} else {
-			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
-			if ($name == "Carolx") Err("Error: CompleteTrans (2) should have failed");
-			else echo "
     -- Passed StartTrans test1 - rolling back
    ";
-		}
-		
-		$db->StartTrans();
-			$db->BeginTrans();
-		$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
-			$db->RollbackTrans();
-		$rez = $db->CompleteTrans();
-		if ($rez !== true) Err("Error: CompleteTrans (1) should have succeeded");
-		else {
-			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
-			if (trim($name) != "Carolx") Err("Error: CompleteTrans (2) should have succeeded, returned name=$name");
-			else echo "
     -- Passed StartTrans test2 - commiting
    ";
-		}
-	}
-	
-	
-	global $TESTERRS;
-	$debugerr = true;
-	
-	global $ADODB_LANG;$ADODB_LANG = 'fr';
-	$db->debug = false;
-	$TESTERRS = 0;
-	$db->raiseErrorFn = 'adodb_test_err';
-	global $ERRNO; // from adodb_test_err
-	$db->Execute('select * from nowhere');
-	$metae = $db->MetaError($ERRNO);
-	if ($metae !== DB_ERROR_NOSUCHTABLE) print "
    MetaError=".$metae." wrong, should be ".DB_ERROR_NOSUCHTABLE."
    ";
-	else print "
    MetaError ok (".DB_ERROR_NOSUCHTABLE."): ".$db->MetaErrorMsg($metae)."
    ";
-	if ($TESTERRS != 1) print "raiseErrorFn select nowhere failed
    ";
-	$rs = $db->Execute('select * from adoxyz');
-	if ($debugerr) print " Move";
-	$rs->Move(100);
-	$rs->_queryID = false;
-	if ($debugerr) print " MoveNext";
-	$rs->MoveNext();
-	if ($debugerr) print " $rs=false";
-	$rs = false;
-
-	print "
    SetFetchMode() tests
    ";
-	$db->SetFetchMode(ADODB_FETCH_ASSOC);
-	$rs = $db->SelectLimit('select firstname from adoxyz',1);
-	//	var_dump($rs->fields);
-	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;	
-	$rs = $db->SelectLimit('select firstname from adoxyz',1);
-	//var_dump($rs->fields);
-	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;	
-	$db->SetFetchMode(ADODB_FETCH_NUM);
-	$rs = $db->SelectLimit('select firstname from adoxyz',1);
-	if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
-	
-	print "
    Test MetaTables again with SetFetchMode()
    ";
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$db->SetFetchMode(ADODB_FETCH_ASSOC);
-	print_r($db->MetaTables());
-	print "
    ";
-	////////////////////////////////////////////////////////////////////
-	
-	$conn = NewADOConnection($db->databaseType);
-	$conn->raiseErrorFn = 'adodb_test_err';
-	@$conn->Connect('abc');
-	if ($TESTERRS == 2) print "raiseErrorFn tests passed
    ";
-	else print "raiseErrorFn tests failed ($TESTERRS)
    ";
-	
-	
-	////////////////////////////////////////////////////////////////////
-	
-	global $nocountrecs;
-	
-	if (isset($nocountrecs) && $ADODB_COUNTRECS) err("Error: \$ADODB_COUNTRECS is set");
-	if (empty($nocountrecs) && $ADODB_COUNTRECS==false) err("Error: \$ADODB_COUNTRECS is not set");
-
-	
-?>
-	
    
-	
     
    
-	
    
-Close();
-	if ($rs2) $rs2->Close();
-	if ($rs) $rs->Close();
-	$db->Close();
-	
-	if ($db->transCnt != 0) Err("Error in transCnt=$db->transCnt (should be 0)");
-	
-	
-	printf("
    Total queries=%d; total cached=%d
    ",$EXECS+$CACHED, $CACHED);
-}
-
-function adodb_test_err($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
-{
-global $TESTERRS,$ERRNO;
-
-	$ERRNO = $errno;
-	$TESTERRS += 1;
-	print "** $dbms ($fn): errno=$errno   errmsg=$errmsg ($p1,$p2)
    ";
-}
-
-//--------------------------------------------------------------------------------------
-
-
-set_time_limit(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-include("../rsfilter.inc.php");
-
-/* White Space Check */
-if (@$HTTP_SERVER_VARS['COMPUTERNAME'] == 'TIGRESS') {
-	CheckWS('mysqlt');
-	CheckWS('postgres');
-	CheckWS('oci8po');
-	CheckWS('firebird');
-	CheckWS('sybase');
-	CheckWS('informix');
-	CheckWS('ado_mssql');
-	CheckWS('ado_access');
-	CheckWS('mssql');
-	//
-	CheckWS('vfp');
-	CheckWS('sqlanywhere');
-	CheckWS('db2');
-	CheckWS('access');
-	CheckWS('odbc_mssql');
-	//
-	CheckWS('oracle');
-	CheckWS('proxy');
-	CheckWS('fbsql');
-	print "White Space Check complete
    ";
-}
-if (sizeof($HTTP_GET_VARS) == 0) $testmysql = true;
-
-
-foreach($HTTP_GET_VARS as $k=>$v)  {
-	//global $$k;
-	$$k = $v;
-}	
-if (strpos(PHP_VERSION,'5') === 0) {
-	//$testaccess=1;
-	//$testmssql = 1;
-	//$testsqlite=1;
-}
-?>
-
-ADODB Testing
-
-
    ADODB Test
    
-
-This script tests the following databases: Interbase, Oracle, Visual FoxPro, Microsoft Access (ODBC and ADO), MySQL, MSSQL (ODBC, native, ADO). 
-There is also support for Sybase, PostgreSQL.
    
-For the latest version of ADODB, visit     php.weblogs.com.
    
-
-Test GetInsertSQL/GetUpdateSQL   
-	Sessions  
-	Paging  
-	Perf Monitor
    
-
-	
-
-
    ADODB Database Library  (c) 2000-2004 John Lim. All rights reserved. Released under BSD and LGPL.
    
-
-
+$msg
    ";
+	flush();
+}
+
+function CheckWS($conn)
+{
+global $ADODB_EXTENSION;
+
+	include_once('../session/adodb-session.php');
+	
+	$saved = $ADODB_EXTENSION;
+	$db = ADONewConnection($conn);
+	$ADODB_EXTENSION = $saved;
+	if (headers_sent()) {
+		print "
    White space detected in adodb-$conn.inc.php or include file...
    ";
+		die();
+	}
+}
+
+function do_strtolower(&$arr)
+{
+	foreach($arr as $k => $v) {
+		$arr[$k] = strtolower($v);
+	}
+}
+
+
+function CountExecs($db, $sql, $inputarray)
+{
+global $EXECS;  $EXECS++;
+}
+
+function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
+{
+global $CACHED; $CACHED++;
+}
+
+// the table creation code is specific to the database, so we allow the user 
+// to define their own table creation stuff
+
+function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
+{
+GLOBAL $ADODB_vers,$ADODB_CACHE_DIR,$ADODB_FETCH_MODE, $HTTP_GET_VARS,$ADODB_COUNTRECS;
+
+?>	
    
+	
    
+	
     
    
+	
    
+Execute('select lastname,firstname,lastname,id from adoxyz');
+	$arr = $rs->GetAssoc();
+	echo "
    ";print_r($arr);
+	die();*/
+	
+	GLOBAL $EXECS, $CACHED;
+	
+	$EXECS = 0;
+	$CACHED = 0;
+	if ((rand()%3) == 0) @$db->Execute("delete from adodb_logsql");
+	$db->debug=1;
+	
+	$db->fnExecute = 'CountExecs';
+	$db->fnCacheExecute = 'CountCachedExecs';
+	
+	if (empty($_GET['nolog'])) {
+		echo "
    SQL Logging enabled
    ";
+		$db->LogSQL();/*
+		$sql =
+"SELECT t1.sid, t1.sid, t1.title, t1.hometext, t1.notes, t1.aid, t1.informant, 
+t2.url, t2.email, t1.catid, t3.title, t1.topic, t4.topicname, t4.topicimage, 
+t4.topictext, t1.score, t1.ratings, t1.counter, t1.comments, t1.acomm 
+FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_topics` `t4` 
+	WHERE ((t2.aid=t1.aid) AND (t3.catid=t1.catid) AND (t4.topicid=t1.topic) 
+	AND ((t1.alanguage='german') OR (t1.alanguage='')) AND (t1.ihome='0')) 
+	ORDER BY t1.time DESC";
+		$db->SelectLimit($sql);
+		echo $db->ErrorMsg();*/
+	}
+	$ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
+	$db->debug = false;
+	
+	//print $db->UnixTimeStamp('2003-7-22 23:00:00');
+	
+	$phpv = phpversion();
+	if (defined('ADODB_EXTENSION')) $ext = '   Extension '.ADODB_EXTENSION.' installed';
+	else $ext = '';
+	print "
    ADODB Version: $ADODB_vers Host: $db->host   Database: $db->database   PHP: $phpv $ext
    ";
+	flush();
+	$arr = $db->ServerInfo();
+	print_r($arr);
+	echo "
    ";
+	$e = error_reporting(E_ALL-E_WARNING);
+	flush();
+	print "date1 (1969-02-20) = ".$db->DBDate('1969-2-20');
+	print "
    date1 (1999-02-20) = ".$db->DBDate('1999-2-20');
+	print "
    date1.1 1999 = ".$db->DBDate("'1999'");
+	print "
    date2 (1970-1-2) = ".$db->DBDate(24*3600)."
    ";
+	print "ts1 (1999-02-20 13:40:50) = ".$db->DBTimeStamp('1999-2-20 1:40:50 pm');
+	print "
    ts1.1 (1999-02-20 13:40:00) = ".$db->DBTimeStamp('1999-2-20 13:40');
+	print "
    ts2 (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
+	print "
    ts3 (1970-1-2 +/- timezone) = ".$db->DBTimeStamp(24*3600);
+	print "
     Fractional TS (1999-2-20 13:40:50.91): ".$db->DBTimeStamp($db->UnixTimeStamp('1999-2-20 13:40:50.91+1'));
+	 $dd = $db->UnixDate('1999-02-20');
+	print "
    unixdate 1999-02-20 = ".date('Y-m-d',$dd)."
    ";
+	print "
    ts4 =".($db->UnixTimeStamp("19700101000101")+8*3600);
+	print "
    ts5 =".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
+	print "
    ts6 =".$db->UserTimeStamp("20040110092123");
+	print "
    ts6 =".$db->DBTimeStamp("20040110092123");
+	flush();
+	// mssql too slow in failing bad connection
+	if (false && $db->databaseType != 'mssql') {
+		print "
    Testing bad connection. Ignore following error msgs:
    ";
+		$db2 = ADONewConnection();
+		$rez = $db2->Connect("bad connection");
+		$err = $db2->ErrorMsg();
+		print "Error='$err'
    ";
+		if ($rez) print "Cannot check if connection failed. The Connect() function returned true.
    ";
+	}
+	error_reporting($e);
+	flush();
+	
+	//$ADODB_COUNTRECS=false;
+	$rs=$db->Execute('select * from adoxyz order by id');
+
+	//print_r($rs);
+	//OCIFetchStatement($rs->_queryID,$rez,0,-1);//,OCI_ASSOC | OCI_FETCHSTATEMENT_BY_ROW);
+	//print_r($rez);
+	//die();
+	if($rs === false) $create = true;
+	else $rs->Close();
+		
+	//if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
+	
+	if ($create) {
+		if (false && $db->databaseType == 'ibase') {
+			print "Please create the following table for testing:
    $createtab
    ";
+			return;
+		} else {
+			$db->debug = 1;
+			$e = error_reporting(E_ALL-E_WARNING);
+			$db->Execute($createtab);
+			error_reporting($e);
+		}
+	}
+	$rs = &$db->Execute("delete from ADOXYZ"); // some ODBC drivers will fail the drop so we delete
+	if ($rs) {
+		if(! $rs->EOF) print "Error: RecordSet returned by Execute('delete...') should show EOF
    ";
+		$rs->Close();
+	} else print "err=".$db->ErrorMsg();
+
+	print "
    Test select on empty table, FetchField when EOF, and GetInsertSQL
    ";
+	$rs = &$db->Execute("select id,firstname from ADOXYZ where id=9999");
+	if ($rs && !$rs->EOF) print "Error: RecordSet returned by Execute(select...') on empty table should show EOF
    ";
+	if ($rs->EOF && ($o = $rs->FetchField(0))) {
+		$record['id'] = 99;
+		$record['firstname'] = 'John';
+		$sql =  $db->GetInsertSQL($rs, $record);
+		if ($sql != "INSERT INTO ADOXYZ ( id, firstname ) VALUES ( 99, 'John' )") Err("GetInsertSQL does not work on empty table");
+	} else {
+		Err("FetchField does not work on empty recordset, meaning GetInsertSQL will fail...");
+	}
+	if ($rs) $rs->Close();
+	flush();
+	//$db->debug=true;	
+	print "
    Testing Commit: ";
+	$time = $db->DBDate(time());
+	if (!$db->BeginTrans()) {
+		print 'Transactions not supported
    ';
+		if ($db->hasTransactions) Err("hasTransactions should be false");
+	} else { /* COMMIT */
+		if (!$db->hasTransactions) Err("hasTransactions should be true");
+		if ($db->transCnt != 1) Err("Invalid transCnt = $db->transCnt (should be 1)");
+		$rs = $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (99,'Should Not','Exist (Commit)',$time)");
+		if ($rs && $db->CommitTrans()) {
+			$rs->Close();
+			$rs = &$db->Execute("select * from ADOXYZ where id=99");
+			if ($rs === false || $rs->EOF) {
+				print 'Data not saved
    ';
+				$rs = &$db->Execute("select * from ADOXYZ where id=99");
+				print_r($rs);
+				die();
+			} else print 'OK
    ';
+			if ($rs) $rs->Close();
+		} else {
+			if (!$rs) {
+				print "Insert failed
    ";
+				$db->RollbackTrans();
+			} else print "Commit failed
    ";
+		}
+		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
+		
+		/* ROLLBACK */	
+		if (!$db->BeginTrans()) print "
    Error in BeginTrans()
    ";
+		print "
    Testing Rollback: ";
+		$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (100,'Should Not','Exist (Rollback)',$time)");
+		if ($db->RollbackTrans()) {
+			$rs = $db->Execute("select * from ADOXYZ where id=100");
+			if ($rs && !$rs->EOF) print 'Fail: Data should rollback
    ';
+			else print 'OK
    ';
+			if ($rs) $rs->Close();
+		} else
+			print "Commit failed
    ";
+			
+		$rs = &$db->Execute('delete from ADOXYZ where id>50');
+		if ($rs) $rs->Close();
+		
+		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
+	}
+	
+	if (1) {
+		print "
    Testing MetaDatabases()
    ";
+		print_r( $db->MetaDatabases());
+		
+		print "
    Testing MetaTables() and MetaColumns()
    ";
+		$a = $db->MetaTables();
+		if ($a===false) print "MetaTables not supported
    ";
+		else {
+			print "Array of tables and views: "; 
+			foreach($a as $v) print " ($v) ";
+			print '
    ';
+		}
+		
+		$a = $db->MetaTables('VIEW');
+		if ($a===false) print "MetaTables not supported
    ";
+		else {
+			print "Array of views: "; 
+			foreach($a as $v) print " ($v) ";
+			print '
    ';
+		}
+		
+		$a = $db->MetaTables(false,false,'aDo%');
+		if ($a===false) print "MetaTables not supported
    ";
+		else {
+			print "Array of ado%: "; 
+			foreach($a as $v) print " ($v) ";
+			print '
    ';
+		}
+		
+		$a = $db->MetaTables('TABLE');
+		if ($a===false) print "MetaTables not supported
    ";
+		else {
+			print "Array of tables: "; 
+			foreach($a as $v) print " ($v) ";
+			print '
    ';
+		}
+		
+		$db->debug=1;
+		$a = $db->MetaColumns('ADOXYZ');
+		if ($a===false) print "MetaColumns not supported
    ";
+		else {
+			print "
    Columns of ADOXYZ: 
    ";
+			foreach($a as $v) {print_r($v); echo "
    ";}
+			echo "    ";
+		}
+		
+		print "
    Testing MetaIndexes
    ";
+		$a = $db->MetaIndexes('ADOXYZ',true);
+		if ($a===false) print "MetaIndexes not supported
    ";
+		else {
+			print "
    Indexes of ADOXYZ: 
    ";
+			foreach($a as $v) {print_r($v); echo "
    ";}
+			echo "    ";
+		}
+		print "
    Testing MetaPrimaryKeys
    ";
+		$a = $db->MetaPrimaryKeys('ADOXYZ');
+		var_dump($a);
+	}
+	$rs = &$db->Execute('delete from ADOXYZ');
+	if ($rs) $rs->Close();
+	
+	$db->debug = false;
+	
+	
+	switch ($db->databaseType) {
+	case 'postgres7':
+	case 'postgres64':
+	case 'postgres':
+	case 'ibase':
+		print "
    Encode=".$db->BlobEncode("abc\0d\"'
+ef")."
    ";//'
+
+		print "
    Testing Foreign Keys
    ";
+		$arr = $db->MetaForeignKeys('adoxyz',false,true);
+		print_r($arr);
+		if (!$arr) Err("Bad MetaForeignKeys");
+		break;
+	
+	case 'odbc_mssql':
+	case 'mssqlpo':
+		print "
    Testing Foreign Keys
    ";
+		$arr = $db->MetaForeignKeys('Orders',false,true);
+		print_r($arr);
+		if (!$arr) Err("Bad MetaForeignKeys");
+		if ($db->databaseType == 'odbc_mssql') break;
+	
+	case 'mssql': 
+	
+		
+/*
+ASSUME Northwind available...
+
+CREATE PROCEDURE SalesByCategory
+	@CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
+AS
+IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
+BEGIN
+	SELECT @OrdYear = '1998'
+END
+
+SELECT ProductName,
+	TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * (1-OD.Discount) * OD.UnitPrice)), 0)
+FROM [Order Details] OD, Orders O, Products P, Categories C
+WHERE OD.OrderID = O.OrderID 
+	AND OD.ProductID = P.ProductID 
+	AND P.CategoryID = C.CategoryID
+	AND C.CategoryName = @CategoryName
+	AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
+GROUP BY ProductName
+ORDER BY ProductName
+GO
+*/
+		print "
    Testing Stored Procedures for mssql
    ";
+		$saved = $db->debug;
+		$db->debug=true;
+		
+		$cat = 'Dairy Products';
+		$yr = '1998';
+		
+		$stmt = $db->PrepareSP('SalesByCategory');
+		$db->InParameter($stmt,$cat,'CategoryName');
+		$db->InParameter($stmt,$yr,'OrdYear');
+		$rs = $db->Execute($stmt);
+		rs2html($rs);
+		
+		$cat = 'Grains/Cereals';
+		$yr = 1998;
+		
+		$stmt = $db->PrepareSP('SalesByCategory');
+		$db->InParameter($stmt,$cat,'CategoryName');
+		$db->InParameter($stmt,$yr,'OrdYear');
+		$rs = $db->Execute($stmt);
+		rs2html($rs);
+		
+		/*
+		Test out params - works in 4.2.3 but not 4.3.0???:
+		
+			CREATE PROCEDURE at_date_interval 
+				@days INTEGER, 
+				@start VARCHAR(20) OUT, 
+				@end VARCHAR(20) OUT 	
+			AS 
+			BEGIN 
+				set @start = CONVERT(VARCHAR(20), getdate(), 101) 
+				set @end =CONVERT(VARCHAR(20), dateadd(day, @days, getdate()), 101 ) 
+			END
+			GO
+		*/
+		$db->debug=1;
+		$stmt = $db->PrepareSP('at_date_interval');
+		$days = 10;
+		$begin_date = '';
+		$end_date = '';
+		$db->InParameter($stmt,$days,'days', 4, SQLINT4); 
+		$db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR ); 
+		$db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR ); 
+		$db->Execute($stmt);
+		if (empty($begin_date) or empty($end_date)) {
+			Err("MSSQL SP Test for OUT Failed");
+			print "begin=$begin_date end=$end_date
    ";
+		} else print "(Today +10days) = (begin=$begin_date end=$end_date)
    ";
+	
+		$db->debug = $saved;
+		break;
+	case 'oci8': 
+	case 'oci8po':
+		$saved = $db->debug;
+		$db->debug=true;
+		
+		print "
    Testing Foreign Keys
    ";
+		$arr = $db->MetaForeignKeys('emp');
+		print_r($arr);
+		if (!$arr) Err("Bad MetaForeignKeys");
+		print "
    Testing Cursor Variables
    ";
+/*
+-- TEST PACKAGE
+CREATE OR REPLACE PACKAGE adodb AS
+TYPE TabType IS REF CURSOR RETURN tab%ROWTYPE;
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar);
+PROCEDURE data_out(input IN varchar, output OUT varchar); 
+END adodb;
+/
+
+CREATE OR REPLACE PACKAGE BODY adodb AS
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar) IS
+	BEGIN
+		OPEN tabcursor FOR SELECT * FROM tab where tname like tablenames;
+	END open_tab;
+	
+PROCEDURE data_out(input IN varchar, output OUT varchar) IS
+	BEGIN
+		output := 'Cinta Hati '||input;
+	END;
+END adodb;
+/
+*/
+		$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS,'A%'); END;");
+	
+		if ($rs && !$rs->EOF) {
+			print "Test 1 RowCount: ".$rs->RecordCount()."
    ";
+		} else {
+			print "Error in using Cursor Variables 1
    ";
+		}
+		
+		
+		print "
    Testing Stored Procedures for oci8
    ";
+		
+		$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
+		$a1 = 'Malaysia';
+		//$a2 = ''; # a2 doesn't even need to be defined!
+		$db->InParameter($stmt,$a1,'a1');
+		$db->OutParameter($stmt,$a2,'a2');
+		$rs = $db->Execute($stmt);
+		if ($rs) {
+			if ($a2 !== 'Cinta Hati Malaysia') print "Stored Procedure Error: a2 = $a2
    ";
+			else echo  "OK: a2=$a2
    ";
+		} else {
+			print "Error in using Stored Procedure IN/Out Variables
    ";
+		}
+		
+		
+		$tname = 'A%';
+		
+		$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
+		$db->Parameter($stmt,$tname,'tablename');
+		$rs = $db->Execute($stmt);
+		rs2html($rs);
+		
+		$db->debug = $saved;
+		break;
+	
+	default:
+		break;
+	}
+	$arr = array(
+		array(1,'Caroline','Miranda'),
+		array(2,'John','Lim'),
+		array(3,'Wai Hun','See')
+	);
+	$db->debug=1;
+	print "
    Testing Bulk Insert of 3 rows
    ";
+
+	$sql = "insert into ADOXYZ (id,firstname,lastname) values (".$db->Param('0').",".$db->Param('1').",".$db->Param('2').")";
+	$db->StartTrans();
+	$db->Execute($sql,$arr);
+	$db->CompleteTrans();
+	$rs = $db->Execute('select * from ADOXYZ order by id');
+	if ($rs->RecordCount() != 3) Err("Bad bulk insert");
+	rs2html($rs);
+	
+	$db->Execute('delete from ADOXYZ');
+		
+	print "
    Inserting 50 rows
    ";
+
+	for ($i = 0; $i < 5; $i++) {	
+
+	$time = $db->DBDate(time());
+	if (empty($HTTP_GET_VARS['hide'])) $db->debug = true;
+	switch($db->databaseType){
+	case 'mssqlpo':
+	case 'mssql':
+		$sqlt = "CREATE TABLE mytable (
+  row1 INT  IDENTITY(1,1) NOT NULL,
+  row2 varchar(16),
+  PRIMARY KEY  (row1))";
+  		//$db->debug=1;
+  		if (!$db->Execute("delete from mytable")) 
+			$db->Execute($sqlt);
+			
+		$ok = $db->Execute("insert into mytable (row2) values ('test')");
+		$ins_id=$db->Insert_ID();
+		echo "Insert ID=";var_dump($ins_id);
+		if ($ins_id == 0) Err("Bad Insert_ID()");
+		$ins_id2 = $db->GetOne("select row1 from mytable");
+		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
+		
+		$arr = array(0=>'Caroline',1=>'Miranda');
+		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
+		break;
+		
+	case 'mysql':
+		$sqlt = "CREATE TABLE `mytable` (
+  `row1` int(11) NOT NULL auto_increment,
+  `row2` varchar(16) NOT NULL default '',
+  PRIMARY KEY  (`row1`),
+  KEY `myindex` (`row1`,`row2`)
+) ";
+		if (!$db->Execute("delete from mytable")) 
+			$db->Execute($sqlt);
+			
+		$ok = $db->Execute("insert into mytable (row2) values ('test')");
+		$ins_id=$db->Insert_ID();
+		echo "Insert ID=";var_dump($ins_id);
+		if ($ins_id == 0) Err("Bad Insert_ID()");
+		$ins_id2 = $db->GetOne("select row1 from mytable");
+		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
+		
+	default:
+		$arr = array(0=>'Caroline',1=>'Miranda');
+		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
+		break;
+	
+	case 'oci8':
+	case 'oci805':
+		$arr = array('first'=>'Caroline','last'=>'Miranda');
+		$amt = rand() % 100;
+		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,:first,:last,$time)";		
+		break;
+	}
+	if ($i & 1) {
+		$sql = $db->Prepare($sql);
+	}
+	$rs = $db->Execute($sql,$arr);
+		
+	if ($rs === false) Err( 'Error inserting with parameters');
+	else $rs->Close();
+	$db->debug = false;
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+1,'John','Lim',$time)");
+	/*$ins_id=$db->Insert_ID();
+	echo "Insert ID=";var_dump($ins_id);*/
+	if ($db->databaseType == 'mysql') if ($ins_id == 0) Err('Bad Insert_ID');
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+2,'Mary','Lamb',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+3,'George','Washington',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+4,'Mr. Alan','Tam',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+5,'Alan',".$db->quote("Turing'ton").",$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created)values ($i*10+6,'Serena','Williams',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+7,'Yat Sun','Sun',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+8,'Wai Hun','See',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+9,'Steven','Oey',$time )");
+	} // for
+	if (1) {
+	$db->debug=1;
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$cnt = $db->GetOne("select count(*) from ADOXYZ");
+	$rs = $db->Execute('update ADOXYZ set id=id+1');	
+	if (!is_object($rs)) {
+		print_r($rs);
+		err("Update should return object");
+	}
+	if (!$rs) err("Update generated error");
+	
+	$nrows = $db->Affected_Rows();   
+	if ($nrows === false) print "
    Affected_Rows() not supported
    ";
+	else if ($nrows != $cnt)  print "
    Affected_Rows() Error: $nrows returned (should be 50) 
    ";
+	else print "
    Affected_Rows() passed
    ";
+	}
+	$db->debug = false;
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+ //////////////////////////////////////////////////////////////////////////////////////////
+	
+	$rs = $db->Execute("select * from ADOXYZ where firstname = 'not known'");
+	if (!$rs ||  !$rs->EOF) print "
    Error on empty recordset
    ";
+	else if ($rs->RecordCount() != 0) {
+		print "
    Error on RecordCount. Should be 0. Was ".$rs->RecordCount()."
    "; 
+		print_r($rs->fields);
+	}
+	if ($db->databaseType !== 'odbc') {
+		$rs = &$db->Execute("select id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
+		if ($rs) {
+			if ($rs->RecordCount() != 50) {
+				print "
    RecordCount returns ".$rs->RecordCount()."
    ";
+				$poc = $rs->PO_RecordCount('ADOXYZ');
+				if ($poc == 50) print "
         PO_RecordCount passed
    ";
+				else print "
    PO_RecordCount returns wrong value: $poc
    ";
+			} else print "
    RecordCount() passed
    ";
+			if (isset($rs->fields['firstname'])) print '
    The fields columns can be indexed by column name.
    ';
+			else {
+				Err( '
    The fields columns cannot be indexed by column name.
    ');
+				print_r($rs->fields);
+			}
+			if (empty($HTTP_GET_VARS['hide'])) rs2html($rs);
+		}
+		else print "Error in Execute of SELECT with random
    ";
+	}
+	$val = $db->GetOne("select count(*) from ADOXYZ");
+	 if ($val == 50) print "
    GetOne returns ok
    ";
+	 else print "
    Fail: GetOne returns $val
    ";
+
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$val = $db->GetRow("select count(*) from ADOXYZ");
+	 if ($val[0] == 50 and sizeof($val) == 1) print "
    GetRow returns ok
    ";
+	 else {
+	 	print_r($val);
+	 	print "
    Fail: GetRow returns {$val[0]}
    ";
+	}
+
+	print "
    FetchObject/FetchNextObject Test
    ";
+	$rs = &$db->Execute('select * from ADOXYZ');
+	
+	if (empty($rs->connection)) print "Connection object missing from recordset
    ";
+	
+	while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
+		if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
+			print_r($o);
+			print "
    Firstname is not string
    ";
+			break;
+		}
+	}
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	print "
    FetchObject/FetchNextObject Test 2
    ";
+	
+	$rs = &$db->Execute('select * from ADOXYZ');
+	if (empty($rs->connection)) print "Connection object missing from recordset
    ";
+	print_r($rs->fields);
+	while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
+		if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
+			print_r($o);
+			print "
    Firstname is not string
    ";
+			break;
+		}
+	}
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	
+	$savefetch = $ADODB_FETCH_MODE;
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	
+	print "
    CacheSelectLimit  Test
    ";
+	$db->debug=1;
+	$rs = $db->CacheSelectLimit('  select  id, firstname from  ADOXYZ order by id',2);
+	if ($rs && !$rs->EOF) {
+		if (isset($rs->fields[0])) {
+			Err("ASSOC has numeric fields");
+			print_r($rs->fields);
+		}
+		if ($rs->fields['id'] != 1)  {Err("Error"); print_r($rs->fields);};
+		if (trim($rs->fields['firstname']) != 'Caroline')  {print Err("Error 2"); print_r($rs->fields);};
+		$rs->MoveNext();
+		if ($rs->fields['id'] != 2)  {Err("Error 3"); print_r($rs->fields);};
+		$rs->MoveNext();
+		if (!$rs->EOF) {
+			Err("Error EOF");
+			print_r($rs);
+		}
+	}
+	
+	print "
    FETCH_MODE = ASSOC: Should get 1, Caroline
    ";
+	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',2);
+	if ($rs && !$rs->EOF) {
+		if ($rs->fields['id'] != 1)  {Err("Error 1"); print_r($rs->fields);};
+		if (trim($rs->fields['firstname']) != 'Caroline')  {Err("Error 2"); print_r($rs->fields);};
+		$rs->MoveNext();
+		if ($rs->fields['id'] != 2)  {Err("Error 3"); print_r($rs->fields);};
+		$rs->MoveNext();
+		if (!$rs->EOF) Err("Error EOF");
+		else if (is_array($rs->fields) || $rs->fields) {
+			Err("Error: ## fields should be set to false on EOF");
+			print_r($rs->fields);
+		}
+	}
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	print "
    FETCH_MODE = NUM: Should get 1, Caroline
    ";
+	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		if (isset($rs->fields['id'])) Err("FETCH_NUM has ASSOC fields");
+		if ($rs->fields[0] != 1)  {Err("Error 1"); print_r($rs->fields);};
+		if (trim($rs->fields[1]) != 'Caroline')  {Err("Error 2");print_r($rs->fields);};
+		$rs->MoveNext();
+		if (!$rs->EOF) Err("Error EOF");
+
+	}
+	$ADODB_FETCH_MODE = $savefetch;
+	
+	$db->debug = false;
+	print "
    GetRowAssoc Upper: Should get 1, Caroline
    ";
+	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		$arr = &$rs->GetRowAssoc();
+		if ($arr['ID'] != 1) {Err("Error 1");print_r($arr);};
+		if (trim($arr['FIRSTNAME']) != 'Caroline') {Err("Error 2"); print_r($arr);};
+		$rs->MoveNext();
+		if (!$rs->EOF) Err("Error EOF");
+
+	}
+	print "
    GetRowAssoc Lower: Should get 1, Caroline
    ";
+	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		$arr = &$rs->GetRowAssoc(false);
+		if ($arr['id'] != 1) {Err("Error 1"); print_r($arr);};
+		if (trim($arr['firstname']) != 'Caroline') {Err("Error 2"); print_r($arr);};
+
+	}
+	
+	print "
    GetCol Test
    ";
+	$col = $db->GetCol('select distinct firstname from adoxyz order by 1');
+	if (!is_array($col)) Err("Col size is wrong");
+	if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col elements wrong");
+
+	$db->debug = true;
+	print "
    SelectLimit Distinct Test 1: Should see Caroline, John and Mary
    ";
+	$rs = &$db->SelectLimit('select distinct * from ADOXYZ order by id',3);
+	$db->debug=false;
+
+	if ($rs && !$rs->EOF) {
+		if (trim($rs->fields[1]) != 'Caroline') Err("Error 1");
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'John') Err("Error 2");
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Mary') Err("Error 3");
+		$rs->MoveNext();
+		if (! $rs->EOF) Err("Error EOF");
+		//rs2html($rs);
+	} else Err("Failed SelectLimit Test 1");
+	
+	print "
    SelectLimit Test 2: Should see Mary, George and Mr. Alan
    ";
+	$rs = &$db->SelectLimit('select * from ADOXYZ order by id',3,2);
+	if ($rs && !$rs->EOF) {
+		if (trim($rs->fields[1]) != 'Mary') Err("Error 1");
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'George')Err("Error 2");
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3");
+		$rs->MoveNext();
+		if (! $rs->EOF) Err("Error EOF");
+	//	rs2html($rs);
+	}
+	 else Err("Failed SelectLimit Test 2");
+	
+	print "
    SelectLimit Test 3: Should see Wai Hun and Steven
    ";
+	$db->debug=1;
+	global $A; $A=1;
+	$rs = &$db->SelectLimit('select * from ADOXYZ order by id',-1,48);
+	$A=0;
+	if ($rs && !$rs->EOF) {
+		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
+		if (trim($rs->fields[1]) != 'Wai Hun') Err("Error 1 ".$rs->fields[1]);
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Steven') Err("Error 2 ".$rs->fields[1]);
+		$rs->MoveNext();
+		if (! $rs->EOF) {
+			Err("Error EOF");
+		}
+		//rs2html($rs);
+	}
+	 else Err("Failed SelectLimit Test 3");
+		$db->debug = false;
+	
+	
+	$rs = &$db->Execute("select * from ADOXYZ order by id");
+	print "
    Testing Move()
    ";	
+	if (!$rs)Err( "Failed Move SELECT");
+	else {
+		if (!$rs->Move(2)) {
+			if (!$rs->canSeek) print "
    $db->databaseType: Move(), MoveFirst() nor MoveLast() not supported.
    ";
+			else print '
    RecordSet->canSeek property should be set to false
    ';
+		} else {
+			$rs->MoveFirst();
+			if (trim($rs->Fields("firstname")) != 'Caroline') {
+				print "
    $db->databaseType: MoveFirst failed -- probably cannot scroll backwards
    ";
+			}
+			else print "MoveFirst() OK
    ";
+						
+						// Move(3) tests error handling -- MoveFirst should not move cursor
+			$rs->Move(3);
+			if (trim($rs->Fields("firstname")) != 'George') {
+				print '
    '.$rs->Fields("id")."$db->databaseType: Move(3) failed
    ";
+			} else print "Move(3) OK
    ";
+						
+			$rs->Move(7);
+			if (trim($rs->Fields("firstname")) != 'Yat Sun') {
+				print '
    '.$rs->Fields("id")."$db->databaseType: Move(7) failed
    ";
+				print_r($rs);
+			} else print "Move(7) OK
    ";
+			if ($rs->EOF) Err("Move(7) is EOF already");
+			$rs->MoveLast();
+			if (trim($rs->Fields("firstname")) != 'Steven'){
+				 print '
    '.$rs->Fields("id")."$db->databaseType: MoveLast() failed
    ";
+				 print_r($rs);
+			}else print "MoveLast() OK
    ";
+			$rs->MoveNext();
+			if (!$rs->EOF) err("Bad MoveNext");
+			if ($rs->canSeek) {
+				$rs->Move(3);
+				if (trim($rs->Fields("firstname")) != 'George') {
+					print '
    '.$rs->Fields("id")."$db->databaseType: Move(3) after MoveLast failed
    ";
+					
+				} else print "Move(3) after MoveLast() OK
    ";
+			}
+			
+			print "
    Empty Move Test";
+			$rs = $db->Execute("select * from ADOXYZ where id > 0 and id < 0");
+			$rs->MoveFirst();
+			if (!$rs->EOF || $rs->fields) Err("Error in empty move first");
+		}
+	}
+	
+	$rs = $db->Execute('select * from ADOXYZ where id = 2');
+	if ($rs->EOF || !is_array($rs->fields)) Err("Error in select");
+	$rs->MoveNext();
+	if (!$rs->EOF) Err("Error in EOF (xx) ");
+ //	$db->debug=true;
+	print "
    Testing ADODB_FETCH_ASSOC and concat: concat firstname and lastname
    ";
+
+	$save = $ADODB_FETCH_MODE;
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	if ($db->dataProvider == 'postgres') {
+		$sql = "select ".$db->Concat('cast(firstname as varchar)',$db->qstr(' '),'lastname')." as fullname,id from ADOXYZ";
+		$rs = &$db->Execute($sql);
+	} else {
+		$sql = "select distinct ".$db->Concat('firstname',$db->qstr(' '),'lastname')." as fullname,id from ADOXYZ";
+		$rs = &$db->Execute($sql);
+	}
+	if ($rs) {
+		if (empty($HTTP_GET_VARS['hide'])) rs2html($rs);
+	} else {
+		Err( "Failed Concat:".$sql);
+	}
+	$ADODB_FETCH_MODE = $save;
+	print "
    Testing GetArray() ";
+	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	
+	$rs = &$db->Execute("select * from ADOXYZ order by id");
+	if ($rs) {
+		$arr = &$rs->GetArray(10);
+		if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' || trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]."   ERROR
    ";
+		else print " OK
    ";
+	}
+	
+	$arr = $db->GetArray("select x from ADOXYZ");
+	$e = $db->ErrorMsg(); $e2 = $db->ErrorNo();
+	echo "Testing error handling, should see illegal column 'x' error=$e ($e2) 
    ";
+	if (!$e || !$e2) Err("Error handling did not work");
+	print "Testing FetchNextObject for 1 object ";
+	$rs = &$db->Execute("select distinct lastname,firstname from ADOXYZ where firstname='Caroline'");
+	$fcnt = 0;
+	if ($rs)
+	while ($o = $rs->FetchNextObject()) {
+		$fcnt += 1;	
+	}
+	if ($fcnt == 1) print " OK
    ";
+	else print "FAILED
    ";
+	
+	$stmt = $db->Prepare("select * from ADOXYZ where id < 3");
+	$rs = $db->Execute($stmt);
+	if (!$rs) Err("Prepare failed");
+	else {
+		$arr = $rs->GetArray();
+		if (!$arr) Err("Prepare failed 2");
+		if (sizeof($arr) != 2) Err("Prepare failed 3");
+	}
+	print "Testing GetAssoc() ";
+	$savecrecs = $ADODB_COUNTRECS;
+	$ADODB_COUNTRECS = false;
+	$rs = &$db->Execute("select distinct lastname,firstname from ADOXYZ");
+	if ($rs) {
+		$arr = $rs->GetAssoc();
+		//print_r($arr);
+		if (trim($arr['See']) != 'Wai Hun') print $arr['See']."   ERROR
    ";
+		else print " OK 1";
+	}
+	
+	$arr = &$db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
+	if ($arr) {
+		//print_r($arr);
+		if (trim($arr['See']) != 'Wai Hun') print $arr['See']."   ERROR
    ";
+		else print " OK 2
    ";
+	}
+	// Comment this out to test countrecs = false
+	$ADODB_COUNTRECS = $savecrecs;
+	
+	for ($loop=0; $loop < 1; $loop++) {
+	print "Testing GetMenu() and CacheExecute
    ";
+	$db->debug = true;
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	
+	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu('menu','Steven').'
    '; 
+	else print " Fail
    ";
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	
+	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu('menu','Steven',false).'
    ';
+	else print " Fail
    ";
+	
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'
    ';
+	else print " Fail
    ";
+	print '
    ';
+	
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) {
+		print ' Multiple, Alan and George selected: '. $rs->GetMenu('menu',array('Alan','George'),false,true);
+		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
+	} else print " Fail
    ";
+	print '
    ';
+	
+	print "Testing GetMenu2() 
    ";
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu2('menu',('Oey')).'
    '; 
+	else print " Fail
    ";
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu2('menu',('Oey'),false).'
    ';
+	else print " Fail
    ";
+	}
+	
+	$db->debug = false;
+	
+	// phplens
+	
+	$sql = 'select * from ADOXYZ where 0=1';
+	echo "
    **Testing '$sql' (phplens compat 1)
    ";
+	$rs = &$db->Execute($sql);
+	if (!$rs) err( "No recordset returned for '$sql'");
+	if (!$rs->FieldCount()) err( "No fields returned for $sql");
+	if (!$rs->FetchField(1)) err( "FetchField failed for $sql");
+	
+	$sql = 'select * from ADOXYZ order by 1';
+	echo "
    **Testing '$sql' (phplens compat 2)
    ";
+	$rs = &$db->Execute($sql);
+	if (!$rs) err( "No recordset returned for '$sql'
    ".$db->ErrorMsg()."    ");
+	
+	
+	$sql = 'select * from ADOXYZ order by 1,1';
+	echo "
    **Testing '$sql' (phplens compat 3)
    ";
+	$rs = &$db->Execute($sql);
+	if (!$rs) err( "No recordset returned for '$sql'
    ".$db->ErrorMsg()."    ");
+	
+	
+	// Move
+	$rs1 = &$db->Execute("select id from ADOXYZ where id <= 2 order by 1");
+	$rs2 = &$db->Execute("select id from ADOXYZ where id = 3 or id = 4 order by 1");
+
+	if ($rs1) $rs1->MoveLast();
+	if ($rs2) $rs2->MoveLast();
+	
+	if (empty($rs1) || empty($rs2) || $rs1->fields[0] != 2 || $rs2->fields[0] != 4) {
+		$a = $rs1->fields[0];
+		$b = $rs2->fields[0];
+		print "
    Error in multiple recordset test rs1=$a rs2=$b (should be rs1=2 rs2=4)
    ";
+	} else
+		print "
    Testing multiple recordsets OK
    ";
+		
+	
+	echo "
     GenID test: ";
+	for ($i=1; $i <= 10; $i++) 
+		echo  "($i: ",$val = $db->GenID($db->databaseType.'abcseq6' ,5), ") ";
+	if ($val == 0) Err("GenID not supported");
+	
+	if ($val) {
+		$db->DropSequence('abc_seq2');
+		$db->CreateSequence('abc_seq2');
+		$val = $db->GenID('abc_seq2');
+		$db->DropSequence('abc_seq2');
+		$db->CreateSequence('abc_seq2');
+		$val = $db->GenID('abc_seq2');
+		if ($val != 1) Err("Drop and Create Sequence not supported ($val)");
+	}
+	echo "
    ";
+	
+	if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
+		$sql = "select firstnames from adoxyz";
+		print "
    Testing execution of illegal statement: $sql
    ";
+		if ($db->Execute($sql) === false) {
+			print "
    This returns the following ErrorMsg(): ".$db->ErrorMsg()." and ErrorNo(): ".$db->ErrorNo().'
    ';
+		} else 
+			print "
    Error in error handling -- Execute() should return false
    ";
+	} else 
+		print "
    ADO skipped error handling of bad select statement
    ";
+	
+	print "
    ASSOC TEST 2
    ";
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs = $db->query('select * from adoxyz order by id');
+	if ($ee = $db->ErrorMsg()) {
+		Err("Error message=$ee");
+	}
+	if ($ee = $db->ErrorNo()) {
+		Err("Error No = $ee");
+	}
+	print_r($rs->fields);
+	for($i=0;$i<$rs->FieldCount();$i++) 
+	{ 
+		$fld=$rs->FetchField($i); 
+		print "
     Field name is ".$fld->name; 
+		print " ".$rs->Fields($fld->name); 
+	} 
+
+		
+	print "
    BOTH TEST 2
    ";
+	if ($db->dataProvider == 'ado') {
+		print "ADODB_FETCH_BOTH not supported for dataProvider=".$db->dataProvider."
    ";
+	} else {
+		$ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
+		$rs = $db->query('select * from adoxyz order by id');
+		for($i=0;$i<$rs->FieldCount();$i++) 
+		{ 
+			$fld=$rs->FetchField($i); 
+			print "
     Field name is ".$fld->name; 
+			print " ".$rs->Fields($fld->name); 
+		} 
+	}
+	
+	print "
    NUM TEST 2
    ";
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$rs = $db->query('select * from adoxyz order by id');
+	for($i=0;$i<$rs->FieldCount();$i++) 
+	{ 
+		$fld=$rs->FetchField($i); 
+		print "
     Field name is ".$fld->name; 
+		print " ".$rs->Fields($fld->name); 
+	} 
+	
+	print "
    ASSOC Test of SelectLimit
    ";
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs = $db->selectlimit('select * from adoxyz order by id',3,4);
+	$cnt = 0;
+	while ($rs && !$rs->EOF) {
+		$cnt += 1;
+		if (!isset($rs->fields['firstname'])) {
+			print "
    ASSOC returned numeric field
    ";
+			break;
+		}
+		$rs->MoveNext();
+	}
+	if ($cnt != 3) print "
    Count should be 3, instead it was $cnt
    ";
+	
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	if ($db->sysDate) {
+		$saved = $db->debug;
+		$db->debug = 1;
+		$rs = $db->Execute("select {$db->sysDate} from adoxyz where id=1");
+		if (ADORecordSet::UnixDate(date('Y-m-d')) != $rs->UnixDate($rs->fields[0])) {
+			print "
    Invalid date {$rs->fields[0]}
    ";
+		} else
+			print "
    Passed \$sysDate test ({$rs->fields[0]})
    ";
+		
+		print_r($rs->FetchField(0));
+		print time();
+		$db->debug=$saved;
+	} else {
+		print "
    \$db->sysDate not defined
    ";
+	}
+
+	print "
    Test CSV
    ";
+	include_once('../toexport.inc.php');
+	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' he,\'"\' q  from adoxyz',10);	
+	
+	print "
    ";
+	print rs2csv($rs);
+	print "
    ";
+	
+	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'The	"young man", he said\' from adoxyz',10);	
+	
+	print "
    ";
+	rs2tabout($rs);
+	print "
    ";
+	
+	//print " CacheFlush ";
+	//$db->CacheFlush();
+	
+	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A');
+	$sql = "SELECT $date from ADOXYZ";
+	print "
    Test SQLDate: ".htmlspecialchars($sql)."
    ";
+	$rs = $db->SelectLimit($sql,1);
+	$d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
+	if (!$rs) Err("SQLDate query returned no recordset");
+	else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: 
    act:$d 
    sql:".$rs->fields[0]);
+	
+	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
+	$sql = "SELECT $date from ADOXYZ";
+	print "
    Test SQLDate: ".htmlspecialchars($sql)."
    ";
+	$rs = $db->SelectLimit($sql,1);
+	$ts = ADOConnection::UnixDate('1974-02-25');
+	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
+	if (!$rs) Err("SQLDate query returned no recordset");
+	else if ($d != $rs->fields[0]) Err("SQLDate 2 failed expected: 
    act:$d 
    sql:".$rs->fields[0]);
+	
+	
+	print "
    Test Filter
    ";
+	$db->debug = 1;
+	
+	$rs = $db->SelectLimit('select * from ADOXYZ where id < 3 order by id');
+	
+	$rs = RSFilter($rs,'do_strtolower');
+	if (trim($rs->fields[1]) != 'caroline'  && trim($rs->fields[2]) != 'miranda') {
+		err('**** RSFilter failed');
+		print_r($rs->fields);
+	}
+	
+	rs2html($rs);
+		
+	$db->debug=1;
+	
+	
+	print "
    Test Replace
    ";
+	
+	$ret = $db->Replace('adoxyz', 
+		array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
+		array('id'),
+		$autoq = true);
+	if (!$ret) echo "
    Error in replacing existing record
    ";
+	else {
+		$saved = $db->debug;
+		$db->debug = 0;
+		$savec = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = true;
+		$rs = $db->Execute('select * FROM ADOXYZ where id=1');
+		$db->debug = $saved;
+		if ($rs->RecordCount() != 1) {
+			$cnt = $rs->RecordCount();
+			rs2html($rs);
+			print "Error - Replace failed, count=$cnt
    ";
+		}
+		$ADODB_COUNTRECS = $savec;
+	}
+	$ret = $db->Replace('adoxyz', 
+		array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
+		array('id','firstname'),
+		$autoq = true);
+	if ($ret != 2) print "Replace failed: ";
+	print "test A return value=$ret (2 expected) 
    ";
+	
+	$ret = $db->Replace('adoxyz', 
+		array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
+		'id',
+		$autoq = true);
+	if ($ret != 1) 
+		if ($db->dataProvider == 'ibase' && $ret == 2);
+		else print "Replace failed: ";
+	print "test B return value=$ret (1 or if ibase then 2 expected) 
    ";
+	
+	print "
    rs2rs Test
    ";
+	
+	$rs = $db->Execute('select * from adoxyz order by id');
+	$rs = $db->_rs2rs($rs);
+	$rs->valueX = 'X';
+	$rs->MoveNext();
+	$rs = $db->_rs2rs($rs);
+	if (!isset($rs->valueX)) err("rs2rs does not preserve array recordsets");
+	if (reset($rs->fields) != 1) err("rs2rs does not move to first row");
+
+	/////////////////////////////////////////////////////////////
+	include_once('../pivottable.inc.php');
+	print "
    Pivot Test
    ";
+	$db->debug=true;
+ 	$sql = PivotTableSQL(
+ 		$db,  			# adodb connection
+ 		'adoxyz',  		# tables
+		'firstname',	# row fields
+		'lastname',		# column fields 
+		false,			# join
+		'ID', 			# sum
+		'Sum ',			# label for sum
+		'sum',			# aggregate function
+		true
+	);
+	$rs = $db->Execute($sql);
+	if ($rs) rs2html($rs);
+	else Err("Pivot sql error");
+	
+	$db->debug=false;
+	include_once "PEAR.php";
+	
+	// PEAR TESTS BELOW
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$pear = true;
+	$rs = $db->query('select * from adoxyz where id>0 and id<10 order by id');
+	
+	$i = 0;
+	if ($rs && !$rs->EOF) {
+		while ($arr = $rs->fetchRow()) {
+			$i++;
+			//print "$i ";
+			if ($arr[0] != $i) {
+				print_r($arr);
+				print "
    PEAR DB emulation error 1.
    ";
+				$pear = false;
+				break;
+			}
+		}
+		$rs->Close();
+	}
+	
+	
+	if ($i != $db->GetOne('select count(*) from adoxyz where id>0 and id<10')) {
+		print "
    PEAR DB emulation error 1.1 EOF ($i)
    ";
+		$pear = false;
+	}
+	
+	$rs = $db->limitQuery('select * from adoxyz where id>0 order by id',$i=3,$top=3);
+	$i2 = $i;
+	if ($rs && !$rs->EOF) {
+
+		while (!is_object($rs->fetchInto($arr))) {
+			$i2++;
+			
+	//			print_r($arr);
+	//		print "$i ";print_r($arr);
+			if ($arr[0] != $i2) {
+				print "
    PEAR DB emulation error 2.
    ";
+				$pear = false;
+				break;
+			}
+		}
+		$rs->Close();
+	}
+	if ($i2 != $i+$top) {
+		print "
    PEAR DB emulation error 2.1 EOF (correct=$i+$top, actual=$i2)
    ";
+		$pear = false;
+	}
+	
+	if ($pear) print "
    PEAR DB emulation passed.
    ";
+	
+	$rs = $db->SelectLimit("select ".$db->sysDate." from adoxyz",1);
+	$date = $rs->fields[0];
+	if (!$date) Err("Bad sysDate");
+	else {
+		$ds = $db->UserDate($date,"d m Y");
+		if ($ds != date("d m Y")) Err("Bad UserDate: ".$ds);
+		else echo "Passed UserDate: $ds
    ";
+	}
+	$db->debug=1;
+	if ($db->dataProvider == 'oci8') 
+		$rs = $db->SelectLimit("select to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from adoxyz",1);
+	else 
+		$rs = $db->SelectLimit("select ".$db->sysTimeStamp." from adoxyz",1);
+	$date = $rs->fields[0];
+	if (!$date) Err("Bad sysTimeStamp");
+	else {
+		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
+		if ($ds != date("H \\h\\r\\s-d m Y")) Err("Bad UserTimeStamp: ".$ds.", correct is ".date("H \\h\\r\\s-d m Y"));
+		else echo "Passed UserTimeStamp: $ds
    ";
+		
+		$date = 100;
+		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
+		$ds2 = date("H \\h\\r\\s-d m Y",$date);
+		if ($ds != $ds2) Err("Bad UserTimeStamp 2: $ds: $ds2");
+		else echo "Passed UserTimeStamp 2: $ds
    ";
+	}
+	if ($db->hasTransactions) {
+		//$db->debug=1;
+		echo "
    Testing StartTrans CompleteTrans
    ";
+		$db->raiseErrorFn = false;
+		$db->StartTrans();
+		$rs = $db->Execute('select * from notable');
+			$db->StartTrans();
+				$db->BeginTrans();
+			$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
+				$db->CommitTrans();
+			$db->CompleteTrans();
+		$rez = $db->CompleteTrans();
+		if ($rez !== false) {
+			if (is_null($rez)) Err("Error: _transOK not modified");
+			else Err("Error: CompleteTrans (1) should have failed");
+		} else {
+			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
+			if ($name == "Carolx") Err("Error: CompleteTrans (2) should have failed");
+			else echo "
     -- Passed StartTrans test1 - rolling back
    ";
+		}
+		
+		$db->StartTrans();
+			$db->BeginTrans();
+		$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
+			$db->RollbackTrans();
+		$rez = $db->CompleteTrans();
+		if ($rez !== true) Err("Error: CompleteTrans (1) should have succeeded");
+		else {
+			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
+			if (trim($name) != "Carolx") Err("Error: CompleteTrans (2) should have succeeded, returned name=$name");
+			else echo "
     -- Passed StartTrans test2 - commiting
    ";
+		}
+	}
+	
+	
+	global $TESTERRS;
+	$debugerr = true;
+	
+	global $ADODB_LANG;$ADODB_LANG = 'fr';
+	$db->debug = false;
+	$TESTERRS = 0;
+	$db->raiseErrorFn = 'adodb_test_err';
+	global $ERRNO; // from adodb_test_err
+	$db->Execute('select * from nowhere');
+	$metae = $db->MetaError($ERRNO);
+	if ($metae !== DB_ERROR_NOSUCHTABLE) print "
    MetaError=".$metae." wrong, should be ".DB_ERROR_NOSUCHTABLE."
    ";
+	else print "
    MetaError ok (".DB_ERROR_NOSUCHTABLE."): ".$db->MetaErrorMsg($metae)."
    ";
+	if ($TESTERRS != 1) print "raiseErrorFn select nowhere failed
    ";
+	$rs = $db->Execute('select * from adoxyz');
+	if ($debugerr) print " Move";
+	$rs->Move(100);
+	$rs->_queryID = false;
+	if ($debugerr) print " MoveNext";
+	$rs->MoveNext();
+	if ($debugerr) print " $rs=false";
+	$rs = false;
+
+	print "
    SetFetchMode() tests
    ";
+	$db->SetFetchMode(ADODB_FETCH_ASSOC);
+	$rs = $db->SelectLimit('select firstname from adoxyz',1);
+	//	var_dump($rs->fields);
+	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;	
+	$rs = $db->SelectLimit('select firstname from adoxyz',1);
+	//var_dump($rs->fields);
+	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;	
+	$db->SetFetchMode(ADODB_FETCH_NUM);
+	$rs = $db->SelectLimit('select firstname from adoxyz',1);
+	if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
+	
+	print "
    Test MetaTables again with SetFetchMode()
    ";
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$db->SetFetchMode(ADODB_FETCH_ASSOC);
+	print_r($db->MetaTables());
+	print "
    ";
+	////////////////////////////////////////////////////////////////////
+	
+	$conn = NewADOConnection($db->databaseType);
+	$conn->raiseErrorFn = 'adodb_test_err';
+	@$conn->Connect('abc');
+	if ($TESTERRS == 2) print "raiseErrorFn tests passed
    ";
+	else print "raiseErrorFn tests failed ($TESTERRS)
    ";
+	
+	
+	////////////////////////////////////////////////////////////////////
+	
+	global $nocountrecs;
+	
+	if (isset($nocountrecs) && $ADODB_COUNTRECS) err("Error: \$ADODB_COUNTRECS is set");
+	if (empty($nocountrecs) && $ADODB_COUNTRECS==false) err("Error: \$ADODB_COUNTRECS is not set");
+
+	
+?>
+	
    
+	
     
    
+	
    
+Close();
+	if ($rs2) $rs2->Close();
+	if ($rs) $rs->Close();
+	$db->Close();
+	
+	if ($db->transCnt != 0) Err("Error in transCnt=$db->transCnt (should be 0)");
+	
+	
+	printf("
    Total queries=%d; total cached=%d
    ",$EXECS+$CACHED, $CACHED);
+}
+
+function adodb_test_err($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
+{
+global $TESTERRS,$ERRNO;
+
+	$ERRNO = $errno;
+	$TESTERRS += 1;
+	print "** $dbms ($fn): errno=$errno   errmsg=$errmsg ($p1,$p2)
    ";
+}
+
+//--------------------------------------------------------------------------------------
+
+
+set_time_limit(240); // increase timeout
+
+include("../tohtml.inc.php");
+include("../adodb.inc.php");
+include("../rsfilter.inc.php");
+
+/* White Space Check */
+
+if (isset($_SERVER['argv'][1])) {
+	//print_r($_SERVER['argv']);
+	$HTTP_GET_VARS[$_SERVER['argv'][1]] = 1;
+}
+
+if (@$HTTP_SERVER_VARS['COMPUTERNAME'] == 'TIGRESS') {
+	CheckWS('mysqlt');
+	CheckWS('postgres');
+	CheckWS('oci8po');
+	
+	CheckWS('firebird');
+	CheckWS('sybase');
+	CheckWS('informix');
+
+	CheckWS('ado_mssql');
+	CheckWS('ado_access');
+	CheckWS('mssql');
+	
+	CheckWS('vfp');
+	CheckWS('sqlanywhere');
+	CheckWS('db2');
+	CheckWS('access');
+	CheckWS('odbc_mssql');
+	//
+	CheckWS('oracle');
+	CheckWS('proxy');
+	CheckWS('fbsql');
+	print "White Space Check complete
    ";
+}
+if (sizeof($HTTP_GET_VARS) == 0) $testmysql = true;
+
+
+foreach($HTTP_GET_VARS as $k=>$v)  {
+	//global $$k;
+	$$k = $v;
+}	
+if (strpos(PHP_VERSION,'5') === 0) {
+	//$testaccess=1;
+	//$testmssql = 1;
+	//$testsqlite=1;
+}
+?>
+
+ADODB Testing
+
+
    ADODB Test
    
+
+This script tests the following databases: Interbase, Oracle, Visual FoxPro, Microsoft Access (ODBC and ADO), MySQL, MSSQL (ODBC, native, ADO). 
+There is also support for Sybase, PostgreSQL.
    
+For the latest version of ADODB, visit php.weblogs.com.
    
+
+Test GetInsertSQL/GetUpdateSQL   
+	Sessions  
+	Paging  
+	Perf Monitor
    
+
+	
+
+
    ADODB Database Library  (c) 2000-2004 John Lim. All rights reserved. Released under BSD and LGPL.
    
+
+
diff --git a/lib/adodb/tests/test2.php b/lib/adodb/tests/test2.php
index 177aa8e94e9..14474666499 100644
--- a/lib/adodb/tests/test2.php
+++ b/lib/adodb/tests/test2.php
@@ -1,41 +1,41 @@
-
-
-
-
-	Untitled
-
-
-
-PConnect('','scott','tiger')) 
-	die("Cannot connect to server");
-$c1->debug=1;
-$rs = $c1->Execute('select rownum, p1.firstname,p2.lastname,p2.firstname,p1.lastname from adoxyz p1, adoxyz p2');
-print "Records=".$rs->RecordCount()."
    ";
-//$rs->_array = false;
-//$rs->connection = false;
-//print_r($rs);
-rs2html($rs);
-?>
-
-
-
-
+
+
+
+
+	Untitled
+
+
+
+PConnect('','scott','tiger')) 
+	die("Cannot connect to server");
+$c1->debug=1;
+$rs = $c1->Execute('select rownum, p1.firstname,p2.lastname,p2.firstname,p1.lastname from adoxyz p1, adoxyz p2');
+print "Records=".$rs->RecordCount()."
    ";
+//$rs->_array = false;
+//$rs->connection = false;
+//print_r($rs);
+rs2html($rs);
+?>
+
+
+
+
diff --git a/lib/adodb/tests/test3.php b/lib/adodb/tests/test3.php
index 36754ed8558..207dda27732 100644
--- a/lib/adodb/tests/test3.php
+++ b/lib/adodb/tests/test3.php
@@ -1,44 +1,44 @@
-Connect('','scott','natsoft');
-$db->debug=1;
-
-$cnt = $db->GetOne("select count(*) from adoxyz");
-$rs = $db->Execute("select * from adoxyz order by id");
-
-$i = 0;
-foreach($rs as $k => $v) {
-	$i += 1;
-	echo $k; adodb_pr($v);
-	flush();
-}
-
-if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
-
-
-
-$rs = $db->Execute("select bad from badder");
-
-} catch (exception $e) {
-	adodb_pr($e);
-	$e = adodb_backtrace($e->trace);
-}
-
+Connect('','scott','natsoft');
+$db->debug=1;
+
+$cnt = $db->GetOne("select count(*) from adoxyz");
+$rs = $db->Execute("select * from adoxyz order by id");
+
+$i = 0;
+foreach($rs as $k => $v) {
+	$i += 1;
+	echo $k; adodb_pr($v);
+	flush();
+}
+
+if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
+
+
+
+$rs = $db->Execute("select bad from badder");
+
+} catch (exception $e) {
+	adodb_pr($e);
+	$e = adodb_backtrace($e->trace);
+}
+
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/test4.php b/lib/adodb/tests/test4.php
index 9a261b13a10..64fb8b01a07 100644
--- a/lib/adodb/tests/test4.php
+++ b/lib/adodb/tests/test4.php
@@ -1,7 +1,7 @@
 GetUpdateSQL($rs, $record);
 $conn->Execute($updateSQL); // Update the record in the database
 print "
    Rows Affected=".$conn->Affected_Rows()."
    ";
 
-rs2html($conn->Execute("select * from adoxyz where lastname like 'Smith%'"));
+$rs = $conn->Execute("select * from adoxyz where lastname like 'Smith%'");
+adodb_pr($rs);
+rs2html($rs);
 }
 
 
diff --git a/lib/adodb/tests/test5.php b/lib/adodb/tests/test5.php
index 5308f2b1386..ba02aeed085 100644
--- a/lib/adodb/tests/test5.php
+++ b/lib/adodb/tests/test5.php
@@ -1,47 +1,47 @@
-debug=1;
-	$conn->PConnect("localhost","root","","xphplens");
-	print $conn->databaseType.':'.$conn->GenID().'
    ';
-}
-
-if (0) {
-	$conn = &ADONewConnection("oci8");  // create a connection
-	$conn->debug=1;
-	$conn->PConnect("falcon", "scott", "tiger", "juris8.ecosystem.natsoft.com.my"); // connect to MySQL, testdb
-	print $conn->databaseType.':'.$conn->GenID();
-}
-
-if (0) {
-	$conn = &ADONewConnection("ibase");  // create a connection
-	$conn->debug=1;
-	$conn->Connect("localhost:c:\\Interbase\\Examples\\Database\\employee.gdb", "sysdba", "masterkey", ""); // connect to MySQL, testdb
-	print $conn->databaseType.':'.$conn->GenID().'
    ';
-}
-
-if (0) {
-	$conn = &ADONewConnection('postgres');
-	$conn->debug=1;
-	@$conn->PConnect("susetikus","tester","test","test");
-	print $conn->databaseType.':'.$conn->GenID().'
    ';
-}
-?>
+debug=1;
+	$conn->PConnect("localhost","root","","xphplens");
+	print $conn->databaseType.':'.$conn->GenID().'
    ';
+}
+
+if (0) {
+	$conn = &ADONewConnection("oci8");  // create a connection
+	$conn->debug=1;
+	$conn->PConnect("falcon", "scott", "tiger", "juris8.ecosystem.natsoft.com.my"); // connect to MySQL, testdb
+	print $conn->databaseType.':'.$conn->GenID();
+}
+
+if (0) {
+	$conn = &ADONewConnection("ibase");  // create a connection
+	$conn->debug=1;
+	$conn->Connect("localhost:c:\\Interbase\\Examples\\Database\\employee.gdb", "sysdba", "masterkey", ""); // connect to MySQL, testdb
+	print $conn->databaseType.':'.$conn->GenID().'
    ';
+}
+
+if (0) {
+	$conn = &ADONewConnection('postgres');
+	$conn->debug=1;
+	@$conn->PConnect("susetikus","tester","test","test");
+	print $conn->databaseType.':'.$conn->GenID().'
    ';
+}
+?>
diff --git a/lib/adodb/tests/testcache.php b/lib/adodb/tests/testcache.php
index c926a2a32ed..b4516d5e854 100644
--- a/lib/adodb/tests/testcache.php
+++ b/lib/adodb/tests/testcache.php
@@ -1,29 +1,29 @@
-
-
-PConnect('nwind');
-} else {
-	$db = ADONewConnection('mysql');
-	$db->PConnect('mangrove','root','','xphplens');
-}
-if (isset($cache)) $rs = $db->CacheExecute(120,'select * from products');
-else $rs = $db->Execute('select * from products');
-
-$arr = $rs->GetArray();
-print sizeof($arr);
+
+
+PConnect('nwind');
+} else {
+	$db = ADONewConnection('mysql');
+	$db->PConnect('mangrove','root','','xphplens');
+}
+if (isset($cache)) $rs = $db->CacheExecute(120,'select * from products');
+else $rs = $db->Execute('select * from products');
+
+$arr = $rs->GetArray();
+print sizeof($arr);
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/testdatabases.inc.php b/lib/adodb/tests/testdatabases.inc.php
index 7357e87de8e..871ec8d2729 100644
--- a/lib/adodb/tests/testdatabases.inc.php
+++ b/lib/adodb/tests/testdatabases.inc.php
@@ -1,285 +1,285 @@
-
-
-
    
-
    
-> Access
    
-> Interbase
    
-> MSSQL
    
- > MySQL
    
-> MySQL ODBC
    
-
    		> SQLite
    
-> MySQL Proxy
    
-> Oracle (oci8) 
    
-> PostgreSQL
    
-> PostgreSQL ODBC
    
-    		> DB2
    
-> VFP
    
-> ADO (for mssql and access)
    
-> $ADODB_COUNTRECS=false
    
-> No SQL Logging
    
-    		
-
-
    
-FETCH MODE IS NOT ADODB_FETCH_DEFAULT";
-
-if (isset($nocountrecs)) $ADODB_COUNTRECS = false;
-
-// cannot test databases below, but we include them anyway to check
-// if they parse ok...
-
-if (!strpos(PHP_VERSION,'5') === 0) {
-	ADOLoadCode("sybase");
-	ADOLoadCode("postgres");
-	ADOLoadCode("postgres7");
-	ADOLoadCode("firebird");
-	ADOLoadCode("borland_ibase");
-	ADOLoadCode("informix");
-	ADOLoadCode("sqlanywhere");
-}
-
-
-flush();
-if (!empty($testpostgres)) {
-	//ADOLoadCode("postgres");
-
-	$db = &ADONewConnection('postgres');
-	print "
    Connecting $db->databaseType...
    ";
-	if (@$db->Connect("localhost","tester","test","test")) {
-		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname varchar,created date)");
-	}else
-		print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.
    ".$db->ErrorMsg();
-}
-
-if (!empty($testpgodbc)) { 
-	
-	$db = &ADONewConnection('odbc');
-	$db->hasTransactions = false;
-	print "
    Connecting $db->databaseType...
    ";
-	
-	if ($db->PConnect('Postgresql')) {
-		$db->hasTransactions = true;
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	} else print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.
    ".$db->ErrorMsg();
-}
-
-if (!empty($testibase)) {
-	
-	$db = &ADONewConnection('firebird');
-	print "
    Connecting $db->databaseType...
    ";
-	if (@$db->PConnect("localhost:d:\\firebird\\10\\examples\\employee.gdb", "sysdba", "masterkey", ""))
-		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname char(24),price numeric(12,2),created date)");
-	 else print "ERROR: Interbase test requires a database called employee.gdb".'
    '.$db->ErrorMsg();
-	
-}
-
-
-if (!empty($testsqlite)) {
-	$db = &ADONewConnection('sqlite');
-	print "
    Connecting $db->databaseType...
    ";
-	
-	if (@$db->PConnect("d:\\inetpub\\adodb\\sqlite.db", "", "", ""))
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	else print "ERROR: SQLite";
-	
-}
-
-// REQUIRES ODBC DSN CALLED nwind
-if (!empty($testaccess)) {
-	$db = &ADONewConnection('access');
-	print "
    Connecting $db->databaseType...
    ";
-	
-	$dsn = "nwind";
-	$driver = "Driver={Microsoft Access Driver (*.mdb)};Dbq=d:\inetpub\adodb\northwind.mdb;Uid=Admin;Pwd=;";
-	if (@$db->PConnect($dsn, "", "", ""))
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	else print "ERROR: Access test requires a Windows ODBC DSN=nwind, Access driver";
-	
-}
-
-if (!empty($testaccess) && !empty($testado)) { // ADO ACCESS
-
-	$db = &ADONewConnection("ado_access");
-	print "
    Connecting $db->databaseType...
    ";
-	
-	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
-	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
-		. 'DATA SOURCE=' . $access . ';';
-		//. 'USER ID=;PASSWORD=;';
-	
-	if (@$db->PConnect($myDSN, "", "", "")) {
-		print "ADO version=".$db->_connectionID->version."
    ";
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	} else print "ERROR: Access test requires a Access database $access".'
    '.$db->ErrorMsg();
-	
-}
-
-if (!empty($testvfp)) { // ODBC
-	$db = &ADONewConnection('vfp');
-	print "
    Connecting $db->databaseType...
    ";flush();
-
-	if ( $db->PConnect("vfp-adoxyz")) {
-		testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
-	 } else print "ERROR: Visual FoxPro test requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
-	
-}
-
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysql)) { // MYSQL
-
-	$db = &ADONewConnection('mysql');
-	print "
    Connecting $db->databaseType...
    ";
-	if ($HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') $server = 'localhost';
-	else $server = "mangrove";
-	if ($db->PConnect($server, "root", "", "northwind")) {
-		//$db->debug=1;$db->Execute('drop table ADOXYZ');
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-	} else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
-}
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysqlodbc)) { // MYSQL
-	
-	$db = &ADONewConnection('odbc');
-	$db->hasTransactions = false;
-	print "
    Connecting $db->databaseType...
    ";
-	if ($HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') $server = 'localhost';
-	else $server = "mangrove";
-	if ($db->PConnect('mysql', "root", ""))
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
-}
-
-if (!empty($testproxy)){
-	$db = &ADONewConnection('proxy');
-	print "
    Connecting $db->databaseType...
    ";
-	if ($HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') $server = 'localhost';
-
-	if ($db->PConnect('http://localhost/php/phplens/adodb/server.php'))
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
-
-}
-
-ADOLoadCode('oci805');
-ADOLoadCode("oci8po");
-if (!empty($testoracle)) { 
-	
-	$db = ADONewConnection('oci8po');
-	print "
    Connecting $db->databaseType...
    ";
-	if ($db->Connect('', "scott", "natsoft",''))
-	//if ($db->PConnect("", "scott", "tiger", "juris.ecosystem.natsoft.com.my"))
-		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	else print "ERROR: Oracle test requires an Oracle server setup with scott/natsoft".'
    '.$db->ErrorMsg();
-
-}
-ADOLoadCode("oracle"); // no longer supported
-if (false && !empty($testoracle)) { 
-	
-	$db = ADONewConnection();
-	print "
    Connecting $db->databaseType...
    ";
-	if ($db->PConnect("", "scott", "tiger", "natsoft.domain"))
-		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	else print "ERROR: Oracle test requires an Oracle server setup with scott/tiger".'
    '.$db->ErrorMsg();
-
-}
-
-ADOLoadCode("db2"); // no longer supported
-if (!empty($testdb2)) { 
-	
-	$db = ADONewConnection();
-	print "
    Connecting $db->databaseType...
    ";
-	if ($db->Connect("db2_sample", "root", "natsoft", ""))
-		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'
    '.$db->ErrorMsg();
-
-}
-
-
-ADOLoadCode('odbc_mssql');
-if (!empty($testmssql)) { // MS SQL Server via ODBC
-	$db = ADONewConnection();
-	
-	print "
    Connecting $db->databaseType...
    ";
-	
-	$dsn = "mssql-northwind";
-	$dsn = "Driver={SQL Server};Server=localhost;Database=northwind;";
-	
-	if (@$db->PConnect($dsn, "adodb", "natsoft", ""))  {
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	}
-	else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with DSN setup";
-
-}
-
-ADOLoadCode("ado_mssql");
-
-if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC -- DSN-less
-	
-	$db = &ADONewConnection("ado_mssql");
-	//$db->debug=1;
-	print "
    Connecting DSN-less $db->databaseType...
    ";
-	
-	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
-		. "SERVER=tigress;DATABASE=NorthWind;UID=adodb;PWD=natsoft;Trusted_Connection=No"  ;
-
-		
-	if (@$db->PConnect($myDSN, "", "", ""))
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	else print "ERROR: MSSQL test 2 requires MS SQL 7";
-	
-}
-
-
-ADOLoadCode("mssqlpo");
-if (!empty($testmssql)) { // MS SQL Server -- the extension is buggy -- probably better to use ODBC
-	$db = ADONewConnection("mssqlpo");
-	//$db->debug=1;
-	print "
    Connecting $db->databaseType...
    ";
-	
-	$ok = $db->PConnect('tigress','adodb','natsoft','northwind');
-	//$rs = $db->Execute("exec sp_ddate");
-	//print_r($rs->fields);
-	//die();
-
-	if ($ok or @$db->PConnect("mangrove", "sa", "natsoft", "ai")) {
-		AutoDetect_MSSQL_Date_Order($db);
-	//	$db->Execute('drop table adoxyz');
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='192.168.0.1', userid='sa', password='natsoft', database='ai'".'
    '.$db->ErrorMsg();
-	
-}
-
-if (!empty($testmssql) && !empty($testado)) { // ADO ACCESS MSSQL with OLEDB provider
-
-	$db = &ADONewConnection("ado_mssql");
-	print "
    Connecting DSN-less OLEDB Provider $db->databaseType...
    ";
-	//$db->debug=1;
-	$myDSN="SERVER=tigress;DATABASE=northwind;Trusted_Connection=yes";
-	//$myDSN='SERVER=(local)\NetSDK;DATABASE=northwind;';
-	if ($db->PConnect($myDSN, "adodb", "natsoft", 'SQLOLEDB'))
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='mangrove', userid='sa', password='', database='ai'";
-
-}
-
-
-print "
    Tests Completed
    ";
-
-?>
+
+
+
    
+
    
+> Access
    
+> Interbase
    
+> MSSQL
    
+ > MySQL
    
+> MySQL ODBC
    
+
    		> SQLite
    
+> MySQL Proxy
    
+> Oracle (oci8) 
    
+> PostgreSQL
    
+> PostgreSQL ODBC
    
+    		> DB2
    
+> VFP
    
+> ADO (for mssql and access)
    
+> $ADODB_COUNTRECS=false
    
+> No SQL Logging
    
+    		
+
+
    
+FETCH MODE IS NOT ADODB_FETCH_DEFAULT";
+
+if (isset($nocountrecs)) $ADODB_COUNTRECS = false;
+
+// cannot test databases below, but we include them anyway to check
+// if they parse ok...
+
+if (!strpos(PHP_VERSION,'5') === 0) {
+	ADOLoadCode("sybase");
+	ADOLoadCode("postgres");
+	ADOLoadCode("postgres7");
+	ADOLoadCode("firebird");
+	ADOLoadCode("borland_ibase");
+	ADOLoadCode("informix");
+	ADOLoadCode("sqlanywhere");
+}
+
+
+flush();
+if (!empty($testpostgres)) {
+	//ADOLoadCode("postgres");
+
+	$db = &ADONewConnection('postgres');
+	print "
    Connecting $db->databaseType...
    ";
+	if (@$db->Connect("localhost","tester","test","test")) {
+		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname varchar,created date)");
+	}else
+		print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.
    ".$db->ErrorMsg();
+}
+
+if (!empty($testpgodbc)) { 
+	
+	$db = &ADONewConnection('odbc');
+	$db->hasTransactions = false;
+	print "
    Connecting $db->databaseType...
    ";
+	
+	if ($db->PConnect('Postgresql')) {
+		$db->hasTransactions = true;
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
+	} else print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.
    ".$db->ErrorMsg();
+}
+
+if (!empty($testibase)) {
+	
+	$db = &ADONewConnection('firebird');
+	print "
    Connecting $db->databaseType...
    ";
+	if (@$db->PConnect("localhost:d:\\firebird\\10\\examples\\employee.gdb", "sysdba", "masterkey", ""))
+		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname char(24),price numeric(12,2),created date)");
+	 else print "ERROR: Interbase test requires a database called employee.gdb".'
    '.$db->ErrorMsg();
+	
+}
+
+
+if (!empty($testsqlite)) {
+	$db = &ADONewConnection('sqlite');
+	print "
    Connecting $db->databaseType...
    ";
+	
+	if (@$db->PConnect("d:\\inetpub\\adodb\\sqlite.db", "", "", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: SQLite";
+	
+}
+
+// REQUIRES ODBC DSN CALLED nwind
+if (!empty($testaccess)) {
+	$db = &ADONewConnection('access');
+	print "
    Connecting $db->databaseType...
    ";
+	
+	$dsn = "nwind";
+	$driver = "Driver={Microsoft Access Driver (*.mdb)};Dbq=d:\inetpub\adodb\northwind.mdb;Uid=Admin;Pwd=;";
+	if (@$db->PConnect($dsn, "", "", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: Access test requires a Windows ODBC DSN=nwind, Access driver";
+	
+}
+
+if (!empty($testaccess) && !empty($testado)) { // ADO ACCESS
+
+	$db = &ADONewConnection("ado_access");
+	print "
    Connecting $db->databaseType...
    ";
+	
+	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
+	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
+		. 'DATA SOURCE=' . $access . ';';
+		//. 'USER ID=;PASSWORD=;';
+	
+	if (@$db->PConnect($myDSN, "", "", "")) {
+		print "ADO version=".$db->_connectionID->version."
    ";
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	} else print "ERROR: Access test requires a Access database $access".'
    '.$db->ErrorMsg();
+	
+}
+
+if (!empty($testvfp)) { // ODBC
+	$db = &ADONewConnection('vfp');
+	print "
    Connecting $db->databaseType...
    ";flush();
+
+	if ( $db->PConnect("vfp-adoxyz")) {
+		testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
+	 } else print "ERROR: Visual FoxPro test requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
+	
+}
+
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysql)) { // MYSQL
+
+	$db = &ADONewConnection('mysql');
+	print "
    Connecting $db->databaseType...
    ";
+	if (PHP_VERSION >= 5 || $HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') $server = 'localhost';
+	else $server = "mangrove";
+	if ($db->PConnect($server, "root", "", "northwind")) {
+		//$db->debug=1;$db->Execute('drop table ADOXYZ');
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
+	} else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
+}
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysqlodbc)) { // MYSQL
+	
+	$db = &ADONewConnection('odbc');
+	$db->hasTransactions = false;
+	print "
    Connecting $db->databaseType...
    ";
+	if ($HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') $server = 'localhost';
+	else $server = "mangrove";
+	if ($db->PConnect('mysql', "root", ""))
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
+	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
+}
+
+if (!empty($testproxy)){
+	$db = &ADONewConnection('proxy');
+	print "
    Connecting $db->databaseType...
    ";
+	if ($HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') $server = 'localhost';
+
+	if ($db->PConnect('http://localhost/php/phplens/adodb/server.php'))
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
+	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
+
+}
+
+ADOLoadCode('oci805');
+ADOLoadCode("oci8po");
+if (!empty($testoracle)) { 
+	
+	$db = ADONewConnection('oci8po');
+	print "
    Connecting $db->databaseType...
    ";
+	if ($db->Connect('', "scott", "natsoft",''))
+	//if ($db->PConnect("", "scott", "tiger", "juris.ecosystem.natsoft.com.my"))
+		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+	else print "ERROR: Oracle test requires an Oracle server setup with scott/natsoft".'
    '.$db->ErrorMsg();
+
+}
+ADOLoadCode("oracle"); // no longer supported
+if (false && !empty($testoracle)) { 
+	
+	$db = ADONewConnection();
+	print "
    Connecting $db->databaseType...
    ";
+	if ($db->PConnect("", "scott", "tiger", "natsoft.domain"))
+		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+	else print "ERROR: Oracle test requires an Oracle server setup with scott/tiger".'
    '.$db->ErrorMsg();
+
+}
+
+ADOLoadCode("db2"); // no longer supported
+if (!empty($testdb2)) { 
+	
+	$db = ADONewConnection();
+	print "
    Connecting $db->databaseType...
    ";
+	if ($db->Connect("db2_sample", "root", "natsoft", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+	else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'
    '.$db->ErrorMsg();
+
+}
+
+
+ADOLoadCode('odbc_mssql');
+if (!empty($testmssql)) { // MS SQL Server via ODBC
+	$db = ADONewConnection();
+	
+	print "
    Connecting $db->databaseType...
    ";
+	
+	$dsn = "mssql-northwind";
+	$dsn = "Driver={SQL Server};Server=localhost;Database=northwind;";
+	
+	if (@$db->PConnect($dsn, "adodb", "natsoft", ""))  {
+		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
+	}
+	else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with DSN setup";
+
+}
+
+ADOLoadCode("ado_mssql");
+
+if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC -- DSN-less
+	
+	$db = &ADONewConnection("ado_mssql");
+	//$db->debug=1;
+	print "
    Connecting DSN-less $db->databaseType...
    ";
+	
+	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
+		. "SERVER=tigress;DATABASE=NorthWind;UID=adodb;PWD=natsoft;Trusted_Connection=No"  ;
+
+		
+	if (@$db->PConnect($myDSN, "", "", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
+	else print "ERROR: MSSQL test 2 requires MS SQL 7";
+	
+}
+
+
+ADOLoadCode("mssqlpo");
+if (!empty($testmssql)) { // MS SQL Server -- the extension is buggy -- probably better to use ODBC
+	$db = ADONewConnection("mssqlpo");
+	//$db->debug=1;
+	print "
    Connecting $db->databaseType...
    ";
+	
+	$ok = $db->PConnect('tigress','adodb','natsoft','northwind');
+	//$rs = $db->Execute("exec sp_ddate");
+	//print_r($rs->fields);
+	//die();
+
+	if ($ok or @$db->PConnect("mangrove", "sa", "natsoft", "ai")) {
+		AutoDetect_MSSQL_Date_Order($db);
+	//	$db->Execute('drop table adoxyz');
+		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
+	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='192.168.0.1', userid='sa', password='natsoft', database='ai'".'
    '.$db->ErrorMsg();
+	
+}
+
+if (!empty($testmssql) && !empty($testado)) { // ADO ACCESS MSSQL with OLEDB provider
+
+	$db = &ADONewConnection("ado_mssql");
+	print "
    Connecting DSN-less OLEDB Provider $db->databaseType...
    ";
+	//$db->debug=1;
+	$myDSN="SERVER=tigress;DATABASE=northwind;Trusted_Connection=yes";
+	//$myDSN='SERVER=(local)\NetSDK;DATABASE=northwind;';
+	if ($db->PConnect($myDSN, "adodb", "natsoft", 'SQLOLEDB'))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='mangrove', userid='sa', password='', database='ai'";
+
+}
+
+
+print "
    Tests Completed
    ";
+
+?>
diff --git a/lib/adodb/tests/testgenid.php b/lib/adodb/tests/testgenid.php
index 05554dd29d7..479f7124b53 100644
--- a/lib/adodb/tests/testgenid.php
+++ b/lib/adodb/tests/testgenid.php
@@ -1,36 +1,36 @@
-Execute("drop table $table");
-	//$db->debug=true;
-	
-	$ctr = 5000;
-	$lastnum = 0;
-	
-	while (--$ctr >= 0) {
-		$num = $db->GenID($table);
-		if ($num === false) {	
-			print "GenID returned false";
-			break;
-		}
-		if ($lastnum + 1 == $num) print " $num ";
-		else {
-			print " $num ";
-			flush();
-		}
-		$lastnum = $num;
-	}
-}
+Execute("drop table $table");
+	//$db->debug=true;
+	
+	$ctr = 5000;
+	$lastnum = 0;
+	
+	while (--$ctr >= 0) {
+		$num = $db->GenID($table);
+		if ($num === false) {	
+			print "GenID returned false";
+			break;
+		}
+		if ($lastnum + 1 == $num) print " $num ";
+		else {
+			print " $num ";
+			flush();
+		}
+		$lastnum = $num;
+	}
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/testmssql.php b/lib/adodb/tests/testmssql.php
index b54b850c322..6db4123c194 100644
--- a/lib/adodb/tests/testmssql.php
+++ b/lib/adodb/tests/testmssql.php
@@ -1,62 +1,76 @@
-Connect('localhost','sa','natsoft','northwind') or die('Fail');
-
-$p = $conn->Prepare('insert into products (productname,unitprice,dcreated) values (?,?,?)');
-echo "
    ";
-print_r($p);
-
-$conn->debug=1;
-$conn->Execute($p,array('John'.rand(),33.3,$conn->DBDate(time())));
-
-$p = $conn->Prepare('select * from products where productname like ?');
-$arr = $conn->getarray($p,array('V%'));
-print_r($arr);
-die();
-
-//$conn = &ADONewConnection("mssql");
-//$conn->Connect('mangrove','sa','natsoft','ai');
-
-//$conn->Connect('mangrove','sa','natsoft','ai');
-$conn->debug=1;
-$conn->Execute('delete from blobtest');
-
-$conn->Execute('insert into blobtest (id) values(1)');
-$conn->UpdateBlobFile('blobtest','b1','../cute_icons_for_site/adodb.gif','id=1');
-$rs = $conn->Execute('select b1 from blobtest where id=1');
-
-$output = "c:\\temp\\test_out-".date('H-i-s').".gif"; 
-print "Saving file $output, size=".strlen($rs->fields[0])."
    ";
-$fd = fopen($output, "wb"); 
-fwrite($fd, $rs->fields[0]); 
-fclose($fd); 
-
-print " View Image";
-//$rs = $conn->Execute('SELECT id,SUBSTRING(b1, 1, 10) FROM blobtest');
-//rs2html($rs);
+Connect('localhost','sa','natsoft','northwind') or die('Fail');
+
+$conn->debug =1;
+$query = 'select * from products';
+$conn->SetFetchMode(ADODB_FETCH_ASSOC);
+$rs = $conn->Execute($query);
+echo "
    ";
+while( !$rs->EOF ) {
+	$output[] = $rs->fields;
+	var_dump($rs->fields);
+	$rs->MoveNext();
+	print "
    ";
+}
+die();
+
+
+$p = $conn->Prepare('insert into products (productname,unitprice,dcreated) values (?,?,?)');
+echo "
    ";
+print_r($p);
+
+$conn->debug=1;
+$conn->Execute($p,array('John'.rand(),33.3,$conn->DBDate(time())));
+
+$p = $conn->Prepare('select * from products where productname like ?');
+$arr = $conn->getarray($p,array('V%'));
+print_r($arr);
+die();
+
+//$conn = &ADONewConnection("mssql");
+//$conn->Connect('mangrove','sa','natsoft','ai');
+
+//$conn->Connect('mangrove','sa','natsoft','ai');
+$conn->debug=1;
+$conn->Execute('delete from blobtest');
+
+$conn->Execute('insert into blobtest (id) values(1)');
+$conn->UpdateBlobFile('blobtest','b1','../cute_icons_for_site/adodb.gif','id=1');
+$rs = $conn->Execute('select b1 from blobtest where id=1');
+
+$output = "c:\\temp\\test_out-".date('H-i-s').".gif"; 
+print "Saving file $output, size=".strlen($rs->fields[0])."
    ";
+$fd = fopen($output, "wb"); 
+fwrite($fd, $rs->fields[0]); 
+fclose($fd); 
+
+print " View Image";
+//$rs = $conn->Execute('SELECT id,SUBSTRING(b1, 1, 10) FROM blobtest');
+//rs2html($rs);
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/testoci8.php b/lib/adodb/tests/testoci8.php
index bf743acb2fe..d748efca463 100644
--- a/lib/adodb/tests/testoci8.php
+++ b/lib/adodb/tests/testoci8.php
@@ -1,70 +1,70 @@
-
-
-PConnect('','scott','tiger');
-
-	if (!empty($testblob)) {
-		$varHoldingBlob = 'ABC DEF GEF John TEST';
-		$num = time()%10240;
-		// create table atable (id integer, ablob blob);
-		$db->Execute('insert into ATABLE (id,ablob) values('.$num.',empty_blob())');
-		$db->UpdateBlob('ATABLE', 'ablob', $varHoldingBlob, 'id='.$num, 'BLOB');
-		
-		$rs = &$db->Execute('select * from atable');
-		
-		if (!$rs) die("Empty RS");
-		if ($rs->EOF) die("EOF RS");
-		rs2html($rs);
-	}
-	$stmt = $db->Prepare('select * from adoxyz where id=?');
-	for ($i = 1; $i <= 10; $i++) {
-	$rs = &$db->Execute(
-		$stmt,
-		array($i));
-			
-		if (!$rs) die("Empty RS");
-		if ($rs->EOF) die("EOF RS");
-		rs2html($rs);
-	}
-}
-if (1) {
-	$db = ADONewConnection('oci8');
-	$db->PConnect('','scott','tiger');
-	$db->debug = true;
-	$db->Execute("delete from emp where ename='John'");
-	print $db->Affected_Rows().'
    ';
-	$stmt = &$db->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
-	$rs = $db->Execute($stmt,array('empno'=>4321,'ename'=>'John'));
-	// prepare not quite ready for prime time
-	//$rs = $db->Execute($stmt,array('empno'=>3775,'ename'=>'John'));
-	if (!$rs) die("Empty RS");
-}
-
-if (0) {
-	$db = ADONewConnection('odbc_oracle');
-	if (!$db->PConnect('local_oracle','scott','tiger')) die('fail connect');
-	$db->debug = true;
-	$rs = &$db->Execute(
-		'select * from adoxyz where firstname=? and trim(lastname)=?',
-		array('first'=>'Caroline','last'=>'Miranda'));
-	if (!$rs) die("Empty RS");
-	if ($rs->EOF) die("EOF RS");
-	rs2html($rs);
-}
+
+
+PConnect('','scott','tiger');
+
+	if (!empty($testblob)) {
+		$varHoldingBlob = 'ABC DEF GEF John TEST';
+		$num = time()%10240;
+		// create table atable (id integer, ablob blob);
+		$db->Execute('insert into ATABLE (id,ablob) values('.$num.',empty_blob())');
+		$db->UpdateBlob('ATABLE', 'ablob', $varHoldingBlob, 'id='.$num, 'BLOB');
+		
+		$rs = &$db->Execute('select * from atable');
+		
+		if (!$rs) die("Empty RS");
+		if ($rs->EOF) die("EOF RS");
+		rs2html($rs);
+	}
+	$stmt = $db->Prepare('select * from adoxyz where id=?');
+	for ($i = 1; $i <= 10; $i++) {
+	$rs = &$db->Execute(
+		$stmt,
+		array($i));
+			
+		if (!$rs) die("Empty RS");
+		if ($rs->EOF) die("EOF RS");
+		rs2html($rs);
+	}
+}
+if (1) {
+	$db = ADONewConnection('oci8');
+	$db->PConnect('','scott','tiger');
+	$db->debug = true;
+	$db->Execute("delete from emp where ename='John'");
+	print $db->Affected_Rows().'
    ';
+	$stmt = &$db->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
+	$rs = $db->Execute($stmt,array('empno'=>4321,'ename'=>'John'));
+	// prepare not quite ready for prime time
+	//$rs = $db->Execute($stmt,array('empno'=>3775,'ename'=>'John'));
+	if (!$rs) die("Empty RS");
+}
+
+if (0) {
+	$db = ADONewConnection('odbc_oracle');
+	if (!$db->PConnect('local_oracle','scott','tiger')) die('fail connect');
+	$db->debug = true;
+	$rs = &$db->Execute(
+		'select * from adoxyz where firstname=? and trim(lastname)=?',
+		array('first'=>'Caroline','last'=>'Miranda'));
+	if (!$rs) die("Empty RS");
+	if ($rs->EOF) die("EOF RS");
+	rs2html($rs);
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/testoci8cursor.php b/lib/adodb/tests/testoci8cursor.php
index 19afa3628d3..a80fc9b9392 100644
--- a/lib/adodb/tests/testoci8cursor.php
+++ b/lib/adodb/tests/testoci8cursor.php
@@ -1,109 +1,115 @@
-PConnect('','scott','natsoft');
-	$db->debug = 99;
-
-
-/*
--- TEST PACKAGE
-CREATE OR REPLACE PACKAGE adodb AS
-TYPE TabType IS REF CURSOR RETURN tab%ROWTYPE;
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar);
-PROCEDURE data_out(input IN varchar, output OUT varchar); 
-END adodb;
-/
-
-CREATE OR REPLACE PACKAGE BODY adodb AS
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM tab where tname like tablenames;
-	END open_tab;
-	
-PROCEDURE data_out(input IN varchar, output OUT varchar) IS
-	BEGIN
-		output := 'Cinta Hati '||input;
-	END;
-END adodb;
-/
-*/
-	$stmt = $db->Prepare("BEGIN adodb.open_tab(:RS,'A%'); END;");
-	$db->InParameter($stmt, $cur, 'RS', -1, OCI_B_CURSOR);
-	$rs = $db->Execute($stmt);
-
-	if ($rs && !$rs->EOF) {
-		print "Test 1 RowCount: ".$rs->RecordCount()."
    ";
-	} else {
-		print "Error in using Cursor Variables 1
    ";
-	}
-	
-	
-	print "
    Testing Stored Procedures for oci8
    ";
-	
-	$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;",true);
-	$a1 = 'Malaysia';
-	//$a2 = ''; # a2 doesn't even need to be defined!
-	$db->InParameter($stmt,$a1,'a1');
-	$db->OutParameter($stmt,$a2,'a2');
-	$rs = $db->Execute($stmt);
-	if ($rs) {
-		if ($a2 !== 'Cinta Hati Malaysia') print "Stored Procedure Error: a2 = $a2
    ";
-		else echo  "OK: a2=$a2
    ";
-	} else {
-		print "Error in using Stored Procedure IN/Out Variables
    ";
-	}
-	
-	
-	$tname = 'A%';
-	
-	$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
-	$db->Parameter($stmt,$tname,'tablename');
-	$rs = $db->Execute($stmt);
-	rs2html($rs);
-		
-		
+PConnect('','scott','natsoft');
+	$db->debug = 99;
+
+
+/*
+*/
+
+	define('MYNUM',5);
+	
+
+	
+	$stmt = $db->Prepare("BEGIN adodb.open_tab(:RS,'A%'); END;");
+	$db->InParameter($stmt, $cur, 'RS', -1, OCI_B_CURSOR);
+	$rs = $db->Execute($stmt);
+
+	if ($rs && !$rs->EOF) {
+		print "Test 1 RowCount: ".$rs->RecordCount()."
    ";
+	} else {
+		print "Error in using Cursor Variables 1
    ";
+	}
+	
+	
+	print "
    Testing Stored Procedures for oci8
    ";
+	
+	$stid = $db->PrepareSP('BEGIN adodb.myproc('.MYNUM.', :myov); END;');
+	$db->OutParameter($stid, $myov, 'myov');
+	$db->Execute($stid);
+	if ($myov != MYNUM) print "
    Error with myproc
    ";
+	
+	
+	$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;",true);
+	$a1 = 'Malaysia';
+	//$a2 = ''; # a2 doesn't even need to be defined!
+	$db->InParameter($stmt,$a1,'a1');
+	$db->OutParameter($stmt,$a2,'a2');
+	$rs = $db->Execute($stmt);
+	if ($rs) {
+		if ($a2 !== 'Cinta Hati Malaysia') print "Stored Procedure Error: a2 = $a2
    ";
+		else echo  "OK: a2=$a2
    ";
+	} else {
+		print "Error in using Stored Procedure IN/Out Variables
    ";
+	}
+	
+	
+	$tname = 'A%';
+	
+	$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
+	$db->Parameter($stmt,$tname,'tablename');
+	$rs = $db->Execute($stmt);
+	rs2html($rs);
+		
+		
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/testpaging.php b/lib/adodb/tests/testpaging.php
index 3cf29aaf7d3..89c9594649d 100644
--- a/lib/adodb/tests/testpaging.php
+++ b/lib/adodb/tests/testpaging.php
@@ -1,83 +1,83 @@
-PConnect('localhost','tester','test','test');
-}
-
-if ($driver == 'access') {
-	$db = NewADOConnection('access');
-	$db->PConnect("nwind", "", "", "");
-}
-
-if ($driver == 'ibase') {
-	$db = NewADOConnection('ibase');
-	$db->PConnect("localhost:e:\\firebird\\examples\\employee.gdb", "sysdba", "masterkey", "");
-	$sql = 'select distinct firstname, lastname  from adoxyz  order  by  firstname';
-
-}
-if ($driver == 'mssql') {
-	$db = NewADOConnection('mssql');
-	$db->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-}
-if ($driver == 'oci8') {
-	$db = NewADOConnection('oci8');
-	$db->Connect('','scott','natsoft');
-}
-
-if ($driver == 'access') {
-	$db = NewADOConnection('access');
-	$db->Connect('nwind');
-}
-
-if (empty($driver) or $driver == 'mysql') {
-	$db = NewADOConnection('mysql');
-	$db->Connect('localhost','root','','xphplens');
-}
-
-//$db->pageExecuteCountRows = false;
-
-$db->debug = true;
-
-if (0) {
-$rs = &$db->Execute($sql);
-include_once('../toexport.inc.php');
-print "
    ";
-print rs2csv($rs); # return a string
-
-print '
    ';
-$rs->MoveFirst(); # note, some databases do not support MoveFirst
-print rs2tab($rs); # return a string
-
-print '
    ';
-$rs->MoveFirst();
-rs2tabout($rs); # send to stdout directly
-print "
    ";
-}
-
-$pager = new ADODB_Pager($db,$sql);
-$pager->showPageLinks = true;
-$pager->linksPerPage = 3;
-$pager->cache = 60;
-$pager->Render($rows=7);
+PConnect('localhost','tester','test','test');
+}
+
+if ($driver == 'access') {
+	$db = NewADOConnection('access');
+	$db->PConnect("nwind", "", "", "");
+}
+
+if ($driver == 'ibase') {
+	$db = NewADOConnection('ibase');
+	$db->PConnect("localhost:e:\\firebird\\examples\\employee.gdb", "sysdba", "masterkey", "");
+	$sql = 'select distinct firstname, lastname  from adoxyz  order  by  firstname';
+
+}
+if ($driver == 'mssql') {
+	$db = NewADOConnection('mssql');
+	$db->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
+}
+if ($driver == 'oci8') {
+	$db = NewADOConnection('oci8');
+	$db->Connect('','scott','natsoft');
+}
+
+if ($driver == 'access') {
+	$db = NewADOConnection('access');
+	$db->Connect('nwind');
+}
+
+if (empty($driver) or $driver == 'mysql') {
+	$db = NewADOConnection('mysql');
+	$db->Connect('localhost','root','','xphplens');
+}
+
+//$db->pageExecuteCountRows = false;
+
+$db->debug = true;
+
+if (0) {
+$rs = &$db->Execute($sql);
+include_once('../toexport.inc.php');
+print "
    ";
+print rs2csv($rs); # return a string
+
+print '
    ';
+$rs->MoveFirst(); # note, some databases do not support MoveFirst
+print rs2tab($rs); # return a string
+
+print '
    ';
+$rs->MoveFirst();
+rs2tabout($rs); # send to stdout directly
+print "
    ";
+}
+
+$pager = new ADODB_Pager($db,$sql);
+$pager->showPageLinks = true;
+$pager->linksPerPage = 3;
+$pager->cache = 60;
+$pager->Render($rows=7);
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/testpear.php b/lib/adodb/tests/testpear.php
index d3bd9d6469f..05ef8ca8719 100644
--- a/lib/adodb/tests/testpear.php
+++ b/lib/adodb/tests/testpear.php
@@ -1,34 +1,34 @@
-setFetchMode(ADODB_FETCH_ASSOC);
-$rs = $db->Query('select firstname,lastname from adoxyz');
-$cnt = 0;
-while ($arr = $rs->FetchRow()) {
-	print_r($arr);
-	print "
    ";
-	$cnt += 1;
-}
-
-if ($cnt != 50) print "Error in \$cnt = $cnt";
+setFetchMode(ADODB_FETCH_ASSOC);
+$rs = $db->Query('select firstname,lastname from adoxyz');
+$cnt = 0;
+while ($arr = $rs->FetchRow()) {
+	print_r($arr);
+	print "
    ";
+	$cnt += 1;
+}
+
+if ($cnt != 50) print "Error in \$cnt = $cnt";
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/testsessions.php b/lib/adodb/tests/testsessions.php
index 597987c18ee..691aa5f988a 100644
--- a/lib/adodb/tests/testsessions.php
+++ b/lib/adodb/tests/testsessions.php
@@ -1,66 +1,66 @@
-Notify Expiring=$ref, sessionkey=$key
    ";
-}
-
-//-------------------------------------------------------------------
-	
-	
-#### CONNECTION
-	$ADODB_SESSION_DRIVER='oci8';
-	$ADODB_SESSION_CONNECT='';
-	$ADODB_SESSION_USER ='scott';
-	$ADODB_SESSION_PWD ='natsoft';
-	$ADODB_SESSION_DB ='';
-	
-	
-### TURN DEBUGGING ON
-	$ADODB_SESS_DEBUG = true;
-
-	
-#### SETUP NOTIFICATION
-	$USER = 'JLIM'.rand();
-	$ADODB_SESSION_EXPIRE_NOTIFY = array('USER','NotifyExpire');
-
-	
-#### INIT
-	ob_start();
-	error_reporting(E_ALL);
-	include('../session/adodb-cryptsession.php');
-	session_start();
-
-
-### SETUP SESSION VARIABLES 
-	$HTTP_SESSION_VARS['MONKEY'] = array('1','abc',44.41);
-	if (!isset($HTTP_GET_VARS['nochange'])) @$HTTP_SESSION_VARS['AVAR'] += 1;
-
-	
-### START DISPLAY
-	print "
    PHP ".PHP_VERSION."
    ";
-	print "
    \$HTTP_SESSION_VARS['AVAR']={$HTTP_SESSION_VARS['AVAR']}
    ";
-	
-	print "
     Cookies: ";
-	print_r($HTTP_COOKIE_VARS);
-	
-### RANDOMLY PERFORM Garbage Collection
-	if (rand() % 10 == 0) {
-	
-		print "
    Garbage Collection
    ";
-		adodb_sess_gc(10);
-		
-		print "
    Random session destroy
    ";
-		session_destroy();
-	}
+Notify Expiring=$ref, sessionkey=$key
    ";
+}
+
+//-------------------------------------------------------------------
+	
+	
+#### CONNECTION
+	$ADODB_SESSION_DRIVER='oci8';
+	$ADODB_SESSION_CONNECT='';
+	$ADODB_SESSION_USER ='scott';
+	$ADODB_SESSION_PWD ='natsoft';
+	$ADODB_SESSION_DB ='';
+	
+	
+### TURN DEBUGGING ON
+	$ADODB_SESS_DEBUG = true;
+
+	
+#### SETUP NOTIFICATION
+	$USER = 'JLIM'.rand();
+	$ADODB_SESSION_EXPIRE_NOTIFY = array('USER','NotifyExpire');
+
+	
+#### INIT
+	ob_start();
+	error_reporting(E_ALL);
+	include('../session/adodb-cryptsession.php');
+	session_start();
+
+
+### SETUP SESSION VARIABLES 
+	$HTTP_SESSION_VARS['MONKEY'] = array('1','abc',44.41);
+	if (!isset($HTTP_GET_VARS['nochange'])) @$HTTP_SESSION_VARS['AVAR'] += 1;
+
+	
+### START DISPLAY
+	print "
    PHP ".PHP_VERSION."
    ";
+	print "
    \$HTTP_SESSION_VARS['AVAR']={$HTTP_SESSION_VARS['AVAR']}
    ";
+	
+	print "
     Cookies: ";
+	print_r($HTTP_COOKIE_VARS);
+	
+### RANDOMLY PERFORM Garbage Collection
+	if (rand() % 10 == 0) {
+	
+		print "
    Garbage Collection
    ";
+		adodb_sess_gc(10);
+		
+		print "
    Random session destroy
    ";
+		session_destroy();
+	}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tests/tmssql.php b/lib/adodb/tests/tmssql.php
index e20db41ed29..a3b743ca1f4 100644
--- a/lib/adodb/tests/tmssql.php
+++ b/lib/adodb/tests/tmssql.php
@@ -1,65 +1,65 @@
-mssql";
-	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
-	mssql_select_db('northwind',$db);
-	
-	$rs = mssql_query('select getdate() as date',$db);
-	$o = mssql_fetch_row($rs);
-	print_r($o);
-	mssql_free_result($rs);
-	
-	print "
    Delete
    "; flush();
-	$rs2 = mssql_query('delete from adoxyz',$db);
-	$p = mssql_num_rows($rs2);
-	mssql_free_result($rs2);
-
-}
-
-function tpear()
-{
-include_once('DB.php');
-
-	print "
    PEAR
    ";
-	$username = 'adodb';
-	$password = 'natsoft';
-	$hostname = 'JAGUAR\vsdotnet';
-	$databasename = 'northwind';
-	
-	$dsn = "mssql://$username:$password@$hostname/$databasename";
-	$conn = &DB::connect($dsn);
-	print "date=".$conn->GetOne('select getdate()')."
    ";
-	@$conn->query('create table tester (id integer)');
-	print "
    Delete
    "; flush();
-	$rs = $conn->query('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."
    ";
-}
-
-function tadodb()
-{
-include_once('../adodb.inc.php');
-
-	print "
    ADOdb
    ";
-	$conn = NewADOConnection('mssql');
-	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-//	$conn->debug=1;
-	print "date=".$conn->GetOne('select getdate()')."
    ";
-	$conn->Execute('create table tester (id integer)');
-	print "
    Delete
    "; flush();
-	$rs = $conn->Execute('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."
    ";
-}
-?>
-mssql
-pear
-adodb
-mssql";
+	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
+	mssql_select_db('northwind',$db);
+	
+	$rs = mssql_query('select getdate() as date',$db);
+	$o = mssql_fetch_row($rs);
+	print_r($o);
+	mssql_free_result($rs);
+	
+	print "
    Delete
    "; flush();
+	$rs2 = mssql_query('delete from adoxyz',$db);
+	$p = mssql_num_rows($rs2);
+	mssql_free_result($rs2);
+
+}
+
+function tpear()
+{
+include_once('DB.php');
+
+	print "
    PEAR
    ";
+	$username = 'adodb';
+	$password = 'natsoft';
+	$hostname = 'JAGUAR\vsdotnet';
+	$databasename = 'northwind';
+	
+	$dsn = "mssql://$username:$password@$hostname/$databasename";
+	$conn = &DB::connect($dsn);
+	print "date=".$conn->GetOne('select getdate()')."
    ";
+	@$conn->query('create table tester (id integer)');
+	print "
    Delete
    "; flush();
+	$rs = $conn->query('delete from tester');
+	print "date=".$conn->GetOne('select getdate()')."
    ";
+}
+
+function tadodb()
+{
+include_once('../adodb.inc.php');
+
+	print "
    ADOdb
    ";
+	$conn = NewADOConnection('mssql');
+	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
+//	$conn->debug=1;
+	print "date=".$conn->GetOne('select getdate()')."
    ";
+	$conn->Execute('create table tester (id integer)');
+	print "
    Delete
    "; flush();
+	$rs = $conn->Execute('delete from tester');
+	print "date=".$conn->GetOne('select getdate()')."
    ";
+}
+?>
+mssql
+pear
+adodb
+
\ No newline at end of file
diff --git a/lib/adodb/tests/xmlschema.xml b/lib/adodb/tests/xmlschema.xml
index acae10741ab..6fc9ab798a6 100644
--- a/lib/adodb/tests/xmlschema.xml
+++ b/lib/adodb/tests/xmlschema.xml
@@ -1,29 +1,30 @@
-
-
-  
-    
-      An integer row that's a primary key and autoincrements
-      
-      
-    
-    
-      A 16 character varchar row that can't be null
-      
-    
-  
    
-  
-    row1
-    row2
-  
-  
-    SQL to be executed only on specific platforms
-    
-      insert into mytable ( row1, row2 ) values ( 12, 'stuff' )
-    
-    
-      insert into mytable ( row1, row2 ) values ( 12, 'different stuff' )
-    
-  
-  
    
-  
-    
+
+
+  
+    
+      An integer row that's a primary key and autoincrements
+      
+      
+    
+    
+      A 16 character varchar row that can't be null
+      
+    
+    
+      row1
+      row2
+    
+  
    
+  
+    SQL to be executed only on specific platforms
+    
+      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
+    
+    
+      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
+    
+  
+  
+    
+  
    
+    
\ No newline at end of file
diff --git a/lib/adodb/toexport.inc.php b/lib/adodb/toexport.inc.php
index c5a63fc54e8..80c9e2af3a0 100644
--- a/lib/adodb/toexport.inc.php
+++ b/lib/adodb/toexport.inc.php
@@ -1,131 +1,131 @@
-FieldTypesArray();
-		reset($fieldTypes);
-		while(list(,$o) = each($fieldTypes)) {
-			
-			$v = $o->name;
-			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
-			$v = strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
-			$elements[] = $v;
-			
-		}
-		$s .= implode($sep, $elements).$NEWLINE;
-	}
-	$hasNumIndex = isset($rs->fields[0]);
-	
-	$line = 0;
-	$max = $rs->FieldCount();
-	
-	while (!$rs->EOF) {
-		$elements = array();
-		$i = 0;
-		
-		if ($hasNumIndex) {
-			for ($j=0; $j < $max; $j++) {
-				$v = trim($rs->fields[$j]);
-				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
-				$v = strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
-				
-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
-				else $elements[] = $v;
-			}
-		} else { // ASSOCIATIVE ARRAY
-			foreach($rs->fields as $v) {
-				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
-				$v = strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
-				
-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
-				else $elements[] = $v;
-			}
-		}
-		$s .= implode($sep, $elements).$NEWLINE;
-		$rs->MoveNext();
-		$line += 1;
-		if ($fp && ($line % $BUFLINES) == 0) {
-			if ($fp === true) echo $s;
-			else fwrite($fp,$s);
-			$s = '';
-		}
-	}
-	
-	if ($fp) {
-		if ($fp === true) echo $s;
-		else fwrite($fp,$s);
-		$s = '';
-	}
-	
-	return $s;
-}
+FieldTypesArray();
+		reset($fieldTypes);
+		while(list(,$o) = each($fieldTypes)) {
+			
+			$v = $o->name;
+			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
+			$v = strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
+			$elements[] = $v;
+			
+		}
+		$s .= implode($sep, $elements).$NEWLINE;
+	}
+	$hasNumIndex = isset($rs->fields[0]);
+	
+	$line = 0;
+	$max = $rs->FieldCount();
+	
+	while (!$rs->EOF) {
+		$elements = array();
+		$i = 0;
+		
+		if ($hasNumIndex) {
+			for ($j=0; $j < $max; $j++) {
+				$v = trim($rs->fields[$j]);
+				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
+				$v = strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
+				
+				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+				else $elements[] = $v;
+			}
+		} else { // ASSOCIATIVE ARRAY
+			foreach($rs->fields as $v) {
+				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
+				$v = strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
+				
+				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+				else $elements[] = $v;
+			}
+		}
+		$s .= implode($sep, $elements).$NEWLINE;
+		$rs->MoveNext();
+		$line += 1;
+		if ($fp && ($line % $BUFLINES) == 0) {
+			if ($fp === true) echo $s;
+			else fwrite($fp,$s);
+			$s = '';
+		}
+	}
+	
+	if ($fp) {
+		if ($fp === true) echo $s;
+		else fwrite($fp,$s);
+		$s = '';
+	}
+	
+	return $s;
+}
 ?>
\ No newline at end of file
diff --git a/lib/adodb/tohtml.inc.php b/lib/adodb/tohtml.inc.php
index d42c7d8993d..dac81ddb756 100644
--- a/lib/adodb/tohtml.inc.php
+++ b/lib/adodb/tohtml.inc.php
@@ -1,6 +1,6 @@
 fields[0]);
-
+	// smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...
+	$numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || isset($rs->fields[2]);
 	while (!$rs->EOF) {
 		
 		$s .= "\n";
diff --git a/lib/adodb/tute.htm b/lib/adodb/tute.htm
index b060a98513b..3f2261e62de 100644
--- a/lib/adodb/tute.htm
+++ b/lib/adodb/tute.htm
@@ -1,290 +1,290 @@
-
-
-
-
-	Tutorial: Moving from MySQL to ADODB
-
-
-
-
    Tutorial: Moving from MySQL to ADODB
    
-
-
    		You say eether and I say eyether, 
-		You say neether and I say nyther; 
-		Eether, eyether, neether, nyther - 
-		Let's call the whole thing off ! 
-
    
-		You like potato and I like po-tah-to, 
-		You like tomato and I like to-mah-to; 
-		Potato, po-tah-to, tomato, to-mah-to - 
-		Let's call the whole thing off ! 
-
    
-
    I love this song, especially the version with Louis Armstrong and Ella singing 
-  duet. It is all about how hard it is for two people in love to be compatible 
-  with each other. It's about compromise and finding a common ground, and that's 
-  what this article is all about. 
-
    PHP is all about creating dynamic web-sites with the least fuss and the most 
-  fun. To create these websites we need to use databases to retrieve login information, 
-  to splash dynamic news onto the web page and store forum postings. So let's 
-  say we were using the popular MySQL database for this. Your company has done 
-  such a fantastic job that the Web site is more popular than your wildest dreams. 
-  You find that MySQL cannot scale to handle the workload; time to switch databases. 
-
     Unfortunately in PHP every database is accessed slightly differently. To connect 
-  to MySQL, you would use mysql_connect(); when you decide to upgrade to 
-  Oracle or Microsoft SQL Server, you would use ocilogon() or mssql_connect() 
-  respectively. What is worse is that the parameters you use for the different 
-  connect functions are different also.. One database says po-tato, the other 
-  database says pota-to. Oh-oh. 
-
    Let's NOT call the whole thing off
    
-
    A database wrapper library such as ADODB comes in handy when you need to ensure portability. It provides 
-  you with a common API to communicate with any supported database so you don't have to call things off. 
    
-
-
    ADODB stands for Active Data Objects DataBase (sorry computer guys are sometimes 
-  not very original). ADODB currently supports MySQL, PostgreSQL, Oracle, Interbase, 
-  Microsoft SQL Server, Access, FoxPro, Sybase, ODBC and ADO. You can download 
-  ADODB from http://php.weblogs.com/adodb.
-
    MySQL Example
    
-
    The most common database used with PHP is MySQL, so I guess you should be familiar 
-  with the following code. It connects to a MySQL server at localhost, 
-  database mydb, and executes an SQL select statement. The results are 
-  printed, one line per row. 
-
    $db = mysql_connect("localhost", "root", "password");
-mysql_select_db("mydb",$db);
-$result = mysql_query("SELECT * FROM employees",$db);
-if ($result === false) die("failed"); 
-while ($fields = mysql_fetch_row($result)) {
- for ($i=0, $max=sizeof($fields); $i < $max; $i++) {
-		print $fields[$i].' ';
- }
- print "<br>\n";
-} 
-
    
-
    The above code has been color-coded by section. The first section is the connection 
-  phase. The second is the execution of the SQL, and the last section is displaying 
-  the fields. The while loop scans the rows of the result, while the for 
-  loop scans the fields in one row.
    
-
    Here is the equivalent code in ADODB
    
-
     include("adodb.inc.php");
- $db = NewADOConnection('mysql');
- $db->Connect("localhost", "root", "password", "mydb");
- $result = $db->Execute("SELECT * FROM employees");
- if ($result === false) die("failed");  
- while (!$result->EOF) {
-	for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
-		   print $result->fields[$i].' ';
-	$result->MoveNext();
-	print "<br>\n";
- } 
    
-
    
-
    Now porting to Oracle is as simple as changing the second line to NewADOConnection('oracle'). 
-  Let's walk through the code...
    
-
    Connecting to the Database
    
-
    
-
    include("adodb.inc.php");
-$db = NewADOConnection('mysql');
-$db->Connect("localhost", "root", "password", "mydb");
    
-
    The connection code is a bit more sophisticated than MySQL's because our needs 
-  are more sophisticated. In ADODB, we use an object-oriented approach to managing 
-  the complexity of handling multiple databases. We have different classes to 
-  handle different databases. If you aren't familiar with object-oriented programing, 
-  don't worry -- the complexity is all hidden away in the NewADOConnection() 
-  function.
    
-
    To conserve memory, we only load the PHP code specific to the database you 
-  are connecting to. We do this by calling NewADOConnection(databasedriver). 
-  Legal database drivers include mysql, mssql, oracle, oci8, postgres, sybase, 
-  vfp, access, ibase and many others.
    
-
    Then we create a new instance of the connection class by calling NewADOConnection(). 
-  Finally we connect to the database using $db->Connect(). 
    
-
    Executing the SQL
    
-
    $result = $db->Execute("SELECT * 
-  FROM employees");
    
-  if ($result === false) die("failed")    ; 
-  
    
-
    
-
    Sending the SQL statement to the server is straight forward. Execute() will 
-  return a recordset object on successful execution. You should check $result 
-  as we do above.
-
    An issue that confuses beginners is the fact that we have two types of objects 
-  in ADODB, the connection object and the recordset object. When do we use each?
-
    The connection object ($db) is responsible for connecting to the database, 
-  formatting your SQL and querying the database server. The recordset object ($result) 
-  is responsible for retrieving the results and formatting the reply as text or 
-  as an array.
-
    The only thing I need to add is that ADODB provides several helper functions 
-  for making INSERT and UPDATE statements easier, which we will cover in the Advanced 
-  section. 
-
    Retrieving the Data
    
-
    
-
    while (!$result->EOF) {
-   for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
-	   print $result->fields[$i].' ';
-   $result->MoveNext();
-   print "<br>\n";
-}
    
-
    The paradigm for getting the data is that it's like reading a file. For every 
-  line, we check first whether we have reached the end-of-file (EOF). While not 
-  end-of-file, loop through each field in the row. Then move to the next line 
-  (MoveNext) and repeat. 
-
    The $result->fields[] array is generated by the PHP database 
-  extension. Some database extensions do not index the array by field name. 
-  To force indexing by name - that is associative arrays - 
-  use the $ADODB_FETCH_MODE global variable. 
-
    -	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$rs1 = $db->Execute('select * from table');
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs2 = $db->Execute('select * from table');
-	print_r($rs1->fields); // shows array([0]=>'v0',[1] =>'v1')
-	print_r($rs2->fields); // shows array(['col1']=>'v0',['col2'] =>'v1')
-
    
-
    
-As you can see in the above example, both recordsets store and use different fetch modes
-based on the $ADODB_FETCH_MODE setting when the recordset was created by Execute().
    
-
    ADOConnection
    
-
    Object that performs the connection to the database, executes SQL statements 
-  and has a set of utility functions for standardising the format of SQL statements 
-  for issues such as concatenation and date formats.
    
-  
-
    Other Useful Functions
    
-
    $recordset->Move($pos) scrolls to that particular row. ADODB supports forward 
-  scrolling for all databases. Some databases will not support backwards scrolling. 
-  This is normally not a problem as you can always cache records to simulate backwards 
-  scrolling. 
-
    $recordset->RecordCount() returns the number of records accessed by the 
-  SQL statement. Some databases will return -1 because it is not supported. 
-
    $recordset->GetArray() returns the result as an array. 
-
    rs2html($recordset) is a function that is generates a HTML table based on the 
-  $recordset passed to it. An example with the relevant lines in bold:
-
       include('adodb.inc.php'); 
-   include('tohtml.inc.php'); /* includes the rs2html function */
-   $conn = &ADONewConnection('mysql'); 
-   $conn->PConnect('localhost','userid','password','database');
-   $rs = $conn->Execute('select * from table');
-   rs2html($rs); /* recordset to html table */ 
    
-
    There are many other helper functions that are listed in the documentation available at http://php.weblogs.com/adodb_manual. 
-
    Advanced Material
    
-
    Inserts and Updates 
    
-
    Let's say you want to insert the following data into a database. 
-
    ID = 3
    
-  TheDate=mktime(0,0,0,8,31,2001) /* 31st August 2001 */
    
-  Note= sugar why don't we call it off 
-
    When you move to another database, your insert might no longer work.
    
-
    The first problem is that each database has a different default date format. 
-  MySQL expects YYYY-MM-DD format, while other databases have different defaults. 
-  ADODB has a function called DBDate() that addresses this issue by converting 
-  converting the date to the correct format.
    
-
    The next problem is that the don't in the Note needs to be quoted. In 
-  MySQL, we use don\'t but in some other databases (Sybase, Access, Microsoft 
-  SQL Server) we use don''t. The qstr() function addresses this issue.
    
-
    So how do we use the functions? Like this:
    
-
    $sql = "INSERT INTO table (id, thedate,note) values (" 
-   . $ID . ','
-   . $db->DBDate($TheDate) .','
-   . $db->qstr($Note).")";
-$db->Execute($sql);
    
-
    ADODB also supports $connection->Affected_Rows() (returns the 
-  number of rows affected by last update or delete) and $recordset->Insert_ID() 
-  (returns last autoincrement number generated by an insert statement). Be forewarned 
-  that not all databases support the two functions.
    
-
    
-
    MetaTypes
    
-
    You can find out more information about each of the fields (I use the words 
-  fields and columns interchangebly) you are selecting by calling the recordset 
-  method FetchField($fieldoffset). This will return an object with 
-  3 properties: name, type and max_length. 
-
    For example:
    
-
    $recordset = $conn->Execute("select adate from table");
    $f0 = $recordset->FetchField(0);
-
    
-
    Then $f0->name will hold 'adata', $f0->type 
-  will be set to 'date'. If the max_length is unknown, it will be set to 
-  -1. 
-
    One problem with handling different databases is that each database often calls 
-  the same type by a different name. For example a timestamp type is called 
-  datetime in one database and time in another. So ADODB has a special 
-  MetaType($type, $max_length) function that standardises the types 
-  to the following: 
-
    C: character and varchar types
    
-  X: text or long character (eg. more than 255 bytes wide).
    
-  B: blob or binary image
    
-  D: date
    
-  T: timestamp
    
-  L: logical (boolean)
    
-  I: integer
    
-  N: numeric (float, double, money) 
-
    In the above date example, 
-
    $recordset = $conn->Execute("select adate from table");
    
-  $f0 = $recordset->FetchField(0);
    
-  $type = $recordset->MetaType($f0->type, $f0->max_length);
    
-  print $type; /* should print 'D'     */
-
     
-
    Select Limit and Top Support 
-
    ADODB has a function called $connection->SelectLimit($sql,$nrows,$offset) that allows
-you to retrieve a subset of the recordset. This will take advantage of native
-SELECT TOP on Microsoft products and SELECT ... LIMIT with PostgreSQL and MySQL, and
-emulated if the database does not support it.
-
    Caching Support 
-
    ADODB allows you to cache recordsets in your file system, and only requery the database
-server after a certain timeout period with $connection->CacheExecute($secs2cache,$sql) and 
-$connection->CacheSelectLimit($secs2cache,$sql,$nrows,$offset).
-
    PHP4 Session Handler Support 
-
    ADODB also supports PHP4 session handlers. You can store your session variables 
-  in a database for true scalability using ADODB. For further information, visit 
-  http://php.weblogs.com/adodb-sessions
-
    Commercial Use Encouraged
    
-
    If you plan to write commercial PHP applications that you want to resell, you should consider ADODB. It has been released using the lesser GPL, which means you can legally include it in commercial applications, while keeping your code proprietary. Commercial use of ADODB is strongly encouraged! We are using it internally for this reason.
    
-
-
    Conclusion
    
-
    As a thank you for finishing this article, here are the complete lyrics for 
-  let's call the whole thing off.
    
-  
    
-
    -   Refrain 
-
    
-		You say eether and I say eyether, 
-		You say neether and I say nyther; 
-		Eether, eyether, neether, nyther - 
-		Let's call the whole thing off ! 
-
    
-		You like potato and I like po-tah-to, 
-		You like tomato and I like to-mah-to; 
-		Potato, po-tah-to, tomato, to-mah-to - 
-		Let's call the whole thing off ! 
-
    
-But oh, if we call the whole thing off, then we must part. 
-And oh, if we ever part, then that might break my heart. 
-
    
-		So, if you like pajamas and I like pa-jah-mas, 
-		I'll wear pajamas and give up pa-jah-mas. 
-		For we know we 
-		Need each other, so we 
-		Better call the calling off off. 
-		Let's call the whole thing off ! 
-
    
-   Second Refrain 
-
    
-		You say laughter and I say lawfter, 
-		You say after and I say awfter; 
-		Laughter, lawfter, after, awfter - 
-		Let's call the whole thing off ! 
-
    
-		You like vanilla and I like vanella, 
-		You, sa's'parilla and I sa's'parella; 
-		Vanilla, vanella, choc'late, strawb'ry - 
-		Let's call the whole thing off ! 
-
    
-But oh, if we call the whole thing off, then we must part. 
-And oh, if we ever part, then that might break my heart. 
-
    
-		So, if you go for oysters and I go for ersters, 
-		I'll order oysters and cancel the ersters. 
-		For we know we 
-		Need each other, so we 
-		Better call the calling off off. 
-		Let's call the whole thing off ! 
-  
    
-
    Song and lyrics by George and Ira Gershwin, introduced by Fred Astaire and Ginger Rogers
-in the film "Shall We Dance?"  
    
-
    
-(c)2001-2002 John Lim.
-
-
-
+
+
+
+
+	Tutorial: Moving from MySQL to ADODB
+
+
+
+
    Tutorial: Moving from MySQL to ADODB
    
+
+
    		You say eether and I say eyether, 
+		You say neether and I say nyther; 
+		Eether, eyether, neether, nyther - 
+		Let's call the whole thing off ! 
+
    
+		You like potato and I like po-tah-to, 
+		You like tomato and I like to-mah-to; 
+		Potato, po-tah-to, tomato, to-mah-to - 
+		Let's call the whole thing off ! 
+
    
+
    I love this song, especially the version with Louis Armstrong and Ella singing 
+  duet. It is all about how hard it is for two people in love to be compatible 
+  with each other. It's about compromise and finding a common ground, and that's 
+  what this article is all about. 
+
    PHP is all about creating dynamic web-sites with the least fuss and the most 
+  fun. To create these websites we need to use databases to retrieve login information, 
+  to splash dynamic news onto the web page and store forum postings. So let's 
+  say we were using the popular MySQL database for this. Your company has done 
+  such a fantastic job that the Web site is more popular than your wildest dreams. 
+  You find that MySQL cannot scale to handle the workload; time to switch databases. 
+
     Unfortunately in PHP every database is accessed slightly differently. To connect 
+  to MySQL, you would use mysql_connect(); when you decide to upgrade to 
+  Oracle or Microsoft SQL Server, you would use ocilogon() or mssql_connect() 
+  respectively. What is worse is that the parameters you use for the different 
+  connect functions are different also.. One database says po-tato, the other 
+  database says pota-to. Oh-oh. 
+
    Let's NOT call the whole thing off
    
+
    A database wrapper library such as ADODB comes in handy when you need to ensure portability. It provides 
+  you with a common API to communicate with any supported database so you don't have to call things off. 
    
+
+
    ADODB stands for Active Data Objects DataBase (sorry computer guys are sometimes 
+  not very original). ADODB currently supports MySQL, PostgreSQL, Oracle, Interbase, 
+  Microsoft SQL Server, Access, FoxPro, Sybase, ODBC and ADO. You can download 
+  ADODB from http://php.weblogs.com/adodb.
+
    MySQL Example
    
+
    The most common database used with PHP is MySQL, so I guess you should be familiar 
+  with the following code. It connects to a MySQL server at localhost, 
+  database mydb, and executes an SQL select statement. The results are 
+  printed, one line per row. 
+
    $db = mysql_connect("localhost", "root", "password");
+mysql_select_db("mydb",$db);
+$result = mysql_query("SELECT * FROM employees",$db);
+if ($result === false) die("failed"); 
+while ($fields = mysql_fetch_row($result)) {
+ for ($i=0, $max=sizeof($fields); $i < $max; $i++) {
+		print $fields[$i].' ';
+ }
+ print "<br>\n";
+} 
+
    
+
    The above code has been color-coded by section. The first section is the connection 
+  phase. The second is the execution of the SQL, and the last section is displaying 
+  the fields. The while loop scans the rows of the result, while the for 
+  loop scans the fields in one row.
    
+
    Here is the equivalent code in ADODB
    
+
     include("adodb.inc.php");
+ $db = NewADOConnection('mysql');
+ $db->Connect("localhost", "root", "password", "mydb");
+ $result = $db->Execute("SELECT * FROM employees");
+ if ($result === false) die("failed");  
+ while (!$result->EOF) {
+	for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
+		   print $result->fields[$i].' ';
+	$result->MoveNext();
+	print "<br>\n";
+ } 
    
+
    
+
    Now porting to Oracle is as simple as changing the second line to NewADOConnection('oracle'). 
+  Let's walk through the code...
    
+
    Connecting to the Database
    
+
    
+
    include("adodb.inc.php");
+$db = NewADOConnection('mysql');
+$db->Connect("localhost", "root", "password", "mydb");
    
+
    The connection code is a bit more sophisticated than MySQL's because our needs 
+  are more sophisticated. In ADODB, we use an object-oriented approach to managing 
+  the complexity of handling multiple databases. We have different classes to 
+  handle different databases. If you aren't familiar with object-oriented programing, 
+  don't worry -- the complexity is all hidden away in the NewADOConnection() 
+  function.
    
+
    To conserve memory, we only load the PHP code specific to the database you 
+  are connecting to. We do this by calling NewADOConnection(databasedriver). 
+  Legal database drivers include mysql, mssql, oracle, oci8, postgres, sybase, 
+  vfp, access, ibase and many others.
    
+
    Then we create a new instance of the connection class by calling NewADOConnection(). 
+  Finally we connect to the database using $db->Connect(). 
    
+
    Executing the SQL
    
+
    $result = $db->Execute("SELECT * 
+  FROM employees");
    
+  if ($result === false) die("failed")    ; 
+  
    
+
    
+
    Sending the SQL statement to the server is straight forward. Execute() will 
+  return a recordset object on successful execution. You should check $result 
+  as we do above.
+
    An issue that confuses beginners is the fact that we have two types of objects 
+  in ADODB, the connection object and the recordset object. When do we use each?
+
    The connection object ($db) is responsible for connecting to the database, 
+  formatting your SQL and querying the database server. The recordset object ($result) 
+  is responsible for retrieving the results and formatting the reply as text or 
+  as an array.
+
    The only thing I need to add is that ADODB provides several helper functions 
+  for making INSERT and UPDATE statements easier, which we will cover in the Advanced 
+  section. 
+
    Retrieving the Data
    
+
    
+
    while (!$result->EOF) {
+   for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
+	   print $result->fields[$i].' ';
+   $result->MoveNext();
+   print "<br>\n";
+}
    
+
    The paradigm for getting the data is that it's like reading a file. For every 
+  line, we check first whether we have reached the end-of-file (EOF). While not 
+  end-of-file, loop through each field in the row. Then move to the next line 
+  (MoveNext) and repeat. 
+
    The $result->fields[] array is generated by the PHP database 
+  extension. Some database extensions do not index the array by field name. 
+  To force indexing by name - that is associative arrays - 
+  use the $ADODB_FETCH_MODE global variable. 
+
    +	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$rs1 = $db->Execute('select * from table');
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs2 = $db->Execute('select * from table');
+	print_r($rs1->fields); // shows array([0]=>'v0',[1] =>'v1')
+	print_r($rs2->fields); // shows array(['col1']=>'v0',['col2'] =>'v1')
+
    
+
    
+As you can see in the above example, both recordsets store and use different fetch modes
+based on the $ADODB_FETCH_MODE setting when the recordset was created by Execute().
    
+
    ADOConnection
    
+
    Object that performs the connection to the database, executes SQL statements 
+  and has a set of utility functions for standardising the format of SQL statements 
+  for issues such as concatenation and date formats.
    
+  
+
    Other Useful Functions
    
+
    $recordset->Move($pos) scrolls to that particular row. ADODB supports forward 
+  scrolling for all databases. Some databases will not support backwards scrolling. 
+  This is normally not a problem as you can always cache records to simulate backwards 
+  scrolling. 
+
    $recordset->RecordCount() returns the number of records accessed by the 
+  SQL statement. Some databases will return -1 because it is not supported. 
+
    $recordset->GetArray() returns the result as an array. 
+
    rs2html($recordset) is a function that is generates a HTML table based on the 
+  $recordset passed to it. An example with the relevant lines in bold:
+
       include('adodb.inc.php'); 
+   include('tohtml.inc.php'); /* includes the rs2html function */
+   $conn = &ADONewConnection('mysql'); 
+   $conn->PConnect('localhost','userid','password','database');
+   $rs = $conn->Execute('select * from table');
+   rs2html($rs); /* recordset to html table */ 
    
+
    There are many other helper functions that are listed in the documentation available at http://php.weblogs.com/adodb_manual. 
+
    Advanced Material
    
+
    Inserts and Updates 
    
+
    Let's say you want to insert the following data into a database. 
+
    ID = 3
    
+  TheDate=mktime(0,0,0,8,31,2001) /* 31st August 2001 */
    
+  Note= sugar why don't we call it off 
+
    When you move to another database, your insert might no longer work.
    
+
    The first problem is that each database has a different default date format. 
+  MySQL expects YYYY-MM-DD format, while other databases have different defaults. 
+  ADODB has a function called DBDate() that addresses this issue by converting 
+  converting the date to the correct format.
    
+
    The next problem is that the don't in the Note needs to be quoted. In 
+  MySQL, we use don\'t but in some other databases (Sybase, Access, Microsoft 
+  SQL Server) we use don''t. The qstr() function addresses this issue.
    
+
    So how do we use the functions? Like this:
    
+
    $sql = "INSERT INTO table (id, thedate,note) values (" 
+   . $ID . ','
+   . $db->DBDate($TheDate) .','
+   . $db->qstr($Note).")";
+$db->Execute($sql);
    
+
    ADODB also supports $connection->Affected_Rows() (returns the 
+  number of rows affected by last update or delete) and $recordset->Insert_ID() 
+  (returns last autoincrement number generated by an insert statement). Be forewarned 
+  that not all databases support the two functions.
    
+
    
+
    MetaTypes
    
+
    You can find out more information about each of the fields (I use the words 
+  fields and columns interchangebly) you are selecting by calling the recordset 
+  method FetchField($fieldoffset). This will return an object with 
+  3 properties: name, type and max_length. 
+
    For example:
    
+
    $recordset = $conn->Execute("select adate from table");
    $f0 = $recordset->FetchField(0);
+
    
+
    Then $f0->name will hold 'adata', $f0->type 
+  will be set to 'date'. If the max_length is unknown, it will be set to 
+  -1. 
+
    One problem with handling different databases is that each database often calls 
+  the same type by a different name. For example a timestamp type is called 
+  datetime in one database and time in another. So ADODB has a special 
+  MetaType($type, $max_length) function that standardises the types 
+  to the following: 
+
    C: character and varchar types
    
+  X: text or long character (eg. more than 255 bytes wide).
    
+  B: blob or binary image
    
+  D: date
    
+  T: timestamp
    
+  L: logical (boolean)
    
+  I: integer
    
+  N: numeric (float, double, money) 
+
    In the above date example, 
+
    $recordset = $conn->Execute("select adate from table");
    
+  $f0 = $recordset->FetchField(0);
    
+  $type = $recordset->MetaType($f0->type, $f0->max_length);
    
+  print $type; /* should print 'D'     */
+
     
+
    Select Limit and Top Support 
+
    ADODB has a function called $connection->SelectLimit($sql,$nrows,$offset) that allows
+you to retrieve a subset of the recordset. This will take advantage of native
+SELECT TOP on Microsoft products and SELECT ... LIMIT with PostgreSQL and MySQL, and
+emulated if the database does not support it.
+
    Caching Support 
+
    ADODB allows you to cache recordsets in your file system, and only requery the database
+server after a certain timeout period with $connection->CacheExecute($secs2cache,$sql) and 
+$connection->CacheSelectLimit($secs2cache,$sql,$nrows,$offset).
+
    PHP4 Session Handler Support 
+
    ADODB also supports PHP4 session handlers. You can store your session variables 
+  in a database for true scalability using ADODB. For further information, visit 
+  http://php.weblogs.com/adodb-sessions
+
    Commercial Use Encouraged
    
+
    If you plan to write commercial PHP applications that you want to resell, you should consider ADODB. It has been released using the lesser GPL, which means you can legally include it in commercial applications, while keeping your code proprietary. Commercial use of ADODB is strongly encouraged! We are using it internally for this reason.
    
+
+
    Conclusion
    
+
    As a thank you for finishing this article, here are the complete lyrics for 
+  let's call the whole thing off.
    
+  
    
+
    +   Refrain 
+
    
+		You say eether and I say eyether, 
+		You say neether and I say nyther; 
+		Eether, eyether, neether, nyther - 
+		Let's call the whole thing off ! 
+
    
+		You like potato and I like po-tah-to, 
+		You like tomato and I like to-mah-to; 
+		Potato, po-tah-to, tomato, to-mah-to - 
+		Let's call the whole thing off ! 
+
    
+But oh, if we call the whole thing off, then we must part. 
+And oh, if we ever part, then that might break my heart. 
+
    
+		So, if you like pajamas and I like pa-jah-mas, 
+		I'll wear pajamas and give up pa-jah-mas. 
+		For we know we 
+		Need each other, so we 
+		Better call the calling off off. 
+		Let's call the whole thing off ! 
+
    
+   Second Refrain 
+
    
+		You say laughter and I say lawfter, 
+		You say after and I say awfter; 
+		Laughter, lawfter, after, awfter - 
+		Let's call the whole thing off ! 
+
    
+		You like vanilla and I like vanella, 
+		You, sa's'parilla and I sa's'parella; 
+		Vanilla, vanella, choc'late, strawb'ry - 
+		Let's call the whole thing off ! 
+
    
+But oh, if we call the whole thing off, then we must part. 
+And oh, if we ever part, then that might break my heart. 
+
    
+		So, if you go for oysters and I go for ersters, 
+		I'll order oysters and cancel the ersters. 
+		For we know we 
+		Need each other, so we 
+		Better call the calling off off. 
+		Let's call the whole thing off ! 
+  
    
+
    Song and lyrics by George and Ira Gershwin, introduced by Fred Astaire and Ginger Rogers
+in the film "Shall We Dance?"  
    
+
    
+(c)2001-2002 John Lim.
+
+
+
diff --git a/lib/adodb/xmlschema.dtd b/lib/adodb/xmlschema.dtd
new file mode 100644
index 00000000000..083bc9032c2
--- /dev/null
+++ b/lib/adodb/xmlschema.dtd
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+] >
diff --git a/lib/adodb/xsl/convert-0.1-0.2.xsl b/lib/adodb/xsl/convert-0.1-0.2.xsl
new file mode 100644
index 00000000000..8cd534f51f6
--- /dev/null
+++ b/lib/adodb/xsl/convert-0.1-0.2.xsl
@@ -0,0 +1,205 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+			0.2
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+			
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/lib/adodb/xsl/convert-0.2-0.1.xsl b/lib/adodb/xsl/convert-0.2-0.1.xsl
new file mode 100644
index 00000000000..61841b4831a
--- /dev/null
+++ b/lib/adodb/xsl/convert-0.2-0.1.xsl
@@ -0,0 +1,207 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+			0.1
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+			
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file