From b3d517a98c1ec03c04f5301d8f600838cff8afff Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 2 Aug 2004 08:30:47 +0000 Subject: [PATCH] imported version 4.51 of ADOdb --- phpgwapi/inc/adodb/adodb-csvlib.inc.php | 54 +- phpgwapi/inc/adodb/adodb-datadict.inc.php | 2 +- phpgwapi/inc/adodb/adodb-errorhandler.inc.php | 2 +- phpgwapi/inc/adodb/adodb-exceptions.inc.php | 2 +- phpgwapi/inc/adodb/adodb-iterator.inc.php | 17 +- phpgwapi/inc/adodb/adodb-lib.inc.php | 183 ++- phpgwapi/inc/adodb/adodb-pager.inc.php | 3 +- phpgwapi/inc/adodb/adodb-perf.inc.php | 4 +- phpgwapi/inc/adodb/adodb-php4.inc.php | 2 +- phpgwapi/inc/adodb/adodb-time.inc.php | 33 +- phpgwapi/inc/adodb/adodb-xmlschema.inc.php | 475 +++++-- phpgwapi/inc/adodb/adodb.inc.php | 397 +++--- .../adodb/datadict/datadict-access.inc.php | 2 +- .../inc/adodb/datadict/datadict-db2.inc.php | 2 +- .../adodb/datadict/datadict-firebird.inc.php | 2 +- .../adodb/datadict/datadict-generic.inc.php | 2 +- .../inc/adodb/datadict/datadict-ibase.inc.php | 2 +- .../adodb/datadict/datadict-informix.inc.php | 2 +- .../inc/adodb/datadict/datadict-mssql.inc.php | 2 +- .../inc/adodb/datadict/datadict-mysql.inc.php | 2 +- .../inc/adodb/datadict/datadict-oci8.inc.php | 2 +- .../adodb/datadict/datadict-postgres.inc.php | 2 +- .../adodb/datadict/datadict-sybase.inc.php | 2 +- phpgwapi/inc/adodb/docs/docs-adodb.htm | 222 ++- phpgwapi/inc/adodb/docs/docs-datadict.htm | 721 +++------- phpgwapi/inc/adodb/docs/docs-perf.htm | 1250 ++++++++++++----- phpgwapi/inc/adodb/docs/docs-session.htm | 364 ++--- .../inc/adodb/drivers/adodb-access.inc.php | 2 +- phpgwapi/inc/adodb/drivers/adodb-ado.inc.php | 18 +- .../adodb/drivers/adodb-ado_access.inc.php | 2 +- .../inc/adodb/drivers/adodb-ado_mssql.inc.php | 3 +- .../adodb/drivers/adodb-borland_ibase.inc.php | 2 +- phpgwapi/inc/adodb/drivers/adodb-csv.inc.php | 2 +- phpgwapi/inc/adodb/drivers/adodb-db2.inc.php | 12 +- .../inc/adodb/drivers/adodb-firebird.inc.php | 2 +- .../inc/adodb/drivers/adodb-ibase.inc.php | 83 +- .../adodb/drivers/adodb-informix72.inc.php | 3 +- phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php | 2 +- .../inc/adodb/drivers/adodb-mssql.inc.php | 35 +- .../inc/adodb/drivers/adodb-mysql.inc.php | 109 +- .../inc/adodb/drivers/adodb-mysqli.inc.php | 157 +-- .../inc/adodb/drivers/adodb-mysqlt.inc.php | 74 +- .../inc/adodb/drivers/adodb-netezza.inc.php | 3 +- phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php | 55 +- .../inc/adodb/drivers/adodb-oci8po.inc.php | 104 +- phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php | 30 +- .../adodb/drivers/adodb-odbc_mssql.inc.php | 18 +- .../adodb/drivers/adodb-odbc_oracle.inc.php | 2 +- .../inc/adodb/drivers/adodb-odbtp.inc.php | 9 +- .../adodb/drivers/adodb-odbtp_unicode.inc.php | 5 +- .../inc/adodb/drivers/adodb-oracle.inc.php | 6 +- phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php | 2 +- .../inc/adodb/drivers/adodb-postgres.inc.php | 2 +- .../adodb/drivers/adodb-postgres64.inc.php | 12 +- .../inc/adodb/drivers/adodb-postgres7.inc.php | 2 +- .../inc/adodb/drivers/adodb-proxy.inc.php | 2 +- .../inc/adodb/drivers/adodb-sapdb.inc.php | 2 +- .../inc/adodb/drivers/adodb-sqlite.inc.php | 2 +- .../inc/adodb/drivers/adodb-sqlitepo.inc.php | 2 +- .../inc/adodb/drivers/adodb-sybase.inc.php | 4 +- phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php | 4 +- phpgwapi/inc/adodb/perf/perf-db2.inc.php | 2 +- phpgwapi/inc/adodb/perf/perf-informix.inc.php | 2 +- phpgwapi/inc/adodb/perf/perf-mssql.inc.php | 2 +- phpgwapi/inc/adodb/perf/perf-mysql.inc.php | 2 +- phpgwapi/inc/adodb/perf/perf-oci8.inc.php | 25 +- phpgwapi/inc/adodb/perf/perf-postgres.inc.php | 2 +- .../adodb/session/adodb-compress-bzip2.php | 2 - .../inc/adodb/session/adodb-compress-gzip.php | 1 - .../inc/adodb/session/adodb-cryptsession.php | 1 - .../adodb/session/adodb-encrypt-mcrypt.php | 1 - .../inc/adodb/session/adodb-encrypt-md5.php | 2 - .../adodb/session/adodb-encrypt-secret.php | 2 - .../inc/adodb/session/adodb-session-clob.php | 1 - phpgwapi/inc/adodb/session/adodb-session.php | 1 - .../adodb/session/old/adodb-cryptsession.php | 2 +- .../adodb/session/old/adodb-session-clob.php | 2 +- .../inc/adodb/session/old/adodb-session.php | 2 +- phpgwapi/inc/adodb/tests/benchmark.php | 2 +- phpgwapi/inc/adodb/tests/test-datadict.php | 2 +- phpgwapi/inc/adodb/tests/test-php5.php | 23 +- phpgwapi/inc/adodb/tests/test-xmlschema.php | 6 +- phpgwapi/inc/adodb/tests/test.php | 117 +- phpgwapi/inc/adodb/tests/test2.php | 2 +- phpgwapi/inc/adodb/tests/test3.php | 2 +- phpgwapi/inc/adodb/tests/test4.php | 2 +- phpgwapi/inc/adodb/tests/test5.php | 2 +- phpgwapi/inc/adodb/tests/testcache.php | 2 +- .../inc/adodb/tests/testdatabases.inc.php | 49 +- phpgwapi/inc/adodb/tests/testoci8.php | 20 +- phpgwapi/inc/adodb/tests/testoci8cursor.php | 2 +- phpgwapi/inc/adodb/tests/testpaging.php | 2 +- phpgwapi/inc/adodb/tests/testpear.php | 2 +- phpgwapi/inc/adodb/tests/testsessions.php | 11 +- phpgwapi/inc/adodb/tohtml.inc.php | 2 +- phpgwapi/inc/adodb/xmlschema.dtd | 9 +- phpgwapi/inc/adodb/xsl/remove-0.2.xsl | 54 + 97 files changed, 3007 insertions(+), 1881 deletions(-) create mode 100644 phpgwapi/inc/adodb/xsl/remove-0.2.xsl diff --git a/phpgwapi/inc/adodb/adodb-csvlib.inc.php b/phpgwapi/inc/adodb/adodb-csvlib.inc.php index 80d0d8cb62..475c1f5a15 100644 --- a/phpgwapi/inc/adodb/adodb-csvlib.inc.php +++ b/phpgwapi/inc/adodb/adodb-csvlib.inc.php @@ -7,7 +7,7 @@ global $ADODB_INCLUDED_CSV; $ADODB_INCLUDED_CSV = 1; /* - V4.50 6 July 2004 (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved. + V4.51 29 July 2004 (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, the BSD license will take precedence. See License.txt. @@ -249,4 +249,56 @@ $ADODB_INCLUDED_CSV = 1; $rs->InitArrayFields($arr,$flds); return $rs; } + + + /** + * 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; + } ?> \ No newline at end of file diff --git a/phpgwapi/inc/adodb/adodb-datadict.inc.php b/phpgwapi/inc/adodb/adodb-datadict.inc.php index 80e77767a3..6aa7a151de 100644 --- a/phpgwapi/inc/adodb/adodb-datadict.inc.php +++ b/phpgwapi/inc/adodb/adodb-datadict.inc.php @@ -1,7 +1,7 @@ rs, $func), $params); } - - function __toString() - { - if (isset($rs->databaseType)) $s = ' for '.$rs->databaseType; - else $s = ''; - - return 'ADODB Iterator'.$s; - } + function hasMore() { @@ -79,6 +72,12 @@ class ADODB_BASE_RS implements IteratorAggregate { function getIterator() { return new ADODB_Iterator($this); } + + function __toString() + { + include_once(ADODB_DIR.'/toexport.inc.php'); + return _adodb_export($this,',',',',false,true); + } } ?> \ No newline at end of file diff --git a/phpgwapi/inc/adodb/adodb-lib.inc.php b/phpgwapi/inc/adodb/adodb-lib.inc.php index f6046b5ca3..26051bb5c9 100644 --- a/phpgwapi/inc/adodb/adodb-lib.inc.php +++ b/phpgwapi/inc/adodb/adodb-lib.inc.php @@ -63,7 +63,7 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_ if ($uSet && $where) { $update = "UPDATE $table SET $uSet WHERE $where"; - $rs = $zthis->Execute($update); + $rs = $zthis->_Execute($update); if ($rs) { if ($zthis->poorAffectedRows) { /* @@ -77,8 +77,10 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_ $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; + } else { + + if (($zthis->Affected_Rows()>0)) return 1; + } } } // print "

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

'; @@ -96,7 +98,7 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_ } } $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; - $rs = $zthis->Execute($insert); + $rs = $zthis->_Execute($insert); return ($rs) ? 2 : 0; } @@ -216,7 +218,7 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql; else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); - $rstest = &$zthis->Execute($rewritesql,$inputarr); + $rstest = &$zthis->_Execute($rewritesql,$inputarr); if ($rstest) { $qryRecs = $rstest->RecordCount(); if ($qryRecs == -1) { @@ -266,11 +268,7 @@ function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, $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 @@ -280,6 +278,12 @@ function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, $atlastpage = true; } + // If page number <= 1, then we are at the first page + if (empty($page) || $page <= 1) { + $page = 1; + $atfirstpage = true; + } + // We get the data we want $offset = $nrows * ($page-1); if ($secs2cache > 0) @@ -372,7 +376,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq // If the recordset field is one // of the fields passed in then process. $upperfname = strtoupper($field->name); - if (adodb_key_exists($upperfname,$arrFields)) { + if (adodb_key_exists($upperfname,$arrFields,$forcenulls)) { // If the existing field value in the recordset // is different from the value passed in then @@ -392,31 +396,32 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq // Based on the datatype of the field // Format the value properly for the database - $type = $rs->MetaType($field->type); - - // is_null requires php 4.0.4 - if (($forcenulls && is_null($arrFields[$upperfname])) || - $arrFields[$upperfname] === 'null') { - $setFields .= $field->name . " = null, "; - } else { - if ($type == 'null') { - $type = 'C'; + $type = $rs->MetaType($field->type); + + // is_null requires php 4.0.4 + if (($forcenulls && is_null($arrFields[$upperfname])) || + $arrFields[$upperfname] === 'null') { + $setFields .= $field->name . " = null, "; + } else { + if ($type == 'null') { + $type = 'C'; + } + + if (strpos($upperfname,' ') !== false) + $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote; + else + $fnameq = $upperfname; + + //we do this so each driver can customize the sql for + //DB specific column types. + //Oracle needs BLOB types to be handled with a returning clause + //postgres has special needs as well + $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq, + $arrFields, $magicq); } - - if (strpos($upperfname,' ') !== false) - $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote; - else - $fnameq = $upperfname; - //we do this so each driver can customize the sql for - //DB specific column types. - //Oracle needs BLOB types to be handled with a returning clause - //postgres has special needs as well - $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq, - $arrFields, $magicq); } } } - } // If there were any modified fields then build the rest of the update query. if ($fieldUpdatedCount > 0 || $forceUpdate) { @@ -429,9 +434,10 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq $discard = false; // not a good hack, improvements? - if ($whereClause) - preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard); - else + if ($whereClause) { + if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard)); + else preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard); + } else $whereClause = array(false,false); if ($discard) @@ -503,7 +509,7 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$forcenulls=f // Loop through all of the fields in the recordset foreach( $columns as $field ) { $upperfname = strtoupper($field->name); - if (adodb_key_exists($upperfname,$arrFields)) { + if (adodb_key_exists($upperfname,$arrFields,$forcenulls)) { // Set the counter for the number of fields that will be inserted. $fieldInsertedCount++; @@ -539,8 +545,10 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$forcenulls=f // Get the table name from the existing query. if (!$tableName) { - preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); + if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName)) $tableName = $tableName[1]; + else + return false; } // Strip off the comma and space on the end of both the fields @@ -693,4 +701,105 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, return $sql; } + + + +function _adodb_debug_execute(&$zthis, $sql, $inputarr) +{ +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) { + $ss = htmlspecialchars($ss); + if ($zthis->debug === -1) + ADOConnection::outp( "
\n($zthis->databaseType): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); + else + ADOConnection::outp( "

\n($zthis->databaseType): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); + } else { + ADOConnection::outp("-----\n($zthis->databaseType): ".$sqlTxt."\n-----\n",false); + } + + $qID = $zthis->_query($sql,$inputarr); + + /* + Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql + because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion + */ + if ($zthis->databaseType == 'mssql') { + // ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6 + if($emsg = $zthis->ErrorMsg()) { + if ($err = $zthis->ErrorNo()) ADOConnection::outp($err.': '.$emsg); + } + } else if (!$qID) { + ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg()); + } + + return $qID; +} + + +function _adodb_backtrace($printOrArr=true,$levels=9999) +{ + 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);
+	array_shift($traceArr);
+	$tabs = sizeof($traceArr)-2;
+	
+	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; +} + ?> \ No newline at end of file diff --git a/phpgwapi/inc/adodb/adodb-pager.inc.php b/phpgwapi/inc/adodb/adodb-pager.inc.php index f4d2525eb4..9715f834af 100644 --- a/phpgwapi/inc/adodb/adodb-pager.inc.php +++ b/phpgwapi/inc/adodb/adodb-pager.inc.php @@ -1,7 +1,7 @@ db->pageExecuteCountRows) return ''; $lastPage = $this->rs->LastPageNo(); if ($lastPage == -1) $lastPage = 1; // check for empty rs. + if ($this->curr_page > $lastPage) $this->curr_page = 1; return "$this->page ".$this->curr_page."/".$lastPage.""; } diff --git a/phpgwapi/inc/adodb/adodb-perf.inc.php b/phpgwapi/inc/adodb/adodb-perf.inc.php index e5c0961cf0..a2f92402c4 100644 --- a/phpgwapi/inc/adodb/adodb-perf.inc.php +++ b/phpgwapi/inc/adodb/adodb-perf.inc.php @@ -1,6 +1,6 @@ - ADOdb Performance Monitor for $app + ADOdb Performance Monitor for $app Performance Stats   View SQL   View Tables   Poll Stats", $allowsql ? '   Run SQL' : '', diff --git a/phpgwapi/inc/adodb/adodb-php4.inc.php b/phpgwapi/inc/adodb/adodb-php4.inc.php index efc8f85e58..8f47417e2f 100644 --- a/phpgwapi/inc/adodb/adodb-php4.inc.php +++ b/phpgwapi/inc/adodb/adodb-php4.inc.php @@ -1,7 +1,7 @@ '; + $t = adodb_mktime(0,0,0,6,1,2102); if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'
'; @@ -428,7 +435,7 @@ function adodb_date_test() // we generate a timestamp, convert it to a date, and convert it back to a timestamp // and check if the roundtrip broke the original timestamp value. print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: "; - + $cnt = 0; for ($max += $i; $i < $max; $i += $offset) { $ret = adodb_date('m,d,Y,H,i,s',$i); $arr = explode(',',$ret); @@ -443,8 +450,9 @@ function adodb_date_test() $fail = true; break; } + $cnt += 1; } - + echo "Tested $cnt dates
"; if (!$fail) print "

Passed !

"; else print "

Failed :-(

"; } @@ -717,6 +725,8 @@ function adodb_date2($fmt, $d=false, $is_gmt=false) */ function adodb_date($fmt,$d=false,$is_gmt=false) { +static $daylight; + if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt); if (!defined('ADODB_TEST_DATES')) { if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range @@ -728,7 +738,8 @@ function adodb_date($fmt,$d=false,$is_gmt=false) $_day_power = 86400; $arr = _adodb_getdate($d,true,$is_gmt); - if (function_exists('adodb_daylight_sv')) adodb_daylight_sv($arr, $is_gmt); + if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv'); + if ($daylight) adodb_daylight_sv($arr, $is_gmt); $year = $arr['year']; $month = $arr['mon']; @@ -852,7 +863,7 @@ function adodb_date($fmt,$d=false,$is_gmt=false) Returns a timestamp given a GMT/UTC time. Note that $is_dst is not implemented and is ignored. */ -function adodb_gmmktime($hr,$min,$sec,$mon,$day,$year,$is_dst=false) +function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false) { return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true); } @@ -863,13 +874,15 @@ function adodb_gmmktime($hr,$min,$sec,$mon,$day,$year,$is_dst=false) Not a very fast algorithm - O(n) operation. Could be optimized to O(1). */ -function adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst=false,$is_gmt=false) +function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) { if (!defined('ADODB_TEST_DATES')) { // for windows, we don't check 1970 because with timezone differences, // 1 Jan 1970 could generate negative timestamp, which is illegal - if (!defined('ADODB_NO_NEGATIVE_TS') || ($year >= 1971)) - if (1901 < $year && $year < 2038) + if (1971 < $year && $year < 2038 + || $mon === false + || !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038) + ) return $is_gmt? @gmmktime($hr,$min,$sec,$mon,$day,$year): @mktime($hr,$min,$sec,$mon,$day,$year); diff --git a/phpgwapi/inc/adodb/adodb-xmlschema.inc.php b/phpgwapi/inc/adodb/adodb-xmlschema.inc.php index 9d0a8f5365..92e9cd33d9 100644 --- a/phpgwapi/inc/adodb/adodb-xmlschema.inc.php +++ b/phpgwapi/inc/adodb/adodb-xmlschema.inc.php @@ -4,31 +4,6 @@ Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, the BSD license will take precedence. - -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 l -ist of conditions and the following disclaimer in the documentation and/or other - materials provided with the distribution. -Neither the name of the ars Cognita, Inc., 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 WA -RRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIREC -T, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR P -ROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWI -SE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE P -OSSIBILITY OF SUCH DAMAGE. - *******************************************************************************/ /** * xmlschema is a class that allows the user to quickly and easily @@ -104,6 +79,7 @@ if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) { */ if( !defined( '_ADODB_LAYER' ) ) { require( 'adodb.inc.php' ); + require( 'adodb-datadict.inc.php' ); } /** @@ -274,7 +250,14 @@ class dbTable extends dbObject { switch( $this->currentElement ) { case 'INDEX': - xml_set_object( $parser, $this->addIndex( $attributes ) ); + if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) { + xml_set_object( $parser, $this->addIndex( $attributes ) ); + } + break; + case 'DATA': + if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) { + xml_set_object( $parser, $this->addData( $attributes ) ); + } break; case 'DROP': $this->drop(); @@ -288,7 +271,7 @@ class dbTable extends dbObject { $this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts ); break; - case 'KEY': + case 'KEY': case 'NOTNULL': case 'AUTOINCREMENT': // Add a field option @@ -304,6 +287,11 @@ class dbTable extends dbObject { $this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] ); break; + case 'DEFDATE': + case 'DEFTIMESTAMP': + // Add a field option to the table object + $this->addFieldOpt( $this->current_field, $this->currentElement ); + break; default: // print_r( array( $tag, $attributes ) ); } @@ -318,6 +306,12 @@ class dbTable extends dbObject { switch( $this->currentElement ) { // Table constraint case 'CONSTRAINT': + if( isset( $this->current_field ) ) { + $this->addFieldOpt( $this->current_field, $this->currentElement, $cdata ); + } else { + $this->addTableOpt( $cdata ); + } + break; // Table option case 'OPT': $this->addTableOpt( $cdata ); @@ -341,6 +335,10 @@ class dbTable extends dbObject { xml_set_object( $parser, $this->parent ); $this->destroy(); break; + case 'FIELD': + unset($this->current_field); + break; + } } @@ -356,6 +354,19 @@ class dbTable extends dbObject { return $this->indexes[$name]; } + /** + * Adds data to a table object + * + * @param array $attributes Data attributes + * @return object dbData object + */ + function &addData( $attributes ) { + if( !isset( $this->data ) ) { + $this->data =& new dbData( $this, $attributes ); + } + return $this->data; + } + /** * Adds a field to a table object * @@ -404,7 +415,7 @@ class dbTable extends dbObject { // Set the field options if( isset( $opts ) ) { - $this->fields[$field_id]['OPTS'] = $opts; + $this->fields[$field_id]['OPTS'][] = $opts; } } @@ -511,7 +522,7 @@ class dbTable extends dbObject { if( is_array( $opt ) ) { $key = key( $opt ); $value = $opt[key( $opt )]; - $fldarray[$field_id][$key] = $value; + @$fldarray[$field_id][$key] .= $value; // Option doesn't have arguments } else { $fldarray[$field_id][$opt] = $opt; @@ -548,6 +559,10 @@ class dbTable extends dbObject { $sql[] = $index->create( $xmls ); } + if( isset( $this->data ) ) { + $sql[] = $this->data->create( $xmls ); + } + return $sql; } @@ -733,6 +748,192 @@ class dbIndex extends dbObject { } } +/** +* Creates a data object in ADOdb's datadict format +* +* This class stores information about table data. +* +* @package axmls +* @access private +*/ +class dbData extends dbObject { + + var $data = array(); + + var $row; + + /** + * Initializes the new dbIndex object. + * + * @param object $parent Parent object + * @param array $attributes Attributes + * + * @internal + */ + function dbData( &$parent, $attributes = NULL ) { + $this->parent =& $parent; + } + + /** + * 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 'ROW': + $this->row = count( $this->data ); + $this->data[$this->row] = array(); + break; + case 'F': + $this->addField($attributes); + 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 'F': + $this->addData( $cdata ); + break; + default: + + } + } + + /** + * XML Callback to process end elements + * + * @access private + */ + function _tag_close( &$parser, $tag ) { + $this->currentElement = ''; + + switch( strtoupper( $tag ) ) { + case 'DATA': + xml_set_object( $parser, $this->parent ); + break; + } + } + + /** + * Adds a field to the index + * + * @param string $name Field name + * @return string Field list + */ + function addField( $attributes ) { + if( isset( $attributes['NAME'] ) ) { + $name = $attributes['NAME']; + } else { + $name = count($this->data[$this->row]); + } + + // Set the field index so we know where we are + $this->current_field = $this->FieldID( $name ); + } + + /** + * Adds options to the index + * + * @param string $opt Comma-separated list of index options. + * @return string Option list + */ + function addData( $cdata ) { + if( !isset( $this->data[$this->row] ) ) { + $this->data[$this->row] = array(); + } + + if( !isset( $this->data[$this->row][$this->current_field] ) ) { + $this->data[$this->row][$this->current_field] = ''; + } + + $this->data[$this->row][$this->current_field] .= $cdata; + } + + /** + * Generates the SQL that will create the index in the database + * + * @param object $xmls adoSchema object + * @return array Array containing index creation SQL + */ + function create( &$xmls ) { + $table = $xmls->dict->TableName($this->parent->name); + $table_field_count = count($this->parent->fields); + $sql = array(); + + // eliminate any columns that aren't in the table + foreach( $this->data as $row ) { + $table_fields = $this->parent->fields; + $fields = array(); + + foreach( $row as $field_id => $field_data ) { + if( !array_key_exists( $field_id, $table_fields ) ) { + if( is_numeric( $field_id ) ) { + $field_id = reset( array_keys( $table_fields ) ); + } else { + continue; + } + } + + $name = $table_fields[$field_id]['NAME']; + + switch( $table_fields[$field_id]['TYPE'] ) { + case 'C': + case 'C2': + case 'X': + case 'X2': + $fields[$name] = $xmls->db->qstr( $field_data ); + break; + case 'I': + case 'I1': + case 'I2': + case 'I4': + case 'I8': + $fields[$name] = intval($field_data); + break; + default: + $fields[$name] = $field_data; + } + + unset($table_fields[$field_id]); + } + + // check that at least 1 column is specified + if( empty( $fields ) ) { + continue; + } + + // check that no required columns are missing + if( count( $fields ) < $table_field_count ) { + foreach( $table_fields as $field ) { + if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) { + continue(2); + } + } + } + + $sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')'; + } + + return $sql; + } +} + /** * Creates the SQL to execute a list of provided SQL queries * @@ -788,8 +989,6 @@ class dbQuerySet extends dbObject { case 'NONE': $this->prefixMethod = 'NONE'; break; - default: - $this->prefixMethod = 'AUTO'; } } @@ -884,19 +1083,11 @@ class dbQuerySet extends dbObject { * @return string SQL query string. */ function buildQuery( $sql = NULL ) { - if( !isset( $this->query ) ) { + if( !isset( $this->query ) OR empty( $sql ) ) { return FALSE; } - if( empty( $sql ) ) { - return FALSE; - } - - if( !empty( $this->query ) ) { - $this->query .= ' '; - } - - $this->query .= trim( $sql ); + $this->query .= $sql; return $this->query; } @@ -911,8 +1102,7 @@ class dbQuerySet extends dbObject { return FALSE; } - $this->queries[] = $this->query; - $return = $this->query; + $this->queries[] = $return = trim($this->query); unset( $this->query ); @@ -933,9 +1123,9 @@ class dbQuerySet extends dbObject { // 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 ); + $query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix ); + $query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix ); + $query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix ); // 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 ); @@ -1099,8 +1289,8 @@ class adoSchema { $this->mgq = get_magic_quotes_runtime(); set_magic_quotes_runtime(0); - $this->debug = $this->db->debug; $this->db =& $db; + $this->debug = $this->db->debug; $this->dict = NewDataDictionary( $this->db ); $this->sqlArray = array(); $this->schemaVersion = XMLS_SCHEMA_VERSION; @@ -1204,10 +1394,11 @@ class adoSchema { * @see ParseSchemaString() * * @param string $file Name of XML schema file. + * @param bool $returnSchema Return schema rather than parsing. * @return array Array of SQL queries, ready to execute */ - function ParseSchema( $filename ) { - return $this->ParseSchemaString( $this->ConvertSchemaFile ( $filename ) ); + function ParseSchema( $filename, $returnSchema = FALSE ) { + return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema ); } /** @@ -1217,12 +1408,13 @@ class adoSchema { * and generate the SQL necessary to create the database described by the schema. * * @param string $file Name of XML schema file. + * @param bool $returnSchema Return schema rather than parsing. * @return array Array of SQL queries, ready to execute. * * @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString() * @see ParseSchema(), ParseSchemaString() */ - function ParseSchemaFile( $filename ) { + function ParseSchemaFile( $filename, $returnSchema = FALSE ) { // Open the file if( !($fp = fopen( $filename, 'r' )) ) { // die( 'Unable to open file' ); @@ -1234,6 +1426,13 @@ class adoSchema { return FALSE; } + if ( $returnSchema ) + { + return $xmlstring; + } + + $this->success = 2; + $xmlParser = $this->create_parser(); // Process the file @@ -1260,9 +1459,10 @@ class adoSchema { * @see ParseSchema() * * @param string $xmlstring XML schema string. + * @param bool $returnSchema Return schema rather than parsing. * @return array Array of SQL queries, ready to execute. */ - function ParseSchemaString( $xmlstring ) { + function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) { if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) { return FALSE; } @@ -1272,10 +1472,15 @@ class adoSchema { return FALSE; } - $xmlParser = $this->create_parser(); + if ( $returnSchema ) + { + return $xmlstring; + } $this->success = 2; + $xmlParser = $this->create_parser(); + if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) { die( sprintf( "XML error: %s at line %d", @@ -1285,9 +1490,46 @@ class adoSchema { } xml_parser_free( $xmlParser ); + return $this->sqlArray; } + /** + * Loads an XML schema from a file and converts it to uninstallation 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 remove the database described. + * @see RemoveSchemaString() + * + * @param string $file Name of XML schema file. + * @param bool $returnSchema Return schema rather than parsing. + * @return array Array of SQL queries, ready to execute + */ + function RemoveSchema( $filename, $returnSchema = FALSE ) { + return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema ); + } + + /** + * Converts an XML schema string to uninstallation SQL. + * + * Call this method to parse a string containing an XML schema (see the DTD for the proper format) + * and generate the SQL necessary to uninstall the database described by the schema. + * @see RemoveSchema() + * + * @param string $schema XML schema string. + * @param bool $returnSchema Return schema rather than parsing. + * @return array Array of SQL queries, ready to execute. + */ + function RemoveSchemaString( $schema, $returnSchema = FALSE ) { + + // grab current version + if( !( $version = $this->SchemaStringVersion( $schema ) ) ) { + return FALSE; + } + + return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema ); + } + /** * Applies the current XML schema to the database (post execution). * @@ -1448,38 +1690,12 @@ class adoSchema { 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); + $result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion); } - if( is_string ($newFile) AND ( $fp = fopen( $newFile, 'w' ) ) ) { - fwrite ($fp, $result); - fclose ($fp); + if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) { + fwrite( $fp, $result ); + fclose( $fp ); } return $result; @@ -1520,43 +1736,66 @@ class adoSchema { $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); + $result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' ); } - if( is_string ($newFile) AND ( $fp = fopen( $newFile, 'w' ) ) ) { - fwrite ($fp, $result); - fclose ($fp); + if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) { + fwrite( $fp, $result ); + fclose( $fp ); } return $result; } + function TransformSchema( $schema, $xsl, $schematype='string' ) + { + // Fail if XSLT extension is not available + if( ! function_exists( 'xslt_create' ) ) { + return FALSE; + } + + $xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl'; + + // look for xsl + if( !is_readable( $xsl_file ) ) { + return FALSE; + } + + switch( $schematype ) + { + case 'file': + if( !is_readable( $schema ) ) { + return FALSE; + } + + $schema = file_get_contents( $schema ); + break; + case 'string': + default: + if( !is_string( $schema ) ) { + 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); + + return $result; + } + /** * Processes XSLT transformation errors * @@ -1692,7 +1931,7 @@ class adoSchema { } if( $details->primary_key ) { - $content[] = ''; + $content[] = ''; } elseif( $details->not_null ) { $content[] = ''; } @@ -1743,6 +1982,10 @@ class adoSchema { $schema .= ' ' . "\n"; while( $row = $rs->FetchRow() ) { + foreach( $row as $key => $val ) { + $row[$key] = htmlentities($row); + } + $schema .= ' ' . implode( '', $row ) . '' . "\n"; } @@ -1780,7 +2023,7 @@ class adoSchema { // prefix too long case strlen( $prefix ) > XMLS_PREFIX_MAXLEN: // prefix contains invalid characters - case !preg_match( '/^[a-z][a-z0-9]+$/i', $prefix ): + case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ): logMsg( 'Invalid prefix: ' . $prefix ); return FALSE; } @@ -1931,8 +2174,8 @@ class adoSchema { * * @access private */ -function logMsg( $msg, $title = NULL ) { - if( XMLS_DEBUG ) { +function logMsg( $msg, $title = NULL, $force = FALSE ) { + if( XMLS_DEBUG or $force ) { echo '
';
 		
 		if( isset( $title ) ) {
diff --git a/phpgwapi/inc/adodb/adodb.inc.php b/phpgwapi/inc/adodb/adodb.inc.php
index 8466ab0124..1067cce274 100644
--- a/phpgwapi/inc/adodb/adodb.inc.php
+++ b/phpgwapi/inc/adodb/adodb.inc.php
@@ -224,7 +224,7 @@
 	var $substr = 'substr';		/// substring operator
 	var $length = 'length';		/// string length operator
 	var $random = 'rand()';		/// random function
-	var $upperCase = false;		/// uppercase function
+	var $upperCase = 'upper';		/// 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
@@ -348,15 +348,17 @@
 		
 		if ($newline) $msg .= "
\n";
 		
-		if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) echo $msg;
+		if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']) || !$newline) echo $msg;
 		else echo strip_tags($msg);
+	
+		
 		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
 		
 	}
 	
 	function Time()
 	{
-		$rs =& $this->Execute("select $this->sysTimeStamp");
+		$rs =& $this->_Execute("select $this->sysTimeStamp");
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
 		
 		return false;
@@ -617,7 +619,7 @@
 		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
 		 	pass in Param(false) before setting the first parameter.
 	*/
-	function Param($name)
+	function Param($name,$type='C')
 	{
 		return '?';
 	}
@@ -754,7 +756,9 @@
 			$ret =& $fn($this,$sql,$inputarr);
 			if (isset($ret)) return $ret;
 		}
-		if ($inputarr && is_array($inputarr)) {
+		if ($inputarr) {
+			if (!is_array($inputarr)) $inputarr = array($inputarr);
+			
 			$element0 = reset($inputarr);
 			# is_object check because oci8 descriptors can be passed in
 			$array_2d = is_array($element0) && !is_object(reset($element0));
@@ -782,7 +786,7 @@
 					if ($i+1 != sizeof($sqlarr))	
 						ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
 		
-					$ret =& $this->_Execute($sql,false);
+					$ret =& $this->_Execute($sql);
 					if (!$ret) return $ret;
 				}	
 			} else {
@@ -803,60 +807,23 @@
 		return $ret;
 	}
 	
+	
 	function& _Execute($sql,$inputarr=false)
 	{
 
 		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 recursion
-			*/
-			if ($this->databaseType == 'mssql') { 
-			// ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6
-				if($emsg = $this->ErrorMsg()) {
-					if ($err = $this->ErrorNo()) ADOConnection::outp($err.': '.$emsg);
-				}
-			} else if (!$this->_queryID) {
-				ADOConnection::outp($this->ErrorNo() .': '. $this->ErrorMsg());
-			}	
+			global $ADODB_INCLUDED_LIB;
+			if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+			$this->_queryID = _adodb_debug_execute($this, $sql,$inputarr);
 		} else {
-			//****************************
-			// non-debug version of query
-			//****************************
-			
-			$this->_queryID =@$this->_query($sql,$inputarr);
+			$this->_queryID = @$this->_query($sql,$inputarr);
 		}
 		
 		/************************
 		// OK, query executed
 		*************************/
 
-		if ($this->_queryID === false) {
-		// error handling if query fails
+		if ($this->_queryID === false) { // error handling if query fails
 			if ($this->debug == 99) adodb_backtrace(true,5);	
 			$fn = $this->raiseErrorFn;
 			if ($fn) {
@@ -866,12 +833,8 @@
 			return false;
 		} 
 		
-		
-		if ($this->_queryID === true) {
-		// return simplified empty recordset for inserts/updates/deletes with lower overhead
+		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
 			$rs =& new ADORecordSet_empty();
-			#if (is_array($sql)) $rs->sql = $sql[0];
-			#else $rs->sql = $sql;
 			return $rs;
 		}
 		
@@ -885,7 +848,7 @@
 		if ($rs->_numOfRows <= 0) {
 		global $ADODB_COUNTRECS;
 			if ($ADODB_COUNTRECS) {
-				if (!$rs->EOF){ 
+				if (!$rs->EOF) { 
 					$rs = &$this->_rs2rs($rs,-1,-1,!is_array($sql));
 					$rs->_queryID = $this->_queryID;
 				} else
@@ -1241,7 +1204,7 @@
 		if ($rs) {		
 			if (!$rs->EOF) $ret = reset($rs->fields);
 			$rs->Close();
-		} 
+		}
 		$ADODB_COUNTRECS = $crecs;
 		return $ret;
 	}
@@ -1481,6 +1444,10 @@
 			}
 			return;
 		} 
+		
+		global $ADODB_INCLUDED_CSV;
+		if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+		
 		$f = $this->_gencachename($sql.serialize($inputarr),false);
 		adodb_write_file($f,''); // is adodb_write_file needed?
 		if (!@unlink($f)) {
@@ -1631,7 +1598,7 @@
 			$forcenulls = defined('ADODB_FORCE_NULLS') ? true : false;
 		}
 		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq);
+		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$forcenulls);
 	}
 
 
@@ -1650,7 +1617,7 @@
 			$forcenulls = defined('ADODB_FORCE_NULLS') ? true : false;
 		}
 		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq);
+		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$forcenulls);
 	}
 	
 
@@ -2505,7 +2472,10 @@
 	 * @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) {
+	function &GetAssoc($force_array = false, $first2cols = false) 
+	{
+	global $ADODB_EXTENSION;
+	
 		$cols = $this->_numOfFields;
 		if ($cols < 2) {
 			return false;
@@ -2514,32 +2484,64 @@
 		$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();
+			if ($ADODB_EXTENSION) {
+				if ($numIndex) {
+					while (!$this->EOF) {
+						$results[trim($this->fields[0])] = array_slice($this->fields, 1);
+						adodb_movenext($this);
+					}
+				} else {
+					while (!$this->EOF) {
+						$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
+						adodb_movenext($this);
+					}
 				}
 			} else {
-				while (!$this->EOF) {
-					$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
-					$this->MoveNext();
+				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();
+			if ($ADODB_EXTENSION) {
+				// 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];
+						adodb_movenext($this);
+					}
+				} 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;
+						adodb_movenext($this);
+					}
 				}
 			} 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();
+				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();
+					}
 				}
 			}
 		}
@@ -2728,7 +2730,8 @@
 		}
 		*/
 		return false;
-	}	
+	}
+	
 	
 	/**
 	 * Random access to a specific row in the recordset. Some databases do not support
@@ -2989,7 +2992,8 @@
 	*/
 	function &FetchNextObj()
 	{
-		return $this->FetchNextObject(false);
+		$o = $this->FetchNextObject(false);
+		return $o;
 	}
 	
 	
@@ -3415,6 +3419,7 @@
 		if (!$dbType) return false;
 		$db = strtolower($dbType);
 		switch ($db) {
+			case 'ifx':
 			case 'maxsql': $db = 'mysqlt'; break;
 			case 'postgres':
 			case 'pgsql': $db = 'postgres7'; break;
@@ -3456,44 +3461,111 @@
 		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
 		
+		if (strpos($db,'://')) {
+			$origdsn = $db;
+			$dsna = @parse_url($db);
+			if (!$dsna) {
+				// special handling of oracle, which might not have host
+				$db = str_replace('@/','@adodb-fakehost/',$db);
+				$dsna = parse_url($db);
+				if (!$dsna) return false;
+				$dsna['host'] = '';
+			}
+			$db = @$dsna['scheme'];
+			if (!$db) return false;
+			$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
+			$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
+			$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
+			$dsna['path'] = isset($dsna['path']) ? rawurldecode(substr($dsna['path'],1)) : '';
+			
+			if (isset($dsna['query'])) {
+				$opt1 = explode('&',$dsna['query']);
+				foreach($opt1 as $k => $v) {
+					$arr = explode('=',$v);
+					$opt[$arr[0]] = isset($arr[1]) ? rawurldecode($arr[1]) : 1;
+				}
+			} else $opt = array();
+		}
+		
+	/*
+	 *  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
+	 */
 		if (!empty($ADODB_NEWCONNECTION)) {
 			$obj = $ADODB_NEWCONNECTION($db);
-			if ($obj) {
-				if ($errorfn)  $obj->raiseErrorFn = $errorfn;
-				return $obj;
+
+		} else {
+		
+			if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
+			if (empty($db)) $db = $ADODB_LASTDB;
+			
+			if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
+			
+			if (!$db) {
+				if (isset($origdsn)) $db = $origdsn;
+				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();
+		}
+		
+		# constructor should not fail
+		if ($obj) {
+			if ($errorfn)  $obj->raiseErrorFn = $errorfn;
+			if (isset($dsna)) {
+			
+				foreach($opt as $k => $v) {
+					switch(strtolower($k)) {
+					case 'persist':
+					case 'persistent': 	$persist = $v; break;
+					case 'debug':		$obj->debug = (integer) $v; break;
+					#ibase
+					case 'dialect': 	$obj->dialect = (integer) $v; break;
+					case 'charset':		$obj->charset = $v; break;
+					case 'buffers':		$obj->buffers = $v; break;
+					case 'fetchmode':   $obj->SetFetchMode($v); break;
+					#ado
+					case 'charpage':	$obj->charPage = $v; break;
+					#mysql, mysqli
+					case 'clientflags': $obj->clientFlags = $v; break;
+					#mysqli
+					case 'port': $obj->port = $v; break;
+					case 'socket': $obj->socket = $v; break;
+					}
+				}
+				if (empty($persist))
+					$ok = $obj->Connect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
+				else
+					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
+					
+				if (!$ok) return false;
 			}
 		}
-		
-		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)
 	{
@@ -3511,8 +3583,6 @@
 						break;
 			case 'db2':	
 						break;
-			case 'sapdb':
-						break;
 			default:
 				$drivername = 'generic';
 				break;
@@ -3561,56 +3631,6 @@
 	}
 
 
-	/**
-	* 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.
@@ -3631,54 +3651,9 @@
 	*/
 	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;
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_backtrace($printOrArr,$levels);
 	}
 	
 } // defined
diff --git a/phpgwapi/inc/adodb/datadict/datadict-access.inc.php b/phpgwapi/inc/adodb/datadict/datadict-access.inc.php
index b1908b1b1d..d281be7e1e 100644
--- a/phpgwapi/inc/adodb/datadict/datadict-access.inc.php
+++ b/phpgwapi/inc/adodb/datadict/datadict-access.inc.php
@@ -1,7 +1,7 @@
 
 ADODB Manual
 
-
+
+	
+
 	
 
 
@@ -26,10 +31,9 @@
 	Feature Requests and Bug Reports

 	Installation

 	Minimum Install

-	Initializing Code and Connection Examples

-	ADONewConnection 
-	NewADOConnection

-	High Speed ADOdb - tuning tips

+	Initializing Code and Connectioning to Databases

+	   Data Source Name (DSN) Support     Connection Examples 

+	High Speed ADOdb - tuning tips

 	Hacking and Modifying ADOdb Safely

 	PHP5 Features

 	foreach iterators exceptions

@@ -232,22 +236,73 @@ $conn = &ADONewConnection('mysql');
   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
+
At this point, you are not connected to the database (no longer true if you pass in a dsn). 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 
+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,
+
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().
 
+ 
+ 
Data Source Name (DSN) Support
 
+ 
 Since ADOdb 4.51, you can connect to a database by passing a dsn to NewADOConnection() (or ADONewConnection, which is
+ the same function). The dsn format is:
+
+	$driver://$username:$password@hostname/$database?options[=value]
+

+NewADOConnection() calls Connect() or PConnect() internally for you. If the connection fails, false is returned.
+
+	# non-persistent connection
+	$dsn = 'mysql://root:pwd@localhost/mydb'; 
+	$db = NewADOConnection($dsn);
+	if (!$db) die("Connection failed");   
+	
+	# no need to call connect/pconnect!
+	$arr = $db->GetArray("select * from table");
+	
+	# persistent connection
+	$dsn2 = 'mysql://root:pwd@localhost/mydb?persist'; 
+

+

+If you have special characters such as /:? in your dsn, then you need to rawurlencode them first:
+
+	$pwd = rawurlencode($pwd);
+	$dsn = "mysql://root:$pwd@localhost/mydb";
+

+

+Legal options are:
+

+
For all drivers
+	'persist', 'persistent', 'debug', 'fetchmode'
+	
Interbase/Firebird
+	
+					 'dialect',
+					 'charset',
+					'buffers'
+	
M'soft ADO
+					 'charpage'
+					
+		
MySQL
+					'clientflags'
+
MySQLi
+	'port', 'socket', 'clientflags'
+

+

+For all drivers, when the options persist or persistent are set,  a persistent connection is forced.
+The debug option enables debugging. The fetchmode calls SetFetchMode().
+If no value is defined for an option, then the value is set to 1.
+

+ADOdb DSN's are compatible with version 1.0 of PEAR DB's DSN format.
 
 
Examples of Connecting to Databases

 
MySQL and Most Other Database Drivers

@@ -256,8 +311,23 @@ different databases. The solution is to always use different userid's for differ
 
 	$conn = &ADONewConnection('mysql'); 
 	$conn->PConnect('localhost','userid','password','database');
+	
+	# or dsn 
+	$dsn = 'mysql://user:pwd@localhost/mydb'; 
+	$conn = ADONewConnection($dsn);  # no need for Connect()
+	
+	# or persistent dsn
+	$dsn = 'mysql://user:pwd@localhost/mydb?persist'; 
+	$conn = ADONewConnection($dsn);  # no need for PConnect()
+	
+	# a more complex example:
+	$pwd = urlencode($pwd);
+	$flags =  MYSQL_CLIENT_COMPRESS;
+	$dsn = "mysql://user:$pwd@localhost/mydb?persist&clientflags=$flags";
+	$conn = ADONewConnection($dsn);  # no need for PConnect()
  

-
 Most other database drivers use a similar convention: Connect($server, $user, $password, $database). Exceptions are listed below.
+
 For most drivers, you can use the standard function: Connect($server, $user, $password, $database), or
+a DSN since ADOdb 4.51. Exceptions to this are listed below.
 
PostgreSQL

 
PostgreSQL accepts connections using: 

 
a. the standard connection string:

@@ -267,7 +337,14 @@ different databases. The solution is to always use different userid's for differ
 
 b. the classical 4 parameters:

  
 	$conn->PConnect('localhost','userid','password','database');
- 

+
+

c. dsn: +

+	$dsn = 'postgres7://user:pwd@localhost/mydb?persist';  # persist is optional
+	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect
+
+ +

LDAP

Here is an example of querying a LDAP server. Thanks to Josh Eldridge for the driver and this example: 

@@ -313,12 +390,22 @@ You define the database in the $host parameter:
 	$conn = &ADONewConnection('ibase'); 
 	$conn->PConnect('localhost:c:\ibase\employee.gdb','sysdba','masterkey');
+

Or dsn: +

+	$dsn = 'firebird://user:pwd@localhost/mydb?persist&dialect=3';  # persist is optional
+	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect
+

SQLite

Sqlite will create the database file if it does not exist. 
 	$conn = &ADONewConnection('sqlite'); 
 	$conn->PConnect('c:\path\to\sqlite.db'); # sqlite will create if does not exist
+

Or dsn: +

+	$dsn = 'sqlite://user:pwd@localhost/mydb?persist';  # persist is optional
+	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect
+

Oracle (oci8)

With oci8, you can connect in multiple ways. Note that oci8 works fine with newer versions of the Oracle, eg. 9i and 10g.

@@ -337,6 +424,17 @@ newer versions of the Oracle, eg. 9i and 10g.

(CONNECT_DATA=(SID=$sid)))"; $conn->Connect($cstr, 'scott', 'tiger'); +

f. ADOdb dsn: +

+	$dsn = 'oci8://user:pwd@tnsname?persist';  # persist is optional
+	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect
+	
+	$dsn = 'oci8://user:pwd@host/sid';
+	$conn = ADONewConnection($dsn);
+	
+	$dsn = 'oci8://user:pwd@/';   # oracle on local machine
+	$conn = ADONewConnection($dsn);
+

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 @@ -395,16 +493,27 @@ using the ADOdb library and Microsoft's ADO: qstr, Affected_Rows, Insert_ID

-

The fastest way to access the fields is by accessing the array $recordset->fields +

The fastest way to access the field data 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.

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 +

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. +

Advanced Tips +

If you have the ADOdb C extension installed, + you can replace your calls to $rs->MoveNext() with adodb_movenext($rs). + This doubles the speed of this operation. For retrieving entire recordsets at once, +use GetArray(), which uses the high speed extension function adodb_getall($rs) internally. +

Execute() is the default way to run queries. You can use the low-level functions _Execute() and _query() +to reduce query overhead. Both these functions share the same parameters as Execute(). +

If you do not have any bind parameters or your database supports binding (without emulation), +then you can call _Execute() directly. Calling this function bypasses bind emulation. Debugging is still supported in _Execute(). +

If you do not require debugging facilities nor emulated binding, and do not require a recordset to be returned, then you can call _query. This is great for inserts, updates and deletes. Calling this function +bypasses emulated binding, debugging, and recordset handling. Either the resultid, true or false are returned by _query(). +

For Informix, you can disable scrollable cursors with $db->cursorType = 0.

Hacking ADOdb Safely

You might want to modify ADOdb for your own purposes. Luckily you can @@ -416,7 +525,7 @@ the function-name stored in this variable if it is defined. 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 {
@@ -425,7 +534,7 @@ var $rsPrefix = 'hack_rs_';
 }
 
 class hack_rs_mysql extends ADORecordSet_mysql {
- /* Your mods here */
+	 /* Your mods here */
 }
 
 class hack_postgres7 extends adodb_postgres7 {
@@ -449,9 +558,8 @@ function& hack_factory($driver)
 }
 
 include_once('adodb.inc.php');
-
-

Don't forget to call the constructor of the parent class. +

Don't forget to call the constructor of the parent class in your constructor. If you want to use the default ADOdb drivers return false in the above hack_factory() function.

PHP5 Features

ADOdb 4.02 or later will transparently determine which version of PHP you are using. @@ -481,6 +589,7 @@ catch exceptions on errors as they occur. }

Note that reaching EOF is not considered an error nor an exception. +If you want to use the default ADOdb drivers return false.

Databases Supported

The name below is the value you pass to NewADOConnection($name) to create a connection object for that database. @@ -1391,20 +1500,24 @@ PEAR::setErrorHandling('PEAR_ERROR_DIE');

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');
+
An example:

+
    $username = 'root';
    $password = '';
    $hostname = 'localhost';
    $databasename = 'xphplens';
    $driver = 'mysql';
-   $dsn = "$driver://$username:$password@$hostname/$databasename";

-
   $db = DB::Connect($dsn);
   $rs = $db->query('select firstname,lastname from adoxyz');
+   $dsn = "$driver://$username:$password@$hostname/$databasename"
+   $db = NewADOConnection(); 
+   # DB::Connect($dsn) also works if you include 'adodb/adodb-pear.inc.php' at the top
+   $rs = $db->query('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.

+   

+
   More info and connection examples on the DSN format.
+
  
PEAR Compatibility

   We support DSN's (see above), and the following functions:
  
@@ -1465,7 +1578,7 @@ $rs = $conn->CacheExec
  
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. 
 
+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 
@@ -1892,9 +2005,30 @@ only with SELECT statements.
     # $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);

+	$stmt = $db->Prepare("begin :cursorvar := getdata(:param1); end;", true); 
+	$db->Parameter($stmt, $cur, 'cursorvar', false, -1, OCI_B_CURSOR);
+	$rs = $db->Execute($stmt,$bindarr);
+
+

ExecuteCursor only accepts 1 out parameter. So if you have 2 out parameters, use: +

+	$vv = 'A%';
+	$stmt = $db->PrepareSP("BEGIN list_tabs(:crsr,:tt); END;");
+	$db->OutParameter($stmt, $cur, 'crsr', -1, OCI_B_CURSOR);
+	$db->OutParameter($stmt, $vv, 'tt', 32); # return varchar(32)
+	$arr = $db->GetArray($stmt);
+	print_r($arr);
+	echo " val = $vv"; ## outputs 'TEST'
+
+for the following PL/SQL: +
+	TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
+
+	PROCEDURE list_tabs(tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) IS
+	BEGIN
+		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
+		tablenames := 'TEST';
+	END list_tabs;
+

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 @@ -3144,8 +3278,32 @@ $rs = $conn->Execute PHP.

Change Log

+

4.51 29 July 2004 +

Added adodb-xmlschema 1.0.2. Thx dan and richard. +

Added new adorecordset_ext_* classes. If ADOdb extension installed for mysql, mysqlt and oci8 +(but not oci8po), we use the superfast ADOdb extension code for movenext. +

Added schema support to mssql and odbc_mssql MetaPrimaryKeys(). +

Patched MSSQL driver to support PHP NULL and Boolean values +while binding the input array parameters in the _query() function. By Stephen Farmer. +

Added support for clob's for mssql, UpdateBlob(). Thx to gfran#directa.com.br +

Added normalize support for postgresql (true=lowercase table name, or false=case-sensitive table names) +to MetaColumns($table, $normalize=true). +

PHP5 variant dates in ADO not working. Fixed in adodb-ado.inc.php. +

Constant ADODB_FORCE_NULLS was not working properly for many releases (for GetUpdateSQL). Fixed. +Also GetUpdateSQL strips off ORDER BY now - thx Elieser Leão. +

Perf Monitor for oci8 now dynamically highlights optimizer_* params if too high/low. +

Added dsn support to NewADOConnection/ADONewConnection. +

Fixed out of page bounds bug in _adodb_pageexecute_all_rows() Thx to "Sergio Strampelli" sergio#rir.it +

Speedup of movenext for mysql and oci8 drivers. +

Moved debugging code _adodb_debug_execute() to adodb-lib.inc.php. +

Fixed postgresql bytea detection bug. See http://phplens.com/lens/lensforum/msgs.php?id=9849. +

Fixed ibase datetimestamp typo in PHP5. Thx stefan. +

Removed whitespace at end of odbtp drivers. +

Added db2 metaprimarykeys fix. +

Optimizations to MoveNext() for mysql and oci8. Misc speedups to Get* functions.

4.50 6 July 2004

Bumped it to 4.50 to avoid confusion with PHP 4.3.x series. +

Added db2 metatables and metacolumns extensions.

Added alpha PDO driver. Very buggy, only works with odbc.

Tested mysqli. Set poorAffectedRows = true. Cleaned up movenext() and _fetch().

PageExecute does not work properly with php5 (return val not a variable). Reported Dmytro Sychevsky sych#php.com.ua. Fixed. diff --git a/phpgwapi/inc/adodb/docs/docs-datadict.htm b/phpgwapi/inc/adodb/docs/docs-datadict.htm index a815749dbb..a575f4dde8 100644 --- a/phpgwapi/inc/adodb/docs/docs-datadict.htm +++ b/phpgwapi/inc/adodb/docs/docs-datadict.htm @@ -1,553 +1,276 @@ + - - ADODB Data Dictionary Manual - - - - - + +

ADOdb Data Dictionary Library for PHP

-

V4.50 6 July 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.

-
Kindly note that the ADOdb home page has moved to http://adodb.sourceforge.net/ because of the persistent - unreliability of http://php.weblogs.com. Please change your links!
-

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. +

V4.50 6 July 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.

+ + + + + + +
Kindly note that the ADOdb home page has +moved to http://adodb.sourceforge.net/ +because of the persistent unreliability of http://php.weblogs.com. Please +change your links!
+

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. You can contact them at +dcech#phpwerx.net and richtl#arscognita.com.

+

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);
-
- +
  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 +

  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:

+

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.

+

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.

+
  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')
-  );
-
+
  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 will treat the names as case-sensitive (eg. Oracle) , and others won't. So be careful.

- -

The $taboptarray is the 3rd parameter of the CreateTableSQL function. This contains table specific settings. Legal keywords include:

+
  $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 will treat the names as case-sensitive (eg. Oracle) , and +others won't. So be careful.

+

The $taboptarray is the 3rd parameter of the CreateTableSQL +function. This contains table specific settings. Legal keywords include:

- -

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)');
- +

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
-
- +

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.

- +

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.

- +

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

- +

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.

- +

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.

- -
- - +
  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.

- +

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>
-
- +

Adodb-xmlschema, or AXMLS, is a set of classes that allow the user +to quickly and easily build or upgrade a database on almost any RDBMS +using the excellent ADOdb database library and a simple XML formatted +schema file. Our goal is to give developers a tool that's simple to +use, but that will allow them to create a single file that can build, +upgrade, and manipulate databases on most RDBMS platforms.

+ Installing axmls +

The easiest way to install AXMLS to download and install any recent +version of the ADOdb database abstraction library. To install AXMLS +manually, simply copy the adodb-xmlschema.inc.php file and the xsl +directory into your adodb directory.

+ 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.

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. +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/phpgwapi/inc/adodb/docs/docs-perf.htm b/phpgwapi/inc/adodb/docs/docs-perf.htm index ae2e0c736f..edfbc22d4a 100644 --- a/phpgwapi/inc/adodb/docs/docs-perf.htm +++ b/phpgwapi/inc/adodb/docs/docs-perf.htm @@ -1,388 +1,972 @@ - - ADOdb Performance Monitoring Library + ADOdb Performance Monitoring Library + -

The ADOdb Performance Monitoring Library

V4.50 6 July 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.

-
Kindly note that the ADOdb home page has moved to http://adodb.sourceforge.net/ because of the persistent - unreliability of http://php.weblogs.com. Please change your links!
-

Useful ADOdb links: Download   Other Docs +

This software is dual licensed using BSD-Style and +LGPL. This means you can use it in compiled proprietary and commercial +products.

+ + + + + + +
Kindly note that the ADOdb home page has +moved to http://adodb.sourceforge.net/ +because of the persistent unreliability of http://php.weblogs.com. Please +change your links!
+

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: +

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: +
  • 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.
      • +
    • 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. +
    • +
  • 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: +

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.
    • +
  • 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:

+

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.
    • +
  • 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.

+

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);
-?>
-
+

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');
-
+
$size = $perf->DBParameter('data cache size');

-Thx to Fernando Ortiz for the informix module. -

Methods

+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
- - - - - - - - - - - - +

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:

+

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
+ + + + + + + +
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
-

function HealthCheck()

-

Returns database health check parameters as a HTML table. You will need to - echo or print the output of this function,

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

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. +

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. - +

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. +

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. +

+

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.

+

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").

+

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.

+

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:

+

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 +
  2. 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.
    3. -
  3. either +
  4. 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. sql string to retrieve value, eg. "select value from +v\$parameter where name='db_block_size'",
      5. +
    5. 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),
      6. +
    6. 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',
    5. -
  5. 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().
    6. +
  6. 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().

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
+
'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
- - -

 

-

- - - - - - - - - - - - +

db2 informix mysql mssql oci8 +postgres

+

+

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 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

db2

+
ParameterValueDescription
Ratios  
data cache hit ratio0    
Data Cache
data cache buffers250   See tuning +reference.
cache blocksize4096    
data cache size1000K    
Connections
current connections2    

 

-

- - - - - - - - - +

+

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 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

informix

+
ParameterVal +ueDescription
Ratios  
data cache hit +ratio95.89 
IO  
data +reads1883884Page reads
data writes1716724Page writes
Connections + 
current connections263.0Number of +sessions
- +

 

-

- - - - - - - - - - - - - - - - - - - - +

+

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.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

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
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
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/phpgwapi/inc/adodb/docs/docs-session.htm b/phpgwapi/inc/adodb/docs/docs-session.htm index 96571b81b7..5015af43a8 100644 --- a/phpgwapi/inc/adodb/docs/docs-session.htm +++ b/phpgwapi/inc/adodb/docs/docs-session.htm @@ -1,239 +1,179 @@ + -ADODB Session Management Manual - - - - + ADODB Session Management Manual + + + +

ADODB Session Management Manual

V4.50 6 July 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. -
Kindly note that the ADOdb home page has moved to http://adodb.sourceforge.net/ because of the persistent - unreliability of http://php.weblogs.com. Please change your links!
-

Useful ADOdb links: Download   Other Docs - +

+

This software is dual licensed using BSD-Style and +LGPL. This means you can use it in compiled proprietary and commercial +products. + + + + + + + + +
Kindly note that the ADOdb home page has +moved to http://adodb.sourceforge.net/ +because of the persistent unreliability of http://php.weblogs.com. Please +change your links!
+

+

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: +

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. +

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. +
  • 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();
-    
+

+
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.
+
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 1: If you have register_globals disabled in php.ini, then you
+will have to manually set the EXPIREREF. E.g. 

+
 
+    $GLOBALS['USERID'] =& $_SESSION['USERID'];
+    $ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
 

-
-    
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 1: If you have register_globals disabled in php.ini, then you will have to
-	manually set the EXPIREREF. E.g.
-	  
 
-	    $GLOBALS['USERID'] =& $_SESSION['USERID'];
-        $ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-    

-    

-    NOTE 2: 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.
-
+
 NOTE 2: 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.
+

 
Neat Notification Tricks

-
 
ExpireRef normally holds the user id of the current session.
-

-1. You can then write a session monitor, scanning expireref to see
+

+
1. You can then write a session monitor, scanning expireref to see
 who is currently logged on.
-

-2. If you delete the sessions record for a specific user, eg.
-
-delete from sessions where expireref = '$USER'
-

+

+
2. If you delete the sessions record for a specific user, eg.
+

+
delete from sessions where expireref = '$USER'

 then the user is logged out. Useful for ejecting someone from a
 site.
-

-3. You can scan the sessions table to ensure no user
+
3. You can scan the sessions table to ensure no user
 can be logged in twice. Useful for security reasons.
-

-
+

 
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.
+Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and
+compression schemes are supported. Currently, supported are:
 

-Also see the core ADOdb documentation.
+
  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/phpgwapi/inc/adodb/drivers/adodb-access.inc.php b/phpgwapi/inc/adodb/drivers/adodb-access.inc.php
index 9a3f200a8c..dab2a510d6 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-access.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-access.inc.php
@@ -1,6 +1,6 @@
 hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
 		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-
+			//echo "
",$t,' ';var_dump($f->value); echo '
';
 			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);
+				else {
+					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+					else $val = $f->value;
+					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+				}
 				break;			
 			case 133:// A date value (yyyymmdd) 
 				if ($val = $f->value) {
@@ -564,7 +568,13 @@ class ADORecordSet_ado extends ADORecordSet {
 				break;
 			case 7: // adDate
 				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else $this->fields[] = adodb_date('Y-m-d',(float)$f->value);
+				else {
+					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+					else $val = $f->value;
+					
+					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
+					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+				}
 				break;
 			case 1: // null
 				$this->fields[] = false;
diff --git a/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php b/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
index 1af1524e0a..f7ed54b0f2 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
@@ -1,6 +1,6 @@
 GetOne("select 1 as ignore from $tables where $where for update");
 	}
 	
-	function &MetaTables($ttype=false,$showSchema=false)
+	function &MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
 	{
 	global $ADODB_FETCH_MODE;
 	
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
+		$qid = odbc_tables($this->_connectionID, "", $qschema, $qtable, "");
 		
 		$rs = new ADORecordSet_odbc($qid);
 		
@@ -177,6 +176,7 @@ class ADODB_DB2 extends ADODB_odbc {
 		return $arr2;
 	}
 	
+	
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
 	{	
diff --git a/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php b/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
index 83563b760f..9fe55c8085 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
@@ -1,6 +1,6 @@
 ibasetrans = IBASE_DEFAULT;
   	}
 	
+	
+	   // returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
+	{  
+		if (!function_exists('ibase_pconnect')) return null;
+		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
+		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
+		$this->_connectionID = $fn($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;
+		}
+		
+		// PHP5 change.
+		if (function_exists('ibase_timefmt')) {
+			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
+			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
+			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
+			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
+			
+		} else {
+			ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
+			ini_set("ibase.dateformat", $this->ibase_datefmt);
+			ini_set("ibase.timeformat", $this->ibase_timefmt);
+		}
+		return true;
+	}
+	   // returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true);
+	}	
+	
+	
 	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
 	{	
 		if ($internalKey) return array('RDB$DB_KEY');
@@ -257,48 +296,6 @@ class ADODB_ibase extends ADOConnection {
 			return $this->_errorMsg;
 	}
 
-	   // returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
-	{  
-		if (!function_exists('ibase_pconnect')) return null;
-		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
-		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
-		$this->_connectionID = $fn($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;
-		}
-		
-		// PHP5 change.
-		if (function_exists('ibase_timefmt')) {
-			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
-			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
-			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
-			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
-		} else {
-			ini_set("ibase.timestampformat", $this->base_timestampfmt);
-			ini_set("ibase.dateformat", $this->ibase_datefmt);
-			ini_set("ibase.timeformat", $this->ibase_timefmt);
-		}
-		//you can use
-		/*
-		ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
-		ini_set("ibase.dateformat", $this->ibase_datefmt);
-		ini_set("ibase.timeformat", $this->ibase_timefmt);
-		*/
-		return true;
-	}
-	   // returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true);
-	}	
-	
 	function Prepare($sql)
 	{
 		$stmt = ibase_prepare($this->_connectionID,$sql);
diff --git a/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php b/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
index 964daea812..a2388a8ea7 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
@@ -1,6 +1,6 @@
  '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'))";
@@ -376,14 +375,25 @@ order by constraint_name, referenced_table_name, keyno";
 
 	// "Stein-Aksel Basma" 
 	// tested with MSSQL 2000
-	function MetaPrimaryKeys($table)
+	function &MetaPrimaryKeys($table)
 	{
-		$sql = "select k.column_name from information_schema.key_column_usage k,
+	global $ADODB_FETCH_MODE;
+	
+		$schema = '';
+		$this->_findschema($table,$schema);
+		if (!$schema) $schema = $this->database;
+		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+
+		$sql = "select distinct k.column_name,ordinal_position 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'";
+		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
 		
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$a = $this->GetCol($sql);
+		$ADODB_FETCH_MODE = $savem;
+		
 		if ($a && sizeof($a)>0) return $a;
 		return false;	  
 	}
@@ -552,6 +562,11 @@ order by constraint_name, referenced_table_name, keyno";
 	*/
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
+	
+		if (strtoupper($blobtype) == 'CLOB') {
+			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
+			return $this->Execute($sql) != false;
+		}
 		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
 		return $this->Execute($sql) != false;
 	}
@@ -589,10 +604,16 @@ order by constraint_name, referenced_table_name, keyno";
 				} else if (is_integer($v)) {
 					$decl .= "@P$i INT";
 					$params .= "@P$i=".$v;
-				} else {
+				} else if (is_float($v)) {
 					$decl .= "@P$i FLOAT";
 					$params .= "@P$i=".$v;
-				}
+				} else if (is_bool($v)) {
+					$decl .= "@P$i INT"; # Used INT just in case BIT in not supported on the user's MSSQL version. It will cast appropriately.
+					$params .= "@P$i=".(($v)?'1':'0'); # True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int field
+				} else {
+					$decl .= "@P$i CHAR"; # Used char because a type is required even when the value is to be NULL.
+					$params .= "@P$i=NULL";
+					}
 				$i += 1;
 			}
 			$decl = $this->qstr($decl);
diff --git a/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php b/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
index e36326945e..1c6f990e0c 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
@@ -1,6 +1,6 @@
 rsPrefix .= 'ext_';
 	}
 	
 	function ServerInfo()
@@ -166,6 +166,11 @@ class ADODB_mysql extends ADOConnection {
 		return false;
 	}
 	
+	function BeginTrans()
+	{
+		if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
+	}
+	
 	function _affectedrows()
 	{
 			return mysql_affected_rows($this->_connectionID);
@@ -239,18 +244,22 @@ class ADODB_mysql extends ADOConnection {
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
+				
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				/** FALL THROUGH */
+			case '-':
+			case '/':
+				$s .= $ch;
+				break;
+				
 			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;
@@ -263,6 +272,15 @@ class ADODB_mysql extends ADOConnection {
 				$s .= '%d';
 				break;
 			
+			case 'Q':
+			case 'q':
+				$s .= "'),Quarter($col)";
+				
+				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+				else $s .= ",('";
+				$concat = true;
+				break;
+			
 			case 'H': 
 				$s .= '%H';
 				break;
@@ -284,14 +302,7 @@ class ADODB_mysql extends ADOConnection {
 				$s .= '%p';
 				break;
 				
-			default:
-				
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $ch;
-				break;
+
 			}
 		}
 		$s.="')";
@@ -449,7 +460,6 @@ class ADODB_mysql extends ADOConnection {
 		return $rs;
 	}
 	
-	
 	// returns queryID or false
 	function _query($sql,$inputarr)
 	{
@@ -477,8 +487,6 @@ class ADODB_mysql extends ADOConnection {
 		else return @mysql_errno($this->_connectionID);
 	}
 	
-
-	
 	// returns true or false
 	function _close()
 	{
@@ -509,6 +517,7 @@ class ADODB_mysql extends ADOConnection {
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
+
 class ADORecordSet_mysql extends ADORecordSet{	
 	
 	var $databaseType = "mysql";
@@ -587,29 +596,20 @@ class ADORecordSet_mysql extends ADORecordSet{
 		return @mysql_data_seek($this->_queryID,$row);
 	}
 	
-	
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	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 adodb_movenext($this);
+		//if (defined('ADODB_EXTENSION')) return adodb_movenext($this);
+		if (@$this->fields =& mysql_fetch_array($this->_queryID,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
 		}
-		*/
 		return false;
-	}	
+	}
 	
 	function _fetch()
 	{
@@ -676,5 +676,32 @@ class ADORecordSet_mysql extends ADORecordSet{
 	}
 
 }
+
+class ADORecordSet_ext_mysql extends ADORecordSet_mysql {	
+	function ADORecordSet_ext_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 MoveNext()
+	{
+		return adodb_movenext($this);
+	}
+}
+
+
 }
 ?>
\ No newline at end of file
diff --git a/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php b/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
index 2ee13a4e6c..76bc8ceeb9 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
@@ -1,6 +1,6 @@
 _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,
+					$this->port,
+					$this->socket,
+					$this->clientFlags))
+ 	      {
+ 		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)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 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 IfNull( $field, $ifNull ) 
 	{
 		return " IFNULL($field, $ifNull) "; // if MySQL
@@ -329,70 +385,6 @@ class ADODB_mysqli extends ADOConnection {
 		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) 
 	{
@@ -539,8 +531,11 @@ class ADODB_mysqli extends ADOConnection {
 	{
 		return $sql;
 		
-		$stmt = mysqli_prepare($this->_connectionID,$sql);
-		if (!$stmt) return false;
+		$stmt = $this->_connectionID->prepare($sql);
+		if (!$stmt) {
+			echo $this->ErrorMsg();
+			return $sql;
+		}
 		return array($sql,$stmt);
 	}
 	
@@ -549,18 +544,20 @@ class ADODB_mysqli extends ADOConnection {
 	function _query($sql, $inputarr)
 	{
 	global $ADODB_COUNTRECS;
-	
+		
 		if (is_array($sql)) {
 			$stmt = $sql[1];
+			$a = '';
 			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);
+				if (is_string($v)) $a .= 's';
+				else if (is_integer($v)) $a .= 'i'; 
+				else $a .= 'd';
 			}
-			$ret = mysqli_execute($stmt);
+			
+			$fnarr =& array_merge( array($stmt,$a) , $inputarr);
+			$ret = call_user_func_array('mysqli_stmt_bind_param',$fnarr);
+
+			$ret = mysqli_stmt_execute($stmt);
 			return $ret;
 		}
 		if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
diff --git a/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php b/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
index 1b102389a4..49425061f7 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
@@ -1,7 +1,7 @@
 rsPrefix .= 'ext_';
+	}
+	
 	function BeginTrans()
 	{	  
 		if ($this->transOff) return true;
@@ -59,21 +64,62 @@ class ADODB_mysqlt extends ADODB_mysql {
 class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
 	var $databaseType = "mysqlt";
 	
-	function ADORecordSet_mysqlt($queryID,$mode=false) {
-		return $this->ADORecordSet_mysql($queryID,$mode);
+	function ADORecordSet_mysqlt($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 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;
-		
+	function MoveNext()
+	{
+		if (@$this->fields =& mysql_fetch_array($this->_queryID,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
 		return false;
-	}	
+	}
 }
+
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
+
+	function ADORecordSet_ext_mysqli($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 MoveNext()
+	{
+		return adodb_movenext($this);
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php b/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
index 57c1cc34a1..8e9bda5c6b 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
@@ -1,6 +1,6 @@
 _hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
+		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
 	}
 	
 	/*  Function &MetaColumns($table) added by smondino@users.sourceforge.net*/
@@ -234,8 +235,6 @@ NATSOFT.DOMAIN =
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
 	}
 	
-	
-	
 	// returns true or false
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
@@ -576,7 +575,7 @@ NATSOFT.DOMAIN =
 		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);
+		$rs = $this->_Execute($sql,$arr);
 		if ($rez = !empty($rs)) $desc->save($val);
 		$desc->free();
 		if ($commit) $this->CommitTrans();
@@ -748,7 +747,7 @@ NATSOFT.DOMAIN =
 		return $rez;
 	}
 	
-	function Param($name)
+	function Param($name,$type=false)
 	{
 		return ':'.$name;
 	}
@@ -898,6 +897,8 @@ NATSOFT.DOMAIN =
 	// returns true or false
 	function _close()
 	{
+		if (!$this->_connectionID) return;
+		
 		if (!$this->autoCommit) OCIRollback($this->_connectionID);
 		if (count($this -> _refLOBs) > 0) {
 			foreach ($this -> _refLOBs as $key => $value) {
@@ -906,6 +907,7 @@ NATSOFT.DOMAIN =
 			}
 		}
 		OCILogoff($this->_connectionID);
+		
 		$this->_stmt = false;
 		$this->_connectionID = false;
 	}
@@ -1126,8 +1128,9 @@ class ADORecordset_oci8 extends ADORecordSet {
 	}
 	
 	
+	/*
 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	function _MoveNext() 
 	{
 	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
 		
@@ -1139,7 +1142,22 @@ class ADORecordset_oci8 extends ADORecordSet {
 		$this->EOF = true;
 		
 		return false;
-	}	
+	}	*/
+	
+	
+	function MoveNext()
+	{
+		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
+		return false;
+	}
+	
 	
 	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
 	function &GetArrayLimit($nrows,$offset=-1) 
@@ -1244,4 +1262,29 @@ class ADORecordset_oci8 extends ADORecordSet {
 		}
 	}
 }
+
+class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
+	function ADORecordSet_ext_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 MoveNext()
+	{
+		return adodb_movenext($this);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php b/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
index c28cc004d5..c03c655c78 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
@@ -1,6 +1,6 @@
 ADODB_oci8();
+		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
+		# oci8po does not support adodb extension: adodb_movenext()
 	}
 	
 	function Param($name)
@@ -77,59 +78,72 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 
 	var $databaseType = 'oci8po';
 	
-		function ADORecordset_oci8po($queryID,$mode=false)
-		{
-			$this->ADORecordset_oci8($queryID,$mode);
-		}
+	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)]];
-		}
+	function Fields($colname)
+	{
+		if ($this->fetchMode & OCI_ASSOC) return $this->fields[$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;
+		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;
+	}
+	/*
+	function MoveNext()
+	{
+		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
+		return false;
+	}*/
 
 	// 10% speedup to move MoveNext to child class
 	function MoveNext() 
 	{
-	
-		if (!$this->EOF) {		
+		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+		global $ADODB_ANSI_PADDING_OFF;
 			$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);
-					}
+			
+			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;
 			}
+			return true;
+		}
+		if (!$this->EOF) {
 			$this->EOF = true;
+			$this->_currentRow++;
 		}
 		return false;
 	}	
@@ -190,4 +204,6 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 	}
 	
 }
+
+
 ?>
\ No newline at end of file
diff --git a/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php b/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
index ee8c8cc1d4..13198bad10 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
@@ -1,6 +1,6 @@
 _connectionID,
+				$rez = @odbc_data_source($this->_connectionID,
 					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
 				$first = false;
 				if (!is_array($rez)) break;
@@ -232,9 +233,13 @@ class ADODB_odbc extends ADOConnection {
 	{
 	global $ADODB_FETCH_MODE;
 	
+		if ($this->uCaseTables) $table = strtoupper($table);
+		$schema = '';
+		$this->_findschema($table,$schema);
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = @odbc_primarykeys($this->_connectionID,'','',$table);
+		$qid = @odbc_primarykeys($this->_connectionID,'',$schema,$table);
 		
 		if (!$qid) {
 			$ADODB_FETCH_MODE = $savem;
@@ -361,14 +366,14 @@ class ADODB_odbc extends ADOConnection {
 	{
 	global $ADODB_FETCH_MODE;
 	
-		$table = strtoupper($table);
-		$schema = false;
+		if ($this->uCaseTables) $table = strtoupper($table);
+		$schema = '';
 		$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
+		/*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;
@@ -387,12 +392,19 @@ class ADODB_odbc extends ADOConnection {
 			$rs->Close();
 			
 			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
-		} else switch ($this->databaseType) {
+		} */
+		
+		switch ($this->databaseType) {
 		case 'access':
 		case 'vfp':
-		case 'db2':
-			$qid = odbc_columns($this->_connectionID);
+			$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
 			break;
+		
+		
+		case 'db2':
+            $colname = "%";
+            $qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
+            break;
 			
 		default:
 			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
diff --git a/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php b/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
index 38c7eb70e9..18ba7e70cf 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
@@ -1,6 +1,6 @@
 _findschema($table,$schema);
+		//if (!$schema) $schema = $this->database;
+		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+	
+		$sql = "select distinct k.column_name,ordinal_position 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'";
+		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
 		
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		$a = $this->GetCol($sql);
+		$ADODB_FETCH_MODE = $savem;
+		
 		if ($a && sizeof($a)>0) return $a;
 		return false;	  
 	}
diff --git a/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php b/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
index 44323627bf..46699d92b4 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
@@ -1,6 +1,6 @@
 _canSelectDb = true;
 				$this->substr = "substring";
 				$this->length = 'len';
-				$this->upperCase = 'upper';
 				$this->identitySQL = 'select @@IDENTITY';
 				$this->metaDatabasesSQL = "select name from master..sysdatabases where name <> 'master'";
 				break;
@@ -202,7 +201,6 @@ class ADODB_odbtp extends ADOConnection{
 				$this->replaceQuote = "'+chr(39)+'";
 				$this->true = '.T.';
 				$this->false = '.F.';
-				$this->upperCase = 'upper';
 				break;
 			case ODB_DRIVER_ORACLE:
 				$this->fmtDate = "'Y-m-d 00:00:00'";
@@ -222,7 +220,6 @@ class ADODB_odbtp extends ADOConnection{
 				$this->rightOuter = '=*';
 				$this->hasInsertID = true;
 				$this->hasTransactions = true;
-				$this->upperCase = 'upper';
 				$this->identitySQL = 'select @@IDENTITY';
 				break;
 			default:
@@ -628,6 +625,4 @@ class ADORecordSet_odbtp extends ADORecordSet {
 	}
 }
 
-?>
-
-
+?>
\ No newline at end of file
diff --git a/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php b/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
index bee94d2184..0f3b090e6b 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
@@ -1,6 +1,6 @@
 
-
+?>
\ No newline at end of file
diff --git a/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php b/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
index 765c50b319..c03b8d6fd7 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
@@ -1,15 +1,15 @@
 _findschema($table,$schema);
 		
-		$table = strtolower($table);
+		if ($normalize) $table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
@@ -486,7 +486,7 @@ select viewname,'V' from pg_views where viewname like $mask";
 			}
 			
 			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
+			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
 			
 			$rs->MoveNext();
 		}
@@ -805,7 +805,7 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 			if (pg_fieldtype($qid,$i) == 'bytea') {
 				$this->_blobArr[$i] = pg_fieldname($qid,$i);
 			}
-		}		
+		}
 	}
 
 		/* Use associative array to get fields array */
@@ -867,7 +867,7 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 			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();
+					if (isset($this->_blobArr)) $this->_fixblobs();
 					return true;
 				}
 			}
diff --git a/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php b/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
index dbab597e65..873acd05f0 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
@@ -1,6 +1,6 @@
  0 && $cnt) $cnt += $offset;
 		
 		$this->Execute("set rowcount $cnt"); 
-		$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
 		$this->Execute("set rowcount 0"); 
 		
 		return $rs;
diff --git a/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php b/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
index 3c7ee2931f..ee9bc6aa99 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
@@ -1,6 +1,6 @@
  100)",'These are sql statements that should be using bind variables'),*/
 		'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.'),
-		
+			'=WarnIndexCost'),
 		'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. '),		
+			'=WarnPageCost'),
 		
 		false
 		
@@ -172,6 +170,23 @@ having count(*) > 100)",'These are sql statements that should be using bind vari
 		$this->conn =& $conn;
 	}
 	
+	function WarnPageCost($val)
+	{
+		if ($val == 100) $s = 'Too High. ';
+		else $s = '';
+		
+		return $s.'Recommended is 20-50 for TP, and 50 for data warehouses. Default is 100. See optimizer_index_cost_adj. ';
+	}
+	
+	function WarnIndexCost($val)
+	{
+		if ($val == 0) $s = 'Too Low. ';
+		else $s = '';
+		
+		return $s.'Percentage of indexed data blocks expected in the cache.
+			Recommended is 20 (fast disk array) to 50 (slower hard disks). Default is 0.
+			 See optimizer_index_caching.';
+		}
 	
 	function PGA()
 	{
diff --git a/phpgwapi/inc/adodb/perf/perf-postgres.inc.php b/phpgwapi/inc/adodb/perf/perf-postgres.inc.php
index b9392b12e8..36df00d1a2 100644
--- a/phpgwapi/inc/adodb/perf/perf-postgres.inc.php
+++ b/phpgwapi/inc/adodb/perf/perf-postgres.inc.php
@@ -1,7 +1,7 @@
 
 PHP ".PHP_VERSION."\n";
 try {
 
-$dbt = 'mysqli';
+$dbt = 'oci8po';
 
 switch($dbt) {
-case 'oci8':
-	$db = NewADOConnection("oci8");
+case 'oci8po':
+	$db = NewADOConnection("oci8po");
 	$db->Connect('','scott','natsoft');
 	break;
 default:
@@ -32,23 +32,26 @@ case 'mysql':
 	break;
 	
 case 'mysqli':
-	$db = NewADOConnection("mysqli");
-	$db->Connect('localhost','root','','test');
+	$db = NewADOConnection("mysqli://root:@localhost/test");
+	//$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");
+$cnt = $db->GetOne("select count(*) from adoxyz where ?Prepare("select * from adoxyz where ?ErrorMsg(),"\n";
+$rs = $db->Execute($stmt,array(10,20));
 
 $i = 0;
 foreach($rs as  $v) {
 	$i += 1;
-	echo "$i: "; adodb_pr($v); adodb_pr($rs->fields);
+	echo "rec $i: "; adodb_pr($v); adodb_pr($rs->fields);
 	flush();
 }
 
+
 if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
 
 
@@ -60,4 +63,6 @@ $rs = $db->Execute("select bad from badder");
 	$e = adodb_backtrace($e->gettrace());
 }
 
+$rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order by id");
+echo "Result=\n",$rs;
 ?>
\ No newline at end of file
diff --git a/phpgwapi/inc/adodb/tests/test-xmlschema.php b/phpgwapi/inc/adodb/tests/test-xmlschema.php
index d3099fd3d9..34886f2a0d 100644
--- a/phpgwapi/inc/adodb/tests/test-xmlschema.php
+++ b/phpgwapi/inc/adodb/tests/test-xmlschema.php
@@ -18,10 +18,10 @@ $schema = new adoSchema( $db );
 // uncomment the following line:
 #$schema->upgradeSchema();
 
+print "SQL to build xmlschema.xml:\n
";
 // Build the SQL array
 $sql = $schema->ParseSchema( "xmlschema.xml" );
 
-print "Here's the SQL to do the build:\n
";
 print_r( $sql );
 print "
\n";
 
@@ -38,10 +38,12 @@ $db2->Connect('localhost','sa','natsoft','northwind') || die("Fail 2");
 
 $db2->Execute("drop table simple_table");
 
+
+print "SQL to build xmlschema-mssql.xml:\n
";
+
 $schema = new adoSchema( $db2 );
 $sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
 
-print "Here's the SQL to do the build:\n
";
 print_r( $sql );
 print "
\n";
 
diff --git a/phpgwapi/inc/adodb/tests/test.php b/phpgwapi/inc/adodb/tests/test.php
index 472eeb7c1c..e466a1d7c8 100644
--- a/phpgwapi/inc/adodb/tests/test.php
+++ b/phpgwapi/inc/adodb/tests/test.php
@@ -1,6 +1,6 @@
 ts4 =".($db->UnixTimeStamp("19700101000101")+8*3600);
 	print "
ts5 =".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
 	print "
ts6 =".$db->UserTimeStamp("20040110092123");
-	print "
ts6 =".$db->DBTimeStamp("20040110092123");
+	print "
ts7 =".$db->DBTimeStamp("20040110092123");
 	flush();
 	// mssql too slow in failing bad connection
 	if (false && $db->databaseType != 'mssql') {
@@ -151,7 +151,7 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 	}
 	error_reporting($e);
 	flush();
-	
+
 	//$ADODB_COUNTRECS=false;
 	$rs=$db->Execute('select * from adoxyz order by id');
 
@@ -410,6 +410,43 @@ GO
 		$saved = $db->debug;
 		$db->debug=true;
 		
+
+		/*
+		CREATE TABLE PHOTOS
+		(
+		  ID           NUMBER(16),
+		  PHOTO        BLOB,
+		  DESCRIPTION  VARCHAR2(4000 BYTE),
+		  DESCCLOB     CLOB
+		);
+		
+		INSERT INTO PHOTOS (ID) VALUES(1);
+		*/
+		$s = '';
+		for ($i = 0; $i <= 500; $i++) {
+			$s .= '1234567890';
+		}
+		
+		
+		print "
Testing Blob: size=".strlen($s)."
";
+		$ok = $db->Updateblob('photos','photo',$s,'id=1');
+		if (!$ok) Err("Blob failed 1");
+		else {
+			$s2= $db->GetOne("select photo from photos where id=1");
+			if ($s !== $s2) Err("updateblob does not match");
+		}
+		
+		print "
Testing Clob: size=".strlen($s)."
";
+		$ok = $db->UpdateClob('photos','descclob',$s,'id=1');
+		if (!$ok) Err("Clob failed 1");
+		else {
+			$s2= $db->GetOne("select descclob from photos where id=1");
+			if ($s !== $s2) Err("updateclob does not match");
+		}
+		
+		
+		$s = '';
+		$s2 = '';
 		print "
Testing Foreign Keys
";
 		$arr = $db->MetaForeignKeys('emp');
 		print_r($arr);
@@ -417,30 +454,50 @@ GO
 		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 Adodb AS
+TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR);
+PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) ;
+PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR);
+
+PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER);
+END Adodb;
 /
 
-CREATE OR REPLACE PACKAGE BODY adodb AS
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar) IS
+
+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;
+		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
 	END open_tab;
+
+	PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) IS
+	BEGIN
+		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
+		tablenames := 'TEST';
+	END open_tab2;
 	
-PROCEDURE data_out(input IN varchar, output OUT varchar) IS
+PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
 	BEGIN
 		output := 'Cinta Hati '||input;
 	END;
-END adodb;
+
+PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER) AS
+BEGIN
+p2 := p1;
+END;
+END Adodb;
 /
+
+
 */
-		$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS,'A%'); END;");
+		$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:zz,'A%'); END;",'zz');
 	
 		if ($rs && !$rs->EOF) {
-			print "Test 1 RowCount: ".$rs->RecordCount()."
";
+			$v = $db->GetOne("SELECT count(*) FROM tab where tname like 'A%'");
+			if ($v == $rs->RecordCount()) print "Test 1 RowCount: OK
";
+			else Err("Test 1 RowCount ".$rs->RecordCount().", actual = $v");
 		} else {
 			print "Error in using Cursor Variables 1
";
 		}
@@ -488,6 +545,7 @@ END adodb;
 	$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');
@@ -749,8 +807,20 @@ END adodb;
 	$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);
+	
+	echo "
Date Update Test
";
+	$zdate = date('Y-m-d',time()+3600*24);
+	$zdate = $db->DBDate($zdate);
+	$db->Execute("update ADOXYZ set created=$zdate where id=1");
+	$row = $db->GetRow("select created,firstname from ADOXYZ where id=1");
+	print_r($row); echo "
";
+	
+	//$zdate = date('Y-m-d',time()+3600*24);
+	//$db->Execute("update ADOXYZ set created=? where id=2",$zdate);
+	//$zdate = $db->GetOne("select created from ADOXYZ where id=2");
+	//echo "tomorrow=",$zdate,"
";
 	$db->debug=false;
-
+	
 	if ($rs && !$rs->EOF) {
 		if (trim($rs->fields[1]) != 'Caroline') Err("Error 1");
 		$rs->MoveNext();
@@ -854,10 +924,10 @@ END adodb;
 	$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";
+		$sql = "select ".$db->Concat('cast(firstname as varchar)',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
 		$rs = &$db->Execute($sql);
 	} else {
-		$sql = "select distinct ".$db->Concat('firstname',$db->qstr(' '),'lastname')." as fullname,id from ADOXYZ";
+		$sql = "select distinct ".$db->Concat('firstname',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
 		$rs = &$db->Execute($sql);
 	}
 	if ($rs) {
@@ -904,12 +974,12 @@ END adodb;
 	//$arr = $db->GetArray("select  lastname,firstname from ADOXYZ");
 	//print_r($arr);
 	print "
";
-	$rs =& $db->Execute("select distinct lastname,firstname from ADOXYZ");
+	$rs =& $db->Execute("select distinct lastname,firstname,created from ADOXYZ");
 	
 	if ($rs) {
 		$arr = $rs->GetAssoc();
 		//print_r($arr);
-		if (empty($arr['See']) || trim($arr['See']) != 'Wai Hun') print $arr['See']."   ERROR
";
+		if (empty($arr['See']) || trim(reset($arr['See'])) != 'Wai Hun') print $arr['See']."   ERROR
";
 		else print " OK 1";
 	}
 	
@@ -1433,7 +1503,7 @@ if (isset($_SERVER['argv'][1])) {
 	$HTTP_GET_VARS[$_SERVER['argv'][1]] = 1;
 }
 
-if ( @$HTTP_SERVER_VARS['COMPUTERNAME'] == 'TIGRESS') {
+if (@$HTTP_SERVER_VARS['COMPUTERNAME'] == 'TIGRESS') {
 	CheckWS('mysqlt');
 	CheckWS('postgres');
 	CheckWS('oci8po');
@@ -1478,7 +1548,7 @@ if (strpos(PHP_VERSION,'5') === 0) {
 
 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.

+For the latest version of ADODB, visit adodb.sourceforge.net.

 
 Test GetInsertSQL/GetUpdateSQL   
 	Sessions  
@@ -1489,8 +1559,9 @@ include('./testdatabases.inc.php');
 
 echo "
vers=",ADOConnection::Version();
 
+
 include_once('../adodb-time.inc.php');
-adodb_date_test();
+if (!isset($_GET['nd'])) adodb_date_test();
 ?>
 
ADODB Database Library  (c) 2000-2004 John Lim. All rights reserved. Released under BSD and LGPL.

 
diff --git a/phpgwapi/inc/adodb/tests/test2.php b/phpgwapi/inc/adodb/tests/test2.php
index 52a2771bac..82e153c19e 100644
--- a/phpgwapi/inc/adodb/tests/test2.php
+++ b/phpgwapi/inc/adodb/tests/test2.php
@@ -8,7 +8,7 @@
 
 Walt's new stuff failed: $insertS
 
 $sql = "
 SELECT * 
-FROM ADOXYZ WHERE lastname=".$conn->qstr($record['lastname']); 
+FROM ADOXYZ WHERE lastname=".$conn->qstr($record['lastname']). " ORDER BY 1"; 
 // Select a record to update 
 
 $rs = $conn->Execute($sql); // Execute the query and get the existing record to update
diff --git a/phpgwapi/inc/adodb/tests/test5.php b/phpgwapi/inc/adodb/tests/test5.php
index 6a744dc509..38603ecab6 100644
--- a/phpgwapi/inc/adodb/tests/test5.php
+++ b/phpgwapi/inc/adodb/tests/test5.php
@@ -1,6 +1,6 @@
 
 Connecting $db->databaseType...";
-	if (@$db->Connect("localhost","tester","test","test")) {
+	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();
@@ -80,7 +80,7 @@ if (!empty($testibase)) {
 	//$_GET['nolog'] = true;
 	$db = &ADONewConnection('firebird');
 	print "
Connecting $db->databaseType...
";
-	if (@$db->PConnect("localhost:d:\\firebird\\10\\examples\\employee.gdb", "sysdba", "masterkey", ""))
+	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();
 	
@@ -91,7 +91,7 @@ if (!empty($testsqlite)) {
 	$db = &ADONewConnection('sqlite');
 	print "
Connecting $db->databaseType...
";
 	
-	if (@$db->PConnect("d:\\inetpub\\adodb\\sqlite.db", "", "", ""))
+	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";
 	
@@ -101,10 +101,12 @@ if (!empty($testsqlite)) {
 if (!empty($testaccess)) {
 	$db = &ADONewConnection('access');
 	print "
Connecting $db->databaseType...
";
-	
+	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
 	$dsn = "nwind";
-	$driver = "Driver={Microsoft Access Driver (*.mdb)};Dbq=d:\inetpub\adodb\northwind.mdb;Uid=Admin;Pwd=;";
-	if (@$db->PConnect($dsn, "", "", ""))
+	$dsn = "Driver={Microsoft Access Driver (*.mdb)};Dbq=$access;Uid=Admin;Pwd=;";
+	
+	//$dsn =  'Provider=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=' . $access . ';';
+	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";
 	
@@ -120,7 +122,7 @@ if (!empty($testaccess) && !empty($testado)) { // ADO ACCESS
 		. 'DATA SOURCE=' . $access . ';';
 		//. 'USER ID=;PASSWORD=;';
 	
-	if (@$db->PConnect($myDSN, "", "", "")) {
+	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();
@@ -141,11 +143,14 @@ if (!empty($testvfp)) { // ODBC
 // 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")) {
+	$user = 'root'; $password = ''; $database = 'northwind';
+	$db = &ADONewConnection("mysql://$user:$password@$server/$database?persist");
+	print "
Connecting $db->databaseType...
";
+	
+	if (true || $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)");
@@ -195,12 +200,11 @@ if (!empty($testproxy)){
 
 ADOLoadCode('oci805');
 ADOLoadCode("oci8po");
-if (!empty($testoracle)) { 
-	
-	$db = ADONewConnection('oci8po');
+if (!empty($testoracle)) {
+	$dsn = "oci8po://scott:natsoft@panther?persist";
+	$db = ADONewConnection($dsn);
 	print "
Connecting $db->databaseType...
";
-	if ($db->Connect('', "scott", "natsoft",''))
-	//if ($db->PConnect("", "scott", "tiger", "juris.ecosystem.natsoft.com.my"))
+	if (true || $db->Connect('', "scott", "natsoft",''))
 		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();
 
@@ -234,10 +238,9 @@ if (!empty($testmssql)) { // MS SQL Server via ODBC
 	
 	print "
Connecting $db->databaseType...
";
 	
-	$dsn = "mssql-northwind";
-	$dsn = "Driver={SQL Server};Server=localhost;Database=northwind;";
+	$dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=localhost;Database=northwind;";
 	
-	if (@$db->PConnect($dsn, "adodb", "natsoft", ""))  {
+	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";
@@ -256,7 +259,7 @@ if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC
 		. "SERVER=tigress;DATABASE=NorthWind;UID=adodb;PWD=natsoft;Trusted_Connection=No"  ;
 
 		
-	if (@$db->PConnect($myDSN, "", "", ""))
+	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";
 	
@@ -270,11 +273,8 @@ if (!empty($testmssql)) { // MS SQL Server -- the extension is buggy -- probably
 	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")) {
+	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)");
@@ -288,7 +288,6 @@ if (!empty($testmssql) && !empty($testado)) { // ADO ACCESS MSSQL with OLEDB pro
 	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'";
diff --git a/phpgwapi/inc/adodb/tests/testoci8.php b/phpgwapi/inc/adodb/tests/testoci8.php
index a8dbf8cfe8..a4486b7356 100644
--- a/phpgwapi/inc/adodb/tests/testoci8.php
+++ b/phpgwapi/inc/adodb/tests/testoci8.php
@@ -2,7 +2,7 @@
 
 PConnect('','scott','natsoft');
@@ -44,7 +44,7 @@ if (1) {
 }
 if (1) {
 	$db = ADONewConnection('oci8');
-	$db->PConnect('','scott','tiger');
+	$db->PConnect('','scott','natsoft');
 	$db->debug = true;
 	$db->Execute("delete from emp where ename='John'");
 	print $db->Affected_Rows().'
';
@@ -53,6 +53,20 @@ if (1) {
 	// prepare not quite ready for prime time
 	//$rs = $db->Execute($stmt,array('empno'=>3775,'ename'=>'John'));
 	if (!$rs) die("Empty RS");
+	
+	$db->setfetchmode(ADODB_FETCH_NUM);
+	
+	$vv = 'A%';
+	$stmt = $db->PrepareSP("BEGIN adodb.open_tab2(:rs,:tt); END;",true);
+	$db->OutParameter($stmt, $cur, 'rs', -1, OCI_B_CURSOR);
+	$db->OutParameter($stmt, $vv, 'tt');
+	$rs = $db->Execute($stmt);
+	while (!$rs->EOF) {
+		adodb_pr($rs->fields);
+		$rs->MoveNext();
+	}
+	echo " val = $vv";
+
 }
 
 if (0) {
diff --git a/phpgwapi/inc/adodb/tests/testoci8cursor.php b/phpgwapi/inc/adodb/tests/testoci8cursor.php
index ae5d76913a..4f88485739 100644
--- a/phpgwapi/inc/adodb/tests/testoci8cursor.php
+++ b/phpgwapi/inc/adodb/tests/testoci8cursor.php
@@ -1,6 +1,6 @@
 
 
-
+
 
+
+
+
 
 
 
@@ -18,6 +21,8 @@
 
 
 
+
+
 
 
 
@@ -26,7 +31,7 @@
 
 
 
-
+
 
 
 
diff --git a/phpgwapi/inc/adodb/xsl/remove-0.2.xsl b/phpgwapi/inc/adodb/xsl/remove-0.2.xsl
new file mode 100644
index 0000000000..9b10a528c1
--- /dev/null
+++ b/phpgwapi/inc/adodb/xsl/remove-0.2.xsl
@@ -0,0 +1,54 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+Uninstallation Schema
+
+		
+		
+			0.2
+			
+			
+				
+			
+		
+	
+	
+	
+	
+		
+			
+				
+				
+				
+					
+				
+				
+				
+					
+				
+				
+				
+				
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file