From abe19eba939a783852e389280622e4a62aa20c45 Mon Sep 17 00:00:00 2001 From: vargenau Date: Mon, 21 Jul 2014 12:04:00 +0000 Subject: [PATCH] Update adodb to adodb519 git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8996 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/WikiDB/adodb/README.md | 94 + lib/WikiDB/adodb/adodb-active-record.inc.php | 343 ++- lib/WikiDB/adodb/adodb-active-recordx.inc.php | 307 ++- lib/WikiDB/adodb/adodb-csvlib.inc.php | 95 +- lib/WikiDB/adodb/adodb-datadict.inc.php | 303 ++- lib/WikiDB/adodb/adodb-error.inc.php | 85 +- lib/WikiDB/adodb/adodb-errorhandler.inc.php | 7 +- lib/WikiDB/adodb/adodb-errorpear.inc.php | 34 +- lib/WikiDB/adodb/adodb-exceptions.inc.php | 17 +- lib/WikiDB/adodb/adodb-iterator.inc.php | 26 +- lib/WikiDB/adodb/adodb-lib.inc.php | 397 ++-- lib/WikiDB/adodb/adodb-memcache.lib.inc.php | 82 +- lib/WikiDB/adodb/adodb-pager.inc.php | 119 +- lib/WikiDB/adodb/adodb-pear.inc.php | 28 +- lib/WikiDB/adodb/adodb-perf.inc.php | 368 ++- lib/WikiDB/adodb/adodb-php4.inc.php | 10 +- lib/WikiDB/adodb/adodb-time.inc.php | 565 +++-- lib/WikiDB/adodb/adodb-xmlschema.inc.php | 663 +++--- lib/WikiDB/adodb/adodb-xmlschema03.inc.php | 681 +++--- lib/WikiDB/adodb/adodb.inc.php | 2021 +++++++++-------- lib/WikiDB/adodb/composer.json | 33 + lib/WikiDB/adodb/contrib/toxmlrpc.inc.php | 26 +- .../adodb/datadict/datadict-access.inc.php | 45 +- .../adodb/datadict/datadict-db2.inc.php | 55 +- .../adodb/datadict/datadict-firebird.inc.php | 67 +- .../adodb/datadict/datadict-generic.inc.php | 59 +- .../adodb/datadict/datadict-ibase.inc.php | 37 +- .../adodb/datadict/datadict-informix.inc.php | 38 +- .../adodb/datadict/datadict-mssql.inc.php | 211 +- .../datadict/datadict-mssqlnative.inc.php | 283 ++- .../adodb/datadict/datadict-mysql.inc.php | 83 +- .../adodb/datadict/datadict-oci8.inc.php | 117 +- .../adodb/datadict/datadict-postgres.inc.php | 258 ++- .../adodb/datadict/datadict-sapdb.inc.php | 38 +- .../adodb/datadict/datadict-sqlite.inc.php | 43 +- .../adodb/datadict/datadict-sybase.inc.php | 179 +- lib/WikiDB/adodb/docs/adodb-faq.html | 108 + lib/WikiDB/adodb/docs/adodb.gif | Bin 0 -> 1091 bytes lib/WikiDB/adodb/docs/adodb2.gif | Bin 0 -> 1458 bytes lib/WikiDB/adodb/docs/docs-active-record.htm | 148 +- lib/WikiDB/adodb/docs/docs-adodb.htm | 74 +- lib/WikiDB/adodb/docs/docs-datadict.htm | 10 +- lib/WikiDB/adodb/docs/docs-oracle.htm | 1084 ++++----- lib/WikiDB/adodb/docs/docs-perf.htm | 4 +- lib/WikiDB/adodb/docs/docs-session.htm | 42 +- lib/WikiDB/adodb/docs/docs-session.old.htm | 48 +- lib/WikiDB/adodb/docs/index.html | 241 ++ lib/WikiDB/adodb/docs/old-changelog.htm | 1642 ++++++------- lib/WikiDB/adodb/docs/readme.htm | 68 - lib/WikiDB/adodb/docs/tips_portable_sql.htm | 734 +++--- lib/WikiDB/adodb/docs/tute.htm | 580 ++--- lib/WikiDB/adodb/drivers/adodb-access.inc.php | 49 +- lib/WikiDB/adodb/drivers/adodb-ado.inc.php | 222 +- lib/WikiDB/adodb/drivers/adodb-ado5.inc.php | 252 +- .../adodb/drivers/adodb-ado_access.inc.php | 35 +- .../adodb/drivers/adodb-ado_mssql.inc.php | 69 +- lib/WikiDB/adodb/drivers/adodb-ads.inc.php | 20 +- .../adodb/drivers/adodb-borland_ibase.inc.php | 53 +- lib/WikiDB/adodb/drivers/adodb-csv.inc.php | 96 +- lib/WikiDB/adodb/drivers/adodb-db2.inc.php | 279 ++- lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php | 89 +- lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php | 43 +- lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php | 139 +- .../adodb/drivers/adodb-firebird.inc.php | 51 +- lib/WikiDB/adodb/drivers/adodb-ibase.inc.php | 371 ++- .../adodb/drivers/adodb-informix.inc.php | 7 +- .../adodb/drivers/adodb-informix72.inc.php | 57 +- lib/WikiDB/adodb/drivers/adodb-ldap.inc.php | 173 +- lib/WikiDB/adodb/drivers/adodb-mssql.inc.php | 452 ++-- .../adodb/drivers/adodb-mssql_n.inc.php | 5 +- .../adodb/drivers/adodb-mssqlnative.inc.php | 928 +++++--- .../adodb/drivers/adodb-mssqlpo.inc.php | 11 +- lib/WikiDB/adodb/drivers/adodb-mysql.inc.php | 351 +-- lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php | 543 ++--- .../adodb/drivers/adodb-mysqlpo.inc.php | 74 +- lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php | 80 +- .../adodb/drivers/adodb-netezza.inc.php | 67 +- lib/WikiDB/adodb/drivers/adodb-oci8.inc.php | 1115 ++++----- lib/WikiDB/adodb/drivers/adodb-oci805.inc.php | 31 +- lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php | 61 +- .../adodb/drivers/adodb-oci8quercus.inc.php | 87 + lib/WikiDB/adodb/drivers/adodb-odbc.inc.php | 292 ++- .../adodb/drivers/adodb-odbc_db2.inc.php | 125 +- .../adodb/drivers/adodb-odbc_mssql.inc.php | 157 +- .../adodb/drivers/adodb-odbc_oracle.inc.php | 65 +- lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php | 63 +- .../adodb/drivers/adodb-odbtp_unicode.inc.php | 3 +- lib/WikiDB/adodb/drivers/adodb-oracle.inc.php | 89 +- lib/WikiDB/adodb/drivers/adodb-pdo.inc.php | 283 ++- .../adodb/drivers/adodb-pdo_mssql.inc.php | 33 +- .../adodb/drivers/adodb-pdo_mysql.inc.php | 75 +- .../adodb/drivers/adodb-pdo_oci.inc.php | 40 +- .../adodb/drivers/adodb-pdo_pgsql.inc.php | 108 +- .../adodb/drivers/adodb-pdo_sqlite.inc.php | 51 +- .../adodb/drivers/adodb-postgres.inc.php | 10 +- .../adodb/drivers/adodb-postgres64.inc.php | 653 +++--- .../adodb/drivers/adodb-postgres7.inc.php | 179 +- .../adodb/drivers/adodb-postgres8.inc.php | 48 +- .../adodb/drivers/adodb-postgres9.inc.php | 51 +- lib/WikiDB/adodb/drivers/adodb-proxy.inc.php | 20 +- lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php | 55 +- .../adodb/drivers/adodb-sqlanywhere.inc.php | 21 +- lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php | 131 +- .../adodb/drivers/adodb-sqlite3.inc.php | 143 +- .../adodb/drivers/adodb-sqlitepo.inc.php | 11 +- lib/WikiDB/adodb/drivers/adodb-sybase.inc.php | 351 +-- .../adodb/drivers/adodb-sybase_ase.inc.php | 33 +- lib/WikiDB/adodb/drivers/adodb-vfp.inc.php | 49 +- lib/WikiDB/adodb/lang/adodb-ar.inc.php | 32 + lib/WikiDB/adodb/lang/adodb-bg.inc.php | 36 + lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php | 36 + lib/WikiDB/adodb/lang/adodb-ca.inc.php | 33 + lib/WikiDB/adodb/lang/adodb-cn.inc.php | 34 + lib/WikiDB/adodb/lang/adodb-cz.inc.php | 39 + lib/WikiDB/adodb/lang/adodb-da.inc.php | 1 - lib/WikiDB/adodb/lang/adodb-de.inc.php | 1 - lib/WikiDB/adodb/lang/adodb-en.inc.php | 1 - lib/WikiDB/adodb/lang/adodb-es.inc.php | 1 - lib/WikiDB/adodb/lang/adodb-esperanto.inc.php | 3 +- lib/WikiDB/adodb/lang/adodb-fa.inc.php | 1 - lib/WikiDB/adodb/lang/adodb-fr.inc.php | 1 - lib/WikiDB/adodb/lang/adodb-hu.inc.php | 33 + lib/WikiDB/adodb/lang/adodb-it.inc.php | 3 +- lib/WikiDB/adodb/lang/adodb-nl.inc.php | 1 - lib/WikiDB/adodb/lang/adodb-pl.inc.php | 34 + lib/WikiDB/adodb/lang/adodb-pt-br.inc.php | 34 + lib/WikiDB/adodb/lang/adodb-ro.inc.php | 1 - lib/WikiDB/adodb/lang/adodb-ru1251.inc.php | 34 + lib/WikiDB/adodb/lang/adodb-sv.inc.php | 32 + lib/WikiDB/adodb/lang/adodb-uk1251.inc.php | 34 + lib/WikiDB/adodb/lang/adodb_th.inc.php | 32 + lib/WikiDB/adodb/license.txt | 362 +-- .../adodb/pear/Auth/Container/ADOdb.php | 31 +- lib/WikiDB/adodb/pear/auth_adodb_example.php | 25 + lib/WikiDB/adodb/pear/readme.Auth.txt | 40 +- lib/WikiDB/adodb/perf/perf-db2.inc.php | 46 +- lib/WikiDB/adodb/perf/perf-informix.inc.php | 33 +- lib/WikiDB/adodb/perf/perf-mssql.inc.php | 54 +- .../adodb/perf/perf-mssqlnative.inc.php | 56 +- lib/WikiDB/adodb/perf/perf-mysql.inc.php | 137 +- lib/WikiDB/adodb/perf/perf-oci8.inc.php | 273 ++- lib/WikiDB/adodb/perf/perf-postgres.inc.php | 53 +- lib/WikiDB/adodb/pivottable.inc.php | 97 +- lib/WikiDB/adodb/readme.txt | 68 - lib/WikiDB/adodb/rsfilter.inc.php | 29 +- lib/WikiDB/adodb/server.php | 44 +- .../adodb/session/adodb-compress-bzip2.php | 6 +- .../adodb/session/adodb-compress-gzip.php | 6 +- .../adodb/session/adodb-cryptsession.php | 6 +- .../adodb/session/adodb-cryptsession2.php | 6 +- .../adodb/session/adodb-encrypt-mcrypt.php | 6 +- .../adodb/session/adodb-encrypt-md5.php | 6 +- .../adodb/session/adodb-encrypt-secret.php | 6 +- .../adodb/session/adodb-encrypt-sha1.php | 5 +- lib/WikiDB/adodb/session/adodb-sess.txt | 262 +-- .../adodb/session/adodb-session-clob.php | 6 +- .../adodb/session/adodb-session-clob2.php | 6 +- lib/WikiDB/adodb/session/adodb-session.php | 88 +- lib/WikiDB/adodb/session/adodb-session2.php | 172 +- lib/WikiDB/adodb/session/crypt.inc.php | 1 - .../adodb/session/old/adodb-cryptsession.php | 91 +- .../adodb/session/old/adodb-session-clob.php | 138 +- .../adodb/session/old/adodb-session.php | 154 +- lib/WikiDB/adodb/session/old/crypt.inc.php | 1 - lib/WikiDB/adodb/session/session_schema.xml | 2 +- lib/WikiDB/adodb/session/session_schema2.xml | 8 +- lib/WikiDB/adodb/tests/benchmark.php | 34 +- lib/WikiDB/adodb/tests/client.php | 91 +- lib/WikiDB/adodb/tests/pdo.php | 54 +- lib/WikiDB/adodb/tests/test-active-record.php | 47 +- lib/WikiDB/adodb/tests/test-active-recs2.php | 1 - .../adodb/tests/test-active-relations.php | 28 +- .../adodb/tests/test-active-relationsx.php | 37 +- lib/WikiDB/adodb/tests/test-datadict.php | 53 +- lib/WikiDB/adodb/tests/test-perf.php | 16 +- lib/WikiDB/adodb/tests/test-pgblob.php | 8 +- lib/WikiDB/adodb/tests/test-php5.php | 21 +- lib/WikiDB/adodb/tests/test-xmlschema.php | 3 +- lib/WikiDB/adodb/tests/test.php | 582 ++--- lib/WikiDB/adodb/tests/test2.php | 9 +- lib/WikiDB/adodb/tests/test3.php | 10 +- lib/WikiDB/adodb/tests/test4.php | 27 +- lib/WikiDB/adodb/tests/test5.php | 15 +- lib/WikiDB/adodb/tests/test_rs_array.php | 1 - lib/WikiDB/adodb/tests/testcache.php | 13 +- lib/WikiDB/adodb/tests/testdatabases.inc.php | 132 +- lib/WikiDB/adodb/tests/testgenid.php | 13 +- lib/WikiDB/adodb/tests/testmssql.php | 23 +- lib/WikiDB/adodb/tests/testoci8.php | 25 +- lib/WikiDB/adodb/tests/testoci8cursor.php | 45 +- lib/WikiDB/adodb/tests/testpaging.php | 17 +- lib/WikiDB/adodb/tests/testpear.php | 13 +- lib/WikiDB/adodb/tests/testsessions.php | 39 +- lib/WikiDB/adodb/tests/time.php | 10 +- lib/WikiDB/adodb/tests/tmssql.php | 15 +- lib/WikiDB/adodb/toexport.inc.php | 37 +- lib/WikiDB/adodb/tohtml.inc.php | 54 +- lib/WikiDB/adodb/xmlschema.dtd | 2 +- lib/WikiDB/adodb/xmlschema03.dtd | 84 +- lib/WikiDB/adodb/xsl/convert-0.1-0.2.xsl | 70 +- lib/WikiDB/adodb/xsl/convert-0.1-0.3.xsl | 72 +- lib/WikiDB/adodb/xsl/convert-0.2-0.1.xsl | 72 +- lib/WikiDB/adodb/xsl/convert-0.2-0.3.xsl | 98 +- lib/WikiDB/adodb/xsl/remove-0.2.xsl | 20 +- lib/WikiDB/adodb/xsl/remove-0.3.xsl | 20 +- 205 files changed, 13691 insertions(+), 12550 deletions(-) create mode 100644 lib/WikiDB/adodb/README.md create mode 100644 lib/WikiDB/adodb/composer.json create mode 100644 lib/WikiDB/adodb/docs/adodb-faq.html create mode 100644 lib/WikiDB/adodb/docs/adodb.gif create mode 100644 lib/WikiDB/adodb/docs/adodb2.gif create mode 100644 lib/WikiDB/adodb/docs/index.html delete mode 100644 lib/WikiDB/adodb/docs/readme.htm create mode 100644 lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-ar.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-bg.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-ca.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-cn.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-cz.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-hu.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-pl.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-pt-br.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-ru1251.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-sv.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb-uk1251.inc.php create mode 100644 lib/WikiDB/adodb/lang/adodb_th.inc.php create mode 100644 lib/WikiDB/adodb/pear/auth_adodb_example.php delete mode 100644 lib/WikiDB/adodb/readme.txt diff --git a/lib/WikiDB/adodb/README.md b/lib/WikiDB/adodb/README.md new file mode 100644 index 000000000..cc6e640a8 --- /dev/null +++ b/lib/WikiDB/adodb/README.md @@ -0,0 +1,94 @@ +ADODB Library for PHP5 +====================== + +(c) 2000-2014 John Lim (jlim@natsoft.com) + +Released under both BSD and GNU Lesser GPL library license. +This means you can use it in proprietary products. + +Home page: http://adodb.sourceforge.net/ + + +Introduction +============ + +PHP's database access functions are not standardized. This creates a +need for a database class library to hide the differences between the +different databases (encapsulate the differences) so we can easily +switch databases. + +The library currently supports MySQL, Interbase, Sybase, PostgreSQL, Oracle, +Microsoft SQL server, Foxpro ODBC, Access ODBC, Informix, DB2, +Sybase SQL Anywhere, generic ODBC and Microsoft's ADO. + +We hope more people will contribute drivers to support other databases. + + +Installation +============ + +Unpack all the files into a directory accessible by your web server. + +To test, try modifying some of the tutorial examples. +Make sure you customize the connection settings correctly. + +You can debug using: + +``` php +debug = true; +$db->Connect($server, $user, $password, $database); +$rs = $db->Execute('select * from some_small_table'); +print "
";
+print_r($rs->GetRows());
+print "
"; +``` + + +Documentation and Examples +========================== + +Refer to the `docs` directory for library documentation and examples. + +- Main documentation: `docs-adodb.htm`. + Query, update and insert records using a portable API. +- Data dictionary docs: `docs-datadict.htm`. + Describes how to create database tables and indexes in a portable manner. +- Database performance monitoring docs: `docs-perf.htm`. + Allows you to perform health checks, tune and monitor your database. +- Database-backed session docs: `docs-session.htm`. + +There is also a tutorial `tute.htm` that contrasts ADOdb code with +mysql code. + + +Files +===== + +- `adodb.inc.php` is the library's main file. You only need to include this file. +- `adodb-*.inc.php` are the database specific driver code. +- `adodb-session.php` is the PHP4 session handling code. +- `test.php` contains a list of test commands to exercise the class library. +- `testdatabases.inc.php` contains the list of databases to apply the tests on. +- `Benchmark.php` is a simple benchmark to test the throughput of a SELECT +statement for databases described in testdatabases.inc.php. The benchmark +tables are created in test.php. + + +Feature Requests and Bug Reports +================================ + +Please report bugs, issues and feature requests on Github: + +https://github.com/ADOdb/ADOdb/issues + +You may also find legacy issues in + +- the old [ADOdb forums](http://phplens.com/lens/lensforum/topics.php?id=4) on phplens.com +- the [SourceForge tickets section](http://sourceforge.net/p/adodb/_list/tickets) + +However, please note that they are not actively monitored and should +only be used as reference. diff --git a/lib/WikiDB/adodb/adodb-active-record.inc.php b/lib/WikiDB/adodb/adodb-active-record.inc.php index ad5d0b9cb..607fa9450 100644 --- a/lib/WikiDB/adodb/adodb-active-record.inc.php +++ b/lib/WikiDB/adodb/adodb-active-record.inc.php @@ -1,18 +1,18 @@ $d) { if (PHP_VERSION >= 5) { if ($d->db === $db) return $k; } else { - if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) + if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) return $k; } } - + $obj = new ADODB_Active_DB(); $obj->db = $db; $obj->tables = array(); - + if ($index == false) $index = sizeof($_ADODB_ACTIVE_DBS); - + $_ADODB_ACTIVE_DBS[$index] = $obj; - + return sizeof($_ADODB_ACTIVE_DBS)-1; } @@ -75,8 +75,8 @@ function ADODB_SetDatabaseAdapter(&$db, $index=false) class ADODB_Active_Record { static $_changeNames = true; // dynamically pluralize table names static $_quoteNames = false; - - static $_foreignSuffix = '_id'; // + + static $_foreignSuffix = '_id'; // var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat] var $_table; // tablename, if set in class definition then use it as table name var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat] @@ -87,8 +87,8 @@ class ADODB_Active_Record { var $foreignName; // CFR: class name when in a relationship - var $lockMode = ' for update '; // you might want to change to - + var $lockMode = ' for update '; // you might want to change to + static function UseDefaultValues($bool=null) { global $ADODB_ACTIVE_DEFVALS; @@ -97,29 +97,29 @@ class ADODB_Active_Record { } // should be static - static function SetDatabaseAdapter(&$db, $index=false) + static function SetDatabaseAdapter(&$db, $index=false) { return ADODB_SetDatabaseAdapter($db, $index); } - - + + public function __set($name, $value) { $name = str_replace(' ', '_', $name); $this->$name = $value; } - + // php5 constructor function __construct($table = false, $pkeyarr=false, $db=false) { global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS; - + if ($db == false && is_object($pkeyarr)) { $db = $pkeyarr; $pkeyarr = false; } - - if (!$table) { + + if (!$table) { if (!empty($this->_table)) $table = $this->_table; else $table = $this->_pluralize(get_class($this)); } @@ -137,13 +137,13 @@ class ADODB_Active_Record { $this->UpdateActiveTable($pkeyarr); } - + function __wakeup() { $class = get_class($this); new $class; } - + function _pluralize($table) { if (!ADODB_Active_Record::$_changeNames) return $table; @@ -154,26 +154,26 @@ class ADODB_Active_Record { $lastc2 = substr($ut,$len-2); switch ($lastc) { case 'S': - return $table.'es'; + return $table.'es'; case 'Y': return substr($table,0,$len-1).'ies'; - case 'X': + case 'X': return $table.'es'; - case 'H': + case 'H': if ($lastc2 == 'CH' || $lastc2 == 'SH') return $table.'es'; default: return $table.'s'; } } - + // CFR Lamest singular inflector ever - @todo Make it real! // Note: There is an assumption here...and it is that the argument's length >= 4 function _singularize($tables) { - + if (!ADODB_Active_Record::$_changeNames) return $table; - + $ut = strtoupper($tables); $len = strlen($tables); if($ut[$len-1] != 'S') @@ -205,14 +205,14 @@ class ADODB_Active_Record { $table->_hasMany[$foreignRef] = $ar; # $this->$foreignRef = $this->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get() } - + // use when you don't want ADOdb to auto-pluralize tablename static function TableHasMany($table, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') { $ar = new ADODB_Active_Record($table); $ar->hasMany($foreignRef, $foreignKey, $foreignClass); } - + // use when you don't want ADOdb to auto-pluralize tablename static function TableKeyHasMany($table, $tablePKey, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') { @@ -220,8 +220,8 @@ class ADODB_Active_Record { $ar = new ADODB_Active_Record($table,$tablePKey); $ar->hasMany($foreignRef, $foreignKey, $foreignClass); } - - + + // use when you want ADOdb to auto-pluralize tablename for you. Note that the class must already be defined. // e.g. class Person will generate relationship for table Persons static function ClassHasMany($parentclass, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') @@ -229,7 +229,7 @@ class ADODB_Active_Record { $ar = new $parentclass(); $ar->hasMany($foreignRef, $foreignKey, $foreignClass); } - + function belongsTo($foreignRef,$foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') { @@ -240,24 +240,24 @@ class ADODB_Active_Record { $ar->parentKey = $parentKey; $ar->UpdateActiveTable(); $ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix; - + $table =& $this->TableInfo(); $table->_belongsTo[$foreignRef] = $ar; # $this->$foreignRef = $this->_belongsTo[$foreignRef]; } - + static function ClassBelongsTo($class, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') { $ar = new $class(); $ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass); } - + static function TableBelongsTo($table, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') { $ar = new ADOdb_Active_Record($table); $ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass); } - + static function TableKeyBelongsTo($table, $tablePKey, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') { if (!is_array($tablePKey)) $tablePKey = array($tablePKey); @@ -268,8 +268,8 @@ class ADODB_Active_Record { /** * __get Access properties - used for lazy loading - * - * @param mixed $name + * + * @param mixed $name * @access protected * @return mixed */ @@ -277,9 +277,9 @@ class ADODB_Active_Record { { return $this->LoadRelations($name, '', -1, -1); } - + /** - * @param string $name + * @param string $name * @param string $whereOrderBy : eg. ' AND field1 = value ORDER BY field2' * @param offset * @param limit @@ -291,12 +291,12 @@ class ADODB_Active_Record { $table = $this->TableInfo(); if ($limit >= 0) $extras['limit'] = $limit; if ($offset >= 0) $extras['offset'] = $offset; - - if (strlen($whereOrderBy)) + + if (strlen($whereOrderBy)) if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy)) if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy)) $whereOrderBy = 'AND '.$whereOrderBy; - + if(!empty($table->_belongsTo[$name])) { $obj = $table->_belongsTo[$name]; @@ -307,7 +307,7 @@ class ADODB_Active_Record { { if ($obj->parentKey) $key = $obj->parentKey; else $key = reset($table->keys); - + $arrayOfOne = $obj->Find($key.'='.$this->$columnName.' '.$whereOrderBy,false,false,$extras); if ($arrayOfOne) { $this->$name = $arrayOfOne[0]; @@ -316,7 +316,7 @@ class ADODB_Active_Record { } } if(!empty($table->_hasMany[$name])) - { + { $obj = $table->_hasMany[$name]; $key = reset($table->keys); $id = @$this->$key; @@ -329,11 +329,11 @@ class ADODB_Active_Record { $this->$name = $objs; return $objs; } - + return array(); } ////////////////////////////////// - + // update metadata function UpdateActiveTable($pkeys=false,$forceUpdate=false) { @@ -349,7 +349,7 @@ class ADODB_Active_Record { $acttab = $tables[$tableat]; foreach($acttab->flds as $name => $fld) { - if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) $this->$name = $fld->default_value; else $this->$name = null; @@ -363,19 +363,19 @@ class ADODB_Active_Record { @flock($fp, LOCK_SH); $acttab = unserialize(fread($fp,100000)); fclose($fp); - if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { + if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { // abs(rand()) randomizes deletion, reducing contention to delete/refresh file // ideally, you should cache at least 32 secs - + foreach($acttab->flds as $name => $fld) { - if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) $this->$name = $fld->default_value; else $this->$name = null; } - + $activedb->tables[$table] = $acttab; - + //if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname"); return; } else if ($db->debug) { @@ -384,18 +384,18 @@ class ADODB_Active_Record { } $activetab = new ADODB_Active_Table(); $activetab->name = $table; - + $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false); - + $cols = $db->MetaColumns($table); - + if (isset($savem)) $db->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; - + if (!$cols) { - $this->Error("Invalid table name: $table",'UpdateActiveTable'); + $this->Error("Invalid table name: $table",'UpdateActiveTable'); return false; } $fld = reset($cols); @@ -405,17 +405,17 @@ class ADODB_Active_Record { foreach($cols as $name => $fld) { if (!empty($fld->primary_key)) $pkeys[] = $name; } - } else + } else $pkeys = $this->GetPrimaryKeys($db, $table); } if (empty($pkeys)) { $this->Error("No primary key found for table $table",'UpdateActiveTable'); return false; } - + $attr = array(); $keys = array(); - + switch($ADODB_ASSOC_CASE) { case 0: foreach($cols as $name => $fldobj) { @@ -430,18 +430,18 @@ class ADODB_Active_Record { $keys[strtolower($name)] = strtolower($name); } break; - - case 1: + + case 1: foreach($cols as $name => $fldobj) { $name = strtoupper($name); - + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) $this->$name = $fldobj->default_value; else $this->$name = null; $attr[$name] = $fldobj; } - + foreach($pkeys as $k => $name) { $keys[strtoupper($name)] = strtoupper($name); } @@ -449,7 +449,7 @@ class ADODB_Active_Record { default: foreach($cols as $name => $fldobj) { $name = ($fldobj->name); - + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) $this->$name = $fldobj->default_value; else @@ -461,7 +461,7 @@ class ADODB_Active_Record { } break; } - + $activetab->keys = $keys; $activetab->flds = $attr; @@ -473,58 +473,58 @@ class ADODB_Active_Record { } if (isset($activedb->tables[$table])) { $oldtab = $activedb->tables[$table]; - + if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo; if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany; } $activedb->tables[$table] = $activetab; } - + function GetPrimaryKeys(&$db, $table) { return $db->MetaPrimaryKeys($table); } - - // error handler for both PHP4+5. + + // error handler for both PHP4+5. function Error($err,$fn) { global $_ADODB_ACTIVE_DBS; - + $fn = get_class($this).'::'.$fn; $this->_lasterr = $fn.': '.$err; - + if ($this->_dbat < 0) $db = false; else { $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; $db = $activedb->db; } - - if (function_exists('adodb_throw')) { + + if (function_exists('adodb_throw')) { if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false); else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db); } else if (!$db || $db->debug) ADOConnection::outp($this->_lasterr); - + } - + // return last error message function ErrorMsg() { if (!function_exists('adodb_throw')) { if ($this->_dbat < 0) $db = false; else $db = $this->DB(); - + // last error could be database error too if ($db && $db->ErrorMsg()) return $db->ErrorMsg(); } return $this->_lasterr; } - - function ErrorNo() + + function ErrorNo() { if ($this->_dbat < 0) return -9999; // no database connection... $db = $this->DB(); - + return (int) $db->ErrorNo(); } @@ -533,7 +533,7 @@ class ADODB_Active_Record { function DB() { global $_ADODB_ACTIVE_DBS; - + if ($this->_dbat < 0) { $false = false; $this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB"); @@ -543,7 +543,7 @@ class ADODB_Active_Record { $db = $activedb->db; return $db; } - + // retrieve ADODB_Active_Table function &TableInfo() { @@ -552,8 +552,8 @@ class ADODB_Active_Record { $table = $activedb->tables[$this->_tableat]; return $table; } - - + + // I have an ON INSERT trigger on a table that sets other columns in the table. // So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook function Reload() @@ -564,21 +564,21 @@ class ADODB_Active_Record { return($this->Load($where)); } - + // set a numeric array (using natural table field ordering) as object properties function Set(&$row) { global $ACTIVE_RECORD_SAFETY; - + $db = $this->DB(); - + if (!$row) { - $this->_saved = false; + $this->_saved = false; return false; } - + $this->_saved = true; - + $table = $this->TableInfo(); if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) { # @@ -597,7 +597,7 @@ class ADODB_Active_Record { } else $keys = array_keys($row); - + # reset($keys); $this->_original = array(); @@ -611,7 +611,7 @@ class ADODB_Active_Record { # return true; } - + // get last inserted id for INSERT function LastInsertID(&$db,$fieldname) { @@ -619,32 +619,32 @@ class ADODB_Active_Record { $val = $db->Insert_ID($this->_table,$fieldname); else $val = false; - + if (is_null($val) || $val === false) { // this might not work reliably in multi-user environment return $db->GetOne("select max(".$fieldname.") from ".$this->_table); } return $val; } - + // quote data in where clause function doquote(&$db, $val,$t) { switch($t) { case 'L': if (strpos($db->databaseType,'postgres') !== false) return $db->qstr($val); - case 'D': + case 'D': case 'T': if (empty($val)) return 'null'; - - case 'B': + + case 'B': case 'N': case 'C': case 'X': if (is_null($val)) return 'null'; - - if (strlen($val)>0 && - (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { + + if (strlen($val)>0 && + (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { return $db->qstr($val); break; } @@ -653,13 +653,13 @@ class ADODB_Active_Record { break; } } - + // generate where clause for an UPDATE/SELECT function GenWhere(&$db, &$table) { $keys = $table->keys; $parr = array(); - + foreach($keys as $k) { $f = $table->flds[$k]; if ($f) { @@ -668,55 +668,55 @@ class ADODB_Active_Record { } return implode(' and ', $parr); } - - + + function _QName($n,$db=false) { if (!ADODB_Active_Record::$_quoteNames) return $n; if (!$db) $db = $this->DB(); if (!$db) return false; return $db->nameQuote.$n.$db->nameQuote; } - + //------------------------------------------------------------ Public functions below - + function Load($where=null,$bindarr=false, $lock = false) { global $ADODB_FETCH_MODE; - + $db = $this->DB(); if (!$db) return false; $this->_where = $where; - + $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false); - + $qry = "select * from ".$this->_table; - + if($where) { $qry .= ' WHERE '.$where; } if ($lock) $qry .= $this->lockMode; - + $row = $db->GetRow($qry,$bindarr); - + if (isset($savem)) $db->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; - + return $this->Set($row); } - + function LoadLocked($where=null, $bindarr=false) { $this->Load($where,$bindarr,true); } - + # useful for multiple record inserts # see http://phplens.com/lens/lensforum/msgs.php?id=17795 function Reset() { $this->_where=null; - $this->_saved = false; - $this->_lasterr = false; + $this->_saved = false; + $this->_lasterr = false; $this->_original = false; $vars=get_object_vars($this); foreach($vars as $k=>$v){ @@ -727,24 +727,24 @@ class ADODB_Active_Record { $this->foreignName=strtolower(get_class($this)); return true; } - + // false on error function Save() { if ($this->_saved) $ok = $this->Update(); else $ok = $this->Insert(); - + return $ok; } - - + + // false on error function Insert() { $db = $this->DB(); if (!$db) return false; $cnt = 0; $table = $this->TableInfo(); - + $valarr = array(); $names = array(); $valstr = array(); @@ -758,7 +758,7 @@ class ADODB_Active_Record { $cnt += 1; } } - + if (empty($names)){ foreach($table->flds as $name=>$fld) { $valarr[] = null; @@ -769,7 +769,7 @@ class ADODB_Active_Record { } $sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')'; $ok = $db->Execute($sql,$valarr); - + if ($ok) { $this->_saved = true; $autoinc = false; @@ -784,23 +784,23 @@ class ADODB_Active_Record { $this->$k = $this->LastInsertID($db,$k); } } - + $this->_original = $valarr; return !empty($ok); } - + function Delete() { $db = $this->DB(); if (!$db) return false; $table = $this->TableInfo(); - + $where = $this->GenWhere($db,$table); $sql = 'DELETE FROM '.$this->_table.' WHERE '.$where; $ok = $db->Execute($sql); - + return $ok ? true : false; } - + // returns an array of active record objects function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()) { @@ -808,17 +808,17 @@ class ADODB_Active_Record { $arr = $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr,$extra); return $arr; } - + // returns 0 on error, 1 on update, 2 on insert function Replace() { global $ADODB_ASSOC_CASE; - + $db = $this->DB(); if (!$db) return false; $table = $this->TableInfo(); - + $pkey = $table->keys; - + foreach($table->flds as $name=>$fld) { $val = $this->$name; /* @@ -834,24 +834,24 @@ class ADODB_Active_Record { if (is_null($val) && !empty($fld->auto_increment)) { continue; } - + if (is_array($val)) continue; - + $t = $db->MetaType($fld->type); $arr[$name] = $this->doquote($db,$val,$t); $valarr[] = $val; } - + if (!is_array($pkey)) $pkey = array($pkey); - - - if ($ADODB_ASSOC_CASE == 0) + + + if ($ADODB_ASSOC_CASE == 0) foreach($pkey as $k => $v) $pkey[$k] = strtolower($v); - elseif ($ADODB_ASSOC_CASE == 1) + elseif ($ADODB_ASSOC_CASE == 1) foreach($pkey as $k => $v) $pkey[$k] = strtoupper($v); - + $ok = $db->Replace($this->_table,$arr,$pkey); if ($ok) { $this->_saved = true; // 1= update 2=insert @@ -868,9 +868,9 @@ class ADODB_Active_Record { $this->$k = $this->LastInsertID($db,$k); } } - + $this->_original = $valarr; - } + } return $ok; } @@ -879,14 +879,14 @@ class ADODB_Active_Record { { $db = $this->DB(); if (!$db) return false; $table = $this->TableInfo(); - + $where = $this->GenWhere($db, $table); - + if (!$where) { $this->error("Where missing for table $table", "Update"); return false; } - $valarr = array(); + $valarr = array(); $neworig = array(); $pairs = array(); $i = -1; @@ -895,10 +895,10 @@ class ADODB_Active_Record { $i += 1; $val = $this->$name; $neworig[] = $val; - - if (isset($table->keys[$name]) || is_array($val)) + + if (isset($table->keys[$name]) || is_array($val)) continue; - + if (is_null($val)) { if (isset($fld->not_null) && $fld->not_null) { if (isset($fld->default_value) && strlen($fld->default_value)) continue; @@ -910,15 +910,15 @@ class ADODB_Active_Record { } if (isset($this->_original[$i]) && strcmp($val,$this->_original[$i]) == 0) continue; - + if (is_null($this->_original[$i]) && is_null($val)) continue; - + $valarr[] = $val; $pairs[] = $this->_QName($name,$db).'='.$db->Param($cnt); $cnt += 1; } - - + + if (!$cnt) return -1; $sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where; $ok = $db->Execute($sql,$valarr); @@ -928,14 +928,14 @@ class ADODB_Active_Record { } return 0; } - + function GetAttributeNames() { $table = $this->TableInfo(); if (!$table) return false; return array_keys($table->flds); } - + }; function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr, $primkeyArr, @@ -943,10 +943,10 @@ function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr { global $_ADODB_ACTIVE_DBS; - + $save = $db->SetFetchMode(ADODB_FETCH_NUM); $qry = "select * from ".$table; - + if (!empty($whereOrderBy)) $qry .= ' WHERE '.$whereOrderBy; if(isset($extra['limit'])) @@ -967,13 +967,13 @@ global $_ADODB_ACTIVE_DBS; $rows = $db->GetAll($qry,$bindarr); $db->SetFetchMode($save); - + $false = false; - - if ($rows === false) { + + if ($rows === false) { return $false; } - + if (!class_exists($class)) { $db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); @@ -987,7 +987,7 @@ global $_ADODB_ACTIVE_DBS; $arrRef = array(); $bTos = array(); // Will store belongTo's indices if any foreach($rows as $row) { - + $obj = new $class($table,$primkeyArr,$db); if ($obj->ErrorNo()){ $db->_errorMsg = $obj->ErrorMsg(); @@ -995,8 +995,7 @@ global $_ADODB_ACTIVE_DBS; } $obj->Set($row); $arr[] = $obj; - } // foreach($rows as $row) + } // foreach($rows as $row) return $arr; } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-active-recordx.inc.php b/lib/WikiDB/adodb/adodb-active-recordx.inc.php index fd8074980..e820144a1 100644 --- a/lib/WikiDB/adodb/adodb-active-recordx.inc.php +++ b/lib/WikiDB/adodb/adodb-active-recordx.inc.php @@ -1,20 +1,20 @@ $d) { if (PHP_VERSION >= 5) { if ($d->db === $db) return $k; } else { - if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) + if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) return $k; } } - + $obj = new ADODB_Active_DB(); $obj->db = $db; $obj->tables = array(); - + $_ADODB_ACTIVE_DBS[] = $obj; - + return sizeof($_ADODB_ACTIVE_DBS)-1; } class ADODB_Active_Record { static $_changeNames = true; // dynamically pluralize table names - static $_foreignSuffix = '_id'; // + static $_foreignSuffix = '_id'; // var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat] var $_table; // tablename, if set in class definition then use it as table name var $_sTable; // singularized table name @@ -106,18 +106,18 @@ class ADODB_Active_Record { } // should be static - static function SetDatabaseAdapter(&$db) + static function SetDatabaseAdapter(&$db) { return ADODB_SetDatabaseAdapter($db); } - - + + public function __set($name, $value) { $name = str_replace(' ', '_', $name); $this->$name = $value; } - + // php5 constructor // Note: if $table is defined, then we will use it as our table name // Otherwise we will use our classname... @@ -131,12 +131,12 @@ class ADODB_Active_Record { function __construct($table = false, $pkeyarr=false, $db=false, $options=array()) { global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS; - + if ($db == false && is_object($pkeyarr)) { $db = $pkeyarr; $pkeyarr = false; } - + if($table) { // table argument exists. It is expected to be @@ -159,10 +159,10 @@ class ADODB_Active_Record { $this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db); } else $this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1; - - + + if ($this->_dbat < 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor'); - + $this->_tableat = $this->_table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future // CFR: Just added this option because UpdateActiveTable() can refresh its information @@ -178,13 +178,13 @@ class ADODB_Active_Record { $table->_belongsTo = array(); } } - + function __wakeup() { $class = get_class($this); new $class; } - + // CFR: Constants found in Rails static $IrregularP = array( 'PERSON' => 'people', @@ -231,26 +231,26 @@ class ADODB_Active_Record { $lastc2 = substr($ut,$len-2); switch ($lastc) { case 'S': - return $table.'es'; + return $table.'es'; case 'Y': return substr($table,0,$len-1).'ies'; - case 'X': + case 'X': return $table.'es'; - case 'H': + case 'H': if ($lastc2 == 'CH' || $lastc2 == 'SH') return $table.'es'; default: return $table.'s'; } } - + // CFR Lamest singular inflector ever - @todo Make it real! // Note: There is an assumption here...and it is that the argument's length >= 4 function _singularize($table) { - + if (!ADODB_Active_Record::$_changeNames) return $table; - + $ut = strtoupper($table); if(isset(self::$WeIsI[$ut])) { @@ -320,7 +320,7 @@ class ADODB_Active_Record { $ar->foreignName = $foreignRef; $ar->UpdateActiveTable(); $ar->foreignKey = ($foreignKey) ? $foreignKey : $ar->foreignName . self::$_foreignSuffix; - + $table =& $this->TableInfo(); if(!isset($table->_belongsTo[$foreignRef])) { @@ -332,8 +332,8 @@ class ADODB_Active_Record { /** * __get Access properties - used for lazy loading - * - * @param mixed $name + * + * @param mixed $name * @access protected * @return void */ @@ -348,12 +348,12 @@ class ADODB_Active_Record { if($offset >= 0) $extras['offset'] = $offset; if($limit >= 0) $extras['limit'] = $limit; $table =& $this->TableInfo(); - - if (strlen($whereOrderBy)) + + if (strlen($whereOrderBy)) if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy)) if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy)) $whereOrderBy = 'AND '.$whereOrderBy; - + if(!empty($table->_belongsTo[$name])) { $obj = $table->_belongsTo[$name]; @@ -366,7 +366,7 @@ class ADODB_Active_Record { $belongsToId = $k; else $belongsToId = 'id'; - + $arrayOfOne = $obj->Find( $belongsToId.'='.$this->$columnName.' '.$whereOrderBy, false, false, $extras); @@ -380,7 +380,7 @@ class ADODB_Active_Record { if(($k = reset($table->keys))) $hasManyId = $k; else - $hasManyId = 'id'; + $hasManyId = 'id'; $this->$name = $obj->Find( @@ -389,7 +389,7 @@ class ADODB_Active_Record { } } ////////////////////////////////// - + // update metadata function UpdateActiveTable($pkeys=false,$forceUpdate=false) { @@ -405,14 +405,14 @@ class ADODB_Active_Record { $tobj = $tables[$tableat]; foreach($tobj->flds as $name => $fld) { - if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) $this->$name = $fld->default_value; else $this->$name = null; } return; } - + $db = $activedb->db; $fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache'; if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) { @@ -420,11 +420,11 @@ class ADODB_Active_Record { @flock($fp, LOCK_SH); $acttab = unserialize(fread($fp,100000)); fclose($fp); - if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { + if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { // abs(rand()) randomizes deletion, reducing contention to delete/refresh file // ideally, you should cache at least 32 secs $activedb->tables[$table] = $acttab; - + //if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname"); return; } else if ($db->debug) { @@ -433,18 +433,18 @@ class ADODB_Active_Record { } $activetab = new ADODB_Active_Table(); $activetab->name = $table; - + $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false); - + $cols = $db->MetaColumns($table); - + if (isset($savem)) $db->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; - + if (!$cols) { - $this->Error("Invalid table name: $table",'UpdateActiveTable'); + $this->Error("Invalid table name: $table",'UpdateActiveTable'); return false; } $fld = reset($cols); @@ -454,17 +454,17 @@ class ADODB_Active_Record { foreach($cols as $name => $fld) { if (!empty($fld->primary_key)) $pkeys[] = $name; } - } else + } else $pkeys = $this->GetPrimaryKeys($db, $table); } if (empty($pkeys)) { $this->Error("No primary key found for table $table",'UpdateActiveTable'); return false; } - + $attr = array(); $keys = array(); - + switch($ADODB_ASSOC_CASE) { case 0: foreach($cols as $name => $fldobj) { @@ -479,18 +479,18 @@ class ADODB_Active_Record { $keys[strtolower($name)] = strtolower($name); } break; - - case 1: + + case 1: foreach($cols as $name => $fldobj) { $name = strtoupper($name); - + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) $this->$name = $fldobj->default_value; else $this->$name = null; $attr[$name] = $fldobj; } - + foreach($pkeys as $k => $name) { $keys[strtoupper($name)] = strtoupper($name); } @@ -498,7 +498,7 @@ class ADODB_Active_Record { default: foreach($cols as $name => $fldobj) { $name = ($fldobj->name); - + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) $this->$name = $fldobj->default_value; else @@ -510,7 +510,7 @@ class ADODB_Active_Record { } break; } - + $activetab->keys = $keys; $activetab->flds = $attr; $activetab->updateColsCount(); @@ -523,58 +523,58 @@ class ADODB_Active_Record { } if (isset($activedb->tables[$table])) { $oldtab = $activedb->tables[$table]; - + if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo; if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany; } $activedb->tables[$table] = $activetab; } - + function GetPrimaryKeys(&$db, $table) { return $db->MetaPrimaryKeys($table); } - - // error handler for both PHP4+5. + + // error handler for both PHP4+5. function Error($err,$fn) { global $_ADODB_ACTIVE_DBS; - + $fn = get_class($this).'::'.$fn; $this->_lasterr = $fn.': '.$err; - + if ($this->_dbat < 0) $db = false; else { $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; $db = $activedb->db; } - - if (function_exists('adodb_throw')) { + + if (function_exists('adodb_throw')) { if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false); else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db); } else if (!$db || $db->debug) ADOConnection::outp($this->_lasterr); - + } - + // return last error message function ErrorMsg() { if (!function_exists('adodb_throw')) { if ($this->_dbat < 0) $db = false; else $db = $this->DB(); - + // last error could be database error too if ($db && $db->ErrorMsg()) return $db->ErrorMsg(); } return $this->_lasterr; } - - function ErrorNo() + + function ErrorNo() { if ($this->_dbat < 0) return -9999; // no database connection... $db = $this->DB(); - + return (int) $db->ErrorNo(); } @@ -583,7 +583,7 @@ class ADODB_Active_Record { function DB() { global $_ADODB_ACTIVE_DBS; - + if ($this->_dbat < 0) { $false = false; $this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB"); @@ -593,18 +593,18 @@ class ADODB_Active_Record { $db = $activedb->db; return $db; } - + // retrieve ADODB_Active_Table function &TableInfo() { global $_ADODB_ACTIVE_DBS; - + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; $table = $activedb->tables[$this->_tableat]; return $table; } - - + + // I have an ON INSERT trigger on a table that sets other columns in the table. // So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook function Reload() @@ -615,21 +615,21 @@ class ADODB_Active_Record { return($this->Load($where)); } - + // set a numeric array (using natural table field ordering) as object properties function Set(&$row) { global $ACTIVE_RECORD_SAFETY; - + $db = $this->DB(); - + if (!$row) { - $this->_saved = false; + $this->_saved = false; return false; } - + $this->_saved = true; - + $table = $this->TableInfo(); $sizeofFlds = sizeof($table->flds); $sizeofRow = sizeof($row); @@ -687,7 +687,7 @@ class ADODB_Active_Record { # return true; } - + // get last inserted id for INSERT function LastInsertID(&$db,$fieldname) { @@ -695,14 +695,14 @@ class ADODB_Active_Record { $val = $db->Insert_ID($this->_table,$fieldname); else $val = false; - + if (is_null($val) || $val === false) { // this might not work reliably in multi-user environment return $db->GetOne("select max(".$fieldname.") from ".$this->_table); } return $val; } - + // quote data in where clause function doquote(&$db, $val,$t) { @@ -710,13 +710,13 @@ class ADODB_Active_Record { case 'D': case 'T': if (empty($val)) return 'null'; - + case 'C': case 'X': if (is_null($val)) return 'null'; - - if (strlen($val)>0 && - (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { + + if (strlen($val)>0 && + (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { return $db->qstr($val); break; } @@ -725,13 +725,13 @@ class ADODB_Active_Record { break; } } - + // generate where clause for an UPDATE/SELECT function GenWhere(&$db, &$table) { $keys = $table->keys; $parr = array(); - + foreach($keys as $k) { $f = $table->flds[$k]; if ($f) { @@ -740,15 +740,15 @@ class ADODB_Active_Record { } return implode(' and ', $parr); } - - + + //------------------------------------------------------------ Public functions below - + function Load($where=null,$bindarr=false) { $db = $this->DB(); if (!$db) return false; $this->_where = $where; - + $save = $db->SetFetchMode(ADODB_FETCH_NUM); $qry = "select * from ".$this->_table; $table =& $this->TableInfo(); @@ -757,7 +757,7 @@ class ADODB_Active_Record { $hasManyId = $k; else $hasManyId = 'id'; - + foreach($table->_belongsTo as $foreignTable) { if(($k = reset($foreignTable->TableInfo()->keys))) @@ -780,7 +780,7 @@ class ADODB_Active_Record { } if($where) $qry .= ' WHERE '.$where; - + // Simple case: no relations. Load row and return. if((count($table->_hasMany) + count($table->_belongsTo)) < 1) { @@ -790,7 +790,7 @@ class ADODB_Active_Record { $db->SetFetchMode($save); return $this->Set($row); } - + // More complex case when relations have to be collated $rows = $db->GetAll($qry,$bindarr); if(!$rows) @@ -800,7 +800,7 @@ class ADODB_Active_Record { return false; $class = get_class($this); $isFirstRow = true; - + if(($k = reset($this->TableInfo()->keys))) $myId = $k; else @@ -819,7 +819,7 @@ class ADODB_Active_Record { } if(!$found) $this->outp_throw("Unable to locate key $myId for $class in Load()",'Load'); - + foreach($rows as $row) { $rowId = intval($row[$index]); @@ -873,21 +873,21 @@ class ADODB_Active_Record { } } } - } + } } } return true; } - + // false on error function Save() { if ($this->_saved) $ok = $this->Update(); else $ok = $this->Insert(); - + return $ok; } - + // CFR: Sometimes we may wish to consider that an object is not to be replaced but inserted. // Sample use case: an 'undo' command object (after a delete()) function Dirty() @@ -901,7 +901,7 @@ class ADODB_Active_Record { $db = $this->DB(); if (!$db) return false; $cnt = 0; $table = $this->TableInfo(); - + $valarr = array(); $names = array(); $valstr = array(); @@ -915,7 +915,7 @@ class ADODB_Active_Record { $cnt += 1; } } - + if (empty($names)){ foreach($table->flds as $name=>$fld) { $valarr[] = null; @@ -926,7 +926,7 @@ class ADODB_Active_Record { } $sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')'; $ok = $db->Execute($sql,$valarr); - + if ($ok) { $this->_saved = true; $autoinc = false; @@ -941,23 +941,23 @@ class ADODB_Active_Record { $this->$k = $this->LastInsertID($db,$k); } } - + $this->_original = $valarr; return !empty($ok); } - + function Delete() { $db = $this->DB(); if (!$db) return false; $table = $this->TableInfo(); - + $where = $this->GenWhere($db,$table); $sql = 'DELETE FROM '.$this->_table.' WHERE '.$where; $ok = $db->Execute($sql); - + return $ok ? true : false; } - + // returns an array of active record objects function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()) { @@ -967,7 +967,7 @@ class ADODB_Active_Record { array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany)); return $arr; } - + // CFR: In introduced this method to ensure that inner workings are not disturbed by // subclasses...for instance when GetActiveRecordsClass invokes Find() // Why am I not invoking parent::Find? @@ -985,12 +985,12 @@ class ADODB_Active_Record { function Replace() { global $ADODB_ASSOC_CASE; - + $db = $this->DB(); if (!$db) return false; $table = $this->TableInfo(); - + $pkey = $table->keys; - + foreach($table->flds as $name=>$fld) { $val = $this->$name; /* @@ -1010,17 +1010,17 @@ class ADODB_Active_Record { $arr[$name] = $this->doquote($db,$val,$t); $valarr[] = $val; } - + if (!is_array($pkey)) $pkey = array($pkey); - - - if ($ADODB_ASSOC_CASE == 0) + + + if ($ADODB_ASSOC_CASE == 0) foreach($pkey as $k => $v) $pkey[$k] = strtolower($v); - elseif ($ADODB_ASSOC_CASE == 1) + elseif ($ADODB_ASSOC_CASE == 1) foreach($pkey as $k => $v) $pkey[$k] = strtoupper($v); - + $ok = $db->Replace($this->_table,$arr,$pkey); if ($ok) { $this->_saved = true; // 1= update 2=insert @@ -1037,9 +1037,9 @@ class ADODB_Active_Record { $this->$k = $this->LastInsertID($db,$k); } } - + $this->_original = $valarr; - } + } return $ok; } @@ -1048,14 +1048,14 @@ class ADODB_Active_Record { { $db = $this->DB(); if (!$db) return false; $table = $this->TableInfo(); - + $where = $this->GenWhere($db, $table); - + if (!$where) { $this->error("Where missing for table $table", "Update"); return false; } - $valarr = array(); + $valarr = array(); $neworig = array(); $pairs = array(); $i = -1; @@ -1064,11 +1064,11 @@ class ADODB_Active_Record { $i += 1; $val = $this->$name; $neworig[] = $val; - + if (isset($table->keys[$name])) { continue; } - + if (is_null($val)) { if (isset($fld->not_null) && $fld->not_null) { if (isset($fld->default_value) && strlen($fld->default_value)) continue; @@ -1078,16 +1078,16 @@ class ADODB_Active_Record { } } } - + if (isset($this->_original[$i]) && $val == $this->_original[$i]) { continue; - } + } $valarr[] = $val; $pairs[] = $name.'='.$db->Param($cnt); $cnt += 1; } - - + + if (!$cnt) return -1; $sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where; $ok = $db->Execute($sql,$valarr); @@ -1097,23 +1097,23 @@ class ADODB_Active_Record { } return 0; } - + function GetAttributeNames() { $table = $this->TableInfo(); if (!$table) return false; return array_keys($table->flds); } - + }; function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bindarr, $primkeyArr, $extra, $relations) { global $_ADODB_ACTIVE_DBS; - + if (empty($extra['loading'])) $extra['loading'] = ADODB_LAZY_AR; - + $save = $db->SetFetchMode(ADODB_FETCH_NUM); $table = &$tableObj->_table; $tableInfo =& $tableObj->TableInfo(); @@ -1135,7 +1135,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind } if(!$found) $db->outp_throw("Unable to locate key $myId for $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); - + $qry = "select * from ".$table; if(ADODB_JOIN_AR == $extra['loading']) { @@ -1192,19 +1192,19 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind } } else $rows = $db->GetAll($qry,$bindarr); - + $db->SetFetchMode($save); - + $false = false; - - if ($rows === false) { + + if ($rows === false) { return $false; } - - + + if (!isset($_ADODB_ACTIVE_DBS)) { include(ADODB_DIR.'/adodb-active-record.inc.php'); - } + } if (!class_exists($class)) { $db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); return $false; @@ -1218,7 +1218,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind $arrRef = array(); $bTos = array(); // Will store belongTo's indices if any foreach($rows as $row) { - + $obj = new $class($table,$primkeyArr,$db); if ($obj->ErrorNo()){ $db->_errorMsg = $obj->ErrorMsg(); @@ -1268,7 +1268,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind { if(ADODB_JOIN_AR == $extra['loading']) { - $isNewObj = !isset($uniqArr['_'.$row[0]]); + $isNewObj = !isset($uniqArr['_'.$row[0]]); if($isNewObj) $uniqArr['_'.$row[0]] = $obj; @@ -1322,7 +1322,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind } } if(!$isNewObj) - unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array + unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array } else if(ADODB_LAZY_AR == $extra['loading']) { @@ -1382,7 +1382,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind array_push($arrRef[$obj->$dbClassRef]->$foreignName, $obj); } } - + } if(!empty($relations['belongsTo'])) { @@ -1398,7 +1398,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind else { $belongsToId = 'id'; - } + } $origObjsArr = $bTos[$foreignTableRef]; $bTosString = implode(',', array_keys($bTos[$foreignTableRef])); $foreignName = $foreignTable->foreignName; @@ -1418,4 +1418,3 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind return $arr; } -?> diff --git a/lib/WikiDB/adodb/adodb-csvlib.inc.php b/lib/WikiDB/adodb/adodb-csvlib.inc.php index 26618ab5d..d70c16f74 100644 --- a/lib/WikiDB/adodb/adodb-csvlib.inc.php +++ b/lib/WikiDB/adodb/adodb-csvlib.inc.php @@ -6,19 +6,19 @@ if (!defined('ADODB_DIR')) die(); global $ADODB_INCLUDED_CSV; $ADODB_INCLUDED_CSV = 1; -/* +/* - V5.18 3 Sep 2012 (c) 2000-2012 John Lim (jlim#natsoft.com). 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. + V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). 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. Set tabs to 4 for best viewing. - + Latest version is available at http://adodb.sourceforge.net - - Library for CSV serialization. This is used by the csv/proxy driver and is the - CacheExecute() serialization format. - + + Library for CSV serialization. This is used by the csv/proxy driver and is the + CacheExecute() serialization format. + ==== NOTE ==== Format documented at http://php.weblogs.com/ADODB_CSV ============== @@ -34,61 +34,61 @@ $ADODB_INCLUDED_CSV = 1; function _rs2serialize(&$rs,$conn=false,$sql='') { $max = ($rs) ? $rs->FieldCount() : 0; - + if ($sql) $sql = urlencode($sql); // metadata setup - + if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete if (is_object($conn)) { $sql .= ','.$conn->Affected_Rows(); $sql .= ','.$conn->Insert_ID(); } else $sql .= ',,'; - + $text = "====-1,0,$sql\n"; return $text; } $tt = ($rs->timeCreated) ? $rs->timeCreated : time(); - + ## changed format from ====0 to ====1 $line = "====1,$tt,$sql\n"; - + if ($rs->databaseType == 'array') { $rows = $rs->_array; } else { $rows = array(); - while (!$rs->EOF) { + while (!$rs->EOF) { $rows[] = $rs->fields; $rs->MoveNext(); - } + } } - + for($i=0; $i < $max; $i++) { $o = $rs->FetchField($i); $flds[] = $o; } - + $savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode; $class = $rs->connection->arrayClass; $rs2 = new $class(); $rs2->timeCreated = $rs->timeCreated; # memcache fix $rs2->sql = $rs->sql; - $rs2->oldProvider = $rs->dataProvider; + $rs2->oldProvider = $rs->dataProvider; $rs2->InitArrayFields($rows,$flds); $rs2->fetchMode = $savefetch; return $line.serialize($rs2); } - + /** -* Open CSV file and convert it into Data. +* Open CSV file and convert it into Data. * * @param url file/ftp/http url * @param err returns the error message * @param timeout dispose if recordset has been alive for $timeout secs * * @return recordset, or false if error occured. If no -* error occurred in sql INSERT/UPDATE/DELETE, +* error occurred in sql INSERT/UPDATE/DELETE, * empty recordset is returned */ function csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') @@ -103,7 +103,7 @@ $ADODB_INCLUDED_CSV = 1; @flock($fp, LOCK_SH); $arr = array(); $ttl = 0; - + if ($meta = fgetcsv($fp, 32000, ",")) { // check if error message if (strncmp($meta[0],'****',4) === 0) { @@ -113,10 +113,10 @@ $ADODB_INCLUDED_CSV = 1; } // check for meta data // $meta[0] is -1 means return an empty recordset - // $meta[1] contains a time - + // $meta[1] contains a time + if (strncmp($meta[0], '====',4) === 0) { - + if ($meta[0] == "====-1") { if (sizeof($meta) < 5) { $err = "Corrupt first line for format -1"; @@ -124,12 +124,12 @@ $ADODB_INCLUDED_CSV = 1; return $false; } fclose($fp); - + if ($timeout > 0) { $err = " Illegal Timeout $timeout "; return $false; } - + $rs = new $rsclass($val=true); $rs->fields = array(); $rs->timeCreated = $meta[1]; @@ -137,9 +137,9 @@ $ADODB_INCLUDED_CSV = 1; $rs->_numOfFields = 0; $rs->sql = urldecode($meta[2]); $rs->affectedrows = (integer)$meta[3]; - $rs->insertid = $meta[4]; + $rs->insertid = $meta[4]; return $rs; - } + } # Under high volume loads, we want only 1 thread/process to _write_file # so that we don't have 50 processes queueing to write the same data. # We use probabilistic timeout, ahead of time. @@ -149,7 +149,7 @@ $ADODB_INCLUDED_CSV = 1; # -1 sec after timeout give processes 1/4 chance of timing out # +0 sec after timeout, give processes 100% chance of timing out if (sizeof($meta) > 1) { - if($timeout >0){ + if($timeout >0){ $tdiff = (integer)( $meta[1]+$timeout - time()); if ($tdiff <= 2) { switch($tdiff) { @@ -161,7 +161,7 @@ $ADODB_INCLUDED_CSV = 1; return $false; } break; - case 2: + case 2: if ((rand() & 15) == 0) { fclose($fp); $err = "Timeout 2"; @@ -175,12 +175,12 @@ $ADODB_INCLUDED_CSV = 1; return $false; } break; - default: + default: fclose($fp); $err = "Timeout 0"; return $false; } // switch - + } // if check flush cache }// (timeout>0) $ttl = $meta[1]; @@ -190,7 +190,7 @@ $ADODB_INCLUDED_CSV = 1; if ($meta[0] === '====1') { // slurp in the data $MAXSIZE = 128000; - + $text = fread($fp,$MAXSIZE); if (strlen($text)) { while ($txt = fread($fp,$MAXSIZE)) { @@ -206,7 +206,7 @@ $ADODB_INCLUDED_CSV = 1; } return $rs; } - + $meta = false; $meta = fgetcsv($fp, 32000, ","); if (!$meta) { @@ -236,15 +236,15 @@ $ADODB_INCLUDED_CSV = 1; $err = "Recordset had unexpected EOF 2"; return $false; } - + // slurp in the data $MAXSIZE = 128000; - + $text = ''; while ($txt = fread($fp,$MAXSIZE)) { $text .= $txt; } - + fclose($fp); @$arr = unserialize($text); //var_dump($arr); @@ -258,18 +258,18 @@ $ADODB_INCLUDED_CSV = 1; $rs->InitArrayFields($arr,$flds); return $rs; } - + /** * Save a file $filename and its $contents (normally for caching) with file locking * Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked) */ 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 + # 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: @@ -279,14 +279,14 @@ $ADODB_INCLUDED_CSV = 1; # 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); + $mtime = substr(str_replace(' ','_',microtime()),2); // getmypid() actually returns 0 on Win98 - never mind! $tmpname = $filename.uniqid($mtime).getmypid(); if (!($fd = @fopen($tmpname,'w'))) return false; if (fwrite($fd,$contents)) $ok = true; else $ok = false; fclose($fd); - + if ($ok) { @chmod($tmpname,0644); // the tricky moment @@ -312,7 +312,6 @@ $ADODB_INCLUDED_CSV = 1; if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename
\n"); $ok = false; } - + return $ok; } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-datadict.inc.php b/lib/WikiDB/adodb/adodb-datadict.inc.php index 3820d7dd9..b8b881e9d 100644 --- a/lib/WikiDB/adodb/adodb-datadict.inc.php +++ b/lib/WikiDB/adodb/adodb-datadict.inc.php @@ -1,15 +1,15 @@ connection->IsConnected()) return array(); return $this->connection->MetaTables(); } - + function MetaColumns($tab, $upper=true, $schema=false) { if (!$this->connection->IsConnected()) return array(); return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema); } - + function MetaPrimaryKeys($tab,$owner=false,$intkey=false) { if (!$this->connection->IsConnected()) return array(); return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey); } - + function MetaIndexes($table, $primary = false, $owner = false) { if (!$this->connection->IsConnected()) return array(); return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner); } - + function MetaType($t,$len=-1,$fieldobj=false) - { + { static $typeMap = array( 'VARCHAR' => 'C', 'VARCHAR2' => 'C', @@ -263,7 +263,7 @@ class ADODB_DataDict { 'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql ## 'BOOL' => 'L', - 'BOOLEAN' => 'L', + 'BOOLEAN' => 'L', 'BIT' => 'L', 'L' => 'L', ## @@ -296,21 +296,21 @@ class ADODB_DataDict { 'NUM' => 'N', 'NUMERIC' => 'N', 'MONEY' => 'N', - + ## informix 9.2 - 'SQLINT' => 'I', - 'SQLSERIAL' => 'I', - 'SQLSMINT' => 'I', - 'SQLSMFLOAT' => 'N', - 'SQLFLOAT' => 'N', - 'SQLMONEY' => 'N', - 'SQLDECIMAL' => 'N', - 'SQLDATE' => 'D', - 'SQLVCHAR' => 'C', - 'SQLCHAR' => 'C', - 'SQLDTIME' => 'T', - 'SQLINTERVAL' => 'N', - 'SQLBYTES' => 'B', + 'SQLINT' => 'I', + 'SQLSERIAL' => 'I', + 'SQLSMINT' => 'I', + 'SQLSMFLOAT' => 'N', + 'SQLFLOAT' => 'N', + 'SQLMONEY' => 'N', + 'SQLDECIMAL' => 'N', + 'SQLDATE' => 'D', + 'SQLVCHAR' => 'C', + 'SQLCHAR' => 'C', + 'SQLDTIME' => 'T', + 'SQLINTERVAL' => 'N', + 'SQLBYTES' => 'B', 'SQLTEXT' => 'X', ## informix 10 "SQLINT8" => 'I8', @@ -320,7 +320,7 @@ class ADODB_DataDict { "SQLLVARCHAR" => 'X', "SQLBOOL" => 'L' ); - + if (!$this->connection->IsConnected()) { $t = strtoupper($t); if (isset($typeMap[$t])) return $typeMap[$t]; @@ -328,36 +328,36 @@ class ADODB_DataDict { } return $this->connection->MetaType($t,$len,$fieldobj); } - + function NameQuote($name = NULL,$allowBrackets=false) { if (!is_string($name)) { return FALSE; } - + $name = trim($name); - + if ( !is_object($this->connection) ) { return $name; } - + $quote = $this->connection->nameQuote; - + // if name is of the form `name`, quote it if ( preg_match('/^`(.+)`$/', $name, $matches) ) { return $quote . $matches[1] . $quote; } - + // if name contains special characters, quote it $regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex; - + if ( !preg_match('/^[' . $regex . ']+$/', $name) ) { return $quote . $name . $quote; } - + return $name; } - + function TableName($name) { if ( $this->schema ) { @@ -365,7 +365,7 @@ class ADODB_DataDict { } return $this->NameQuote($name); } - + // Executes the sql array returned by GetTableSQL and GetIndexSQL function ExecuteSQLArray($sql, $continueOnError = true) { @@ -373,7 +373,7 @@ class ADODB_DataDict { $conn = $this->connection; $saved = $conn->debug; foreach($sql as $line) { - + if ($this->debug) $conn->debug = true; $ok = $conn->Execute($line); $conn->debug = $saved; @@ -385,43 +385,43 @@ class ADODB_DataDict { } return $rez; } - + /** Returns the actual type given a character code. - + C: varchar X: CLOB (character large object) or largest varchar size if CLOB is not supported C2: Multibyte varchar X2: Multibyte CLOB - + B: BLOB (binary large object) - + D: Date - T: Date-time + T: Date-time L: Integer field suitable for storing booleans (0 or 1) I: Integer F: Floating point number N: Numeric or decimal number */ - + function ActualType($meta) { return $meta; } - + function CreateDatabase($dbname,$options=false) { $options = $this->_Options($options); $sql = array(); - + $s = 'CREATE DATABASE ' . $this->NameQuote($dbname); if (isset($options[$this->upperName])) $s .= ' '.$options[$this->upperName]; - + $sql[] = $s; return $sql; } - + /* Generates the SQL to create index. Returns an array of sql strings. */ @@ -430,25 +430,25 @@ class ADODB_DataDict { if (!is_array($flds)) { $flds = explode(',',$flds); } - + foreach($flds as $key => $fld) { # some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32) $flds[$key] = $this->NameQuote($fld,$allowBrackets=true); } - + return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions)); } - + function DropIndexSQL ($idxname, $tabname = NULL) { return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname))); } - + function SetSchema($schema) { $this->schema = $schema; } - + function AddColumnSQL($tabname, $flds) { $tabname = $this->TableName ($tabname); @@ -468,7 +468,7 @@ class ADODB_DataDict { } return $sql; } - + /** * Change the definition of one column * @@ -500,7 +500,7 @@ class ADODB_DataDict { } return $sql; } - + /** * Rename one column * @@ -523,7 +523,7 @@ class ADODB_DataDict { } return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def)); } - + /** * Drop one column * @@ -546,17 +546,17 @@ class ADODB_DataDict { } return $sql; } - + function DropTableSQL($tabname) { return array (sprintf($this->dropTable, $this->TableName($tabname))); } - + function RenameTableSQL($tabname,$newname) { return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname))); - } - + } + /** Generate the SQL to create table. Returns an array of sql strings. */ @@ -565,11 +565,11 @@ class ADODB_DataDict { list($lines,$pkey,$idxs) = $this->_GenFields($flds, true); // genfields can return FALSE at times if ($lines == null) $lines = array(); - + $taboptions = $this->_Options($tableoptions); $tabname = $this->TableName ($tabname); $sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions); - + // ggiunta - 2006/10/12 - KLUDGE: // if we are on autoincrement, and table options includes REPLACE, the // autoincrement sequence has already been dropped on table creation sql, so @@ -579,7 +579,7 @@ class ADODB_DataDict { unset($taboptions['REPLACE']); $tsql = $this->_Triggers($tabname,$taboptions); foreach($tsql as $s) $sql[] = $s; - + if (is_array($idxs)) { foreach($idxs as $idx => $idxdef) { $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); @@ -589,9 +589,9 @@ class ADODB_DataDict { return $sql; } - - - + + + function _GenFields($flds,$widespacing=false) { if (is_string($flds)) { @@ -608,7 +608,7 @@ class ADODB_DataDict { $f1['INDEX'] = ''; // fall through intentionally case 'CONSTRAINT': - case 'DEFAULT': + case 'DEFAULT': $hasparam = $token; break; default: @@ -633,7 +633,7 @@ class ADODB_DataDict { $hasparam = false; $flds[] = $f1; - + } } $this->autoIncrement = false; @@ -642,7 +642,7 @@ class ADODB_DataDict { $idxs = array(); foreach($flds as $fld) { $fld = _array_change_key_case($fld); - + $fname = false; $fdefault = false; $fautoinc = false; @@ -658,20 +658,20 @@ class ADODB_DataDict { $funsigned = false; $findex = ''; $funiqueindex = false; - + //----------------- // Parse attributes foreach($fld as $attr => $v) { if ($attr == 2 && is_numeric($v)) $attr = 'SIZE'; else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v); - + switch($attr) { case '0': case 'NAME': $fname = $v; break; case '1': case 'TYPE': $ty = $v; $ftype = $this->ActualType(strtoupper($v)); break; - - case 'SIZE': + + case 'SIZE': $dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,','); if ($dotat === false) $fsize = $v; else { @@ -697,33 +697,33 @@ class ADODB_DataDict { case 'UNIQUE': $funiqueindex = true; break; } //switch } // foreach $fld - + //-------------------- // VALIDATE FIELD INFO if (!strlen($fname)) { if ($this->debug) ADOConnection::outp("Undefined NAME"); return false; } - + $fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname)); $fname = $this->NameQuote($fname); - + if (!strlen($ftype)) { if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'"); return false; } else { $ftype = strtoupper($ftype); } - + $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec); - + if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls - + if ($fprimary) $pkey[] = $fname; - + // some databases do not allow blobs to have defaults if ($ty == 'X') $fdefault = false; - + // build list of indexes if ($findex != '') { if (array_key_exists($findex, $idxs)) { @@ -760,7 +760,7 @@ class ADODB_DataDict { $fdefault = $this->connection->sysDate; } } else if ($fdefault !== false && !$fnoquote) { - if ($ty == 'C' or $ty == 'X' or + if ($ty == 'C' or $ty == 'X' or ( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) { if (($ty == 'D' || $ty == 'T') && strtolower($fdefault) != 'null') { @@ -775,27 +775,27 @@ class ADODB_DataDict { } } else - if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') + if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') $fdefault = trim($fdefault); else if (strtolower($fdefault) != 'null') $fdefault = $this->connection->qstr($fdefault); } } $suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); - + // add index creation if ($widespacing) $fname = str_pad($fname,24); - + // check for field names appearing twice if (array_key_exists($fid, $lines)) { ADOConnection::outp("Field '$fname' defined twice"); } - + $lines[$fid] = $fname.' '.$ftype.$suffix; - + if ($fautoinc) $this->autoIncrement = true; } // foreach $flds - + return array($lines,$pkey,$idxs); } @@ -813,56 +813,56 @@ class ADODB_DataDict { } return $ftype; } - - + + // return string must begin with space function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned) - { + { $suffix = ''; if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault"; if ($fnotnull) $suffix .= ' NOT NULL'; if ($fconstraint) $suffix .= ' '.$fconstraint; return $suffix; } - + function _IndexSQL($idxname, $tabname, $flds, $idxoptions) { $sql = array(); - + if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) { $sql[] = sprintf ($this->dropIndex, $idxname); if ( isset($idxoptions['DROP']) ) return $sql; } - + if ( empty ($flds) ) { return $sql; } - + $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : ''; - + $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' '; - + if ( isset($idxoptions[$this->upperName]) ) $s .= $idxoptions[$this->upperName]; - + if ( is_array($flds) ) $flds = implode(', ',$flds); $s .= '(' . $flds . ')'; $sql[] = $s; - + return $sql; } - + function _DropAutoIncrement($tabname) { return false; } - + function _TableSQL($tabname,$lines,$pkey,$tableoptions) { $sql = array(); - + if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) { $sql[] = sprintf($this->dropTable,$tabname); if ($this->autoIncrement) { @@ -879,19 +879,19 @@ class ADODB_DataDict { $s .= ",\n PRIMARY KEY ("; $s .= implode(", ",$pkey).")"; } - if (isset($tableoptions['CONSTRAINTS'])) + if (isset($tableoptions['CONSTRAINTS'])) $s .= "\n".$tableoptions['CONSTRAINTS']; - - if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) + + if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) $s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; - + $s .= "\n)"; if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName]; $sql[] = $s; - + return $sql; } - + /** GENERATE TRIGGERS IF NEEDED used when table has auto-incrementing field that is emulated using triggers @@ -900,7 +900,7 @@ class ADODB_DataDict { { return array(); } - + /** Sanitize options, so that array elements with no keys are promoted to keys */ @@ -914,8 +914,8 @@ class ADODB_DataDict { } return $newopts; } - - + + function _getSizePrec($size) { $fsize = false; @@ -929,34 +929,34 @@ class ADODB_DataDict { } return array($fsize, $fprec); } - + /** "Florian Buzin [ easywe ]" - + This function changes/adds new fields to your table. You don't have to know if the col is new or not. It will check on its own. */ function ChangeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFlds=false) { global $ADODB_FETCH_MODE; - + $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false); - + // check table exists $save_handler = $this->connection->raiseErrorFn; $this->connection->raiseErrorFn = ''; $cols = $this->MetaColumns($tablename); $this->connection->raiseErrorFn = $save_handler; - + if (isset($savem)) $this->connection->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; - - if ( empty($cols)) { + + if ( empty($cols)) { return $this->CreateTableSQL($tablename, $flds, $tableoptions); } - + if (is_array($flds)) { // Cycle through the update fields, comparing // existing fields to fields to update. @@ -969,16 +969,16 @@ class ADODB_DataDict { $obj = $cols[$k]; if (isset($obj->not_null) && $obj->not_null) $v = str_replace('NOT NULL','',$v); - if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT'])) + if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT'])) $v = str_replace('AUTOINCREMENT','',$v); - + $c = $cols[$k]; $ml = $c->max_length; $mt = $this->MetaType($c->type,$ml); - + if (isset($c->scale)) $sc = $c->scale; else $sc = 99; // always force change if scale not known. - + if ($sc == -1) $sc = false; list($fsize, $fprec) = $this->_getSizePrec($v['SIZE']); @@ -989,11 +989,11 @@ class ADODB_DataDict { } } else { $holdflds[$k] = $v; - } + } } $flds = $holdflds; } - + // already exists, alter table instead list($lines,$pkey,$idxs) = $this->_GenFields($flds); @@ -1004,29 +1004,28 @@ class ADODB_DataDict { foreach ( $lines as $id => $v ) { if ( isset($cols[$id]) && is_object($cols[$id]) ) { - + $flds = Lens_ParseArgs($v,','); - + // We are trying to change the size of the field, if not allowed, simply ignore the request. // $flds[1] holds the type, $flds[2] holds the size -postnuke addition if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4) && (isset($flds[0][2]) && is_numeric($flds[0][2]))) { if ($this->debug) ADOConnection::outp(sprintf("

%s cannot be changed to %s currently

", $flds[0][0], $flds[0][1])); #echo "

$this->alterCol cannot be changed to $flds currently

"; - continue; + continue; } $sql[] = $alter . $this->alterCol . ' ' . $v; } else { $sql[] = $alter . $this->addCol . ' ' . $v; } } - + if ($dropOldFlds) { foreach ( $cols as $id => $v ) - if ( !isset($lines[$id]) ) + if ( !isset($lines[$id]) ) $sql[] = $alter . $this->dropCol . ' ' . $v->name; } return $sql; } } // class -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-error.inc.php b/lib/WikiDB/adodb/adodb-error.inc.php index 67c16d667..29c6a9ce7 100644 --- a/lib/WikiDB/adodb/adodb-error.inc.php +++ b/lib/WikiDB/adodb/adodb-error.inc.php @@ -1,12 +1,12 @@ DB_ERROR_NOSUCHTABLE, - '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key.*violates unique constraint/i' => DB_ERROR_ALREADY_EXISTS, - '/database ".+" does not exist$/i' => DB_ERROR_NOSUCHDB, - '/(divide|division) by zero$/i' => DB_ERROR_DIVZERO, - '/pg_atoi: error in .*: can\'t parse /i' => DB_ERROR_INVALID_NUMBER, - '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/i' => DB_ERROR_NOSUCHFIELD, - '/(parser: parse|syntax) error at or near \"/i' => DB_ERROR_SYNTAX, - '/referential integrity violation/i' => DB_ERROR_CONSTRAINT, - '/deadlock detected$/i' => DB_ERROR_DEADLOCK, - '/canceling statement due to statement timeout$/i' => DB_ERROR_STATEMENT_TIMEOUT, - '/could not serialize access due to/i' => DB_ERROR_SERIALIZATION_FAILURE - ); + static $error_regexps = array( + '(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$' => DB_ERROR_NOSUCHTABLE, + 'Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key.*violates unique constraint' => DB_ERROR_ALREADY_EXISTS, + 'database ".+" does not exist$' => DB_ERROR_NOSUCHDB, + '(divide|division) by zero$' => DB_ERROR_DIVZERO, + 'pg_atoi: error in .*: can\'t parse ' => DB_ERROR_INVALID_NUMBER, + 'ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']' => DB_ERROR_NOSUCHFIELD, + '(parser: parse|syntax) error at or near \"' => DB_ERROR_SYNTAX, + 'referential integrity violation' => DB_ERROR_CONSTRAINT, + 'deadlock detected$' => DB_ERROR_DEADLOCK, + 'canceling statement due to statement timeout$' => DB_ERROR_STATEMENT_TIMEOUT, + 'could not serialize access due to' => DB_ERROR_SERIALIZATION_FAILURE + ); reset($error_regexps); - while (list($regexp,$code) = each($error_regexps)) { - if (preg_match($regexp, $errormsg)) { - return $code; - } - } - // Fall back to DB_ERROR if there was no mapping. - return DB_ERROR; + while (list($regexp,$code) = each($error_regexps)) { + if (preg_match("/$regexp/mi", $errormsg)) { + return $code; + } + } + // Fall back to DB_ERROR if there was no mapping. + return DB_ERROR; } - + function adodb_error_odbc() { static $MAP = array( @@ -175,7 +175,7 @@ static $MAP = array( -923 => DB_ERROR_CONNECT_FAILED, -924 => DB_ERROR_CONNECT_FAILED ); - + return $MAP; } @@ -193,7 +193,7 @@ static $MAP = array( '-1210' => DB_ERROR_INVALID_DATE, '-1212' => DB_ERROR_INVALID_DATE ); - + return $MAP; } @@ -212,7 +212,7 @@ static $MAP = array( 2291 => DB_ERROR_CONSTRAINT, 2449 => DB_ERROR_CONSTRAINT ); - + return $MAP; } @@ -222,7 +222,7 @@ static $MAP = array( 208 => DB_ERROR_NOSUCHTABLE, 2601 => DB_ERROR_ALREADY_EXISTS ); - + return $MAP; } @@ -231,7 +231,7 @@ function adodb_error_sqlite() static $MAP = array( 1 => DB_ERROR_SYNTAX ); - + return $MAP; } @@ -258,7 +258,6 @@ static $MAP = array( 2002 => DB_ERROR_CONNECT_FAILED, 2005 => DB_ERROR_CONNECT_FAILED ); - + return $MAP; } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-errorhandler.inc.php b/lib/WikiDB/adodb/adodb-errorhandler.inc.php index 7099f0347..680e76d85 100644 --- a/lib/WikiDB/adodb/adodb-errorhandler.inc.php +++ b/lib/WikiDB/adodb/adodb-errorhandler.inc.php @@ -1,6 +1,6 @@ $s

"; - trigger_error($s,ADODB_ERROR_HANDLER_TYPE); + trigger_error($s,ADODB_ERROR_HANDLER_TYPE); } -?> diff --git a/lib/WikiDB/adodb/adodb-errorpear.inc.php b/lib/WikiDB/adodb/adodb-errorpear.inc.php index 8340a8407..10dbb97c4 100644 --- a/lib/WikiDB/adodb/adodb-errorpear.inc.php +++ b/lib/WikiDB/adodb/adodb-errorpear.inc.php @@ -1,14 +1,14 @@ !$s

"; } @@ -84,5 +84,3 @@ global $ADODB_Last_PEAR_Error; return $ADODB_Last_PEAR_Error; } - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-exceptions.inc.php b/lib/WikiDB/adodb/adodb-exceptions.inc.php index 98bf1601e..2300f11d9 100644 --- a/lib/WikiDB/adodb/adodb-exceptions.inc.php +++ b/lib/WikiDB/adodb/adodb-exceptions.inc.php @@ -1,7 +1,7 @@ params = $p2; $s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n"; break; - + case 'PCONNECT': case 'CONNECT': $user = $thisConnection->user; @@ -43,7 +43,7 @@ var $database = ''; $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n"; break; } - + $this->dbms = $dbms; if ($thisConnection) { $this->host = $thisConnection->host; @@ -51,7 +51,7 @@ var $database = ''; } $this->fn = $fn; $this->msg = $errmsg; - + if (!is_numeric($errno)) $errno = -1; parent::__construct($s,$errno); } @@ -71,12 +71,9 @@ var $database = ''; function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection) { global $ADODB_EXCEPTION; - + if (error_reporting() == 0) return; // obey @ protocol if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION; else $errfn = 'ADODB_EXCEPTION'; throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection); } - - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-iterator.inc.php b/lib/WikiDB/adodb/adodb-iterator.inc.php index 38957ad0f..2d26326b6 100644 --- a/lib/WikiDB/adodb/adodb-iterator.inc.php +++ b/lib/WikiDB/adodb/adodb-iterator.inc.php @@ -1,30 +1,24 @@ Execute("select * from adoxyz"); foreach($rs as $k => $v) { echo $k; print_r($v); echo "
"; } - - - Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2 - - - Moved to adodb.inc.php to improve performance. - */ - + Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2 -?> \ No newline at end of file + Moved to adodb.inc.php to improve performance. + */ diff --git a/lib/WikiDB/adodb/adodb-lib.inc.php b/lib/WikiDB/adodb/adodb-lib.inc.php index e3e678224..de35bc983 100644 --- a/lib/WikiDB/adodb/adodb-lib.inc.php +++ b/lib/WikiDB/adodb/adodb-lib.inc.php @@ -5,22 +5,22 @@ if (!defined('ADODB_DIR')) die(); global $ADODB_INCLUDED_LIB; $ADODB_INCLUDED_LIB = 1; -/* - @version V5.18 3 Sep 2012 (c) 2000-2012 John Lim (jlim#natsoft.com). 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. +/* + @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). 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. Set tabs to 4 for best viewing. - - Less commonly used functions are placed here to reduce size of adodb.inc.php. -*/ + + Less commonly used functions are placed here to reduce size of adodb.inc.php. +*/ function adodb_strip_order_by($sql) { - $rez = preg_match('/(\sORDER\s+BY\s[^)]*)/is',$sql,$arr); + $rez = preg_match('/(\sORDER\s+BY\s(?:[^)](?!limit))*)(?:\sLIMIT\s+[0-9]+)?/is', $sql, $arr); if ($arr) - if (strpos($arr[0],'(') !== false) { - $at = strpos($sql,$arr[0]); + if (strpos($arr[1], '(') !== false) { + $at = strpos($sql, $arr[1]); $cntin = 0; for ($i=$at, $max=strlen($sql); $i < $max; $i++) { $ch = $sql[$i]; @@ -34,8 +34,9 @@ function adodb_strip_order_by($sql) } } $sql = substr($sql,0,$at).substr($sql,$i); - } else - $sql = str_replace($arr[0], '', $sql); + } else { + $sql = str_replace($arr[1], '', $sql); + } return $sql; } @@ -51,8 +52,8 @@ function adodb_probetypes(&$array,&$types,$probe=8) $types = array(); if ($probe > sizeof($array)) $max = sizeof($array); else $max = $probe; - - + + for ($j=0;$j < $max; $j++) { $row = $array[$j]; if (!$row) break; @@ -61,16 +62,16 @@ function adodb_probetypes(&$array,&$types,$probe=8) $i += 1; if (isset($types[$i]) && $types[$i]=='C') continue; - + //print " ($i ".$types[$i]. "$v) "; $v = trim($v); - + if (!preg_match('/^[+-]{0,1}[0-9\.]+$/',$v)) { $types[$i] = 'C'; // once C, always C - + continue; } - if ($j == 0) { + if ($j == 0) { // If empty string, we presume is character // test for integer for 1st row only // after that it is up to testing other rows to prove @@ -80,19 +81,19 @@ function adodb_probetypes(&$array,&$types,$probe=8) else $types[$i] = 'I'; continue; } - + if (strpos($v,'.') !== false) $types[$i] = 'N'; - + } } - + } function adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs) { $oldX = sizeof(reset($arr)); - $oldY = sizeof($arr); - + $oldY = sizeof($arr); + if ($hdr) { $startx = 1; $hdr = array('Fields'); @@ -108,14 +109,14 @@ function adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs) $newarr[] = array($o->name); } else $newarr[] = array(); - + for ($y = 0; $y < $oldY; $y++) { $newarr[$x-$startx][] = $arr[$y][$x]; } } } -// Force key to upper. +// Force key to upper. // See also http://www.php.net/manual/en/function.array-change-key-case.php function _array_change_key_case($an_array) { @@ -135,7 +136,7 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_ if (count($fieldArray) == 0) return 0; $first = true; $uSet = ''; - + if (!is_array($keyCol)) { $keyCol = array($keyCol); } @@ -148,14 +149,14 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_ $fieldArray[$k] = $v; } if (in_array($k,$keyCol)) continue; // skip UPDATE if is key - + if ($first) { - $first = false; + $first = false; $uSet = "$k=$v"; } else $uSet .= ",$k=$v"; } - + $where = false; foreach ($keyCol as $v) { if (isset($fieldArray[$v])) { @@ -163,24 +164,24 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_ else $where = $v.'='.$fieldArray[$v]; } } - + if ($uSet && $where) { $update = "UPDATE $table SET $uSet WHERE $where"; $rs = $zthis->Execute($update); - - + + if ($rs) { if ($zthis->poorAffectedRows) { /* - The Select count(*) wipes out any errors that the update would have returned. + The Select count(*) wipes out any errors that the update would have returned. http://phplens.com/lens/lensforum/msgs.php?id=5696 */ if ($zthis->ErrorNo()<>0) return 0; - + # affected_rows == 0 if update field values identical to old values - # for mysql - which is silly. - + # for mysql - which is silly. + $cnt = $zthis->GetOne("select count(*) from $table where $where"); if ($cnt > 0) return 1; // record already exists } else { @@ -189,22 +190,22 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_ } else return 0; } - + // print "

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

'; $first = true; foreach($fieldArray as $k => $v) { if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col - + if ($first) { - $first = false; + $first = false; $iCols = "$k"; $iVals = "$v"; } else { $iCols .= ",$k"; $iVals .= ",$v"; - } + } } - $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; + $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; $rs = $zthis->Execute($insert); return ($rs) ? 2 : 0; } @@ -221,9 +222,9 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f if (!strpos($name,'[]')) $name .= '[]'; } else if ($size) $attr = ' size="'.$size.'"'; else $attr =''; - + $s = ''; - if ($blank1stItem) + if ($blank1stItem) if (is_string($blank1stItem)) { $barr = explode(':',$blank1stItem); if (sizeof($barr) == 1) $barr[] = ''; @@ -318,7 +319,7 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl if ($zthis->FieldCount() > 1) $hasvalue=true; else $compareFields0 = true; - + $value = ''; $optgroup = null; $firstgroup = true; @@ -338,12 +339,12 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl $zval2 = rtrim(next($zthis->fields)); } $selected = ($compareFields0) ? $zval : $zval2; - + $group = ''; if (isset($zthis->fields[2])) { $group = rtrim($zthis->fields[2]); } - + if ($optgroup != $group) { $optgroup = $group; if ($firstgroup) { @@ -354,26 +355,26 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl $s .="\n"; } } - - if ($hasvalue) + + if ($hasvalue) $value = " value='".htmlspecialchars($zval2)."'"; - + if (is_array($defstr)) { - - if (in_array($selected,$defstr)) + + if (in_array($selected,$defstr)) $s .= "\n'; - else + else $s .= "\n'.htmlspecialchars($zval).''; } else { - if (strcasecmp($selected,$defstr)==0) + if (strcasecmp($selected,$defstr)==0) $s .= "\n'; else $s .= "\n'.htmlspecialchars($zval).''; } $zthis->MoveNext(); } // while - + // closing last optgroup if($optgroup != null) { $s .= "\n"; @@ -385,34 +386,34 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl /* Count the number of records this sql statement will return by using query rewriting heuristics... - + Does not work with UNIONs, except with postgresql and oracle. - + Usage: - + $conn->Connect(...); $cnt = _adodb_getcount($conn, $sql); - + */ -function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) +function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) { $qryRecs = 0; - - if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || - preg_match('/\s+GROUP\s+BY\s+/is',$sql) || + + if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || + preg_match('/\s+GROUP\s+BY\s+/is',$sql) || preg_match('/\s+UNION\s+/is',$sql)) { - + $rewritesql = adodb_strip_order_by($sql); - + // ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias // but this is only supported by oracle and postgresql... if ($zthis->dataProvider == 'oci8') { // Allow Oracle hints to be used for query optimization, Chris Wrye if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) { - $rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; + $rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; } else - $rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; - + $rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; + } else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0) { $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_"; } else { @@ -422,20 +423,20 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) // now replace SELECT ... FROM with SELECT COUNT(*) FROM $rewritesql = preg_replace( '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql); - // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails + // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails // with mssql, access and postgresql. Also a good speedup optimization - skips sorting! // also see http://phplens.com/lens/lensforum/msgs.php?id=12752 $rewritesql = adodb_strip_order_by($rewritesql); } - + if (isset($rewritesql) && $rewritesql != $sql) { if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0]; - + if ($secs2cache) { // we only use half the time of secs2cache because the count can quickly // become inaccurate if new records are added $qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr); - + } else { $qryRecs = $zthis->GetOne($rewritesql,$inputarr); } @@ -443,14 +444,14 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) } //-------------------------------------------- // query rewrite failed - so try slower way... - - + + // strip off unneeded ORDER BY if no UNION if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql; - else $rewritesql = $rewritesql = adodb_strip_order_by($sql); - + else $rewritesql = $rewritesql = adodb_strip_order_by($sql); + if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0]; - + if ($secs2cache) { $rstest = $zthis->CacheExecute($secs2cache,$rewritesql,$inputarr); if (!$rstest) $rstest = $zthis->CacheExecute($secs2cache,$sql,$inputarr); @@ -460,7 +461,7 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) } if ($rstest) { $qryRecs = $rstest->RecordCount(); - if ($qryRecs == -1) { + if ($qryRecs == -1) { global $ADODB_EXTENSION; // some databases will return -1 on MoveLast() - change to MoveNext() if ($ADODB_EXTENSION) { @@ -483,53 +484,53 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) /* Code originally from "Cornel G" - This code might not work with SQL that has UNION in it - + This code might not work with SQL that has UNION in it + Also if you are using CachePageExecute(), there is a strong possibility that data will get out of synch. use CachePageExecute() only with tables that rarely change. */ -function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, - $inputarr=false, $secs2cache=0) +function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, + $inputarr=false, $secs2cache=0) { $atfirstpage = false; $atlastpage = false; $lastpageno=1; - // If an invalid nrows is supplied, + // If an invalid nrows is supplied, // we assume a default value of 10 rows per page if (!isset($nrows) || $nrows <= 0) $nrows = 10; $qryRecs = false; //count records for no offset - + $qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache); $lastpageno = (int) ceil($qryRecs / $nrows); $zthis->_maxRecordCount = $qryRecs; - - // ***** Here we check whether $page is the last page or - // whether we are trying to retrieve + + // ***** Here we check whether $page is the last page or + // whether we are trying to retrieve // a page number greater than the last page number. if ($page >= $lastpageno) { $page = $lastpageno; $atlastpage = true; } - + // If page number <= 1, then we are at the first page - if (empty($page) || $page <= 1) { + if (empty($page) || $page <= 1) { $page = 1; $atfirstpage = true; } - + // We get the data we want $offset = $nrows * ($page-1); - if ($secs2cache > 0) + if ($secs2cache > 0) $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); - else + else $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); - + // Before returning the RecordSet, we set the pagination properties we need if ($rsreturn) { $rsreturn->_maxRecordCount = $qryRecs; @@ -542,20 +543,20 @@ function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, return $rsreturn; } -// Iván Oliva version -function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) +// Iván Oliva version +function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) { $atfirstpage = false; $atlastpage = false; - + if (!isset($page) || $page <= 1) { // If page number <= 1, then we are at the first page $page = 1; $atfirstpage = true; } if ($nrows <= 0) $nrows = 10; // If an invalid nrows is supplied, we assume a default value of 10 rows per page - - // ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than + + // ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than // the last page number. $pagecounter = $page + 1; $pagecounteroffset = ($pagecounter * $nrows) - $nrows; @@ -577,12 +578,12 @@ function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr if ($page == 1) $atfirstpage = true; // We have to do this again in case the last page is the same as the first //... page, that is, the recordset has only 1 page. } - + // We get the data we want $offset = $nrows * ($page-1); if ($secs2cache > 0) $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); else $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); - + // Before returning the RecordSet, we set the pagination properties we need if ($rsreturn) { $rsreturn->rowsPerPage = $nrows; @@ -601,13 +602,13 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq printf(ADODB_BAD_RS,'GetUpdateSQL'); return false; } - + $fieldUpdatedCount = 0; $arrFields = _array_change_key_case($arrFields); $hasnumeric = isset($rs->fields[0]); $setFields = ''; - + // Loop through all of the fields in the recordset for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) { // Get the field from the recordset @@ -617,19 +618,19 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq // of the fields passed in then process. $upperfname = strtoupper($field->name); if (adodb_key_exists($upperfname,$arrFields,$force)) { - + // If the existing field value in the recordset // is different from the value passed in then // go ahead and append the field name and new value to // the update query. - + if ($hasnumeric) $val = $rs->fields[$i]; else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname]; else if (isset($rs->fields[$field->name])) $val = $rs->fields[$field->name]; else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)]; else $val = ''; - - + + if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) { // Set the counter for the number of fields that will be updated. $fieldUpdatedCount++; @@ -637,14 +638,14 @@ 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); - + if ($type == 'null') { $type = 'C'; } - + if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) { - switch (ADODB_QUOTE_FIELDNAMES) { + switch ($ADODB_QUOTE_FIELDNAMES) { case 'LOWER': $fnameq = $zthis->nameQuote.strtolower($field->name).$zthis->nameQuote;break; case 'NATIVE': @@ -655,9 +656,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq } } else $fnameq = $upperfname; - - - // is_null requires php 4.0.4 + //********************************************************// if (is_null($arrFields[$upperfname]) || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0) @@ -674,7 +673,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq //Set null $setFields .= $field->name . " = null, "; break; - + case 2: //Set empty $arrFields[$upperfname] = ""; @@ -693,7 +692,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq //********************************************************// } else { //we do this so each driver can customize the sql for - //DB specific column types. + //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, @@ -714,7 +713,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq // Get the full where clause excluding the word "WHERE" from // the existing query. preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause); - + $discard = false; // not a good hack, improvements? if ($whereClause) { @@ -725,12 +724,12 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976 } else $whereClause = array(false,false); - + if ($discard) $whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1])); - + $sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2); - if (strlen($whereClause[1]) > 0) + if (strlen($whereClause[1]) > 0) $sql .= ' WHERE '.$whereClause[1]; return $sql; @@ -757,8 +756,8 @@ function adodb_key_exists($key, &$arr,$force=2) * There is a special case of this function for the oci8 driver. * The proper way to handle an insert w/ a blob in oracle requires * a returning clause with bind variables and a descriptor blob. - * - * + * + * */ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2) { @@ -773,19 +772,19 @@ static $cacheCols; $recordSet = null; $arrFields = _array_change_key_case($arrFields); $fieldInsertedCount = 0; - + if (is_string($rs)) { //ok we have a table name //try and get the column info ourself. - $tableName = $rs; - + $tableName = $rs; + //we need an object for the recordSet //because we have to call MetaType. //php can't do a $rsclass::MetaType() $rsclass = $zthis->rsPrefix.$zthis->databaseType; $recordSet = new $rsclass(-1,$zthis->fetchMode); $recordSet->connection = $zthis; - + if (is_string($cacheRS) && $cacheRS == $rs) { $columns = $cacheCols; } else { @@ -797,26 +796,26 @@ static $cacheCols; if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS == $rs->insertSig) { $columns = $cacheCols; } else { - for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) + for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) $columns[] = $rs->FetchField($i); $cacheRS = $cacheSig; $cacheCols = $columns; $rs->insertSig = $cacheSig++; } $recordSet = $rs; - + } else { printf(ADODB_BAD_RS,'GetInsertSQL'); return false; } // Loop through all of the fields in the recordset - foreach( $columns as $field ) { + foreach( $columns as $field ) { $upperfname = strtoupper($field->name); if (adodb_key_exists($upperfname,$arrFields,$force)) { $bad = false; if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) { - switch (ADODB_QUOTE_FIELDNAMES) { + switch ($ADODB_QUOTE_FIELDNAMES) { case 'LOWER': $fnameq = $zthis->nameQuote.strtolower($field->name).$zthis->nameQuote;break; case 'NATIVE': @@ -827,9 +826,9 @@ static $cacheCols; } } else $fnameq = $upperfname; - + $type = $recordSet->MetaType($field->type); - + /********************************************************/ if (is_null($arrFields[$upperfname]) || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0) @@ -841,11 +840,11 @@ static $cacheCols; case 0: // we must always set null if missing $bad = true; break; - + case 1: $values .= "null, "; break; - + case 2: //Set empty $arrFields[$upperfname] = ""; @@ -855,7 +854,7 @@ static $cacheCols; default: case 3: //Set the value that was given in array, so you can give both null and empty values - if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { + if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { $values .= "null, "; } else { $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq); @@ -866,18 +865,18 @@ static $cacheCols; /*********************************************************/ } else { //we do this so each driver can customize the sql for - //DB specific column types. + //DB specific column types. //Oracle needs BLOB types to be handled with a returning clause //postgres has special needs as well $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq); } - + if ($bad) continue; // Set the counter for the number of fields that will be inserted. $fieldInsertedCount++; - - + + // Get the name of the fields to insert $fields .= $fnameq . ", "; } @@ -886,15 +885,15 @@ static $cacheCols; // If there were any inserted fields then build the rest of the insert query. if ($fieldInsertedCount <= 0) return false; - + // Get the table name from the existing query. if (!$tableName) { if (!empty($rs->tableName)) $tableName = $rs->tableName; else if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName)) $tableName = $tableName[1]; - else + else return false; - } + } // Strip off the comma and space on the end of both the fields // and their values. @@ -911,20 +910,20 @@ static $cacheCols; * the update/sql which is generated by GetInsertSQL and GetUpdateSQL. * It handles the string construction of 1 column -> sql string based on * the column type. We want to do 'safe' handling of BLOBs - * + * * @param string the type of sql we are trying to create - * 'I' or 'U'. - * @param string column data type from the db::MetaType() method + * 'I' or 'U'. + * @param string column data type from the db::MetaType() method * @param string the column name * @param array the column value - * + * * @return string - * + * */ -function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq) +function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq) { $sql = ''; - + // Based on the datatype of the field // Format the value properly for the database switch($type) { @@ -932,7 +931,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie //in order to handle Blobs correctly, we need //to do some magic for Oracle - //we need to create a new descriptor to handle + //we need to create a new descriptor to handle //this properly if (!empty($zthis->hasReturningInto)) { if ($action == 'I') { @@ -949,7 +948,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie $sql = 'empty_blob(), '; } else { $sql = $fnameq. '=empty_blob(), '; - } + } } else { //this is to maintain compatibility //with older adodb versions. @@ -965,7 +964,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie //to avoid conflicts w/ dupes. if (!empty($zthis->hasReturningInto)) { if ($action == 'I') { - $sql = ':xx'.$fname.'xx, '; + $sql = ':xx'.$fname.'xx, '; } else { $sql = $fnameq.'=:xx'.$fname.'xx, '; } @@ -977,18 +976,18 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie //this is to maintain compatibility //with older adodb versions. $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); - } + } break; - + default: $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); break; } - + return $sql; -} - -function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true) +} + +function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true) { if ($recurse) { @@ -998,10 +997,10 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, break; case 'oci8': return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq); - + } } - + switch($type) { case "C": case "X": @@ -1016,7 +1015,7 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, case "T": $val = $zthis->DBTimeStamp($arrFields[$fname]); break; - + case "N": $val = $arrFields[$fname]; if (!is_numeric($val)) $val = str_replace(',', '.', (float)$val); @@ -1035,10 +1034,10 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, } if ($action == 'I') return $val . ", "; - - + + return $fnameq . "=" . $val . ", "; - + } @@ -1061,7 +1060,7 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr) */ // check if running from browser or command-line $inBrowser = isset($_SERVER['HTTP_USER_AGENT']); - + $dbt = $zthis->databaseType; if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType; if ($inBrowser) { @@ -1079,31 +1078,31 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr) } $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') { + 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()) { - if ($zthis->debug === -99) + if ($zthis->debug === -99) ADOConnection::outp( "

\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); - + ADOConnection::outp($err.': '.$emsg); } } } else if (!$qID) { - - if ($zthis->debug === -99) + + if ($zthis->debug === -99) if ($inBrowser) ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); else ADOConnection::outp("-----
\n($dbt): ".$sqlTxt."$ss\n-----
\n",false); - + ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg()); } - + if ($zthis->debug === 99) _adodb_backtrace(true,9999,2); return $qID; } @@ -1112,27 +1111,27 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr) function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0,$ishtml=null) { if (!function_exists('debug_backtrace')) return ''; - + if ($ishtml === null) $html = (isset($_SERVER['HTTP_USER_AGENT'])); else $html = $ishtml; - + $fmt = ($html) ? " %% line %4d, file: %s" : "%% line %4d, file: %s"; $MAXSTRLEN = 128; $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) {
 		if ($skippy) {$skippy -= 1; continue;}
 		$levels -= 1;
 		if ($levels < 0) break;
-		
+
 		$args = array();
 		for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? '   ' : "\t";
 		$tabs -= 1;
@@ -1152,30 +1151,30 @@ function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0,$ishtml=null)
 			}
 		}
 		$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; } /* -function _adodb_find_from($sql) +function _adodb_find_from($sql) { $sql = str_replace(array("\n","\r"), ' ', $sql); $charCount = strlen($sql); - + $inString = false; $quote = ''; $parentheseCount = 0; $prevChars = ''; $nextChars = ''; - + for($i = 0; $i < $charCount; $i++) { @@ -1205,5 +1204,3 @@ function _adodb_find_from($sql) } } */ - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-memcache.lib.inc.php b/lib/WikiDB/adodb/adodb-memcache.lib.inc.php index 23b18fcbd..6e0040d3a 100644 --- a/lib/WikiDB/adodb/adodb-memcache.lib.inc.php +++ b/lib/WikiDB/adodb/adodb-memcache.lib.inc.php @@ -9,18 +9,18 @@ $ADODB_INCLUDED_MEMCACHE = 1; global $ADODB_INCLUDED_CSV; if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php'); -/* +/* - V5.18 3 Sep 2012 (c) 2000-2012 John Lim (jlim#natsoft.com). 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. + V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). 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. Set tabs to 4 for best viewing. - + Latest version is available at http://adodb.sourceforge.net Usage: - + $db = NewADOConnection($driver); $db->memCache = true; /// should we use memCache instead of caching in files $db->memCacheHost = array($ip1, $ip2, $ip3); @@ -29,32 +29,32 @@ $db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses $db->Connect(...); $db->CacheExecute($sql); - + Note the memcache class is shared by all connections, is created during the first call to Connect/PConnect. - + Class instance is stored in $ADODB_CACHE */ class ADODB_Cache_MemCache { var $createdir = false; // create caching directory structure? - + //----------------------------- // memcache specific variables - + var $hosts; // array of hosts var $port = 11211; var $compress = false; // memcache compression with zlib - + var $_connected = false; var $_memcache = false; - + function ADODB_Cache_MemCache(&$obj) { $this->hosts = $obj->memCacheHost; $this->port = $obj->memCachePort; $this->compress = $obj->memCacheCompress; } - + // implement as lazy connection. The connection only occurs on CacheExecute call function connect(&$err) { @@ -64,9 +64,9 @@ $db->CacheExecute($sql); } $memcache = new MemCache; - + if (!is_array($this->hosts)) $this->hosts = array($this->hosts); - + $failcnt = 0; foreach($this->hosts as $host) { if (!@$memcache->addServer($host,$this->port,true)) { @@ -81,7 +81,7 @@ $db->CacheExecute($sql); $this->_memcache = $memcache; return true; } - + // returns true or false. true if successful save function writecache($filename, $contents, $debug, $secs2cache) { @@ -90,43 +90,43 @@ $db->CacheExecute($sql); if (!$this->connect($err) && $debug) ADOConnection::outp($err); } if (!$this->_memcache) return false; - + if (!$this->_memcache->set($filename, $contents, $this->compress ? MEMCACHE_COMPRESSED : 0, $secs2cache)) { if ($debug) ADOConnection::outp(" Failed to save data at the memcached server!
\n"); return false; } - + return true; } - + // returns a recordset function readcache($filename, &$err, $secs2cache, $rsClass) { $false = false; if (!$this->_connected) $this->connect($err); if (!$this->_memcache) return $false; - + $rs = $this->_memcache->get($filename); if (!$rs) { $err = 'Item with such key doesn\'t exists on the memcached server.'; return $false; } - + // hack, should actually use _csv2rs $rs = explode("\n", $rs); unset($rs[0]); $rs = join("\n", $rs); $rs = unserialize($rs); if (! is_object($rs)) { - $err = 'Unable to unserialize $rs'; + $err = 'Unable to unserialize $rs'; return $false; } if ($rs->timeCreated == 0) return $rs; // apparently have been reports that timeCreated was set to 0 somewhere - + $tdiff = intval($rs->timeCreated+$secs2cache - time()); if ($tdiff <= 2) { switch($tdiff) { - case 2: + case 2: if ((rand() & 15) == 0) { $err = "Timeout 2"; return $false; @@ -138,14 +138,14 @@ $db->CacheExecute($sql); return $false; } break; - default: + default: $err = "Timeout 0"; return $false; } } return $rs; } - + function flushall($debug=false) { if (!$this->_connected) { @@ -153,38 +153,36 @@ $db->CacheExecute($sql); if (!$this->connect($err) && $debug) ADOConnection::outp($err); } if (!$this->_memcache) return false; - + $del = $this->_memcache->flush(); - - if ($debug) + + if ($debug) if (!$del) ADOConnection::outp("flushall: failed!
\n"); else ADOConnection::outp("flushall: succeeded!
\n"); - + return $del; } - + function flushcache($filename, $debug=false) { if (!$this->_connected) { $err = ''; - if (!$this->connect($err) && $debug) ADOConnection::outp($err); - } + if (!$this->connect($err) && $debug) ADOConnection::outp($err); + } if (!$this->_memcache) return false; - + $del = $this->_memcache->delete($filename); - - if ($debug) + + if ($debug) if (!$del) ADOConnection::outp("flushcache: $key entry doesn't exist on memcached server!
\n"); else ADOConnection::outp("flushcache: $key entry flushed from memcached server!
\n"); - + return $del; } - + // not used for memcache - function createdir($dir, $hash) + function createdir($dir, $hash) { return true; } } - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-pager.inc.php b/lib/WikiDB/adodb/adodb-pager.inc.php index 317d57330..a08ced46e 100644 --- a/lib/WikiDB/adodb/adodb-pager.inc.php +++ b/lib/WikiDB/adodb/adodb-pager.inc.php @@ -1,22 +1,22 @@ implemented Render_PageLinks(). - - Please note, this class is entirely unsupported, + + Please note, this class is entirely unsupported, and no free support requests except for bug reports will be entertained by the author. @@ -29,10 +29,10 @@ class ADODB_Pager { var $curr_page; // current page number before Render() called, calculated in constructor var $rows; // number of rows per page var $linksPerPage=10; // number of links per page in navigation bar - var $showPageLinks; + var $showPageLinks; var $gridAttributes = 'width=100% border=1 bgcolor=white'; - + // Localize text strings here var $first = '|<'; var $prev = '<<'; @@ -45,39 +45,39 @@ class ADODB_Pager { var $page = 'Page'; var $linkSelectedColor = 'red'; var $cache = 0; #secs to cache with CachePageExecute() - + //---------------------------------------------- // constructor // // $db adodb connection object // $sql sql statement - // $id optional id to identify which pager, - // if you have multiple on 1 page. + // $id optional id to identify which pager, + // if you have multiple on 1 page. // $id should be only be [a-z0-9]* // function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false) { global $PHP_SELF; - + $curr_page = $id.'_curr_page'; if (!empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks - + $this->sql = $sql; $this->id = $id; $this->db = $db; $this->showPageLinks = $showPageLinks; - - $next_page = $id.'_next_page'; - + + $next_page = $id.'_next_page'; + if (isset($_GET[$next_page])) { $_SESSION[$curr_page] = (integer) $_GET[$next_page]; } if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page - + $this->curr_page = $_SESSION[$curr_page]; - + } - + //--------------------------- // Display link to first page function Render_First($anchor=true) @@ -85,51 +85,51 @@ class ADODB_Pager { global $PHP_SELF; if ($anchor) { ?> - first;?>   + first;?>   first   "; } } - + //-------------------------- // Display link to next page function render_next($anchor=true) { global $PHP_SELF; - + if ($anchor) { ?> - next;?>   + next;?>   next   "; } } - + //------------------ // Link to last page - // + // // for better performance with large recordsets, you can set // $this->db->pageExecuteCountRows = false, which disables // last page counting. function render_last($anchor=true) { global $PHP_SELF; - + if (!$this->db->pageExecuteCountRows) return; - + if ($anchor) { ?> - last;?>   + last;?>   last   "; } } - + //--------------------------------------------------- - // original code by "Pablo Costa" + // original code by "Pablo Costa" function render_pagelinks() { global $PHP_SELF; @@ -146,21 +146,21 @@ class ADODB_Pager { $end = $start+$linksperpage-1; $link = $this->id . "_next_page"; if($end > $pages) $end = $pages; - - + + if ($this->startLinks && $start > 1) { $pos = $start - 1; $numbers .= "$this->startLinks "; - } - + } + for($i=$start; $i <= $end; $i++) { if ($this->rs->AbsolutePage() == $i) $numbers .= "linkSelectedColor>$i "; - else + else $numbers .= "$i "; - + } - if ($this->moreLinks && $end < $pages) + if ($this->moreLinks && $end < $pages) $numbers .= "$this->moreLinks "; print $numbers . '   '; } @@ -170,13 +170,13 @@ class ADODB_Pager { global $PHP_SELF; if ($anchor) { ?> - prev;?>   - id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>">prev;?>   + prev   "; } } - + //-------------------------------------------------------- // Simply rendering of grid. You should override this for // better control over the format of the grid @@ -193,7 +193,7 @@ class ADODB_Pager { ob_end_clean(); return $s; } - + //------------------------------------------------------- // Navigation bar // @@ -222,7 +222,7 @@ class ADODB_Pager { ob_end_clean(); return $s; } - + //------------------- // This is the footer function RenderPageCount() @@ -233,17 +233,17 @@ class ADODB_Pager { if ($this->curr_page > $lastPage) $this->curr_page = 1; return "$this->page ".$this->curr_page."/".$lastPage.""; } - + //----------------------------------- // Call this class to draw everything. function Render($rows=10) { global $ADODB_COUNTRECS; - + $this->rows = $rows; - + if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL; - + $savec = $ADODB_COUNTRECS; if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true; if ($this->cache) @@ -251,27 +251,27 @@ class ADODB_Pager { else $rs = $this->db->PageExecute($this->sql,$rows,$this->curr_page); $ADODB_COUNTRECS = $savec; - + $this->rs = $rs; if (!$rs) { print "

Query failed: $this->sql

"; return; } - - if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) + + if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) $header = $this->RenderNav(); else $header = " "; - + $grid = $this->RenderGrid(); $footer = $this->RenderPageCount(); - + $this->RenderLayout($header,$grid,$footer); - + $rs->Close(); $this->rs = false; } - + //------------------------------------------------------ // override this to control overall layout and formating function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige') @@ -285,6 +285,3 @@ class ADODB_Pager { ""; } } - - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-pear.inc.php b/lib/WikiDB/adodb/adodb-pear.inc.php index 59bbce5f7..49ba93614 100644 --- a/lib/WikiDB/adodb/adodb-pear.inc.php +++ b/lib/WikiDB/adodb/adodb-pear.inc.php @@ -1,12 +1,12 @@ | @@ -15,7 +15,7 @@ /* We support: - + DB_Common --------- query - returns PEAR_Error on error @@ -27,13 +27,13 @@ quote nextID disconnect - + getOne getAssoc getRow getCol getAll - + DB_Result --------- numRows - returns -1 if not supported @@ -42,7 +42,7 @@ fetchRows - does not support passing of fetchmode free */ - + define('ADODB_PEAR',dirname(__FILE__)); include_once "PEAR.php"; include_once ADODB_PEAR."/adodb-errorpear.inc.php"; @@ -183,10 +183,10 @@ class DB if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket']; else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port']; - + if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); else $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); - + if (!$ok) $obj = ADODB_PEAR_Error(); return $obj; } @@ -212,7 +212,7 @@ class DB { if (!is_object($value)) return false; $class = strtolower(get_class($value)); - return $class == 'pear_error' || is_subclass_of($value, 'pear_error') || + return $class == 'pear_error' || is_subclass_of($value, 'pear_error') || $class == 'db_error' || is_subclass_of($value, 'db_error'); } @@ -370,5 +370,3 @@ class DB return true; } } - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/adodb-perf.inc.php b/lib/WikiDB/adodb/adodb-perf.inc.php index e1930f7fb..8e6e6cc72 100644 --- a/lib/WikiDB/adodb/adodb-perf.inc.php +++ b/lib/WikiDB/adodb/adodb-perf.inc.php @@ -1,19 +1,19 @@ =2) return (integer) $memarr[1]; - + return 0; } @@ -74,7 +74,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr) if (!empty($connx->_logsql) && (empty($connx->_logsqlErrors) || !$rs)) { global $ADODB_LOG_CONN; - + if (!empty($ADODB_LOG_CONN)) { $conn = $ADODB_LOG_CONN; if ($conn->databaseType != $connx->databaseType) @@ -85,12 +85,12 @@ function adodb_log_sql(&$connx,$sql,$inputarr) $conn = $connx; $prefix = ''; } - + $conn->_logsql = false; // disable logsql error simulation $dbT = $conn->databaseType; - + $time = $a1 - $a0; - + if (!$rs) { $errM = $connx->ErrorMsg(); $errN = $connx->ErrorNo(); @@ -102,7 +102,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr) $errN = 0; $dbg = $conn->debug; $conn->debug = false; - if (!is_object($rs) || $rs->dataProvider == 'empty') + if (!is_object($rs) || $rs->dataProvider == 'empty') $conn->_affected = $conn->affected_rows(true); $conn->lastInsID = @$conn->Insert_ID(); $conn->debug = $dbg; @@ -110,12 +110,12 @@ function adodb_log_sql(&$connx,$sql,$inputarr) if (isset($_SERVER['HTTP_HOST'])) { $tracer .= '
'.$_SERVER['HTTP_HOST']; if (isset($_SERVER['PHP_SELF'])) $tracer .= htmlspecialchars($_SERVER['PHP_SELF']); - } else + } else if (isset($_SERVER['PHP_SELF'])) $tracer .= '
'.htmlspecialchars($_SERVER['PHP_SELF']); //$tracer .= (string) adodb_backtrace(false); - + $tracer = (string) substr($tracer,0,500); - + if (is_array($inputarr)) { if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr); else { @@ -132,7 +132,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr) } else { $params = ''; } - + if (is_array($sql)) $sql = $sql[0]; if ($prefix) $sql = $prefix.$sql; $arr = array('b'=>strlen($sql).'.'.crc32($sql), @@ -140,7 +140,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr) //var_dump($arr); $saved = $conn->debug; $conn->debug = 0; - + $d = $conn->sysTimeStamp; if (empty($d)) $d = date("'Y-m-d H:i:s'"); if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') { @@ -153,7 +153,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr) $sql2 = $conn->qstr($arr['c']); $params = $conn->qstr($arr['d']); $tracer = $conn->qstr($arr['e']); - + $isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)"; if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql); $arr = false; @@ -161,17 +161,17 @@ function adodb_log_sql(&$connx,$sql,$inputarr) if ($dbT == 'db2') $arr['f'] = (float) $arr['f']; $isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)"; } - + global $ADODB_PERF_MIN; if ($errN != 0 || $time >= $ADODB_PERF_MIN) { $ok = $conn->Execute($isql,$arr); } else $ok = true; - + $conn->debug = $saved; - + if ($ok) { - $conn->_logsql = true; + $conn->_logsql = true; } else { $err2 = $conn->ErrorMsg(); $conn->_logsql = true; // enable logsql error simulation @@ -181,7 +181,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr) } else { $ok = $conn->Execute("create table $perf_table ( created varchar(50), - sql0 varchar(250), + sql0 varchar(250), sql1 varchar(4000), params varchar(3000), tracer varchar(500), @@ -194,12 +194,12 @@ function adodb_log_sql(&$connx,$sql,$inputarr) } $connx->_errorMsg = $errM; $connx->_errorCode = $errN; - } + } $connx->fnExecute = 'adodb_log_sql'; return $rs; } - + /* The settings data structure is an associative array that database parameter per element. @@ -207,9 +207,9 @@ Each database parameter element in the array is itself an array consisting of: 0: category code, used to group related db parameters 1: either - a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", + a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", b. array holding sql string and field to look for, e.g. array('show variables','table_cache'), - c. a string prefixed by =, then a PHP method of the class is invoked, + c. a string prefixed by =, then a PHP method of the class is invoked, e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue', 2: description of the database parameter */ @@ -227,8 +227,8 @@ class adodb_perf { var $helpurl = "LogSQL help"; var $createTableSQL = false; var $maxLength = 2000; - - // Sets the tablename to be used + + // Sets the tablename to be used static function table($newtable = false) { static $_table; @@ -263,20 +263,20 @@ processes 69293 if (PHP_VERSION == '5.0.2') return false; if (PHP_VERSION == '5.0.3') return false; if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737 - + static $FAIL = false; if ($FAIL) return false; - - $objName = "winmgmts:{impersonationLevel=impersonate}!\\\\.\\root\\CIMV2"; + + $objName = "winmgmts:{impersonationLevel=impersonate}!\\\\.\\root\\CIMV2"; $myQuery = "SELECT * FROM Win32_PerfFormattedData_PerfOS_Processor WHERE Name = '_Total'"; - + try { @$objWMIService = new COM($objName); if (!$objWMIService) { $FAIL = true; return false; } - + $info[0] = -1; $info[1] = 0; $info[2] = 0; @@ -284,23 +284,23 @@ processes 69293 foreach($objWMIService->ExecQuery($myQuery) as $objItem) { $info[0] = $objItem->PercentProcessorTime(); } - + } catch(Exception $e) { $FAIL = true; echo $e->getMessage(); return false; } - + return $info; } - + // Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com) $statfile = '/proc/stat'; if (!file_exists($statfile)) return false; - + $fd = fopen($statfile,"r"); if (!$fd) return false; - + $statinfo = explode("\n",fgets($fd, 1024)); fclose($fd); foreach($statinfo as $line) { @@ -311,11 +311,11 @@ processes 69293 return $info; } } - + return false; - + } - + /* NOT IMPLEMENTED */ function MemInfo() { @@ -343,8 +343,8 @@ SwapFree: 2085664 kB Committed_AS: 348732 kB */ } - - + + /* Remember that this is client load, not db server load! */ @@ -353,7 +353,7 @@ Committed_AS: 348732 kB { $info = $this->_CPULoad(); if (!$info) return false; - + if (strncmp(PHP_OS,'WIN',3)==0) { return (integer) $info[0]; }else { @@ -362,38 +362,38 @@ Committed_AS: 348732 kB $this->_lastLoad = $info; $info = $this->_CPULoad(); } - + $last = $this->_lastLoad; $this->_lastLoad = $info; - + $d_user = $info[0] - $last[0]; $d_nice = $info[1] - $last[1]; $d_system = $info[2] - $last[2]; $d_idle = $info[3] - $last[3]; - + //printf("Delta - User: %f Nice: %f System: %f Idle: %f
",$d_user,$d_nice,$d_system,$d_idle); - + $total=$d_user+$d_nice+$d_system+$d_idle; if ($total<1) $total=1; - return 100*($d_user+$d_nice+$d_system)/$total; + return 100*($d_user+$d_nice+$d_system)/$total; } } - + function Tracer($sql) { $perf_table = adodb_perf::table(); $saveE = $this->conn->fnExecute; $this->conn->fnExecute = false; - + global $ADODB_FETCH_MODE; $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); - + $sqlq = $this->conn->qstr($sql); $arr = $this->conn->GetArray( -"select count(*),tracer - from $perf_table where sql1=$sqlq +"select count(*),tracer + from $perf_table where sql1=$sqlq group by tracer order by 1 desc"); $s = ''; @@ -403,26 +403,26 @@ Committed_AS: 348732 kB $s .= sprintf("%4d",$k[0]).'   '.strip_tags($k[1]).'
'; } } - + if (isset($savem)) $this->conn->SetFetchMode($savem); $ADODB_CACHE_MODE = $save; $this->conn->fnExecute = $saveE; return $s; } - /* + /* Explain Plan for $sql. - If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the + If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the actual sql. */ function Explain($sql,$partial=false) - { + { return false; } - + function InvalidSQL($numsql = 10) { - + if (isset($_GET['sql'])) return; $s = '

Invalid SQL

'; $saveE = $this->conn->fnExecute; @@ -434,30 +434,30 @@ Committed_AS: 348732 kB $s .= rs2html($rs,false,false,false,false); } else return "

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

"; - + return $s; } - + /* This script identifies the longest running SQL - */ + */ function _SuspiciousSQL($numsql = 10) { global $ADODB_FETCH_MODE; - + $perf_table = adodb_perf::table(); $saveE = $this->conn->fnExecute; $this->conn->fnExecute = false; - + if (isset($_GET['exps']) && isset($_GET['sql'])) { $partial = !empty($_GET['part']); echo "".$this->Explain($_GET['sql'],$partial)."\n"; } - + if (isset($_GET['sql'])) return; $sql1 = $this->sql1; - + $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); @@ -472,7 +472,7 @@ Committed_AS: 348732 kB if (isset($savem)) $this->conn->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; $this->conn->fnExecute = $saveE; - + if (!$rs) return "

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

"; $s = "

Suspicious SQL

The following SQL have high average execution times
@@ -496,15 +496,15 @@ Committed_AS: 348732 kB $rs->MoveNext(); } return $s.""; - + } - + function CheckMemory() { return ''; } - - + + function SuspiciousSQL($numsql=10) { return adodb_perf::_SuspiciousSQL($numsql); @@ -515,32 +515,32 @@ Committed_AS: 348732 kB return adodb_perf::_ExpensiveSQL($numsql); } - + /* - This reports the percentage of load on the instance due to the most - expensive few SQL statements. Tuning these statements can often - make huge improvements in overall system performance. + This reports the percentage of load on the instance due to the most + expensive few SQL statements. Tuning these statements can often + make huge improvements in overall system performance. */ function _ExpensiveSQL($numsql = 10) { global $ADODB_FETCH_MODE; - + $perf_table = adodb_perf::table(); $saveE = $this->conn->fnExecute; $this->conn->fnExecute = false; - + if (isset($_GET['expe']) && isset($_GET['sql'])) { $partial = !empty($_GET['part']); echo "".$this->Explain($_GET['sql'],$partial)."\n"; } - + if (isset($_GET['sql'])) return; - + $sql1 = $this->sql1; $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); - + $rs = $this->conn->SelectLimit( "select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer from $perf_table @@ -576,7 +576,7 @@ Committed_AS: 348732 kB } return $s.""; } - + /* Raw function to return parameter value from $settings. */ @@ -586,7 +586,7 @@ Committed_AS: 348732 kB $sql = $this->settings[$param][1]; return $this->_DBParameter($sql); } - + /* Raw function returning array of poll paramters */ @@ -598,7 +598,7 @@ Committed_AS: 348732 kB $arr[3] = (integer) $this->DBParameter('current connections'); return $arr; } - + /* Low-level Get Database Parameter */ @@ -607,7 +607,7 @@ Committed_AS: 348732 kB $savelog = $this->conn->LogSQL(false); if (is_array($sql)) { global $ADODB_FETCH_MODE; - + $sql1 = $sql[0]; $key = $sql[1]; if (sizeof($sql)>2) $pos = $sql[2]; @@ -618,9 +618,9 @@ Committed_AS: 348732 kB $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); - + $rs = $this->conn->Execute($sql1); - + if (isset($savem)) $this->conn->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; if ($rs) { @@ -645,21 +645,21 @@ Committed_AS: 348732 kB $sql = str_replace('$DATABASE',$this->conn->database,$sql); $ret = $this->conn->GetOne($sql); $this->conn->LogSQL($savelog); - + return $ret; } } - + /* Warn if cache ratio falls below threshold. Displayed in "Description" column. */ function WarnCacheRatio($val) { - if ($val < $this->warnRatio) + if ($val < $this->warnRatio) return 'Cache ratio should be at least '.$this->warnRatio.'%'; else return ''; } - + function clearsql() { $perf_table = adodb_perf::table(); @@ -669,54 +669,54 @@ Committed_AS: 348732 kB // HIGH LEVEL UI FUNCTIONS /***********************************************************************************************/ - + function UI($pollsecs=5) { global $ADODB_LOG_CONN; - + $perf_table = adodb_perf::table(); $conn = $this->conn; - + $app = $conn->host; if ($conn->host && $conn->database) $app .= ', db='; $app .= $conn->database; - + if ($app) $app .= ', '; - $savelog = $this->conn->LogSQL(false); + $savelog = $this->conn->LogSQL(false); $info = $conn->ServerInfo(); if (isset($_GET['clearsql'])) { $this->clearsql(); } $this->conn->LogSQL($savelog); - + // magic quotes - + if (isset($_GET['sql']) && get_magic_quotes_gpc()) { $_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']); } - + if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10; else $nsql = $_SESSION['ADODB_PERF_SQL']; - + $app .= $info['description']; - - + + if (isset($_GET['do'])) $do = $_GET['do']; else if (isset($_POST['do'])) $do = $_POST['do']; else if (isset($_GET['sql'])) $do = 'viewsql'; else $do = 'stats'; - + if (isset($_GET['nsql'])) { if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql']; } echo "ADOdb Performance Monitor on $app"; if ($do == 'viewsql') $form = "
# SQL:
"; else $form = " "; - + $allowsql = !defined('ADODB_PERF_NO_RUN_SQL'); global $ADODB_PERF_MIN; $app .= " (Min sql timing \$ADODB_PERF_MIN=$ADODB_PERF_MIN secs)"; - + if (empty($_GET['hidem'])) echo "
ADOdb Performance Monitor for $app
@@ -726,7 +726,7 @@ Committed_AS: 348732 kB "$form", "
"; - + switch ($do) { default: case 'stats': @@ -734,21 +734,21 @@ Committed_AS: 348732 kB echo "

  Clear SQL Log
"; echo $this->HealthCheck(); //$this->conn->debug=1; - echo $this->CheckMemory(); + echo $this->CheckMemory(); break; case 'poll': $self = htmlspecialchars($_SERVER['PHP_SELF']); - echo ""; break; case 'poll2': echo "

";
 			$this->Poll($pollsecs);
 			break;
-		
+
 		case 'dosql':
 			if (!$allowsql) break;
-			
+
 			$this->DoSQLForm();
 			break;
 		case 'viewsql':
@@ -758,13 +758,13 @@ Committed_AS:   348732 kB
 			echo($this->ExpensiveSQL($nsql));
 			echo($this->InvalidSQL($nsql));
 			break;
-		case 'tables': 
+		case 'tables':
 			echo $this->Tables(); break;
 		}
 		global $ADODB_vers;
 		echo "
$ADODB_vers Sponsored by phpLens
";
 	}
-	
+
 	/*
 		Runs in infinite loop, returning real-time statistics
 	*/
@@ -781,12 +781,12 @@ Committed_AS:   348732 kB
 		while (1) {
 
 			$arr = $this->PollParameters();
-			
+
 			$hits   = sprintf('%2.2f',$arr[0]);
 			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
 			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
 			$sess = sprintf('%5d',$arr[3]);
-			
+
 			$load = $this->CPULoad();
 			if ($load !== false) {
 				$oslabel = 'WS-CPU%';
@@ -795,18 +795,18 @@ Committed_AS:   348732 kB
 				$oslabel = '';
 				$osval = '';
 			}
-			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
+			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n";
 			$cnt += 1;
 			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
 			flush();
-			
+
 			if (connection_aborted()) return;
-			
+
 			sleep($secs);
 			$arro = $arr;
 		}
 	}
-	
+
 	/*
 		Returns basic health check in a command line interface
 	*/
@@ -814,48 +814,48 @@ Committed_AS:   348732 kB
 	{
 		return $this->HealthCheck(true);
 	}
-	
-		
+
+
 	/*
 		Returns basic health check as HTML
 	*/
 	function HealthCheck($cli=false)
 	{
 		$saveE = $this->conn->fnExecute;
-		$this->conn->fnExecute = false;	
+		$this->conn->fnExecute = false;
 		if ($cli) $html = '';
 		else $html = $this->table.'
'.$this->conn->databaseType.'
'.$this->titles;
-		
+
 		$oldc = false;
 		$bgc = '';
 		foreach($this->settings as $name => $arr) {
 			if ($arr === false) break;
-			
+
 			if (!is_string($name)) {
 				if ($cli) $html .= " -- $arr -- \n";
 				else $html .= "color>$arr  ";
 				continue;
 			}
-			
+
 			if (!is_array($arr)) break;
 			$category = $arr[0];
 			$how = $arr[1];
 			if (sizeof($arr)>2) $desc = $arr[2];
 			else $desc = '   ';
-			
-			
+
+
 			if ($category == 'HIDE') continue;
-			
+
 			$val = $this->_DBParameter($how);
-			
+
 			if ($desc && strncmp($desc,"=",1) === 0) {
 				$fn = substr($desc,1);
 				$desc = $this->$fn($val);
 			}
-			
+
 			if ($val === false) {
 				$m = $this->conn->ErrorMsg();
-				$val = "Error: $m"; 
+				$val = "Error: $m";
 			} else {
 				if (is_numeric($val) && $val >= 256*1024) {
 					if ($val % (1024*1024) == 0) {
@@ -876,34 +876,34 @@ Committed_AS:   348732 kB
 			if (strlen($val)==0) $val = ' ';
 			if ($cli) {
 				$html  .= str_replace(' ','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
-				
+
 			}else {
 				$html .= "".$name.''.$val.''.$desc."\n";
 			}
 		}
-		
+
 		if (!$cli) $html .= "\n";
 		$this->conn->fnExecute = $saveE;
-			
-		return $html;	
+
+		return $html;
 	}
-	
+
 	function Tables($orderby='1')
 	{
 		if (!$this->tablesSQL) return false;
-		
+
 		$savelog = $this->conn->LogSQL(false);
 		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
 		$this->conn->LogSQL($savelog);
 		$html = rs2html($rs,false,false,false,false);
 		return $html;
 	}
-	
+
 
 	function CreateLogTable()
 	{
 		if (!$this->createTableSQL) return false;
-		
+
 		$table = $this->table();
 		$sql = str_replace('adodb_logsql',$table,$this->createTableSQL);
 		$savelog = $this->conn->LogSQL(false);
@@ -911,17 +911,17 @@ Committed_AS:   348732 kB
 		$this->conn->LogSQL($savelog);
 		return ($ok) ? true : false;
 	}
-	
+
 	function DoSQLForm()
 	{
-	
-		
+
+
 		$PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']);
 		$sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';
 
 		if (isset($_SESSION['phplens_sqlrows'])) $rows = $_SESSION['phplens_sqlrows'];
 		else $rows = 3;
-		
+
 		if (isset($_REQUEST['SMALLER'])) {
 			$rows /= 2;
 			if ($rows < 3) $rows = 3;
@@ -931,7 +931,7 @@ Committed_AS:   348732 kB
 			$rows *= 2;
 			$_SESSION['phplens_sqlrows'] = $rows;
 		}
-		
+
 ?>
 
 

@@ -950,7 +950,7 @@ Committed_AS:   348732 kB
 
 undomq(trim($sql));
 		if (substr($sql,strlen($sql)-1) === ';') {
 			$print = true;
@@ -962,7 +962,7 @@ Committed_AS:   348732 kB
 		foreach($sqla as $sqls) {
 
 			if (!$sqls) continue;
-			
+
 			if ($print) {
 				print "
".htmlspecialchars($sqls)."
";
 				flush();
@@ -988,14 +988,14 @@ Committed_AS:   348732 kB
 			}
 		} // foreach
 	}
-	
+
 	function SplitSQL($sql)
 	{
 		$arr = explode(';',$sql);
 		return $arr;
 	}
-	
-	function undomq($m) 
+
+	function undomq($m)
 	{
 	if (get_magic_quotes_gpc()) {
 		// undo the damage
@@ -1006,13 +1006,13 @@ Committed_AS:   348732 kB
 	return $m;
 }
 
-    
+
    /************************************************************************/
-   
-    /** 
+
+    /**
      * Reorganise multiple table-indices/statistics/..
      * OptimizeMode could be given by last Parameter
-     * 
+     *
      * @example
      *      
      *          optimizeTables( 'tableA');
@@ -1023,12 +1023,12 @@ Committed_AS:   348732 kB
      *      
      *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
      *      

-     * 
+     *
      * @param string table name of the table to optimize
      * @param int mode optimization-mode
-     *      ADODB_OPT_HIGH for full optimization 
+     *      ADODB_OPT_HIGH for full optimization
      *      ADODB_OPT_LOW for CPU-less optimization
-     *      Default is LOW ADODB_OPT_LOW 
+     *      Default is LOW ADODB_OPT_LOW
      * @author Markus Staab
      * @return Returns true on success and false on error
      */
@@ -1036,52 +1036,52 @@ Committed_AS:   348732 kB
     {
         $args = func_get_args();
         $numArgs = func_num_args();
-        
+
         if ( $numArgs == 0) return false;
-        
-        $mode = ADODB_OPT_LOW; 
+
+        $mode = ADODB_OPT_LOW;
         $lastArg = $args[ $numArgs - 1];
         if ( !is_string($lastArg)) {
             $mode = $lastArg;
             unset( $args[ $numArgs - 1]);
         }
-        
+
         foreach( $args as $table) {
             $this->optimizeTable( $table, $mode);
         }
 	}
 
-    /** 
+    /**
      * Reorganise the table-indices/statistics/.. depending on the given mode.
      * Default Implementation throws an error.
-     * 
+     *
      * @param string table name of the table to optimize
      * @param int mode optimization-mode
-     *      ADODB_OPT_HIGH for full optimization 
+     *      ADODB_OPT_HIGH for full optimization
      *      ADODB_OPT_LOW for CPU-less optimization
-     *      Default is LOW ADODB_OPT_LOW 
+     *      Default is LOW ADODB_OPT_LOW
      * @author Markus Staab
      * @return Returns true on success and false on error
      */
-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+    function OptimizeTable( $table, $mode = ADODB_OPT_LOW)
     {
         ADOConnection::outp( sprintf( "
%s: '%s' not implemented for driver '%s'
", __CLASS__, __FUNCTION__, $this->conn->databaseType));
         return false;
     }
-    
-    /** 
+
+    /**
      * Reorganise current database.
-     * Default implementation loops over all MetaTables() and 
+     * Default implementation loops over all MetaTables() and
      * optimize each using optmizeTable()
-     * 
+     *
      * @author Markus Staab
      * @return Returns true on success and false on error
      */
-    function optimizeDatabase() 
+    function optimizeDatabase()
     {
         $conn = $this->conn;
         if ( !$conn) return false;
-        
+
         $tables = $conn->MetaTables( 'TABLES');
         if ( !$tables ) return false;
 
@@ -1090,10 +1090,8 @@ Committed_AS:   348732 kB
                 return false;
             }
         }
-      
+
         return true;
     }
-    // end hack 
+    // end hack
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/adodb-php4.inc.php b/lib/WikiDB/adodb/adodb-php4.inc.php
index 283c51722..e9999835f 100644
--- a/lib/WikiDB/adodb/adodb-php4.inc.php
+++ b/lib/WikiDB/adodb/adodb-php4.inc.php
@@ -1,16 +1,14 @@
 
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/adodb-time.inc.php b/lib/WikiDB/adodb/adodb-time.inc.php
index e346dd716..c74778bb9 100644
--- a/lib/WikiDB/adodb/adodb-time.inc.php
+++ b/lib/WikiDB/adodb/adodb-time.inc.php
@@ -4,33 +4,33 @@ ADOdb Date Library, part of the ADOdb abstraction library
 Download: http://phplens.com/phpeverywhere/
 
 PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix 
-and 1970-2038 on Windows due to integer overflow for dates beyond 
-those years. This library overcomes these limitations by replacing the 
-native function's signed integers (normally 32-bits) with PHP floating 
+Because of this, dates are restricted to the years 1901-2038 on Unix
+and 1970-2038 on Windows due to integer overflow for dates beyond
+those years. This library overcomes these limitations by replacing the
+native function's signed integers (normally 32-bits) with PHP floating
 point numbers (normally 64-bits).
 
 Dates from 100 A.D. to 3000 A.D. and later
 have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the 
-future, but this is a theoretical limit as the computation of that year 
+2 => 4 digit year conversion. The maximum is billions of years in the
+future, but this is a theoretical limit as the computation of that year
 would take too long with the current implementation of adodb_mktime().
 
 This library replaces native functions as follows:
 
-
	
+
 	getdate()  with  adodb_getdate()
-	date()     with  adodb_date() 
+	date()     with  adodb_date()
 	gmdate()   with  adodb_gmdate()
 	mktime()   with  adodb_mktime()
 	gmmktime() with  adodb_gmmktime()
 	strftime() with  adodb_strftime()
 	strftime() with  adodb_gmstrftime()
 

-	
+
 The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT, 
-and date() will convert from GMT to local time, but daylight savings is 
+of date()'s field formats. Mktime() will convert from local time to GMT,
+and date() will convert from GMT to local time, but daylight savings is
 not handled currently.
 
 This library is independant of the rest of ADOdb, and can be used
@@ -39,25 +39,25 @@ as standalone code.
 PERFORMANCE
 
 For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside 
+possible, and only switches to PHP code when the dates fall outside
 the 32-bit signed integer range.
 
 GREGORIAN CORRECTION
 
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
-October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
-1582 (Gregorian). 
+Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
+October 4, 1582 (Julian) was followed immediately by Friday, October 15,
+1582 (Gregorian).
 
 Since 0.06, we handle this correctly, so:
 
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
+adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
 	== 24 * 3600 (1 day)
 
 =============================================================================
 
 COPYRIGHT
 
-(c) 2003-2005 John Lim and released under BSD-style license except for code by 
+(c) 2003-2014 John Lim and released under BSD-style license except for code by
 jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
 and originally found at http://www.php.net/manual/en/function.mktime.php
 
@@ -80,10 +80,10 @@ Returns the current time measured in the number of seconds since the Unix Epoch
 ** FUNCTION adodb_getdate($date=false)
 
 Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a 
-heuristic the first time adodb_getdate is called. 
-	 
-	 
+dates greater than 1901 to 2038. The local date/time format is derived from a
+heuristic the first time adodb_getdate is called.
+
+
 ** FUNCTION adodb_date($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted local date. If $timestamp is not defined, the
@@ -93,45 +93,45 @@ outside the 1901 to 2038 range.
 The format fields that adodb_date supports:
 
 
-	a - "am" or "pm" 
-	A - "AM" or "PM" 
-	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
-	D - day of the week, textual, 3 letters; e.g. "Fri" 
-	F - month, textual, long; e.g. "January" 
-	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
-	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
-	h - hour, 12-hour format; i.e. "01" to "12" 
-	H - hour, 24-hour format; i.e. "00" to "23" 
-	i - minutes; i.e. "00" to "59" 
-	j - day of the month without leading zeros; i.e. "1" to "31" 
-	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
-	L - boolean for whether it is a leap year; i.e. "0" or "1" 
-	m - month; i.e. "01" to "12" 
-	M - month, textual, 3 letters; e.g. "Jan" 
-	n - month without leading zeros; i.e. "1" to "12" 
-	O - Difference to Greenwich time in hours; e.g. "+0200" 
-	Q - Quarter, as in 1, 2, 3, 4 
-	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
-	s - seconds; i.e. "00" to "59" 
-	S - English ordinal suffix for the day of the month, 2 characters; 
-	   			i.e. "st", "nd", "rd" or "th" 
+	a - "am" or "pm"
+	A - "AM" or "PM"
+	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
+	D - day of the week, textual, 3 letters; e.g. "Fri"
+	F - month, textual, long; e.g. "January"
+	g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
+	G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
+	h - hour, 12-hour format; i.e. "01" to "12"
+	H - hour, 24-hour format; i.e. "00" to "23"
+	i - minutes; i.e. "00" to "59"
+	j - day of the month without leading zeros; i.e. "1" to "31"
+	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"
+	L - boolean for whether it is a leap year; i.e. "0" or "1"
+	m - month; i.e. "01" to "12"
+	M - month, textual, 3 letters; e.g. "Jan"
+	n - month without leading zeros; i.e. "1" to "12"
+	O - Difference to Greenwich time in hours; e.g. "+0200"
+	Q - Quarter, as in 1, 2, 3, 4
+	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200"
+	s - seconds; i.e. "00" to "59"
+	S - English ordinal suffix for the day of the month, 2 characters;
+	   			i.e. "st", "nd", "rd" or "th"
 	t - number of days in the given month; i.e. "28" to "31"
-	T - Timezone setting of this machine; e.g. "EST" or "MDT" 
-	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
-	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
-	Y - year, 4 digits; e.g. "1999" 
-	y - year, 2 digits; e.g. "99" 
-	z - day of the year; i.e. "0" to "365" 
-	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
-	   			The offset for timezones west of UTC is always negative, 
-				and for those east of UTC is always positive. 
+	T - Timezone setting of this machine; e.g. "EST" or "MDT"
+	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
+	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
+	Y - year, 4 digits; e.g. "1999"
+	y - year, 2 digits; e.g. "99"
+	z - day of the year; i.e. "0" to "365"
+	Z - timezone offset in seconds (i.e. "-43200" to "43200").
+	   			The offset for timezones west of UTC is always negative,
+				and for those east of UTC is always positive.
 

 
 Unsupported:
 
-	B - Swatch Internet time 
+	B - Swatch Internet time
 	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
-	W - ISO-8601 week number of year, weeks starting on Monday 
+	W - ISO-8601 week number of year, weeks starting on Monday
 
 

 
@@ -141,7 +141,7 @@ Same as adodb_date, but 2nd parameter accepts iso date, eg.
 
   adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
 
-  
+
 ** FUNCTION adodb_gmdate($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
@@ -166,7 +166,7 @@ Convert a timestamp to a formatted GMT date.
 
 ** FUNCTION adodb_strftime($fmt, $timestamp = false)
 
-Convert a timestamp to a formatted local date. Internally converts $fmt into 
+Convert a timestamp to a formatted local date. Internally converts $fmt into
 adodb_date format, then echo result.
 
 For best results, you can define the local date format yourself. Define a global
@@ -174,56 +174,56 @@ variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
 adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
 
     eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-	
+
 	Supported format codes:
 
 
-	%a - abbreviated weekday name according to the current locale 
-	%A - full weekday name according to the current locale 
-	%b - abbreviated month name according to the current locale 
-	%B - full month name according to the current locale 
-	%c - preferred date and time representation for the current locale 
-	%d - day of the month as a decimal number (range 01 to 31) 
-	%D - same as %m/%d/%y 
-	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') 
+	%a - abbreviated weekday name according to the current locale
+	%A - full weekday name according to the current locale
+	%b - abbreviated month name according to the current locale
+	%B - full month name according to the current locale
+	%c - preferred date and time representation for the current locale
+	%d - day of the month as a decimal number (range 01 to 31)
+	%D - same as %m/%d/%y
+	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31')
 	%h - same as %b
-	%H - hour as a decimal number using a 24-hour clock (range 00 to 23) 
-	%I - hour as a decimal number using a 12-hour clock (range 01 to 12) 
-	%m - month as a decimal number (range 01 to 12) 
-	%M - minute as a decimal number 
-	%n - newline character 
-	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale 
-	%r - time in a.m. and p.m. notation 
-	%R - time in 24 hour notation 
-	%S - second as a decimal number 
-	%t - tab character 
-	%T - current time, equal to %H:%M:%S 
-	%x - preferred date representation for the current locale without the time 
-	%X - preferred time representation for the current locale without the date 
-	%y - year as a decimal number without a century (range 00 to 99) 
-	%Y - year as a decimal number including the century 
-	%Z - time zone or name or abbreviation 
-	%% - a literal `%' character 
-
	
+	%H - hour as a decimal number using a 24-hour clock (range 00 to 23)
+	%I - hour as a decimal number using a 12-hour clock (range 01 to 12)
+	%m - month as a decimal number (range 01 to 12)
+	%M - minute as a decimal number
+	%n - newline character
+	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale
+	%r - time in a.m. and p.m. notation
+	%R - time in 24 hour notation
+	%S - second as a decimal number
+	%t - tab character
+	%T - current time, equal to %H:%M:%S
+	%x - preferred date representation for the current locale without the time
+	%X - preferred time representation for the current locale without the date
+	%y - year as a decimal number without a century (range 00 to 99)
+	%Y - year as a decimal number including the century
+	%Z - time zone or name or abbreviation
+	%% - a literal `%' character
+

 
 	Unsupported codes:
 
-	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) 
-	%g - like %G, but without the century. 
-	%G - The 4-digit year corresponding to the ISO week number (see %V). 
-	     This has the same format and value as %Y, except that if the ISO week number belongs 
-		 to the previous or next year, that year is used instead. 
-	%j - day of the year as a decimal number (range 001 to 366) 
-	%u - weekday as a decimal number [1,7], with 1 representing Monday 
-	%U - week number of the current year as a decimal number, starting 
-	    with the first Sunday as the first day of the first week 
-	%V - The ISO 8601:1988 week number of the current year as a decimal number, 
-	     range 01 to 53, where week 1 is the first week that has at least 4 days in the 
-		 current year, and with Monday as the first day of the week. (Use %G or %g for 
-		 the year component that corresponds to the week number for the specified timestamp.) 
-	%w - day of the week as a decimal, Sunday being 0 
-	%W - week number of the current year as a decimal number, starting with the 
-	     first Monday as the first day of the first week 
+	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99)
+	%g - like %G, but without the century.
+	%G - The 4-digit year corresponding to the ISO week number (see %V).
+	     This has the same format and value as %Y, except that if the ISO week number belongs
+		 to the previous or next year, that year is used instead.
+	%j - day of the year as a decimal number (range 001 to 366)
+	%u - weekday as a decimal number [1,7], with 1 representing Monday
+	%U - week number of the current year as a decimal number, starting
+	    with the first Sunday as the first day of the first week
+	%V - The ISO 8601:1988 week number of the current year as a decimal number,
+	     range 01 to 53, where week 1 is the first week that has at least 4 days in the
+		 current year, and with Monday as the first day of the week. (Use %G or %g for
+		 the year component that corresponds to the week number for the specified timestamp.)
+	%w - day of the week as a decimal, Sunday being 0
+	%W - week number of the current year as a decimal number, starting with the
+	     first Monday as the first day of the first week
 

 
 =============================================================================
@@ -233,10 +233,10 @@ NOTES
 Useful url for generating test timestamps:
 	http://www.4webhelp.net/us/timestamp.php
 
-Possible future optimizations include 
+Possible future optimizations include
 
-a. Using an algorithm similar to Plauger's in "The Standard C Library" 
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
+a. Using an algorithm similar to Plauger's in "The Standard C Library"
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
 work outside 32-bit signed range, so i decided not to implement it.
 
 b. Implement daylight savings, which looks awfully complicated, see
@@ -248,7 +248,7 @@ CHANGELOG
 Added adodb_time() which returns current time. If > 2038, will return as float
 
 - 7 Feb 2011 0.35
-Changed adodb_date to be symmetric with adodb_mktime. See $jan1_71. fix for bc. 
+Changed adodb_date to be symmetric with adodb_mktime. See $jan1_71. fix for bc.
 
 - 13 July 2010 0.34
 Changed adodb_get_gm_diff to use DateTimeZone().
@@ -257,24 +257,24 @@ Changed adodb_get_gm_diff to use DateTimeZone().
 * Bug in 0.32 fix for hour handling. Fixed.
 
 - 1 Feb 2008 0.32
-* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly. 
+* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly.
 
 - 10 Jan 2008 0.31
 * Now adodb_mktime(0,0,0,24,1,2037) works correctly.
 
 - 15 July 2007 0.30
-Added PHP 5.2.0 compatability fixes. 
+Added PHP 5.2.0 compatability fixes.
  * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
  * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
- * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but 
+ * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but
    in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
- * 
- 
+ *
+
 - 19 March 2006 0.24
 Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
 
 - 10 Feb 2006 0.23
-PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000. 
+PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000.
 	In PHP4, we will still use -0000 for 100% compat with PHP4.
 
 - 08 Sept 2005 0.22
@@ -288,7 +288,7 @@ Added support for negative months in adodb_mktime().
 Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
 
 - 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 
+In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
 Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
 
 - 17 Nov 2004 0.16
@@ -297,7 +297,7 @@ Removed intval typecast in adodb_mktime() for secs, allowing:
 Suggested by Ryan.
 
 - 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
 This brings it more in line with mktime (still not identical).
 
 - 23 June 2004 0.14
@@ -315,21 +315,21 @@ function adodb_daylight_sv(&$arr, $is_gmt)
 	if ($m == 6 || $m == 7) $arr['hours'] += 1;
 }
 
-This is only called by adodb_date() and not by adodb_mktime(). 
+This is only called by adodb_date() and not by adodb_mktime().
 
 The format of $arr is
-Array ( 
-   [seconds] => 0 
-   [minutes] => 0 
-   [hours] => 0 
+Array (
+   [seconds] => 0
+   [minutes] => 0
+   [hours] => 0
    [mday] => 1      # day of month, eg 1st day of the month
    [mon] => 2       # month (eg. Feb)
-   [year] => 2102 
+   [year] => 2102
    [yday] => 31     # days in current year
    [leap] =>        # true if leap year
    [ndays] => 28    # no of days in current month
-   ) 
-   
+   )
+
 
 - 28 Apr 2004 0.13
 Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
@@ -338,11 +338,11 @@ Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
 Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
 
 - 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to 
+Because of daylight savings problems (some systems apply daylight savings to
 January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
 
 - 9 Aug 2003 0.10
-Fixed bug with dates after 2038. 
+Fixed bug with dates after 2038.
 See http://phplens.com/lens/lensforum/msgs.php?id=6980
 
 - 1 July 2003 0.09
@@ -372,14 +372,14 @@ Day overflow for less than one month's days is supported.
 
 - 28 Jan 2003 0.04
 
-Gregorian correction handled. In PHP5, we might throw an error if 
+Gregorian correction handled. In PHP5, we might throw an error if
 mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
 Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
 
 - 27 Jan 2003 0.03
 
 Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970. 
+Fixed calculation of days since start of year for <1970.
 
 - 27 Jan 2003 0.02
 
@@ -402,13 +402,13 @@ define('ADODB_DATE_VERSION',0.35);
 $ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
 
 /*
-	This code was originally for windows. But apparently this problem happens 
+	This code was originally for windows. But apparently this problem happens
 	also with Linux, RH 7.3 and later!
-	
+
 	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
 	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
 	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
-	
+
 	References:
 	 http://bugs.php.net/bug.php?id=20048&edit=2
 	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
@@ -434,74 +434,74 @@ function adodb_date_test_strftime($fmt)
 {
 	$s1 = strftime($fmt);
 	$s2 = adodb_strftime($fmt);
-	
+
 	if ($s1 == $s2) return true;
-	
+
 	echo "error for $fmt,  strftime=$s1, adodb=$s2
";
 	return false;
 }
 
 /**
 	 Test Suite
-*/	
+*/
 function adodb_date_test()
 {
-	
+
 	for ($m=-24; $m<=24; $m++)
 		echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"
";
-	
+
 	error_reporting(E_ALL);
 	print "
Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."
";
 	@set_time_limit(0);
 	$fail = false;
-	
+
 	// This flag disables calling of PHP native functions, so we can properly test the code
 	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-	
+
 	$t = time();
-	
-	
+
+
 	$fmt = 'Y-m-d H:i:s';
 	echo '
';
 	echo 'adodb: ',adodb_date($fmt,$t),'
';
 	echo 'php  : ',date($fmt,$t),'
';
 	echo '
';
-	
+
 	adodb_date_test_strftime('%Y %m %x %X');
 	adodb_date_test_strftime("%A %d %B %Y");
 	adodb_date_test_strftime("%H %M S");
-	
+
 	$t = adodb_mktime(0,0,0);
 	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'
';
-	
+
 	$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).'
';
-	
+
 	$t = adodb_mktime(0,0,0,2,1,2102);
 	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'
';
-	
-	
+
+
 	print "
Testing gregorian <=> julian conversion
";
 	$t = adodb_mktime(0,0,0,10,11,1492);
 	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
 	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing
';
-	
+
 	$t = adodb_mktime(0,0,0,2,29,1500);
 	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years
';
-	
+
 	$t = adodb_mktime(0,0,0,2,29,1700);
 	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years
';
-	
+
 	print  adodb_mktime(0,0,0,10,4,1582).' ';
 	print adodb_mktime(0,0,0,10,15,1582);
 	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
 	if ($diff != 3600*24) print " Error in gregorian correction = ".($diff/3600/24)." days 
";
-		
+
 	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : 'Error')."
";
 	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : 'Error')."
";
-	
+
 	print "
Testing overflow
";
-	
+
 	$t = adodb_mktime(0,0,0,3,33,1965);
 	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 
';
 	$t = adodb_mktime(0,0,0,4,33,1971);
@@ -514,7 +514,7 @@ function adodb_date_test()
 	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' 
';
 	$t = adodb_mktime(0,0,0,13,3,1965);
 	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 
';
-	
+
 	print "Testing 2-digit => 4-digit year conversion
";
 	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000
";
 	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010
";
@@ -523,10 +523,10 @@ function adodb_date_test()
 	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940
";
 	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950
";
 	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990
";
-	
+
 	// Test string formating
 	print "
Testing date formating
";
-	
+
 	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
 	$s1 = date($fmt,0);
 	$s2 = adodb_date($fmt,0);
@@ -549,12 +549,12 @@ function adodb_date_test()
 					break;
 				}
 			}
-			print "Error date(): $ts
 
+			print "Error date(): $ts
   \"$s1\" (date len=".strlen($s1).")
   \"$s2\" (adodb_date len=".strlen($s2).")

";
 			$fail = true;
 		}
-		
+
 		$a1 = getdate($ts);
 		$a2 = adodb_getdate($ts);
 		$rez = array_diff($a1,$a2);
@@ -567,7 +567,7 @@ function adodb_date_test()
 			$fail = true;
 		}
 	}
-	
+
 	// Test generation of dates outside 1901-2038
 	print "
Testing random dates between 100 and 4000
";
 	adodb_date_test_date(100,1);
@@ -575,7 +575,7 @@ function adodb_date_test()
 		$y1 = 100+rand(0,1970-100);
 		$m = rand(1,12);
 		adodb_date_test_date($y1,$m);
-		
+
 		$y1 = 3000-rand(0,3000-1970);
 		adodb_date_test_date($y1,$m);
 	}
@@ -586,7 +586,7 @@ function adodb_date_test()
 	$offset = 36000+rand(10000,60000);
 	$max = 365*$yrs*86400;
 	$lastyear = 0;
-	
+
 	// 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: ";
@@ -619,58 +619,58 @@ function adodb_time()
 }
 
 /**
-	Returns day of week, 0 = Sunday,... 6=Saturday. 
+	Returns day of week, 0 = Sunday,... 6=Saturday.
 	Algorithm from PEAR::Date_Calc
 */
 function adodb_dow($year, $month, $day)
 {
 /*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 
-proclaimed that from that time onwards 3 days would be dropped from the calendar 
+Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and
+proclaimed that from that time onwards 3 days would be dropped from the calendar
 every 400 years.
 
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
+Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian).
 */
 	if ($year <= 1582) {
-		if ($year < 1582 || 
+		if ($year < 1582 ||
 			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
 		 else
 			$greg_correction = 0;
 	} else
 		$greg_correction = 0;
-	
+
 	if($month > 2)
 	    $month -= 2;
 	else {
 	    $month += 10;
 	    $year--;
 	}
-	
+
 	$day =  floor((13 * $month - 1) / 5) +
 	        $day + ($year % 100) +
 	        floor(($year % 100) / 4) +
 	        floor(($year / 100) / 4) - 2 *
 	        floor($year / 100) + 77 + $greg_correction;
-	
+
 	return $day - 7 * floor($day / 7);
 }
 
 
 /**
- Checks for leap year, returns true if it is. No 2-digit year check. Also 
+ Checks for leap year, returns true if it is. No 2-digit year check. Also
  handles julian calendar correctly.
 */
-function _adodb_is_leap_year($year) 
+function _adodb_is_leap_year($year)
 {
 	if ($year % 4 != 0) return false;
-	
+
 	if ($year % 400 == 0) {
 		return true;
 	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
 	} else if ($year > 1582 && $year % 100 == 0 ) {
 		return false;
-	} 
-	
+	}
+
 	return true;
 }
 
@@ -678,7 +678,7 @@ function _adodb_is_leap_year($year)
 /**
  checks for leap year, returns true if it is. Has 2-digit year check
 */
-function adodb_is_leap_year($year) 
+function adodb_is_leap_year($year)
 {
 	return  _adodb_is_leap_year(adodb_year_digit_check($year));
 }
@@ -687,13 +687,13 @@ function adodb_is_leap_year($year)
 	Fix 2-digit years. Works for any century.
  	Assumes that if 2-digit is more than 30 years in future, then previous century.
 */
-function adodb_year_digit_check($y) 
+function adodb_year_digit_check($y)
 {
 	if ($y < 100) {
-	
+
 		$yr = (integer) date("Y");
 		$century = (integer) ($yr /100);
-		
+
 		if ($yr%100 > 50) {
 			$c1 = $century + 1;
 			$c0 = $century;
@@ -710,24 +710,24 @@ function adodb_year_digit_check($y)
 	return $y;
 }
 
-function adodb_get_gmt_diff_ts($ts) 
+function adodb_get_gmt_diff_ts($ts)
 {
 	if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
 		$arr = getdate($ts);
 		$y = $arr['year'];
 		$m = $arr['mon'];
 		$d = $arr['mday'];
-		return adodb_get_gmt_diff($y,$m,$d);	
+		return adodb_get_gmt_diff($y,$m,$d);
 	} else {
 		return adodb_get_gmt_diff(false,false,false);
 	}
-	
+
 }
 
 /**
  get local time zone offset from GMT. Does not handle historical timezones before 1970.
 */
-function adodb_get_gmt_diff($y,$m,$d) 
+function adodb_get_gmt_diff($y,$m,$d)
 {
 static $TZ,$tzo;
 global $ADODB_DATETIME_CLASS;
@@ -753,7 +753,7 @@ global $ADODB_DATETIME_CLASS;
 				$tobj = new DateTimeZone($tzonename);
 				$TZ = -timezone_offset_get($tobj,new DateTime("now",$tzo));
 			}
-		} 
+		}
 		*/
 		if (empty($TZ)) $TZ = mktime(0,0,0,12,2,$y) - gmmktime(0,0,0,12,2,$y);
 	}
@@ -782,7 +782,7 @@ function adodb_date_gentable($out=true)
 
 	for ($i=1970; $i >= 1600; $i-=10) {
 		$s = adodb_gmmktime(0,0,0,1,1,$i);
-		echo "$i => $s,
";	
+		echo "$i => $s,
";
 	}
 }
 adodb_date_gentable();
@@ -798,22 +798,22 @@ echo "
$i ";
 
 $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 $_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 function adodb_validdate($y,$m,$d)
 {
 global $_month_table_normal,$_month_table_leaf;
 
 	if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
 	else $marr = $_month_table_normal;
-	
+
 	if ($m > 12 || $m < 1) return false;
-	
+
 	if ($d > 31 || $d < 1) return false;
-	
+
 	if ($marr[$m] < $d) return false;
-	
+
 	if ($y < 1000 && $y > 3000) return false;
-	
+
 	return true;
 }
 
@@ -831,17 +831,17 @@ global $_month_table_normal,$_month_table_leaf;
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
-	
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
-	
+
+	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction
+
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 	$d366 = $_day_power * 366;
 	$d365 = $_day_power * 365;
-	
+
 	if ($d < 0) {
-		
+
 		if (empty($YRS)) $YRS = array(
 			1970 => 0,
 			1960 => -315619200,
@@ -883,28 +883,28 @@ global $_month_table_normal,$_month_table_leaf;
 			1600 => -11676096000);
 
 		if ($is_gmt) $origd = $d;
-		// The valid range of a 32bit signed timestamp is typically from 
+		// The valid range of a 32bit signed timestamp is typically from
 		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
 		//
-		
+
 		# old algorithm iterates through all years. new algorithm does it in
 		# 10 year blocks
-		
+
 		/*
 		# old algo
 		for ($a = 1970 ; --$a >= 0;) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
 			else $d += $d365;
-			
+
 			if ($d >= 0) {
 				$year = $a;
 				break;
 			}
 		}
 		*/
-		
+
 		$lastsecs = 0;
 		$lastyear = 1970;
 		foreach($YRS as $year => $secs) {
@@ -915,27 +915,27 @@ global $_month_table_normal,$_month_table_leaf;
 			$lastsecs = $secs;
 			$lastyear = $year;
 		}
-		
+
 		$d -= $lastsecs;
 		if (!isset($a)) $a = $lastyear;
-		
+
 		//echo ' yr=',$a,' ', $d,'.';
-		
+
 		for (; --$a >= 0;) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
 			else $d += $d365;
-			
+
 			if ($d >= 0) {
 				$year = $a;
 				break;
 			}
 		}
 		/**/
-		
+
 		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-		
+
 		$d = $lastd;
 		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
 		for ($a = 13 ; --$a > 0;) {
@@ -947,17 +947,17 @@ global $_month_table_normal,$_month_table_leaf;
 				break;
 			}
 		}
-		
+
 		$d = $lastd;
 		$day = $ndays + ceil(($d+1) / ($_day_power));
 
 		$d += ($ndays - $day+1)* $_day_power;
 		$hour = floor($d/$_hour_power);
-	
+
 	} else {
 		for ($a = 1970 ;; $a++) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
 			else $d -= $d365;
 			if ($d < 0) {
@@ -982,7 +982,7 @@ global $_month_table_normal,$_month_table_leaf;
 		$d = $d - ($day-1) * $_day_power;
 		$hour = floor($d /$_hour_power);
 	}
-	
+
 	$d -= $hour * $_hour_power;
 	$min = floor($d/$_min_power);
 	$secs = $d - $min * $_min_power;
@@ -999,8 +999,8 @@ global $_month_table_normal,$_month_table_leaf;
 		'ndays' => $ndays
 		);
 	}
-	
-	
+
+
 	$dow = adodb_dow($year,$month,$day);
 
 	return array(
@@ -1019,18 +1019,18 @@ global $_month_table_normal,$_month_table_leaf;
 }
 /*
 		if ($isphp5)
-				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36);
 			else
-				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36);
 			break;*/
 function adodb_tz_offset($gmt,$isphp5)
 {
 	$zhrs = abs($gmt)/3600;
 	$hrs = floor($zhrs);
-	if ($isphp5) 
-		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+	if ($isphp5)
+		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
 	else
-		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
 }
 
 
@@ -1043,17 +1043,17 @@ function adodb_gmdate($fmt,$d=false)
 function adodb_date2($fmt, $d=false, $is_gmt=false)
 {
 	if ($d !== false) {
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
 
 		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
-	
+
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
 		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
 	}
-	
+
 	return adodb_date($fmt,$d,$is_gmt);
 }
 
@@ -1072,34 +1072,34 @@ static $jan1_1971;
 		$daylight = function_exists('adodb_daylight_sv');
 		if (empty($jan1_1971)) $jan1_1971 = mktime(0,0,0,1,1,1971); // we only use date() when > 1970 as adodb_mktime() only uses mktime() when > 1970
 	}
-	
+
 	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
-		
+
 			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= $jan1_1971) // if windows, must be +ve integer
 				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
 
 		}
 	}
 	$_day_power = 86400;
-	
+
 	$arr = _adodb_getdate($d,true,$is_gmt);
-	
+
 	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
-	
+
 	$year = $arr['year'];
 	$month = $arr['mon'];
 	$day = $arr['mday'];
 	$hour = $arr['hours'];
 	$min = $arr['minutes'];
 	$secs = $arr['seconds'];
-	
+
 	$max = strlen($fmt);
 	$dates = '';
-	
+
 	$isphp5 = PHP_VERSION >= 5;
-	
+
 	/*
 		at this point, we have the following integer vars to manipulate:
 		$year, $month, $day, $hour, $min, $secs
@@ -1109,7 +1109,7 @@ static $jan1_1971;
 		case 'e':
 			$dates .= date('e');
 			break;
-		case 'T': 
+		case 'T':
 			if ($ADODB_DATETIME_CLASS) {
 				$dt = new DateTime();
 				$dt->SetDate($year,$month,$day);
@@ -1120,23 +1120,23 @@ static $jan1_1971;
 		// YEAR
 		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
 		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-		
+
 			// 4.3.11 uses '04 Jun 2004'
 			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
+			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '
 				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-			
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
-			
+
+			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour;
+
 			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
-			
+
 			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
-			
+
 			$gmt = adodb_get_gmt_diff($year,$month,$day);
-			
+
 			$dates .= ' '.adodb_tz_offset($gmt,$isphp5);
 			break;
-			
+
 		case 'Y': $dates .= $year; break;
 		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
 		// MONTH
@@ -1153,47 +1153,47 @@ static $jan1_1971;
 		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
 		case 'j': $dates .= $day; break;
 		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S': 
+		case 'S':
 			$d10 = $day % 10;
 			if ($d10 == 1) $dates .= 'st';
 			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
 			else if ($d10 == 3) $dates .= 'rd';
 			else $dates .= 'th';
 			break;
-			
+
 		// HOUR
 		case 'Z':
 			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
-		case 'O': 
+		case 'O':
 			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
-			
+
 			$dates .= adodb_tz_offset($gmt,$isphp5);
 			break;
-			
-		case 'H': 
-			if ($hour < 10) $dates .= '0'.$hour; 
-			else $dates .= $hour; 
+
+		case 'H':
+			if ($hour < 10) $dates .= '0'.$hour;
+			else $dates .= $hour;
 			break;
-		case 'h': 
-			if ($hour > 12) $hh = $hour - 12; 
+		case 'h':
+			if ($hour > 12) $hh = $hour - 12;
 			else {
-				if ($hour == 0) $hh = '12'; 
+				if ($hour == 0) $hh = '12';
 				else $hh = $hour;
 			}
-			
+
 			if ($hh < 10) $dates .= '0'.$hh;
 			else $dates .= $hh;
 			break;
-			
-		case 'G': 
+
+		case 'G':
 			$dates .= $hour;
 			break;
-			
+
 		case 'g':
-			if ($hour > 12) $hh = $hour - 12; 
+			if ($hour > 12) $hh = $hour - 12;
 			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour; 
+				if ($hour == 0) $hh = '12';
+				else $hh = $hour;
 			}
 			$dates .= $hh;
 			break;
@@ -1215,7 +1215,7 @@ static $jan1_1971;
 		default:
 			$dates .= $fmt[$i]; break;
 		// ESCAPE
-		case "\\": 
+		case "\\":
 			$i++;
 			if ($i < $max) $dates .= $fmt[$i];
 			break;
@@ -1225,7 +1225,7 @@ static $jan1_1971;
 }
 
 /**
-	Returns a timestamp given a GMT/UTC time. 
+	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=false,$day=false,$year=false,$is_dst=false)
@@ -1236,33 +1236,33 @@ function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=
 /**
 	Return a timestamp given a local time. Originally by jackbbs.
 	Note that $is_dst is not implemented and is ignored.
-	
+
 	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
 */
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$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')) {
 
 		if ($mon === false) {
 			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
 		}
-		
-		// for windows, we don't check 1970 because with timezone differences, 
+
+		// for windows, we don't check 1970 because with timezone differences,
 		// 1 Jan 1970 could generate negative timestamp, which is illegal
 		$usephpfns = (1970 < $year && $year < 2038
 			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-			); 
-			
-		
+			);
+
+
 		if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
-			
+
 		if ($usephpfns) {
 				return $is_gmt ?
 					@gmmktime($hr,$min,$sec,$mon,$day,$year):
 					@mktime($hr,$min,$sec,$mon,$day,$year);
 		}
 	}
-	
+
 	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
 
 	/*
@@ -1275,8 +1275,8 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 	$mon = intval($mon);
 	$day = intval($day);
 	$year = intval($year);
-	
-	
+
+
 	$year = adodb_year_digit_check($year);
 
 	if ($mon > 12) {
@@ -1288,14 +1288,14 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 		$year -= $y;
 		$mon += $y*12;
 	}
-	
+
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
-	
+
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 	$_total_date = 0;
 	if ($year >= 1970) {
 		for ($a = 1970 ; $a <= $year; $a++) {
@@ -1307,7 +1307,7 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 				$loop_table = $_month_table_normal;
 				$_add_date = 365;
 			}
-			if ($a < $year) { 
+			if ($a < $year) {
 				$_total_date += $_add_date;
 			} else {
 				for($b=1;$b<$mon;$b++) {
@@ -1317,7 +1317,7 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 		}
 		$_total_date +=$day-1;
 		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
-	
+
 	} else {
 		for ($a = 1969 ; $a >= $year; $a--) {
 			$leaf = _adodb_is_leap_year($a);
@@ -1336,13 +1336,13 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 			}
 		}
 		$_total_date += $loop_table[$mon] - $day;
-		
+
 		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
 		$_day_time = $_day_power - $_day_time;
 		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
 		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
 		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
-	} 
+	}
 	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
 	return $ret;
 }
@@ -1364,7 +1364,7 @@ global $ADODB_DATE_LOCALE;
 
 		}
 	}
-	
+
 	if (empty($ADODB_DATE_LOCALE)) {
 	/*
 		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
@@ -1376,11 +1376,11 @@ global $ADODB_DATE_LOCALE;
 		$sep = substr($dstr,2,1);
 		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
 		$hasAM = strrpos($tstr,'M') !== false;
-		
+
 		$ADODB_DATE_LOCALE = array();
-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
+		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';
 		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
-			
+
 	}
 	$inpct = false;
 	$fmtdate = '';
@@ -1393,7 +1393,7 @@ global $ADODB_DATE_LOCALE;
 			} else
 				$inpct = true;
 		} else if ($inpct) {
-		
+
 			$inpct = false;
 			switch($ch) {
 			case '0':
@@ -1409,9 +1409,9 @@ global $ADODB_DATE_LOCALE;
 			case 'E':
 			case 'O':
 				/* ignore format modifiers */
-				$inpct = true; 
+				$inpct = true;
 				break;
-				
+
 			case 'a': $fmtdate .= 'D'; break;
 			case 'A': $fmtdate .= 'l'; break;
 			case 'h':
@@ -1456,6 +1456,3 @@ global $ADODB_DATE_LOCALE;
 	$ret = adodb_date($fmtdate, $ts, $is_gmt);
 	return $ret;
 }
-
-
-?>
diff --git a/lib/WikiDB/adodb/adodb-xmlschema.inc.php b/lib/WikiDB/adodb/adodb-xmlschema.inc.php
index 706126e8e..72a9f9bc7 100644
--- a/lib/WikiDB/adodb/adodb-xmlschema.inc.php
+++ b/lib/WikiDB/adodb/adodb-xmlschema.inc.php
@@ -1,9 +1,9 @@
 parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
 	* @access private
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	function create(&$xmls) {
 		return array();
 	}
-	
+
 	/**
 	* Destroys the object
 	*/
 	function destroy() {
 		unset( $this );
 	}
-	
+
 	/**
 	* Checks whether the specified RDBMS is supported by the current
 	* database object or its ranking ancestor.
@@ -170,7 +170,7 @@ class dbObject {
 	function supportedPlatform( $platform = NULL ) {
 		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
 	}
-	
+
 	/**
 	* Returns the prefix set by the ranking ancestor of the database object.
 	*
@@ -180,7 +180,7 @@ class dbObject {
 	function prefix( $name = '' ) {
 		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
 	}
-	
+
 	/**
 	* Extracts a field ID from the specified field.
 	*
@@ -204,44 +204,44 @@ class dbObject {
 * @access private
 */
 class dbTable extends dbObject {
-	
+
 	/**
 	* @var string Table name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array Field specifier: Meta-information about each field
 	*/
 	var $fields = array();
-	
+
 	/**
 	* @var array List of table indexes.
 	*/
 	var $indexes = array();
-	
+
 	/**
 	* @var array Table options: Table-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var string Field index: Keeps track of which field is currently being processed
 	*/
 	var $current_field;
-	
+
 	/**
 	* @var boolean Mark table for destruction
 	* @access private
 	*/
 	var $drop_table;
-	
+
 	/**
 	* @var boolean Mark field for destruction (not yet implemented)
 	* @access private
 	*/
 	var $drop_field = array();
-	
+
 	/**
 	* Iniitializes a new table object.
 	*
@@ -252,16 +252,16 @@ class dbTable extends dbObject {
 		$this->parent = $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'INDEX':
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
@@ -282,7 +282,7 @@ class dbTable extends dbObject {
 				$fieldType = $attributes['TYPE'];
 				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
 				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
+
 				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
 				break;
 			case 'KEY':
@@ -293,12 +293,12 @@ class dbTable extends dbObject {
 				break;
 			case 'DEFAULT':
 				// Add a field option to the table object
-				
+
 				// Work around ADOdb datadict issue that misinterprets empty strings.
 				if( $attributes['VALUE'] == '' ) {
 					$attributes['VALUE'] = " '' ";
 				}
-				
+
 				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
 				break;
 			case 'DEFDATE':
@@ -310,7 +310,7 @@ class dbTable extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -331,10 +331,10 @@ class dbTable extends dbObject {
 				$this->addTableOpt( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -342,7 +342,7 @@ class dbTable extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'TABLE':
 				$this->parent->addSQL( $this->create( $this->parent ) );
@@ -355,7 +355,7 @@ class dbTable extends dbObject {
 
 		}
 	}
-	
+
 	/**
 	* Adds an index to a table object
 	*
@@ -367,7 +367,7 @@ class dbTable extends dbObject {
 		$this->indexes[$name] = new dbIndex( $this, $attributes );
 		return $this->indexes[$name];
 	}
-	
+
 	/**
 	* Adds data to a table object
 	*
@@ -380,11 +380,11 @@ class dbTable extends dbObject {
 		}
 		return $this->data;
 	}
-	
+
 	/**
 	* Adds a field to a table object
 	*
-	* $name is the name of the table to which the field should be added. 
+	* $name is the name of the table to which the field should be added.
 	* $type is an ADODB datadict field type. The following field types
 	* are supported as of ADODB 3.40:
 	* 	- C:  varchar
@@ -412,31 +412,31 @@ class dbTable extends dbObject {
 	*/
 	function addField( $name, $type, $size = NULL, $opts = NULL ) {
 		$field_id = $this->FieldID( $name );
-		
+
 		// Set the field index so we know where we are
 		$this->current_field = $field_id;
-		
+
 		// Set the field name (required)
 		$this->fields[$field_id]['NAME'] = $name;
-		
+
 		// Set the field type (required)
 		$this->fields[$field_id]['TYPE'] = $type;
-		
+
 		// Set the field size (optional)
 		if( isset( $size ) ) {
 			$this->fields[$field_id]['SIZE'] = $size;
 		}
-		
+
 		// Set the field options
 		if( isset( $opts ) ) {
 			$this->fields[$field_id]['OPTS'][] = $opts;
 		}
 	}
-	
+
 	/**
 	* Adds a field option to the current field specifier
 	*
-	* This method adds a field option allowed by the ADOdb datadict 
+	* This method adds a field option allowed by the ADOdb datadict
 	* and appends it to the given field.
 	*
 	* @param string $field	Field name
@@ -452,7 +452,7 @@ class dbTable extends dbObject {
 			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
 		}
 	}
-	
+
 	/**
 	* Adds an option to the table
 	*
@@ -469,7 +469,7 @@ class dbTable extends dbObject {
 		return $this->opts;
 	}
 
-	
+
 	/**
 	* Generates the SQL that will create the table in the database
 	*
@@ -478,28 +478,28 @@ class dbTable extends dbObject {
 	*/
 	function create( &$xmls ) {
 		$sql = array();
-		
+
 		// drop any existing indexes
 		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
 			foreach( $legacy_indexes as $index => $index_details ) {
 				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
 			}
 		}
-		
+
 		// remove fields to be dropped from table object
 		foreach( $this->drop_field as $field ) {
 			unset( $this->fields[$field] );
 		}
-		
+
 		// if table exists
 		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
 			// drop table
 			if( $this->drop_table ) {
 				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
+
 				return $sql;
 			}
-			
+
 			// drop any existing fields not in schema
 			foreach( $legacy_fields as $field_id => $field ) {
 				if( !isset( $this->fields[$field_id] ) ) {
@@ -511,27 +511,27 @@ class dbTable extends dbObject {
 			if( $this->drop_table ) {
 				return $sql;
 			}
-			
+
 			$legacy_fields = array();
 		}
-		
+
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
-		
+
 		foreach( $this->fields as $field_id => $finfo ) {
 			// Set an empty size if it isn't supplied
 			if( !isset( $finfo['SIZE'] ) ) {
 				$finfo['SIZE'] = '';
 			}
-			
+
 			// Initialize the field array with the type and size
 			$fldarray[$field_id] = array(
 				'NAME' => $finfo['NAME'],
 				'TYPE' => $finfo['TYPE'],
 				'SIZE' => $finfo['SIZE']
 			);
-			
-			// Loop through the options array and add the field options. 
+
+			// Loop through the options array and add the field options.
 			if( isset( $finfo['OPTS'] ) ) {
 				foreach( $finfo['OPTS'] as $opt ) {
 					// Option has an argument.
@@ -546,7 +546,7 @@ class dbTable extends dbObject {
 				}
 			}
 		}
-		
+
 		if( empty( $legacy_fields ) ) {
 			// Create the new table
 			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
@@ -570,18 +570,18 @@ class dbTable extends dbObject {
 					return array();
 			}
 		}
-		
+
 		foreach( $this->indexes as $index ) {
 			$sql[] = $index->create( $xmls );
 		}
-		
+
 		if( isset( $this->data ) ) {
 			$sql[] = $this->data->create( $xmls );
 		}
-		
+
 		return $sql;
 	}
-	
+
 	/**
 	* Marks a field or table for destruction
 	*/
@@ -612,28 +612,28 @@ class dbTable extends dbObject {
 * @access private
 */
 class dbIndex extends dbObject {
-	
+
 	/**
 	* @var string	Index name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array	Index options: Index-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var array	Indexed fields: Table columns included in this index
 	*/
 	var $columns = array();
-	
+
 	/**
 	* @var boolean Mark index for destruction
 	* @access private
 	*/
 	var $drop = FALSE;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -644,21 +644,21 @@ class dbIndex extends dbObject {
 	*/
 	function dbIndex( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
-		
+
 		$this->name = $this->prefix ($attributes['NAME']);
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	* Processes XML opening tags.
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'DROP':
 				$this->drop();
@@ -675,7 +675,7 @@ class dbIndex extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -690,10 +690,10 @@ class dbIndex extends dbObject {
 				$this->addField( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -701,14 +701,14 @@ class dbIndex extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'INDEX':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the index
 	*
@@ -717,11 +717,11 @@ class dbIndex extends dbObject {
 	*/
 	function addField( $name ) {
 		$this->columns[$this->FieldID( $name )] = $name;
-		
+
 		// Return the field list
 		return $this->columns;
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -730,11 +730,11 @@ class dbIndex extends dbObject {
 	*/
 	function addIndexOpt( $opt ) {
 		$this->opts[] = $opt;
-		
+
 		// Return the options list
 		return $this->opts;
 	}
-	
+
 	/**
 	* Generates the SQL that will create the index in the database
 	*
@@ -745,17 +745,17 @@ class dbIndex extends dbObject {
 		if( $this->drop ) {
 			return NULL;
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->columns as $id => $col ) {
 			if( !isset( $this->parent->fields[$id] ) ) {
 				unset( $this->columns[$id] );
 			}
 		}
-		
+
 		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
 	}
-	
+
 	/**
 	* Marks an index for destruction
 	*/
@@ -773,11 +773,11 @@ class dbIndex extends dbObject {
 * @access private
 */
 class dbData extends dbObject {
-	
+
 	var $data = array();
-	
+
 	var $row;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -789,18 +789,18 @@ class dbData extends dbObject {
 	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. 
+	* 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 );
@@ -812,7 +812,7 @@ class dbData extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -827,10 +827,10 @@ class dbData extends dbObject {
 				$this->addData( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -838,14 +838,14 @@ class dbData extends dbObject {
 	*/
 	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
 	*
@@ -858,11 +858,11 @@ class dbData extends dbObject {
 		} 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
 	*
@@ -873,14 +873,14 @@ class dbData extends dbObject {
 		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
 	*
@@ -891,12 +891,12 @@ class dbData extends dbObject {
 		$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 ) ) {
@@ -905,9 +905,9 @@ class dbData extends dbObject {
 						continue;
 					}
 				}
-				
+
 				$name = $table_fields[$field_id]['NAME'];
-				
+
 				switch( $table_fields[$field_id]['TYPE'] ) {
 					case 'C':
 					case 'C2':
@@ -925,15 +925,15 @@ class dbData extends dbObject {
 					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 ) {
@@ -943,10 +943,10 @@ class dbData extends dbObject {
 						}
 				}
 			}
-			
+
 			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 		}
-		
+
 		return $sql;
 	}
 }
@@ -958,27 +958,27 @@ class dbData extends dbObject {
 * @access private
 */
 class dbQuerySet extends dbObject {
-	
+
 	/**
 	* @var array	List of SQL queries
 	*/
 	var $queries = array();
-	
+
 	/**
 	* @var string	String used to build of a query line by line
 	*/
 	var $query;
-	
+
 	/**
 	* @var string	Query prefix key
 	*/
 	var $prefixKey = '';
-	
+
 	/**
 	* @var boolean	Auto prefix enable (TRUE)
 	*/
 	var $prefixMethod = 'AUTO';
-	
+
 	/**
 	* Initializes the query set.
 	*
@@ -987,14 +987,14 @@ class dbQuerySet extends dbObject {
 	*/
 	function dbQuerySet( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
-			
+
 		// Overrides the manual prefix key
 		if( isset( $attributes['KEY'] ) ) {
 			$this->prefixKey = $attributes['KEY'];
 		}
-		
+
 		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
+
 		// Enables or disables automatic prefix prepending
 		switch( $prefixMethod ) {
 			case 'AUTO':
@@ -1008,20 +1008,20 @@ class dbQuerySet extends dbObject {
 				break;
 		}
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: QUERY.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'QUERY':
 				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
+				// Ignore this query set if a platform is specified and it's different than the
 				// current connection platform.
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					$this->newQuery();
@@ -1033,7 +1033,7 @@ class dbQuerySet extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*/
@@ -1044,10 +1044,10 @@ class dbQuerySet extends dbObject {
 				$this->buildQuery( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1055,7 +1055,7 @@ class dbQuerySet extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'QUERY':
 				// Add the finished query to the open query set.
@@ -1067,10 +1067,10 @@ class dbQuerySet extends dbObject {
 				$this->destroy();
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* Re-initializes the query.
 	*
@@ -1078,10 +1078,10 @@ class dbQuerySet extends dbObject {
 	*/
 	function newQuery() {
 		$this->query = '';
-		
+
 		return TRUE;
 	}
-	
+
 	/**
 	* Discards the existing query.
 	*
@@ -1089,11 +1089,11 @@ class dbQuerySet extends dbObject {
 	*/
 	function discardQuery() {
 		unset( $this->query );
-		
+
 		return TRUE;
 	}
-	
-	/** 
+
+	/**
 	* Appends a line to a query that is being built line by line
 	*
 	* @param string $data Line of SQL data or NULL to initialize a new query
@@ -1103,12 +1103,12 @@ class dbQuerySet extends dbObject {
 		if( !isset( $this->query ) OR empty( $sql ) ) {
 			return FALSE;
 		}
-		
+
 		$this->query .= $sql;
-		
+
 		return $this->query;
 	}
-	
+
 	/**
 	* Adds a completed query to the query list
 	*
@@ -1118,14 +1118,14 @@ class dbQuerySet extends dbObject {
 		if( !isset( $this->query ) ) {
 			return FALSE;
 		}
-		
+
 		$this->queries[] = $return = trim($this->query);
-		
+
 		unset( $this->query );
-		
+
 		return $return;
 	}
-	
+
 	/**
 	* Creates and returns the current query set
 	*
@@ -1137,16 +1137,16 @@ class dbQuerySet extends dbObject {
 			switch( $this->prefixMethod ) {
 				case 'AUTO':
 					// Enable auto prefix replacement
-					
+
 					// Process object prefix.
 					// Evaluate SQL statements to prepend prefix to objects
 					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $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 );
-					
+
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
@@ -1158,14 +1158,14 @@ class dbQuerySet extends dbObject {
 						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
 					}
 			}
-			
+
 			$this->queries[$id] = trim( $query );
 		}
-		
+
 		// Return the query set array
 		return $this->queries;
 	}
-	
+
 	/**
 	* Rebuilds the query with the prefix attached to any objects
 	*
@@ -1178,33 +1178,33 @@ class dbQuerySet extends dbObject {
 		if( !isset( $prefix ) ) {
 			return $query;
 		}
-		
+
 		if( preg_match( $regex, $query, $match ) ) {
 			$preamble = $match[1];
 			$postamble = $match[5];
 			$objectList = explode( ',', $match[3] );
 			// $prefix = $prefix . '_';
-			
+
 			$prefixedList = '';
-			
+
 			foreach( $objectList as $object ) {
 				if( $prefixedList !== '' ) {
 					$prefixedList .= ', ';
 				}
-				
+
 				$prefixedList .= $prefix . trim( $object );
 			}
-			
+
 			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
 		}
-		
+
 		return $query;
 	}
 }
 
 /**
 * Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
+*
 * This class is used to load and parse the XML file, to create an array of SQL statements
 * that can be used to build a database, and to build the database using the SQL array.
 *
@@ -1216,82 +1216,82 @@ class dbQuerySet extends dbObject {
 * @package axmls
 */
 class adoSchema {
-	
+
 	/**
 	* @var array	Array containing SQL queries to generate all objects
 	* @access private
 	*/
 	var $sqlArray;
-	
+
 	/**
 	* @var object	ADOdb connection object
 	* @access private
 	*/
 	var $db;
-	
+
 	/**
 	* @var object	ADOdb Data Dictionary
 	* @access private
 	*/
 	var $dict;
-	
+
 	/**
 	* @var string Current XML element
 	* @access private
 	*/
 	var $currentElement = '';
-	
+
 	/**
 	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
 	* @access private
 	*/
 	var $upgrade = '';
-	
+
 	/**
 	* @var string Optional object prefix
 	* @access private
 	*/
 	var $objectPrefix = '';
-	
+
 	/**
 	* @var long	Original Magic Quotes Runtime value
 	* @access private
 	*/
 	var $mgq;
-	
+
 	/**
 	* @var long	System debug
 	* @access private
 	*/
 	var $debug;
-	
+
 	/**
 	* @var string Regular expression to find schema version
 	* @access private
 	*/
 	var $versionRegex = '//';
-	
+
 	/**
 	* @var string Current schema version
 	* @access private
 	*/
 	var $schemaVersion;
-	
+
 	/**
 	* @var int	Success of last Schema execution
 	*/
 	var $success;
-	
+
 	/**
 	* @var bool	Execute SQL inline as it is generated
 	*/
 	var $executeInline;
-	
+
 	/**
 	* @var bool	Continue SQL execution if errors occur
 	*/
 	var $continueOnError;
-	
+
 	/**
 	* Creates an adoSchema object
 	*
@@ -1306,7 +1306,7 @@ class adoSchema {
 		$this->mgq = get_magic_quotes_runtime();
 		ini_set("magic_quotes_runtime", 0);
 		#set_magic_quotes_runtime(0);
-		
+
 		$this->db = $db;
 		$this->debug = $this->db->debug;
 		$this->dict = NewDataDictionary( $this->db );
@@ -1316,7 +1316,7 @@ class adoSchema {
 		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
 		$this->setUpgradeMethod();
 	}
-	
+
 	/**
 	* Sets the method to be used for upgrading an existing database
 	*
@@ -1337,9 +1337,9 @@ class adoSchema {
 		if( !is_string( $method ) ) {
 			return FALSE;
 		}
-		
+
 		$method = strtoupper( $method );
-		
+
 		// Handle the upgrade methods
 		switch( $method ) {
 			case 'ALTER':
@@ -1358,10 +1358,10 @@ class adoSchema {
 				// Use default if no legitimate method is passed.
 				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
 		}
-		
+
 		return $this->upgrade;
 	}
-	
+
 	/**
 	* Enables/disables inline SQL execution.
 	*
@@ -1379,10 +1379,10 @@ class adoSchema {
 		if( is_bool( $mode ) ) {
 			$this->executeInline = $mode;
 		}
-		
+
 		return $this->executeInline;
 	}
-	
+
 	/**
 	* Enables/disables SQL continue on error.
 	*
@@ -1400,15 +1400,15 @@ class adoSchema {
 		if( is_bool( $mode ) ) {
 			$this->continueOnError = $mode;
 		}
-		
+
 		return $this->continueOnError;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
 	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database described. 
+	* the filesystem and generate the SQL necessary to create the database described.
 	* @see ParseSchemaString()
 	*
 	* @param string $file Name of XML schema file.
@@ -1418,11 +1418,11 @@ class adoSchema {
 	function ParseSchema( $filename, $returnSchema = FALSE ) {
 		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
-	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
+	* Call this method to load the specified schema from a file (see the DTD for the proper format)
 	* and generate the SQL necessary to create the database described by the schema.
 	*
 	* @param string $file Name of XML schema file.
@@ -1438,12 +1438,12 @@ class adoSchema {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
 			return FALSE;
 		}
-		
+
 		if ( $returnSchema )
 		{
 			$xmlstring = '';
@@ -1452,11 +1452,11 @@ class adoSchema {
 			}
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
@@ -1467,17 +1467,17 @@ class adoSchema {
 				) );
 			}
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Converts an XML schema string to 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 create the database described by the schema. 
+	* and generate the SQL necessary to create the database described by the schema.
 	* @see ParseSchema()
 	*
 	* @param string $xmlstring XML schema string.
@@ -1488,21 +1488,21 @@ class adoSchema {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
 			return FALSE;
 		}
-		
+
 		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",
@@ -1510,12 +1510,12 @@ class adoSchema {
 				xml_get_current_line_number( $xmlParser)
 			) );
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to uninstallation SQL.
 	*
@@ -1530,12 +1530,12 @@ class adoSchema {
 	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. 
+	* and generate the SQL necessary to uninstall the database described by the schema.
 	* @see RemoveSchema()
 	*
 	* @param string $schema XML schema string.
@@ -1543,20 +1543,20 @@ class adoSchema {
 	* @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).
 	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* Call this method to apply the current schema (generally created by calling
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
 	* and executing other SQL specified in the schema) after parsing.
 	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
 	*
@@ -1569,25 +1569,25 @@ class adoSchema {
 		if( !is_bool( $continueOnErr ) ) {
 			$continueOnErr = $this->ContinueOnError();
 		}
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			$this->success = 0;
 		} else {
 			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
 		}
-		
+
 		return $this->success;
 	}
-	
+
 	/**
-	* Returns the current SQL array. 
+	* Returns the current SQL array.
 	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
+	* Call this method to fetch the array of SQL queries resulting from
+	* ParseSchema() or ParseSchemaString().
 	*
 	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
 	* @return array Array of SQL statements or FALSE if an error occurs
@@ -1596,7 +1596,7 @@ class adoSchema {
 		$sqlArray = null;
 		return $this->getSQL( $format, $sqlArray );
 	}
-	
+
 	/**
 	* Saves the current SQL array to the local filesystem as a list of SQL queries.
 	*
@@ -1604,25 +1604,25 @@ class adoSchema {
 	* parsed XML schema) to the filesystem.
 	*
 	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
+	* @return boolean TRUE if save is successful, else FALSE.
 	*/
 	function SaveSQL( $filename = './schema.sql' ) {
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
 		if( !isset( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		$fp = fopen( $filename, "w" );
-		
+
 		foreach( $sqlArray as $key => $query ) {
 			fwrite( $fp, $query . ";\n" );
 		}
 		fclose( $fp );
 	}
-	
+
 	/**
 	* Create an xml parser
 	*
@@ -1634,14 +1634,14 @@ class adoSchema {
 		// Create the parser
 		$xmlParser = xml_parser_create();
 		xml_set_object( $xmlParser, $this );
-		
+
 		// Initialize the XML callback functions
 		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
 		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
+
 		return $xmlParser;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
@@ -1662,9 +1662,9 @@ class adoSchema {
 			default:
 				// print_r( array( $tag, $attributes ) );
 		}
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -1672,7 +1672,7 @@ class adoSchema {
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1680,16 +1680,16 @@ class adoSchema {
 	* @internal
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	/**
 	* Converts an XML schema string to the specified DTD version.
 	*
 	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaFile()
@@ -1700,44 +1700,44 @@ class adoSchema {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = $schema;
 		} else {
 			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
 		}
-		
+
 		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
-	
+
 	// compat for pre-4.3 - jlim
 	function _file_get_contents($path)
 	{
 		if (function_exists('file_get_contents')) return file_get_contents($path);
 		return join('',file($path));
 	}
-	
+
 	/**
 	* Converts an XML schema file to the specified DTD version.
 	*
 	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaString()
@@ -1748,19 +1748,19 @@ class adoSchema {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = _file_get_contents( $filename );
-			
+
 			// remove unicode BOM if present
 			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
 				$result = substr( $result, 3 );
@@ -1768,36 +1768,36 @@ class adoSchema {
 		} else {
 			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
 		}
-		
+
 		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':
@@ -1806,26 +1806,26 @@ class adoSchema {
 					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); 
-		
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
+
 		xslt_free ($xh);
-		
+
 		return $result;
 	}
-	
+
 	/**
 	* Processes XSLT transformation errors
 	*
@@ -1845,7 +1845,7 @@ class adoSchema {
 				'Error Number' => $errno,
 				'Level' => $level
 			);
-			
+
 			switch( $fields['URI'] ) {
 				case 'arg:/_xml':
 					$msg['Input'] = 'XML';
@@ -1856,7 +1856,7 @@ class adoSchema {
 				default:
 					$msg['Input'] = $fields['URI'];
 			}
-			
+
 			$msg['Line'] = $fields['line'];
 		} else {
 			$msg = array(
@@ -1866,19 +1866,19 @@ class adoSchema {
 				'Fields' => var_export( $fields, TRUE )
 			);
 		}
-		
+
 		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
 					   . '' . "\n";
-		
+
 		foreach( $msg as $label => $details ) {
 			$error_details .= '' . "\n";
 		}
-		
+
 		$error_details .= '
' . $label . ': ' . htmlentities( $details ) . '
';
-		
+
 		trigger_error( $error_details, E_USER_ERROR );
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the requested XML schema file.
 	*
@@ -1894,17 +1894,17 @@ class adoSchema {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( preg_match( $this->versionRegex, $data, $matches ) ) {
 				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 			}
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the provided XML schema string.
 	*
@@ -1918,125 +1918,125 @@ class adoSchema {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
 		}
-		
+
 		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
 			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Extracts an XML schema from an existing database.
 	*
 	* Call this method to create an XML schema string from an existing database.
 	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
+	* in the schema.
 	*
 	* @param boolean $data Include data in schema dump
 	* @return string Generated XML schema
 	*/
 	function ExtractSchema( $data = FALSE ) {
 		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
+
 		$schema = '' . "\n"
 				. '' . "\n";
-		
+
 		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
 			foreach( $tables as $table ) {
 				$schema .= '	' . "\n";
-				
+
 				// grab details from database
 				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
 				$fields = $this->db->MetaColumns( $table );
 				$indexes = $this->db->MetaIndexes( $table );
-				
+
 				if( is_array( $fields ) ) {
 					foreach( $fields as $details ) {
 						$extra = '';
 						$content = array();
-						
+
 						if( $details->max_length > 0 ) {
 							$extra .= ' size="' . $details->max_length . '"';
 						}
-						
+
 						if( $details->primary_key ) {
 							$content[] = '';
 						} elseif( $details->not_null ) {
 							$content[] = '';
 						}
-						
+
 						if( $details->has_default ) {
 							$content[] = '';
 						}
-						
+
 						if( $details->auto_increment ) {
 							$content[] = '';
 						}
-						
+
 						// this stops the creation of 'R' columns,
 						// AUTOINCREMENT is used to create auto columns
 						$details->primary_key = 0;
 						$type = $rs->MetaType( $details );
-						
+
 						$schema .= '		';
-						
+
 						if( !empty( $content ) ) {
 							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
 						}
-						
+
 						$schema .= '' . "\n";
 					}
 				}
-				
+
 				if( is_array( $indexes ) ) {
 					foreach( $indexes as $index => $details ) {
 						$schema .= '		' . "\n";
-						
+
 						if( $details['unique'] ) {
 							$schema .= '			' . "\n";
 						}
-						
+
 						foreach( $details['columns'] as $column ) {
 							$schema .= '			' . $column . '' . "\n";
 						}
-						
+
 						$schema .= '		' . "\n";
 					}
 				}
-				
+
 				if( $data ) {
 					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
+
 					if( is_object( $rs ) ) {
 						$schema .= '		' . "\n";
-						
+
 						while( $row = $rs->FetchRow() ) {
 							foreach( $row as $key => $val ) {
 								$row[$key] = htmlentities($val);
 							}
-							
+
 							$schema .= '			' . implode( '', $row ) . '' . "\n";
 						}
-						
+
 						$schema .= '		' . "\n";
 					}
 				}
-				
+
 				$schema .= '	
' . "\n";
 			}
 		}
-		
+
 		$this->db->SetFetchMode( $old_mode );
-		
+
 		$schema .= '';
 		return $schema;
 	}
-	
+
 	/**
 	* Sets a prefix for database objects
 	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* Call this method to set a standard prefix that will be prepended to all database tables
 	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
 	*
 	* @param string $prefix Prefix that will be prepended.
@@ -2057,17 +2057,17 @@ class adoSchema {
 				logMsg( 'Invalid prefix: ' . $prefix );
 				return FALSE;
 		}
-		
+
 		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
 			$prefix .= '_';
 		}
-		
+
 		// prefix valid
 		logMsg( 'Set prefix: ' . $prefix );
 		$this->objectPrefix = $prefix;
 		return TRUE;
 	}
-	
+
 	/**
 	* Returns an object name with the current prefix prepended.
 	*
@@ -2083,11 +2083,11 @@ class adoSchema {
 			// prepend after quote if used
 			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
 		}
-		
+
 		// No prefix set. Use name provided.
 		return $name;
 	}
-	
+
 	/**
 	* Checks if element references a specific platform
 	*
@@ -2098,7 +2098,7 @@ class adoSchema {
 	*/
 	function supportedPlatform( $platform = NULL ) {
 		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-		
+
 		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
 			logMsg( "Platform $platform is supported" );
 			return TRUE;
@@ -2107,7 +2107,7 @@ class adoSchema {
 			return FALSE;
 		}
 	}
-	
+
 	/**
 	* Clears the array of generated SQL.
 	*
@@ -2116,7 +2116,7 @@ class adoSchema {
 	function clearSQL() {
 		$this->sqlArray = array();
 	}
-	
+
 	/**
 	* Adds SQL into the SQL array.
 	*
@@ -2124,58 +2124,58 @@ class adoSchema {
 	* @return boolean TRUE if successful, else FALSE.
 	*
 	* @access private
-	*/	
+	*/
 	function addSQL( $sql = NULL ) {
 		if( is_array( $sql ) ) {
 			foreach( $sql as $line ) {
 				$this->addSQL( $line );
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		if( is_string( $sql ) ) {
 			$this->sqlArray[] = $sql;
-			
+
 			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
 			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
 				$saved = $this->db->debug;
 				$this->db->debug = $this->debug;
 				$ok = $this->db->Execute( $sql );
 				$this->db->debug = $saved;
-				
+
 				if( !$ok ) {
 					if( $this->debug ) {
 						ADOConnection::outp( $this->db->ErrorMsg() );
 					}
-					
+
 					$this->success = 1;
 				}
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Gets the SQL array in the specified format.
 	*
 	* @param string $format Format
 	* @return mixed SQL
-	*	
+	*
 	* @access private
 	*/
 	function getSQL( $format = NULL, $sqlArray = NULL ) {
 		if( !is_array( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		switch( strtolower( $format ) ) {
 			case 'string':
 			case 'text':
@@ -2183,10 +2183,10 @@ class adoSchema {
 			case'html':
 				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
 		}
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Destroys an adoSchema object.
 	*
@@ -2208,18 +2208,17 @@ class adoSchema {
 function logMsg( $msg, $title = NULL, $force = FALSE ) {
 	if( XMLS_DEBUG or $force ) {
 		echo '
';
-		
+
 		if( isset( $title ) ) {
 			echo '
' . htmlentities( $title ) . '
';
 		}
-		
+
 		if( is_object( $this ) ) {
 			echo '[' . get_class( $this ) . '] ';
 		}
-		
+
 		print_r( $msg );
-		
+
 		echo '
';
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/adodb-xmlschema03.inc.php b/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
index 6e9ff353a..3ed5aecbe 100644
--- a/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
+++ b/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
@@ -1,9 +1,9 @@
 parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
 	* @access private
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	function create(&$xmls) {
 		return array();
 	}
-	
+
 	/**
 	* Destroys the object
 	*/
 	function destroy() {
 		unset( $this );
 	}
-	
+
 	/**
 	* Checks whether the specified RDBMS is supported by the current
 	* database object or its ranking ancestor.
@@ -188,7 +188,7 @@ class dbObject {
 	function supportedPlatform( $platform = NULL ) {
 		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
 	}
-	
+
 	/**
 	* Returns the prefix set by the ranking ancestor of the database object.
 	*
@@ -198,7 +198,7 @@ class dbObject {
 	function prefix( $name = '' ) {
 		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
 	}
-	
+
 	/**
 	* Extracts a field ID from the specified field.
 	*
@@ -222,51 +222,51 @@ class dbObject {
 * @access private
 */
 class dbTable extends dbObject {
-	
+
 	/**
 	* @var string Table name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array Field specifier: Meta-information about each field
 	*/
 	var $fields = array();
-	
+
 	/**
 	* @var array List of table indexes.
 	*/
 	var $indexes = array();
-	
+
 	/**
 	* @var array Table options: Table-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var string Field index: Keeps track of which field is currently being processed
 	*/
 	var $current_field;
-	
+
 	/**
 	* @var boolean Mark table for destruction
 	* @access private
 	*/
 	var $drop_table;
-	
+
 	/**
 	* @var boolean Mark field for destruction (not yet implemented)
 	* @access private
 	*/
 	var $drop_field = array();
-	
+
 	/**
 	* @var array Platform-specific options
 	* @access private
 	*/
 	var $currentPlatform = true;
-	
-	
+
+
 	/**
 	* Iniitializes a new table object.
 	*
@@ -277,16 +277,16 @@ class dbTable extends dbObject {
 		$this->parent = $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'INDEX':
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
@@ -307,7 +307,7 @@ class dbTable extends dbObject {
 				$fieldType = $attributes['TYPE'];
 				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
 				$fieldOpts = !empty( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
+
 				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
 				break;
 			case 'KEY':
@@ -321,12 +321,12 @@ class dbTable extends dbObject {
 				break;
 			case 'DEFAULT':
 				// Add a field option to the table object
-				
+
 				// Work around ADOdb datadict issue that misinterprets empty strings.
 				if( $attributes['VALUE'] == '' ) {
 					$attributes['VALUE'] = " '' ";
 				}
-				
+
 				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
 				break;
 			case 'OPT':
@@ -338,7 +338,7 @@ class dbTable extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -363,10 +363,10 @@ class dbTable extends dbObject {
 				}
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -374,7 +374,7 @@ class dbTable extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'TABLE':
 				$this->parent->addSQL( $this->create( $this->parent ) );
@@ -392,7 +392,7 @@ class dbTable extends dbObject {
 
 		}
 	}
-	
+
 	/**
 	* Adds an index to a table object
 	*
@@ -404,7 +404,7 @@ class dbTable extends dbObject {
 		$this->indexes[$name] = new dbIndex( $this, $attributes );
 		return $this->indexes[$name];
 	}
-	
+
 	/**
 	* Adds data to a table object
 	*
@@ -417,11 +417,11 @@ class dbTable extends dbObject {
 		}
 		return $this->data;
 	}
-	
+
 	/**
 	* Adds a field to a table object
 	*
-	* $name is the name of the table to which the field should be added. 
+	* $name is the name of the table to which the field should be added.
 	* $type is an ADODB datadict field type. The following field types
 	* are supported as of ADODB 3.40:
 	* 	- C:  varchar
@@ -449,21 +449,21 @@ class dbTable extends dbObject {
 	*/
 	function addField( $name, $type, $size = NULL, $opts = NULL ) {
 		$field_id = $this->FieldID( $name );
-		
+
 		// Set the field index so we know where we are
 		$this->current_field = $field_id;
-		
+
 		// Set the field name (required)
 		$this->fields[$field_id]['NAME'] = $name;
-		
+
 		// Set the field type (required)
 		$this->fields[$field_id]['TYPE'] = $type;
-		
+
 		// Set the field size (optional)
 		if( isset( $size ) ) {
 			$this->fields[$field_id]['SIZE'] = $size;
 		}
-		
+
 		// Set the field options
 		if( isset( $opts ) ) {
 			$this->fields[$field_id]['OPTS'] = array($opts);
@@ -471,11 +471,11 @@ class dbTable extends dbObject {
 			$this->fields[$field_id]['OPTS'] = array();
 		}
 	}
-	
+
 	/**
 	* Adds a field option to the current field specifier
 	*
-	* This method adds a field option allowed by the ADOdb datadict 
+	* This method adds a field option allowed by the ADOdb datadict
 	* and appends it to the given field.
 	*
 	* @param string $field	Field name
@@ -493,7 +493,7 @@ class dbTable extends dbObject {
 		}
 	}
 	}
-	
+
 	/**
 	* Adds an option to the table
 	*
@@ -510,7 +510,7 @@ class dbTable extends dbObject {
 		return $this->opts;
 	}
 
-	
+
 	/**
 	* Generates the SQL that will create the table in the database
 	*
@@ -519,28 +519,28 @@ class dbTable extends dbObject {
 	*/
 	function create( &$xmls ) {
 		$sql = array();
-		
+
 		// drop any existing indexes
 		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
 			foreach( $legacy_indexes as $index => $index_details ) {
 				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
 			}
 		}
-		
+
 		// remove fields to be dropped from table object
 		foreach( $this->drop_field as $field ) {
 			unset( $this->fields[$field] );
 		}
-		
+
 		// if table exists
 		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
 			// drop table
 			if( $this->drop_table ) {
 				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
+
 				return $sql;
 			}
-			
+
 			// drop any existing fields not in schema
 			foreach( $legacy_fields as $field_id => $field ) {
 				if( !isset( $this->fields[$field_id] ) ) {
@@ -552,27 +552,27 @@ class dbTable extends dbObject {
 			if( $this->drop_table ) {
 				return $sql;
 			}
-			
+
 			$legacy_fields = array();
 		}
-		
+
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
-		
+
 		foreach( $this->fields as $field_id => $finfo ) {
 			// Set an empty size if it isn't supplied
 			if( !isset( $finfo['SIZE'] ) ) {
 				$finfo['SIZE'] = '';
 			}
-			
+
 			// Initialize the field array with the type and size
 			$fldarray[$field_id] = array(
 				'NAME' => $finfo['NAME'],
 				'TYPE' => $finfo['TYPE'],
 				'SIZE' => $finfo['SIZE']
 			);
-			
-			// Loop through the options array and add the field options. 
+
+			// Loop through the options array and add the field options.
 			if( isset( $finfo['OPTS'] ) ) {
 				foreach( $finfo['OPTS'] as $opt ) {
 					// Option has an argument.
@@ -587,7 +587,7 @@ class dbTable extends dbObject {
 				}
 			}
 		}
-		
+
 		if( empty( $legacy_fields ) ) {
 			// Create the new table
 			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
@@ -611,18 +611,18 @@ class dbTable extends dbObject {
 					return array();
 			}
 		}
-		
+
 		foreach( $this->indexes as $index ) {
 			$sql[] = $index->create( $xmls );
 		}
-		
+
 		if( isset( $this->data ) ) {
 			$sql[] = $this->data->create( $xmls );
 		}
-		
+
 		return $sql;
 	}
-	
+
 	/**
 	* Marks a field or table for destruction
 	*/
@@ -653,28 +653,28 @@ class dbTable extends dbObject {
 * @access private
 */
 class dbIndex extends dbObject {
-	
+
 	/**
 	* @var string	Index name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array	Index options: Index-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var array	Indexed fields: Table columns included in this index
 	*/
 	var $columns = array();
-	
+
 	/**
 	* @var boolean Mark index for destruction
 	* @access private
 	*/
 	var $drop = FALSE;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -685,21 +685,21 @@ class dbIndex extends dbObject {
 	*/
 	function dbIndex( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
-		
+
 		$this->name = $this->prefix ($attributes['NAME']);
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	* Processes XML opening tags.
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'DROP':
 				$this->drop();
@@ -716,7 +716,7 @@ class dbIndex extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -731,10 +731,10 @@ class dbIndex extends dbObject {
 				$this->addField( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -742,14 +742,14 @@ class dbIndex extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'INDEX':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the index
 	*
@@ -758,11 +758,11 @@ class dbIndex extends dbObject {
 	*/
 	function addField( $name ) {
 		$this->columns[$this->FieldID( $name )] = $name;
-		
+
 		// Return the field list
 		return $this->columns;
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -771,11 +771,11 @@ class dbIndex extends dbObject {
 	*/
 	function addIndexOpt( $opt ) {
 		$this->opts[] = $opt;
-		
+
 		// Return the options list
 		return $this->opts;
 	}
-	
+
 	/**
 	* Generates the SQL that will create the index in the database
 	*
@@ -786,17 +786,17 @@ class dbIndex extends dbObject {
 		if( $this->drop ) {
 			return NULL;
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->columns as $id => $col ) {
 			if( !isset( $this->parent->fields[$id] ) ) {
 				unset( $this->columns[$id] );
 			}
 		}
-		
+
 		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
 	}
-	
+
 	/**
 	* Marks an index for destruction
 	*/
@@ -815,11 +815,11 @@ class dbIndex extends dbObject {
 * @access private
 */
 class dbData extends dbObject {
-	
+
 	var $data = array();
-	
+
 	var $row;
-	
+
 	/**
 	* Initializes the new dbData object.
 	*
@@ -831,18 +831,18 @@ class dbData extends dbObject {
 	function dbData( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: ROW and F (field). 
+	* Processes XML opening tags.
+	* Elements currently processed are: ROW and F (field).
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'ROW':
 				$this->row = count( $this->data );
@@ -854,7 +854,7 @@ class dbData extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -869,10 +869,10 @@ class dbData extends dbObject {
 				$this->addData( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -880,14 +880,14 @@ class dbData extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'DATA':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the insert
 	*
@@ -899,20 +899,20 @@ class dbData extends dbObject {
 		if( !isset( $this->row ) || !isset( $this->data[$this->row] ) ) {
 			return;
 		}
-		
+
 		// Set the field index so we know where we are
 		if( isset( $attributes['NAME'] ) ) {
 			$this->current_field = $this->FieldID( $attributes['NAME'] );
 		} else {
 			$this->current_field = count( $this->data[$this->row] );
 		}
-		
+
 		// initialise data
 		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
 			$this->data[$this->row][$this->current_field] = '';
 		}
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -926,7 +926,7 @@ class dbData extends dbObject {
 			$this->data[$this->row][$this->current_field] .= $cdata;
 		}
 	}
-	
+
 	/**
 	* Generates the SQL that will add/update the data in the database
 	*
@@ -936,22 +936,22 @@ class dbData extends dbObject {
 	function create( &$xmls ) {
 		$table = $xmls->dict->TableName($this->parent->name);
 		$table_field_count = count($this->parent->fields);
-		$tables = $xmls->db->MetaTables(); 
+		$tables = $xmls->db->MetaTables();
 		$sql = array();
-		
+
 		$ukeys = $xmls->db->MetaPrimaryKeys( $table );
 		if( !empty( $this->parent->indexes ) and !empty( $ukeys ) ) {
 			foreach( $this->parent->indexes as $indexObj ) {
 				if( !in_array( $indexObj->name, $ukeys ) ) $ukeys[] = $indexObj->name;
 			}
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->data as $row ) {
 			$table_fields = $this->parent->fields;
 			$fields = array();
 			$rawfields = array(); // Need to keep some of the unprocessed data on hand.
-			
+
 			foreach( $row as $field_id => $field_data ) {
 				if( !array_key_exists( $field_id, $table_fields ) ) {
 					if( is_numeric( $field_id ) ) {
@@ -960,9 +960,9 @@ class dbData extends dbObject {
 						continue;
 					}
 				}
-				
+
 				$name = $table_fields[$field_id]['NAME'];
-				
+
 				switch( $table_fields[$field_id]['TYPE'] ) {
 					case 'I':
 					case 'I1':
@@ -979,16 +979,16 @@ class dbData extends dbObject {
 						$fields[$name] = $xmls->db->qstr( $field_data );
 						$rawfields[$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 ) {
@@ -997,27 +997,27 @@ class dbData extends dbObject {
 						}
 				}
 			}
-			
+
 			// The rest of this method deals with updating existing data records.
-			
+
 			if( !in_array( $table, $tables ) or ( $mode = $xmls->existingData() ) == XMLS_MODE_INSERT ) {
 				// Table doesn't yet exist, so it's safe to insert.
 				logMsg( "$table doesn't exist, inserting or mode is INSERT" );
 			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 				continue;
 		}
-		
+
 			// Prepare to test for potential violations. Get primary keys and unique indexes
 			$mfields = array_merge( $fields, $rawfields );
 			$keyFields = array_intersect( $ukeys, array_keys( $mfields ) );
-			
+
 			if( empty( $ukeys ) or count( $keyFields ) == 0 ) {
 				// No unique keys in schema, so safe to insert
 				logMsg( "Either schema or data has no unique keys, so safe to insert" );
 				$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 				continue;
 			}
-			
+
 			// Select record containing matching unique keys.
 			$where = '';
 			foreach( $ukeys as $key ) {
@@ -1057,27 +1057,27 @@ class dbData extends dbObject {
 * @access private
 */
 class dbQuerySet extends dbObject {
-	
+
 	/**
 	* @var array	List of SQL queries
 	*/
 	var $queries = array();
-	
+
 	/**
 	* @var string	String used to build of a query line by line
 	*/
 	var $query;
-	
+
 	/**
 	* @var string	Query prefix key
 	*/
 	var $prefixKey = '';
-	
+
 	/**
 	* @var boolean	Auto prefix enable (TRUE)
 	*/
 	var $prefixMethod = 'AUTO';
-	
+
 	/**
 	* Initializes the query set.
 	*
@@ -1086,14 +1086,14 @@ class dbQuerySet extends dbObject {
 	*/
 	function dbQuerySet( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
-			
+
 		// Overrides the manual prefix key
 		if( isset( $attributes['KEY'] ) ) {
 			$this->prefixKey = $attributes['KEY'];
 		}
-		
+
 		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
+
 		// Enables or disables automatic prefix prepending
 		switch( $prefixMethod ) {
 			case 'AUTO':
@@ -1107,20 +1107,20 @@ class dbQuerySet extends dbObject {
 				break;
 		}
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: QUERY.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'QUERY':
 				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
+				// Ignore this query set if a platform is specified and it's different than the
 				// current connection platform.
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					$this->newQuery();
@@ -1132,7 +1132,7 @@ class dbQuerySet extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*/
@@ -1143,10 +1143,10 @@ class dbQuerySet extends dbObject {
 				$this->buildQuery( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1154,7 +1154,7 @@ class dbQuerySet extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'QUERY':
 				// Add the finished query to the open query set.
@@ -1166,10 +1166,10 @@ class dbQuerySet extends dbObject {
 				$this->destroy();
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* Re-initializes the query.
 	*
@@ -1177,10 +1177,10 @@ class dbQuerySet extends dbObject {
 	*/
 	function newQuery() {
 		$this->query = '';
-		
+
 		return TRUE;
 	}
-	
+
 	/**
 	* Discards the existing query.
 	*
@@ -1188,11 +1188,11 @@ class dbQuerySet extends dbObject {
 	*/
 	function discardQuery() {
 		unset( $this->query );
-		
+
 		return TRUE;
 	}
-	
-	/** 
+
+	/**
 	* Appends a line to a query that is being built line by line
 	*
 	* @param string $data Line of SQL data or NULL to initialize a new query
@@ -1202,12 +1202,12 @@ class dbQuerySet extends dbObject {
 		if( !isset( $this->query ) OR empty( $sql ) ) {
 			return FALSE;
 		}
-		
+
 		$this->query .= $sql;
-		
+
 		return $this->query;
 	}
-	
+
 	/**
 	* Adds a completed query to the query list
 	*
@@ -1217,14 +1217,14 @@ class dbQuerySet extends dbObject {
 		if( !isset( $this->query ) ) {
 			return FALSE;
 		}
-		
+
 		$this->queries[] = $return = trim($this->query);
-		
+
 		unset( $this->query );
-		
+
 		return $return;
 	}
-	
+
 	/**
 	* Creates and returns the current query set
 	*
@@ -1236,16 +1236,16 @@ class dbQuerySet extends dbObject {
 			switch( $this->prefixMethod ) {
 				case 'AUTO':
 					// Enable auto prefix replacement
-					
+
 					// Process object prefix.
 					// Evaluate SQL statements to prepend prefix to objects
 					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $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 );
-					
+
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
@@ -1257,14 +1257,14 @@ class dbQuerySet extends dbObject {
 						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
 					}
 			}
-			
+
 			$this->queries[$id] = trim( $query );
 		}
-		
+
 		// Return the query set array
 		return $this->queries;
 	}
-	
+
 	/**
 	* Rebuilds the query with the prefix attached to any objects
 	*
@@ -1277,33 +1277,33 @@ class dbQuerySet extends dbObject {
 		if( !isset( $prefix ) ) {
 			return $query;
 		}
-		
+
 		if( preg_match( $regex, $query, $match ) ) {
 			$preamble = $match[1];
 			$postamble = $match[5];
 			$objectList = explode( ',', $match[3] );
 			// $prefix = $prefix . '_';
-			
+
 			$prefixedList = '';
-			
+
 			foreach( $objectList as $object ) {
 				if( $prefixedList !== '' ) {
 					$prefixedList .= ', ';
 				}
-				
+
 				$prefixedList .= $prefix . trim( $object );
 			}
-			
+
 			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
 		}
-		
+
 		return $query;
 	}
 }
 
 /**
 * Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
+*
 * This class is used to load and parse the XML file, to create an array of SQL statements
 * that can be used to build a database, and to build the database using the SQL array.
 *
@@ -1315,87 +1315,87 @@ class dbQuerySet extends dbObject {
 * @package axmls
 */
 class adoSchema {
-	
+
 	/**
 	* @var array	Array containing SQL queries to generate all objects
 	* @access private
 	*/
 	var $sqlArray;
-	
+
 	/**
 	* @var object	ADOdb connection object
 	* @access private
 	*/
 	var $db;
-	
+
 	/**
 	* @var object	ADOdb Data Dictionary
 	* @access private
 	*/
 	var $dict;
-	
+
 	/**
 	* @var string Current XML element
 	* @access private
 	*/
 	var $currentElement = '';
-	
+
 	/**
 	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
 	* @access private
 	*/
 	var $upgrade = '';
-	
+
 	/**
 	* @var string Optional object prefix
 	* @access private
 	*/
 	var $objectPrefix = '';
-	
+
 	/**
 	* @var long	Original Magic Quotes Runtime value
 	* @access private
 	*/
 	var $mgq;
-	
+
 	/**
 	* @var long	System debug
 	* @access private
 	*/
 	var $debug;
-	
+
 	/**
 	* @var string Regular expression to find schema version
 	* @access private
 	*/
 	var $versionRegex = '//';
-	
+
 	/**
 	* @var string Current schema version
 	* @access private
 	*/
 	var $schemaVersion;
-	
+
 	/**
 	* @var int	Success of last Schema execution
 	*/
 	var $success;
-	
+
 	/**
 	* @var bool	Execute SQL inline as it is generated
 	*/
 	var $executeInline;
-	
+
 	/**
 	* @var bool	Continue SQL execution if errors occur
 	*/
 	var $continueOnError;
-	
+
 	/**
 	* @var int	How to handle existing data rows (insert, update, or ignore)
 	*/
 	var $existingData;
-	
+
 	/**
 	* Creates an adoSchema object
 	*
@@ -1410,7 +1410,7 @@ class adoSchema {
 		$this->mgq = get_magic_quotes_runtime();
 		#set_magic_quotes_runtime(0);
 		ini_set("magic_quotes_runtime", 0);
-		
+
 		$this->db = $db;
 		$this->debug = $this->db->debug;
 		$this->dict = NewDataDictionary( $this->db );
@@ -1421,7 +1421,7 @@ class adoSchema {
 		$this->existingData( XMLS_EXISTING_DATA );
 		$this->setUpgradeMethod();
 	}
-	
+
 	/**
 	* Sets the method to be used for upgrading an existing database
 	*
@@ -1442,9 +1442,9 @@ class adoSchema {
 		if( !is_string( $method ) ) {
 			return FALSE;
 		}
-		
+
 		$method = strtoupper( $method );
-		
+
 		// Handle the upgrade methods
 		switch( $method ) {
 			case 'ALTER':
@@ -1463,10 +1463,10 @@ class adoSchema {
 				// Use default if no legitimate method is passed.
 				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
 		}
-		
+
 		return $this->upgrade;
 	}
-	
+
 	/**
 	* Specifies how to handle existing data row when there is a unique key conflict.
 	*
@@ -1475,7 +1475,7 @@ class adoSchema {
 	* data into an existing table with one or more primary keys or unique indexes.
 	* The existingData method takes one of three options: XMLS_MODE_INSERT attempts
 	* to always insert the data as a new row. In the event of a unique key violation,
-	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the 
+	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the
 	* any existing rows with the new data based upon primary or unique key fields in
 	* the schema. If the data row in the schema specifies no unique fields, the row
 	* data will be inserted as a new row. XMLS_MODE_IGNORE specifies that any data rows
@@ -1504,10 +1504,10 @@ class adoSchema {
 			}
 			$this->existingData = $mode;
 		}
-		
+
 		return $this->existingData;
 	}
-	
+
 	/**
 	* Enables/disables inline SQL execution.
 	*
@@ -1525,10 +1525,10 @@ class adoSchema {
 		if( is_bool( $mode ) ) {
 			$this->executeInline = $mode;
 		}
-		
+
 		return $this->executeInline;
 	}
-	
+
 	/**
 	* Enables/disables SQL continue on error.
 	*
@@ -1546,10 +1546,10 @@ class adoSchema {
 		if( is_bool( $mode ) ) {
 			$this->continueOnError = $mode;
 		}
-		
+
 		return $this->continueOnError;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
@@ -1566,7 +1566,7 @@ class adoSchema {
 	function ParseSchema( $filename, $returnSchema = FALSE ) {
 		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
@@ -1594,13 +1594,13 @@ class adoSchema {
 			logMsg( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
 			logMsg( 'Invalid Schema Version' );
 			return FALSE;
 		}
-		
+
 		if( $returnSchema ) {
 			$xmlstring = '';
 			while( $data = fread( $fp, 4096 ) ) {
@@ -1608,11 +1608,11 @@ class adoSchema {
 			}
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
@@ -1623,17 +1623,17 @@ class adoSchema {
 				) );
 			}
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Converts an XML schema string to 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 create the database described by the schema. 
+	* and generate the SQL necessary to create the database described by the schema.
 	* @see ParseSchema()
 	*
 	* @param string $xmlstring XML schema string.
@@ -1645,21 +1645,21 @@ class adoSchema {
 			logMsg( 'Empty or Invalid Schema' );
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
 			logMsg( 'Invalid Schema Version' );
 			return FALSE;
 		}
-		
+
 		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",
@@ -1667,12 +1667,12 @@ class adoSchema {
 				xml_get_current_line_number( $xmlParser)
 			) );
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to uninstallation SQL.
 	*
@@ -1687,12 +1687,12 @@ class adoSchema {
 	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. 
+	* and generate the SQL necessary to uninstall the database described by the schema.
 	* @see RemoveSchema()
 	*
 	* @param string $schema XML schema string.
@@ -1700,20 +1700,20 @@ class adoSchema {
 	* @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).
 	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* Call this method to apply the current schema (generally created by calling
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
 	* and executing other SQL specified in the schema) after parsing.
 	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
 	*
@@ -1726,25 +1726,25 @@ class adoSchema {
 		if( !is_bool( $continueOnErr ) ) {
 			$continueOnErr = $this->ContinueOnError();
 		}
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			$this->success = 0;
 		} else {
 			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
 		}
-		
+
 		return $this->success;
 	}
-	
+
 	/**
-	* Returns the current SQL array. 
+	* Returns the current SQL array.
 	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
+	* Call this method to fetch the array of SQL queries resulting from
+	* ParseSchema() or ParseSchemaString().
 	*
 	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
 	* @return array Array of SQL statements or FALSE if an error occurs
@@ -1753,7 +1753,7 @@ class adoSchema {
 		$sqlArray = null;
 		return $this->getSQL( $format, $sqlArray );
 	}
-	
+
 	/**
 	* Saves the current SQL array to the local filesystem as a list of SQL queries.
 	*
@@ -1761,25 +1761,25 @@ class adoSchema {
 	* parsed XML schema) to the filesystem.
 	*
 	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
+	* @return boolean TRUE if save is successful, else FALSE.
 	*/
 	function SaveSQL( $filename = './schema.sql' ) {
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
 		if( !isset( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		$fp = fopen( $filename, "w" );
-		
+
 		foreach( $sqlArray as $key => $query ) {
 			fwrite( $fp, $query . ";\n" );
 		}
 		fclose( $fp );
 	}
-	
+
 	/**
 	* Create an xml parser
 	*
@@ -1791,14 +1791,14 @@ class adoSchema {
 		// Create the parser
 		$xmlParser = xml_parser_create();
 		xml_set_object( $xmlParser, $this );
-		
+
 		// Initialize the XML callback functions
 		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
 		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
+
 		return $xmlParser;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
@@ -1821,9 +1821,9 @@ class adoSchema {
 			default:
 				// print_r( array( $tag, $attributes ) );
 		}
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -1831,7 +1831,7 @@ class adoSchema {
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1839,16 +1839,16 @@ class adoSchema {
 	* @internal
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	/**
 	* Converts an XML schema string to the specified DTD version.
 	*
 	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaFile()
@@ -1859,27 +1859,27 @@ class adoSchema {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = $schema;
 		} else {
 			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
 		}
-		
+
 		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
 
@@ -1890,14 +1890,14 @@ class adoSchema {
 		if (function_exists('file_get_contents')) return file_get_contents($path);
 		return join('',file($path));
 	}*/
-	
+
 	/**
 	* Converts an XML schema file to the specified DTD version.
 	*
 	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaString()
@@ -1908,19 +1908,19 @@ class adoSchema {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = _file_get_contents( $filename );
-			
+
 			// remove unicode BOM if present
 			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
 				$result = substr( $result, 3 );
@@ -1928,36 +1928,36 @@ class adoSchema {
 		} else {
 			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
 		}
-		
+
 		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':
@@ -1966,26 +1966,26 @@ class adoSchema {
 					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); 
-		
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
+
 		xslt_free ($xh);
-		
+
 		return $result;
 	}
-	
+
 	/**
 	* Processes XSLT transformation errors
 	*
@@ -2005,7 +2005,7 @@ class adoSchema {
 				'Error Number' => $errno,
 				'Level' => $level
 			);
-			
+
 			switch( $fields['URI'] ) {
 				case 'arg:/_xml':
 					$msg['Input'] = 'XML';
@@ -2016,7 +2016,7 @@ class adoSchema {
 				default:
 					$msg['Input'] = $fields['URI'];
 			}
-			
+
 			$msg['Line'] = $fields['line'];
 		} else {
 			$msg = array(
@@ -2026,19 +2026,19 @@ class adoSchema {
 				'Fields' => var_export( $fields, TRUE )
 			);
 		}
-		
+
 		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
 					   . '' . "\n";
-		
+
 		foreach( $msg as $label => $details ) {
 			$error_details .= '' . "\n";
 		}
-		
+
 		$error_details .= '
' . $label . ': ' . htmlentities( $details ) . '
';
-		
+
 		trigger_error( $error_details, E_USER_ERROR );
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the requested XML schema file.
 	*
@@ -2054,17 +2054,17 @@ class adoSchema {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( preg_match( $this->versionRegex, $data, $matches ) ) {
 				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 			}
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the provided XML schema string.
 	*
@@ -2078,20 +2078,20 @@ class adoSchema {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
 		}
-		
+
 		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
 			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Extracts an XML schema from an existing database.
 	*
 	* Call this method to create an XML schema string from an existing database.
 	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
+	* in the schema.
 	*
 	* @param boolean $data Include data in schema dump
 	* @indent string indentation to use
@@ -2101,54 +2101,54 @@ class adoSchema {
 	*/
 	function ExtractSchema( $data = FALSE, $indent = '  ', $prefix = '' , $stripprefix=false) {
 		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
+
 		$schema = '' . "\n"
 				. '' . "\n";
-		
+
 		if( is_array( $tables = $this->db->MetaTables( 'TABLES' , ($prefix) ? $prefix.'%' : '') ) ) {
 			foreach( $tables as $table ) {
 				if ($stripprefix) $table = str_replace(str_replace('\\_', '_', $pfx ), '', $table);
 				$schema .= $indent . '' . "\n";
-				
+
 				// grab details from database
 				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE -1' );
 				$fields = $this->db->MetaColumns( $table );
 				$indexes = $this->db->MetaIndexes( $table );
-				
+
 				if( is_array( $fields ) ) {
 					foreach( $fields as $details ) {
 						$extra = '';
 						$content = array();
-						
+
 						if( isset($details->max_length) && $details->max_length > 0 ) {
 							$extra .= ' size="' . $details->max_length . '"';
 						}
-						
+
 						if( isset($details->primary_key) && $details->primary_key ) {
 							$content[] = '';
 						} elseif( isset($details->not_null) && $details->not_null ) {
 							$content[] = '';
 						}
-						
+
 						if( isset($details->has_default) && $details->has_default ) {
 							$content[] = '';
 						}
-						
+
 						if( isset($details->auto_increment) && $details->auto_increment ) {
 							$content[] = '';
 						}
-						
+
 						if( isset($details->unsigned) && $details->unsigned ) {
 							$content[] = '';
 						}
-						
+
 						// this stops the creation of 'R' columns,
 						// AUTOINCREMENT is used to create auto columns
 						$details->primary_key = 0;
 						$type = $rs->MetaType( $details );
-						
+
 						$schema .= str_repeat( $indent, 2 ) . ' $details ) {
 						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
-						
+
 						if( $details['unique'] ) {
 							$schema .= str_repeat( $indent, 3 ) . '' . "\n";
 						}
-						
+
 						foreach( $details['columns'] as $column ) {
 							$schema .= str_repeat( $indent, 3 ) . '' . htmlentities( $column ) . '' . "\n";
 						}
-						
+
 						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
 					}
 				}
-				
+
 				if( $data ) {
 					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
+
 					if( is_object( $rs ) && !$rs->EOF ) {
 						$schema .= str_repeat( $indent, 2 ) . "\n";
-						
+
 						while( $row = $rs->FetchRow() ) {
 							foreach( $row as $key => $val ) {
 								if ( $val != htmlentities( $val ) ) {
 									$row[$key] = '';
 								}
 							}
-							
+
 							$schema .= str_repeat( $indent, 3 ) . '' . implode( '', $row ) . "\n";
 						}
-						
+
 						$schema .= str_repeat( $indent, 2 ) . "\n";
 					}
 				}
-				
+
 				$schema .= $indent . "
\n";
 			}
 		}
-		
+
 		$this->db->SetFetchMode( $old_mode );
-		
+
 		$schema .= '';
 		return $schema;
 	}
-	
+
 	/**
 	* Sets a prefix for database objects
 	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* Call this method to set a standard prefix that will be prepended to all database tables
 	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
 	*
 	* @param string $prefix Prefix that will be prepended.
@@ -2229,17 +2229,17 @@ class adoSchema {
 				logMsg( 'Invalid prefix: ' . $prefix );
 				return FALSE;
 		}
-		
+
 		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
 			$prefix .= '_';
 		}
-		
+
 		// prefix valid
 		logMsg( 'Set prefix: ' . $prefix );
 		$this->objectPrefix = $prefix;
 		return TRUE;
 	}
-	
+
 	/**
 	* Returns an object name with the current prefix prepended.
 	*
@@ -2255,11 +2255,11 @@ class adoSchema {
 			// prepend after quote if used
 			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
 		}
-		
+
 		// No prefix set. Use name provided.
 		return $name;
 	}
-	
+
 	/**
 	* Checks if element references a specific platform
 	*
@@ -2271,7 +2271,7 @@ class adoSchema {
 	function supportedPlatform( $platform = NULL ) {
 		if( !empty( $platform ) ) {
 			$regex = '/(^|\|)' . $this->db->databaseType . '(\||$)/i';
-		
+
 			if( preg_match( '/^- /', $platform ) ) {
 				if (preg_match ( $regex, substr( $platform, 2 ) ) ) {
 					logMsg( 'Platform ' . $platform . ' is NOT supported' );
@@ -2284,11 +2284,11 @@ class adoSchema {
 		}
 	}
 		}
-		
+
 		logMsg( 'Platform ' . $platform . ' is supported' );
 		return TRUE;
 	}
-	
+
 	/**
 	* Clears the array of generated SQL.
 	*
@@ -2297,7 +2297,7 @@ class adoSchema {
 	function clearSQL() {
 		$this->sqlArray = array();
 	}
-	
+
 	/**
 	* Adds SQL into the SQL array.
 	*
@@ -2305,58 +2305,58 @@ class adoSchema {
 	* @return boolean TRUE if successful, else FALSE.
 	*
 	* @access private
-	*/	
+	*/
 	function addSQL( $sql = NULL ) {
 		if( is_array( $sql ) ) {
 			foreach( $sql as $line ) {
 				$this->addSQL( $line );
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		if( is_string( $sql ) ) {
 			$this->sqlArray[] = $sql;
-			
+
 			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
 			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
 				$saved = $this->db->debug;
 				$this->db->debug = $this->debug;
 				$ok = $this->db->Execute( $sql );
 				$this->db->debug = $saved;
-				
+
 				if( !$ok ) {
 					if( $this->debug ) {
 						ADOConnection::outp( $this->db->ErrorMsg() );
 					}
-					
+
 					$this->success = 1;
 				}
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Gets the SQL array in the specified format.
 	*
 	* @param string $format Format
 	* @return mixed SQL
-	*	
+	*
 	* @access private
 	*/
 	function getSQL( $format = NULL, $sqlArray = NULL ) {
 		if( !is_array( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		switch( strtolower( $format ) ) {
 			case 'string':
 			case 'text':
@@ -2364,10 +2364,10 @@ class adoSchema {
 			case'html':
 				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
 		}
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Destroys an adoSchema object.
 	*
@@ -2389,18 +2389,17 @@ class adoSchema {
 function logMsg( $msg, $title = NULL, $force = FALSE ) {
 	if( XMLS_DEBUG or $force ) {
 		echo '
';
-		
+
 		if( isset( $title ) ) {
 			echo '
' . htmlentities( $title ) . '
';
 		}
-		
+
 		if( @is_object( $this ) ) {
 			echo '[' . get_class( $this ) . '] ';
 		}
-		
+
 		print_r( $msg );
-		
+
 		echo '
';
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/adodb.inc.php b/lib/WikiDB/adodb/adodb.inc.php
index 64a745461..e9011e959 100644
--- a/lib/WikiDB/adodb/adodb.inc.php
+++ b/lib/WikiDB/adodb/adodb.inc.php
@@ -1,9 +1,9 @@
-fields is available on EOF
 	 	$ADODB_FETCH_MODE,	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
 		$ADODB_GETONE_EOF,
-		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.	
-	
-	//==============================================================================================	
+		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.
+
+	//==============================================================================================
 	// GLOBAL SETUP
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
-	
-	//********************************************************//
-	/*
-	Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
-	Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi
 
- 		0 = ignore empty fields. All empty fields in array are ignored.
-		1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
-		2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
-		3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
-	*/
-        define('ADODB_FORCE_IGNORE',0);
-        define('ADODB_FORCE_NULL',1);
-        define('ADODB_FORCE_EMPTY',2);
-        define('ADODB_FORCE_VALUE',3);
-    //********************************************************//
+	// ********************************************************
+	// Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
+	// Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi
+	//
+	// 0 = ignore empty fields. All empty fields in array are ignored.
+	// 1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
+	// 2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
+	// 3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
+
+		define('ADODB_FORCE_IGNORE',0);
+		define('ADODB_FORCE_NULL',1);
+		define('ADODB_FORCE_EMPTY',2);
+		define('ADODB_FORCE_VALUE',3);
+	// ********************************************************
 
 
 	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-		
+
 		define('ADODB_BAD_RS','
Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;
');
-	
+
 	// allow [ ] @ ` " and . in table names
 		define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
-	
+
 	// prefetching used by oracle
 		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-	
-	
+
+
 	/*
 	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
 	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-	
- 		0 = assoc lowercase field names. $rs->fields['orderid']
+
+		0 = assoc lowercase field names. $rs->fields['orderid']
 		1 = assoc uppercase field names. $rs->fields['ORDERID']
 		2 = use native-case field names. $rs->fields['OrderID']
 	*/
-	
+		define('ADODB_ASSOC_CASE_LOWER', 0);
+		define('ADODB_ASSOC_CASE_UPPER', 1);
+		define('ADODB_ASSOC_CASE_NATIVE', 2);
+
 		define('ADODB_FETCH_DEFAULT',0);
 		define('ADODB_FETCH_NUM',1);
 		define('ADODB_FETCH_ASSOC',2);
 		define('ADODB_FETCH_BOTH',3);
-		
+
 		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-	
+
 		// PHP's version scheme makes converting to numbers difficult - workaround
 		$_adodb_ver = (float) PHP_VERSION;
 		if ($_adodb_ver >= 5.2) {
 			define('ADODB_PHPVER',0x5200);
 		} else if ($_adodb_ver >= 5.0) {
 			define('ADODB_PHPVER',0x5000);
-		} else 
+		} else
 			die("PHP5 or later required. You are running ".PHP_VERSION);
 	}
-	
-	
+
+
 	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 
-	
+
 	/**
 	 	Accepts $src and $dest arrays, replacing string $data
 	*/
 	function ADODB_str_replace($src, $dest, $data)
 	{
 		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
-		
+
 		$s = reset($src);
 		$d = reset($dest);
 		while ($s !== false) {
@@ -142,10 +144,10 @@
 		}
 		return $data;
 	}
-	
+
 	function ADODB_Setup()
 	{
-	GLOBAL 
+	GLOBAL
 		$ADODB_vers, 		// database version
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
@@ -155,7 +157,7 @@
 		$ADODB_FORCE_TYPE,
 		$ADODB_GETONE_EOF,
 		$ADODB_QUOTE_FIELDNAMES;
-		
+
 		if (empty($ADODB_CACHE_CLASS)) $ADODB_CACHE_CLASS =  'ADODB_Cache_File' ;
 		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
 		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
@@ -165,58 +167,58 @@
 			$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
 		} else {
 			// do not accept url based paths, eg. http:/ or ftp:/
-			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
+			if (strpos($ADODB_CACHE_DIR,'://') !== false)
 				die("Illegal path http:// or ftp://");
 		}
-		
-			
+
+
 		// Initialize random number generator for randomizing cache flushes
 		// -- note Since PHP 4.2.0, the seed  becomes optional and defaults to a random value if omitted.
 		 srand(((double)microtime())*1000000);
-		
+
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
-	
+		$ADODB_vers = 'V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
+
 		/**
-		 * Determines whether recordset->RecordCount() is used. 
+		 * Determines whether recordset->RecordCount() is used.
 		 * Set to false for highest performance -- RecordCount() will always return -1 then
 		 * for databases that provide "virtual" recordcounts...
 		 */
-		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
+		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true;
 	}
-	
-	
-	//==============================================================================================	
+
+
+	//==============================================================================================
 	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	ADODB_Setup();
 
-	//==============================================================================================	
+	//==============================================================================================
 	// CLASS ADOFieldObject
-	//==============================================================================================	
+	//==============================================================================================
 	/**
 	 * Helper class for FetchFields -- holds info on a column
 	 */
-	class ADOFieldObject { 
+	class ADOFieldObject {
 		var $name = '';
 		var $max_length=0;
 		var $type="";
 /*
 		// additional fields by dannym... (danny_milo@yahoo.com)
-		var $not_null = false; 
+		var $not_null = false;
 		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
 		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
 
-		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
+		var $has_default = false; // this one I have done only in mysql and postgres for now ...
 			// others to come (dannym)
 		var $default_value; // default, if any, and supported. Check has_default first.
 */
 	}
-	
-	
+
+
 	function _adodb_safedate($s)
 	{
 		return str_replace(array("'", '\\'), '', $s);
@@ -238,16 +240,16 @@
 				$s2 .= $ch;
 				break;
 			}
-			
+
 			$s2 .= $ch;
 		}
-		
+
 		return strlen($s2) == 0 ? 'null' : $s2;
 	}
 
-	
+
 	// for transaction handling
-	
+
 	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
 	{
 		//print "Errorno ($fn errno=$errno m=$errmsg) ";
@@ -257,46 +259,46 @@
 			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
 		}
 	}
-	
+
 	//------------------
 	// class for caching
 	class ADODB_Cache_File {
-	
+
 		var $createdir = true; // requires creation of temp dirs
-		
+
 		function ADODB_Cache_File()
 		{
 		global $ADODB_INCLUDED_CSV;
 			if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
 		}
-		
+
 		// write serialised recordset to cache item/file
 		function writecache($filename, $contents,  $debug, $secs2cache)
 		{
 			return adodb_write_file($filename, $contents,$debug);
 		}
-		
+
 		// load serialised recordset and unserialise it
 		function &readcache($filename, &$err, $secs2cache, $rsClass)
 		{
 			$rs = csv2rs($filename,$err,$secs2cache,$rsClass);
 			return $rs;
 		}
-		
+
 		// flush all items in cache
 		function flushall($debug=false)
 		{
 		global $ADODB_CACHE_DIR;
 
 		$rez = false;
-		
+
 			if (strlen($ADODB_CACHE_DIR) > 1) {
 				$rez = $this->_dirFlush($ADODB_CACHE_DIR);
 	         	if ($debug) ADOConnection::outp( "flushall: $dir
\n". $rez."
");
 	   		}
 			return $rez;
 		}
-		
+
 		// flush one file in cache
 		function flushcache($f, $debug=false)
 		{
@@ -304,43 +306,43 @@
 		   		if ($debug) ADOConnection::outp( "flushcache: failed for $f");
 			}
 		}
-		
+
 		function getdirname($hash)
 		{
 		global $ADODB_CACHE_DIR;
 			if (!isset($this->notSafeMode)) $this->notSafeMode = !ini_get('safe_mode');
 			return ($this->notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($hash,0,2) : $ADODB_CACHE_DIR;
 		}
-		
+
 		// create temp directories
 		function createdir($hash, $debug)
 		{
 		global $ADODB_CACHE_PERMS;
-		
+
 			$dir = $this->getdirname($hash);
 			if ($this->notSafeMode && !file_exists($dir)) {
 				$oldu = umask(0);
 				if (!@mkdir($dir, empty($ADODB_CACHE_PERMS) ? 0771 : $ADODB_CACHE_PERMS)) if(!is_dir($dir) && $debug) ADOConnection::outp("Cannot create $dir");
 				umask($oldu);
 			}
-		
+
 			return $dir;
 		}
-		
+
 		/**
 		* Private function to erase all of the files and subdirectories in a directory.
 		*
 		* Just specify the directory, and tell it if you want to delete the directory or just clear it out.
 		* Note: $kill_top_level is used internally in the function to flush subdirectories.
 		*/
-		function _dirFlush($dir, $kill_top_level = false) 
+		function _dirFlush($dir, $kill_top_level = false)
 		{
 		   if(!$dh = @opendir($dir)) return;
-		   
+
 		   while (($obj = readdir($dh))) {
 		   		if($obj=='.' || $obj=='..') continue;
 				$f = $dir.'/'.$obj;
-		
+
 				if (strpos($obj,'.cache')) @unlink($f);
 				if (is_dir($f)) $this->_dirFlush($f, true);
 		   }
@@ -348,27 +350,27 @@
 		   return true;
 		}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADOConnection
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * Connection object. For connecting to databases, and executing queries.
-	 */ 
-	class ADOConnection {
+	 */
+	abstract class ADOConnection {
 	//
-	// PUBLIC VARS 
+	// PUBLIC VARS
 	//
 	var $dataProvider = 'native';
-	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
-	var $database = '';			/// Name of database to be used.	
-	var $host = ''; 			/// The hostname of the database server	
-	var $user = ''; 			/// The username which is used to connect to the database server. 
+	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql
+	var $database = '';			/// Name of database to be used.
+	var $host = ''; 			/// The hostname of the database server
+	var $user = ''; 			/// The username which is used to connect to the database server.
 	var $password = ''; 		/// Password for the username. For security, we no longer store it.
 	var $debug = false; 		/// if set to true will output sql statements
 	var $maxblobsize = 262144; 	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
-	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
+	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase
 	var $substr = 'substr';		/// substring operator
 	var $length = 'length';		/// string length ofperator
 	var $random = 'rand()';		/// random function
@@ -411,9 +413,9 @@
 	var $sysTimeStamp = false; /// name of function that returns the current timestamp
 	var $sysUTimeStamp = false; // name of function that returns the current timestamp accurate to the microsecond or nearest fraction
 	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
-	
+
 	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
-	var $numCacheHits = 0; 
+	var $numCacheHits = 0;
 	var $numCacheMisses = 0;
 	var $pageExecuteCountRows = true;
 	var $uniqueSort = false; /// indicates that all fields in order by must be unique
@@ -422,18 +424,18 @@
 	var $ansiOuter = false; /// whether ansi outer join syntax supported
 	var $autoRollback = false; // autoRollback on PConnect().
 	var $poorAffectedRows = false; // affectedRows not working or unreliable
-	
+
 	var $fnExecute = false;
 	var $fnCacheExecute = false;
 	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
 	var $rsPrefix = "ADORecordSet_";
-	
+
 	var $autoCommit = true; 	/// do not modify this yourself - actually private
 	var $transOff = 0; 			/// temporarily disable transactions
 	var $transCnt = 0; 			/// count of nested transactions
-	
+
 	var $fetchMode=false;
-	
+
 	var $null2null = 'null'; // in autoexecute/getinsertsql/getupdatesql, this value will be converted to a null
 	var $bulkBind = false; // enable 2D Execute array
 	 //
@@ -441,60 +443,51 @@
 	 //
 	var $_oldRaiseFn =  false;
 	var $_transOK = null;
-	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
+	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.
 	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
-								/// then returned by the errorMsg() function	
-	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
+								/// then returned by the errorMsg() function
+	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8
 	var $_queryID = false;		/// This variable keeps the last created result link identifier
-	
+
 	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
 	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
 	var $_transmode = ''; // transaction mode
-	
 
-	
-	/**
-	 * Constructor
-	 */
-	function ADOConnection()			
-	{
-		die('Virtual Class -- cannot instantiate');
-	}
-	
+
 	static function Version()
 	{
 	global $ADODB_vers;
-	
-		$ok = preg_match( '/^[Vv]([0-9\.]+)/', $ADODB_vers, $matches );
+
+		$ok = preg_match( '/^[Vv]?([0-9]\.[0-9]+(dev|[a-z]))?/', $ADODB_vers, $matches );
 		if (!$ok) return (float) substr($ADODB_vers,1);
 		else return $matches[1];
 	}
-	
+
 	/**
 		Get server version info...
-		
-		@returns An array with 2 elements: $arr['string'] is the description string, 
+
+		@returns An array with 2 elements: $arr['string'] is the description string,
 			and $arr[version] is the version (also a string).
 	*/
 	function ServerInfo()
 	{
 		return array('description' => '', 'version' => '');
 	}
-	
+
 	function IsConnected()
 	{
-    	return !empty($this->_connectionID);
+		return !empty($this->_connectionID);
 	}
-	
+
 	function _findvers($str)
 	{
 		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
 		else return '';
 	}
-	
+
 	/**
 	* All error messages go through this bottleneck function.
 	* You can define your own handler by defining the function name in ADODB_OUTP.
@@ -502,7 +495,7 @@
 	static function outp($msg,$newline=true)
 	{
 	global $ADODB_FLUSH,$ADODB_OUTP;
-	
+
 		if (defined('ADODB_OUTP')) {
 			$fn = ADODB_OUTP;
 			$fn($msg,$newline);
@@ -512,25 +505,25 @@
 			$fn($msg,$newline);
 			return;
 		}
-		
+
 		if ($newline) $msg .= "
\n";
-		
+
 		if (isset($_SERVER['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 
-		
+
+
+		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");
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
 		return false;
 	}
-	
+
 	/**
 	 * Connect to database
 	 *
@@ -541,16 +534,16 @@
 	 * @param [forceNew]		force new connection
 	 *
 	 * @return true or false
-	 */	  
-	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
+	 */
+	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false)
 	{
 		if ($argHostname != "") $this->host = $argHostname;
 		if ($argUsername != "") $this->user = $argUsername;
 		if ($argPassword != "") $this->password = 'not stored'; // not stored for security reasons
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-		
-		$this->_isPersistentConnection = false;	
-			
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;
+
+		$this->_isPersistentConnection = false;
+
 		if ($forceNew) {
 			if ($rez=$this->_nconnect($this->host, $this->user, $argPassword, $this->database)) return true;
 		} else {
@@ -564,21 +557,21 @@
 			$err = "Missing extension for ".$this->dataProvider;
 			$ret = 0;
 		}
-		if ($fn = $this->raiseErrorFn) 
+		if ($fn = $this->raiseErrorFn)
 			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		
-		
+
+
 		$this->_connectionID = false;
 		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
 		return $ret;
-	}	
-	
+	}
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
 	}
-	
-	
+
+
 	/**
 	 * Always force a new connection to database - currently only works with oracle
 	 *
@@ -588,12 +581,12 @@
 	 * @param [argDatabaseName]	database
 	 *
 	 * @return true or false
-	 */	  
-	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
+	 */
+	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
 	{
 		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
 	}
-	
+
 	/**
 	 * Establish persistent connect to database
 	 *
@@ -603,20 +596,20 @@
 	 * @param [argDatabaseName]	database
 	 *
 	 * @return return true or false
-	 */	
+	 */
 	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
 	{
-		
-		if (defined('ADODB_NEVER_PERSIST')) 
+
+		if (defined('ADODB_NEVER_PERSIST'))
 			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-		
+
 		if ($argHostname != "") $this->host = $argHostname;
 		if ($argUsername != "") $this->user = $argUsername;
 		if ($argPassword != "") $this->password = 'not stored';
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-			
-		$this->_isPersistentConnection = true;	
-		
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;
+
+		$this->_isPersistentConnection = true;
+
 		if ($rez = $this->_pconnect($this->host, $this->user, $argPassword, $this->database)) return true;
 		if (isset($rez)) {
 			$err = $this->ErrorMsg();
@@ -629,7 +622,7 @@
 		if ($fn = $this->raiseErrorFn) {
 			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
 		}
-		
+
 		$this->_connectionID = false;
 		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
 		return $ret;
@@ -640,32 +633,32 @@
 		if (defined('ADODB_ERROR_HANDLER') &&  ADODB_ERROR_HANDLER == 'adodb_throw') {
 			adodb_throw($this->databaseType,$src,-9999,$msg,$sql,false,$this);
 			return;
-		} 
+		}
 		ADOConnection::outp($msg);
 	}
-	
+
 	// create cache class. Code is backward compat with old memcache implementation
 	function _CreateCache()
 	{
 	global $ADODB_CACHE, $ADODB_CACHE_CLASS;
-	
+
 		if ($this->memCache) {
 		global $ADODB_INCLUDED_MEMCACHE;
-		
+
 			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
 				$ADODB_CACHE = new ADODB_Cache_MemCache($this);
 		} else
 				$ADODB_CACHE = new $ADODB_CACHE_CLASS($this);
-		
+
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysDate;
 		return $col; // child class implement
 	}
-	
+
 	/**
 	 * Should prepare the sql statement and return the stmt resource.
 	 * For databases that do not support this, we return the $sql. To ensure
@@ -680,7 +673,7 @@
 	 * @return return FALSE, or the prepared statement, or the original sql if
 	 * 			if the database does not support prepare.
 	 *
-	 */	
+	 */
 	function Prepare($sql)
 	{
 		return $sql;
@@ -699,7 +692,7 @@
 	 * @return return FALSE, or the prepared statement, or the original sql if
 	 * 			if the database does not support prepare.
 	 *
-	 */	
+	 */
 	function PrepareSP($sql,$param=true)
 	{
 		return $this->Prepare($sql,$param);
@@ -712,7 +705,7 @@
 	{
 		return $this->qstr($s,false);
 	}
-	
+
 	/**
 	 Requested by "Karsten Dambekalns" 
 	*/
@@ -726,48 +719,48 @@
 		#if (!empty($this->qNull)) if ($s == 'null') return $s;
 		$s = $this->qstr($s,false);
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function ErrorNative()
 	{
 		return $this->ErrorNo();
 	}
 
-	
-   /**
-	* PEAR DB Compat - do not use internally. 
-	*/
+
+	/**
+	 * PEAR DB Compat - do not use internally.
+	 */
 	function nextId($seq_name)
 	{
 		return $this->GenID($seq_name);
 	}
 
 	/**
-	*	 Lock a row, will escalate and lock the table if row locking not supported
-	*	will normally free the lock at the end of the transaction
-	*
-	*  @param $table	name of table to lock
-	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
-	*/
+	 *	 Lock a row, will escalate and lock the table if row locking not supported
+	 *	will normally free the lock at the end of the transaction
+	 *
+	 *  @param $table	name of table to lock
+	 *  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
+	 */
 	function RowLock($table,$where,$col='1 as adodbignore')
 	{
 		return false;
 	}
-	
+
 	function CommitLock($table)
 	{
 		return $this->CommitTrans();
 	}
-	
+
 	function RollbackLock($table)
 	{
 		return $this->RollbackTrans();
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*
 	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
 	* 	for easy porting :-)
@@ -776,20 +769,20 @@
 	* @returns		The previous fetch mode
 	*/
 	function SetFetchMode($mode)
-	{	
+	{
 		$old = $this->fetchMode;
 		$this->fetchMode = $mode;
-		
+
 		if ($old === false) {
 		global $ADODB_FETCH_MODE;
 			return $ADODB_FETCH_MODE;
 		}
 		return $old;
 	}
-	
+
 
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function Query($sql, $inputarr=false)
 	{
@@ -798,18 +791,18 @@
 		return $rs;
 	}
 
-	
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
 	function LimitQuery($sql, $offset, $count, $params=false)
 	{
-		$rs = $this->SelectLimit($sql, $count, $offset, $params); 
+		$rs = $this->SelectLimit($sql, $count, $offset, $params);
 		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
 		return $rs;
 	}
 
-	
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
@@ -817,21 +810,25 @@
 	{
 		return $this->Close();
 	}
-	
-	/*
-		 Returns placeholder for parameter, eg.
-		 $DB->Param('a')
-		 
-		 will return ':a' for Oracle, and '?' for most other databases...
-		 
-		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
-		 	pass in Param(false) before setting the first parameter.
-	*/
+
+	/**
+	 * Returns a placeholder for query parameters
+	 * e.g. $DB->Param('a') will return
+	 * - '?' for most databases
+	 * - ':a' for Oracle
+	 * - '$1', '$2', etc. for PostgreSQL
+	 * @param string $name parameter's name, false to force a reset of the
+	 *                     number to 1 (for databases that require positioned
+	 *                     params such as PostgreSQL; note that ADOdb will
+	 *                     automatically reset this when executing a query )
+	 * @param string $type (unused)
+	 * @return string query parameter placeholder
+	 */
 	function Param($name,$type='C')
 	{
 		return '?';
 	}
-	
+
 	/*
 		InParameter and OutParameter are self-documenting versions of Parameter().
 	*/
@@ -839,23 +836,23 @@
 	{
 		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
 	}
-	
+
 	/*
 	*/
 	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 	{
 		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-	
+
 	}
 
-	
-	/* 
+
+	/*
 	Usage in oracle
 		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
 		$db->Parameter($stmt,$id,'myid');
 		$db->Parameter($stmt,$group,'group',64);
 		$db->Execute();
-		
+
 		@param $stmt Statement returned by Prepare() or PrepareSP().
 		@param $var PHP variable to bind to
 		@param $name Name of stored procedure variable name to bind to.
@@ -868,8 +865,8 @@
 	{
 		return false;
 	}
-	
-	
+
+
 	function IgnoreErrors($saveErrs=false)
 	{
 		if (!$saveErrs) {
@@ -881,11 +878,11 @@
 			$this->_transOK = $saveErrs[1];
 		}
 	}
-	
+
 	/**
 		Improved method of initiating a transaction. Used together with CompleteTrans().
 		Advantages include:
-		
+
 		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
 		   Only the outermost block is treated as a transaction.

 		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.

@@ -898,23 +895,23 @@
 			$this->transOff += 1;
 			return true;
 		}
-		
+
 		$this->_oldRaiseFn = $this->raiseErrorFn;
 		$this->raiseErrorFn = $errfn;
 		$this->_transOK = true;
-		
+
 		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
 		$ok = $this->BeginTrans();
 		$this->transOff = 1;
 		return $ok;
 	}
-	
-	
+
+
 	/**
 		Used together with StartTrans() to end a transaction. Monitors connection
 		for sql errors, and will commit or rollback as appropriate.
-		
-		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
+
+		@autoComplete if true, monitor sql errors and commit and rollback as appropriate,
 		and if set to false force rollback even if no SQL error detected.
 		@returns true on commit, false on rollback.
 	*/
@@ -925,7 +922,7 @@
 			return true;
 		}
 		$this->raiseErrorFn = $this->_oldRaiseFn;
-		
+
 		$this->transOff = 0;
 		if ($this->_transOK && $autoComplete) {
 			if (!$this->CommitTrans()) {
@@ -938,16 +935,16 @@
 			$this->RollbackTrans();
 			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
 		}
-		
+
 		return $this->_transOK;
 	}
-	
+
 	/*
 		At the end of a StartTrans/CompleteTrans block, perform a rollback.
 	*/
 	function FailTrans()
 	{
-		if ($this->debug) 
+		if ($this->debug)
 			if ($this->transOff == 0) {
 				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
 			} else {
@@ -956,7 +953,7 @@
 			}
 		$this->_transOK = false;
 	}
-	
+
 	/**
 		Check if transaction has failed, only for Smart Transactions.
 	*/
@@ -965,43 +962,43 @@
 		if ($this->transOff > 0) return $this->_transOK == false;
 		return false;
 	}
-	
+
 	/**
-	 * Execute SQL 
+	 * Execute SQL
 	 *
 	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
 	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
 	 * @return 		RecordSet or false
 	 */
-	function Execute($sql,$inputarr=false) 
+	function Execute($sql,$inputarr=false)
 	{
 		if ($this->fnExecute) {
 			$fn = $this->fnExecute;
 			$ret = $fn($this,$sql,$inputarr);
 			if (isset($ret)) return $ret;
 		}
-		if ($inputarr) {
+		if ($inputarr !== false) {
 			if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
+
 			$element0 = reset($inputarr);
 			# is_object check because oci8 descriptors can be passed in
 			$array_2d = $this->bulkBind && is_array($element0) && !is_object(reset($element0));
-		
+
 			//remove extra memory copy of input -mikefedyk
 			unset($element0);
-			
+
 			if (!is_array($sql) && !$this->_bindInputArray) {
 				$sqlarr = explode('?',$sql);
 				$nparams = sizeof($sqlarr)-1;
 				if (!$array_2d) $inputarr = array($inputarr);
-	
+
 				foreach($inputarr as $arr) {
 					$sql = ''; $i = 0;
 					//Use each() instead of foreach to reduce memory usage -mikefedyk
 					while(list(, $v) = each($arr)) {
 						$sql .= $sqlarr[$i];
 						// from Ron Baldwin 
-						// Only quote string types	
+						// Only quote string types
 						$typ = gettype($v);
 						if ($typ == 'string')
 							//New memory copy of input created here -mikefedyk
@@ -1018,25 +1015,25 @@
 						else
 							$sql .= $v;
 						$i += 1;
-						
+
 						if ($i == $nparams) break;
 					} // while
 					if (isset($sqlarr[$i])) {
 						$sql .= $sqlarr[$i];
 						if ($i+1 != sizeof($sqlarr)) $this->outp_throw( "Input Array does not match ?: ".htmlspecialchars($sql),'Execute');
-					} else if ($i != sizeof($sqlarr))	
+					} else if ($i != sizeof($sqlarr))
 						$this->outp_throw( "Input array does not match ?: ".htmlspecialchars($sql),'Execute');
-		
+
 					$ret = $this->_Execute($sql);
 					if (!$ret) return $ret;
-				}	
+				}
 			} else {
 				if ($array_2d) {
 					if (is_string($sql))
 						$stmt = $this->Prepare($sql);
 					else
 						$stmt = $sql;
-					
+
 					foreach($inputarr as $arr) {
 						$ret = $this->_Execute($stmt,$arr);
 						if (!$ret) return $ret;
@@ -1051,8 +1048,8 @@
 
 		return $ret;
 	}
-	
-	
+
+
 	function _Execute($sql,$inputarr=false)
 	{
 		if ($this->debug) {
@@ -1062,28 +1059,28 @@
 		} else {
 			$this->_queryID = @$this->_query($sql,$inputarr);
 		}
-		
-		/************************
+
+		// ************************
 		// OK, query executed
-		*************************/
+		// ************************
 
 		if ($this->_queryID === false) { // error handling if query fails
-			if ($this->debug == 99) adodb_backtrace(true,5);	
+			if ($this->debug == 99) adodb_backtrace(true,5);
 			$fn = $this->raiseErrorFn;
 			if ($fn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-			} 
+			}
 			$false = false;
 			return $false;
-		} 
-		
+		}
+
 		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
 			$rsclass = $this->rsPrefix.'empty';
 			$rs = (class_exists($rsclass)) ? new $rsclass():  new ADORecordSet_empty();
-			
+
 			return $rs;
 		}
-		
+
 		// return real recordset from select statement
 		$rsclass = $this->rsPrefix.$this->databaseType;
 		$rs = new $rsclass($this->_queryID,$this->fetchMode);
@@ -1094,7 +1091,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
@@ -1129,16 +1126,16 @@
 		if (!$this->hasGenID) {
 			return 0; // formerly returns false pre 1.60
 		}
-		
+
 		$getnext = sprintf($this->_genIDSQL,$seqname);
-		
+
 		$holdtransOK = $this->_transOK;
-		
+
 		$save_handler = $this->raiseErrorFn;
 		$this->raiseErrorFn = '';
 		@($rs = $this->Execute($getnext));
 		$this->raiseErrorFn = $save_handler;
-		
+
 		if (!$rs) {
 			$this->_transOK = $holdtransOK; //if the status was ok before reset
 			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
@@ -1146,17 +1143,17 @@
 		}
 		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
 		else $this->genID = 0; // false
-	
+
 		if ($rs) $rs->Close();
 
 		return $this->genID;
-	}	
+	}
 
 	/**
 	 * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
 	 * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
 	 * @return  the last inserted ID. Not all databases support this.
-	 */ 
+	 */
 	function Insert_ID($table='',$column='')
 	{
 		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
@@ -1174,8 +1171,8 @@
 	 *
 	 * @return  the last inserted ID. All databases support this. But aware possible
 	 * problems in multiuser environments. Heavy test this before deploying.
-	 */ 
-	function PO_Insert_ID($table="", $id="") 
+	 */
+	function PO_Insert_ID($table="", $id="")
 	{
 	   if ($this->hasInsertID){
 		   return $this->Insert_ID($table,$id);
@@ -1186,7 +1183,7 @@
 
 	/**
 	* @return # rows affected by UPDATE/DELETE
-	*/ 
+	*/
 	function Affected_Rows()
 	{
 		if ($this->hasAffectedRows) {
@@ -1196,12 +1193,12 @@
 			$val = $this->_affectedrows();
 			return ($val < 0) ? false : $val;
 		}
-				  
+
 		if ($this->debug) ADOConnection::outp( '
Affected_Rows error
',false);
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * @return  the last error message
 	 */
@@ -1210,29 +1207,29 @@
 		if ($this->_errorMsg) return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
 		else return '';
 	}
-	
-	
+
+
 	/**
 	 * @return the last error number. Normally 0 means no error.
 	 */
-	function ErrorNo() 
+	function ErrorNo()
 	{
 		return ($this->_errorMsg) ? -1 : 0;
 	}
-	
+
 	function MetaError($err=false)
 	{
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		if ($err === false) $err = $this->ErrorNo();
 		return adodb_error($this->dataProvider,$this->databaseType,$err);
 	}
-	
+
 	function MetaErrorMsg($errno)
 	{
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		return adodb_errormsg($errno);
 	}
-	
+
 	/**
 	 * @returns an array with the primary key columns in it.
 	 */
@@ -1252,7 +1249,7 @@
 			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
 		return false;
 	}
-	
+
 	/**
 	 * @returns assoc array where keys are tables, and values are foreign keys
 	 */
@@ -1266,40 +1263,40 @@
 	 * @param dbName 	is the name of the database to select
 	 * @return 		true or false
 	 */
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{return false;}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
-	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
-	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]		is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
+	 * Will select, getting rows from $offset (1-based), for $nrows.
+	 * This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	 * the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	 * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	 * eg.
+	 *  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
+	 *  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
+	 *
+	 * Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
+	 * BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
+	 *
+	 * @param sql
+	 * @param [offset]	is the row to start calculations from (1-based)
+	 * @param [nrows]		is the number of rows to get
+	 * @param [inputarr]	array of bind variables
+	 * @param [secs2cache]		is a private parameter only used by jlim
+	 * @return		the recordset ($rs->databaseType == 'array')
+	 */
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		if ($this->hasTop && $nrows > 0) {
-		// suggested by Reinhard Balling. Access requires top after distinct 
+		// suggested by Reinhard Balling. Access requires top after distinct
 		 // Informix requires first before distinct - F Riosa
 			$ismssql = (strpos($this->databaseType,'mssql') !== false);
 			if ($ismssql) $isaccess = false;
 			else $isaccess = (strpos($this->databaseType,'access') !== false);
-			
+
 			if ($offset <= 	0) {
-				
+
 					// access includes ties in result
 					if ($isaccess) {
 						$sql = preg_replace(
@@ -1329,18 +1326,18 @@
 				}
 			}
 		}
-		
+
 		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
 		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
 		global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-			
+
 
 		if ($secs2cache != 0) $rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		else $rs = $this->Execute($sql,$inputarr);
-		
+
 		$ADODB_COUNTRECS = $savec;
 		if ($rs && !$rs->EOF) {
 			$rs = $this->_rs2rs($rs,$nrows,$offset);
@@ -1348,7 +1345,7 @@
 		//print_r($rs);
 		return $rs;
 	}
-	
+
 	/**
 	* Create serializable recordset. Breaks rs link to connection.
 	*
@@ -1359,10 +1356,10 @@
 		$rs2 = $this->_rs2rs($rs);
 		$ignore = false;
 		$rs2->connection = $ignore;
-		
+
 		return $rs2;
 	}
-	
+
 	/**
 	* Convert database recordset to an array recordset
 	* input recordset's cursor should be at beginning, and
@@ -1397,9 +1394,9 @@
 		$arr = $rs->GetArrayLimit($nrows,$offset);
 		//print_r($arr);
 		if ($close) $rs->Close();
-		
+
 		$arrayClass = $this->arrayClass;
-		
+
 		$rs2 = new $arrayClass();
 		$rs2->connection = $this;
 		$rs2->sql = $rs->sql;
@@ -1408,7 +1405,7 @@
 		$rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
 		return $rs2;
 	}
-	
+
 	/*
 	* Return all rows. Compat with PEAR DB
 	*/
@@ -1417,7 +1414,7 @@
 		$arr = $this->GetArray($sql,$inputarr);
 		return $arr;
 	}
-	
+
 	function GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
 	{
 		$rs = $this->Execute($sql, $inputarr);
@@ -1428,7 +1425,7 @@
 		$arr = $rs->GetAssoc($force_array,$first2cols);
 		return $arr;
 	}
-	
+
 	function CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
 	{
 		if (!is_numeric($secs2cache)) {
@@ -1443,7 +1440,7 @@
 		$arr = $rs->GetAssoc($force_array,$first2cols);
 		return $arr;
 	}
-	
+
 	/**
 	* Return first element of first row of sql statement. Recordset is disposed
 	* for you.
@@ -1456,32 +1453,32 @@
 	global $ADODB_COUNTRECS,$ADODB_GETONE_EOF;
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
+
 		$ret = false;
 		$rs = $this->Execute($sql,$inputarr);
-		if ($rs) {	
+		if ($rs) {
 			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
 			else $ret = reset($rs->fields);
-			
+
 			$rs->Close();
 		}
 		$ADODB_COUNTRECS = $crecs;
 		return $ret;
 	}
-	
+
 	// $where should include 'WHERE fld=value'
 	function GetMedian($table, $field,$where = '')
 	{
 		$total = $this->GetOne("select count(*) from $table $where");
 		if (!$total) return false;
-	
+
 		$midrow = (integer) ($total/2);
 		$rs = $this->SelectLimit("select $field from $table $where order by 1",1,$midrow);
 		if ($rs && !$rs->EOF) return reset($rs->fields);
 		return false;
 	}
-	
-	
+
+
 	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_GETONE_EOF;
@@ -1491,14 +1488,14 @@
 			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
 			else $ret = reset($rs->fields);
 			$rs->Close();
-		} 
-		
+		}
+
 		return $ret;
 	}
-	
+
 	function GetCol($sql, $inputarr = false, $trim = false)
 	{
-	  	
+
 	  	$rs = $this->Execute($sql, $inputarr);
 	  	if ($rs) {
 			$rv = array();
@@ -1518,7 +1515,7 @@
 			$rv = false;
 	  	return $rv;
 	}
-	
+
 	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
 	{
 	  	$rs = $this->CacheExecute($secs, $sql, $inputarr);
@@ -1538,34 +1535,34 @@
 	   		$rs->Close();
 	  	} else
 			$rv = false;
-			
+
 	  	return $rv;
 	}
-	
+
 	function Transpose(&$rs,$addfieldnames=true)
 	{
 		$rs2 = $this->_rs2rs($rs);
 		$false = false;
 		if (!$rs2) return $false;
-		
+
 		$rs2->_transpose($addfieldnames);
 		return $rs2;
 	}
- 
+
 	/*
 		Calculate the offset of a date for a particular database and generate
 			appropriate SQL. Useful for calculating future/past dates and storing
 			in a database.
-			
+
 		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
 	*/
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
 		return  '('.$date.'+'.$dayFraction.')';
 	}
-	
-	
+
+
 	/**
 	*
 	* @param sql			SQL statement
@@ -1574,12 +1571,12 @@
 	function GetArray($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
 		$rs = $this->Execute($sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		if (!$rs) 
+		if (!$rs)
 			if (defined('ADODB_PEAR')) {
 				$cls = ADODB_PEAR_Error();
 				return $cls;
@@ -1591,23 +1588,23 @@
 		$rs->Close();
 		return $arr;
 	}
-	
+
 	function CacheGetAll($secs2cache,$sql=false,$inputarr=false)
 	{
 		$arr = $this->CacheGetArray($secs2cache,$sql,$inputarr);
 		return $arr;
 	}
-	
+
 	function CacheGetArray($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
 		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		
-		if (!$rs) 
+
+		if (!$rs)
 			if (defined('ADODB_PEAR')) {
 				$cls = ADODB_PEAR_Error();
 				return $cls;
@@ -1619,16 +1616,16 @@
 		$rs->Close();
 		return $arr;
 	}
-	
+
 	function GetRandRow($sql, $arr= false)
 	{
 		$rezarr = $this->GetAll($sql, $arr);
 		$sz = sizeof($rezarr);
 		return $rezarr[abs(rand()) % $sz];
 	}
-	
+
 	/**
-	* Return one row of sql statement. Recordset is disposed for you. 
+	* Return one row of sql statement. Recordset is disposed for you.
 	* Note that SelectLimit should not be called.
 	*
 	* @param sql			SQL statement
@@ -1639,9 +1636,9 @@
 	global $ADODB_COUNTRECS;
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
+
 		$rs = $this->Execute($sql,$inputarr);
-		
+
 		$ADODB_COUNTRECS = $crecs;
 		if ($rs) {
 			if (!$rs->EOF) $arr = $rs->fields;
@@ -1649,27 +1646,27 @@
 			$rs->Close();
 			return $arr;
 		}
-		
+
 		$false = false;
 		return $false;
 	}
-	
+
 	function CacheGetRow($secs2cache,$sql=false,$inputarr=false)
 	{
 		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		if ($rs) {
 			if (!$rs->EOF) $arr = $rs->fields;
 			else $arr = array();
-			
+
 			$rs->Close();
 			return $arr;
 		}
 		$false = false;
 		return $false;
 	}
-	
+
 	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
+	* Insert or replace a single record. Note: this is not the same as MySQL's replace.
 	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
 	* Also note that no table locking is done currently, so it is possible that the
 	* record be inserted twice by two programs...
@@ -1685,38 +1682,38 @@
 	*
 	* Currently blob replace not supported
 	*
-	* returns 0 = fail, 1 = update, 2 = insert 
+	* returns 0 = fail, 1 = update, 2 = insert
 	*/
-	
+
 	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		
+
 		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
 	}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
-	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]	is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
+	 * Will select, getting rows from $offset (1-based), for $nrows.
+	 * This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	 * the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	 * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	 * eg.
+	 *  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
+	 *  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
+	 *
+	 * BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
+	 *
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
+	 * @param sql
+	 * @param [offset]	is the row to start calculations from (1-based)
+	 * @param [nrows]	is the number of rows to get
+	 * @param [inputarr]	array of bind variables
+	 * @return		the recordset ($rs->databaseType == 'array')
+	 */
 	function CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-	{	
+	{
 		if (!is_numeric($secs2cache)) {
 			if ($sql === false) $sql = -1;
 			if ($offset == -1) $offset = false;
@@ -1728,52 +1725,52 @@
 		}
 		return $rs;
 	}
-	
-	
+
+
 	/**
-	* Flush cached recordsets that match a particular $sql statement. 
-	* If $sql == false, then we purge all files in the cache.
- 	*/
-	
+	 * Flush cached recordsets that match a particular $sql statement.
+	 * If $sql == false, then we purge all files in the cache.
+	 */
+
 	/**
-   * Flush cached recordsets that match a particular $sql statement. 
-   * If $sql == false, then we purge all files in the cache.
-    */
+	 * Flush cached recordsets that match a particular $sql statement.
+	 * If $sql == false, then we purge all files in the cache.
+	 */
 	function CacheFlush($sql=false,$inputarr=false)
 	{
 	global $ADODB_CACHE_DIR, $ADODB_CACHE;
-		
+
 		if (empty($ADODB_CACHE)) return false;
-		
+
 		if (!$sql) {
 			 $ADODB_CACHE->flushall($this->debug);
 	         return;
 	    }
-		
+
 		$f = $this->_gencachename($sql.serialize($inputarr),false);
 		return $ADODB_CACHE->flushcache($f, $this->debug);
 	}
-   
-	
+
+
 	/**
-	* Private function to generate filename for caching.
-	* Filename is generated based on:
-	*
-	*  - sql statement
-	*  - database type (oci8, ibase, ifx, etc)
-	*  - database name
-	*  - userid
-	*  - setFetchMode (adodb 4.23)
-	*
-	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
-	* Assuming that we can have 50,000 files per directory with good performance, 
-	* then we can scale to 12.8 million unique cached recordsets. Wow!
- 	*/
+	 * Private function to generate filename for caching.
+	 * Filename is generated based on:
+	 *
+	 *  - sql statement
+	 *  - database type (oci8, ibase, ifx, etc)
+	 *  - database name
+	 *  - userid
+	 *  - setFetchMode (adodb 4.23)
+	 *
+	 * When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR).
+	 * Assuming that we can have 50,000 files per directory with good performance,
+	 * then we can scale to 12.8 million unique cached recordsets. Wow!
+	 */
 	function _gencachename($sql,$createdir)
 	{
 	global $ADODB_CACHE, $ADODB_CACHE_DIR;
-		
-		if ($this->fetchMode === false) { 
+
+		if ($this->fetchMode === false) {
 		global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		} else {
@@ -1783,15 +1780,15 @@
 		if (!$ADODB_CACHE->createdir) return $m;
 		if (!$createdir) $dir = $ADODB_CACHE->getdirname($m);
 		else $dir = $ADODB_CACHE->createdir($m, $this->debug);
-		
+
 		return $dir.'/adodb_'.$m.'.cache';
 	}
-	
-	
+
+
 	/**
 	 * Execute SQL, caching recordsets.
 	 *
-	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query.
 	 *					  This is an optional parameter.
 	 * @param sql		SQL statement to execute
 	 * @param [inputarr]	holds the input data  to bind to
@@ -1800,25 +1797,25 @@
 	function CacheExecute($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_CACHE;
-	
+
 		if (empty($ADODB_CACHE)) $this->_CreateCache();
-		
+
 		if (!is_numeric($secs2cache)) {
 			$inputarr = $sql;
 			$sql = $secs2cache;
 			$secs2cache = $this->cacheSecs;
 		}
-		
+
 		if (is_array($sql)) {
 			$sqlparam = $sql;
 			$sql = $sql[0];
 		} else
 			$sqlparam = $sql;
-			
-		
+
+
 		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
 		$err = '';
-		
+
 		if ($secs2cache > 0){
 			$rs = $ADODB_CACHE->readcache($md5file,$err,$secs2cache,$this->arrayClass);
 			$this->numCacheHits += 1;
@@ -1827,7 +1824,7 @@
 			$rs = false;
 			$this->numCacheMisses += 1;
 		}
-		
+
 		if (!$rs) {
 		// no cached rs found
 			if ($this->debug) {
@@ -1836,7 +1833,7 @@
 				}
 				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (this is a notice and not an error)");
 			}
-			
+
 			$rs = $this->Execute($sqlparam,$inputarr);
 
 			if ($rs) {
@@ -1845,13 +1842,13 @@
 				$rs = $this->_rs2rs($rs); // read entire recordset into memory immediately
 				$rs->timeCreated = time(); // used by caching
 				$txt = _rs2serialize($rs,false,$sql); // serialize
-	
+
 				$ok = $ADODB_CACHE->writecache($md5file,$txt,$this->debug, $secs2cache);
 				if (!$ok) {
 					if ($ok === false) {
 						$em = 'Cache write error';
 						$en = -32000;
-						
+
 						if ($fn = $this->raiseErrorFn) {
 							$fn($this->databaseType,'CacheExecute', $en, $em, $md5file,$sql,$this);
 						}
@@ -1860,52 +1857,52 @@
 						$en = -32001;
 						// do not call error handling for just a warning
 					}
-					
+
 					if ($this->debug) ADOConnection::outp( " ".$em);
 				}
 				if ($rs->EOF && !$eof) {
 					$rs->MoveFirst();
-					//$rs = csv2rs($md5file,$err);		
+					//$rs = csv2rs($md5file,$err);
 					$rs->connection = $this; // Pablo suggestion
-				}  
-				
+				}
+
 			} else if (!$this->memCache)
 				$ADODB_CACHE->flushcache($md5file);
 		} else {
 			$this->_errorMsg = '';
 			$this->_errorCode = 0;
-			
+
 			if ($this->fnCacheExecute) {
 				$fn = $this->fnCacheExecute;
 				$fn($this, $secs2cache, $sql, $inputarr);
 			}
 		// ok, set cached object found
 			$rs->connection = $this; // Pablo suggestion
-			if ($this->debug){ 			
+			if ($this->debug){
 				if ($this->debug == 99) adodb_backtrace();
 				$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
 				$ttl = $rs->timeCreated + $secs2cache - time();
 				$s = is_array($sql) ? $sql[0] : $sql;
 				if ($inBrowser) $s = ''.htmlspecialchars($s).'';
-				
+
 				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
 			}
 		}
 		return $rs;
 	}
-	
-	
-	/* 
-		Similar to PEAR DB's autoExecute(), except that 
+
+
+	/*
+		Similar to PEAR DB's autoExecute(), except that
 		$mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
 		If $mode == 'UPDATE', then $where is compulsory as a safety measure.
-		
+
 		$forceUpdate means that even if the data has not changed, perform update.
 	 */
-	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
+	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false)
 	{
 		$false = false;
-		$sql = 'SELECT * FROM '.$table;  
+		$sql = 'SELECT * FROM '.$table;
 		if ($where!==FALSE) $sql .= ' WHERE '.$where;
 		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
 			$this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause','AutoExecute');
@@ -1916,7 +1913,7 @@
 		if (!$rs) return $false; // table does not exist
 		$rs->tableName = $table;
 		$rs->sql = $sql;
-		
+
 		switch((string) $mode) {
 		case 'UPDATE':
 		case '2':
@@ -1935,31 +1932,31 @@
 		if ($ret) $ret = true;
 		return $ret;
 	}
-	
-	
+
+
 	/**
 	 * Generates an Update Query based on an existing recordset.
 	 * $arrFields is an associative array of fields with the value
 	 * that should be assigned.
 	 *
 	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table and sql should only 
+	 *	   that is run against a single table and sql should only
 	 *		 be a simple select stmt with no groupby/orderby/limit
 	 *
 	 * "Jonathan Younger" 
-  	 */
+	 */
 	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
 	{
 		global $ADODB_INCLUDED_LIB;
 
-        //********************************************************//
-        //This is here to maintain compatibility
-        //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
+		// ********************************************************
+		// This is here to maintain compatibility
+		// with older adodb versions. Sets force type to force nulls if $forcenulls is set.
 		if (!isset($force)) {
 				global $ADODB_FORCE_TYPE;
 			    $force = $ADODB_FORCE_TYPE;
 		}
-		//********************************************************//
+		// ********************************************************
 
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
@@ -1971,30 +1968,30 @@
 	 * that should be assigned.
 	 *
 	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table.
-  	 */
+	 *       that is run against a single table.
+	 */
 	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
-	{	
+	{
 		global $ADODB_INCLUDED_LIB;
 		if (!isset($force)) {
 			global $ADODB_FORCE_TYPE;
 			$force = $ADODB_FORCE_TYPE;
-			
+
 		}
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
 	}
-	
+
 
 	/**
 	* Update a blob column, given a where clause. There are more sophisticated
 	* blob handling functions that we could have implemented, but all require
 	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use. 
+	* simple to understand and use.
 	*
 	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
 	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
+	* Usage to update a $blobvalue which has a primary key blob_id=1 into a
 	* field blobtable.blobcolumn:
 	*
 	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
@@ -2004,7 +2001,7 @@
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
-	
+
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
@@ -2013,7 +2010,7 @@
 	/**
 	* Usage:
 	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*	
+	*
 	*	$blobtype supports 'BLOB' and 'CLOB'
 	*
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
@@ -2027,45 +2024,45 @@
 		fclose($fd);
 		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
 	}
-	
+
 	function BlobDecode($blob)
 	{
 		return $blob;
 	}
-	
+
 	function BlobEncode($blob)
 	{
 		return $blob;
 	}
-	
+
 	function SetCharSet($charset)
 	{
 		return false;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
 	}
-	
+
 	function LogSQL($enable=true)
 	{
 		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		
+
 		if ($enable) $this->fnExecute = 'adodb_log_sql';
 		else $this->fnExecute = false;
-		
-		$old = $this->_logsql;	
+
+		$old = $this->_logsql;
 		$this->_logsql = $enable;
 		if ($enable && !$old) $this->_affected = false;
 		return $old;
 	}
-	
+
 	function GetCharSet()
 	{
 		return false;
 	}
-	
+
 	/**
 	* Usage:
 	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
@@ -2077,21 +2074,21 @@
 	{
 		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
 	}
-	
+
 	// not the fastest implementation - quick and dirty - jlim
 	// for best performance, use the actual $rs->MetaType().
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
-		
+
 		if (empty($this->_metars)) {
 			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars = new $rsclass(false,$this->fetchMode); 
+			$this->_metars = new $rsclass(false,$this->fetchMode);
 			$this->_metars->connection = $this;
 		}
 		return $this->_metars->MetaType($t,$len,$fieldobj);
 	}
-	
-	
+
+
 	/**
 	*  Change the SQL connection locale to a specified locale.
 	*  This is used to get the date formats written depending on the client locale.
@@ -2105,13 +2102,13 @@
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
 				break;
-				
+
 			case 'US':
 				$this->fmtDate = "'m-d-Y'";
 				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
 				break;
-				
-			case 'PT_BR': 	
+
+			case 'PT_BR':
 			case 'NL':
 			case 'FR':
 			case 'RO':
@@ -2119,12 +2116,12 @@
 				$this->fmtDate="'d-m-Y'";
 				$this->fmtTimeStamp = "'d-m-Y H:i:s'";
 				break;
-				
+
 			case 'GE':
 				$this->fmtDate="'d.m.Y'";
 				$this->fmtTimeStamp = "'d.m.Y H:i:s'";
 				break;
-				
+
 			default:
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
@@ -2133,13 +2130,13 @@
 	}
 
 	/**
-	 * GetActiveRecordsClass Performs an 'ALL' query 
-	 * 
+	 * GetActiveRecordsClass Performs an 'ALL' query
+	 *
 	 * @param mixed $class This string represents the class of the current active record
 	 * @param mixed $table Table used by the active record object
 	 * @param mixed $whereOrderBy Where, order, by clauses
-	 * @param mixed $bindarr 
-	 * @param mixed $primkeyArr 
+	 * @param mixed $bindarr
+	 * @param mixed $primkeyArr
 	 * @param array $extra Query extras: limit, offset...
 	 * @param mixed $relations Associative array: table's foreign name, "hasMany", "belongsTo"
 	 * @access public
@@ -2156,13 +2153,13 @@
 		if (!isset($_ADODB_ACTIVE_DBS))include_once(ADODB_DIR.'/adodb-active-record.inc.php');
 		return adodb_GetActiveRecordsClass($this, $class, $table, $whereOrderBy, $bindarr, $primkeyArr, $extra, $relations);
 	}
-	
+
 	function GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false)
 	{
 		$arr = $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
 		return $arr;
 	}
-	
+
 	/**
 	 * Close Connection
 	 */
@@ -2172,20 +2169,20 @@
 		$this->_connectionID = false;
 		return $rez;
 	}
-	
+
 	/**
 	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
 	 *
 	 * @return true if succeeded or false if database does not support transactions
 	 */
-	function BeginTrans() 
+	function BeginTrans()
 	{
 		if ($this->debug) ADOConnection::outp("BeginTrans: Transactions not supported for this driver");
 		return false;
 	}
-	
+
 	/* set transaction mode */
-	function SetTransactionMode( $transaction_mode ) 
+	function SetTransactionMode( $transaction_mode )
 	{
 		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
 		$this->_transmode  = $transaction_mode;
@@ -2200,11 +2197,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		$mode = strtoupper($mode);
 		$mode = str_replace('ISOLATION LEVEL ','',$mode);
-		
+
 		switch($mode) {
 
 		case 'READ UNCOMMITTED':
-			switch($db) { 
+			switch($db) {
 			case 'oci8':
 			case 'oracle':
 				return 'ISOLATION LEVEL READ COMMITTED';
@@ -2212,11 +2209,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				return 'ISOLATION LEVEL READ UNCOMMITTED';
 			}
 			break;
-					
+
 		case 'READ COMMITTED':
 				return 'ISOLATION LEVEL READ COMMITTED';
 			break;
-			
+
 		case 'REPEATABLE READ':
 			switch($db) {
 			case 'oci8':
@@ -2226,16 +2223,16 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				return 'ISOLATION LEVEL REPEATABLE READ';
 			}
 			break;
-			
+
 		case 'SERIALIZABLE':
 				return 'ISOLATION LEVEL SERIALIZABLE';
 			break;
-			
+
 		default:
 			return $mode;
 		}
 	}
-	
+
 	/**
 	 * If database does not support transactions, always return true as data always commited
 	 *
@@ -2243,71 +2240,70 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return true/false.
 	 */
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok=true)
 	{ return true;}
-	
-	
+
+
 	/**
 	 * If database does not support transactions, rollbacks always fail, so return false
 	 *
 	 * @return true/false.
 	 */
-	function RollbackTrans() 
+	function RollbackTrans()
 	{ return false;}
 
 
 	/**
-	 * return the databases that the driver can connect to. 
+	 * return the databases that the driver can connect to.
 	 * Some databases will return an empty array.
 	 *
 	 * @return an array of database names.
 	 */
-		function MetaDatabases() 
+		function MetaDatabases()
 		{
 		global $ADODB_FETCH_MODE;
-		
+
 			if ($this->metaDatabasesSQL) {
-				$save = $ADODB_FETCH_MODE; 
-				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-				
+				$save = $ADODB_FETCH_MODE;
+				$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
 				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-				
+
 				$arr = $this->GetCol($this->metaDatabasesSQL);
 				if (isset($savem)) $this->SetFetchMode($savem);
-				$ADODB_FETCH_MODE = $save; 
-			
+				$ADODB_FETCH_MODE = $save;
+
 				return $arr;
 			}
-			
+
 			return false;
 		}
-	
-	  /**
-      * List procedures or functions in an array.
-      * @param procedureNamePattern  a procedure name pattern; must match the procedure name as it is stored in the database
-      * @param catalog a catalog name; must match the catalog name as it is stored in the database;
-      * @param schemaPattern a schema name pattern;
-      *
-      * @return array of procedures on current database.
-	  
-		 Array (
-		    [name_of_procedure] => Array
-		      (
-		      [type] => PROCEDURE or FUNCTION
-		      [catalog] => Catalog_name
-		      [schema] => Schema_name
-		      [remarks] => explanatory comment on the procedure 
-		      )
-                 )		
-      */
-     function MetaProcedures($procedureNamePattern = null, $catalog  = null, $schemaPattern  = null)
-     {
-            return false;
-     }
-
-		
+
 	/**
-	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
+	 * List procedures or functions in an array.
+	 * @param procedureNamePattern  a procedure name pattern; must match the procedure name as it is stored in the database
+	 * @param catalog a catalog name; must match the catalog name as it is stored in the database;
+	 * @param schemaPattern a schema name pattern;
+	 *
+	 * @return array of procedures on current database.
+	 *
+	 * Array(
+	 *   [name_of_procedure] => Array(
+	 *     [type] => PROCEDURE or FUNCTION
+	 *     [catalog] => Catalog_name
+	 *     [schema] => Schema_name
+	 *     [remarks] => explanatory comment on the procedure
+	 *   )
+	 * )
+	 */
+	function MetaProcedures($procedureNamePattern = null, $catalog  = null, $schemaPattern  = null)
+	{
+		return false;
+	}
+
+
+	/**
+	 * @param ttype can either be 'VIEW' or 'TABLE' or false.
 	 * 		If false, both views and tables are returned.
 	 *		"VIEW" returns only views
 	 *		"TABLE" returns only tables
@@ -2315,34 +2311,34 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * @param mask  is the input mask - only supported by oci8 and postgresql
 	 *
 	 * @return  array of tables for current database.
-	 */ 
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	 */
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
-		
+
+
 		$false = false;
 		if ($mask) {
 			return $false;
 		}
 		if ($this->metaTablesSQL) {
-			$save = $ADODB_FETCH_MODE; 
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-			
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
 			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
+
 			$rs = $this->Execute($this->metaTablesSQL);
 			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save; 
-			
+			$ADODB_FETCH_MODE = $save;
+
 			if ($rs === false) return $false;
 			$arr = $rs->GetArray();
 			$arr2 = array();
-			
-			if ($hast = ($ttype && isset($arr[0][1]))) { 
+
+			if ($hast = ($ttype && isset($arr[0][1]))) {
 				$showt = strncmp($ttype,'T',1);
 			}
-			
+
 			for ($i=0; $i < sizeof($arr); $i++) {
 				if ($hast) {
 					if ($showt == 0) {
@@ -2358,8 +2354,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		}
 		return $false;
 	}
-	
-	
+
+
 	function _findschema(&$table,&$schema)
 	{
 		if (!$schema && ($at = strpos($table,'.')) !== false) {
@@ -2367,9 +2363,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$table = substr($table,$at+1);
 		}
 	}
-	
+
 	/**
-	 * List columns in a database as an array of ADOFieldObjects. 
+	 * List columns in a database as an array of ADOFieldObjects.
 	 * See top of file for definition of object.
 	 *
 	 * @param $table	table name to query
@@ -2378,17 +2374,17 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return  array of ADOFieldObjects for current table.
 	 */
-	function MetaColumns($table,$normalize=true) 
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-		
+
 		$false = false;
-		
+
 		if (!empty($this->metaColumnsSQL)) {
-		
+
 			$schema = false;
 			$this->_findschema($table,$schema);
-		
+
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
@@ -2408,48 +2404,47 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					if ($fld->scale>0) $fld->max_length += 1;
 				} else
 					$fld->max_length = $rs->fields[2];
-					
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 				else $retarr[strtoupper($fld->name)] = $fld;
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return $false;
 	}
-	
-    /**
-      * List indexes on a table as an array.
-      * @param table  table name to query
-      * @param primary true to only show primary keys. Not actually used for most databases
-	  *
-      * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
-	  
-		 Array (
-		    [name_of_index] => Array
-		      (
-	          [unique] => true or false
-	          [columns] => Array
-	          (
-	          	[0] => firstname
-		      	[1] => lastname
-	          )
-		)		
-      */
-     function MetaIndexes($table, $primary = false, $owner = false)
-     {
-	 		$false = false;
-            return $false;
-     }
 
 	/**
-	 * List columns names in a table as an array. 
+	 * List indexes on a table as an array.
+	 * @param table  table name to query
+	 * @param primary true to only show primary keys. Not actually used for most databases
+	 *
+	 * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
+	 *
+	 * Array(
+	 *   [name_of_index] => Array(
+	 *     [unique] => true or false
+	 *     [columns] => Array(
+	 *       [0] => firstname
+	 *       [1] => lastname
+	 *     )
+	 *   )
+	 * )
+	 */
+	function MetaIndexes($table, $primary = false, $owner = false)
+	{
+		$false = false;
+		return $false;
+	}
+
+	/**
+	 * List columns names in a table as an array.
 	 * @param table	table name to query
 	 *
 	 * @return  array of column names for current table.
-	 */ 
-	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
+	 */
+	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */)
 	{
 		$objarr = $this->MetaColumns($table);
 		if (!is_array($objarr)) {
@@ -2460,34 +2455,34 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($numIndexes) {
 			$i = 0;
 			if ($useattnum) {
-				foreach($objarr as $v) 
+				foreach($objarr as $v)
 					$arr[$v->attnum] = $v->name;
-				
+
 			} else
 				foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
-		
+
 		return $arr;
 	}
-			
+
 	/**
 	 * Different SQL databases used different methods to combine strings together.
-	 * This function provides a wrapper. 
-	 * 
+	 * This function provides a wrapper.
+	 *
 	 * param s	variable number of string parameters
 	 *
 	 * Usage: $db->Concat($str1,$str2);
-	 * 
+	 *
 	 * @return concatenated string
-	 */ 	 
+	 */
 	function Concat()
-	{	
+	{
 		$arr = func_get_args();
 		return implode($this->concat_operator, $arr);
 	}
-	
-	
+
+
 	/**
 	 * Converts a date "d" to a string that the database can understand.
 	 *
@@ -2499,10 +2494,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		if (empty($d) && $d !== 0) return 'null';
 		if ($isfld) return $d;
-		
+
 		if (is_object($d)) return $d->format($this->fmtDate);
-		
-		
+
+
 		if (is_string($d) && !is_numeric($d)) {
 			if ($d === 'null') return $d;
 			if (strncmp($d,"'",1) === 0) {
@@ -2515,24 +2510,24 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 
 		return adodb_date($this->fmtDate,$d);
 	}
-	
+
 	function BindDate($d)
 	{
 		$d = $this->DBDate($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
+
 	function BindTimeStamp($d)
 	{
 		$d = $this->DBTimeStamp($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
-	
+
+
 	/**
 	 * Converts a timestamp "ts" to a string that the database can understand.
 	 *
@@ -2545,11 +2540,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if (empty($ts) && $ts !== 0) return 'null';
 		if ($isfld) return $ts;
 		if (is_object($ts)) return $ts->format($this->fmtTimeStamp);
-		
+
 		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
+		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14))
 			return adodb_date($this->fmtTimeStamp,$ts);
-		
+
 		if ($ts === 'null') return $ts;
 		if ($this->isoDates && strlen($ts) !== 14) {
 			$ts = _adodb_safedate($ts);
@@ -2558,7 +2553,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$ts = ADOConnection::UnixTimeStamp($ts);
 		return adodb_date($this->fmtTimeStamp,$ts);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
 	 * @param $v is a date string in YYYY-MM-DD format
@@ -2572,16 +2567,16 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-	
+
 		if (is_numeric($v) && strlen($v) !== 8) return $v;
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
+		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|",
 			($v), $rr)) return false;
 
 		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
 		// h-m-s-MM-DD-YY
 		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 
 	/**
 	 * Also in ADORecordSet.
@@ -2596,18 +2591,18 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-		
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($v), $rr)) return false;
-			
+
 		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
+
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
 	 *
@@ -2618,7 +2613,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return a date formated as user desires
 	 */
-	 
+
 	function UserDate($v,$fmt='Y-m-d',$gmt=false)
 	{
 		$tt = $this->UnixDate($v);
@@ -2628,11 +2623,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		else if ($tt == 0) return $this->emptyDate;
 		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
 		}
-		
+
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	
+
 	}
-	
+
 		/**
 	 *
 	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
@@ -2651,19 +2646,19 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($tt == 0) return $this->emptyTimeStamp;
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
 	}
-	
+
 	function escape($s,$magic_quotes=false)
 	{
 		return $this->addq($s,$magic_quotes);
 	}
-	
+
 	/**
-	* Quotes a string, without prefixing nor appending quotes. 
+	* Quotes a string, without prefixing nor appending quotes.
 	*/
 	function addq($s,$magic_quotes=false)
 	{
 		if (!$magic_quotes) {
-		
+
 			if ($this->replaceQuote[0] == '\\'){
 				// only since php 4.0.5
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
@@ -2671,10 +2666,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			}
 			return  str_replace("'",$this->replaceQuote,$s);
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
-		
+
 		if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase'))  // ' already quoted, no need to change anything
 			return $s;
 		else {// change \' to '' for sybase/mssql
@@ -2682,12 +2677,12 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			return str_replace("\\'",$this->replaceQuote,$s);
 		}
 	}
-	
+
 	/**
 	 * Correctly quotes a string so that all strings are escaped. We prefix and append
 	 * to the string single-quotes.
 	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
+	 *
 	 * @param s			the string to quote
 	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
 	 *				This undoes the stupidity of magic quotes for GPC.
@@ -2695,9 +2690,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * @return  quoted string to be sent back to database
 	 */
 	function qstr($s,$magic_quotes=false)
-	{	
+	{
 		if (!$magic_quotes) {
-		
+
 			if ($this->replaceQuote[0] == '\\'){
 				// only since php 4.0.5
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
@@ -2705,10 +2700,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			}
 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
-		
+
 		if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase'))  // ' already quoted, no need to change anything
 			return "'$s'";
 		else {// change \' to '' for sybase/mssql
@@ -2716,14 +2711,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
 		}
 	}
-	
-	
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
-	* See readme.htm#ex8 for an example of usage.
+	* See docs-adodb.htm#ex8 for an example of usage.
 	*
 	* @param sql
 	* @param nrows		is the number of rows per page to get
@@ -2735,7 +2730,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
 	*
 	*/
-	function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
+	function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
@@ -2743,12 +2738,12 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		else $rs = _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
 		return $rs;
 	}
-	
-		
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
 	* @param secs2cache	seconds to cache data, set to 0 to force query
 	* @param sql
@@ -2757,11 +2752,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	* @param [inputarr]	array of bind variables
 	* @return		the recordset ($rs->databaseType == 'array')
 	*/
-	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
+	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false)
 	{
 		/*switch($this->dataProvider) {
 		case 'postgres':
-		case 'mysql': 
+		case 'mysql':
 			break;
 		default: $secs2cache = 0; break;
 		}*/
@@ -2770,67 +2765,67 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	}
 
 } // end class ADOConnection
-	
-	
-	
-	//==============================================================================================	
+
+
+
+	//==============================================================================================
 	// CLASS ADOFetchObj
-	//==============================================================================================	
-		
+	//==============================================================================================
+
 	/**
 	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
 	*/
 	class ADOFetchObj {
 	};
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_empty
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	class ADODB_Iterator_empty implements Iterator {
-	
+
 	    private $rs;
-	
-	    function __construct($rs) 
+
+	    function __construct($rs)
 		{
 	        $this->rs = $rs;
 	    }
-	    function rewind() 
+	    function rewind()
 		{
 	    }
-	
-		function valid() 
+
+		function valid()
 		{
 	        return !$this->rs->EOF;
 	    }
-		
-	    function key() 
+
+	    function key()
 		{
 	        return false;
 	    }
-		
-	    function current() 
+
+	    function current()
 		{
 	        return false;
 	    }
-		
-	    function next() 
+
+	    function next()
 		{
 	    }
-		
+
 		function __call($func, $params)
 		{
 			return call_user_func_array(array($this->rs, $func), $params);
 		}
-		
+
 		function hasMore()
 		{
 			return false;
 		}
-	
+
 	}
 
-	
+
 	/**
 	* Lightweight recordset when there are no records to be returned
 	*/
@@ -2852,65 +2847,65 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		function getIterator() {return new ADODB_Iterator_empty($this);}
 		function GetAssoc() {return array();}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// DATE AND TIME FUNCTIONS
-	//==============================================================================================	
+	//==============================================================================================
 	if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php');
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet
-	//==============================================================================================	
+	//==============================================================================================
 
 	class ADODB_Iterator implements Iterator {
-	
+
 	    private $rs;
-	
-	    function __construct($rs) 
+
+	    function __construct($rs)
 		{
 	        $this->rs = $rs;
 	    }
-	    function rewind() 
+	    function rewind()
 		{
 	        $this->rs->MoveFirst();
 	    }
-	
-		function valid() 
+
+		function valid()
 		{
 	        return !$this->rs->EOF;
 	    }
-		
-	    function key() 
+
+	    function key()
 		{
 	        return $this->rs->_currentRow;
 	    }
-		
-	    function current() 
+
+	    function current()
 		{
 	        return $this->rs->fields;
 	    }
-		
-	    function next() 
+
+	    function next()
 		{
 	        $this->rs->MoveNext();
 	    }
-		
+
 		function __call($func, $params)
 		{
 			return call_user_func_array(array($this->rs, $func), $params);
 		}
-	
-		
+
+
 		function hasMore()
 		{
 			return !$this->rs->EOF;
 		}
-	
+
 	}
 
 
 
-   /**
+	/**
 	 * RecordSet class that represents the dataset returned by the database.
 	 * To keep memory overhead low, this class holds only the current row in memory.
 	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
@@ -2918,7 +2913,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 */
 	class ADORecordSet implements IteratorAggregate {
 	/*
-	 * public variables	
+	 * public variables
 	 */
 	var $dataProvider = "native";
 	var $fields = false; 	/// holds the current row data
@@ -2926,8 +2921,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 							/// in other words, we use a text area for editing.
 	var $canSeek = false; 	/// indicates that seek is supported
 	var $sql; 				/// sql text
-	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
-	
+	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object.
+
 	var $emptyTimeStamp = ' '; /// what to display when $time==0
 	var $emptyDate = ' '; /// what to display when $time==0
 	var $debug = false;
@@ -2937,7 +2932,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	var $fetchMode;			/// default fetch mode
 	var $connection = false; /// the parent connection
 	/*
-	 *	private variables	
+	 *	private variables
 	 */
 	var $_numOfRows = -1;	/** number of rows, or -1 */
 	var $_numOfFields = -1;	/** number of fields in recordset */
@@ -2947,38 +2942,38 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	var $_inited = false; 	/** Init() should only be called once */
 	var $_obj; 				/** Used by FetchObj */
 	var $_names;			/** Used by FetchObj */
-	
-	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_lastPageNo = -1; 
+
+	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_lastPageNo = -1;
 	var $_maxRecordCount = 0;
 	var $datetime = false;
-	
+
 	/**
 	 * Constructor
 	 *
 	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
 	 *
 	 */
-	function ADORecordSet($queryID) 
+	function ADORecordSet($queryID)
 	{
 		$this->_queryID = $queryID;
 	}
-	
-	function getIterator() 
+
+	function getIterator()
 	{
-        return new ADODB_Iterator($this);
-    }
-	
+		return new ADODB_Iterator($this);
+	}
+
 	/* this is experimental - i don't really know what to return... */
 	function __toString()
 	{
 		include_once(ADODB_DIR.'/toexport.inc.php');
 		return _adodb_export($this,',',',',false,true);
 	}
-	
-	
+
+
 	function Init()
 	{
 		if ($this->_inited) return;
@@ -2989,7 +2984,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->_numOfFields = 0;
 		}
 		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
-			
+
 			$this->_currentRow = 0;
 			if ($this->EOF = ($this->_fetch() === false)) {
 				$this->_numOfRows = 0; // _numOfRows could be -1
@@ -2998,11 +2993,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->EOF = true;
 		}
 	}
-	
-	
+
+
 	/**
 	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * If the recordset has 2 cols, we treat the 1st col as the containing
 	 * the text to display to the user, and 2nd col as the return value. Default
 	 * strings are compared with the FIRST column.
 	 *
@@ -3013,7 +3008,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * @param [size]		#rows to show for listbox. not used by popup
 	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
 	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
+	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with
 	 *				column 0 (1st col) if this is true. This is not documented.
 	 *
 	 * @return HTML
@@ -3028,22 +3023,22 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
 			$size, $selectAttr,$compareFields0);
 	}
-	
 
-	
+
+
 	/**
 	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * If the recordset has 2 cols, we treat the 1st col as the containing
 	 * the text to display to the user, and 2nd col as the return value. Default
 	 * strings are compared with the SECOND column.
 	 *
 	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
+	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')
 	{
 		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
 			$size, $selectAttr,false);
 	}
-	
+
 	/*
 		Grouped Menu
 	*/
@@ -3063,7 +3058,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetArray($nRows = -1) 
+	function GetArray($nRows = -1)
 	{
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
 		$results = adodb_getall($this,$nRows);
@@ -3078,13 +3073,13 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		}
 		return $results;
 	}
-	
+
 	function GetAll($nRows = -1)
 	{
 		$arr = $this->GetArray($nRows);
 		return $arr;
 	}
-	
+
 	/*
 	* Some databases allow multiple recordsets to be returned. This function
 	* will return true if there is a next recordset, or false if no more.
@@ -3093,9 +3088,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return false;
 	}
-	
+
 	/**
-	 * return recordset as a 2-dimensional array. 
+	 * return recordset as a 2-dimensional array.
 	 * Helper function for ADOConnection->SelectLimit()
 	 *
 	 * @param offset	is the row to start calculations from (1-based)
@@ -3103,26 +3098,26 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetArrayLimit($nrows,$offset=-1) 
-	{	
+	function GetArrayLimit($nrows,$offset=-1)
+	{
 		if ($offset <= 0) {
 			$arr = $this->GetArray($nrows);
 			return $arr;
-		} 
-		
+		}
+
 		$this->Move($offset);
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
+
+
 	/**
 	 * Synonym for GetArray() for compatibility with ADO.
 	 *
@@ -3130,15 +3125,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetRows($nRows = -1) 
+	function GetRows($nRows = -1)
 	{
 		$arr = $this->GetArray($nRows);
 		return $arr;
 	}
-	
+
 	/**
-	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
-	 * The first column is treated as the key and is not included in the array. 
+	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns.
+	 * The first column is treated as the key and is not included in the array.
 	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
 	 * $force_array == true.
 	 *
@@ -3146,24 +3141,24 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
 	 * 	read the source.
 	 *
-	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
+	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and
 	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
 	 *
-	 * @return an associative array indexed by the first column of the array, 
+	 * @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) {
 			$false = false;
 			return $false;
 		}
-		$numIndex = isset($this->fields[0]) && isset($this->fields[1]);
+		$numIndex = is_array($this->fields) && array_key_exists(0, $this->fields);
 		$results = array();
-		
+
 		if (!$first2cols && ($cols > 2 || $force_array)) {
 			if ($ADODB_EXTENSION) {
 				if ($numIndex) {
@@ -3180,7 +3175,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 						foreach($keys as $key) {
 							$sliced_array[$key] = $this->fields[$key];
 						}
-						
+
 						$results[trim(reset($this->fields))] = $sliced_array;
 						adodb_movenext($this);
 					}
@@ -3200,7 +3195,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 						foreach($keys as $key) {
 							$sliced_array[$key] = $this->fields[$key];
 						}
-						
+
 						$results[trim(reset($this->fields))] = $sliced_array;
 						$this->MoveNext();
 					}
@@ -3219,7 +3214,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					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); 
+						$v2 = ''.next($this->fields);
 						$results[$v1] = $v2;
 						adodb_movenext($this);
 					}
@@ -3235,19 +3230,19 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					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); 
+						$v2 = ''.next($this->fields);
 						$results[$v1] = $v2;
 						$this->MoveNext();
 					}
 				}
 			}
 		}
-		
+
 		$ref = $results; # workaround accelerator incompat with PHP 4.4 :(
-		return $ref; 
+		return $ref;
 	}
-	
-	
+
+
 	/**
 	 *
 	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
@@ -3264,8 +3259,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($tt === 0) return $this->emptyTimeStamp;
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
 	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
 	 * @param fmt 	is the format to apply to it, using date()
@@ -3282,8 +3277,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		}
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
 	 * @param $v is a date string in YYYY-MM-DD format
 	 *
@@ -3293,7 +3288,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return ADOConnection::UnixDate($v);
 	}
-	
+
 
 	/**
 	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
@@ -3304,8 +3299,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return ADOConnection::UnixTimeStamp($v);
 	}
-	
-	
+
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
@@ -3313,8 +3308,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return $this->Close();
 	}
-	
-	
+
+
 	/**
 	* PEAR DB compat, number of rows
 	*/
@@ -3322,8 +3317,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return $this->_numOfRows;
 	}
-	
-	
+
+
 	/**
 	* PEAR DB compat, number of cols
 	*/
@@ -3331,9 +3326,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return $this->_numOfFields;
 	}
-	
+
 	/**
-	* Fetch a row, returning false if no more rows. 
+	* Fetch a row, returning false if no more rows.
 	* This is PEAR DB compat mode.
 	*
 	* @return false or array containing the current record
@@ -3349,10 +3344,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if (!$this->_fetch()) $this->EOF = true;
 		return $arr;
 	}
-	
-	
+
+
 	/**
-	* Fetch a row, returning PEAR_Error if no more rows. 
+	* Fetch a row, returning PEAR_Error if no more rows.
 	* This is PEAR DB compat mode.
 	*
 	* @return DB_OK or error object
@@ -3364,26 +3359,26 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$this->MoveNext();
 		return 1; // DB_OK
 	}
-	
-	
+
+
 	/**
 	 * Move to the first row in the recordset. Many databases do NOT support this.
 	 *
 	 * @return true or false
 	 */
-	function MoveFirst() 
+	function MoveFirst()
 	{
 		if ($this->_currentRow == 0) return true;
-		return $this->Move(0);			
-	}			
+		return $this->Move(0);
+	}
+
 
-	
 	/**
-	 * Move to the last row in the recordset. 
+	 * Move to the last row in the recordset.
 	 *
 	 * @return true or false
 	 */
-	function MoveLast() 
+	function MoveLast()
 	{
 		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
 		if ($this->EOF) return false;
@@ -3395,14 +3390,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$this->EOF = false;
 		return true;
 	}
-	
-	
+
+
 	/**
 	 * Move to next record in the recordset.
 	 *
 	 * @return true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function MoveNext() 
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
@@ -3418,8 +3413,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		*/
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * Random access to a specific row in the recordset. Some databases do not support
 	 * access to previous rows in the databases (no scrolling backwards).
@@ -3428,15 +3423,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function Move($rowNumber = 0) 
+	function Move($rowNumber = 0)
 	{
 		$this->EOF = false;
 		if ($rowNumber == $this->_currentRow) return true;
 		if ($rowNumber >= $this->_numOfRows)
 	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-  				
-		if ($this->canSeek) { 
-	
+
+		if ($this->canSeek) {
+
 			if ($this->_seek($rowNumber)) {
 				$this->_currentRow = $rowNumber;
 				if ($this->_fetch()) {
@@ -3454,26 +3449,26 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					adodb_movenext($this);
 				}
 			} else {
-			
+
 				while (! $this->EOF && $this->_currentRow < $rowNumber) {
 					$this->_currentRow++;
-					
+
 					if (!$this->_fetch()) $this->EOF = true;
 				}
 			}
 			return !($this->EOF);
 		}
-		
-		$this->fields = false;	
+
+		$this->fields = false;
 		$this->EOF = true;
 		return false;
 	}
-	
-		
+
+
 	/**
 	 * Get the value of a field in the current row by column name.
 	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
-	 * 
+	 *
 	 * @param colname  is the field to access
 	 *
 	 * @return the value of $colname column
@@ -3482,68 +3477,86 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return $this->fields[$colname];
 	}
-	
-	function GetAssocKeys($upper=true)
+
+	/**
+	 * Builds the bind array associating keys to recordset fields
+	 *
+	 * @param int $upper Case for the array keys, defaults to uppercase
+	 *                   (see ADODB_ASSOC_CASE_xxx constants)
+	 */
+	function GetAssocKeys($upper=ADODB_ASSOC_CASE_UPPER)
 	{
 		$this->bind = array();
 		for ($i=0; $i < $this->_numOfFields; $i++) {
 			$o = $this->FetchField($i);
-			if ($upper === 2) $this->bind[$o->name] = $i;
-			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
+			switch($upper) {
+				case ADODB_ASSOC_CASE_LOWER:
+					$key = strtolower($o->name);
+					break;
+				case ADODB_ASSOC_CASE_UPPER:
+					$key = strtoupper($o->name);
+					break;
+				case ADODB_ASSOC_CASE_NATIVE:
+				default:
+					$key = $o->name;
+					break;
+			}
+			$val = $this->fetchMode == ADODB_FETCH_ASSOC ? $o->name : $i;
+			$this->bind[$key] = $val;
 		}
 	}
-	
-  /**
-   * Use associative array to get fields array for databases that do not support
-   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
-   *
-   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC
-   * before you execute your SQL statement, and access $rs->fields['col'] directly.
-   *
-   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by FetchField
-   */
-	function GetRowAssoc($upper=1) 
+
+	/**
+	 * Use associative array to get fields array for databases that do not support
+	 * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
+	 *
+	 * @param int $upper Case for the array keys, defaults to uppercase
+	 *                   (see ADODB_ASSOC_CASE_xxx constants)
+	 */
+	function GetRowAssoc($upper=ADODB_ASSOC_CASE_UPPER)
 	{
 		$record = array();
 		if (!$this->bind) {
 			$this->GetAssocKeys($upper);
 		}
 		foreach($this->bind as $k => $v) {
-			if( isset( $this->fields[$v] ) ) {
+			if( array_key_exists( $v, $this->fields ) ) {
 				$record[$k] = $this->fields[$v];
-			} else if (isset($this->fields[$k])) {
+			} elseif( array_key_exists( $k, $this->fields ) ) {
 				$record[$k] = $this->fields[$k];
-			} else
-				$record[$k] = $this->fields[$v];
+			} else {
+				# This should not happen... trigger error ?
+				$record[$k] = null;
+			}
 		}
 		return $record;
 	}
-	
+
 	/**
 	 * Clean up recordset
 	 *
 	 * @return true or false
 	 */
-	function Close() 
+	function Close()
 	{
 		// free connection object - this seems to globally free the object
 		// and not merely the reference, so don't do this...
-		// $this->connection = false; 
+		// $this->connection = false;
 		if (!$this->_closed) {
 			$this->_closed = true;
-			return $this->_close();		
+			return $this->_close();
 		} else
 			return true;
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
 	function RecordCount() {return $this->_numOfRows;}
-	
-	
+
+
 	/*
 	* If we are using PageExecute(), this will return the maximum possible rows
 	* that can be returned when paging a recordset.
@@ -3552,14 +3565,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
-	function RowCount() {return $this->_numOfRows;} 
-	
+	function RowCount() {return $this->_numOfRows;}
+
 
 	 /**
 	 * Portable RecordCount. Pablo Roca 
@@ -3568,39 +3581,39 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * But aware possible problems in multiuser environments. For better speed the table
 	 * must be indexed by the condition. Heavy test this before deploying.
-	 */ 
+	 */
 	function PO_RecordCount($table="", $condition="") {
-		
+
 		$lnumrows = $this->_numOfRows;
 		// the database doesn't support native recordcount, so we do a workaround
 		if ($lnumrows == -1 && $this->connection) {
 			IF ($table) {
-				if ($condition) $condition = " WHERE " . $condition; 
+				if ($condition) $condition = " WHERE " . $condition;
 				$resultrows = $this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
 				if ($resultrows) $lnumrows = reset($resultrows->fields);
 			}
 		}
 		return $lnumrows;
 	}
-	
-	
+
+
 	/**
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
 	function CurrentRow() {return $this->_currentRow;}
-	
+
 	/**
 	 * synonym for CurrentRow -- for ADO compat
 	 *
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
 	function AbsolutePosition() {return $this->_currentRow;}
-	
+
 	/**
 	 * @return the number of columns in the recordset. Some databases will set this to 0
 	 * if no records are returned, others will return the number of columns in the query.
 	 */
-	function FieldCount() {return $this->_numOfFields;}   
+	function FieldCount() {return $this->_numOfFields;}
 
 
 	/**
@@ -3610,14 +3623,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return the ADOFieldObject for that column, or false.
 	 */
-	function FetchField($fieldoffset = -1) 
+	function FetchField($fieldoffset = -1)
 	{
 		// must be defined by child class
-		
+
 		$false = false;
 		return $false;
-	}	
-	
+	}
+
 	/**
 	 * Get the ADOFieldObjects of all columns in an array.
 	 *
@@ -3625,11 +3638,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	function FieldTypesArray()
 	{
 		$arr = array();
-		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
+		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++)
 			$arr[] = $this->FetchField($i);
 		return $arr;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is lowercase field names.
@@ -3641,11 +3654,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$o = $this->FetchObject(false);
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is uppercase.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row
@@ -3663,21 +3676,21 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$i = 0;
 		if (PHP_VERSION >= 5) $o = clone($this->_obj);
 		else $o = $this->_obj;
-	
+
 		for ($i=0; $i <$this->_numOfFields; $i++) {
 			$name = $this->_names[$i];
 			if ($isupper) $n = strtoupper($name);
 			else $n = $name;
-			
+
 			$o->$n = $this->Fields($name);
 		}
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default is lower-case field names.
-	* 
+	*
 	* @return the object with the properties set to the fields of the current row,
 	* 	or false if EOF
 	*
@@ -3688,12 +3701,12 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$o = $this->FetchNextObject(false);
 		return $o;
 	}
-	
-	
+
+
 	/**
-	* Return the fields array of the current row as an object for convenience. 
+	* Return the fields array of the current row as an object for convenience.
 	* The default is upper case field names.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row,
@@ -3705,14 +3718,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		$o = false;
 		if ($this->_numOfRows != 0 && !$this->EOF) {
-			$o = $this->FetchObject($isupper);	
+			$o = $this->FetchObject($isupper);
 			$this->_currentRow++;
 			if ($this->_fetch()) return $o;
 		}
 		$this->EOF = true;
 		return $o;
 	}
-	
+
 	/**
 	 * Get the metatype of the column. This is used for formatting. This is because
 	 * many databases use different names for the same type, so we transform the original
@@ -3723,8 +3736,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * 	fields bigger than a certain size as a 'B' (blob).
 	 * @param fieldobj is the field object returned by the database driver. Can hold
 	 *	additional info (eg. primary_key for mysql).
-	 * 
-	 * @return the general type of the data: 
+	 *
+	 * @return the general type of the data:
 	 *	C for character < 250 chars
 	 *	X for teXt (>= 250 chars)
 	 *	B for Binary
@@ -3734,7 +3747,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * 	L for logical/Boolean
 	 *	I for integer
 	 *	R for autoincrement counter/integer
-	 * 
+	 *
 	 *
 	*/
 	function MetaType($t,$len=-1,$fieldobj=false)
@@ -3791,7 +3804,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
+		'BOOLEAN' => 'L',
 		'BIT' => 'L',
 		'L' => 'L',
 		##
@@ -3824,21 +3837,21 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		'NUM' => 'N',
 		'NUMERIC' => 'N',
 		'MONEY' => 'N',
-		
+
 		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
+		'SQLINT' => 'I',
+		'SQLSERIAL' => 'I',
+		'SQLSMINT' => 'I',
+		'SQLSMFLOAT' => 'N',
+		'SQLFLOAT' => 'N',
+		'SQLMONEY' => 'N',
+		'SQLDECIMAL' => 'N',
+		'SQLDATE' => 'D',
+		'SQLVCHAR' => 'C',
+		'SQLCHAR' => 'C',
+		'SQLDTIME' => 'T',
+		'SQLINTERVAL' => 'N',
+		'SQLBYTES' => 'B',
 		'SQLTEXT' => 'X',
 		 ## informix 10
 		"SQLINT8" => 'I8',
@@ -3848,46 +3861,46 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		"SQLLVARCHAR" => 'X',
 		"SQLBOOL" => 'L'
 		);
-		
+
 		$tmap = false;
 		$t = strtoupper($t);
 		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
 		switch ($tmap) {
 		case 'C':
-		
-			// is the char field is too long, return as text field... 
+
+			// is the char field is too long, return as text field...
 			if ($this->blobSize >= 0) {
 				if ($len > $this->blobSize) return 'X';
 			} else if ($len > 250) {
 				return 'X';
 			}
 			return 'C';
-			
+
 		case 'I':
 			if (!empty($fieldobj->primary_key)) return 'R';
 			return 'I';
-		
+
 		case false:
 			return 'N';
-			
+
 		case 'B':
-			 if (isset($fieldobj->binary)) 
+			 if (isset($fieldobj->binary))
 				 return ($fieldobj->binary) ? 'B' : 'X';
 			return 'B';
-		
+
 		case 'D':
 			if (!empty($this->connection) && !empty($this->connection->datetime)) return 'T';
 			return 'D';
-			
-		default: 
+
+		default:
 			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
 			return $tmap;
 		}
 	}
-	
-	
+
+
 	function _close() {}
-	
+
 	/**
 	 * set/returns the current recordset page when paginating
 	 */
@@ -3896,7 +3909,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($page != -1) $this->_currentPage = $page;
 		return $this->_currentPage;
 	}
-	
+
 	/**
 	 * set/returns the status of the atFirstPage flag when paginating
 	 */
@@ -3905,13 +3918,13 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($status != false) $this->_atFirstPage = $status;
 		return $this->_atFirstPage;
 	}
-	
+
 	function LastPageNo($page = false)
 	{
 		if ($page != false) $this->_lastPageNo = $page;
 		return $this->_lastPageNo;
 	}
-	
+
 	/**
 	 * set/returns the status of the atLastPage flag when paginating
 	 */
@@ -3920,20 +3933,20 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($status != false) $this->_atLastPage = $status;
 		return $this->_atLastPage;
 	}
-	
+
 } // end class ADORecordSet
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_array
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * This class encapsulates the concept of a recordset created in memory
 	 * as an array. This is useful for the creation of cached recordsets.
-	 * 
+	 *
 	 * Note that the constructor is different from the standard ADORecordSet
 	 */
-	
+
 	class ADORecordSet_array extends ADORecordSet
 	{
 		var $databaseType = 'array';
@@ -3955,32 +3968,32 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		function ADORecordSet_array($fakeid=1)
 		{
 		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-		
+
 			// fetch() on EOF does not delete $this->fields
 			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
+			$this->ADORecordSet($fakeid); // fake queryID
 			$this->fetchMode = $ADODB_FETCH_MODE;
 		}
-		
+
 		function _transpose($addfieldnames=true)
 		{
 		global $ADODB_INCLUDED_LIB;
-			
+
 			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 			$hdr = true;
-			
+
 			$fobjs = $addfieldnames ? $this->_fieldobjects : false;
 			adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
 			//adodb_pr($newarr);
-			
+
 			$this->_skiprow1 = false;
 			$this->_array = $newarr;
 			$this->_colnames = $hdr;
-			
+
 			adodb_probetypes($newarr,$this->_types);
-		
+
 			$this->_fieldobjects = array();
-			
+
 			foreach($hdr as $k => $name) {
 				$f = new ADOFieldObject();
 				$f->name = $name;
@@ -3989,18 +4002,18 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				$this->_fieldobjects[] = $f;
 			}
 			$this->fields = reset($this->_array);
-			
+
 			$this->_initrs();
-			
+
 		}
-		
+
 		/**
 		 * Setup the array.
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
+		 *			The first row should hold the column names
 		 *			unless paramter $colnames is used.
-		 * @param typearr	holds an array of types. These are the same types 
+		 * @param typearr	holds an array of types. These are the same types
 		 *			used in MetaTypes (C,B,L,I,N).
 		 * @param [colnames]	array of column names. If set, then the first row of
 		 *			$array should not hold the column names.
@@ -4008,7 +4021,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		function InitArray($array,$typearr,$colnames=false)
 		{
 			$this->_array = $array;
-			$this->_types = $typearr;	
+			$this->_types = $typearr;
 			if ($colnames) {
 				$this->_skiprow1 = false;
 				$this->_colnames = $colnames;
@@ -4022,7 +4035,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		 * Setup the Array and datatype file objects
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
+		 *			The first row should hold the column names
 		 *			unless paramter $colnames is used.
 		 * @param fieldarr	holds an array of ADOFieldObject's.
 		 */
@@ -4032,10 +4045,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->_skiprow1= false;
 			if ($fieldarr) {
 				$this->_fieldobjects = $fieldarr;
-			} 
+			}
 			$this->Init();
 		}
-		
+
 		function GetArray($nRows=-1)
 		{
 			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
@@ -4045,21 +4058,21 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				return $arr;
 			}
 		}
-		
+
 		function _initrs()
 		{
 			$this->_numOfRows =  sizeof($this->_array);
 			if ($this->_skiprow1) $this->_numOfRows -= 1;
-		
+
 			$this->_numOfFields =(isset($this->_fieldobjects)) ?
 				 sizeof($this->_fieldobjects):sizeof($this->_types);
 		}
-		
+
 		/* Use associative array to get fields array */
 		function Fields($colname)
 		{
 			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
-			
+
 			if ($mode & ADODB_FETCH_ASSOC) {
 				if (!isset($this->fields[$colname]) && !is_null($this->fields[$colname])) $colname = strtolower($colname);
 				return $this->fields[$colname];
@@ -4073,8 +4086,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			}
 			return $this->fields[$this->bind[strtoupper($colname)]];
 		}
-		
-		function FetchField($fieldOffset = -1) 
+
+		function FetchField($fieldOffset = -1)
 		{
 			if (isset($this->_fieldobjects)) {
 				return $this->_fieldobjects[$fieldOffset];
@@ -4083,10 +4096,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$o->name = $this->_colnames[$fieldOffset];
 			$o->type =  $this->_types[$fieldOffset];
 			$o->max_length = -1; // length not known
-			
+
 			return $o;
 		}
-			
+
 		function _seek($row)
 		{
 			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
@@ -4097,31 +4110,31 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			}
 			return false;
 		}
-		
-		function MoveNext() 
+
+		function MoveNext()
 		{
-			if (!$this->EOF) {		
+			if (!$this->EOF) {
 				$this->_currentRow++;
-				
+
 				$pos = $this->_currentRow;
-				
+
 				if ($this->_numOfRows <= $pos) {
 					if (!$this->compat) $this->fields = false;
 				} else {
 					if ($this->_skiprow1) $pos += 1;
 					$this->fields = $this->_array[$pos];
 					return true;
-				}		
+				}
 				$this->EOF = true;
 			}
-			
+
 			return false;
-		}	
-	
+		}
+
 		function _fetch()
 		{
 			$pos = $this->_currentRow;
-			
+
 			if ($this->_numOfRows <= $pos) {
 				if (!$this->compat) $this->fields = false;
 				return false;
@@ -4130,56 +4143,62 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->fields = $this->_array[$pos];
 			return true;
 		}
-		
-		function _close() 
+
+		function _close()
 		{
-			return true;	
+			return true;
 		}
-	
+
 	} // ADORecordSet_array
 
-	//==============================================================================================	
+	//==============================================================================================
 	// HELPER FUNCTIONS
-	//==============================================================================================			
-	
+	//==============================================================================================
+
 	/**
 	 * Synonym for ADOLoadCode. Private function. Do not use.
 	 *
 	 * @deprecated
 	 */
-	function ADOLoadDB($dbType) 
-	{ 
+	function ADOLoadDB($dbType)
+	{
 		return ADOLoadCode($dbType);
 	}
-		
+
 	/**
 	 * Load the code for a specific database driver. Private function. Do not use.
 	 */
-	function ADOLoadCode($dbType) 
+	function ADOLoadCode($dbType)
 	{
 	global $ADODB_LASTDB;
-	
+
 		if (!$dbType) return false;
 		$db = strtolower($dbType);
 		switch ($db) {
-			case 'ado': 
+			case 'ado':
 				if (PHP_VERSION >= 5) $db = 'ado5';
-				$class = 'ado'; 
+				$class = 'ado';
 				break;
+
 			case 'ifx':
-			case 'maxsql': $class = $db = 'mysqlt'; break;
+			case 'maxsql':
+				$class = $db = 'mysqlt';
+				break;
+
+			case 'pgsql':
 			case 'postgres':
-			case 'postgres8':
-			case 'pgsql': $class = $db = 'postgres7'; break;
+				$class = $db = 'postgres8';
+				break;
+
 			default:
 				$class = $db; break;
 		}
-		
+
 		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
 		@include_once($file);
 		$ADODB_LASTDB = $class;
 		if (class_exists("ADODB_" . $class)) return $class;
-		
+
 		//ADOConnection::outp(adodb_pr(get_declared_classes(),true));
 		if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
 		else ADOConnection::outp("Syntax error in file: $file");
@@ -4194,7 +4213,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$tmp = ADONewConnection($db);
 		return $tmp;
 	}
-	
+
 	/**
 	 * Instantiate a new Connection class for a specific database driver.
 	 *
@@ -4206,7 +4225,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	function ADONewConnection($db='')
 	{
 	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-		
+
 		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
 		$false = false;
@@ -4217,21 +4236,22 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				// special handling of oracle, which might not have host
 				$fakedsn = str_replace('@/','@adodb-fakehost/',$fakedsn);
 			}
-			
-			 if ((strpos($origdsn, 'sqlite')) !== FALSE && stripos($origdsn, '%2F') === FALSE) {
-             // special handling for SQLite, it only might have the path to the database file.
-             // If you try to connect to a SQLite database using a dsn like 'sqlite:///path/to/database', the 'parse_url' php function
-             // will throw you an exception with a message such as "unable to parse url"
-                list($scheme, $path) = explode('://', $origdsn);
-                $dsna['scheme'] = $scheme;
+
+			if ((strpos($origdsn, 'sqlite')) !== FALSE && stripos($origdsn, '%2F') === FALSE) {
+				// special handling for SQLite, it only might have the path to the database file.
+				// If you try to connect to a SQLite database using a dsn
+				// like 'sqlite:///path/to/database', the 'parse_url' php function
+				// will throw you an exception with a message such as "unable to parse url"
+				list($scheme, $path) = explode('://', $origdsn);
+				$dsna['scheme'] = $scheme;
 				if ($qmark = strpos($path,'?')) {
 					$dsn['query'] = substr($path,$qmark+1);
 					$path = substr($path,0,$qmark);
 				}
-            	$dsna['path'] = '/' . urlencode($path);
+				$dsna['path'] = '/' . urlencode($path);
 			} else
 				$dsna = @parse_url($fakedsn);
-				
+
 			if (!$dsna) {
 				return $false;
 			}
@@ -4239,11 +4259,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			if ($at2 !== FALSE) {
 				$dsna['host'] = '';
 			}
-			
+
 			if (strncmp($origdsn,'pdo',3) == 0) {
 				$sch = explode('_',$dsna['scheme']);
 				if (sizeof($sch)>1) {
-				
+
 					$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
 					if ($sch[1] == 'sqlite')
 						$dsna['host'] = rawurlencode($sch[1].':'.rawurldecode($dsna['host']));
@@ -4252,14 +4272,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					$dsna['scheme'] = 'pdo';
 				}
 			}
-			
+
 			$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)) : ''; # strip off initial /
-			
+
 			if (isset($dsna['query'])) {
 				$opt1 = explode('&',$dsna['query']);
 				foreach($opt1 as $k => $v) {
@@ -4280,15 +4300,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if (!empty($ADODB_NEWCONNECTION)) {
 			$obj = $ADODB_NEWCONNECTION($db);
 
-		} 
-		
+		}
+
 		if(empty($obj)) {
-		
+
 			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) {
@@ -4299,19 +4319,19 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 							 $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;
@@ -4341,15 +4361,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					#oci8
 					case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break;
 					case 'cachesecs': $obj->cacheSecs = $v; break;
-					case 'memcache': 
+					case 'memcache':
 						$varr = explode(':',$v);
 						$vlen = sizeof($varr);
-						if ($vlen == 0) break;	
+						if ($vlen == 0) break;
 						$obj->memCache = true;
 						$obj->memCacheHost = explode(',',$varr[0]);
-						if ($vlen == 1) break;	
+						if ($vlen == 1) break;
 						$obj->memCachePort = $varr[1];
-						if ($vlen == 2) break;	
+						if ($vlen == 2) break;
 						$obj->memCacheCompress = $varr[2] ?  true : false;
 						break;
 					}
@@ -4360,36 +4380,36 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
 				else
 					$ok = $obj->NConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-					
+
 				if (!$ok) return $false;
 			}
 		}
 		return $obj;
 	}
-	
-	
-	
+
+
+
 	// $perf == true means called by NewPerfMonitor(), otherwise for data dictionary
 	function _adodb_getdriver($provider,$drivername,$perf=false)
 	{
 		switch ($provider) {
-		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); 
-		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); 
+		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6);
+		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5);
 		case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
 		case 'native':  break;
 		default:
 			return $provider;
 		}
-		
+
 		switch($drivername) {
 		case 'mysqlt':
-		case 'mysqli': 
-				$drivername='mysql'; 
+		case 'mysqli':
+				$drivername='mysql';
 				break;
 		case 'postgres7':
 		case 'postgres8':
-				$drivername = 'postgres'; 
-				break;	
+				$drivername = 'postgres';
+				break;
 		case 'firebird15': $drivername = 'firebird'; break;
 		case 'oracle': $drivername = 'oci8'; break;
 		case 'access': if ($perf) $drivername = ''; break;
@@ -4401,7 +4421,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		}
 		return $drivername;
 	}
-	
+
 	function NewPerfMonitor(&$conn)
 	{
 		$false = false;
@@ -4412,10 +4432,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$class = "Perf_$drivername";
 		if (!class_exists($class)) return $false;
 		$perf = new $class($conn);
-		
+
 		return $perf;
 	}
-	
+
 	function NewDataDictionary(&$conn,$drivername=false)
 	{
 		$false = false;
@@ -4438,34 +4458,34 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$dict->quote = $conn->nameQuote;
 		if (!empty($conn->_connectionID))
 			$dict->serverInfo = $conn->ServerInfo();
-		
+
 		return $dict;
 	}
 
 
-	
+
 	/*
 		Perform a print_r, with pre tags for better formatting.
 	*/
 	function adodb_pr($var,$as_string=false)
 	{
 		if ($as_string) ob_start();
-		
-		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
+
+		if (isset($_SERVER['HTTP_USER_AGENT'])) {
 			echo " 
\n";print_r($var);echo "
\n";
 		} else
 			print_r($var);
-			
+
 		if ($as_string) {
 			$s = ob_get_contents();
 			ob_end_clean();
 			return $s;
 		}
 	}
-	
+
 	/*
 		Perform a stack-crawl and pretty print it.
-		
+
 		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
 		@param levels Number of levels to display
 	*/
@@ -4478,4 +4498,3 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 
 
 }
-?>
diff --git a/lib/WikiDB/adodb/composer.json b/lib/WikiDB/adodb/composer.json
new file mode 100644
index 000000000..73eedb5f0
--- /dev/null
+++ b/lib/WikiDB/adodb/composer.json
@@ -0,0 +1,33 @@
+{
+	"name" : "adodb/adodb-php",
+	"description" : "ADOdb is a PHP database abstraction layer library",
+	"license" : [ "LGPL-2.1", " BSD-2-Clause" ],
+	"authors" : [
+		{
+			"name": "John Lim",
+			"email" : "jlim@natsoft.com",
+			"role": "Author"
+		},
+		{
+			"name": "Damien Regad",
+			"role": "Current maintainer"
+		}
+	],
+
+	"keywords" : [ "database" ],
+
+	"homepage": "http://adodb.sourceforge.net/",
+	"support" : {
+		"issues" : "https://github.com/ADOdb/ADOdb/issues",
+		"source" : "https://github.com/ADOdb/ADOdb"
+	},
+
+	"require" : {
+		"php" : ">=5.3.2"
+	},
+
+	"autoload" : {
+		"files" : ["adodb.inc.php"]
+	}
+
+}
diff --git a/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php b/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php
index 3711bdacd..f769cc5fd 100644
--- a/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php
+++ b/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php
@@ -2,11 +2,11 @@
     /**
     * Helper functions to convert between ADODB recordset objects and XMLRPC values.
     * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
-    * 
+    *
     * @author Daniele Baroncelli
     * @author Gaetano Giunta
     * @copyright (c) 2003-2004 Giunta/Baroncelli. All rights reserved.
-    * 
+    *
     * @todo some more error checking here and there
     * @todo document the xmlrpc-struct used to encode recordset info
     * @todo verify if using xmlrpc_encode($rs->GetArray()) would work with:
@@ -16,10 +16,10 @@
 
     /**
     * Include the main libraries
-    */    
+    */
     require_once('xmlrpc.inc');
     if (!defined('ADODB_DIR')) require_once('adodb.inc.php');
-            
+
     /**
     * Builds an xmlrpc struct value out of an AdoDB recordset
     */
@@ -113,12 +113,12 @@
         }
         $body = new xmlrpcval ($rows, "array");
 
-        return $body;    
+        return $body;
     }
-    
+
     /**
     * Returns an xmlrpc struct value as string out of an AdoDB recordset
-    */    
+    */
     function rs2xmlrpcstring (&$adodbrs) {
         $xmlrpc = rs2xmlrpcval ($adodbrs);
         if ($xmlrpc)
@@ -129,24 +129,24 @@
 
     /**
     * Given a well-formed xmlrpc struct object returns an AdoDB object
-    * 
+    *
     * @todo add some error checking on the input value
     */
     function xmlrpcval2rs (&$xmlrpcval) {
 
         $fields_array = array();
         $data_array = array();
- 
-        // rebuild column information  
+
+        // rebuild column information
         $header = $xmlrpcval->structmem('header');
-        
+
         $numfields = $header->structmem('fieldcount');
         $numfields = $numfields->scalarval();
         $numrecords = $header->structmem('recordcount');
         $numrecords = $numrecords->scalarval();
         $sqlstring = $header->structmem('sql');
         $sqlstring = $sqlstring->scalarval();
-        
+
         $fieldinfo = $header->structmem('fieldinfo');
         for ($i = 0; $i < $numfields; $i++) {
             $temp = $fieldinfo->arraymem($i);
@@ -179,5 +179,3 @@
         return $rs;
 
     }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-access.inc.php b/lib/WikiDB/adodb/datadict/datadict-access.inc.php
index 9b0bf843d..6a0a2cdc4 100644
--- a/lib/WikiDB/adodb/datadict/datadict-access.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-access.inc.php
@@ -1,54 +1,54 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-}
 
-
-?>
\ No newline at end of file
+}
diff --git a/lib/WikiDB/adodb/datadict/datadict-db2.inc.php b/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
index 6c5811089..5bbca1d0c 100644
--- a/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
@@ -1,28 +1,28 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
 	{
-		
+
 		/**
 		  Allow basic table changes to DB2 databases
-		  DB2 will fatally reject changes to non character columns 
+		  DB2 will fatally reject changes to non character columns
 
 		*/
-		
+
 		$validTypes = array("CHAR","VARC");
 		$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
 		// check table exists
 		$cols = $this->MetaColumns($tablename);
-		if ( empty($cols)) { 
+		if ( empty($cols)) {
 			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
 		}
-		
+
 		// already exists, alter table instead
 		list($lines,$pkey) = $this->_GenFields($flds);
 		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
 		$sql = array();
-		
+
 		foreach ( $lines as $id => $v ) {
 			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
 				/**
@@ -110,10 +110,10 @@ class ADODB2_db2 extends ADODB_DataDict {
 				for ($i=1;$ialterCol . ' ' . $v;
 			} else {
 				$sql[] = $alter . $this->addCol . ' ' . $v;
 			}
 		}
-		
+
 		return $sql;
 	}
-	
-}
 
-
-?>
\ No newline at end of file
+}
diff --git a/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php b/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
index c353f7125..d4471df73 100644
--- a/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
@@ -1,76 +1,76 @@
 connection) ) {
 			return $name;
 		}
-		
+
 		$quote = $this->connection->nameQuote;
-		
+
 		// if name is of the form `name`, quote it
 		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
 			return $quote . $matches[1] . $quote;
 		}
-		
+
 		// if name contains special characters, quote it
 		if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
 			return $quote . $name . $quote;
 		}
-		
+
 		return $quote . $name . $quote;
 	}
 
@@ -78,12 +78,12 @@ class ADODB2_firebird extends ADODB_DataDict {
 	{
 		$options = $this->_Options($options);
 		$sql = array();
-		
+
 		$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
-		
+
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($t)
 	{
 		if (strpos($t,'.') !== false) {
@@ -92,20 +92,20 @@ class ADODB2_firebird extends ADODB_DataDict {
 		}
 		return 'DROP GENERATOR "GEN_'.$t;
 	}
-	
+
 
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		$suffix = '';
-		
+
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
 		if ($fautoinc) $this->seqField = $fname;
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
+
 		return $suffix;
 	}
-	
+
 /*
 CREATE or replace TRIGGER jaddress_insert
 before insert on jaddress
@@ -116,9 +116,9 @@ IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
 end;
 */
 	function _Triggers($tabname,$tableoptions)
-	{	
+	{
 		if (!$this->seqField) return array();
-		
+
 		$tab1 = preg_replace( '/"/', '', $tabname );
 		if ($this->schema) {
 			$t = strpos($tab1,'.');
@@ -141,12 +141,9 @@ end;
 		{ $sql[] = "CREATE GENERATOR \"$seqname\"";
 		  $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
 		}
-		
+
 		$this->seqField = false;
 		return $sql;
 	}
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-generic.inc.php b/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
index 9b78d2288..b3736f5b3 100644
--- a/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
@@ -1,47 +1,47 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 }
 
 /*
@@ -70,52 +70,52 @@ class ADODB2_generic extends ADODB_DataDict {
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
-		case 'X': return 'VARCHAR'; 
-		
+		case 'X': return 'VARCHAR';
+
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'DECIMAL';
 		default:
 			return $meta;
 		}
 	}
-	
+
 // ifx
 function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';// 255
-		case 'X': return 'TEXT'; 
-		
+		case 'X': return 'TEXT';
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'T': return 'DATETIME';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'DECIMAL(20)';
-		
+
 		case 'F': return 'FLOAT';
 		case 'N': return 'DECIMAL';
 		default:
@@ -123,4 +123,3 @@ function ActualType($meta)
 		}
 	}
 */
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php b/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
index cd755f6e5..13f028e31 100644
--- a/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
@@ -1,47 +1,47 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-}
-
 
-?>
\ No newline at end of file
+}
diff --git a/lib/WikiDB/adodb/datadict/datadict-informix.inc.php b/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
index 29ddb0d51..1bc688072 100644
--- a/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
@@ -1,47 +1,47 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
@@ -75,7 +75,5 @@ class ADODB2_informix extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
-}
 
-?>
\ No newline at end of file
+}
diff --git a/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php b/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
index 79ff1d0c0..6610fc44e 100644
--- a/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
@@ -1,38 +1,38 @@
 type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 		case 'R':
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
@@ -75,7 +75,7 @@ class ADODB2_mssql extends ADODB_DataDict {
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
@@ -85,30 +85,30 @@ class ADODB2_mssql extends ADODB_DataDict {
 		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
-		
+
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
+
+		case 'R':
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -122,7 +122,7 @@ class ADODB2_mssql extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	/*
 	function AlterColumnSQL($tabname, $flds)
 	{
@@ -136,7 +136,7 @@ class ADODB2_mssql extends ADODB_DataDict {
 		return $sql;
 	}
 	*/
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -151,10 +151,10 @@ class ADODB2_mssql extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
@@ -163,110 +163,110 @@ class ADODB2_mssql extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
-	
+
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		switch ($ftype) {
@@ -277,8 +277,7 @@ CREATE TABLE
 			return $ftype;
 		}
     	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);
 
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php b/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
index c57953623..0741c79f7 100644
--- a/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
@@ -1,38 +1,38 @@
 type;
 			$len = $fieldobj->max_length;
 		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'R':
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
+
+		$_typeConversion = array(
+			-155 => 'D',
+			  93 => 'D',
+			-154 => 'D',
+			  -2 => 'D',
+			  91 => 'D',
+
+			  12 => 'C',
+			   1 => 'C',
+			  -9 => 'C',
+			  -8 => 'C',
+
+			  -7 => 'L',
+			  -6 => 'I2',
+			  -5 => 'I8',
+			 -11 => 'I',
+			   4 => 'I',
+			   5 => 'I4',
+
+			  -1 => 'X',
+			 -10 => 'X',
+
+			   2 => 'N',
+			   3 => 'N',
+			   6 => 'N',
+			   7 => 'N',
+
+			-152 => 'X',
+			-151 => 'X',
+			  -4 => 'X',
+			  -3 => 'X'
+			);
+
+		return $_typeConversion($t);
+
 	}
-	
+
 	function ActualType($meta)
 	{
+		$DATE_TYPE = 'DATETIME';
+
 		switch(strtoupper($meta)) {
 
 		case 'C': return 'VARCHAR';
@@ -85,28 +107,29 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
+
+		case 'D': return $DATE_TYPE;
+		case 'T': return 'TIME';
 		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
+
+		case 'R':
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
+			print "RETURN $meta";
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -120,7 +143,7 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	/*
 	function AlterColumnSQL($tabname, $flds)
 	{
@@ -134,25 +157,36 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 		return $sql;
 	}
 	*/
-	
-	function DropColumnSQL($tabname, $flds)
+
+	/**
+	 * Drop a column, syntax is ALTER TABLE table DROP COLUMN column,column
+	 *
+	 * @param string   $tabname      Table Name
+	 * @param string[] $flds         One, or an array of Fields To Drop
+	 * @param string   $tableflds    Throwaway value to make the function match the parent
+	 * @param string   $tableoptions Throway value to make the function match the parent
+	 *
+	 * @return string  The SQL necessary to drop the column
+	 */
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 		$tabname = $this->TableName ($tabname);
 		if (!is_array($flds))
 			$flds = explode(',',$flds);
 		$f = array();
-		$s = 'ALTER TABLE ' . $tabname;
+		$s = 'ALTER TABLE ' . $tabname . ' DROP COLUMN ';
 		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+			//$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+			$f[] = $this->NameQuote($v);
 		}
 		$s .= implode(', ',$f);
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
@@ -161,110 +195,110 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
-	
+
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		switch ($ftype) {
@@ -275,8 +309,7 @@ CREATE TABLE
 			return $ftype;
 		}
     	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);
 
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php b/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
index 07344d04d..773aa0c79 100644
--- a/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
@@ -1,13 +1,13 @@
 max_length;
 		}
 		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING': 
+		case 'STRING':
 		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
+		case 'VARCHAR':
+		case 'TINYBLOB':
+		case 'TINYTEXT':
+		case 'ENUM':
 		case 'SET':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 			return 'X';
-			
+
 		// php_mysql extension always returns 'blob' even if 'text'
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'YEAR':
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP': return 'T';
-		
+
 		case 'FLOAT':
 		case 'DOUBLE':
 			return 'F';
-			
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER': return $is_serial ? 'R' : 'I';
 		case 'TINYINT': return $is_serial ? 'R' : 'I1';
 		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
@@ -82,34 +82,34 @@ class ADODB2_mysql extends ADODB_DataDict {
 		case 'C': return 'VARCHAR';
 		case 'XL':return 'LONGTEXT';
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'LONGTEXT';
-		
+
 		case 'B': return 'LONGBLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'TINYINT';
-		
+
 		case 'R':
 		case 'I4':
 		case 'I': return 'INTEGER';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if ($funsigned) $suffix .= ' UNSIGNED';
 		if ($fnotnull) $suffix .= ' NOT NULL';
@@ -118,7 +118,7 @@ class ADODB2_mysql extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
 	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
 		[table_options] [select_statement]
@@ -134,16 +134,16 @@ class ADODB2_mysql extends ADODB_DataDict {
 		[reference_definition]
 		or CHECK (expr)
 	*/
-	
+
 	/*
 	CREATE [UNIQUE|FULLTEXT] INDEX index_name
 		ON tbl_name (col_name[(length)],... )
 	*/
-	
+
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
 			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
@@ -151,11 +151,11 @@ class ADODB2_mysql extends ADODB_DataDict {
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		if (isset($idxoptions['FULLTEXT'])) {
 			$unique = ' FULLTEXT';
 		} elseif (isset($idxoptions['UNIQUE'])) {
@@ -163,20 +163,19 @@ class ADODB2_mysql extends ADODB_DataDict {
 		} else {
 			$unique = '';
 		}
-		
+
 		if ( is_array($flds) ) $flds = implode(', ',$flds);
-		
+
 		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
 		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
-		
+
 		$s .= ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php b/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
index 597fadd88..0f033897d 100644
--- a/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
@@ -1,20 +1,20 @@
 blobSize) return 'C';
 			return 'X';
-		
+
 		case 'NCHAR':
 		case 'NVARCHAR2':
 		case 'NVARCHAR':
 			if (isset($this) && $len <= $this->blobSize) return 'C2';
 			return 'X2';
-			
+
 		case 'NCLOB':
 		case 'CLOB':
 			return 'XL';
-		
+
 		case 'LONG RAW':
 		case 'LONG VARBINARY':
 		case 'BLOB':
 			return 'B';
-		
+
 		case 'TIMESTAMP':
 			return 'TS';
-			
-		case 'DATE': 
+
+		case 'DATE':
 			return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'SMALLINT':
-		case 'INTEGER': 
+		case 'INTEGER':
 			return 'I';
-			
+
 		default:
 			return 'N';
 		}
 	}
-	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'X': return $this->typeX;
 		case 'XL': return $this->typeXL;
-		
+
 		case 'C2': return 'NVARCHAR2';
 		case 'X2': return 'NVARCHAR2(4000)';
-		
+
 		case 'B': return 'BLOB';
-		
+
 		case 'TS':
 				return 'TIMESTAMP';
-				
-		case 'D': 
+
+		case 'D':
 		case 'T': return 'DATE';
 		case 'L': return 'NUMBER(1)';
 		case 'I1': return 'NUMBER(3)';
 		case 'I2': return 'NUMBER(5)';
 		case 'I':
 		case 'I4': return 'NUMBER(10)';
-		
+
 		case 'I8': return 'NUMBER(20)';
 		case 'F': return 'NUMBER';
 		case 'N': return 'NUMBER';
 		case 'R': return 'NUMBER(20)';
 		default:
 			return $meta;
-		}	
+		}
 	}
-	
+
 	function CreateDatabase($dbname, $options=false)
 	{
 		$options = $this->_Options($options);
@@ -110,10 +110,10 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
 		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
 		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
-		
+
 		return $sql;
 	}
-	
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$f = array();
@@ -122,12 +122,12 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		foreach($lines as $v) {
 			$f[] = "\n $v";
 		}
-		
+
 		$s .= implode(', ',$f).')';
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$f = array();
@@ -140,19 +140,19 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if (!is_array($flds)) $flds = explode(',',$flds);
 		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
-		
+
 		$sql = array();
 		$s = "ALTER TABLE $tabname DROP(";
 		$s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($t)
 	{
 		if (strpos($t,'.') !== false) {
@@ -161,26 +161,26 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		}
 		return "drop sequence seq_".$t;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		$suffix = '';
-		
+
 		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
 			$fnotnull = false;
 			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
 		}
-		
+
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
-		
+
 		if ($fautoinc) $this->seqField = $fname;
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
+
 		return $suffix;
 	}
-	
+
 /*
 CREATE or replace TRIGGER jaddress_insert
 before insert on jaddress
@@ -192,7 +192,7 @@ end;
 	function _Triggers($tabname,$tableoptions)
 	{
 		if (!$this->seqField) return array();
-		
+
 		if ($this->schema) {
 			$t = strpos($tabname,'.');
 			if ($t !== false) $tab = substr($tabname,$t+1);
@@ -203,7 +203,7 @@ end;
 			$seqname = $this->seqPrefix.$tabname;
 			$trigname = $this->trigPrefix.$seqname;
 		}
-		
+
 		if (strlen($seqname) > 30) {
 			$seqname = $this->seqPrefix.uniqid('');
 		} // end if
@@ -219,12 +219,12 @@ end;
 		$seqStart = '';
 		if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];}
 		$sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache";
-		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END";
-		
+		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
+
 		$this->seqField = false;
 		return $sql;
 	}
-	
+
 	/*
 	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
 		[table_options] [select_statement]
@@ -240,58 +240,57 @@ end;
 		[reference_definition]
 		or CHECK (expr)
 	*/
-	
 
-	
+
+
 	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		if (isset($idxoptions['BITMAP'])) {
-			$unique = ' BITMAP'; 
+			$unique = ' BITMAP';
 		} elseif (isset($idxoptions['UNIQUE'])) {
 			$unique = ' UNIQUE';
 		} else {
 			$unique = '';
 		}
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		if (isset($idxoptions['oci8']))
 			$s .= $idxoptions['oci8'];
-		
+
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	function GetCommentSQL($table,$col)
 	{
 		$table = $this->connection->qstr($table);
-		$col = $this->connection->qstr($col);	
+		$col = $this->connection->qstr($col);
 		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
 	}
-	
+
 	function SetCommentSQL($table,$col,$cmt)
 	{
 		$cmt = $this->connection->qstr($cmt);
 		return  "COMMENT ON COLUMN $table.$col IS $cmt";
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php b/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
index 67d589070..965314dbc 100644
--- a/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
@@ -1,20 +1,20 @@
 type;
 			$len = $fieldobj->max_length;
 		}
-		$is_serial = is_object($fieldobj) && !empty($fieldobj->primary_key) && !empty($fieldobj->unique) && 
+		$is_serial = is_object($fieldobj) && !empty($fieldobj->primary_key) && !empty($fieldobj->unique) &&
 			!empty($fieldobj->has_default) && substr($fieldobj->default_value,0,8) == 'nextval(';
-		
+
 		switch (strtoupper($t)) {
 			case 'INTERVAL':
 			case 'CHAR':
@@ -41,84 +41,84 @@ class ADODB2_postgres extends ADODB_DataDict {
 			case 'NAME':
 	   		case 'BPCHAR':
 				if ($len <= $this->blobSize) return 'C';
-			
+
 			case 'TEXT':
 				return 'X';
-	
+
 			case 'IMAGE': // user defined type
 			case 'BLOB': // user defined type
 			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
 			case 'VARBIT':
 			case 'BYTEA':
 				return 'B';
-			
+
 			case 'BOOL':
 			case 'BOOLEAN':
 				return 'L';
-			
+
 			case 'DATE':
 				return 'D';
-			
+
 			case 'TIME':
 			case 'DATETIME':
 			case 'TIMESTAMP':
 			case 'TIMESTAMPTZ':
 				return 'T';
-			
+
 			case 'INTEGER': return !$is_serial ? 'I' : 'R';
-			case 'SMALLINT': 
+			case 'SMALLINT':
 			case 'INT2': return !$is_serial ? 'I2' : 'R';
 			case 'INT4': return !$is_serial ? 'I4' : 'R';
-			case 'BIGINT': 
+			case 'BIGINT':
 			case 'INT8': return !$is_serial ? 'I8' : 'R';
-				
+
 			case 'OID':
 			case 'SERIAL':
 				return 'R';
-			
+
 			case 'FLOAT4':
 			case 'FLOAT8':
 			case 'DOUBLE PRECISION':
 			case 'REAL':
 				return 'F';
-				
+
 			 default:
 			 	return 'N';
 		}
 	}
- 	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BYTEA';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'BOOLEAN';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'INT2';
 		case 'I4': return 'INT4';
 		case 'I8': return 'INT8';
-		
+
 		case 'F': return 'FLOAT8';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	/**
-	 * Adding a new Column 
+	 * Adding a new Column
 	 *
 	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
 	 *
@@ -142,7 +142,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
 				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
 				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-			} else {				
+			} else {
 				$sql[] = $alter . $v;
 			}
 			if ($not_null) {
@@ -158,7 +158,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 	{
 	   return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname)));
 	}
-	
+
 	/**
 	 * Change the definition of one column
 	 *
@@ -179,85 +179,96 @@ class ADODB2_postgres extends ADODB_DataDict {
 		}
 		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
 	}*/
-	
+
 	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
-	   // Check if alter single column datatype available - works with 8.0+
-	   $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
-	
-	   if ($has_alter_column) {
-	      $tabname = $this->TableName($tabname);
-	      $sql = array();
-	      list($lines,$pkey) = $this->_GenFields($flds);
-		  $set_null = false;
-	      $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-	      foreach($lines as $v) {
-	        if ($not_null = preg_match('/NOT NULL/i',$v)) {
-	            $v = preg_replace('/NOT NULL/i','',$v);
-	        }
-	         // this next block doesn't work - there is no way that I can see to 
-	         // explicitly ask a column to be null using $flds
-	        else if ($set_null = preg_match('/NULL/i',$v)) {
-	            // if they didn't specify not null, see if they explicitely asked for null
-	            $v = preg_replace('/\sNULL/i','',$v);
-	        }
-	         
-			if (preg_match('/^([^ ]+) .*DEFAULT (\'[^\']+\'|\"[^\"]+\"|[^ ]+)/',$v,$matches)) {
-				$existing = $this->MetaColumns($tabname);
-				list(,$colname,$default) = $matches;
-				if ($this->connection) $old_coltype = $this->connection->MetaType($existing[strtoupper($colname)]);
-				else $old_coltype = $t;
-				$v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
-				$t = trim(str_replace('DEFAULT '.$default,'',$v));
-
-				// Type change from bool to int
-				if ( $old_coltype == 'L' && $t == 'INTEGER' ) {
-					$sql[] = $alter . $colname . ' DROP DEFAULT';
-					$sql[] = $alter . $colname . " TYPE $t USING ($colname::BOOL)::INT";
-					$sql[] = $alter . $colname . " SET DEFAULT $default";
+		// Check if alter single column datatype available - works with 8.0+
+		$has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
+
+		if ($has_alter_column) {
+			$tabname = $this->TableName($tabname);
+			$sql = array();
+			list($lines,$pkey) = $this->_GenFields($flds);
+			$set_null = false;
+			$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+			foreach($lines as $v) {
+				if ($not_null = preg_match('/NOT NULL/i',$v)) {
+					$v = preg_replace('/NOT NULL/i','',$v);
 				}
-				// Type change from int to bool
-				else if ( $old_coltype == 'I' && $t == 'BOOLEAN' ) {
-					$sql[] = $alter . $colname . ' DROP DEFAULT';
-					$sql[] = $alter . $colname . " TYPE $t USING CASE WHEN $colname = 0 THEN false ELSE true END";
-					$sql[] = $alter . $colname . " SET DEFAULT " . $this->connection->qstr($default);
+				 // this next block doesn't work - there is no way that I can see to
+				 // explicitly ask a column to be null using $flds
+				else if ($set_null = preg_match('/NULL/i',$v)) {
+					// if they didn't specify not null, see if they explicitely asked for null
+					// Lookbehind pattern covers the case 'fieldname NULL datatype DEFAULT NULL'
+					// only the first NULL should be removed, not the one specifying
+					// the default value
+					$v = preg_replace('/(?MetaColumns($tabname);
+					list(,$colname,$default) = $matches;
+					$alter .= $colname;
+					if ($this->connection) {
+						$old_coltype = $this->connection->MetaType($existing[strtoupper($colname)]);
+					}
+					else {
+						$old_coltype = $t;
+					}
+					$v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
+					$t = trim(str_replace('DEFAULT '.$default,'',$v));
+
+					// Type change from bool to int
+					if ( $old_coltype == 'L' && $t == 'INTEGER' ) {
+						$sql[] = $alter . ' DROP DEFAULT';
+						$sql[] = $alter . " TYPE $t USING ($colname::BOOL)::INT";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+					// Type change from int to bool
+					else if ( $old_coltype == 'I' && $t == 'BOOLEAN' ) {
+						if( strcasecmp('NULL', trim($default)) != 0 ) {
+							$default = $this->connection->qstr($default);
+						}
+						$sql[] = $alter . ' DROP DEFAULT';
+						$sql[] = $alter . " TYPE $t USING CASE WHEN $colname = 0 THEN false ELSE true END";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+					// Any other column types conversion
+					else {
+						$sql[] = $alter . " TYPE $t";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+
 				}
-				// Any other column types conversion
 				else {
-					$sql[] = $alter . $colname . " TYPE $t";
-					$sql[] = $alter . $colname . " SET DEFAULT $default";
+					// drop default?
+					preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
+					list (,$colname,$rest) = $matches;
+					$alter .= $colname;
+					$sql[] = $alter . ' TYPE ' . $rest;
+				}
+
+#				list($colname) = explode(' ',$v);
+				if ($not_null) {
+					// this does not error out if the column is already not null
+					$sql[] = $alter . ' SET NOT NULL';
+				}
+				if ($set_null) {
+					// this does not error out if the column is already null
+					$sql[] = $alter . ' DROP NOT NULL';
 				}
-			 
-			 
-	         } 
-	         else {
-	            // drop default?
-	            preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
-	            list (,$colname,$rest) = $matches;
-	            $sql[] = $alter . $colname . ' TYPE ' . $rest;
-	         }
-	
-#	         list($colname) = explode(' ',$v);
-	         if ($not_null) {
-	            // this does not error out if the column is already not null
-				$sql[] = $alter . $colname . ' SET NOT NULL';
-	         }
-	         if ($set_null) {
-	            // this does not error out if the column is already null
-	            $sql[] = $alter . $colname . ' DROP NOT NULL';
-	         }
-	      }
-	      return $sql;
-	   }
-	
-	   // does not have alter column
-	   if (!$tableflds) {
-	      if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
-	      return array();
-	   }
-	   return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+			}
+			return $sql;
+		}
+
+		// does not have alter column
+		if (!$tableflds) {
+			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+			return array();
+		}
+		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
 	}
-	
+
 	/**
 	 * Drop one column
 	 *
@@ -281,7 +292,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 		}
 		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
 	}
-	
+
 	/**
 	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
 	 *
@@ -301,14 +312,14 @@ class ADODB2_postgres extends ADODB_DataDict {
 		foreach($this->MetaColumns($tabname) as $fld) {
 			if (!$dropflds || !in_array($fld->name,$dropflds)) {
 				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
-				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
+				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) &&
 					in_array($fld->type,array('varchar','char','text','bytea'))) {
 					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
 				} else {
 					$copyflds[] = $fld->name;
 				}
 				// identify the sequence name and the fld its on
-				if ($fld->primary_key && $fld->has_default && 
+				if ($fld->primary_key && $fld->has_default &&
 					preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
 					$seq_name = $matches[1];
 					$seq_fld = $fld->name;
@@ -316,7 +327,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 			}
 		}
 		$copyflds = implode(', ',$copyflds);
-		
+
 		$tempname = $tabname.'_tmp';
 		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
 		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
@@ -339,14 +350,14 @@ class ADODB2_postgres extends ADODB_DataDict {
 		$aSql[] = 'COMMIT';
 		return $aSql;
 	}
-	
+
 	function DropTableSQL($tabname)
 	{
 		$sql = ADODB_DataDict::DropTableSQL($tabname);
-		
+
 		$drop_seq = $this->_DropAutoIncrement($tabname);
 		if ($drop_seq) $sql[] = $drop_seq;
-		
+
 		return $sql;
 	}
 
@@ -363,7 +374,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
 	// if yes return sql to drop it
 	// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
@@ -379,7 +390,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 		}
 		return "DROP SEQUENCE ".$seq;
 	}
-	
+
 	function RenameTableSQL($tabname,$newname)
 	{
 		if (!empty($this->schema)) {
@@ -393,7 +404,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 
 		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
 	}
-	
+
 	/*
 	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
 	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
@@ -417,8 +428,8 @@ class ADODB2_postgres extends ADODB_DataDict {
 	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
 	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
 	*/
-	
-	
+
+
 	/*
 	CREATE [ UNIQUE ] INDEX index_name ON table
 [ USING acc_method ] ( column [ ops_name ] [, ...] )
@@ -430,35 +441,35 @@ CREATE [ UNIQUE ] INDEX index_name ON table
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		
+
 		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
+
 		if (isset($idxoptions['HASH']))
 			$s .= 'USING HASH ';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s .= '(' . $flds . ')';
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' && strpos($ftype,'(') === false) {
@@ -469,4 +480,3 @@ CREATE [ UNIQUE ] INDEX index_name ON table
 		return $ftype;
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php b/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
index 4ef44c1f9..aaa4820d1 100644
--- a/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
@@ -1,13 +1,13 @@
 _GenFields($flds);
 		return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -116,7 +116,5 @@ class ADODB2_sapdb extends ADODB_DataDict {
 			$flds[$k] = $this->NameQuote($v);
 		}
 		return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
-	}	
+	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php b/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
index dd6b9827c..81fb01653 100644
--- a/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
@@ -1,15 +1,15 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported natively by SQLite");
 		return array();
 	}
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported natively by SQLite");
 		return array();
 	}
-	
+
 	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
 	{
 		if ($this->debug) ADOConnection::outp("RenameColumnSQL not supported natively by SQLite");
-		return array();	
+		return array();
 	}
-	
+
 }
-?>
diff --git a/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php b/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
index dca89495f..3426e078d 100644
--- a/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
+++ b/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
@@ -1,13 +1,13 @@
 type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
 		case 'SMALLINT': return 'I2';
 		case 'BIGINT':  return  'I8';
-		
+
 		case 'REAL':
 		case 'FLOAT': return 'F';
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'I': return 'INT'; 
+
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -86,7 +86,7 @@ class ADODB2_sybase extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -98,7 +98,7 @@ class ADODB2_sybase extends ADODB_DataDict {
 
 		return $sql;
 	}
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName($tabname);
@@ -112,10 +112,10 @@ class ADODB2_sybase extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
@@ -124,106 +124,105 @@ class ADODB2_sybase extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/docs/adodb-faq.html b/lib/WikiDB/adodb/docs/adodb-faq.html
new file mode 100644
index 000000000..1bf258163
--- /dev/null
+++ b/lib/WikiDB/adodb/docs/adodb-faq.html
@@ -0,0 +1,108 @@
+

+
ADOdb Frequently Asked Questions

+

+

+Home   Download
+

+GENERAL
+
    
+
  1. What is ADOdb?
    
+An object oriented library written in PHP that abstracts database operations for portability. It is modelled on Microsoft's ADO, but has many improvements that make it unique (eg. pivot tables, Active Record support, generating HTML for paging recordsets with next and previous links, cached recordsets, HTML menu generation, etc).
+  
    
+
  2. Can I use ADOdb for commercial applications for free? 
    
+Yes; ADOdb uses a BSD-style license so you can freely use the source code in any application, so long as you comply to the terms of license.txt.
+
    
+
  3. How can I learn ADOdb?
    
+See the docs. There is an extensive list of tutorials listed. 
+
    
+
  4. How can I contribute to ADOdb?
    
+- You can translate documentation to another language.
    
+- Link to this web-site. 
    
+- Port ADOdb to new databases. 
    
+- Make me very happy by buying a copy of phpLens.
    
+
    
+Code contributions are also welcome provided they enhance functionality, preferably work on multiple databases, and are backward compatible.
+
    
+
  5. Who is using ADOdb?
    
+Many PHP applications and web-sites. There is partial list here: http://php.weblogs.com/adodb-cool-applications
+
    
+
  6. Is there a mailing list or forum to discuss ADOdb?
    
+There is a forum at http://phplens.com/lens/lensforum/topics.php?id=4. There is no longer any mailing list due to spammers. 
+

+

+TECHNICAL
+
    
+
+  
  1. # Why do I get a ociplogon/ocilogon undefined error message?
    
+Why do I get a mysql_pconnect/mysql_connect undefined error message?
    
+Why do I get a ibase_timefmt undefined error message?
    
+Why do I get a *_connect/*_pconnect undefined error message?
    
+You do not have this extension compiled or included with PHP. On Windows, you can include it by modifying your php.ini (extension=extension_name.dll). On Unix, you will need to compile the extension - for help try this knowledgebase. Or perhaps you do not have the database client installed.
+    
    
+
+  
  2. #
+I am trying to create two connections to the same database, but the 2nd connection doesn't work, but reuses the first connection.
    
+    
    
+This is a "feature" of PHP. When you make a 2nd connection that only differs by the database name, you get back the first connection. This is normally the reason for the problem described.
+    
    
+
+From http://php.net/manual/en/function.mysql-connect.php
+(this applies to other db's too):
+    
    
+
+If a second call is made to mysql_connect() with the same arguments, no new link will be established, but instead, the link identifier of the already opened link will be returned.
+    
    
+
+Possible solutions include: 
+    
      
+      
    •  Use different userid and password for each connection. 
+      
    •  Use different IP or  host-address for each connection, even when connecting to same server! Eg. use 'localhost' and '127.0.0.l'.
+      
    •  Use NConnect( ), which always forces a new connection, if the database driver supports it (Oci8, MySQL,MSSQL and PostgreSQL).
+    
+      
    • Use SelectDB( ), which switches databases, if the database driver supports it (MySQL, MSSQL, Sybase).
+    
    
+    
    
+
+
+  
  3.  
+Can you tell me what is wrong with this code snipplet? - it does not do anything...[code deleted]...
    
+Try turning on debugging. Eg.
+    
    +  $DB = ADONewConnection($driver);
+  $DB->debug = 1;
    
+   This will show all error messages and generated SQL.
+    
    
+  
  4. SelectLimit with Oracle oci8 is not working.
    
+    The adodb_pager class is not working with oci8.
    
+You are probably using a version of Oracle earlier than 8.1.7, or have compatibility set to an earlier version in init.ora. You can try using the oci805 driver instead.
+    
    
+  
  5. Why does mssql only retrieve the first 255 or 4096 bytes of my data?
    
+See http://phplens.com/lens/lensforum/msgs.php?id=3564
+    
    
+  
  6. # I tried in Microsoft Access to insert a record but i cannot see it, or it is inserted twice. Why? 
    
+The Access ODBC driver is not thread-safe.
+
    
+When you run Microsoft Jet in an IIS environment, it is recommended that you use the native Jet OLE DB Provider in place of the Microsoft Access ODBC driver. The Microsoft Access ODBC driver (Jet ODBC driver) can have stability issues due to the version of Visual Basic for Applications that is invoked because the version is not thread safe. 
+
    
+An example of using the thread-safe OLE DB provider:
+
    +$dsn = 'Provider=Microsoft.Jet.OLEDB.4.0;'.
+             'Data Source=C:\path\to\MyDatabase.mdb;';
+$db = NewADOConnection('ado_access');
+$db->PConnect($dsn);
+
    
+
    
+There have been reports that using PConnect() is more reliable than Connect() with Access. 
+I have also heard of good experiences using ODBTP; you can
+call it directly, or through the ADOdb odbtp driver.
+
    
+  
  7.  # I cannot connect to Access/VFP/SQL Server from IIS. However I can connect from the desktop.
    
+This is probably a Windows 2000 file permissions problem. IIS assumes a specific userid when serving web pages, and it is likely that userid does not have permission to access the  database. You need to change the IIS user to someone who has permission the database.
+
    
+          
+  
  8. Oracle problem with ADOdb?
+    
    
+If it is a very technical question, you can try this forum http://forums.oracle.com/forums/forum.jsp?forum=178
+

+

+(c) 2000-2004 John Lim. All rights reserved.
diff --git a/lib/WikiDB/adodb/docs/adodb.gif b/lib/WikiDB/adodb/docs/adodb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c5e8dfc6db2d41dfcdd1beaf338ad60bc8375587
GIT binary patch
literal 1091
zcmb7<{WIHl0DwOUc@N?x-e2-H64Owrwi9hvoYw2H%QrbkEDm9?CJ@p9h|bB8i9};DF}E-nu8&VKlPQ^+TA|VS1j3czU?Biulaoss8J!Ts
zYim>Uczu?Z+_AA$2BXQzDHnj#?_luvIsX&rtvSLD_yg*D@BI@%nkK8u<)Ibft?jup
znZYf(?&GWgZ>sABvVO@9()Sm}`b*{vZ=B*&F9lTrGZ^P;?EcTibFcm}m6R4^Fpw*e
z7=|WYq*9@qwU9d&ix$<^iR-*c4Yed6YYz`+_m&oyx@O3`uDij^3}s<~b|H`<#Qx0Zy
zM5&dzEm-tEQItP$xl*zQ1@sj=e1abg>0jztUh!k=?>ldPnd6aEsrB=JB)><;@~cOf
ziOLmMa+SkLdEXON^ReiWo-F;14%!D3i;H{ufzKD*TyTdwEY-j|EBReup8T)JXC0b_
zH23V;2{)6hD(EfTEN!{@6v=r5CRRk4cxSdx=5w#k7X7S2Y+G&phnomHi<*Sc+&S
zwsGRNkSpfK{Xm9&J@{>iBx79Id6ynmPLW(WP;|BA+V5^iO5o4B?s7d3tSbzfC`wZ)
zGMLi-J(g$a$UI2z?i2;Hqz%;<4-D;hrlVxiE*{ILz5RD-_t7Dm%{QGgd$F{q=;?aJ$*2EiPh`WLqT
B&Itej

literal 0
HcmV?d00001

diff --git a/lib/WikiDB/adodb/docs/adodb2.gif b/lib/WikiDB/adodb/docs/adodb2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f12ae2037ee14b11d8cc0f00a31ba088ef755119
GIT binary patch
literal 1458
zcma)%{Xf%r0Kh++S@STy8>OwtRIg)EqO#F-9)>lg*;Sk)BR4Xap**$p9Yd5hwrdr#
zErn4eAxDke5jyLYh{~qsQf}Su)x*`f+SPw>@7Md+_Yd#T?I9FuJO^w54*)QkOh)6o
zxw$!=&Y;me8yy`T8X6iHc&t`Wb#&ZsZPnD**DDl*a`~^7mA%qaX{DuI1qJOe4Cm#w
zq^GO6+)Igx%BZL+7E2ZuCJ7G@4+tpt^)01Rk8j*qxNaTn>Y7g?(g&2eJ=h4`zZ74d0NUjL6OZmr
z6b;p7+)4F9Xc~62A$olzyr=bg2$sD;N!8vk+JL}smrf)*O2;46tt^r5!
zxlA;_kd>7!WR}5ke4Hmsw0>RR%BRqV*=W(;mEt2v59)1z&vp(kDY
zI)#|tqaXIcAU;TUQ)p**MK{Zfv$eyor08@7`v(aapY;&}}o3R5xQ
z!&^G#x6J2q!F&mBM7Bws(1)={1u>#9;9_qXcG}S7s?Z(HcGVUQMjX)RY7m$;buyX-
z)75_!{~iL&LQehxF!b>whnCe-GhqTqY>qCLXB`1Mnrk-q1zLGv;&mzEQA}+f;Drj0
z1!IzDad#1r0PsNPajoR{gr+tu*^`lq
zBpe)`ht8-POx$(`KbM4i6=JCdxbYQz6^|?;kd0={Rs?#}-n`l-v&j?^xAo@Yi*6-Z
z;b9(<_>i;~;s4U5@jE$r;qYzZ)>JS>U36EbElaN}r=h0ih-MTxgO6pW*8TENaZJmg
zldehIui0Xa4|PgqN8w4=T4M1r<`5sdFN`{2OzpRv#2TjmrGAMPHt_?S}r$H~Aepajnz)S^9Wy(`5OI
zePfG;lP$mHOevGXyA3^KhFo0Rh8n*GShkPyh!Z!{@%TdIwhu;{y~x4P%wpL(5>HYX~Mxh5K{y@~50*Cnp
z)U$Z}2@d@>aoSi+8CBS19}jXcii4L31y*~+$j?~`eTNb+YZx$d5yQ;XXb1qm{{VnR
Bbn*ZI

literal 0
HcmV?d00001

diff --git a/lib/WikiDB/adodb/docs/docs-active-record.htm b/lib/WikiDB/adodb/docs/docs-active-record.htm
index 88b6ee5c6..70435c12a 100644
--- a/lib/WikiDB/adodb/docs/docs-active-record.htm
+++ b/lib/WikiDB/adodb/docs/docs-active-record.htm
@@ -14,8 +14,8 @@ font-family: Arial, Helvetica, sans-serif ;
 ADOdb Active Record
 
 
ADOdb Active Record

-
 (c) 2000-2010 John Lim (jlim#natsoft.com)

-
This software is dual licensed using BSD-Style and LGPL. This 
+
 (c) 2000-2014 John Lim (jlim#natsoft.com)

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

 

 
    
@@ -34,7 +34,7 @@ This implementation differs from Zend Framework's implementation in the followin
 
  1. Caching of table metadata so it is only queried once per table, no matter how many Active Records are created.
    
 
  2. PHP5 version of ADOdb_Active_Record now supports one-to-many relationships.
    
 
  3. New adodb-active-recordx.inc.php, which is an Active Record eXtended implementation that support JOINs for higher performance when loading children, and other nice features.
    
-
  4. Lots of  additional functionality.
     
+
  5. Lots of  additional functionality.
    
 
 
    
 ADOdb_Active_Record is designed upon the principles of the "ActiveRecord" design pattern, which was first described by Martin Fowler. The ActiveRecord pattern has been implemented in many forms across the spectrum of programming languages. ADOdb_Active_Record attempts to represent the database as closely to native PHP objects as possible.
@@ -44,14 +44,14 @@ ADOdb_Active_Record maps a database table to a PHP class, and each instance of t
 
 
  6. Setting the Database Connection
    7. 
 
    
-The first step to using  ADOdb_Active_Record is to set the default connection that an ADOdb_Active_Record objects will use to connect to a database. 
+The first step to using  ADOdb_Active_Record is to set the default connection that an ADOdb_Active_Record objects will use to connect to a database.
 
 
     require_once('adodb/adodb-active-record.inc.php');
 
 $db = NewADOConnection('mysql://root:pwd@localhost/dbname');
 ADOdb_Active_Record::SetDatabaseAdapter($db);
-
            
+

 
 
  • Table Rows as Objects
    • 
 
    
@@ -66,14 +66,14 @@ $db->Execute("CREATE TEMPORARY TABLE `persons` (
                 PRIMARY KEY  (`id`)
             ) ENGINE=MyISAM;
            ");
- 
       
+

    ADOdb_Active_Records are object representations of table rows. Each table in the database is represented by a class in PHP. To begin working with a table as a ADOdb_Active_Record, a class that extends ADOdb_Active_Record needs to be created for it. 

     class person extends ADOdb_Active_Record{}
 $person = new person();
-
    +

    In the above example, a new ADOdb_Active_Record object $person was created to access the "persons" table. Zend_Db_DataObject takes the name of the class, pluralizes it (according to American English rules), and assumes that this is the name of the table in the database. Also note that with MySQL, table names are case-sensitive, so your class name must match the table name's case. With other databases with case-insensitive tables, your class can be capitalized differently. @@ -101,7 +101,7 @@ var_dump($person->getAttributeNames()); * string(13) "favorite_color" * } */ - +

    One big difference between ADOdb and Zend's implementation is we do not automatically convert to camelCaps style.

    @@ -115,12 +115,12 @@ $person = new person(); $person->name_first = 'Andi'; $person->name_last = 'Gutmans'; $person->save(); - +

    Oh, no! The above code snippet does not insert a new record into the database. Instead, outputs an error: 

     1048: Column 'favorite_color' cannot be null
-
    +

    This error occurred because MySQL rejected the INSERT query that was generated by ADOdb_Active_Record. If exceptions are enabled in ADOdb and you are using PHP5, an error will be thrown. In the definition of our table, we specified all of the fields as NOT NULL; i.e., they must contain a value.

    @@ -147,7 +147,7 @@ var_dump($person->id); * Outputs the following: * string(1) */ - +

    From this point on, updating it is simply a matter of changing the object's properties and calling the save() method again: @@ -162,8 +162,8 @@ The code snippet above will change the favorite color to red, and then UPDATE th

    ADOdb Specific Functionality

  • Setting the Table Name

    • The default behaviour on creating an ADOdb_Active_Record is to "pluralize" the class name and - use that as the table name. Often, this is not the case. For example, the person class could be reading - from the "People" table. + use that as the table name. Often, this is not the case. For example, the person class could be reading + from the "People" table.

    We provide two ways to define your own table:

    1. Use a constructor parameter to override the default table naming behaviour. 

    @@ -180,7 +180,7 @@ The code snippet above will change the favorite color to red, and then UPDATE th

  • $ADODB_ASSOC_CASE

    • -

    This allows you to control the case of field names and properties. For example, all field names in Oracle are upper-case by default. So you +

    This allows you to control the case of field names and properties. For example, all field names in Oracle are upper-case by default. So you can force field names to be lowercase using $ADODB_ASSOC_CASE. Legal values are as follows: 

      0: lower-case
@@ -194,14 +194,14 @@ $person = new person('People');
 $person->name = 'Lily';
 $ADODB_ASSOC_CASE = 2;
 $person2 = new person('People');
-$person2->NAME = 'Lily'; 
+$person2->NAME = 'Lily';

    Also see $ADODB_ASSOC_CASE.

  • ADOdb_Active_Record::Save()

    • -Saves a record by executing an INSERT or UPDATE SQL statement as appropriate. +Saves a record by executing an INSERT or UPDATE SQL statement as appropriate.

    Returns false on unsuccessful INSERT, true if successsful INSERT.

    Returns 0 on failed UPDATE, and 1 on UPDATE if data has changed, and -1 if no data was changed, so no UPDATE statement was executed. @@ -247,7 +247,7 @@ ADODB_Active_Record::$_quoteNames = true;

  • Error Handling and Debugging

    • -In PHP5, if adodb-exceptions.inc.php is included, then errors are thrown. Otherwise errors are handled by returning a value. False by default means an error has occurred. You can get the last error message using the ErrorMsg() function. +In PHP5, if adodb-exceptions.inc.php is included, then errors are thrown. Otherwise errors are handled by returning a value. False by default means an error has occurred. You can get the last error message using the ErrorMsg() function.

    To check for errors in ADOdb_Active_Record, do not poll ErrorMsg() as the last error message will always be returned, even if it occurred several operations ago. Do this instead: 

    @@ -288,14 +288,14 @@ try {
 
    
 
  • Primary Keys
    • 
 
    
-ADOdb_Active_Record does not require the table to have a primary key. You can insert records for such a table, but you will not be able to update nor delete. 
+ADOdb_Active_Record does not require the table to have a primary key. You can insert records for such a table, but you will not be able to update nor delete.
 
    Sometimes you are retrieving data from a view or table that has no primary key, but has a unique index. You can dynamically set the primary key of a table through the constructor:
 
     	$pkeys = array('category','prodcode');
-	
+
 	// set primary key using constructor
 	$rec = new ADOdb_Active_Record('Products', $pkeys);
-	
+
 	// or define a new class
 	class Product extends ADOdb_Active_Record {
 		function __construct()
@@ -303,7 +303,7 @@ ADOdb_Active_Record does not require the table to have a primary key. You can in
 			parent::__construct('Products', array('prodid'));
 		}
 	}
-	
+
 	$rec = new Product();
 
    
 
@@ -326,7 +326,7 @@ foreach($activeRecs as $rec) {
 	$rec2 = new ADOdb_Active_Record('table2',$db2);
 	$rec2->id = $rec->id;
 	$rec2->name = $rec->name;
-	
+
 	$rec2->Save();
 }
    @@ -370,7 +370,7 @@ Of course an UPDATE statement is superior because it's simpler and much more eff

  • Transactions

    • -The default transaction mode in ADOdb is autocommit. So that is the default with active record too. +The default transaction mode in ADOdb is autocommit. So that is the default with active record too. The general rules for managing transactions still apply. Active Record to the database is a set of insert/update/delete statements, and the db has no knowledge of active records.

    Smart transactions, that does an auto-rollback if an error occurs, is still the best method to multiple activities (inserts/updates/deletes) that need to be treated as a single transaction: @@ -383,7 +383,7 @@ $conn->CompleteTrans();

    One to Many Relations

    -

    Since ADOdb 5.06, we support parent child relationships. This is done using the ClassBelongsTo() and ClassHasMany() functions. +

    Since ADOdb 5.06, we support parent child relationships. This is done using the ClassBelongsTo() and ClassHasMany() functions.

  • ClassHasMany

    • To globally define a one-to-many relationship we use the static function ADODB_Active_Record::ClassHasMany($class, $relation, $foreignKey = '', $foreignClass = 'ADODB_Active_Record'). For example, we have 2 tables, persons (parent table) and children (child table) @@ -391,7 +391,7 @@ linked by persons.id = children.person_id. The variable $person 

     	class person extends ADOdb_Active_Record{}
 	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
-	
+
 	$person = new person();
 	$person->Load("id=1");
 	foreach($person->children as $c) {
@@ -413,15 +413,15 @@ linked by persons.id = children.person_id. The variable $person
 	class person extends ADOdb_Active_Record{}
 	class children extends ADOdb_Active_Record{}
 	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
-	
+
 	$person = new person();
-	
-	for ($i=0; $i<10; $i++) 
+
+	for ($i=0; $i<10; $i++)
 		$person->children[0] = new children('children');
-	 
+
 	 // modify fields of $person, then...
 	$person->save();
-	
+
 	foreach($person->children as $c) {
 		// modify fields of $c then...
 		$c->save();
@@ -442,7 +442,7 @@ linked by persons.id = children.person_id. The variable $person
 	class child extends ADOdb_Active_Record { .... some modifications here ... }
 	ADODB_Active_Record::ClassHasMany('person', 'children','person_id', 'child');
    -

    Lastly some troubleshooting issues. We use the __get() method to set +

    Lastly some troubleshooting issues. We use the __get() method to set $p->children below. So once $p->children is defined by accessing it, we don't change the child reference, as shown below: 

     	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
@@ -450,14 +450,14 @@ $p->children below. So once $p->children is defined by accessing it, we don't ch
 	$p->Load('id=1');
 	# $p->children points to person_id = 1
 	var_dump($p->children);
-	
+
 	$p->Load('id=2');
 	# $p->children still points to person_id = 1
-	var_dump($p->children); 
+	var_dump($p->children);

    The solution to the above is to unset($p->children) before $p->Load('id=2').

  • TableHasMany

    • -For some classes, the mapping between class name and table name (which is the pluralised version) might not match. For example, +For some classes, the mapping between class name and table name (which is the pluralised version) might not match. For example, the class name might be person, but the table name might be people. So we have 2 tables, people (parent table) and children (child table) linked by people.id = children.person_id.

    Then you use the following static function @@ -466,7 +466,7 @@ linked by people.id = children.person_id. ADODB_Active_Record::TableHasMany('people', 'children', 'person_id')

  • TableKeyHasMany

    • -For some classes, the mapping between class name and table name (which is the pluralised version) might not match or the primary key is not the default id. For example, +For some classes, the mapping between class name and table name (which is the pluralised version) might not match or the primary key is not the default id. For example, the class name might be person, but the table name might be people. So we have 2 tables, people (parent table) and children (child table) linked by people.pid = children.person_id.

    Then you use the following static function @@ -493,7 +493,7 @@ ADODB_Active_Record::TableKeyHasMany('people', 'pid', 'children', 'person_id') PRIMARY KEY (`id`) ) ENGINE=MyISAM; "); - + $db->Execute("CREATE TEMPORARY TABLE `children` ( `id` int(10) unsigned NOT NULL auto_increment, `person_id` int(10) unsigned NOT NULL, @@ -504,24 +504,24 @@ ADODB_Active_Record::TableKeyHasMany('people', 'pid', 'children', 'person_id') PRIMARY KEY (`id`) ) ENGINE=MyISAM; "); - + $db->Execute("insert into children (person_id,name_first,name_last) values (1,'Jill','Lim')"); $db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')"); $db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')"); - + class person extends ADOdb_Active_Record{} - ADODB_Active_Record::ClassHasMany('person', 'children','person_id'); - + ADODB_Active_Record::ClassHasMany('person', 'children','person_id'); + $person = new person(); - + $person->name_first = 'John'; $person->name_last = 'Lim'; $person->favorite_color = 'lavender'; $person->save(); // this save will perform an INSERT successfully - + $person2 = new person(); # no need to define HasMany() again, adodb remembers definition $person2->Load('id=1'); - + $c = $person2->children; if (is_array($c) && sizeof($c) == 3 && $c[0]->name_first=='Jill' && $c[1]->name_first=='Joan' && $c[2]->name_first == 'JAMIE') echo "OK Loaded HasMany<br>"; @@ -531,12 +531,12 @@ ADODB_Active_Record::TableKeyHasMany('people', 'pid', 'children', 'person_id')

  • HasMany

    • -

    This older method is deprecated and ClassHasMany/TableHasMany/TableKeyHasMany should be used. +

    This older method is deprecated and ClassHasMany/TableHasMany/TableKeyHasMany should be used.

    The older way to define a one-to-many relationship is to use $parentobj->HasMany($relation, $foreignKey = ''). For example, we have 2 tables, persons (parent table) and children (child table) linked by persons.id = children.person_id. The variable $person->children is an array that holds the children. To define this relationship: 

     	class person extends ADOdb_Active_Record{}
-	
+
 	$person = new person();
 	$person->HasMany('children','person_id');
 	$person->Load("id=1");
@@ -550,7 +550,7 @@ linked by persons.id = children.person_id. The variable $person
 
     	$person = new person();
 	$person->HasMany('children','person_id');
-	
+
 	$person2 = new person();
 	$person->Load("id=1");
 	$p = $person2->children;
@@ -562,20 +562,20 @@ linked by persons.id = children.person_id. The variable $person
 we have a child table kids, and a parent table person. We have a link kids.person_id = persons.id. We create a child first, then link it to the parent:
 
     	class kid extends ADOdb_Active_Record{};
-	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id'); 
+	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id');
 
-	$ch = new kid(); // default tablename will be 'kids', with primary key 'id' 
+	$ch = new kid(); // default tablename will be 'kids', with primary key 'id'
 	$ch->Load('id=1');
 	$p = $ch->person;
 	if (!$p || $p->name_first != 'John') echo "Error loading belongsTo<br>";
 	else echo "OK loading BelongTo<br>";
 
    
 
    
-
    Note that relationships are case-sensitive, so ClassBelongsTo('kid','PARENT', 'parent_id') and ClassBelongsTo('kid', 'parent', 'parent_id') are not the same. 
+
    Note that relationships are case-sensitive, so ClassBelongsTo('kid','PARENT', 'parent_id') and ClassBelongsTo('kid', 'parent', 'parent_id') are not the same.
 
    Also if no data is loaded into the child instance, then $p will return null;
 
    -	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id'); 
-	
+	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id');
+
 	$ch = new kid();
 	$p = $ch->person; # $p is null
 
    
@@ -584,7 +584,7 @@ we have a child table kids, and a parent table person
 
  • TableBelongsTo
    • 
 
    If the child table differs from the convention that the child table name is the plural of the child class name, use this function:
@@ -608,23 +608,23 @@ we have a child table children, and a parent table pers
 	class Child extends ADOdb_Active_Record{};
 	$ch = new Child('children',array('id'));
 	$ch->BelongsTo('person','person_id','id');  ## this can be simplified to $ch->BelongsTo('person')
-	                                            ## as foreign key defaults to $table.'_id' and 
-	                                            ## parent pkey defaults to 'id' 
+	                                            ## as foreign key defaults to $table.'_id' and
+	                                            ## parent pkey defaults to 'id'
 	$ch->Load('id=1');
 	$p = $ch->person;
 	if (!$p || $p->name_first != 'John') echo "Error loading belongsTo<br>";
 	else echo "OK loading BelongTo<br>";
 
    
-
    You only need to define BelongsTo() once in a script as it is global for all instances. 
+
    You only need to define BelongsTo() once in a script as it is global for all instances.
 
 
  • LoadRelations
    • 
 
    Sometimes you want to load only a subset of data in a relationship. For example, you could load all female children sorted by children.name
 using LoadRelations($relation, $whereOrderBy = '', $offset = -1, $limit = -1):
 
    -	# assume this has been called: 
+	# assume this has been called:
 	#   ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
-	$person = new person(); 
-	$person->Load('id=23');  
+	$person = new person();
+	$person->Load('id=23');
 	# Load doesn't load children until $person->children is accessed or LoadRelations is called:
 	$person->LoadRelations('children',"gender='F' order by name");
 
    
@@ -632,11 +632,11 @@ using LoadRelations($relation, $whereOrderBy = '', $offset = -1, $limit = -1):
 example, we load a window of 100 records at a time:
 
     
-	# assume this has been called: 
-	#  ADODB_Active_Record::ClassHasMany('Account', 'transactions','account_id'); 
+	# assume this has been called:
+	#  ADODB_Active_Record::ClassHasMany('Account', 'transactions','account_id');
 	$acc = new Account();
 	$acc->Load('id=23');
-	
+
 	$start = 0;
 	while(true) {
 		$acc->LoadRelations('transactions',"tx_done=0 order by trxdate", $start, $start+100);
@@ -742,7 +742,7 @@ $db->Execute("CREATE TEMPORARY TABLE `persons` (
                 PRIMARY KEY  (`id`)
             ) ENGINE=MyISAM;
            ");
-		   
+
 class person extends ADOdb_Active_Record{}
 $person = new person();
 
@@ -794,7 +794,7 @@ var_dump($person2);
 // retrieve an array of records
 $activeArr = $db->GetActiveRecordsClass($class = "person",$table = "persons","id=".$db->Param(0),array(2));
 $person2 = $activeArr[0];
-echo "<p>Name first (should be John): ",$person->name_first, "<br>Class = ",get_class($person2);	
+echo "<p>Name first (should be John): ",$person->name_first, "<br>Class = ",get_class($person2);
 
    
 
 
@@ -803,7 +803,7 @@ echo "<p>Name first (should be John): ",$person->name_first, "<br>Class =
 
    Active Record eXtended
    
 
    This is the original one-to-many Active Record implementation submitted by
 Chris Ravenscroft  (chris#voilaweb.com). The reason why we are offering both versions is that the Extended version
-is more powerful but more complex. My personal preference is to keep it simpler, but your view may vary. 
+is more powerful but more complex. My personal preference is to keep it simpler, but your view may vary.
 
    To use, just include adodb-active-recordx.inc.php instead of adodb-active-record.inc.php.
 
    It provides a new function called Find() that is quite intuitive to use as shown in the example below. It also supports loading all relationships using a single query (using joins).
 
    @@ -817,7 +817,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 
 	include_once('../adodb.inc.php');
 	include_once('../adodb-active-recordx.inc.php');
-	
+
 
 	$db = NewADOConnection('mysql://root@localhost/northwind');
 	$db->debug=0;
@@ -846,12 +846,12 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-			   
-	
+
+
 	$db->Execute("insert into children (person_id,name_first,name_last,favorite_pet) values (1,'Jill','Lim','tortoise')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
-			   
+
 	// This class _implicitely_ relies on the 'people' table (pluralized form of 'person')
 	class Person extends ADOdb_Active_Record
 	{
@@ -887,7 +887,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 			parent::__construct('children', false, false, array('new' => true));
 		}
 	}
-	
+
 	echo "Inserting person in 'people' table ('John Lim, he likes lavender')\n";
 	echo "---------------------------------------------------------------------------\n";
 	$person = new Person();
@@ -934,7 +934,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 	$people7 = $person7->Find('people.id=1', false, false, array('loading' => ADODB_JOIN_AR));
 	echo (ar_assert($people7, "'name_first' => 'John'")) ? "[OK] Found John\n" : "[!!] Find failed\n";
 	echo (ar_assert($people7, "'favorite_pet' => 'tortoise'")) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n";
-	
+
 	echo "\n\n---------------------------------------------------------------------------\n";
 	echo "person->Load('people.id=1') [Join Method]\n";
 	echo "Load() always uses the join method since it returns only one row\n";
@@ -986,7 +986,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 		if($akid->person);
 	}
 	echo (ar_assert($ach32, "'favorite_color' => 'lavender'")) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n";
-	
+
 	echo "\n\n---------------------------------------------------------------------------\n";
 	echo "rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
 	echo "In rugrat's constructor it is specified that\nit must forget any existing relation\n";
@@ -1004,7 +1004,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 	$ach5 = $ch5->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
 	echo (ar_assert($ach5, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
 	echo (ar_assert($ach5, "'favorite_color' => 'lavender'")) ? "[OK] I did not forget relation: person\n" : "[!!] I should not have forgotten relation: person\n";
-	
+
 	echo "\n\n---------------------------------------------------------------------------\n";
 	echo "rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
 	echo "---------------------------------------------------------------------------\n";
@@ -1036,7 +1036,7 @@ ADODB_Active_Record::$_quoteNames = true;
 
 
    0.92
 
    Fixed some issues with incompatible fetch modes (ADODB_FETCH_ASSOC) causing problems in UpdateActiveTable.
-
    Added support for functions that support predefining one-to-many relationships:
     
+
    Added support for functions that support predefining one-to-many relationships:
    
   ClassHasMany ClassBelongsTo TableHasMany TableBelongsTo TableKeyHasMany TableKeyBelongsTo. 
    
 
    You can also define your child/parent class in these functions, instead of the default ADODB_Active_Record.
 
@@ -1057,7 +1057,7 @@ Added support for assoc arrays in Set().
 
    0.06
 
    Added ErrorNo().
 
    Fixed php 5.2.0 compat issues.
- 
+
 
    0.05
 
    If inserting a record and the value of a primary key field is null, then we do not insert that field in as
 we assume it is an auto-increment field. Needed by mssql.
diff --git a/lib/WikiDB/adodb/docs/docs-adodb.htm b/lib/WikiDB/adodb/docs/docs-adodb.htm
index 54fbc5a0e..db0ef5847 100644
--- a/lib/WikiDB/adodb/docs/docs-adodb.htm
+++ b/lib/WikiDB/adodb/docs/docs-adodb.htm
@@ -620,7 +620,7 @@ ul
 
 
    ADOdb Library for PHP
    
 
-
    V5.18 3 Sep 2012 (c) 2000-2012 John Lim (jlim#natsoft.com)
    
+
    V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
    
 
 
    This software is dual licensed using BSD-Style
 and LGPL. This means you can use it in compiled proprietary and commercial
@@ -997,7 +997,7 @@ style='mso-tab-count:1'>
 style='mso-tab-count:1'>         
             # persistent connection
    
 
             $dsn2 = 'mysql://root:pwd@localhost/mydb?persist'; 
+style='mso-tab-count:1'>         $dsn2 = 'mysql://root:pwd@localhost/mydb?persist';
 
    
 
    
@@ -1745,7 +1745,7 @@ NewADOConnection($name) to create a connection object for that database. 
    
   Universal Database client.
    
   
  
- 
+
  
   
   
    db2oci
    
@@ -1767,7 +1767,7 @@ NewADOConnection($name) to create a connection object for that database. 
    
   Universal Database client.
    
   
  
- 
+
  
   
   
    odbc_db2
    
@@ -4782,7 +4782,7 @@ beginning of each page request. This is only supported in postgresql, mssql,
 mysql with InnoDB and oci8 currently. For example: 
    
 
 
     
    $db->SetTransactionMode("SERIALIZABLE");
    $db->BeginTrans();
    $db->Execute(...); $db->Execute(...);
    $db->CommiTrans();
     
    $db->SetTransactionMode(""); // restore to default
    $db->StartTrans();
    $db->Execute(...); $db->Execute(...);
    $db->CompleteTrans();
    
+solid #DDDDDD .75pt;padding:9.0pt 18.0pt 9.0pt 18.0pt;background:#EEEEEE'>
     
    $db->SetTransactionMode("SERIALIZABLE");
    $db->BeginTrans();
    $db->Execute(...); $db->Execute(...);
    $db->CommitTrans();
     
    $db->SetTransactionMode(""); // restore to default
    $db->StartTrans();
    $db->Execute(...); $db->Execute(...);
    $db->CompleteTrans();
    
 
 
    Supported values to pass in: 
    
 
@@ -6169,6 +6169,51 @@ href="http://phplens.com/lens/php-book/optimizing-debugging-php.php">Optimizing
 PHP    . 
    
 
 
    Change Log
    
+
+
    5.19 - 23-Apr-2014
+
    
+
    adodb: GetRowAssoc will return null as required. See http://phplens.com/lens/lensforum/msgs.php?id=19289
+
    adodb: Fix GetRowAssoc bug introduced in 5.17, causing function to return data from previous fetch for NULL fields. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+
    adodb: GetAssoc will return a zero-based array when 2nd column is null. See https://sourceforge.net/p/adodb/bugs/130/
+
    adodb: Execute no longer ignores single parameters evaluating to false. See https://sourceforge.net/p/adodb/patches/32/
+
    adodb: Fix LIMIT 1 clause in subquery gets stripped off. See http://phplens.com/lens/lensforum/msgs.php?id=17813
+
    adodb-lib: Fix columns quoting bug. See https://sourceforge.net/p/adodb/bugs/127/
+
    Added new ADODB_ASSOC_CASE_* constants. Thx to Damien Regad.
+
    sessions: changed lob handling to detect all variations of oci8 driver.
+
    ads: clear fields before fetching. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+
    mssqlnative: fixed many FetchField compat issues. See http://phplens.com/lens/lensforum/msgs.php?id=18464. Also date format changed to remove timezone.
+
    mssqlnative: Numerous fixes and improvements by Mark Newnham 
    
+
    mssqlnative: Fix Insert ID on prepared statement, thanks to Mike Parks. See http://phplens.com/lens/lensforum/msgs.php?id=19079
+
    mssql: timestamp format changed to 'Y-m-d\TH:i:s' (ISO 8601)
+	to make them independent from DATEFORMAT setting, as recommended on
+	Microsoft TechNet.
+
    mysql/mysqli: Fix ability for MetaTables to filter by table name, broken since 5.15. See http://phplens.com/lens/lensforum/msgs.php?id=19359
+
    odbc: Fixed MetaTables and MetaPrimaryKeys definitions in odbc driver to match adoconnection class.
+
    odbc: clear fields before fetching. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+
    oci8: GetRowAssoc now works in ADODB_FETCH_ASSOC fetch mode
+
    oci8: MetaType and MetaForeignKeys argument count are now strict-standards compliant
+
    oci8: Added trailing ';' on trigger creation for sequence fields, prevents occurence of ORA-24344
+
    oci8quercus: new oci8 driver with support for quercus jdbc data types.
+
    pdo: Fixed concat recursion bug in 5.3. See http://phplens.com/lens/lensforum/msgs.php?id=19285
+
    pgsql: Default driver (postgres/pgsql) is now postgres8
+
    pgsql: Fix output of BLOB (bytea) columns with PostgreSQL >= 9.0
+
    pgsql: Fix handling of DEFAULT NULL columns in AlterColumnSQL
+
    pgsql: Fix mapping of error message to ADOdb error codes
+
    pgsql: Reset parameter number in Param() method when $name == false
+
    postgres8: New class/type with correct behavior for _insertid(). See Github #8
+
    postgres9: Fixed assoc problem. See http://phplens.com/lens/lensforum/msgs.php?id=19296
+
    sybase: Removed redundant sybase_connect() call in _connect(). See Github #3
+
    sybase: Allow connection on custom port. See Github #9
+
    sybase: Fix null values returned with ASSOC fetch mode. See Github #10
+
    Added Composer support. See Github #7
+
 
    5.18 3 Sep 2012
 
    datadict-postgres: Fixes bug in ALTER COL. See http://phplens.com/lens/lensforum/msgs.php?id=19202. Also fixed bugs in MetaType() checking $fieldobj properties.
 
    GetRowAssoc did not work with null values. Bug in 5.17.
@@ -6183,9 +6228,10 @@ $ADODB_CACHE_PERMS. Default value is 0771.
 make Prepare() and empty function, and we still execute the unprepared stmt.
 
    mysql: FetchField(-1), turns it is is not possible to retrieve the max_length. Set to -1.
 
    mysql-perf: Fixed "SHOW INNODB STATUS". Change to "SHOW ENGINE INNODB STATUS"
+
 
    5.17 18 May 2012
 
    Active Record: Removed trailing whitespace from adodb-active-record.inc.php.
-
    odbc: Added support for $database parameter in odbc Connect() function. E.g. $DB->Connect($dsn_without_db, $user, $pwd, $database). 
+
    odbc: Added support for $database parameter in odbc Connect() function. E.g. $DB->Connect($dsn_without_db, $user, $pwd, $database).
 Previously $database had to be left blank and the $dsn was used to pass in this parameter.
 
    oci8: Added better empty($rs) error handling to metaindexes().
 
    oci8: Changed to use newer oci API to support PHP 5.4.
@@ -6206,7 +6252,7 @@ Previously $database had to be left blank and the $dsn was used to pass in this
 
    mysql and mysqli: MetaTables() now identifies views and tables correctly.
 
    Added function adodb_time() to adodb-time.inc.php. Generates current time in unsigned integer format.
 
    5.14 8 Sep 2011
-
    mysqli: fix php compilation bug. 
+
    mysqli: fix php compilation bug.
 
    postgres: bind variables did not work properly. Fixed.
 
    postgres: blob handling bug in _decode. Fixed.
 
    ActiveRecord: if a null field was never updated, activerecord would still update the record. Fixed.
@@ -6289,11 +6335,11 @@ Also changed oci8 $conn->sysTimeStamp to use 'SYSTIMESTAMP' instead of 'SYSDATE'
 
    5.08a 17 Apr 2009 
    
 
    Fixes wrong version number string.
 
    Incorrect + in adodb-datadict.inc.php removed.
-
    Fixes missing OffsetDate() function in pdo. Thx paul#mantisforge.org. 
+
    Fixes missing OffsetDate() function in pdo. Thx paul#mantisforge.org.
 
 
    5.08 17 Apr 2009 
    
 
    adodb-sybase.inc.php driver. Added $conn->charSet support. Thx Luis Henrique Mulinari (luis.mulinari#gmail.com)
-
    adodb-ado5.inc.php. Fixed some bind param issues. Thx Jirka Novak. 
+
    adodb-ado5.inc.php. Fixed some bind param issues. Thx Jirka Novak.
 
    adodb-ado5.inc.php. Now has improved error handling.
 
    Fixed typo in adodb-xmlschema03.inc.php. See XMLS_EXISTING_DATA, line 1501. Thx james johnson.
 
    Made $inputarr optional for _query() in all drivers.
diff --git a/lib/WikiDB/adodb/docs/docs-datadict.htm b/lib/WikiDB/adodb/docs/docs-datadict.htm
index b2e6422c3..bb6013fb5 100644
--- a/lib/WikiDB/adodb/docs/docs-datadict.htm
+++ b/lib/WikiDB/adodb/docs/docs-datadict.htm
@@ -11,7 +11,7 @@
       }
       pre {
         font-size: 9pt;
-         background-color: #EEEEEE; padding: .5em; margin: 0px; 
+         background-color: #EEEEEE; padding: .5em; margin: 0px;
       }
       .toplink {
         font-size: 8pt;
@@ -20,7 +20,7 @@
 
 
 
    ADOdb Data Dictionary Library for PHP
    
-
    V5.18 3 Sep 2012  (c) 2000-2010 John Lim (V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com).
    
 AXMLS (c) 2004 ars Cognita, Inc
    
 
    This software is dual licensed using BSD-Style and
@@ -289,8 +289,8 @@ documentation for a more detailed description of the adoSchema methods,
 including methods and schema elements that are not described in this
 tutorial.
    
 
    XML Schema Version 3
    
-
    In March 2006, we added adodb-xmlschema03.inc.php to the release, which supports version 3 of XML Schema. 
-The adodb-xmlschema.inc.php remains the same as previous releases, and supports version 2 of XML Schema. 
+
    In March 2006, we added adodb-xmlschema03.inc.php to the release, which supports version 3 of XML Schema.
+The adodb-xmlschema.inc.php remains the same as previous releases, and supports version 2 of XML Schema.
 Version 3 provides some enhancements:
 
 
      
@@ -308,7 +308,7 @@ Version 3 provides some enhancements:
   <descr>ATS KnowledgeBase</descr>
   <opt platform="mysql">TYPE=INNODB</opt>
   <field name="recid" type="I"/>
-  <field name="organization_code" type="I4"/> 
+  <field name="organization_code" type="I4"/>
   <field name="sub_code" type="C" size="20"/>
   etc...
 
    
diff --git a/lib/WikiDB/adodb/docs/docs-oracle.htm b/lib/WikiDB/adodb/docs/docs-oracle.htm
index 3ee27aae2..5e8992e31 100644
--- a/lib/WikiDB/adodb/docs/docs-oracle.htm
+++ b/lib/WikiDB/adodb/docs/docs-oracle.htm
@@ -1,542 +1,542 @@
-
-
-
-
-ADOdb with PHP and Oracle
-
-
-
-
-
-
    
-
    Using ADOdb with PHP and Oracle: an advanced tutorial
    
-
    
-
    (c)2004-2005 John Lim. All rights reserved.
    
-
    1. Introduction
    
-
    Oracle is the most popular commercial database used with PHP. There are many ways of accessing Oracle databases in PHP. These include:
    
-
      
-  
    • The oracle extension
      • 
-  
    • The oci8 extension
      • 
-  
    • PEAR DB library
      • 
-  
    • ADOdb library
      • 
-
    
-
    The wide range of choices is confusing to someone just starting with Oracle and PHP. I will briefly summarize the differences, and  show you the advantages of using ADOdb. 
    
-
    First we have the C extensions which provide low-level access to Oracle functionality. These C extensions are precompiled into PHP, or linked in dynamically when the web server starts up. Just in case you need it, here's a guide to installing Oracle and PHP on Linux.
    
-
-  
-    
-    
-  
-  
-    
-    
-  
-
    Oracle extensionDesigned for Oracle 7 or earlier. This is obsolete.
    Oci8 extension Despite it's name, which implies it is only for Oracle 8i, this is the standard method for accessing databases running Oracle 8i, 9i or 10g (and later).
    
-
    Here is an example of using the oci8 extension to query the emp table of the scott schema with bind parameters:
-
    -$conn = OCILogon("scott","tiger", $tnsName); 
-
-$stmt = OCIParse($conn,"select * from emp where empno > :emp order by empno"); 
-$emp = 7900;
-OCIBindByName($stmt, ':emp', $emp);
-$ok = OCIExecute($stmt);
-while (OCIFetchInto($stmt,$arr)) {
-	print_r($arr);
-	echo "<hr>";	
-} 
-
    
-
    This generates the following output:
-
    
-Array ( [0] => 7902 [1] => FORD [2] => ANALYST [3] => 7566 [4] => 03/DEC/81 [5] => 3000 [7] => 20 ) 
-
    
-  Array ( [0] => 7934 [1] => MILLER [2] => CLERK [3] => 7782 [4] => 23/JAN/82 [5] => 1300 [7] => 10 )
-
    
-
    We also have  many higher level PHP libraries that allow you to simplify the above code. The most popular are PEAR DB and ADOdb.  Here are some of the differences between these libraries:
    
-
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-  
-    
-    
-    
-  
-
    FeaturePEAR DB 1.6ADOdb 4.52
    General StyleSimple, easy to use. Lacks Oracle specific functionality.Has multi-tier design. Simple high-level design for beginners, and also lower-level advanced Oracle functionality.
    Support for PrepareYes, but only on one statement, as the last prepare overwrites previous prepares.Yes (multiple simultaneous prepare's allowed)
    Support for LOBsNoYes, using update semantics
    Support for REF CursorsNoYes
    Support for IN ParametersYesYes
    Support for OUT ParametersNoYes
    Schema creation using XMLNoYes, including ability to define tablespaces and constraints
    Provides database portability featuresNoYes, has some ability to abstract features that differ between databases such as dates, bind parameters, and data types.
    Performance monitoring and tracingNoYes. SQL can be traced and linked to web page it was executed on. Explain plan support included.
    Recordset caching for frequently used queriesNoYes. Provides great speedups for SQL involving complex where, group-by and order-by clauses.
    PopularityYes, part of PEAR releaseYes, many open source projects are using this software, including PostNuke, Xaraya, Mambo, Tiki Wiki.
    SpeedMedium speed.Very high speed. Fastest database abstraction library available for PHP. Benchmarks are available.
    High Speed Extension availableNoYes. You can install the optional ADOdb extension, which reimplements the most frequently used parts of ADOdb as fast C code. Note that the source code version of ADOdb runs just fine without this extension, and only makes use of the extension if detected.
    
-
     PEAR DB is good enough for simple web apps. But if you need more power, you can see ADOdb offers more sophisticated functionality. The rest of this article will concentrate on using ADOdb with Oracle. You can find out more about connecting to Oracle later in this guide.
    
-
    ADOdb Example
    
-
    In ADOdb, the above oci8 example querying the emp table could be written as:
    
-
    -include "/path/to/adodb.inc.php";
-$db = NewADOConnection("oci8");
-$db->Connect($tnsName, "scott", "tiger");
-
-$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
-                    array('emp' => 7900));
-while ($arr = $rs->FetchRow()) {
-    print_r($arr);
-	echo "<hr>";
-}
-
    
-
    The Execute( ) function returns a recordset object, and you can retrieve the rows returned using $recordset->FetchRow( ). 
    
-
    If we ignore the initial connection preamble, we can see the ADOdb version is much easier and simpler:
    
-
-  
-    
-    
-  
-  
-    
-    
-  
-
    Oci8ADOdb
    $stmt = OCIParse($conn,
-       "select * from emp where empno > :emp"); 
-$emp = 7900;
-OCIBindByName($stmt, ':emp', $emp);
-$ok = OCIExecute($stmt);
-
-while (OCIFetchInto($stmt,$arr)) {
-	print_r($arr);
-	echo "<hr>";	
-} 
    $recordset = $db->Execute("select * from emp where empno>:emp", 
-                           array('emp' => 7900));
-
-while ($arr = $recordset->FetchRow()) {
-	print_r($arr);
-	echo "<hr>";
-}
    
-
     
    
-
    2. ADOdb Query Semantics
    
-
    You can also query the database using the standard Microsoft ADO MoveNext( ) metaphor. The data array for the current row is stored in the fields property of the recordset object, $rs.
-MoveNext( ) offers the highest performance among all the techniques for iterating through a recordset:
-
    -$rs = $db->Execute("select * from emp where empno>:emp", array('emp' => 7900));
-while (!$rs->EOF) {
-	print_r($rs->fields);
-	$rs->MoveNext();
-}
-
    
-
    And if you are interested in having the data returned in a 2-dimensional array, you can use:
-
    -$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
-
    
-
    Now to obtain only the first row as an array:
-
    -$arr = $db->GetRow("select * from emp where empno=:emp", array('emp' => 7900));
-
    
-
    Or to retrieve only the first field of the first row:
-
    -$arr = $db->GetOne("select ename from emp where empno=:emp", array('emp' => 7900));
-
    
-
    For easy pagination support, we provide the SelectLimit function. The following will perform a select query, limiting it to 100 rows, starting from row 201 (row 1 being the 1st row):
-
    -$offset = 200; $limitrows = 100;
-$rs = $db->SelectLimit('select * from table', $limitrows, $offset);
-
    
-
    The $offset parameter is optional.
-
    Array Fetch Mode
    
-
    When data is being returned in an array, you can choose the type of array the data is returned in. 
-
      
-  
    1.  Numeric indexes - use $connection->SetFetchMode(ADODB_FETCH_NUM).
      2. 
-  
    2. Associative indexes - the keys of the array are the names of the fields (in upper-case). Use $connection->SetFetchMode(ADODB_FETCH_ASSOC).
      3. 
-  
    3. Both numeric and associative indexes - use $connection->SetFetchMode(ADODB_FETCH_BOTH).
      4. 
-
    
-
    The default is ADODB_FETCH_BOTH for Oracle.
    
-
    Caching
    
-
    You can define a database cache directory using $ADODB_CACHE_DIR, and cache the results of frequently used queries that rarely change. This is particularly useful for SQL with complex where clauses and group-by's and order-by's. It is also good for relieving heavily-loaded database servers.
    
-
    This example will cache the following select statement for 3600 seconds (1 hour):
    
-
    -$ADODB_CACHE_DIR = '/var/adodb/tmp';
-$rs = $db->CacheExecute(3600, "select names from allcountries order by 1");
-
    
-There are analogous CacheGetArray(
-), CacheGetRow( ),  CacheGetOne( ) and CacheSelectLimit( )  functions. The first parameter is the number of seconds to cache. You can also pass a bind array as a 3rd parameter (not shown above).
-
    There is an alternative syntax for the caching functions. The first parameter is omitted, and you set the cacheSecs
- property of the connection object:
-
    -$ADODB_CACHE_DIR = '/var/adodb/tmp';
-$connection->cacheSecs = 3600;
-$rs = $connection->CacheExecute($sql, array('id' => 1));
-
    
-
     
    
-
    3. Using Prepare( ) For Frequently Used Statements
    
-
    Prepare( ) is  for compiling frequently used  SQL statement for reuse. For example, suppose we have a large array which needs to be inserted into an Oracle database. The following will result in a massive speedup in query execution (at least 20-40%), as the SQL statement only needs to be compiled once:
    
-
    -$stmt = $db->Prepare('insert into table (field1, field2) values (:f1, :f2)');
-foreach ($arrayToInsert as $key => $value) {
-	$db->Execute($stmt, array('f1' => $key, 'f2' => $val);
-}
-
    
-
     
    
-
    4. Working With LOBs
    
-
    Oracle treats data which is more than 4000 bytes in length specially. These are called Large Objects, or LOBs for short. Binary LOBs are BLOBs, and character LOBs are CLOBs. In most Oracle libraries, you need to do a lot of work to process LOBs, probably because Oracle designed it to work in systems with little memory. ADOdb tries to make things easy by assuming the LOB can fit into main memory. 
    
-
    ADOdb will transparently handle LOBs  in select statements. The LOBs are automatically converted to PHP variables without any special coding.
    
-
    For updating records with LOBs, the functions UpdateBlob( ) and UpdateClob( ) are provided. Here's a BLOB example. The parameters should be self-explanatory:
-
    -$ok = $db->Execute("insert into aTable (id, name, ablob) 
-                                values (aSequence.nextVal, 'Name', null)");
-if (!$ok) return LogError($db->ErrorMsg());
-# params: $tableName, $blobFieldName, $blobValue, $whereClause
-$db->UpdateBlob('aTable', 'ablob', $blobValue, 'id=aSequence.currVal');
-
    
-
    and the analogous CLOB example:
-
    -$ok = $db->Execute("insert into aTable (id, name, aclob) 
-                                values (aSequence.nextVal, 'Name', null)");
-if (!$ok) return LogError($db->ErrorMsg());
-$db->UpdateClob('aTable', 'aclob', $clobValue, 'id=aSequence.currVal');
-
    
-
    Note that LogError( ) is a user-defined function, and not part of ADOdb.
-
    Inserting LOBs is more complicated. Since ADOdb 4.55, we allow you to do this
-  (assuming that the photo field is a BLOB, and we want to store $blob_data into
-  this field, and the primary key is the id field):
-
    -	$sql = "INSERT INTO photos ( ID, photo) ".
-			"VALUES ( :id, empty_blob() )".
-			" RETURNING photo INTO :xx";
-
- 		$stmt = $db->PrepareSP($sql);
-		$db->InParameter($stmt, $id, 'id');
-		$blob = $db->InParameter($stmt, $blob_data, 'xx',-1, OCI_B_BLOB);
-		$db->StartTrans();
-		$ok = $db->Execute($stmt);
-		$db->CompleteTrans();
-
     
-
    
-
    5. REF CURSORs
    
-
    Oracle recordsets can be passed around as variables called REF Cursors. For example, in PL/SQL, we could define a function open_tab that returns a REF CURSOR in the first parameter:
    
-
    -TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
-
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
-	END open_tab;
-
    
-
    In ADOdb, we could access this REF Cursor using the ExecuteCursor() function. The following will find
- all table names that begin with 'A' in the current schema:
-
    -$rs = $db->ExecuteCursor("BEGIN open_tab(:refc,'A%'); END;",'refc');
-while ($arr = $rs->FetchRow()) print_r($arr);
-
    
-
    The first parameter is the PL/SQL statement, and the second parameter is the name of the REF Cursor.
-
    
-
     
    
-
    6. In and Out Parameters
    
-
    The following PL/SQL
-stored procedure  requires an input  variable, and returns a result into an output variable:
-
    -PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
-	BEGIN
-		output := 'I love '||input;
-	END;
-
    
-
    The following ADOdb code allows you to call the stored procedure:
    
-
    -$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
-$input = 'Sophia Loren';
-$db->InParameter($stmt,$input,'a1');
-$db->OutParameter($stmt,$output,'a2');
-$ok = $db->Execute($stmt);
-if ($ok) echo ($output == 'I love Sophia Loren') ? 'OK' : 'Failed';
-
    
-
    PrepareSP( ) is a special function that knows about bind parameters.
-The main limitation currently is that IN OUT parameters do not work.
-
    Bind Parameters and REF CURSORs
    
-
    We could also rewrite the REF CURSOR example to use InParameter (requires ADOdb 4.53 or later):
-
    -$stmt = $db->PrepareSP("BEGIN adodb.open_tab(:refc,:tabname); END;");
-$input = 'A%';
-$db->InParameter($stmt,$input,'tabname');
-$rs = $db->ExecuteCursor($stmt,'refc');
-while ($arr = $rs->FetchRow()) print_r($arr);
-
    
-
    Bind Parameters and LOBs
    
-
    You can also operate on LOBs. In this example, we have IN and OUT parameters using CLOBs. 
-
    -	$text = 'test test test';
-	$sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
-	$stmt = $conn -> PrepareSP($sql);
-	$conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB); # -1 means variable length
-	$rs = '';
-	$conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
-	$conn -> Execute($stmt);
-	echo "return = ".$rs."<br>";
-
    
-
    Similarly, you can use the constant OCI_B_BLOB to indicate that you are using BLOBs.
-
    Reusing Bind Parameters with CURSOR_SHARING=FORCE
    
-
    Many web programmers do not care to use bind parameters, and prefer to enter the SQL directly. So instead of:
    
-
    -$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
-
    
-
    They prefer  entering the values inside the SQL:
-
    -$arr = $db->GetArray("select * from emp where empno>7900");
-
    
-
    This reduces Oracle performance because Oracle will reuse compiled SQL which is identical to previously compiled SQL. The above example with the values inside the SQL
-is unlikely to be reused. As an optimization, from Oracle 8.1 onwards, you can set the following session parameter after you login:
-
    -ALTER SESSION SET CURSOR_SHARING=FORCE
-
    
-
    This will force Oracle to convert all such variables (eg. the 7900 value) into constant bind parameters, improving SQL reuse.
    
-
    More speedup tips.
    
-
     
    
-
    7. Dates and Datetime in ADOdb
    
-
    There are two things you need to know about dates in ADOdb. 
    
-
    First, to ensure cross-database compability, ADOdb assumes that dates are returned in ISO format (YYYY-MM-DD H24:MI:SS).
    
-
    Secondly, since Oracle treats dates and datetime as the same data type, we decided not to display the time in the default date format. So on login, ADOdb will set the NLS_DATE_FORMAT to 'YYYY-MM-DD'. If you prefer to show the date and time by default, do this:
    
-
    -$db = NewADOConnection('oci8');
-$db->NLS_DATE_FORMAT =  'RRRR-MM-DD HH24:MI:SS';
-$db->Connect($tns, $user, $pwd);
-
    
-
    Or execute:
    
-
    $sql = quot;ALTER SESSION SET NLS_DATE_FORMAT = 'RRRR-MM-DD HH24:MI:SS'";
-$db->Execute($sql);
-
    
-
    If you are not concerned about date portability and do not use ADOdb's portability layer, you can use your preferred date format instead.
-
    
-
    8. Database Portability Layer
    
-
    ADOdb provides the following functions for portably generating SQL functions 
-  as strings to be merged into your SQL statements:
    
-
-   
-    
-    
-  
-   
-    
-    
-  
-   
-    
-    
-  
-   
-    
-    
-  
-   
-    
-    
-  
-   
-    
-    
-  
-   
-    
-    
-  
-  
-    
-    
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
    FunctionDescription
    DBDate($date)Pass in a UNIX timestamp or ISO date and it will convert it to a date 
-      string formatted for INSERT/UPDATE
    DBTimeStamp($date)Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp 
-      string formatted for INSERT/UPDATE
    SQLDate($date, $fmt)Portably generate a date formatted using $fmt mask, for use in SELECT 
-      statements.
    OffsetDate($date, $ndays)Portably generate a $date offset by $ndays.
    Concat($s1, $s2, ...)Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, 
-      which allows || operator.
    IfNull($fld, $replaceNull)Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.
    Param($name)Generates bind placeholders, using ? or named conventions as appropriate.
    $db->sysDateProperty that holds the SQL function that returns today's date
    $db->sysTimeStampProperty that holds the SQL function that returns the current
-timestamp (date+time).
-
    $db->concat_operatorProperty that holds the concatenation operator
-
    $db->lengthProperty that holds the name of the SQL strlen function.
-
    $db->upperCaseProperty that holds the name of the SQL strtoupper function.
-
    $db->randomProperty that holds the SQL to generate a random number between 0.00 and 1.00.
-
    $db->substrProperty that holds the name of the SQL substring function.
-
    
-
    ADOdb also provides multiple oracle oci8 drivers for different scenarios:
    
-
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-  
-    
-    
-  
-
    Driver NameDescription
    oci805 Specifically for Oracle 8.0.5. This driver has a slower SelectLimit( ).
    oci8The default high performance driver. The keys of associative arrays returned in a recordset are upper-case.
    oci8po The portable Oracle driver. Slightly slower than oci8. This driver uses ? instead of :bindvar for binding variables, which is the standard for  other databases. Also the keys of associative arrays are in lower-case like other databases.
    
-
    Here's an example of calling the oci8po driver. Note that the bind variables use question-mark:
    
-
    $db = NewADOConnection('oci8po');
-$db->Connect($tns, $user, $pwd);
-$db->Execute("insert into atable (f1, f2) values (?,?)", array(12, 'abc'));
    
-
     
-
    9. Connecting to Oracle
    
-
    Before you can use ADOdb, you need to have the Oracle client installed and setup the oci8 extension. This extension comes pre-compiled for Windows (but you still need to enable it in the php.ini file). For information on compiling the oci8 extension for PHP and Apache on Unix, there is an excellent guide at oracle.com. 
    
-
    Should You Use Persistent Connections
    
-
    One question that is frequently asked is should you use persistent connections to Oracle. Persistent connections allow PHP to recycle existing connections, reusing them after the previous web pages have completed. Non-persistent connections close automatically after the web page has completed. Persistent connections are faster because the cost of reconnecting is expensive, but there is additional resource overhead. As an alternative, Oracle allows you to pool and reuse server processes; this is called  Shared Server (also known as MTS).
    
-
    The author's benchmarks suggest that using non-persistent connections and the  Shared Server configuration offer the best performance. If Shared Server is not an option, only then consider using persistent connections.
    
-
    Connection Examples
    
-
    Just in case you are having problems connecting to Oracle, here are some examples:
    
-
    a. PHP and Oracle reside on the same machine, use default SID, with non-persistent connections:
    
-
    	$conn = NewADOConnection('oci8');
-	$conn->Connect(false, 'scott', 'tiger');
    
-
    b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS', using persistent connections:
    
-
    	$conn = NewADOConnection('oci8');
-	$conn->PConnect(false, 'scott', 'tiger', 'myTNS');
    
-
    or
    
-
     	$conn->PConnect('myTNS', 'scott', 'tiger');
    
-
    c. Host Address and SID
    
-
    -	$conn->connectSID = true;	
-	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'SID');
    
-
    d. Host Address and Service Name
    
-
    	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'servicename');
    
-
    e. Oracle connection string:
-
    	$cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
-			(CONNECT_DATA=(SID=$sid)))";
-	$conn->Connect($cstr, 'scott', 'tiger');
-
    
-
    f. ADOdb data source names (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);
    
-
    With ADOdb data source names,
-you don't have to call Connect( ) or PConnect( ).
-
    
-
     
    
-
    10. Error Checking
    
-
    The examples in this article are easy to read but a bit simplistic because we ignore error-handling. Execute( ) and Connect( ) will return false on error. So a more realistic way to call Connect( ) and Execute( ) is:
-
    function InvokeErrorHandler()
-{
    global $db; ## assume global
-    MyLogFunction($db->ErrorNo(), $db->ErrorMsg());
-}
-if (!$db->Connect($tns, $usr, $pwd)) InvokeErrorHandler();
-
-$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
-                    array('emp' => 7900));
-if (!$rs) return InvokeErrorHandler();
-while ($arr = $rs->FetchRow()) {
-    print_r($arr);
-	echo "<hr>";
-}
-
    
-
    You can retrieve the  error message and error number of the last SQL statement executed from ErrorMsg( ) and ErrorNo( ). You can also define a custom error handler function.
-ADOdb also supports throwing exceptions in PHP5.
-
     
    
-
    Handling Large Recordsets (added 27 May 2005)
    
-The oci8 driver does not support counting the number of records returned in a SELECT statement, so the function RecordCount() 
-is emulated when the global variable $ADODB_COUNTRECS is set to true, which is the default. 
-We emulate this by buffering all the records. This can take up large amounts of memory for big recordsets.
- Set $ADODB_COUNTRECS to false for the best performance. 
- 
    
-This variable is checked every time a query is executed, so you can selectively choose which recordsets to count.
-
     
    
-
    11. Other ADOdb Features
    
-
    Schema generation. This allows you to define a schema using XML and import it into different RDBMS systems portably.
    
-
    Performance monitoring and tracing. Highlights of performance monitoring include identification of poor and suspicious SQL, with explain plan support, and identifying which web pages the SQL ran on.
    
-
     
    
-
    12. Download
    
-
    You can download ADOdb from sourceforge. ADOdb uses a BSD style license. That means that it is free for commercial use, and redistribution without source code is allowed.
    
-
     
    
-
    13. Resources
    
-
-
-
+
+
+
+
+ADOdb with PHP and Oracle
+
+
+
+
+
+
    
+
    Using ADOdb with PHP and Oracle: an advanced tutorial
    
+
    
+
    (c) 2004-2014 John Lim. All rights reserved.
    
+
    1. Introduction
    
+
    Oracle is the most popular commercial database used with PHP. There are many ways of accessing Oracle databases in PHP. These include:
    
+
      
+  
    • The oracle extension
      • 
+  
    • The oci8 extension
      • 
+  
    • PEAR DB library
      • 
+  
    • ADOdb library
      • 
+
    
+
    The wide range of choices is confusing to someone just starting with Oracle and PHP. I will briefly summarize the differences, and  show you the advantages of using ADOdb. 
    
+
    First we have the C extensions which provide low-level access to Oracle functionality. These C extensions are precompiled into PHP, or linked in dynamically when the web server starts up. Just in case you need it, here's a guide to installing Oracle and PHP on Linux.
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+
    Oracle extensionDesigned for Oracle 7 or earlier. This is obsolete.
    Oci8 extension Despite it's name, which implies it is only for Oracle 8i, this is the standard method for accessing databases running Oracle 8i, 9i or 10g (and later).
    
+
    Here is an example of using the oci8 extension to query the emp table of the scott schema with bind parameters:
+
    +$conn = OCILogon("scott","tiger", $tnsName);
+
+$stmt = OCIParse($conn,"select * from emp where empno > :emp order by empno");
+$emp = 7900;
+OCIBindByName($stmt, ':emp', $emp);
+$ok = OCIExecute($stmt);
+while (OCIFetchInto($stmt,$arr)) {
+	print_r($arr);
+	echo "<hr>";
+}
+
    
+
    This generates the following output:
+
    
+Array ( [0] => 7902 [1] => FORD [2] => ANALYST [3] => 7566 [4] => 03/DEC/81 [5] => 3000 [7] => 20 )
+
    
+  Array ( [0] => 7934 [1] => MILLER [2] => CLERK [3] => 7782 [4] => 23/JAN/82 [5] => 1300 [7] => 10 )
+
    
+
    We also have  many higher level PHP libraries that allow you to simplify the above code. The most popular are PEAR DB and ADOdb.  Here are some of the differences between these libraries:
    
+
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+
    FeaturePEAR DB 1.6ADOdb 4.52
    General StyleSimple, easy to use. Lacks Oracle specific functionality.Has multi-tier design. Simple high-level design for beginners, and also lower-level advanced Oracle functionality.
    Support for PrepareYes, but only on one statement, as the last prepare overwrites previous prepares.Yes (multiple simultaneous prepare's allowed)
    Support for LOBsNoYes, using update semantics
    Support for REF CursorsNoYes
    Support for IN ParametersYesYes
    Support for OUT ParametersNoYes
    Schema creation using XMLNoYes, including ability to define tablespaces and constraints
    Provides database portability featuresNoYes, has some ability to abstract features that differ between databases such as dates, bind parameters, and data types.
    Performance monitoring and tracingNoYes. SQL can be traced and linked to web page it was executed on. Explain plan support included.
    Recordset caching for frequently used queriesNoYes. Provides great speedups for SQL involving complex where, group-by and order-by clauses.
    PopularityYes, part of PEAR releaseYes, many open source projects are using this software, including PostNuke, Xaraya, Mambo, Tiki Wiki.
    SpeedMedium speed.Very high speed. Fastest database abstraction library available for PHP. Benchmarks are available.
    High Speed Extension availableNoYes. You can install the optional ADOdb extension, which reimplements the most frequently used parts of ADOdb as fast C code. Note that the source code version of ADOdb runs just fine without this extension, and only makes use of the extension if detected.
    
+
     PEAR DB is good enough for simple web apps. But if you need more power, you can see ADOdb offers more sophisticated functionality. The rest of this article will concentrate on using ADOdb with Oracle. You can find out more about connecting to Oracle later in this guide.
    
+
    ADOdb Example
    
+
    In ADOdb, the above oci8 example querying the emp table could be written as:
    
+
    +include "/path/to/adodb.inc.php";
+$db = NewADOConnection("oci8");
+$db->Connect($tnsName, "scott", "tiger");
+
+$rs = $db->Execute("select * from emp where empno>:emp order by empno",
+                    array('emp' => 7900));
+while ($arr = $rs->FetchRow()) {
+    print_r($arr);
+	echo "<hr>";
+}
+
    
+
    The Execute( ) function returns a recordset object, and you can retrieve the rows returned using $recordset->FetchRow( ). 
    
+
    If we ignore the initial connection preamble, we can see the ADOdb version is much easier and simpler:
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+
    Oci8ADOdb
    $stmt = OCIParse($conn,
+       "select * from emp where empno > :emp");
+$emp = 7900;
+OCIBindByName($stmt, ':emp', $emp);
+$ok = OCIExecute($stmt);
+
+while (OCIFetchInto($stmt,$arr)) {
+	print_r($arr);
+	echo "<hr>";
+} 
    $recordset = $db->Execute("select * from emp where empno>:emp",
+                           array('emp' => 7900));
+
+while ($arr = $recordset->FetchRow()) {
+	print_r($arr);
+	echo "<hr>";
+}
    
+
     
    
+
    2. ADOdb Query Semantics
    
+
    You can also query the database using the standard Microsoft ADO MoveNext( ) metaphor. The data array for the current row is stored in the fields property of the recordset object, $rs.
+MoveNext( ) offers the highest performance among all the techniques for iterating through a recordset:
+
    +$rs = $db->Execute("select * from emp where empno>:emp", array('emp' => 7900));
+while (!$rs->EOF) {
+	print_r($rs->fields);
+	$rs->MoveNext();
+}
+
    
+
    And if you are interested in having the data returned in a 2-dimensional array, you can use:
+
    +$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
+
    
+
    Now to obtain only the first row as an array:
+
    +$arr = $db->GetRow("select * from emp where empno=:emp", array('emp' => 7900));
+
    
+
    Or to retrieve only the first field of the first row:
+
    +$arr = $db->GetOne("select ename from emp where empno=:emp", array('emp' => 7900));
+
    
+
    For easy pagination support, we provide the SelectLimit function. The following will perform a select query, limiting it to 100 rows, starting from row 201 (row 1 being the 1st row):
+
    +$offset = 200; $limitrows = 100;
+$rs = $db->SelectLimit('select * from table', $limitrows, $offset);
+
    
+
    The $offset parameter is optional.
+
    Array Fetch Mode
    
+
    When data is being returned in an array, you can choose the type of array the data is returned in.
+
      
+  
    1.  Numeric indexes - use $connection->SetFetchMode(ADODB_FETCH_NUM).
      2. 
+  
    2. Associative indexes - the keys of the array are the names of the fields (in upper-case). Use $connection->SetFetchMode(ADODB_FETCH_ASSOC).
      3. 
+  
    3. Both numeric and associative indexes - use $connection->SetFetchMode(ADODB_FETCH_BOTH).
      4. 
+
    
+
    The default is ADODB_FETCH_BOTH for Oracle.
    
+
    Caching
    
+
    You can define a database cache directory using $ADODB_CACHE_DIR, and cache the results of frequently used queries that rarely change. This is particularly useful for SQL with complex where clauses and group-by's and order-by's. It is also good for relieving heavily-loaded database servers.
    
+
    This example will cache the following select statement for 3600 seconds (1 hour):
    
+
    +$ADODB_CACHE_DIR = '/var/adodb/tmp';
+$rs = $db->CacheExecute(3600, "select names from allcountries order by 1");
+
    
+There are analogous CacheGetArray(
+), CacheGetRow( ),  CacheGetOne( ) and CacheSelectLimit( )  functions. The first parameter is the number of seconds to cache. You can also pass a bind array as a 3rd parameter (not shown above).
+
    There is an alternative syntax for the caching functions. The first parameter is omitted, and you set the cacheSecs
+ property of the connection object:
+
    +$ADODB_CACHE_DIR = '/var/adodb/tmp';
+$connection->cacheSecs = 3600;
+$rs = $connection->CacheExecute($sql, array('id' => 1));
+
    
+
     
    
+
    3. Using Prepare( ) For Frequently Used Statements
    
+
    Prepare( ) is  for compiling frequently used  SQL statement for reuse. For example, suppose we have a large array which needs to be inserted into an Oracle database. The following will result in a massive speedup in query execution (at least 20-40%), as the SQL statement only needs to be compiled once:
    
+
    +$stmt = $db->Prepare('insert into table (field1, field2) values (:f1, :f2)');
+foreach ($arrayToInsert as $key => $value) {
+	$db->Execute($stmt, array('f1' => $key, 'f2' => $val);
+}
+
    
+
     
    
+
    4. Working With LOBs
    
+
    Oracle treats data which is more than 4000 bytes in length specially. These are called Large Objects, or LOBs for short. Binary LOBs are BLOBs, and character LOBs are CLOBs. In most Oracle libraries, you need to do a lot of work to process LOBs, probably because Oracle designed it to work in systems with little memory. ADOdb tries to make things easy by assuming the LOB can fit into main memory. 
    
+
    ADOdb will transparently handle LOBs  in select statements. The LOBs are automatically converted to PHP variables without any special coding.
    
+
    For updating records with LOBs, the functions UpdateBlob( ) and UpdateClob( ) are provided. Here's a BLOB example. The parameters should be self-explanatory:
+
    +$ok = $db->Execute("insert into aTable (id, name, ablob)
+                                values (aSequence.nextVal, 'Name', null)");
+if (!$ok) return LogError($db->ErrorMsg());
+# params: $tableName, $blobFieldName, $blobValue, $whereClause
+$db->UpdateBlob('aTable', 'ablob', $blobValue, 'id=aSequence.currVal');
+
    
+
    and the analogous CLOB example:
+
    +$ok = $db->Execute("insert into aTable (id, name, aclob)
+                                values (aSequence.nextVal, 'Name', null)");
+if (!$ok) return LogError($db->ErrorMsg());
+$db->UpdateClob('aTable', 'aclob', $clobValue, 'id=aSequence.currVal');
+
    
+
    Note that LogError( ) is a user-defined function, and not part of ADOdb.
+
    Inserting LOBs is more complicated. Since ADOdb 4.55, we allow you to do this
+  (assuming that the photo field is a BLOB, and we want to store $blob_data into
+  this field, and the primary key is the id field):
+
    +	$sql = "INSERT INTO photos ( ID, photo) ".
+			"VALUES ( :id, empty_blob() )".
+			" RETURNING photo INTO :xx";
+
+ 		$stmt = $db->PrepareSP($sql);
+		$db->InParameter($stmt, $id, 'id');
+		$blob = $db->InParameter($stmt, $blob_data, 'xx',-1, OCI_B_BLOB);
+		$db->StartTrans();
+		$ok = $db->Execute($stmt);
+		$db->CompleteTrans();
+
    
+
    
+
    5. REF CURSORs
    
+
    Oracle recordsets can be passed around as variables called REF Cursors. For example, in PL/SQL, we could define a function open_tab that returns a REF CURSOR in the first parameter:
    
+
    +TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
+
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
+	BEGIN
+		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
+	END open_tab;
+
    
+
    In ADOdb, we could access this REF Cursor using the ExecuteCursor() function. The following will find
+ all table names that begin with 'A' in the current schema:
+
    +$rs = $db->ExecuteCursor("BEGIN open_tab(:refc,'A%'); END;",'refc');
+while ($arr = $rs->FetchRow()) print_r($arr);
+
    
+
    The first parameter is the PL/SQL statement, and the second parameter is the name of the REF Cursor.
+
    
+
     
    
+
    6. In and Out Parameters
    
+
    The following PL/SQL
+stored procedure  requires an input  variable, and returns a result into an output variable:
+
    +PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
+	BEGIN
+		output := 'I love '||input;
+	END;
+
    
+
    The following ADOdb code allows you to call the stored procedure:
    
+
    +$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
+$input = 'Sophia Loren';
+$db->InParameter($stmt,$input,'a1');
+$db->OutParameter($stmt,$output,'a2');
+$ok = $db->Execute($stmt);
+if ($ok) echo ($output == 'I love Sophia Loren') ? 'OK' : 'Failed';
+
    
+
    PrepareSP( ) is a special function that knows about bind parameters.
+The main limitation currently is that IN OUT parameters do not work.
+
    Bind Parameters and REF CURSORs
    
+
    We could also rewrite the REF CURSOR example to use InParameter (requires ADOdb 4.53 or later):
+
    +$stmt = $db->PrepareSP("BEGIN adodb.open_tab(:refc,:tabname); END;");
+$input = 'A%';
+$db->InParameter($stmt,$input,'tabname');
+$rs = $db->ExecuteCursor($stmt,'refc');
+while ($arr = $rs->FetchRow()) print_r($arr);
+
    
+
    Bind Parameters and LOBs
    
+
    You can also operate on LOBs. In this example, we have IN and OUT parameters using CLOBs.
+
    +	$text = 'test test test';
+	$sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
+	$stmt = $conn -> PrepareSP($sql);
+	$conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB); # -1 means variable length
+	$rs = '';
+	$conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
+	$conn -> Execute($stmt);
+	echo "return = ".$rs."<br>";
+
    
+
    Similarly, you can use the constant OCI_B_BLOB to indicate that you are using BLOBs.
+
    Reusing Bind Parameters with CURSOR_SHARING=FORCE
    
+
    Many web programmers do not care to use bind parameters, and prefer to enter the SQL directly. So instead of:
    
+
    +$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
+
    
+
    They prefer  entering the values inside the SQL:
+
    +$arr = $db->GetArray("select * from emp where empno>7900");
+
    
+
    This reduces Oracle performance because Oracle will reuse compiled SQL which is identical to previously compiled SQL. The above example with the values inside the SQL
+is unlikely to be reused. As an optimization, from Oracle 8.1 onwards, you can set the following session parameter after you login:
+
    +ALTER SESSION SET CURSOR_SHARING=FORCE
+
    
+
    This will force Oracle to convert all such variables (eg. the 7900 value) into constant bind parameters, improving SQL reuse.
    
+
    More speedup tips.
    
+
     
    
+
    7. Dates and Datetime in ADOdb
    
+
    There are two things you need to know about dates in ADOdb. 
    
+
    First, to ensure cross-database compability, ADOdb assumes that dates are returned in ISO format (YYYY-MM-DD H24:MI:SS).
    
+
    Secondly, since Oracle treats dates and datetime as the same data type, we decided not to display the time in the default date format. So on login, ADOdb will set the NLS_DATE_FORMAT to 'YYYY-MM-DD'. If you prefer to show the date and time by default, do this:
    
+
    +$db = NewADOConnection('oci8');
+$db->NLS_DATE_FORMAT =  'RRRR-MM-DD HH24:MI:SS';
+$db->Connect($tns, $user, $pwd);
+
    
+
    Or execute:
    
+
    $sql = quot;ALTER SESSION SET NLS_DATE_FORMAT = 'RRRR-MM-DD HH24:MI:SS'";
+$db->Execute($sql);
+
    
+
    If you are not concerned about date portability and do not use ADOdb's portability layer, you can use your preferred date format instead.
+
    
+
    8. Database Portability Layer
    
+
    ADOdb provides the following functions for portably generating SQL functions
+  as strings to be merged into your SQL statements:
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
    FunctionDescription
    DBDate($date)Pass in a UNIX timestamp or ISO date and it will convert it to a date
+      string formatted for INSERT/UPDATE
    DBTimeStamp($date)Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp
+      string formatted for INSERT/UPDATE
    SQLDate($date, $fmt)Portably generate a date formatted using $fmt mask, for use in SELECT
+      statements.
    OffsetDate($date, $ndays)Portably generate a $date offset by $ndays.
    Concat($s1, $s2, ...)Portably concatenate strings. Alternatively, for mssql use mssqlpo driver,
+      which allows || operator.
    IfNull($fld, $replaceNull)Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.
    Param($name)Generates bind placeholders, using ? or named conventions as appropriate.
    $db->sysDateProperty that holds the SQL function that returns today's date
    $db->sysTimeStampProperty that holds the SQL function that returns the current
+timestamp (date+time).
+
    $db->concat_operatorProperty that holds the concatenation operator
+
    $db->lengthProperty that holds the name of the SQL strlen function.
+
    $db->upperCaseProperty that holds the name of the SQL strtoupper function.
+
    $db->randomProperty that holds the SQL to generate a random number between 0.00 and 1.00.
+
    $db->substrProperty that holds the name of the SQL substring function.
+
    
+
    ADOdb also provides multiple oracle oci8 drivers for different scenarios:
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
    Driver NameDescription
    oci805 Specifically for Oracle 8.0.5. This driver has a slower SelectLimit( ).
    oci8The default high performance driver. The keys of associative arrays returned in a recordset are upper-case.
    oci8po The portable Oracle driver. Slightly slower than oci8. This driver uses ? instead of :bindvar for binding variables, which is the standard for  other databases. Also the keys of associative arrays are in lower-case like other databases.
    
+
    Here's an example of calling the oci8po driver. Note that the bind variables use question-mark:
    
+
    $db = NewADOConnection('oci8po');
+$db->Connect($tns, $user, $pwd);
+$db->Execute("insert into atable (f1, f2) values (?,?)", array(12, 'abc'));
    
+
     
+
    9. Connecting to Oracle
    
+
    Before you can use ADOdb, you need to have the Oracle client installed and setup the oci8 extension. This extension comes pre-compiled for Windows (but you still need to enable it in the php.ini file). For information on compiling the oci8 extension for PHP and Apache on Unix, there is an excellent guide at oracle.com. 
    
+
    Should You Use Persistent Connections
    
+
    One question that is frequently asked is should you use persistent connections to Oracle. Persistent connections allow PHP to recycle existing connections, reusing them after the previous web pages have completed. Non-persistent connections close automatically after the web page has completed. Persistent connections are faster because the cost of reconnecting is expensive, but there is additional resource overhead. As an alternative, Oracle allows you to pool and reuse server processes; this is called  Shared Server (also known as MTS).
    
+
    The author's benchmarks suggest that using non-persistent connections and the  Shared Server configuration offer the best performance. If Shared Server is not an option, only then consider using persistent connections.
    
+
    Connection Examples
    
+
    Just in case you are having problems connecting to Oracle, here are some examples:
    
+
    a. PHP and Oracle reside on the same machine, use default SID, with non-persistent connections:
    
+
    	$conn = NewADOConnection('oci8');
+	$conn->Connect(false, 'scott', 'tiger');
    
+
    b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS', using persistent connections:
    
+
    	$conn = NewADOConnection('oci8');
+	$conn->PConnect(false, 'scott', 'tiger', 'myTNS');
    
+
    or
    
+
     	$conn->PConnect('myTNS', 'scott', 'tiger');
    
+
    c. Host Address and SID
    
+
    +	$conn->connectSID = true;
+	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'SID');
    
+
    d. Host Address and Service Name
    
+
    	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'servicename');
    
+
    e. Oracle connection string:
+
    	$cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
+			(CONNECT_DATA=(SID=$sid)))";
+	$conn->Connect($cstr, 'scott', 'tiger');
+
    
+
    f. ADOdb data source names (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);
    
+
    With ADOdb data source names,
+you don't have to call Connect( ) or PConnect( ).
+
    
+
     
    
+
    10. Error Checking
    
+
    The examples in this article are easy to read but a bit simplistic because we ignore error-handling. Execute( ) and Connect( ) will return false on error. So a more realistic way to call Connect( ) and Execute( ) is:
+
    function InvokeErrorHandler()
+{
    global $db; ## assume global
+    MyLogFunction($db->ErrorNo(), $db->ErrorMsg());
+}
+if (!$db->Connect($tns, $usr, $pwd)) InvokeErrorHandler();
+
+$rs = $db->Execute("select * from emp where empno>:emp order by empno",
+                    array('emp' => 7900));
+if (!$rs) return InvokeErrorHandler();
+while ($arr = $rs->FetchRow()) {
+    print_r($arr);
+	echo "<hr>";
+}
+
    
+
    You can retrieve the  error message and error number of the last SQL statement executed from ErrorMsg( ) and ErrorNo( ). You can also define a custom error handler function.
+ADOdb also supports throwing exceptions in PHP5.
+
     
    
+
    Handling Large Recordsets (added 27 May 2005)
    
+The oci8 driver does not support counting the number of records returned in a SELECT statement, so the function RecordCount()
+is emulated when the global variable $ADODB_COUNTRECS is set to true, which is the default.
+We emulate this by buffering all the records. This can take up large amounts of memory for big recordsets.
+ Set $ADODB_COUNTRECS to false for the best performance.
+ 
    
+This variable is checked every time a query is executed, so you can selectively choose which recordsets to count.
+
     
    
+
    11. Other ADOdb Features
    
+
    Schema generation. This allows you to define a schema using XML and import it into different RDBMS systems portably.
    
+
    Performance monitoring and tracing. Highlights of performance monitoring include identification of poor and suspicious SQL, with explain plan support, and identifying which web pages the SQL ran on.
    
+
     
    
+
    12. Download
    
+
    You can download ADOdb from sourceforge. ADOdb uses a BSD style license. That means that it is free for commercial use, and redistribution without source code is allowed.
    
+
     
    
+
    13. Resources
    
+
+
+
diff --git a/lib/WikiDB/adodb/docs/docs-perf.htm b/lib/WikiDB/adodb/docs/docs-perf.htm
index 0be707966..471ff5a22 100644
--- a/lib/WikiDB/adodb/docs/docs-perf.htm
+++ b/lib/WikiDB/adodb/docs/docs-perf.htm
@@ -18,7 +18,7 @@ font-size: 8pt;
 
 
 
    The ADOdb Performance Monitoring Library
    
-
    V5.18 3 Sep 2012  (c) 2000-2010 John Lim (jlim#natsoft.com)
    
+
    V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
    
 
    This software is dual licensed using BSD-Style and
 LGPL. This means you can use it in compiled proprietary and commercial
 products.
    
@@ -299,7 +299,7 @@ $this->DBParameter("data cache size").
    
 percentage. Only works for Linux and Windows. For Windows, WMI must be
 available.
    
 
    $ADODB_PERF_MIN
    
-
    New in adodb 4.97/5.03 is this global variable, which controls whether sql timings which are too small are not saved. Currently it defaults 
+
    New in adodb 4.97/5.03 is this global variable, which controls whether sql timings which are too small are not saved. Currently it defaults
 to 0.05 (seconds). This means that all sql's which are faster than 0.05 seconds to execute are not saved.
 
    Format of $settings Property
    
 
     To create new database parameters, you need to understand
diff --git a/lib/WikiDB/adodb/docs/docs-session.htm b/lib/WikiDB/adodb/docs/docs-session.htm
index f5425cbd2..6fab26806 100644
--- a/lib/WikiDB/adodb/docs/docs-session.htm
+++ b/lib/WikiDB/adodb/docs/docs-session.htm
@@ -21,7 +21,7 @@ font-size: 8pt;
 
 
    ADODB Session 2 Management Manual
    
 
    
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com)
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
 
    
 
     This software is dual licensed using BSD-Style and
 LGPL. This means you can use it in compiled proprietary and commercial
@@ -44,7 +44,7 @@ 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
-variable you want to keep alive for the duration of the session, use $_SESSION['variablename']. 
+variable you want to keep alive for the duration of the session, use $_SESSION['variablename'].
  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.
@@ -60,8 +60,8 @@ However if you have special needs such as you:
 
    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. 
    
-
    These records will be garbage collected based on the php.ini [session] timeout settings. 
-You can register a notification function to notify you when the record has expired and 
+
    These records will be garbage collected based on the php.ini [session] timeout settings.
+You can register a notification function to notify you when the record has expired and
 is about to be freed by the garbage collector.
    
 
    An alternative to using a database backed session handler is to use memcached.
   This is a distributed memory based caching system suitable for storing session
@@ -82,7 +82,7 @@ It features the following improvements:
 
  • The functions dataFieldName() and syncSeconds() is obsolete.
 
 
-
    Usage is 
+
    Usage is
 
 
     include_once("adodb/session/adodb-session2.php");
@@ -96,7 +96,7 @@ session_start();
 
    When the session is created in session_start( ), the global variable $ADODB_SESS_CONN holds
 the connection object.
 
    The default name of the table is sessions2. If you want to override it:
-  
+
 
     include_once("adodb/session/adodb-session2.php");
 $options['table'] = 'mytablename';
@@ -127,13 +127,13 @@ including adodb-cryptsession2.php instead of adodb-session2.php. 
    • 
 
    Usage Examples
    
 
    To force non-persistent connections, call Persist() first before session_start():
 
- 
+
 
      
 include_once("adodb/session/adodb-session2.php");
 $driver = 'mysql'; $host = 'localhost'; $user = 'auser'; $pwd = 'secret'; $database = 'sessiondb';
 ADOdb_Session::config($driver, $host, $user, $password, $database, $options=false);
    ADOdb_session::Persist($connectMode=false);    
-session_start();
     
+session_start();
    
 
 # or, using DSN support so you can set other options such as port (since 5.11)
 include_once("adodb/session/adodb-session2.php");
@@ -217,7 +217,7 @@ CREATE INDEX SESS2_EXPIREREF ON SESSIONS2(EXPIREREF);
    
 
     We need to use a CLOB here because for text greater than 4000 bytes long,
   Oracle requires you to use the CLOB data type. If you are using the oci8 driver,
   ADOdb will automatically enable CLOB handling. So you can use either adodb-session2.php
-  or adodb-session-clob2.php - in this case it doesn't matter. 
        
+  or adodb-session-clob2.php - in this case it doesn't matter. 
    
 
    Notifications
    
 
    You can receive notification when your session is cleaned up by the session garbage collector or
 when you call session_destroy().
@@ -231,18 +231,18 @@ adodb's garbage collection function, which can be setup to do notification.
 	executed at     called by                             for all recs
 	random time     Session Extension                     queued for deletion
    -

    When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically +

    When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically the userid of the session. Later when the session has expired, just before the record is deleted, -we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which +we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which is the userid of the person being logged off.

    ADOdb uses a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must predefine before session -start to store the notification configuration. +start to store the notification configuration. $ADODB_SESSION_EXPIRE_NOTIFY 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.

    For example, suppose we want to be notified when a user's session has expired, based on the userid. When the user logs in, we store the id in the global session variable -$USERID. The function name is 'NotifyFn'. +$USERID. The function name is 'NotifyFn'.

    So we define (before session_start() is called): 

     
@@ -259,10 +259,10 @@ records in the database and temporary files: 
    
 	{
 		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");          
+
+		$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.

    @@ -300,16 +300,16 @@ will compress and then encrypt the record in the database.

    Dynamically change the current session id with a newly generated one and update database. Currently only works with cookies. Useful to improve security by reducing the risk of session-hijacking. See this article on Session - Fixation for more info + Fixation for more info on the theory behind this feature. Usage:

     	include('path/to/adodb/session/adodb-session2.php');
-	
+
 	session_start();
 	# Approximately every 10 page loads, reset cookie for safety.
-	# This is extremely simplistic example, better 
+	# This is extremely simplistic example, better
 	# to regenerate only when the user logs in or changes
 	# user privilege levels.
-	if ((rand()%10) == 0) adodb_session_regenerate_id(); 
+	if ((rand()%10) == 0) adodb_session_regenerate_id();

    This function calls session_regenerate_id() internally or simulates it if the function does not exist.

    Vacuum/Optimize Database

    @@ -327,7 +327,7 @@ ADODB_Session::optimize($turnOn); $ADODB_SESSION_USER ='root'; $ADODB_SESSION_PWD ='abc'; $ADODB_SESSION_DB ='phplens'; - + include('path/to/adodb/session/adodb-session2.php');

    In the above example, the only things you need to change in your code to upgrade is

    diff --git a/lib/WikiDB/adodb/docs/docs-session.old.htm b/lib/WikiDB/adodb/docs/docs-session.old.htm index f25381885..fff3c2ec3 100644 --- a/lib/WikiDB/adodb/docs/docs-session.old.htm +++ b/lib/WikiDB/adodb/docs/docs-session.old.htm @@ -21,7 +21,7 @@ font-size: 8pt;

    ADODB Session Management Manual

    -V5.18 3 Sep 2012 (c) 2000-2010 John Lim (jlim#natsoft.com) +V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com)

    This software is dual licensed using BSD-Style and LGPL. This means you can use it in compiled proprietary and commercial @@ -30,7 +30,7 @@ products.   Other Docs

    Introduction

    -

    This documentation discusses the old adodb-session.php. +

    This documentation discusses the old adodb-session.php. Here is the new documentation on the newer adodb-session2.php.

    We store state information specific to a user or web client in session variables. These session variables persist throughout a @@ -53,8 +53,8 @@ However if you have special needs such as you:

    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.

    -

    These records will be garbage collected based on the php.ini [session] timeout settings. -You can register a notification function to notify you when the record has expired and +

    These records will be garbage collected based on the php.ini [session] timeout settings. +You can register a notification function to notify you when the record has expired and is about to be freed by the garbage collector.

    Important Upgrade Notice: Since ADOdb 4.05, the session files have been moved to its own folder, adodb/session. This is a rewrite @@ -84,7 +84,7 @@ including adodb-cryptsession.php instead of adodb-session.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.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(): 

    @@ -179,18 +179,18 @@ adodb's garbage collection function, which can be setup to do notification.
 	executed at     called by                             for all recs
 	random time     Session Extension                     queued for deletion
    -

    When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically +

    When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically the userid of the session. Later when the session has expired, just before the record is deleted, -we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which +we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which is the userid of the person being logged off.

    ADOdb uses a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must predefine before session -start to store the notification configuration. +start to store the notification configuration. $ADODB_SESSION_EXPIRE_NOTIFY 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.

    For example, suppose we want to be notified when a user's session has expired, based on the userid. When the user logs in, we store the id in the global session variable -$USERID. The function name is 'NotifyFn'. +$USERID. The function name is 'NotifyFn'.

    So we define (before session_start() is called): 

     
@@ -207,10 +207,10 @@ records in the database and temporary files: 
    
 	{
 		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");          
+
+		$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.

    @@ -246,7 +246,7 @@ can be logged in twice. Useful for security reasons. DATA CLOB, PRIMARY KEY (sesskey) );     - +

    Then your PHP code could look like this: 

     	ADODB_SESSION_DRIVER='oci8';
@@ -254,20 +254,20 @@ can be logged in twice. Useful for security reasons.
 	$ADODB_SESSION_USER ='scott';
 	$ADODB_SESSION_PWD = 'tiger';
 	$ADODB_SESSION_DB ='';
-	
+
 	$ADODB_SESSION_USE_LOBS = 'clob';
 	$ADODB_SESSION_TBL = 'sessions';
-	
+
 	$ADODB_SESS_DEBUG=0;
-	
+
 	include(ADODB_DIR.'/session/adodb-session.php');
-	
+
 	ADODB_Session::persist('P'); # use 'C' for non-persistent connects
-	
+
 	session_start();

    Note that you can set persistance using ADODB_Session::persist('P'). - +

    Compression/Encryption Schemes

    Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and compression schemes are supported. Currently, supported are: @@ -279,7 +279,7 @@ will compress and then encrypt the record in the database.

    adodb_session_regenerate_id()

    Dynamically change the current session id with a newly generated one and update database. Currently only works with cookies. Useful to improve security by reducing the risk of session-hijacking. -See this article on Session Fixation for more info +See this article on Session Fixation for more info on the theory behind this feature. Usage: 

     	$ADODB_SESSION_DRIVER='mysql';
@@ -287,15 +287,15 @@ on the theory behind this feature. Usage:
 	$ADODB_SESSION_USER ='root';
 	$ADODB_SESSION_PWD ='abc';
 	$ADODB_SESSION_DB ='phplens';
-	
+
 	include('path/to/adodb/session/adodb-session.php');
-	
+
 	session_start();
 	# Every 10 page loads, reset cookie for safety.
-	# This is extremely simplistic example, better 
+	# This is extremely simplistic example, better
 	# to regenerate only when the user logs in or changes
 	# user privilege levels.
-	if ((rand()%10) == 0) adodb_session_regenerate_id(); 
+	if ((rand()%10) == 0) adodb_session_regenerate_id();

    This function calls session_regenerate_id() internally or simulates it if the function does not exist.

    Vacuum/Optimize Database

    diff --git a/lib/WikiDB/adodb/docs/index.html b/lib/WikiDB/adodb/docs/index.html new file mode 100644 index 000000000..7e74593c2 --- /dev/null +++ b/lib/WikiDB/adodb/docs/index.html @@ -0,0 +1,241 @@ + + + + + ADOdb Database Abstraction Library for PHP + + + + + + + + + + +
    + + + + + + + +
    +

    ADOdb Database Abstraction Library for PHP

    + © 2000-2014 John Lim +(jlim#natsoft.com). All rights reserved.
    +

    + Download   + Source code   + Documentation   + Support   + Changelog  + FAQ

    +
    +

    ADOdb is a database abstraction library for PHP

    +

    It currently supports an amazing number of +databases, thanks to the wonderful ADOdb community: MySQL, +PostgreSQL, Interbase, Firebird, Informix, Oracle, MS SQL, Foxpro, +Access, ADO, Sybase, FrontBase, DB2, SAP DB, SQLite, Netezza, LDAP, and +generic ODBC, ODBTP. The Sybase, Informix, FrontBase and +PostgreSQL, Netezza, LDAP, ODBTP drivers are community contributions. +Here is the complete +list of drivers.

    +

    Many popular web applications such as + ACID, + Zikula/PostNuke, + phpWiki, + Mambo, + PHP GACL, + TikiWiki, + eGroupWare and + phpLens App Server + are using ADOdb as their database abstraction layer. + + Some reasons why ADOdb is popular include:

    +
      +
    • Designed for speed. It is probably the fastest open +source database abstraction library available for PHP. See benchmarks.
      • +
    • Provides extensive portability support such as date +and type-handling and portable schema creation. See portable sql tips
      • +
    • Support many enterprise features such as database +backed sessions (with session expiry notification), SQL code +generation, pivot tables, SELECT LIMIT emulation for all databases, +performance monitoring.
      • +
    • Easy to learn, especially if you have Window's +programming experience, as it uses many ADO conventions.
      • +
    • Extensive QA, every release is unit-tested on +Access, MySQL, PostgreSQL, MS SQL, Oracle 11g.
      • +
    • Mature, continiously developed since August 2000. +Has a large community of users.
      • +
    • Powerful Active Record support. See docs.
      • +
    • Very reasonable licensing terms (BSD). This means +that you can incorporate (and even compile) it into your software +applications royalty-free without asking the author's +permission, provided you include license.txt in your release. Also +dual-licensed (Lesser GPL).
      • +
    + + +

    PHP Code Samples

    + + 
    include('/path/to/adodb.inc.php');
    $DB = NewADOConnection('mysql');
    $DB->Connect($server, $user, $pwd, $db);

    # M'soft style data retrieval with binds
+$rs = $DB->Execute("select * from table where key=?",array($key));
+while (!$rs->EOF) {
+    print_r($rs->fields);
+    $rs->MoveNext();
+}
+
+# PEAR style data retrieval
+$rs = $DB->Execute("select * from table where key=123");
+while ($array = $rs->FetchRow()) {
+    print_r($array);
+}
+
+# Alternative URI connection syntax:
+$DB = NewADOConnection("mysql://$user:$pwd@$server/$db?persist");

    # No need for Connect or PConnect when using URI syntax
+
+$ok = $DB->Execute("update atable set aval = 0");
+if (!$ok) mylogerr($DB->ErrorMsg());
+
    + +

    Other things you can try include:

    + 
    # Updating tables
+$ok = $DB->Execute("update table set col1=? where key=?",array($colval, $key));
+
+# retrieving data shortcuts
+$val = $DB->GetOne("select col from table where key='John'");
+$row = $DB->GetRow("select col from table where key='John'");
+$arr = $DB->GetAll("select col from table");
+$arr = $DB->GetAssoc("select key,col from table"); # returns associative array $key=>col
+
+# Retrieve high speed cached recordsets (cached for 3600 secs)
    
+# Cache directory defined in  global $ADODB_CACHE_DIR. 
    
+# CacheGetOne, CacheRow, CacheGetAll all work    
+$rs = $DB->CacheExecute(3600, "select orgname from users where user='JOHN'");
+
    + + And there are more +connection examples showing you how to connect to + SQLite, + Oracle, + PostgreSQL, + Microsoft SQL Server, + MS Access, + LDAP, + Interbase/Firebird, + etc. + + +

    PHP5 Support

    + ADOdb has full PHP5 support, including SPL and exception support. For +example, you can do this in PHP5: + 
    $rs = $DB->Execute("select * from table");
    foreach ($rs as $row) {
        print_r($row);
    }
    + If you include the following adodb-exceptions.inc.php file, then ADOdb +will throw exceptions when an error occurs: + 
    include("/path/to/adodb-exceptions.inc.php");
    include("/path/to/adodb.inc.php");
    $DB = NewADOConnection('oci8');  
    $DB->Connect("", "scott", "tiger");
    try {
       $DB->Execute("select badsql from badtable");
    } catch (exception $e) {
        print_r($e);
    }
    + + +

    Download

    +

    + Download from SourceForge
    +

    +

    Requirements: PHP 5.0 or later.

    +

    Installation: Unpack files into a directory. Try the +above sample code, adjusting +the connection parameters to suit your database server, and modify the +sql to match your tables.

    +

    Debugging: Set your connection's debug property, e.g. +$DB->debug=true; if you are having problems. It will output lots of +useful status and +error messages.

    + + +

    ADOdb Documentation

    +

    One HTML Page +

    + +

    + Data Dictionary for schema creation.
    + Performance Monitoring.
    + Database-backed Session Management. +

    + +

    Other Docs for PHP version

    +

    + The documents in this section are maintained (or not, as the case may be) + by their respective authors and are therefore potentially out of date + or even obsolete. +

    + +

    + MySQL Tutorial
    + Advanced Oracle Tutorial
    + Portable SQL Tips with ADOdb
    + ADOdb Active Record, an OOP encapsulation of a database record.
    +

    + +

    A couple excellent articles by icarus about ADOdb at MelonFire:

    +

        + Part 1 on Basics and + Part 2 on Advanced ADOdb. +

    + +

    Translations

    +

    PHP documentation in other languages:

    + +

    and tutorials in:

    + + + +

    Support

    +

    Bug reports, feature requests and questions should be filed on + Github. +

    +

    The legacy + ADOdb forums + are still available, however they are not actively monitored and should + only be used as reference. +

    +
    + © 2000-2014 John Lim. All Rights Reserved. + Contact: jlim#natsoft.com
    +
    + + diff --git a/lib/WikiDB/adodb/docs/old-changelog.htm b/lib/WikiDB/adodb/docs/old-changelog.htm index bf8a1af26..8f8a03d06 100644 --- a/lib/WikiDB/adodb/docs/old-changelog.htm +++ b/lib/WikiDB/adodb/docs/old-changelog.htm @@ -1,822 +1,822 @@ -Old Changelog: ADOdb -

    Old Changelog

    - -

    3.92 22 Sept 2003 -

    Added GetAssoc and CacheGetAssoc to connection object. -

    Removed TextMax and CharMax functions from adodb.inc.php. -

    HasFailedTrans() returned false when trans failed. Fixed. -

    Moved perf driver classes into adodb/perf/*.php. -

    Misc improvements to performance monitoring, including UI(). -

    RETVAL in mssql Parameter(), we do not append @ now. -

    Added Param($name) to connection class, returns '?' or ":$name", for defining - bind parameters portably. -

    LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8 - _stmt and _affectedrows() bugs. -

    Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT - stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also - added new $conn->datetime field to oci8, controls whether MetaType() returns - 'D' ($this->datetime==false) or 'T' ($this->datetime == true) for DATE type. -

    Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php. -

    Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL(). -

    Tuned include_once handling to reduce file-system checking overhead. -

    3.91 9 Sept 2003 -

    Only released to InterAkt -

    Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory - for driver instantiation. -

    Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com -

    Added portable substr support. -

    Now rs2html() has new parameter, $echo. Set to false to return $html instead - of echoing it. -

    3.90 5 Sept 2003 -

    First beta of performance monitoring released. -

    MySQL supports MetaTable() masking. -

    Fixed key_exists() bug in adodb-lib.inc.php -

    Added sp_executesql Prepare() support to mssql. -

    Added bind support to db2. -

    Added swedish language file - Christian Tiberg" christian#commsoft.nu -

    Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich. -

    Left join setting for oci8 was wrong. Thx to johnwilk#juno.com -

    3.80 27 Aug 2003 -

    Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility. -

    Added matching mask for MetaTables. Only for oci8, mssql and postgres currently. -

    Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano. -

    Added better debugging for Smart Transactions. -

    Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP. -

    ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define - it after including adodb.inc.php. -

    Added portugese (brazilian) to languages. Thx to "Levi Fukumori". -

    Removed arg3 parameter from Execute/SelectLimit/Cache* functions. -

    Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() - to note change in sql query counting with 2-d arrays. -

    Added MONEY to MetaType in PostgreSQL. -

    Added more debugging output to CacheFlush(). -

    3.72 9 Aug 2003 -

    Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes - and does the right thing... -

    Fixed CacheFlush() bug - Thx to martin#gmx.de -

    Walt Boring contributed MetaForeignKeys for postgres7. -

    _fetch() called _BlobDecode() wrongly in interbase. Fixed. -

    adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980 -

    3.71 4 Aug 2003 -

    The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner - == false. -

    Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru. -

    Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com. -

    Error handling in oci8 bugfix - if there was an error in Execute(), then when - calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but - the 2nd call would return no error. -

    Error handling in odbc bugfix. ODBC would always return the last error, even - if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to - 0 everytime before CacheExecute() and Execute(). -

    3.70 29 July 2003 -

    Added new SQLite driver. Tested on PHP 4.3 and PHP 5. -

    Added limited "sapdb" driver support - mainly date support. -

    The oci8 driver did not identify NUMBER with no defined precision correctly. -

    Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls - in GetInsertSQL/GetUpdateSQL. -

    DBDate() and DBTimeStamp() format for postgresql had problems. Fixed. -

    Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit. -

    Added charset support to postgresql. Thx to Julian Tarkhanov. -

    Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS) -

    Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn. -

    adodb-cryptsession.php includes wrong. Fixed. -

    Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8. -

    Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. -

    adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause checking - in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. -

    Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring. -

    Upgraded to adodb-xmlschema.inc.php 0.0.2. -

    NConnect for mysql now returns value. Thx to Dennis Verspuij. -

    ADODB_FETCH_BOTH support added to interbase/firebird. -

    Czech language file contributed by Kamil Jakubovic jake#host.sk. -

    PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec. -

    Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it -

    ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed. -

    3.60 16 June 2003 -

    We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with - mssql driver. -

    The property $emptyDate missing from connection class. Also changed 1903 to - constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. -

    ADOdb speedup optimization - we now return all arrays by reference. -

    Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. - Suggested by vincent. -

    Added GetArray() to connection class. -

    Added not_null check in informix metacolumns(). -

    Connection parameters for postgresql did not work correctly when port was defined. -

    DB2 is now a tested driver, making adodb 100% compatible. Extensive changes - to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching - to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() - fixes. -

    The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed. -

    Some bugs in adodb_backtrace() fixed. -

    Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql - properly. -

    MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions - to odbc MetaColumns() for vfp and db2 compat. -

    Added unsigned support to mysql datadict class. Thx to iamsure. -

    Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to - Josh R, Night_Wulfe#hotmail.com. -

    ChangeTableSQL contributed by Florian Buzin. -

    The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with - mssql driver. -

    - -

    3.50 19 May 2003

    -

    Fixed mssql compat with FreeTDS. FreeTDS does not implement mssql_fetch_assoc(). -

    Merged back connection and recordset code into adodb.inc.php. -

    ADOdb sessions using oracle clobs contributed by achim.gosse#ddd.de. See adodb-session-clob.php. -

    Added /s modifier to preg_match everywhere, which ensures that regex does not - stop at /n. Thx Pao-Hsi Huang. -

    Fixed error in metacolumns() for mssql. -

    Added time format support for SQLDate. -

    Image => B added to metatype. -

    MetaType now checks empty($this->blobSize) instead of empty($this). -

    Datadict has beta support for informix, sybase (mapped to mssql), db2 and generic - (which is a fudge). -

    BlobEncode for postgresql uses pg_escape_bytea, if available. Needed for compat - with 7.3. -

    Added $ADODB_LANG, to support multiple languages in MetaErrorMsg(). -

    Datadict can now parse table definition as declarative text. -

    For DataDict, oci8 autoincrement trigger missing semi-colon. Fixed. -

    For DataDict, when REPLACE flag enabled, drop sequence in datadict for autoincrement - field in postgres and oci8.s -

    Postgresql defaults to template1 database if no database defined in connect/pconnect. -

    We now clear _resultid in postgresql if query fails. -

    3.40 19 May 2003

    -

    Added insert_id for odbc_mssql. -

    Modified postgresql UpdateBlobFile() because it did not work in safe mode. -

    Now connection object is passed to raiseErrorFn as last parameter. Needed by - StartTrans(). -

    Added StartTrans() and CompleteTrans(). It is recommended that you do not modify - transOff, but use the above functions. -

    oci8po now obeys ADODB_ASSOC_CASE settings. -

    Added virtualized error codes, using PEAR DB equivalents. Requires you to manually - include adodb-error.inc.php yourself, with MetaError() and MetaErrorMsg($errno). -

    GetRowAssoc for mysql and pgsql were flawed. Fix by Ross Smith. -

    Added to datadict types I1, I2, I4 and I8. Changed datadict type 'T' to map - to timestamp instead of datetime for postgresql. -

    Error handling in ExecuteSQLArray(), adodb-datadict.inc.php did not work. -

    We now auto-quote postgresql connection parameters when building connection - string. -

    Added session expiry notification. -

    We now test with odbc mysql - made some changes to odbc recordset constructor. -

    MetaColumns now special cases access and other databases for odbc. -

    3.31 17 March 2003

    -

    Added row checking for _fetch in postgres. -

    Added Interval type to MetaType for postgres. -

    Remapped postgres driver to call postgres7 driver internally. -

    Adorecordset_array::getarray() did not return array when nRows >= 0. -

    Postgresql: at times, no error message returned by pg_result_error() but error - message returned in pg_last_error(). Recoded again. -

    Interbase blob's now use chunking for updateblob. -

    Move() did not set EOF correctly. Reported by Jorma T. -

    We properly support mysql timestamp fields when we are creating mysql tables - using the data-dict interface. -

    Table regex includes backticks character now. -

    3.30 3 March 2003

    -

    Added $ADODB_EXTENSION and $ADODB_COMPAT_FETCH constant. -

    Made blank1stItem configurable using syntax "value:text" in GetMenu/GetMenu2. - Thx to Gabriel Birke. -

    Previously ADOdb differed from the Microsoft standard because it did not define - what to set $this->fields when EOF was reached. Now at EOF, ADOdb sets $this->fields - to false for all databases, which is consist with Microsoft's implementation. - Postgresql and mysql have always worked this way (in 3.11 and earlier). If you - are experiencing compatibility problems (and you are not using postgresql nor - mysql) on upgrading to 3.30, try setting the global variables $ADODB_COUNTRECS - = true (which is the default) and $ADODB_FETCH_COMPAT = true (this is a new - global variable). -

    We now check both pg_result_error and pg_last_error as sometimes pg_result_error - does not display anything. Iman Mayes -

    We no longer check for magic quotes gpc in Quote(). -

    Misc fixes for table creation in adodb-datadict.inc.php. Thx to iamsure. -

    Time calculations use adodb_time library for all negative timestamps due to - problems in Red Hat 7.3 or later. Formerly, only did this for Windows. -

    In mssqlpo, we now check if $sql in _query is a string before we change || - to +. This is to support prepared stmts. -

    Move() and MoveLast() internals changed to support to support EOF and $this->fields - change. -

    Added ADODB_FETCH_BOTH support to mssql. Thx to Angel Fradejas afradejas#mediafusion.es -

    We now check if link resource exists before we run mysql_escape_string in - qstr(). -

    Before we flock in csv code, we check that it is not a http url. -

    3.20 17 Feb 2003

    -

    Added new Data Dictionary classes for creating tables and indexes. Warning - - this is very much alpha quality code. The API can still change. See adodb/tests/test-datadict.php - for more info. -

    We now ignore $ADODB_COUNTRECS for mysql, because PHP truncates incomplete - recordsets when mysql_unbuffered_query() is called a second time. -

    Now postgresql works correctly when $ADODB_COUNTRECS = false. -

    Changed _adodb_getcount to properly support SELECT DISTINCT. -

    Discovered that $ADODB_COUNTRECS=true has some problems with prepared queries - - suspect PHP bug. -

    Now GetOne and GetRow run in $ADODB_COUNTRECS=false mode for better performance. -

    Added support for mysql_real_escape_string() and pg_escape_string() in qstr(). -

    Added an intermediate variable for mysql _fetch() and MoveNext() to store fields, - to prevent overwriting field array with boolean when mysql_fetch_array() returns - false. -

    Made arrays for getinsertsql and getupdatesql case-insensitive. Suggested by - Tim Uckun" tim#diligence.com -

    3.11 11 Feb 2003

    -

    Added check for ADODB_NEVER_PERSIST constant in PConnect(). If defined, then - PConnect() will actually call non-persistent Connect(). -

    Modified interbase to properly work with Prepare(). -

    Added $this->ibase_timefmt to allow you to change the date and time format. -

    Added support for $input_array parameter in CacheFlush(). -

    Added experimental support for dbx, which was then removed when i found that - it was slower than using native calls. -

    Added MetaPrimaryKeys for mssql and ibase/firebird. -

    Added new $trim parameter to GetCol and CacheGetCol -

    Uses updated adodb-time.inc.php 0.06. -

    3.10 27 Jan 2003 -

    Added adodb_date(), adodb_getdate(), adodb_mktime() and adodb-time.inc.php. -

    For interbase, added code to handle unlimited number of bind parameters. From - Daniel Hasan daniel#hasan.cl. -

    Added BlobDecode and UpdateBlob for informix. Thx to Fernando Ortiz. -

    Added constant ADODB_WINDOWS. If defined, means that running on Windows. -

    Added constant ADODB_PHPVER which stores php version as a hex num. Removed - $ADODB_PHPVER variable. -

    Felho Bacsi reported a minor white-space regular expression problem in GetInsertSQL. -

    Modified ADO to use variant to store _affectedRows -

    Changed ibase to use base class Replace(). Modified base class Replace() to - support ibase. -

    Changed odbc to auto-detect when 0 records returned is wrong due to bad odbc - drivers. -

    Changed mssql to use datetimeconvert ini setting only when 4.30 or later (does - not work in 4.23). -

    ExecuteCursor($stmt, $cursorname, $params) now accepts a new $params array - of additional bind parameters -- William Lovaton walovaton#yahoo.com.mx. -

    Added support for sybase_unbuffered_query if ADODB_COUNTRECS == false. Thx - to chuck may. -

    Fixed FetchNextObj() bug. Thx to Jorma Tuomainen. -

    We now use SCOPE_IDENTITY() instead of @@IDENTITY for mssql - thx to marchesini#eside.it -

    Changed postgresql movenext logic to prevent illegal row number from being - passed to pg_fetch_array(). -

    Postgresql initrs bug found by "Bogdan RIPA" bripa#interakt.ro $f1 accidentally - named $f -

    3.00 6 Jan 2003 -

    Fixed adodb-pear.inc.php syntax error. -

    Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages - that accept it. -

    Fixed _adodb_getcount() caching error. -

    Added sql to retrive table and column info for odbc_mssql. -

    2.91 3 Jan 2003 -

    Revised PHP version checking to use $ADODB_PHPVER with legal values 0x4000, - 0x4050, 0x4200, 0x4300. -

    Added support for bytea fields and oid blobs in postgres by allowing BlobDecode() - to detect and convert non-oid fields. Also added BlobEncode to postgres when - you want to encode oid blobs. -

    Added blobEncodeType property for connections to inform phpLens what encoding - method to use for blobs. -

    Added BlobDecode() and BlobEncode() to base ADOConnection class. -

    Added umask() to _gencachename() when creating directories. -

    Added charPage for ado drivers, so you can set the code page. -

    -$conn->charPage = CP_UTF8;
-$conn->Connect($dsn);
-
    -

    Modified _seek in mysql to check for num rows=0. -

    Added to metatypes new informix types for IDS 9.30. Thx Fernando Ortiz. -

    _maxrecordcount returned in CachePageExecute $rsreturn -

    Fixed sybase cacheselectlimit( ) problems -

    MetaColumns() max_length should use precision for types X and C for ms access. - Fixed. -

    Speedup of odbc non-SELECT sql statements. -

    Added support in MetaColumns for Wide Char types for ODBC. We halve max_length - if unicode/wide char. -

    Added 'B' to types handled by GetUpdateSQL/GetInsertSQL. -

    Fixed warning message in oci8 driver with $persist variable when using PConnect. -

    2.90 11 Dec 2002 -

    Mssql and mssqlpo and oci8po now support ADODB_ASSOC_CASE. -

    Now MetaType() can accept a field object as the first parameter. -

    New $arr = $db->ServerInfo( ) function. Returns $arr['description'] which - is the string description, and $arr['version']. -

    PostgreSQL and MSSQL speedups for insert/updates. -

    Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. - Each connection has independant fetchMode. -

    ADODB_ASSOC_CASE now defaults to 2, use native defaults. This is because we - would break backward compat for too many applications otherwise. -

    Patched encrypted sessions to use replace() -

    The qstr function supports quoting of nulls when escape character is \ -

    Rewrote bits and pieces of session code to check for time synch and improve - reliability. -

    Added property ADOConnection::hasTransactions = true/false; -

    Added CreateSequence and DropSequence functions -

    Found misplaced MoveNext() in adodb-postgres.inc.php. Fixed. -

    Sybase SelectLimit not reliable because 'set rowcount' not cached - fixed. -

    Moved ADOConnection to adodb-connection.inc.php and ADORecordSet to adodb-recordset.inc.php. - This allows us to use doxygen to generate documentation. Doxygen doesn't like - the classes in the main adodb.inc.php file for some mysterious reason. -

    2.50, 14 Nov 2002 -

    Added transOff and transCnt properties for disabling (transOff = true) and - tracking transaction status (transCnt>0). -

    Added inputarray handling into _adodb_pageexecute_all_rows - "Ross Smith" RossSmith#bnw.com. -

    Fixed postgresql inconsistencies in date handling. -

    Added support for mssql_fetch_assoc. -

    Fixed $ADODB_FETCH_MODE bug in odbc MetaTables() and MetaPrimaryKeys(). -

    Accidentally declared UnixDate() twice, making adodb incompatible with php - 4.3.0. Fixed. -

    Fixed pager problems with some databases that returned -1 for _currentRow on - MoveLast() by switching to MoveNext() in adodb-lib.inc.php. -

    Also fixed uninited $discard in adodb-lib.inc.php. -

    2.43, 25 Oct 2002

    -Added ADODB_ASSOC_CASE constant to better support ibase and odbc field names. -

    Added support for NConnect() for oracle OCINLogin. -

    Fixed NumCols() bug. -

    Changed session handler to use Replace() on write. -

    Fixed oci8 SelectLimit aggregate function bug again. -

    Rewrote pivoting code. -

    2.42, 4 Oct 2002

    -

    Fixed ibase_fetch() problem with nulls. Also interbase now does automatic blob - decoding, and is backward compatible. Suggested by Heinz Hombergs heinz#hhombergs.de. -

    Fixed postgresql MoveNext() problems when called repeatedly after EOF. Also - suggested by Heinz Hombergs. -

    PageExecute() does not rewrite queries if SELECT DISTINCT is used. Requested - by hans#velum.net -

    Added additional fixes to oci8 SelectLimit handling with aggregate functions - - thx to Christian Bugge for reporting the problem. -

    2.41, 2 Oct 2002

    -

    Fixed ADODB_COUNTRECS bug in odbc. Thx to Joshua Zoshi jzoshi#hotmail.com. -

    Increased buffers for adodb-csvlib.inc.php for extremely long sql from 8192 - to 32000. -

    Revised pivottable.inc.php code. Added better support for aggregate fields. -

    Fixed mysql text/blob types problem in MetaTypes base class - thx to horacio - degiorgi. -

    Added SQLDate($fmt,$date) function, which allows an sql date format string - to be generated - useful for group by's. -

    Fixed bug in oci8 SelectLimit when offset>100. -

    2.40 4 Sept 2002

    -

    Added new NLS_DATE_FORMAT property to oci8. Suggested by Laurent NAVARRO ln#altidev.com -

    Now use bind parameters in oci8 selectlimit for better performance. -

    Fixed interbase replaceQuote for dialect != 1. Thx to "BEGUIN Pierre-Henri - - INFOCOB" phb#infocob.com. -

    Added white-space check to QA. -

    Changed unixtimestamp to support fractional seconds (we always round down/floor - the seconds). Thanks to beezly#beezly.org.uk. -

    Now you can set the trigger_error type your own user-defined type in adodb-errorhandler.inc.php. - Suggested by Claudio Bustos clbustos#entelchile.net. -

    Added recordset filters with rsfilter.inc.php. -

    $conn->_rs2rs does not create a new recordset when it detects it is of type - array. Some trickery there as there seems to be a bug in Zend Engine -

    Added render_pagelinks to adodb-pager.inc.php. Code by "Pablo Costa" pablo#cbsp.com.br. -

    MetaType() speedup in adodb.inc.php by using hashing instead of switch. Best - performance if constant arrays are supported, as they are in PHP5. -

    adodb-session.php now updates only the expiry date if the crc32 check indicates - that the data has not been modified. -

    2.31 20 Aug 2002

    -

    Made changes to pivottable.inc.php due to daniel lucuzaeu's suggestions (we sum the pivottable column if desired). -

    Fixed ErrorNo() in postgres so it does not depend on _errorMsg property. -

    Robert Tuttle added support for oracle cursors. See ExecuteCursor(). -

    Fixed Replace() so it works with mysql when updating record where data has not changed. Reported by -Cal Evans (cal#calevans.com). -

    2.30 1 Aug 2002

    -

    Added pivottable.inc.php. Thanks to daniel.lucazeau#ajornet.com for the original - concept. -

    Added ADOConnection::outp($msg,$newline) to output error and debugging messages. Now -you can override this using the ADODB_OUTP constant and use your own output handler. -

    Changed == to === for 'null' comparison. Reported by ericquil#yahoo.com -

    Fixed mssql SelectLimit( ) bug when distinct used. -

    2.30 1 Aug 2002

    -

    New GetCol() and CacheGetCol() from ross#bnw.com that returns the first field as a 1 dim array. -

    We have an empty recordset, but RecordCount() could return -1. Fixed. Reported by "Jonathan Polansky" jonathan#polansky.com. -

    We now check for session variable changes using strlen($sessval).crc32($sessval). -Formerly we only used crc32(). -

    Informix SelectLimit() problem with $ADODB_COUNTRECS fixed. -

    Fixed informix SELECT FIRST x DISTINCT, and not SELECT DISTINCT FIRST x - reported by F Riosa -

    Now default adodb error handlers ignores error if @ used. -

    If you set $conn->autoRollback=true, we auto-rollback persistent connections for odbc, mysql, oci8, mssql. -Default for autoRollback is false. No need to do so for postgres. -As interbase requires a transaction id (what a flawed api), we don't do it for interbase. -

    Changed PageExecute() to use non-greedy preg_match when searching for "FROM" keyword. -

    2.20 9 July 2002

    -

    Added CacheGetOne($secs2cache,$sql), CacheGetRow($secs2cache,$sql), CacheGetAll($secs2cache,$sql). -

    Added $conn->OffsetDate($dayFraction,$date=false) to generate sql that calcs - date offsets. Useful for scheduling appointments. -

    Added connection properties: leftOuter, rightOuter that hold left and right - outer join operators. -

    Added connection property: ansiOuter to indicate whether ansi outer joins supported. -

    New driver mssqlpo, the portable mssql driver, which converts string - concat operator from || to +. -

    Fixed ms access bug - SelectLimit() did not support ties - fixed. -

    Karsten Kraus (Karsten.Kraus#web.de), contributed error-handling code to ADONewConnection. - Unfortunately due to backward compat problems, had to rollback most of the changes. -

    Added new parameter to GetAssoc() to allow returning an array of key-value pairs, -ignoring any additional columns in the recordset. Off by default. -

    Corrected mssql $conn->sysDate to return only date using convert(). -

    CacheExecute() improved debugging output. -

    Changed rs2html() so newlines are converted to BR tags. Also optimized rs2html() based -on feedback by "Jerry Workman" jerry#mtncad.com. -

    Added support for Replace() with Interbase, using DELETE and INSERT. -

    Some minor optimizations (mostly removing & references when passing arrays). -

    Changed GenID() to allows id's larger than the size of an integer. -

    Added force_session property to oci8 for better updateblob() support. -

    Fixed PageExecute() which did not work properly with sql containing GROUP BY. -

    2.12 12 June 2002

    -

    Added toexport.inc.php to export recordsets in CSV and tab-delimited format. -

    CachePageExecute() does not work - fixed - thx John Huong. -

    Interbase aliases not set properly in FetchField() - fixed. Thx Stefan Goethals. -

    Added cache property to adodb pager class. The number of secs to cache recordsets. -

    SQL rewriting bug in pageexecute() due to skipping of newlines due to missing /s modifier. Fixed. -

    Max size of cached recordset due to a bug was 256000 bytes. Fixed. -

    Speedup of 1st invocation of CacheExecute() by tuning code. -

    We compare $rewritesql with $sql in pageexecute code in case of rewrite failure. -

    2.11 7 June 2002

    -

    Fixed PageExecute() rewrite sql problem - COUNT(*) and ORDER BY don't go together with - mssql, access and postgres. Thx to Alexander Zhukov alex#unipack.ru -

    DB2 support for CHARACTER type added - thx John Huong huongch#bigfoot.com -

    For ado, $argProvider not properly checked. Fixed - kalimero#ngi.it -

    Added $conn->Replace() function for update with automatic insert if the record does not exist. - Supported by all databases except interbase. -

    2.10 4 June 2002

    -

    Added uniqueSort property to indicate mssql ORDER BY cols must be unique. -

    Optimized session handler by crc32 the data. We only write if session data has changed. -

    adodb_sess_read in adodb-session.php now returns ''correctly - thanks to Jorma Tuomainen, webmaster#wizactive.com -

    Mssql driver did not throw EXECUTE errors correctly because ErrorMsg() and ErrorNo() called in wrong order. -Pointed out by Alexios Fakos. Fixed. -

    Changed ado to use client cursors. This fixes BeginTran() problems with ado. -

    Added handling of timestamp type in ado. -

    Added to ado_mssql support for insert_id() and affected_rows(). -

    Added support for mssql.datetimeconvert=0, available since php 4.2.0. -

    Made UnixDate() less strict, so that the time is ignored if present. -

    Changed quote() so that it checks for magic_quotes_gpc. -

    Changed maxblobsize for odbc to default to 64000. -

    2.00 13 May 2002

    -

    Added drivers informix72 for pre-7.3 versions, and oci805 for - oracle 8.0.5, and postgres64 for postgresql 6.4 and earlier. The postgres and postgres7 drivers - are now identical. -

    Interbase now partially supports ADODB_FETCH_BOTH, by defaulting to ASSOC mode. -

    Proper support for blobs in mssql. Also revised blob support code -is base class. Now UpdateBlobFile() calls UpdateBlob() for consistency. -

    Added support for changed odbc_fetch_into api in php 4.2.0 -with $conn->_has_stupid_odbc_fetch_api_change. -

    Fixed spelling of tablock locking hint in GenID( ) for mssql. -

    Added RowLock( ) to several databases, including oci8, informix, sybase, etc. - Fixed where error in mssql RowLock(). -

    Added sysDate and sysTimeStamp properties to most database drivers. These are the sql -functions/constants for that database that return the current date and current timestamp, and -are useful for portable inserts and updates. -

    Support for RecordCount() caused date handling in sybase and mssql to break. -Fixed, thanks to Toni Tunkkari, by creating derived classes for ADORecordSet_array for -both databases. Generalized using arrayClass property. Also to support RecordCount(), -changed metatype handling for ado drivers. Now the type returned in FetchField - is no longer a number, but the 1-char data type returned by MetaType. - At the same time, fixed a lot of date handling. Now mssql support dmy and mdy date formats. -Also speedups in sybase and mssql with preg_match and ^ in date/timestamp handling. -Added support in sybase and mssql for 24 hour clock in timestamps (no AM/PM). -

    Extensive revisions to informix driver - thanks to Samuel CARRIERE samuel_carriere#hotmail.com -

    Added $ok parameter to CommitTrans($ok) for easy rollbacks. -

    Fixed odbc MetaColumns and MetaTables to save and restore $ADODB_FETCH_MODE. -

    Some odbc drivers did not call the base connection class constructor. Fixed. -

    Fixed regex for GetUpdateSQL() and GetInsertSQL() to support more legal character combinations. - -

    1.99 21 April 2002

    -

    Added emulated RecordCount() to all database drivers if $ADODB_COUNTRECS = true - (which it is by default). Inspired by Cristiano Duarte (cunha17#uol.com.br). -

    Unified stored procedure support for mssql and oci8. Parameter() and PrepareSP() - functions implemented. -

    Added support for SELECT FIRST in informix, modified hasTop property to support - this. -

    Changed csv driver to handle updates/deletes/inserts properly (when Execute() returns true). -Bind params also work now, and raiseErrorFn with csv driver. Added csv driver to QA process. -

    Better error checking in oci8 UpdateBlob() and UpdateBlobFile(). -

    Added TIME type to MySQL - patch by Manfred h9125297#zechine.wu-wien.ac.at -

    Prepare/Execute implemented for Interbase/Firebird -

    Changed some regular expressions to be anchored by /^ $/ for speed. -

    Added UnixTimeStamp() and UnixDate() to ADOConnection(). Now these functions - are in both ADOConnection and ADORecordSet classes. -

    Empty recordsets were not cached - fixed. -

    Thanks to Gaetano Giunta (g.giunta#libero.it) for the oci8 code review. We - didn't agree on everything, but i hoped we agreed to disagree! -

    1.90 6 April 2002

    -

    Now all database drivers support fetch modes ADODB_FETCH_NUM and ADODB_FETCH_ASSOC, though - still not fully tested. Eg. Frontbase, Sybase, Informix. -

    NextRecordSet() support for mssql. Contributed by "Sven Axelsson" sven.axelsson#bokochwebb.se -

    Added blob support for SQL Anywhere. Contributed by Wade Johnson wade#wadejohnson.de -

    Fixed some security loopholes in server.php. Server.php also supports fetch mode. -

    Generalized GenID() to support odbc and mssql drivers. Mssql no longer generates GUID's. -

    Experimental RowLock($table,$where) for mssql. -

    Properly implemented Prepare() in oci8 and ODBC. -

    Added Bind() support to oci8 to support Prepare(). -

    Improved error handler. Catches CacheExecute() and GenID() errors now. -

    Now if you are running php from the command line, debugging messages do not output html formating. -Not 100% complete, but getting there. -

    1.81 22 March 2002

    -

    Restored default $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT for backward compatibility. -

    SelectLimit for oci8 improved - Our FIRST_ROWS optimization now does not overwrite existing hint. -

    New Sybase SQL Anywhere driver. Contributed by Wade Johnson wade#wadejohnson.de -

    1.80 15 March 2002

    -

    Redesigned directory structure of ADOdb files. Added new driver directory where -all database drivers reside. -

    Changed caching algorithm to create subdirectories. Now we scale better. -

    Informix driver now supports insert_id(). Contribution by "Andrea Pinnisi" pinnisi#sysnet.it -

    Added experimental ISO date and FetchField support for informix. -

    Fixed a quoting bug in Execute() with bind parameters, causing problems with blobs. -

    Mssql driver speedup by 10-15%. -

    Now in CacheExecute($secs2cache,$sql,...), $secs2cache is optional. If missing, it will -take the value defined in $connection->cacheSecs (default is 3600 seconds). Note that -CacheSelectLimit(), the secs2cache is still compulsory - sigh. -

    Sybase SQL Anywhere driver (using ODBC) contributed by Wade Johnson wade#wadejohnson.de -

    1.72 8 March 2002

    -

    Added @ when returning Fields() to prevent spurious error - "Michael William Miller" mille562#pilot.msu.edu -

    MetaDatabases() for postgres contributed by Phil pamelant#nerim.net -

    Mitchell T. Young (mitch#youngfamily.org) contributed informix driver. -

    Fixed rs2html() problem. I cannot reproduce, so probably a problem with pre PHP 4.1.0 versions, - when supporting new ADODB_FETCH_MODEs. -

    Mattia Rossi (mattia#technologist.com) contributed BlobDecode() and UpdateBlobFile() for postgresql - using the postgres specific pg_lo_import()/pg_lo_open() - i don't use them but hopefully others will - find this useful. See this posting - for an example of usage. -

    Added UpdateBlobFile() for uploading files to a database. -

    Made UpdateBlob() compatible with oci8po driver. -

    Added noNullStrings support to oci8 driver. Oracle changes all ' ' strings to nulls, - so you need to set strings to ' ' to prevent the nullifying of strings. $conn->noNullStrings = true; - will do this for you automatically. This is useful when you define a char column as NOT NULL. -

    Fixed UnixTimeStamp() bug - wasn't setting minutes and seconds properly. Patch from Agusti Fita i Borrell agusti#anglatecnic.com. -

    Toni Tunkkari added patch for sybase dates. Problem with spaces in day part of date fixed. -

    1.71 18 Jan 2002

    -

    Sequence start id support. Now $conn->Gen_ID('seqname', 50) to start sequence from 50. -

    CSV driver fix for selectlimit, from Andreas - akaiser#vocote.de. -

    Gam3r spotted that a global variable was undefined in the session handler. -

    Mssql date regex had error. Fixed - reported by Minh Hoang vb_user#yahoo.com. -

    DBTimeStamp() and DBDate() now accept iso dates and unix timestamps. This means -that the PostgreSQL handling of dates in GetInsertSQL() and GetUpdateSQL() can -be removed. Also if these functions are passed '' or null or false, we return a SQL null. -

    GetInsertSQL() and GetUpdateSQL() now accept a new parameter, $magicq to -indicate whether quotes should be inserted based on magic quote settings - suggested by -dj#4ict.com. -

    Reformated docs slightly based on suggestions by Chris Small. -

    1.65 28 Dec 2001

    -

    Fixed borland_ibase class naming bug. -

    Now instead of using $rs->fields[0] internally, we use reset($rs->fields) so - that we are compatible with ADODB_FETCH_ASSOC mode. Reported by Nico S. -

    Changed recordset constructor and _initrs() for oci8 so that it returns the field definitions even - if no rows in the recordset. Reported by Rick Hickerson (rhickers#mv.mv.com). -

    Improved support for postgresql in GetInsertSQL and GetUpdateSQL by - "mike" mike#partner2partner.com and "Ryan Bailey" rebel#windriders.com -

    1.64 20 Dec 2001

    -

    Danny Milosavljevic <danny.milo#gmx.net> added some patches for MySQL error handling -and displaying default values. -

    Fixed some ADODB_FETCH_BOTH inconsistencies in odbc and interbase. -

    Added more tests to test suite to cover ADODB_FETCH_* and ADODB_ERROR_HANDLER. -

    Added firebird (ibase) driver -

    Added borland_ibase driver for interbase 6.5 -

    1.63 13 Dec 2001

    -Absolute to the adodb-lib.inc.php file not set properly. Fixed.

    - -

    1.62 11 Dec 2001

    -

    Major speedup of ADOdb for low-end web sites by reducing the php code loading and compiling -cycle. We conditionally compile not so common functions. -Moved csv code to adodb-csvlib.inc.php to reduce adodb.inc.php parsing. This file -is loaded only when the csv/proxy driver is used, or CacheExecute() is run. -Also moved PageExecute(), GetSelectSQL() and GetUpdateSQL() core code to adodb-lib.inc.php. -This reduced the 70K main adodb.inc.php file to 55K, and since at least 20K of the file -is comments, we have reduced 50K of code in adodb.inc.php to 35K. There - should be 35% reduction in memory and thus 35% speedup in compiling the php code for the -main adodb.inc.php file. -

    Highly tuned SelectLimit() for oci8 for massive speed improvements on large files. -Selecting 20 rows starting from the 20,000th row of a table is now 7 times faster. -Thx to Tomas V V Cox. -

    Allow . and # in table definitions in GetInsertSQL and GetUpdateSQL. - See ADODB_TABLE_REGEX constant. Thx to Ari Kuorikoski. -

    Added ADODB_PREFETCH_ROWS constant, defaulting to 10. This determines the number -of records to prefetch in a SELECT statement. Only used by oci8.

    -

    Added high portability Oracle class called oci8po. This uses ? for bind variables, and -lower cases column names.

    -

    Now all database drivers support $ADODB_FETCH_MODE, including interbase, ado, and odbc: -ADODB_FETCH_NUM and ADODB_FETCH_ASSOC. ADODB_FETCH_BOTH is not fully implemented for all -database drivers. -

    1.61 Nov 2001

    -

    Added PO_RecordCount() and PO_Insert_ID(). PO stands for portable. Pablo Roca - [pabloroca#mvps.org]

    -

    GenID now returns 0 if not available. Safer is that you should check $conn->hasGenID - for availability.

    -

    M'soft ADO we now correctly close recordset in _close() peterd#telephonetics.co.uk

    -

    MSSQL now supports GenID(). It generates a 16-byte GUID from mssql newid() - function.

    -

    Changed ereg_replace to preg_replace in SelectLimit. This is a fix for mssql. - Ereg doesn't support t or n! Reported by marino Carlos xaplo#postnuke-espanol.org

    -

    Added $recordset->connection. This is the ADOConnection object for the recordset. -Works with cached and normal recordsets. Surprisingly, this had no affect on performance!

    -

    1.54 15 Nov 2001

    -Fixed some more bugs in PageExecute(). I am getting sick of bug in this and will have to -reconsider my QA here. The main issue is that I don't use PageExecute() and -to check whether it is working requires a visual inspection of the html generated currently. -It is possible to write a test script but it would be quite complicated :( -

    More speedups of SelectLimit() for DB2, Oci8, access, vfp, mssql. -

    - -

    1.53 7 Nov 2001

    -Added support for ADODB_FETCH_ASSOC for ado and odbc drivers.

    -Tuned GetRowAssoc(false) in postgresql and mysql.

    -Stephen Van Dyke contributed ADOdb icon, accepted with some minor mods.

    -Enabled Affected_Rows() for postgresql

    -Speedup for Concat() using implode() - Benjamin Curtis ben_curtis#yahoo.com

    -Fixed some more bugs in PageExecute() to prevent infinite loops

    -

    1.52 5 Nov 2001

    -Spelling error in CacheExecute() caused it to fail. $ql should be $sql in line 625!

    -Added fixes for parsing [ and ] in GetUpdateSQL(). -

    1.51 5 Nov 2001

    -

    Oci8 SelectLimit() speedup by using OCIFetch(). -

    Oci8 was mistakenly reporting errors when $db->debug = true. -

    If a connection failed with ODBC, it was not correctly reported - fixed. -

    _connectionID was inited to -1, changed to false. -

    Added $rs->FetchRow(), to simplify API, ala PEAR DB -

    Added PEAR DB compat mode, which is still faster than PEAR! See adodb-pear.inc.php. -

    Removed postgres pconnect debugging statement. -

    1.50 31 Oct 2001

    -

    ADOdbConnection renamed to ADOConnection, and ADOdbFieldObject to ADOFieldObject. -

    PageExecute() now checks for empty $rs correctly, and the errors in the docs on this subject have been fixed. -

    odbc_error() does not return 6 digit error correctly at times. Implemented workaround. -

    Added ADORecordSet_empty class. This will speedup INSERTS/DELETES/UPDATES because the return -object created is much smaller. -

    Added Prepare() to odbc, and oci8 (but doesn't work properly for oci8 still). -

    Made pgsql a synonym for postgre7, and changed SELECT LIMIT to use OFFSET for compat with -postgres 7.2. -

    Revised adodb-cryptsession.php thanks to Ari. -

    Set resources to false on _close, to force freeing of resources. -

    Added adodb-errorhandler.inc.php, adodb-errorpear.inc.php and raiseErrorFn on Freek's urging. -

    GetRowAssoc($toUpper=true): $toUpper added as default. -

    Errors when connecting to a database were not captured formerly. Now we do it correctly. -

    1.40 19 September 2001

    -

    PageExecute() to implement page scrolling added. Code and idea by Iván Oliva.

    -

    Some minor postgresql fixes.

    -

    Added sequence support using GenID() for postgresql, oci8, mysql, interbase.

    -

    Added UpdateBlob support for interbase (untested).

    -

    Added encrypted sessions (see adodb-cryptsession.php). By Ari Kuorikoski <kuoriari#finebyte.com>

    -

    1.31 21 August 2001

    -

    Many bug fixes thanks to "GaM3R (Cameron)" <gamr#outworld.cx>. Some session changes due to Gam3r. -

    Fixed qstr() to quote also. -

    rs2html() now pretty printed. -

    Jonathan Younger jyounger#unilab.com contributed the great idea GetUpdateSQL() and GetInsertSQL() which -generates SQL to update and insert into a table from a recordset. Modify the recordset fields -array, then can this function to generate the SQL (the SQL is not executed). -

    "Nicola Fankhauser" <nicola.fankhauser#couniq.com> found some bugs in date handling for mssql.

    -

    Added minimal Oracle support for LOBs. Still under development.

    -Added $ADODB_FETCH_MODE so you can control whether recordsets return arrays which are -numeric, associative or both. This is a global variable you set. Currently only MySQL, Oci8, Postgres -drivers support this. -

    PostgreSQL properly closes recordsets now. Reported by several people. -

    -Added UpdateBlob() for Oracle. A hack to make it easier to save blobs. -

    -Oracle timestamps did not display properly. Fixed. -

    1.20 6 June 2001

    -

    Now Oracle can connect using tnsnames.ora or server and service name

    -

    Extensive Oci8 speed optimizations. -Oci8 code revised to support variable binding, and /*+ FIRST_ROWS */ hint.

    -

    Worked around some 4.0.6 bugs in odbc_fetch_into().

    -

    Paolo S. Asioli paolo.asioli#libero.it suggested GetRowAssoc().

    -

    Escape quotes for oracle wrongly set to '. Now '' is used.

    -

    Variable binding now works in ODBC also.

    -

    Jumped to version 1.20 because I don't like 13 :-)

    -

    1.12 6 June 2001

    -

    Changed $ADODB_DIR to ADODB_DIR constant to plug a security loophole.

    -

    Changed _close() to close persistent connections also. Prevents connection leaks.

    -

    Major revision of oracle and oci8 drivers. -Added OCI_RETURN_NULLS and OCI_RETURN_LOBS to OCIFetchInto(). BLOB, CLOB and VARCHAR2 recognition -in MetaType() improved. MetaColumns() returns columns in correct sort order.

    -

    Interbase timestamp input format was wrong. Fixed.

    -

    1.11 20 May 2001

    -

    Improved file locking for Windows.

    -

    Probabilistic flushing of cache to avoid avalanche updates when cache timeouts.

    -

    Cached recordset timestamp not saved in some scenarios. Fixed.

    -

    1.10 19 May 2001

    -

    Added caching. CacheExecute() and CacheSelectLimit(). -

    Added csv driver. See http://php.weblogs.com/ADODB_csv. -

    Fixed SelectLimit(), SELECT TOP not working under certain circumstances. -

    Added better Frontbase support of MetaTypes() by Frank M. Kromann. -

    1.01 24 April 2001

    -

    Fixed SelectLimit bug. not quoted properly. -

    SelectLimit: SELECT TOP -1 * FROM TABLE not support by Microsoft. Fixed.

    -

    GetMenu improved by glen.davies#cce.ac.nz to support multiple hilited items

    -

    FetchNextObject() did not work with only 1 record returned. Fixed bug reported by $tim#orotech.net

    -

    Fixed mysql field max_length problem. Fix suggested by Jim Nicholson (jnich#att.com)

    -

    1.00 16 April 2001

    -

    Given some brilliant suggestions on how to simplify ADOdb by akul. You no longer need to -setup $ADODB_DIR yourself, and ADOLoadCode() is automatically called by ADONewConnection(), -simplifying the startup code.

    -

    FetchNextObject() added. Suggested by Jakub Marecek. This makes FetchObject() obsolete, as -this is more flexible and powerful.

    -

    Misc fixes to SelectLimit() to support Access (top must follow distinct) and Fields() -in the array recordset. From Reinhard Balling.

    -

    0.96 27 Mar 2001

    -

    ADOConnection Close() did not return a value correctly. Thanks to akul#otamedia.com.

    -

    When the horrible magic_quotes is enabled, back-slash () is changed to double-backslash (\). -This doesn't make sense for Microsoft/Sybase databases. We fix this in qstr().

    -

    Fixed Sybase date problem in UnixDate() thanks to Toni Tunkkari. Also fixed MSSQL problem -in UnixDate() - thanks to milhouse31#hotmail.com.

    -

    MoveNext() moved to leaf classes for speed in MySQL/PostgreSQL. 10-15% speedup.

    -

    Added null handling in bindInputArray in Execute() -- Ron Baldwin suggestion.

    -

    Fixed some option tags. Thanks to john#jrmstudios.com.

    -

    0.95 13 Mar 2001

    -

    Added postgres7 database driver which supports LIMIT and other version 7 stuff in the future.

    -

    Added SelectLimit to ADOConnection to simulate PostgreSQL's "select * from table limit 10 offset 3". -Added helper function GetArrayLimit() to ADORecordSet.

    -

    Fixed mysql metacolumns bug. Thanks to Freek Dijkstra (phpeverywhere#macfreek.com).

    -

    Also many PostgreSQL changes by Freek. He almost rewrote the whole PostgreSQL driver!

    -

    Added fix to input parameters in Execute for non-strings by Ron Baldwin.

    -

    Added new metatype, X for TeXt. Formerly, metatype B for Blob also included -text fields. Now 'B' is for binary/image data. 'X' for textual data.

    -

    Fixed $this->GetArray() in GetRows().

    -

    Oracle and OCI8: 1st parameter is always blank -- now warns if it is filled.

    -

    Now hasLimit and hasTop added to indicate whether -SELECT * FROM TABLE LIMIT 10 or SELECT TOP 10 * FROM TABLE are supported.

    -

    0.94 04 Feb 2001

    -

    Added ADORecordSet::GetRows() for compatibility with Microsoft ADO. Synonym for GetArray().

    -

    Added new metatype 'R' to represent autoincrement numbers.

    -

    Added ADORecordSet.FetchObject() to return a row as an object.

    -

    Finally got a Linux box to test PostgreSql. Many fixes.

    -

    Fixed copyright misspellings in 0.93.

    -

    Fixed mssql MetaColumns type bug.

    -

    Worked around odbc bug in PHP4 for sessions.

    -

    Fixed many documentation bugs (affected_rows, metadatabases, qstr).

    -

    Fixed MySQL timestamp format (removed comma).

    -

    Interbase driver did not call ibase_pconnect(). Fixed.

    -

    0.93 18 Jan 2002

    -

    Fixed GetMenu bug.

    -

    Simplified Interbase commit and rollback.

    -

    Default behaviour on closing a connection is now to rollback all active transactions.

    -

    Added field object handling for array recordset for future XML compatibility.

    -

    Added arr2html() to convert array to html table.

    -

    0.92 2 Jan 2002

    -

    Interbase Commit and Rollback should be working again.

    -

    Changed initialisation of ADORecordSet. This is internal and should not affect users. We -are doing this to support cached recordsets in the future.

    - -

    Implemented ADORecordSet_array class. This allows you to simulate a database recordset -with an array.

    -

    Added UnixDate() and UnixTimeStamp() to ADORecordSet.

    -

    0.91 21 Dec 2000

    -

    Fixed ODBC so ErrorMsg() is working.

    -

    Worked around ADO unrecognised null (0x1) value problem in COM.

    -

    Added Sybase support for FetchField() type

    -

    Removed debugging code and unneeded html from various files

    -

    Changed to javadoc style comments to adodb.inc.php.

    -

    Added maxsql as synonym for mysqlt

    -

    Now ODBC downloads first 8K of blob by default -

    0.90 15 Nov 2000

    -

    Lots of testing of Microsoft ADO. Should be more stable now.

    -

    Added $ADODB_COUNTREC. Set to false for high speed selects.

    -

    Added Sybase support. Contributed by Toni Tunkkari (toni.tunkkari#finebyte.com). Bug in Sybase - API: GetFields is unable to determine date types.

    -

    Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.

    -

    Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent - empty dates.

    -

    Added MetaColumns($table) that returns an array of ADOFieldObject's listing - the columns of a table.

    -

    Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.

    -

    Added adodb-session.php for session support.

    -

    0.80 30 Nov 2000

    -

    Added support for charSet for interbase. Implemented MetaTables for most databases. - PostgreSQL more extensively tested.

    -

    0.71 22 Nov 2000

    -

    Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier.

    -

    0.70 15 Nov 2000

    -

    Calls by reference have been removed (call_time_pass_reference=Off) to ensure compatibility with future versions of PHP, -except in Oracle 7 driver due to a bug in php_oracle.dll.

    -

    PostgreSQL database driver contributed by Alberto Cerezal (acerezalp#dbnet.es). -

    -

    Oci8 driver for Oracle 8 contributed by George Fourlanos (fou#infomap.gr).

    -

    Added mysqlt database driver to support MySQL 3.23 which has transaction - support.

    -

    Oracle default date format (DD-MON-YY) did not match ADOdb default date format (which is YYYY-MM-DD). Use ALTER SESSION to force the default date.

    -

    Error message checking is now included in test suite.

    -

    MoveNext() did not check EOF properly -- fixed.

    -

    0.60 Nov 8 2000

    -

    Fixed some constructor bugs in ODBC and ADO. Added ErrorNo function to ADOConnection - class.

    -

    0.51 Oct 18 2000

    -

    Fixed some interbase bugs.

    -

    0.50 Oct 16 2000

    -

    Interbase commit/rollback changed to be compatible with PHP 4.03.

    -

    CommitTrans( ) will now return true if transactions not supported.

    -

    Conversely RollbackTrans( ) will return false if transactions not supported. -

    -

    0.46 Oct 12

    -Many Oracle compatibility issues fixed. -

    0.40 Sept 26

    -

    Many bug fixes

    -

    Now Code for BeginTrans, CommitTrans and RollbackTrans is working. So is the Affected_Rows -and Insert_ID. Added above functions to test.php.

    -

    ADO type handling was busted in 0.30. Fixed.

    -

    Generalised Move( ) so it works will all databases, including ODBC.

    -

    0.30 Sept 18

    -

    Renamed ADOLoadDB to ADOLoadCode. This is clearer.

    -

    Added BeginTrans, CommitTrans and RollbackTrans functions.

    -

    Added Affected_Rows() and Insert_ID(), _affectedrows() and _insertID(), ListTables(), - ListDatabases(), ListColumns().

    -

    Need to add New_ID() and hasInsertID and hasAffectedRows, autoCommit

    -

    0.20 Sept 12

    -

    Added support for Microsoft's ADO.

    -

    Added new field to ADORecordSet -- canSeek

    -

    Added new parameter to _fetch($ignore_fields = false). Setting to true will - not update fields array for faster performance.

    -

    Added new field to ADORecordSet/ADOConnection -- dataProvider to indicate whether - a class is derived from odbc or ado.

    -

    Changed class ODBCFieldObject to ADOFieldObject -- not documented currently.

    -

    Added benchmark.php and testdatabases.inc.php to the test suite.

    -

    Added to ADORecordSet FastForward( ) for future high speed scrolling. Not documented.

    -

    Realised that ADO's Move( ) uses relative positioning. ADOdb uses absolute. -

    -

    0.10 Sept 9 2000

    -

    First release

    +Old Changelog: ADOdb +

    Old Changelog

    + +

    3.92 22 Sept 2003 +

    Added GetAssoc and CacheGetAssoc to connection object. +

    Removed TextMax and CharMax functions from adodb.inc.php. +

    HasFailedTrans() returned false when trans failed. Fixed. +

    Moved perf driver classes into adodb/perf/*.php. +

    Misc improvements to performance monitoring, including UI(). +

    RETVAL in mssql Parameter(), we do not append @ now. +

    Added Param($name) to connection class, returns '?' or ":$name", for defining + bind parameters portably. +

    LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8 + _stmt and _affectedrows() bugs. +

    Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT + stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also + added new $conn->datetime field to oci8, controls whether MetaType() returns + 'D' ($this->datetime==false) or 'T' ($this->datetime == true) for DATE type. +

    Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php. +

    Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL(). +

    Tuned include_once handling to reduce file-system checking overhead. +

    3.91 9 Sept 2003 +

    Only released to InterAkt +

    Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory + for driver instantiation. +

    Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com +

    Added portable substr support. +

    Now rs2html() has new parameter, $echo. Set to false to return $html instead + of echoing it. +

    3.90 5 Sept 2003 +

    First beta of performance monitoring released. +

    MySQL supports MetaTable() masking. +

    Fixed key_exists() bug in adodb-lib.inc.php +

    Added sp_executesql Prepare() support to mssql. +

    Added bind support to db2. +

    Added swedish language file - Christian Tiberg" christian#commsoft.nu +

    Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich. +

    Left join setting for oci8 was wrong. Thx to johnwilk#juno.com +

    3.80 27 Aug 2003 +

    Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility. +

    Added matching mask for MetaTables. Only for oci8, mssql and postgres currently. +

    Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano. +

    Added better debugging for Smart Transactions. +

    Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP. +

    ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define + it after including adodb.inc.php. +

    Added portugese (brazilian) to languages. Thx to "Levi Fukumori". +

    Removed arg3 parameter from Execute/SelectLimit/Cache* functions. +

    Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() + to note change in sql query counting with 2-d arrays. +

    Added MONEY to MetaType in PostgreSQL. +

    Added more debugging output to CacheFlush(). +

    3.72 9 Aug 2003 +

    Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes + and does the right thing... +

    Fixed CacheFlush() bug - Thx to martin#gmx.de +

    Walt Boring contributed MetaForeignKeys for postgres7. +

    _fetch() called _BlobDecode() wrongly in interbase. Fixed. +

    adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980 +

    3.71 4 Aug 2003 +

    The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner + == false. +

    Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru. +

    Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com. +

    Error handling in oci8 bugfix - if there was an error in Execute(), then when + calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but + the 2nd call would return no error. +

    Error handling in odbc bugfix. ODBC would always return the last error, even + if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to + 0 everytime before CacheExecute() and Execute(). +

    3.70 29 July 2003 +

    Added new SQLite driver. Tested on PHP 4.3 and PHP 5. +

    Added limited "sapdb" driver support - mainly date support. +

    The oci8 driver did not identify NUMBER with no defined precision correctly. +

    Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls + in GetInsertSQL/GetUpdateSQL. +

    DBDate() and DBTimeStamp() format for postgresql had problems. Fixed. +

    Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit. +

    Added charset support to postgresql. Thx to Julian Tarkhanov. +

    Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS) +

    Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn. +

    adodb-cryptsession.php includes wrong. Fixed. +

    Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8. +

    Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. +

    adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause checking + in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. +

    Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring. +

    Upgraded to adodb-xmlschema.inc.php 0.0.2. +

    NConnect for mysql now returns value. Thx to Dennis Verspuij. +

    ADODB_FETCH_BOTH support added to interbase/firebird. +

    Czech language file contributed by Kamil Jakubovic jake#host.sk. +

    PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec. +

    Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it +

    ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed. +

    3.60 16 June 2003 +

    We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with + mssql driver. +

    The property $emptyDate missing from connection class. Also changed 1903 to + constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. +

    ADOdb speedup optimization - we now return all arrays by reference. +

    Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. + Suggested by vincent. +

    Added GetArray() to connection class. +

    Added not_null check in informix metacolumns(). +

    Connection parameters for postgresql did not work correctly when port was defined. +

    DB2 is now a tested driver, making adodb 100% compatible. Extensive changes + to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching + to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() + fixes. +

    The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed. +

    Some bugs in adodb_backtrace() fixed. +

    Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql + properly. +

    MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions + to odbc MetaColumns() for vfp and db2 compat. +

    Added unsigned support to mysql datadict class. Thx to iamsure. +

    Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to + Josh R, Night_Wulfe#hotmail.com. +

    ChangeTableSQL contributed by Florian Buzin. +

    The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with + mssql driver. +

    + +

    3.50 19 May 2003

    +

    Fixed mssql compat with FreeTDS. FreeTDS does not implement mssql_fetch_assoc(). +

    Merged back connection and recordset code into adodb.inc.php. +

    ADOdb sessions using oracle clobs contributed by achim.gosse#ddd.de. See adodb-session-clob.php. +

    Added /s modifier to preg_match everywhere, which ensures that regex does not + stop at /n. Thx Pao-Hsi Huang. +

    Fixed error in metacolumns() for mssql. +

    Added time format support for SQLDate. +

    Image => B added to metatype. +

    MetaType now checks empty($this->blobSize) instead of empty($this). +

    Datadict has beta support for informix, sybase (mapped to mssql), db2 and generic + (which is a fudge). +

    BlobEncode for postgresql uses pg_escape_bytea, if available. Needed for compat + with 7.3. +

    Added $ADODB_LANG, to support multiple languages in MetaErrorMsg(). +

    Datadict can now parse table definition as declarative text. +

    For DataDict, oci8 autoincrement trigger missing semi-colon. Fixed. +

    For DataDict, when REPLACE flag enabled, drop sequence in datadict for autoincrement + field in postgres and oci8.s +

    Postgresql defaults to template1 database if no database defined in connect/pconnect. +

    We now clear _resultid in postgresql if query fails. +

    3.40 19 May 2003

    +

    Added insert_id for odbc_mssql. +

    Modified postgresql UpdateBlobFile() because it did not work in safe mode. +

    Now connection object is passed to raiseErrorFn as last parameter. Needed by + StartTrans(). +

    Added StartTrans() and CompleteTrans(). It is recommended that you do not modify + transOff, but use the above functions. +

    oci8po now obeys ADODB_ASSOC_CASE settings. +

    Added virtualized error codes, using PEAR DB equivalents. Requires you to manually + include adodb-error.inc.php yourself, with MetaError() and MetaErrorMsg($errno). +

    GetRowAssoc for mysql and pgsql were flawed. Fix by Ross Smith. +

    Added to datadict types I1, I2, I4 and I8. Changed datadict type 'T' to map + to timestamp instead of datetime for postgresql. +

    Error handling in ExecuteSQLArray(), adodb-datadict.inc.php did not work. +

    We now auto-quote postgresql connection parameters when building connection + string. +

    Added session expiry notification. +

    We now test with odbc mysql - made some changes to odbc recordset constructor. +

    MetaColumns now special cases access and other databases for odbc. +

    3.31 17 March 2003

    +

    Added row checking for _fetch in postgres. +

    Added Interval type to MetaType for postgres. +

    Remapped postgres driver to call postgres7 driver internally. +

    Adorecordset_array::getarray() did not return array when nRows >= 0. +

    Postgresql: at times, no error message returned by pg_result_error() but error + message returned in pg_last_error(). Recoded again. +

    Interbase blob's now use chunking for updateblob. +

    Move() did not set EOF correctly. Reported by Jorma T. +

    We properly support mysql timestamp fields when we are creating mysql tables + using the data-dict interface. +

    Table regex includes backticks character now. +

    3.30 3 March 2003

    +

    Added $ADODB_EXTENSION and $ADODB_COMPAT_FETCH constant. +

    Made blank1stItem configurable using syntax "value:text" in GetMenu/GetMenu2. + Thx to Gabriel Birke. +

    Previously ADOdb differed from the Microsoft standard because it did not define + what to set $this->fields when EOF was reached. Now at EOF, ADOdb sets $this->fields + to false for all databases, which is consist with Microsoft's implementation. + Postgresql and mysql have always worked this way (in 3.11 and earlier). If you + are experiencing compatibility problems (and you are not using postgresql nor + mysql) on upgrading to 3.30, try setting the global variables $ADODB_COUNTRECS + = true (which is the default) and $ADODB_FETCH_COMPAT = true (this is a new + global variable). +

    We now check both pg_result_error and pg_last_error as sometimes pg_result_error + does not display anything. Iman Mayes +

    We no longer check for magic quotes gpc in Quote(). +

    Misc fixes for table creation in adodb-datadict.inc.php. Thx to iamsure. +

    Time calculations use adodb_time library for all negative timestamps due to + problems in Red Hat 7.3 or later. Formerly, only did this for Windows. +

    In mssqlpo, we now check if $sql in _query is a string before we change || + to +. This is to support prepared stmts. +

    Move() and MoveLast() internals changed to support to support EOF and $this->fields + change. +

    Added ADODB_FETCH_BOTH support to mssql. Thx to Angel Fradejas afradejas#mediafusion.es +

    We now check if link resource exists before we run mysql_escape_string in + qstr(). +

    Before we flock in csv code, we check that it is not a http url. +

    3.20 17 Feb 2003

    +

    Added new Data Dictionary classes for creating tables and indexes. Warning + - this is very much alpha quality code. The API can still change. See adodb/tests/test-datadict.php + for more info. +

    We now ignore $ADODB_COUNTRECS for mysql, because PHP truncates incomplete + recordsets when mysql_unbuffered_query() is called a second time. +

    Now postgresql works correctly when $ADODB_COUNTRECS = false. +

    Changed _adodb_getcount to properly support SELECT DISTINCT. +

    Discovered that $ADODB_COUNTRECS=true has some problems with prepared queries + - suspect PHP bug. +

    Now GetOne and GetRow run in $ADODB_COUNTRECS=false mode for better performance. +

    Added support for mysql_real_escape_string() and pg_escape_string() in qstr(). +

    Added an intermediate variable for mysql _fetch() and MoveNext() to store fields, + to prevent overwriting field array with boolean when mysql_fetch_array() returns + false. +

    Made arrays for getinsertsql and getupdatesql case-insensitive. Suggested by + Tim Uckun" tim#diligence.com +

    3.11 11 Feb 2003

    +

    Added check for ADODB_NEVER_PERSIST constant in PConnect(). If defined, then + PConnect() will actually call non-persistent Connect(). +

    Modified interbase to properly work with Prepare(). +

    Added $this->ibase_timefmt to allow you to change the date and time format. +

    Added support for $input_array parameter in CacheFlush(). +

    Added experimental support for dbx, which was then removed when i found that + it was slower than using native calls. +

    Added MetaPrimaryKeys for mssql and ibase/firebird. +

    Added new $trim parameter to GetCol and CacheGetCol +

    Uses updated adodb-time.inc.php 0.06. +

    3.10 27 Jan 2003 +

    Added adodb_date(), adodb_getdate(), adodb_mktime() and adodb-time.inc.php. +

    For interbase, added code to handle unlimited number of bind parameters. From + Daniel Hasan daniel#hasan.cl. +

    Added BlobDecode and UpdateBlob for informix. Thx to Fernando Ortiz. +

    Added constant ADODB_WINDOWS. If defined, means that running on Windows. +

    Added constant ADODB_PHPVER which stores php version as a hex num. Removed + $ADODB_PHPVER variable. +

    Felho Bacsi reported a minor white-space regular expression problem in GetInsertSQL. +

    Modified ADO to use variant to store _affectedRows +

    Changed ibase to use base class Replace(). Modified base class Replace() to + support ibase. +

    Changed odbc to auto-detect when 0 records returned is wrong due to bad odbc + drivers. +

    Changed mssql to use datetimeconvert ini setting only when 4.30 or later (does + not work in 4.23). +

    ExecuteCursor($stmt, $cursorname, $params) now accepts a new $params array + of additional bind parameters -- William Lovaton walovaton#yahoo.com.mx. +

    Added support for sybase_unbuffered_query if ADODB_COUNTRECS == false. Thx + to chuck may. +

    Fixed FetchNextObj() bug. Thx to Jorma Tuomainen. +

    We now use SCOPE_IDENTITY() instead of @@IDENTITY for mssql - thx to marchesini#eside.it +

    Changed postgresql movenext logic to prevent illegal row number from being + passed to pg_fetch_array(). +

    Postgresql initrs bug found by "Bogdan RIPA" bripa#interakt.ro $f1 accidentally + named $f +

    3.00 6 Jan 2003 +

    Fixed adodb-pear.inc.php syntax error. +

    Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages + that accept it. +

    Fixed _adodb_getcount() caching error. +

    Added sql to retrive table and column info for odbc_mssql. +

    2.91 3 Jan 2003 +

    Revised PHP version checking to use $ADODB_PHPVER with legal values 0x4000, + 0x4050, 0x4200, 0x4300. +

    Added support for bytea fields and oid blobs in postgres by allowing BlobDecode() + to detect and convert non-oid fields. Also added BlobEncode to postgres when + you want to encode oid blobs. +

    Added blobEncodeType property for connections to inform phpLens what encoding + method to use for blobs. +

    Added BlobDecode() and BlobEncode() to base ADOConnection class. +

    Added umask() to _gencachename() when creating directories. +

    Added charPage for ado drivers, so you can set the code page. +

    +$conn->charPage = CP_UTF8;
+$conn->Connect($dsn);
+
    +

    Modified _seek in mysql to check for num rows=0. +

    Added to metatypes new informix types for IDS 9.30. Thx Fernando Ortiz. +

    _maxrecordcount returned in CachePageExecute $rsreturn +

    Fixed sybase cacheselectlimit( ) problems +

    MetaColumns() max_length should use precision for types X and C for ms access. + Fixed. +

    Speedup of odbc non-SELECT sql statements. +

    Added support in MetaColumns for Wide Char types for ODBC. We halve max_length + if unicode/wide char. +

    Added 'B' to types handled by GetUpdateSQL/GetInsertSQL. +

    Fixed warning message in oci8 driver with $persist variable when using PConnect. +

    2.90 11 Dec 2002 +

    Mssql and mssqlpo and oci8po now support ADODB_ASSOC_CASE. +

    Now MetaType() can accept a field object as the first parameter. +

    New $arr = $db->ServerInfo( ) function. Returns $arr['description'] which + is the string description, and $arr['version']. +

    PostgreSQL and MSSQL speedups for insert/updates. +

    Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. + Each connection has independant fetchMode. +

    ADODB_ASSOC_CASE now defaults to 2, use native defaults. This is because we + would break backward compat for too many applications otherwise. +

    Patched encrypted sessions to use replace() +

    The qstr function supports quoting of nulls when escape character is \ +

    Rewrote bits and pieces of session code to check for time synch and improve + reliability. +

    Added property ADOConnection::hasTransactions = true/false; +

    Added CreateSequence and DropSequence functions +

    Found misplaced MoveNext() in adodb-postgres.inc.php. Fixed. +

    Sybase SelectLimit not reliable because 'set rowcount' not cached - fixed. +

    Moved ADOConnection to adodb-connection.inc.php and ADORecordSet to adodb-recordset.inc.php. + This allows us to use doxygen to generate documentation. Doxygen doesn't like + the classes in the main adodb.inc.php file for some mysterious reason. +

    2.50, 14 Nov 2002 +

    Added transOff and transCnt properties for disabling (transOff = true) and + tracking transaction status (transCnt>0). +

    Added inputarray handling into _adodb_pageexecute_all_rows - "Ross Smith" RossSmith#bnw.com. +

    Fixed postgresql inconsistencies in date handling. +

    Added support for mssql_fetch_assoc. +

    Fixed $ADODB_FETCH_MODE bug in odbc MetaTables() and MetaPrimaryKeys(). +

    Accidentally declared UnixDate() twice, making adodb incompatible with php + 4.3.0. Fixed. +

    Fixed pager problems with some databases that returned -1 for _currentRow on + MoveLast() by switching to MoveNext() in adodb-lib.inc.php. +

    Also fixed uninited $discard in adodb-lib.inc.php. +

    2.43, 25 Oct 2002

    +Added ADODB_ASSOC_CASE constant to better support ibase and odbc field names. +

    Added support for NConnect() for oracle OCINLogin. +

    Fixed NumCols() bug. +

    Changed session handler to use Replace() on write. +

    Fixed oci8 SelectLimit aggregate function bug again. +

    Rewrote pivoting code. +

    2.42, 4 Oct 2002

    +

    Fixed ibase_fetch() problem with nulls. Also interbase now does automatic blob + decoding, and is backward compatible. Suggested by Heinz Hombergs heinz#hhombergs.de. +

    Fixed postgresql MoveNext() problems when called repeatedly after EOF. Also + suggested by Heinz Hombergs. +

    PageExecute() does not rewrite queries if SELECT DISTINCT is used. Requested + by hans#velum.net +

    Added additional fixes to oci8 SelectLimit handling with aggregate functions + - thx to Christian Bugge for reporting the problem. +

    2.41, 2 Oct 2002

    +

    Fixed ADODB_COUNTRECS bug in odbc. Thx to Joshua Zoshi jzoshi#hotmail.com. +

    Increased buffers for adodb-csvlib.inc.php for extremely long sql from 8192 + to 32000. +

    Revised pivottable.inc.php code. Added better support for aggregate fields. +

    Fixed mysql text/blob types problem in MetaTypes base class - thx to horacio + degiorgi. +

    Added SQLDate($fmt,$date) function, which allows an sql date format string + to be generated - useful for group by's. +

    Fixed bug in oci8 SelectLimit when offset>100. +

    2.40 4 Sept 2002

    +

    Added new NLS_DATE_FORMAT property to oci8. Suggested by Laurent NAVARRO ln#altidev.com +

    Now use bind parameters in oci8 selectlimit for better performance. +

    Fixed interbase replaceQuote for dialect != 1. Thx to "BEGUIN Pierre-Henri + - INFOCOB" phb#infocob.com. +

    Added white-space check to QA. +

    Changed unixtimestamp to support fractional seconds (we always round down/floor + the seconds). Thanks to beezly#beezly.org.uk. +

    Now you can set the trigger_error type your own user-defined type in adodb-errorhandler.inc.php. + Suggested by Claudio Bustos clbustos#entelchile.net. +

    Added recordset filters with rsfilter.inc.php. +

    $conn->_rs2rs does not create a new recordset when it detects it is of type + array. Some trickery there as there seems to be a bug in Zend Engine +

    Added render_pagelinks to adodb-pager.inc.php. Code by "Pablo Costa" pablo#cbsp.com.br. +

    MetaType() speedup in adodb.inc.php by using hashing instead of switch. Best + performance if constant arrays are supported, as they are in PHP5. +

    adodb-session.php now updates only the expiry date if the crc32 check indicates + that the data has not been modified. +

    2.31 20 Aug 2002

    +

    Made changes to pivottable.inc.php due to daniel lucuzaeu's suggestions (we sum the pivottable column if desired). +

    Fixed ErrorNo() in postgres so it does not depend on _errorMsg property. +

    Robert Tuttle added support for oracle cursors. See ExecuteCursor(). +

    Fixed Replace() so it works with mysql when updating record where data has not changed. Reported by +Cal Evans (cal#calevans.com). +

    2.30 1 Aug 2002

    +

    Added pivottable.inc.php. Thanks to daniel.lucazeau#ajornet.com for the original + concept. +

    Added ADOConnection::outp($msg,$newline) to output error and debugging messages. Now +you can override this using the ADODB_OUTP constant and use your own output handler. +

    Changed == to === for 'null' comparison. Reported by ericquil#yahoo.com +

    Fixed mssql SelectLimit( ) bug when distinct used. +

    2.30 1 Aug 2002

    +

    New GetCol() and CacheGetCol() from ross#bnw.com that returns the first field as a 1 dim array. +

    We have an empty recordset, but RecordCount() could return -1. Fixed. Reported by "Jonathan Polansky" jonathan#polansky.com. +

    We now check for session variable changes using strlen($sessval).crc32($sessval). +Formerly we only used crc32(). +

    Informix SelectLimit() problem with $ADODB_COUNTRECS fixed. +

    Fixed informix SELECT FIRST x DISTINCT, and not SELECT DISTINCT FIRST x - reported by F Riosa +

    Now default adodb error handlers ignores error if @ used. +

    If you set $conn->autoRollback=true, we auto-rollback persistent connections for odbc, mysql, oci8, mssql. +Default for autoRollback is false. No need to do so for postgres. +As interbase requires a transaction id (what a flawed api), we don't do it for interbase. +

    Changed PageExecute() to use non-greedy preg_match when searching for "FROM" keyword. +

    2.20 9 July 2002

    +

    Added CacheGetOne($secs2cache,$sql), CacheGetRow($secs2cache,$sql), CacheGetAll($secs2cache,$sql). +

    Added $conn->OffsetDate($dayFraction,$date=false) to generate sql that calcs + date offsets. Useful for scheduling appointments. +

    Added connection properties: leftOuter, rightOuter that hold left and right + outer join operators. +

    Added connection property: ansiOuter to indicate whether ansi outer joins supported. +

    New driver mssqlpo, the portable mssql driver, which converts string + concat operator from || to +. +

    Fixed ms access bug - SelectLimit() did not support ties - fixed. +

    Karsten Kraus (Karsten.Kraus#web.de), contributed error-handling code to ADONewConnection. + Unfortunately due to backward compat problems, had to rollback most of the changes. +

    Added new parameter to GetAssoc() to allow returning an array of key-value pairs, +ignoring any additional columns in the recordset. Off by default. +

    Corrected mssql $conn->sysDate to return only date using convert(). +

    CacheExecute() improved debugging output. +

    Changed rs2html() so newlines are converted to BR tags. Also optimized rs2html() based +on feedback by "Jerry Workman" jerry#mtncad.com. +

    Added support for Replace() with Interbase, using DELETE and INSERT. +

    Some minor optimizations (mostly removing & references when passing arrays). +

    Changed GenID() to allows id's larger than the size of an integer. +

    Added force_session property to oci8 for better updateblob() support. +

    Fixed PageExecute() which did not work properly with sql containing GROUP BY. +

    2.12 12 June 2002

    +

    Added toexport.inc.php to export recordsets in CSV and tab-delimited format. +

    CachePageExecute() does not work - fixed - thx John Huong. +

    Interbase aliases not set properly in FetchField() - fixed. Thx Stefan Goethals. +

    Added cache property to adodb pager class. The number of secs to cache recordsets. +

    SQL rewriting bug in pageexecute() due to skipping of newlines due to missing /s modifier. Fixed. +

    Max size of cached recordset due to a bug was 256000 bytes. Fixed. +

    Speedup of 1st invocation of CacheExecute() by tuning code. +

    We compare $rewritesql with $sql in pageexecute code in case of rewrite failure. +

    2.11 7 June 2002

    +

    Fixed PageExecute() rewrite sql problem - COUNT(*) and ORDER BY don't go together with + mssql, access and postgres. Thx to Alexander Zhukov alex#unipack.ru +

    DB2 support for CHARACTER type added - thx John Huong huongch#bigfoot.com +

    For ado, $argProvider not properly checked. Fixed - kalimero#ngi.it +

    Added $conn->Replace() function for update with automatic insert if the record does not exist. + Supported by all databases except interbase. +

    2.10 4 June 2002

    +

    Added uniqueSort property to indicate mssql ORDER BY cols must be unique. +

    Optimized session handler by crc32 the data. We only write if session data has changed. +

    adodb_sess_read in adodb-session.php now returns ''correctly - thanks to Jorma Tuomainen, webmaster#wizactive.com +

    Mssql driver did not throw EXECUTE errors correctly because ErrorMsg() and ErrorNo() called in wrong order. +Pointed out by Alexios Fakos. Fixed. +

    Changed ado to use client cursors. This fixes BeginTran() problems with ado. +

    Added handling of timestamp type in ado. +

    Added to ado_mssql support for insert_id() and affected_rows(). +

    Added support for mssql.datetimeconvert=0, available since php 4.2.0. +

    Made UnixDate() less strict, so that the time is ignored if present. +

    Changed quote() so that it checks for magic_quotes_gpc. +

    Changed maxblobsize for odbc to default to 64000. +

    2.00 13 May 2002

    +

    Added drivers informix72 for pre-7.3 versions, and oci805 for + oracle 8.0.5, and postgres64 for postgresql 6.4 and earlier. The postgres and postgres7 drivers + are now identical. +

    Interbase now partially supports ADODB_FETCH_BOTH, by defaulting to ASSOC mode. +

    Proper support for blobs in mssql. Also revised blob support code +is base class. Now UpdateBlobFile() calls UpdateBlob() for consistency. +

    Added support for changed odbc_fetch_into api in php 4.2.0 +with $conn->_has_stupid_odbc_fetch_api_change. +

    Fixed spelling of tablock locking hint in GenID( ) for mssql. +

    Added RowLock( ) to several databases, including oci8, informix, sybase, etc. + Fixed where error in mssql RowLock(). +

    Added sysDate and sysTimeStamp properties to most database drivers. These are the sql +functions/constants for that database that return the current date and current timestamp, and +are useful for portable inserts and updates. +

    Support for RecordCount() caused date handling in sybase and mssql to break. +Fixed, thanks to Toni Tunkkari, by creating derived classes for ADORecordSet_array for +both databases. Generalized using arrayClass property. Also to support RecordCount(), +changed metatype handling for ado drivers. Now the type returned in FetchField + is no longer a number, but the 1-char data type returned by MetaType. + At the same time, fixed a lot of date handling. Now mssql support dmy and mdy date formats. +Also speedups in sybase and mssql with preg_match and ^ in date/timestamp handling. +Added support in sybase and mssql for 24 hour clock in timestamps (no AM/PM). +

    Extensive revisions to informix driver - thanks to Samuel CARRIERE samuel_carriere#hotmail.com +

    Added $ok parameter to CommitTrans($ok) for easy rollbacks. +

    Fixed odbc MetaColumns and MetaTables to save and restore $ADODB_FETCH_MODE. +

    Some odbc drivers did not call the base connection class constructor. Fixed. +

    Fixed regex for GetUpdateSQL() and GetInsertSQL() to support more legal character combinations. + +

    1.99 21 April 2002

    +

    Added emulated RecordCount() to all database drivers if $ADODB_COUNTRECS = true + (which it is by default). Inspired by Cristiano Duarte (cunha17#uol.com.br). +

    Unified stored procedure support for mssql and oci8. Parameter() and PrepareSP() + functions implemented. +

    Added support for SELECT FIRST in informix, modified hasTop property to support + this. +

    Changed csv driver to handle updates/deletes/inserts properly (when Execute() returns true). +Bind params also work now, and raiseErrorFn with csv driver. Added csv driver to QA process. +

    Better error checking in oci8 UpdateBlob() and UpdateBlobFile(). +

    Added TIME type to MySQL - patch by Manfred h9125297#zechine.wu-wien.ac.at +

    Prepare/Execute implemented for Interbase/Firebird +

    Changed some regular expressions to be anchored by /^ $/ for speed. +

    Added UnixTimeStamp() and UnixDate() to ADOConnection(). Now these functions + are in both ADOConnection and ADORecordSet classes. +

    Empty recordsets were not cached - fixed. +

    Thanks to Gaetano Giunta (g.giunta#libero.it) for the oci8 code review. We + didn't agree on everything, but i hoped we agreed to disagree! +

    1.90 6 April 2002

    +

    Now all database drivers support fetch modes ADODB_FETCH_NUM and ADODB_FETCH_ASSOC, though + still not fully tested. Eg. Frontbase, Sybase, Informix. +

    NextRecordSet() support for mssql. Contributed by "Sven Axelsson" sven.axelsson#bokochwebb.se +

    Added blob support for SQL Anywhere. Contributed by Wade Johnson wade#wadejohnson.de +

    Fixed some security loopholes in server.php. Server.php also supports fetch mode. +

    Generalized GenID() to support odbc and mssql drivers. Mssql no longer generates GUID's. +

    Experimental RowLock($table,$where) for mssql. +

    Properly implemented Prepare() in oci8 and ODBC. +

    Added Bind() support to oci8 to support Prepare(). +

    Improved error handler. Catches CacheExecute() and GenID() errors now. +

    Now if you are running php from the command line, debugging messages do not output html formating. +Not 100% complete, but getting there. +

    1.81 22 March 2002

    +

    Restored default $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT for backward compatibility. +

    SelectLimit for oci8 improved - Our FIRST_ROWS optimization now does not overwrite existing hint. +

    New Sybase SQL Anywhere driver. Contributed by Wade Johnson wade#wadejohnson.de +

    1.80 15 March 2002

    +

    Redesigned directory structure of ADOdb files. Added new driver directory where +all database drivers reside. +

    Changed caching algorithm to create subdirectories. Now we scale better. +

    Informix driver now supports insert_id(). Contribution by "Andrea Pinnisi" pinnisi#sysnet.it +

    Added experimental ISO date and FetchField support for informix. +

    Fixed a quoting bug in Execute() with bind parameters, causing problems with blobs. +

    Mssql driver speedup by 10-15%. +

    Now in CacheExecute($secs2cache,$sql,...), $secs2cache is optional. If missing, it will +take the value defined in $connection->cacheSecs (default is 3600 seconds). Note that +CacheSelectLimit(), the secs2cache is still compulsory - sigh. +

    Sybase SQL Anywhere driver (using ODBC) contributed by Wade Johnson wade#wadejohnson.de +

    1.72 8 March 2002

    +

    Added @ when returning Fields() to prevent spurious error - "Michael William Miller" mille562#pilot.msu.edu +

    MetaDatabases() for postgres contributed by Phil pamelant#nerim.net +

    Mitchell T. Young (mitch#youngfamily.org) contributed informix driver. +

    Fixed rs2html() problem. I cannot reproduce, so probably a problem with pre PHP 4.1.0 versions, + when supporting new ADODB_FETCH_MODEs. +

    Mattia Rossi (mattia#technologist.com) contributed BlobDecode() and UpdateBlobFile() for postgresql + using the postgres specific pg_lo_import()/pg_lo_open() - i don't use them but hopefully others will + find this useful. See this posting + for an example of usage. +

    Added UpdateBlobFile() for uploading files to a database. +

    Made UpdateBlob() compatible with oci8po driver. +

    Added noNullStrings support to oci8 driver. Oracle changes all ' ' strings to nulls, + so you need to set strings to ' ' to prevent the nullifying of strings. $conn->noNullStrings = true; + will do this for you automatically. This is useful when you define a char column as NOT NULL. +

    Fixed UnixTimeStamp() bug - wasn't setting minutes and seconds properly. Patch from Agusti Fita i Borrell agusti#anglatecnic.com. +

    Toni Tunkkari added patch for sybase dates. Problem with spaces in day part of date fixed. +

    1.71 18 Jan 2002

    +

    Sequence start id support. Now $conn->Gen_ID('seqname', 50) to start sequence from 50. +

    CSV driver fix for selectlimit, from Andreas - akaiser#vocote.de. +

    Gam3r spotted that a global variable was undefined in the session handler. +

    Mssql date regex had error. Fixed - reported by Minh Hoang vb_user#yahoo.com. +

    DBTimeStamp() and DBDate() now accept iso dates and unix timestamps. This means +that the PostgreSQL handling of dates in GetInsertSQL() and GetUpdateSQL() can +be removed. Also if these functions are passed '' or null or false, we return a SQL null. +

    GetInsertSQL() and GetUpdateSQL() now accept a new parameter, $magicq to +indicate whether quotes should be inserted based on magic quote settings - suggested by +dj#4ict.com. +

    Reformated docs slightly based on suggestions by Chris Small. +

    1.65 28 Dec 2001

    +

    Fixed borland_ibase class naming bug. +

    Now instead of using $rs->fields[0] internally, we use reset($rs->fields) so + that we are compatible with ADODB_FETCH_ASSOC mode. Reported by Nico S. +

    Changed recordset constructor and _initrs() for oci8 so that it returns the field definitions even + if no rows in the recordset. Reported by Rick Hickerson (rhickers#mv.mv.com). +

    Improved support for postgresql in GetInsertSQL and GetUpdateSQL by + "mike" mike#partner2partner.com and "Ryan Bailey" rebel#windriders.com +

    1.64 20 Dec 2001

    +

    Danny Milosavljevic <danny.milo#gmx.net> added some patches for MySQL error handling +and displaying default values. +

    Fixed some ADODB_FETCH_BOTH inconsistencies in odbc and interbase. +

    Added more tests to test suite to cover ADODB_FETCH_* and ADODB_ERROR_HANDLER. +

    Added firebird (ibase) driver +

    Added borland_ibase driver for interbase 6.5 +

    1.63 13 Dec 2001

    +Absolute to the adodb-lib.inc.php file not set properly. Fixed.

    + +

    1.62 11 Dec 2001

    +

    Major speedup of ADOdb for low-end web sites by reducing the php code loading and compiling +cycle. We conditionally compile not so common functions. +Moved csv code to adodb-csvlib.inc.php to reduce adodb.inc.php parsing. This file +is loaded only when the csv/proxy driver is used, or CacheExecute() is run. +Also moved PageExecute(), GetSelectSQL() and GetUpdateSQL() core code to adodb-lib.inc.php. +This reduced the 70K main adodb.inc.php file to 55K, and since at least 20K of the file +is comments, we have reduced 50K of code in adodb.inc.php to 35K. There + should be 35% reduction in memory and thus 35% speedup in compiling the php code for the +main adodb.inc.php file. +

    Highly tuned SelectLimit() for oci8 for massive speed improvements on large files. +Selecting 20 rows starting from the 20,000th row of a table is now 7 times faster. +Thx to Tomas V V Cox. +

    Allow . and # in table definitions in GetInsertSQL and GetUpdateSQL. + See ADODB_TABLE_REGEX constant. Thx to Ari Kuorikoski. +

    Added ADODB_PREFETCH_ROWS constant, defaulting to 10. This determines the number +of records to prefetch in a SELECT statement. Only used by oci8.

    +

    Added high portability Oracle class called oci8po. This uses ? for bind variables, and +lower cases column names.

    +

    Now all database drivers support $ADODB_FETCH_MODE, including interbase, ado, and odbc: +ADODB_FETCH_NUM and ADODB_FETCH_ASSOC. ADODB_FETCH_BOTH is not fully implemented for all +database drivers. +

    1.61 Nov 2001

    +

    Added PO_RecordCount() and PO_Insert_ID(). PO stands for portable. Pablo Roca + [pabloroca#mvps.org]

    +

    GenID now returns 0 if not available. Safer is that you should check $conn->hasGenID + for availability.

    +

    M'soft ADO we now correctly close recordset in _close() peterd#telephonetics.co.uk

    +

    MSSQL now supports GenID(). It generates a 16-byte GUID from mssql newid() + function.

    +

    Changed ereg_replace to preg_replace in SelectLimit. This is a fix for mssql. + Ereg doesn't support t or n! Reported by marino Carlos xaplo#postnuke-espanol.org

    +

    Added $recordset->connection. This is the ADOConnection object for the recordset. +Works with cached and normal recordsets. Surprisingly, this had no affect on performance!

    +

    1.54 15 Nov 2001

    +Fixed some more bugs in PageExecute(). I am getting sick of bug in this and will have to +reconsider my QA here. The main issue is that I don't use PageExecute() and +to check whether it is working requires a visual inspection of the html generated currently. +It is possible to write a test script but it would be quite complicated :( +

    More speedups of SelectLimit() for DB2, Oci8, access, vfp, mssql. +

    + +

    1.53 7 Nov 2001

    +Added support for ADODB_FETCH_ASSOC for ado and odbc drivers.

    +Tuned GetRowAssoc(false) in postgresql and mysql.

    +Stephen Van Dyke contributed ADOdb icon, accepted with some minor mods.

    +Enabled Affected_Rows() for postgresql

    +Speedup for Concat() using implode() - Benjamin Curtis ben_curtis#yahoo.com

    +Fixed some more bugs in PageExecute() to prevent infinite loops

    +

    1.52 5 Nov 2001

    +Spelling error in CacheExecute() caused it to fail. $ql should be $sql in line 625!

    +Added fixes for parsing [ and ] in GetUpdateSQL(). +

    1.51 5 Nov 2001

    +

    Oci8 SelectLimit() speedup by using OCIFetch(). +

    Oci8 was mistakenly reporting errors when $db->debug = true. +

    If a connection failed with ODBC, it was not correctly reported - fixed. +

    _connectionID was inited to -1, changed to false. +

    Added $rs->FetchRow(), to simplify API, ala PEAR DB +

    Added PEAR DB compat mode, which is still faster than PEAR! See adodb-pear.inc.php. +

    Removed postgres pconnect debugging statement. +

    1.50 31 Oct 2001

    +

    ADOdbConnection renamed to ADOConnection, and ADOdbFieldObject to ADOFieldObject. +

    PageExecute() now checks for empty $rs correctly, and the errors in the docs on this subject have been fixed. +

    odbc_error() does not return 6 digit error correctly at times. Implemented workaround. +

    Added ADORecordSet_empty class. This will speedup INSERTS/DELETES/UPDATES because the return +object created is much smaller. +

    Added Prepare() to odbc, and oci8 (but doesn't work properly for oci8 still). +

    Made pgsql a synonym for postgre7, and changed SELECT LIMIT to use OFFSET for compat with +postgres 7.2. +

    Revised adodb-cryptsession.php thanks to Ari. +

    Set resources to false on _close, to force freeing of resources. +

    Added adodb-errorhandler.inc.php, adodb-errorpear.inc.php and raiseErrorFn on Freek's urging. +

    GetRowAssoc($toUpper=true): $toUpper added as default. +

    Errors when connecting to a database were not captured formerly. Now we do it correctly. +

    1.40 19 September 2001

    +

    PageExecute() to implement page scrolling added. Code and idea by Iván Oliva.

    +

    Some minor postgresql fixes.

    +

    Added sequence support using GenID() for postgresql, oci8, mysql, interbase.

    +

    Added UpdateBlob support for interbase (untested).

    +

    Added encrypted sessions (see adodb-cryptsession.php). By Ari Kuorikoski <kuoriari#finebyte.com>

    +

    1.31 21 August 2001

    +

    Many bug fixes thanks to "GaM3R (Cameron)" <gamr#outworld.cx>. Some session changes due to Gam3r. +

    Fixed qstr() to quote also. +

    rs2html() now pretty printed. +

    Jonathan Younger jyounger#unilab.com contributed the great idea GetUpdateSQL() and GetInsertSQL() which +generates SQL to update and insert into a table from a recordset. Modify the recordset fields +array, then can this function to generate the SQL (the SQL is not executed). +

    "Nicola Fankhauser" <nicola.fankhauser#couniq.com> found some bugs in date handling for mssql.

    +

    Added minimal Oracle support for LOBs. Still under development.

    +Added $ADODB_FETCH_MODE so you can control whether recordsets return arrays which are +numeric, associative or both. This is a global variable you set. Currently only MySQL, Oci8, Postgres +drivers support this. +

    PostgreSQL properly closes recordsets now. Reported by several people. +

    +Added UpdateBlob() for Oracle. A hack to make it easier to save blobs. +

    +Oracle timestamps did not display properly. Fixed. +

    1.20 6 June 2001

    +

    Now Oracle can connect using tnsnames.ora or server and service name

    +

    Extensive Oci8 speed optimizations. +Oci8 code revised to support variable binding, and /*+ FIRST_ROWS */ hint.

    +

    Worked around some 4.0.6 bugs in odbc_fetch_into().

    +

    Paolo S. Asioli paolo.asioli#libero.it suggested GetRowAssoc().

    +

    Escape quotes for oracle wrongly set to '. Now '' is used.

    +

    Variable binding now works in ODBC also.

    +

    Jumped to version 1.20 because I don't like 13 :-)

    +

    1.12 6 June 2001

    +

    Changed $ADODB_DIR to ADODB_DIR constant to plug a security loophole.

    +

    Changed _close() to close persistent connections also. Prevents connection leaks.

    +

    Major revision of oracle and oci8 drivers. +Added OCI_RETURN_NULLS and OCI_RETURN_LOBS to OCIFetchInto(). BLOB, CLOB and VARCHAR2 recognition +in MetaType() improved. MetaColumns() returns columns in correct sort order.

    +

    Interbase timestamp input format was wrong. Fixed.

    +

    1.11 20 May 2001

    +

    Improved file locking for Windows.

    +

    Probabilistic flushing of cache to avoid avalanche updates when cache timeouts.

    +

    Cached recordset timestamp not saved in some scenarios. Fixed.

    +

    1.10 19 May 2001

    +

    Added caching. CacheExecute() and CacheSelectLimit(). +

    Added csv driver. See http://php.weblogs.com/ADODB_csv. +

    Fixed SelectLimit(), SELECT TOP not working under certain circumstances. +

    Added better Frontbase support of MetaTypes() by Frank M. Kromann. +

    1.01 24 April 2001

    +

    Fixed SelectLimit bug. not quoted properly. +

    SelectLimit: SELECT TOP -1 * FROM TABLE not support by Microsoft. Fixed.

    +

    GetMenu improved by glen.davies#cce.ac.nz to support multiple hilited items

    +

    FetchNextObject() did not work with only 1 record returned. Fixed bug reported by $tim#orotech.net

    +

    Fixed mysql field max_length problem. Fix suggested by Jim Nicholson (jnich#att.com)

    +

    1.00 16 April 2001

    +

    Given some brilliant suggestions on how to simplify ADOdb by akul. You no longer need to +setup $ADODB_DIR yourself, and ADOLoadCode() is automatically called by ADONewConnection(), +simplifying the startup code.

    +

    FetchNextObject() added. Suggested by Jakub Marecek. This makes FetchObject() obsolete, as +this is more flexible and powerful.

    +

    Misc fixes to SelectLimit() to support Access (top must follow distinct) and Fields() +in the array recordset. From Reinhard Balling.

    +

    0.96 27 Mar 2001

    +

    ADOConnection Close() did not return a value correctly. Thanks to akul#otamedia.com.

    +

    When the horrible magic_quotes is enabled, back-slash () is changed to double-backslash (\). +This doesn't make sense for Microsoft/Sybase databases. We fix this in qstr().

    +

    Fixed Sybase date problem in UnixDate() thanks to Toni Tunkkari. Also fixed MSSQL problem +in UnixDate() - thanks to milhouse31#hotmail.com.

    +

    MoveNext() moved to leaf classes for speed in MySQL/PostgreSQL. 10-15% speedup.

    +

    Added null handling in bindInputArray in Execute() -- Ron Baldwin suggestion.

    +

    Fixed some option tags. Thanks to john#jrmstudios.com.

    +

    0.95 13 Mar 2001

    +

    Added postgres7 database driver which supports LIMIT and other version 7 stuff in the future.

    +

    Added SelectLimit to ADOConnection to simulate PostgreSQL's "select * from table limit 10 offset 3". +Added helper function GetArrayLimit() to ADORecordSet.

    +

    Fixed mysql metacolumns bug. Thanks to Freek Dijkstra (phpeverywhere#macfreek.com).

    +

    Also many PostgreSQL changes by Freek. He almost rewrote the whole PostgreSQL driver!

    +

    Added fix to input parameters in Execute for non-strings by Ron Baldwin.

    +

    Added new metatype, X for TeXt. Formerly, metatype B for Blob also included +text fields. Now 'B' is for binary/image data. 'X' for textual data.

    +

    Fixed $this->GetArray() in GetRows().

    +

    Oracle and OCI8: 1st parameter is always blank -- now warns if it is filled.

    +

    Now hasLimit and hasTop added to indicate whether +SELECT * FROM TABLE LIMIT 10 or SELECT TOP 10 * FROM TABLE are supported.

    +

    0.94 04 Feb 2001

    +

    Added ADORecordSet::GetRows() for compatibility with Microsoft ADO. Synonym for GetArray().

    +

    Added new metatype 'R' to represent autoincrement numbers.

    +

    Added ADORecordSet.FetchObject() to return a row as an object.

    +

    Finally got a Linux box to test PostgreSql. Many fixes.

    +

    Fixed copyright misspellings in 0.93.

    +

    Fixed mssql MetaColumns type bug.

    +

    Worked around odbc bug in PHP4 for sessions.

    +

    Fixed many documentation bugs (affected_rows, metadatabases, qstr).

    +

    Fixed MySQL timestamp format (removed comma).

    +

    Interbase driver did not call ibase_pconnect(). Fixed.

    +

    0.93 18 Jan 2002

    +

    Fixed GetMenu bug.

    +

    Simplified Interbase commit and rollback.

    +

    Default behaviour on closing a connection is now to rollback all active transactions.

    +

    Added field object handling for array recordset for future XML compatibility.

    +

    Added arr2html() to convert array to html table.

    +

    0.92 2 Jan 2002

    +

    Interbase Commit and Rollback should be working again.

    +

    Changed initialisation of ADORecordSet. This is internal and should not affect users. We +are doing this to support cached recordsets in the future.

    + +

    Implemented ADORecordSet_array class. This allows you to simulate a database recordset +with an array.

    +

    Added UnixDate() and UnixTimeStamp() to ADORecordSet.

    +

    0.91 21 Dec 2000

    +

    Fixed ODBC so ErrorMsg() is working.

    +

    Worked around ADO unrecognised null (0x1) value problem in COM.

    +

    Added Sybase support for FetchField() type

    +

    Removed debugging code and unneeded html from various files

    +

    Changed to javadoc style comments to adodb.inc.php.

    +

    Added maxsql as synonym for mysqlt

    +

    Now ODBC downloads first 8K of blob by default +

    0.90 15 Nov 2000

    +

    Lots of testing of Microsoft ADO. Should be more stable now.

    +

    Added $ADODB_COUNTREC. Set to false for high speed selects.

    +

    Added Sybase support. Contributed by Toni Tunkkari (toni.tunkkari#finebyte.com). Bug in Sybase + API: GetFields is unable to determine date types.

    +

    Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.

    +

    Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent + empty dates.

    +

    Added MetaColumns($table) that returns an array of ADOFieldObject's listing + the columns of a table.

    +

    Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.

    +

    Added adodb-session.php for session support.

    +

    0.80 30 Nov 2000

    +

    Added support for charSet for interbase. Implemented MetaTables for most databases. + PostgreSQL more extensively tested.

    +

    0.71 22 Nov 2000

    +

    Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier.

    +

    0.70 15 Nov 2000

    +

    Calls by reference have been removed (call_time_pass_reference=Off) to ensure compatibility with future versions of PHP, +except in Oracle 7 driver due to a bug in php_oracle.dll.

    +

    PostgreSQL database driver contributed by Alberto Cerezal (acerezalp#dbnet.es). +

    +

    Oci8 driver for Oracle 8 contributed by George Fourlanos (fou#infomap.gr).

    +

    Added mysqlt database driver to support MySQL 3.23 which has transaction + support.

    +

    Oracle default date format (DD-MON-YY) did not match ADOdb default date format (which is YYYY-MM-DD). Use ALTER SESSION to force the default date.

    +

    Error message checking is now included in test suite.

    +

    MoveNext() did not check EOF properly -- fixed.

    +

    0.60 Nov 8 2000

    +

    Fixed some constructor bugs in ODBC and ADO. Added ErrorNo function to ADOConnection + class.

    +

    0.51 Oct 18 2000

    +

    Fixed some interbase bugs.

    +

    0.50 Oct 16 2000

    +

    Interbase commit/rollback changed to be compatible with PHP 4.03.

    +

    CommitTrans( ) will now return true if transactions not supported.

    +

    Conversely RollbackTrans( ) will return false if transactions not supported. +

    +

    0.46 Oct 12

    +Many Oracle compatibility issues fixed. +

    0.40 Sept 26

    +

    Many bug fixes

    +

    Now Code for BeginTrans, CommitTrans and RollbackTrans is working. So is the Affected_Rows +and Insert_ID. Added above functions to test.php.

    +

    ADO type handling was busted in 0.30. Fixed.

    +

    Generalised Move( ) so it works will all databases, including ODBC.

    +

    0.30 Sept 18

    +

    Renamed ADOLoadDB to ADOLoadCode. This is clearer.

    +

    Added BeginTrans, CommitTrans and RollbackTrans functions.

    +

    Added Affected_Rows() and Insert_ID(), _affectedrows() and _insertID(), ListTables(), + ListDatabases(), ListColumns().

    +

    Need to add New_ID() and hasInsertID and hasAffectedRows, autoCommit

    +

    0.20 Sept 12

    +

    Added support for Microsoft's ADO.

    +

    Added new field to ADORecordSet -- canSeek

    +

    Added new parameter to _fetch($ignore_fields = false). Setting to true will + not update fields array for faster performance.

    +

    Added new field to ADORecordSet/ADOConnection -- dataProvider to indicate whether + a class is derived from odbc or ado.

    +

    Changed class ODBCFieldObject to ADOFieldObject -- not documented currently.

    +

    Added benchmark.php and testdatabases.inc.php to the test suite.

    +

    Added to ADORecordSet FastForward( ) for future high speed scrolling. Not documented.

    +

    Realised that ADO's Move( ) uses relative positioning. ADOdb uses absolute. +

    +

    0.10 Sept 9 2000

    +

    First release

    \ No newline at end of file diff --git a/lib/WikiDB/adodb/docs/readme.htm b/lib/WikiDB/adodb/docs/readme.htm deleted file mode 100644 index 944b967f8..000000000 --- a/lib/WikiDB/adodb/docs/readme.htm +++ /dev/null @@ -1,68 +0,0 @@ - - -ADODB Manual - - - - - -

    ADOdb Library for PHP

    -

    ADOdb is a suite of database libraries that allow you to connect to multiple - databases in a portable manner. Download from http://adodb.sourceforge.net/. -

    • The ADOdb documentation has moved to docs-adodb.htm - This allows you to query, update and insert records using a portable API. -

    • The ADOdb data dictionary docs are at docs-datadict.htm. - This allows you to create database tables and indexes in a portable manner. -

    • The ADOdb database performance monitoring docs are at docs-perf.htm. - This allows you to perform health checks, tune and monitor your database. -

    • The ADOdb database-backed session docs are at docs-session.htm. -
    -

    -

    Installation

    -Make sure you are running PHP5 or later. For PHP 4 or earlier, you need to use adodb 4.9. Unpack all the files into a directory accessible by your webserver. -

    -To test, try modifying some of the tutorial examples. Make sure you customize the connection settings correctly. You can debug using: -

    -<?php
-include('adodb/adodb.inc.php');
-
-$db = ADONewConnection($driver); # eg. 'mysql' or 'oci8' 
-$db->debug = true;
-$db->Connect($server, $user, $password, $database);
-$rs = $db->Execute('select * from some_small_table');
-print "<pre>";
-print_r($rs->GetRows());
-print "</pre>";
-?>
-
    -

    How are people using ADOdb

    -Here are some examples of how people are using ADOdb: -
      -
    • PhpLens is a commercial data grid component that allows - both cool Web designers and serious unshaved programmers to develop and - maintain databases on the Web easily. Developed by the author of ADOdb. -
      • -
    • PHAkt: PHP Extension for DreamWeaver Ultradev allows - you to script PHP in the popular Web page editor. Database handling provided - by ADOdb.
      • -
    • Analysis Console for Intrusion Databases (ACID): PHP-based - analysis engine to search and process a database of security incidents - generated by security-related software such as IDSes and firewalls (e.g. - Snort, ipchains). By Roman Danyliw.
      • -
    • PostNuke is a very popular free content management system - and weblog system. It offers full CSS support, HTML 4.01 transitional - compliance throughout, an advanced blocks system, and is fully multi-lingual - enabled.
      • -
    • EasyPublish CMS is another free content management system - for managing information and integrated modules on your internet, intranet- - and extranet-sites. From Norway.
      • -
    • NOLA is a full featured accounting, inventory, and job - tracking application. It is licensed under the GPL, and developed by Noguska. -
      • -
    - - diff --git a/lib/WikiDB/adodb/docs/tips_portable_sql.htm b/lib/WikiDB/adodb/docs/tips_portable_sql.htm index aa75069ca..53743572e 100644 --- a/lib/WikiDB/adodb/docs/tips_portable_sql.htm +++ b/lib/WikiDB/adodb/docs/tips_portable_sql.htm @@ -1,367 +1,367 @@ - - - - - Tips on Writing Portable SQL for Multiple Databases for PHP - - - -

    Tips on Writing Portable SQL  

    		 -
    -

    Updated 6 Oct 2006. Added OffsetDate example. -

    Updated 18 Sep 2003. Added Portable Native SQL section. -

    - - If you are writing an application that is used in multiple environments and - operating systems, you need to plan to support multiple databases. This article - is based on my experiences with multiple database systems, stretching from 4th - Dimension in my Mac days, to the databases I currently use, which are: Oracle, - FoxPro, Access, MS SQL Server and MySQL. Although most of the advice here applies - to using SQL with Perl, Python and other programming languages, I will focus on PHP and how - the ADOdb database abstraction library - offers some solutions.

    -

    Most database vendors practice product lock-in. The best or fastest way to - do things is often implemented using proprietary extensions to SQL. This makes - it extremely hard to write portable SQL code that performs well under all conditions. - When the first ANSI committee got together in 1984 to standardize SQL, the database - vendors had such different implementations that they could only agree on the - core functionality of SQL. Many important application specific requirements - were not standardized, and after so many years since the ANSI effort began, - it looks as if much useful database functionality will never be standardized. - Even though ANSI-92 SQL has codified much more, we still have to implement portability - at the application level.

    -

    Selects

    -

    The SELECT statement has been standardized to a great degree. Nearly every - database supports the following:

    -

    SELECT [cols] FROM [tables]
    -   [WHERE conditions]
    -   [GROUP BY cols]
    -   [HAVING conditions]
    -   [ORDER BY cols]

    -

    But so many useful techniques can only be implemented by using proprietary - extensions. For example, when writing SQL to retrieve the first 10 rows for - paging, you could write...

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    DatabaseSQL Syntax
    DB2select * from table fetch first 10 rows only
    Informixselect first 10 * from table
    Microsoft SQL Server and Accessselect top 10 * from table
    MySQL and PostgreSQLselect * from table limit 10
    Oracle 8iselect * from (select * from table) where rownum <= 10
    -

    This feature of getting a subset of data is so useful that in the PHP class - library ADOdb, we have a SelectLimit( ) function that allows you to hide the - implementation details within a function that will rewrite your SQL for you:

    -
    $connection->SelectLimit('select * from table', 10);
-
    -

    Selects: Fetch Modes

    -

    PHP allows you to retrieve database records as arrays. You can choose to have - the arrays indexed by field name or number. However different low-level PHP - database drivers are inconsistent in their indexing efforts. ADOdb allows you - to determine your prefered mode. You set this by setting the variable $ADODB_FETCH_MODE - to either of the constants ADODB_FETCH_NUM (for numeric indexes) or ADODB_FETCH_ASSOC - (using field names as an associative index).

    -

    The default behaviour of ADOdb varies depending on the database you are using. - For consistency, set the fetch mode to either ADODB_FETCH_NUM (for speed) or - ADODB_FETCH_ASSOC (for convenience) at the beginning of your code.

    -

    Selects: Counting Records

    -

    Another problem with SELECTs is that some databases do not return the number - of rows retrieved from a select statement. This is because the highest performance - databases will return records to you even before the last record has been found. -

    -

    In ADOdb, RecordCount( ) returns the number of rows returned, or will emulate - it by buffering the rows and returning the count after all rows have been returned. - This can be disabled for performance reasons when retrieving large recordsets - by setting the global variable $ADODB_COUNTRECS = false. This variable is checked - every time a query is executed, so you can selectively choose which recordsets - to count.

    -

    If you prefer to set $ADODB_COUNTRECS = false, ADOdb still has the PO_RecordCount( - ) function. This will return the number of rows, or if it is not found, it will - return an estimate using SELECT COUNT(*):

    -
    $rs = $db->Execute("select * from table where state=$state");
-$numrows = $rs->PO_RecordCount('table', "state=$state");
    -

    Selects: Locking

    -

    SELECT statements are commonly used to implement row-level locking of tables. - Other databases such as Oracle, Interbase, PostgreSQL and MySQL with InnoDB - do not require row-level locking because they use versioning to display data - consistent with a specific point in time.

    -

    Currently, I recommend encapsulating the row-level locking in a separate function, - such as RowLock($table, $where):

    -
    $connection->BeginTrans( );
-$connection->RowLock($table, $where);
    -
    # some operation
    -
    if ($ok) $connection->CommitTrans( );
-else $connection->RollbackTrans( );
-
    -

    Selects: Outer Joins

    -

    Not all databases support outer joins. Furthermore the syntax for outer joins - differs dramatically between database vendors. One portable (and possibly slower) - method of implementing outer joins is using UNION.

    -

    For example, an ANSI-92 left outer join between two tables t1 and t2 could - look like:

    -
    SELECT t1.col1, t1.col2, t2.cola 
      FROM t1 LEFT JOIN t2 ON t1.col = t2.col
    -

    This can be emulated using:

    -
    SELECT t1.col1, t1.col2, t2.cola FROM t1, t2 
    	   WHERE t1.col = t2.col 
-   UNION ALL
-SELECT col1, col2, null FROM t1 
    	   WHERE t1.col not in (select distinct col from t2)
-
    -

    Since ADOdb 2.13, we provide some hints in the connection object as to legal - join variations. This is still incomplete and sometimes depends on the database - version you are using, but is useful as a general guideline:

    -

    $conn->leftOuter: holds the - operator used for left outer joins (eg. '*='), or false if not known or not - available.
    - $conn->rightOuter: holds the - operator used for right outer joins (eg '=*'), or false if not known or not - available.
    - $conn->ansiOuter: boolean - that if true means that ANSI-92 style outer joins are supported, or false if - not known.

    -

    Inserts

    -

    When you create records, you need to generate unique id's for each record. - There are two common techniques: (1) auto-incrementing columns and (2) sequences. -

    -

    Auto-incrementing columns are supported by MySQL, Sybase and Microsoft Access - and SQL Server. However most other databases do not support this feature. So - for portability, you have little choice but to use sequences. Sequences are - special functions that return a unique incrementing number every time you call - it, suitable to be used as database keys. In ADOdb, we use the GenID( ) function. - It has takes a parameter, the sequence name. Different tables can have different - sequences.

    -
    $id = $connection->GenID('sequence_name');
    $connection->Execute("insert into table (id, firstname, lastname) 
    			   values ($id, $firstname, $lastname)");
    -

    For databases that do not support sequences natively, ADOdb emulates sequences - by creating a table for every sequence.

    -

    Binding

    -

    Binding variables in an SQL statement is another tricky feature. Binding is - useful because it allows pre-compilation of SQL. When inserting multiple records - into a database in a loop, binding can offer a 50% (or greater) speedup. However - many databases such as Access and MySQL do not support binding natively and - there is some overhead in emulating binding. Furthermore, different databases - (specificly Oracle!) implement binding differently. My recommendation is to - use binding if your database queries are too slow, but make sure you are using - a database that supports it like Oracle.

    -

    ADOdb supports portable Prepare/Execute with:

    -
    $stmt = $db->Prepare('select * from customers where custid=? and state=?');
-$rs = $db->Execute($stmt, array($id,'New York'));
    -

    Oracle uses named bind placeholders, not "?", so to support portable binding, we have Param() that generates -the correct placeholder (available since ADOdb 3.92): -

    $sql = 'insert into table (col1,col2) values ('.$DB->Param('a').','.$DB->Param('b').')';
-# generates 'insert into table (col1,col2) values (?,?)'
-# or        'insert into table (col1,col2) values (:a,:b)'
-$stmt = $DB->Prepare($sql);
-$stmt = $DB->Execute($stmt,array('one','two'));
-
    - -

    Portable Native SQL

    -

    ADOdb provides the following functions for portably generating SQL functions - as strings to be merged into your SQL statements (some are only available since - ADOdb 3.92):

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    FunctionDescription
    DBDate($date)Pass in a UNIX timestamp or ISO date and it will convert it to a date - string formatted for INSERT/UPDATE
    DBTimeStamp($date)Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp - string formatted for INSERT/UPDATE
    SQLDate($date, $fmt)Portably generate a date formatted using $fmt mask, for use in SELECT - statements.
    OffsetDate($date, $ndays)Portably generate a $date offset by $ndays.
    Concat($s1, $s2, ...)Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, - which allows || operator.
    IfNull($fld, $replaceNull)Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.
    Param($name)Generates bind placeholders, using ? or named conventions as appropriate.
    $db->sysDateProperty that holds the SQL function that returns today's date
    $db->sysTimeStampProperty that holds the SQL function that returns the current -timestamp (date+time). -
    $db->concat_operatorProperty that holds the concatenation operator -
    $db->lengthProperty that holds the name of the SQL strlen function. -
    $db->upperCaseProperty that holds the name of the SQL strtoupper function. -
    $db->randomProperty that holds the SQL to generate a random number between 0.00 and 1.00. -
    $db->substrProperty that holds the name of the SQL substring function. -
    -

     

    -

    DDL and Tuning

    -There are database design tools such as ERWin or Dezign that allow you to generate data definition language commands such as ALTER TABLE or CREATE INDEX from Entity-Relationship diagrams. -

    -However if you prefer to use a PHP-based table creation scheme, adodb provides you with this feature. Here is the code to generate the SQL to create a table with: -

      -
    1. Auto-increment primary key 'ID',
      2. -
    2. The person's 'NAME' VARCHAR(32) NOT NULL and defaults to '',
      3. -
    3. The date and time of record creation 'CREATED',
      4. -
    4. The person's 'AGE', defaulting to 0, type NUMERIC(16).
      5. -
    -

    -Also create a compound index consisting of 'NAME' and 'AGE': -

    -$datadict = NewDataDictionary($connection);
-$flds = " 
-  ID I AUTOINCREMENT PRIMARY,
-  NAME C(32) DEFAULT '' NOTNULL,
-  CREATED T DEFTIMESTAMP,
-  AGE N(16) DEFAULT 0
-";
-$sql1 = $datadict->CreateTableSQL('tabname', $flds);
-$sql2 = $datadict->CreateIndexSQL('idx_name_age', 'tabname', 'NAME,AGE');
-
    - -

    Data Types

    -

    Stick to a few data types that are available in most databases. Char, varchar - and numeric/number are supported by most databases. Most other data types (including - integer, boolean and float) cannot be relied on being available. I recommend - using char(1) or number(1) to hold booleans.

    -

    Different databases have different ways of representing dates and timestamps/datetime. - ADOdb attempts to display all dates in ISO (YYYY-MM-DD) format. ADOdb also provides - DBDate( ) and DBTimeStamp( ) to convert dates to formats that are acceptable - to that database. Both functions accept Unix integer timestamps and date strings - in ISO format.

    -
    $date1 = $connection->DBDate(time( ));
    $date2 = $connection->DBTimeStamp('2002-02-23 13:03:33');
    -

    We also provide functions to convert database dates to Unix timestamps:

    -
    $unixts = $recordset->UnixDate('#2002-02-30#'); # MS Access date =gt; unix timestamp
    -

    For date calculations, we have OffsetDate which allows you to calculate dates such as yesterday and next week in a RDBMS independant fashion. For example, if we want to set a field to 6 hour from now, use: -

    -$sql = 'update table set dtimefld='.$db->OffsetDate($db->sysTimeStamp, 6/24).' where ...';
-
    -

    The maximum length of a char/varchar field is also database specific. You can - only assume that field lengths of up to 250 characters are supported. This is - normally impractical for web based forum or content management systems. You - will need to be familiar with how databases handle large objects (LOBs). ADOdb - implements two functions, UpdateBlob( ) and UpdateClob( ) that allow you to - update fields holding Binary Large Objects (eg. pictures) and Character Large - Objects (eg. HTML articles):

    -
    # for oracle 
-$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1,empty_blob())'); 
-$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1'); 
-   
-# non-oracle databases
-$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); 
-$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
-
    -

    Null handling is another area where differences can occur. This is a mine-field, - because 3-value logic is tricky. -

    In general, I avoid using nulls except for dates and default all my numeric - and character fields to 0 or the empty string. This maintains consistency with - PHP, where empty strings and zero are treated as equivalent, and avoids SQL - ambiguities when you use the ANY and EXISTS operators. However if your database - has significant amounts of missing or unknown data, using nulls might be a good - idea. -

    - ADOdb also supports a portable IfNull function, so you can define what to display - if the field contains a null. -

    Stored Procedures

    -

    Stored procedures are another problem area. Some databases allow recordsets - to be returned in a stored procedure (Microsoft SQL Server and Sybase), and - others only allow output parameters to be returned. Stored procedures sometimes - need to be wrapped in special syntax. For example, Oracle requires such code - to be wrapped in an anonymous block with BEGIN and END. Also internal sql operators - and functions such as +, ||, TRIM( ), SUBSTR( ) or INSTR( ) vary between vendors. -

    -

    An example of how to call a stored procedure with 2 parameters and 1 return - value follows:

    -
    	switch ($db->databaseType) {
-	case 'mssql':
-	  $sql = 'SP_RUNSOMETHING'; break;
-	case 'oci8':
-	  $sql = 
-	  "declare RETVAL integer;begin :RETVAL := SP_RUNSOMETHING(:myid,:group);end;";
-	  break;
-	default:
-	  die('Unsupported feature');
-	}
-	# @RETVAL = SP_RUNSOMETHING @myid,@group
-	$stmt = $db->PrepareSP($sql);	
    	$db->Parameter($stmt,$id,'myid'); 
-	$db->Parameter($stmt,$group,'group');
-	# true indicates output parameter
    	    $db->Parameter($stmt,$ret,'RETVAL',true); 
-	$db->Execute($stmt);
    -

    As you can see, the ADOdb API is the same for both databases. But the stored - procedure SQL syntax is quite different between databases and is not portable, - so be forewarned! However sometimes you have little choice as some systems only - allow data to be accessed via stored procedures. This is when the ultimate portability - solution might be the only solution: treating portable SQL as a localization - exercise...

    -

    SQL as a Localization Exercise

    -

    In general to provide real portability, you will have to treat SQL coding - as a localization exercise. In PHP, it has become common to define separate - language files for English, Russian, Korean, etc. Similarly, I would suggest - you have separate Sybase, Intebase, MySQL, etc files, and conditionally include - the SQL based on the database. For example, each MySQL SQL statement would be - stored in a separate variable, in a file called 'mysql-lang.inc.php'.

    -
    $sqlGetPassword = 'select password from users where userid=%s';
-$sqlSearchKeyword = quot;SELECT * FROM articles WHERE match (title,body) against (%s)";
    -

    In our main PHP file:

    -
    # define which database to load...
-$database = 'mysql';
-include_once("$database-lang.inc.php");
-
-$db = NewADOConnection($database);
-$db->PConnect(...) or die('Failed to connect to database');
-
-# search for a keyword $word
-$rs = $db->Execute(sprintf($sqlSearchKeyWord,$db->qstr($word)));
    -

    Note that we quote the $word variable using the qstr( ) function. This is because - each database quotes strings using different conventions.

    -

    -

    Final Thoughts

    -

    The best way to ensure that you have portable SQL is to have your data tables designed using -sound principles. Learn the theory of normalization and entity-relationship diagrams and model -your data carefully. Understand how joins and indexes work and how they are used to tune performance. -

    Visit the following page for more references on database theory and vendors: - http://php.weblogs.com/sql_tutorial. - Also read this article on Optimizing PHP. -

    -(c) 2002-2003 John Lim. - - - + + + + + Tips on Writing Portable SQL for Multiple Databases for PHP + + + +

    Tips on Writing Portable SQL  

    		 +
    +

    Updated 6 Oct 2006. Added OffsetDate example. +

    Updated 18 Sep 2003. Added Portable Native SQL section. +

    + + If you are writing an application that is used in multiple environments and + operating systems, you need to plan to support multiple databases. This article + is based on my experiences with multiple database systems, stretching from 4th + Dimension in my Mac days, to the databases I currently use, which are: Oracle, + FoxPro, Access, MS SQL Server and MySQL. Although most of the advice here applies + to using SQL with Perl, Python and other programming languages, I will focus on PHP and how + the ADOdb database abstraction library + offers some solutions.

    +

    Most database vendors practice product lock-in. The best or fastest way to + do things is often implemented using proprietary extensions to SQL. This makes + it extremely hard to write portable SQL code that performs well under all conditions. + When the first ANSI committee got together in 1984 to standardize SQL, the database + vendors had such different implementations that they could only agree on the + core functionality of SQL. Many important application specific requirements + were not standardized, and after so many years since the ANSI effort began, + it looks as if much useful database functionality will never be standardized. + Even though ANSI-92 SQL has codified much more, we still have to implement portability + at the application level.

    +

    Selects

    +

    The SELECT statement has been standardized to a great degree. Nearly every + database supports the following:

    +

    SELECT [cols] FROM [tables]
    +   [WHERE conditions]
    +   [GROUP BY cols]
    +   [HAVING conditions]
    +   [ORDER BY cols]

    +

    But so many useful techniques can only be implemented by using proprietary + extensions. For example, when writing SQL to retrieve the first 10 rows for + paging, you could write...

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    DatabaseSQL Syntax
    DB2select * from table fetch first 10 rows only
    Informixselect first 10 * from table
    Microsoft SQL Server and Accessselect top 10 * from table
    MySQL and PostgreSQLselect * from table limit 10
    Oracle 8iselect * from (select * from table) where rownum <= 10
    +

    This feature of getting a subset of data is so useful that in the PHP class + library ADOdb, we have a SelectLimit( ) function that allows you to hide the + implementation details within a function that will rewrite your SQL for you:

    +
    $connection->SelectLimit('select * from table', 10);
+
    +

    Selects: Fetch Modes

    +

    PHP allows you to retrieve database records as arrays. You can choose to have + the arrays indexed by field name or number. However different low-level PHP + database drivers are inconsistent in their indexing efforts. ADOdb allows you + to determine your prefered mode. You set this by setting the variable $ADODB_FETCH_MODE + to either of the constants ADODB_FETCH_NUM (for numeric indexes) or ADODB_FETCH_ASSOC + (using field names as an associative index).

    +

    The default behaviour of ADOdb varies depending on the database you are using. + For consistency, set the fetch mode to either ADODB_FETCH_NUM (for speed) or + ADODB_FETCH_ASSOC (for convenience) at the beginning of your code.

    +

    Selects: Counting Records

    +

    Another problem with SELECTs is that some databases do not return the number + of rows retrieved from a select statement. This is because the highest performance + databases will return records to you even before the last record has been found. +

    +

    In ADOdb, RecordCount( ) returns the number of rows returned, or will emulate + it by buffering the rows and returning the count after all rows have been returned. + This can be disabled for performance reasons when retrieving large recordsets + by setting the global variable $ADODB_COUNTRECS = false. This variable is checked + every time a query is executed, so you can selectively choose which recordsets + to count.

    +

    If you prefer to set $ADODB_COUNTRECS = false, ADOdb still has the PO_RecordCount( + ) function. This will return the number of rows, or if it is not found, it will + return an estimate using SELECT COUNT(*):

    +
    $rs = $db->Execute("select * from table where state=$state");
+$numrows = $rs->PO_RecordCount('table', "state=$state");
    +

    Selects: Locking

    +

    SELECT statements are commonly used to implement row-level locking of tables. + Other databases such as Oracle, Interbase, PostgreSQL and MySQL with InnoDB + do not require row-level locking because they use versioning to display data + consistent with a specific point in time.

    +

    Currently, I recommend encapsulating the row-level locking in a separate function, + such as RowLock($table, $where):

    +
    $connection->BeginTrans( );
+$connection->RowLock($table, $where);
    +
    # some operation
    +
    if ($ok) $connection->CommitTrans( );
+else $connection->RollbackTrans( );
+
    +

    Selects: Outer Joins

    +

    Not all databases support outer joins. Furthermore the syntax for outer joins + differs dramatically between database vendors. One portable (and possibly slower) + method of implementing outer joins is using UNION.

    +

    For example, an ANSI-92 left outer join between two tables t1 and t2 could + look like:

    +
    SELECT t1.col1, t1.col2, t2.cola 
      FROM t1 LEFT JOIN t2 ON t1.col = t2.col
    +

    This can be emulated using:

    +
    SELECT t1.col1, t1.col2, t2.cola FROM t1, t2 
    	   WHERE t1.col = t2.col
+   UNION ALL
+SELECT col1, col2, null FROM t1 
    	   WHERE t1.col not in (select distinct col from t2)
+
    +

    Since ADOdb 2.13, we provide some hints in the connection object as to legal + join variations. This is still incomplete and sometimes depends on the database + version you are using, but is useful as a general guideline:

    +

    $conn->leftOuter: holds the + operator used for left outer joins (eg. '*='), or false if not known or not + available.
    + $conn->rightOuter: holds the + operator used for right outer joins (eg '=*'), or false if not known or not + available.
    + $conn->ansiOuter: boolean + that if true means that ANSI-92 style outer joins are supported, or false if + not known.

    +

    Inserts

    +

    When you create records, you need to generate unique id's for each record. + There are two common techniques: (1) auto-incrementing columns and (2) sequences. +

    +

    Auto-incrementing columns are supported by MySQL, Sybase and Microsoft Access + and SQL Server. However most other databases do not support this feature. So + for portability, you have little choice but to use sequences. Sequences are + special functions that return a unique incrementing number every time you call + it, suitable to be used as database keys. In ADOdb, we use the GenID( ) function. + It has takes a parameter, the sequence name. Different tables can have different + sequences.

    +
    $id = $connection->GenID('sequence_name');
    $connection->Execute("insert into table (id, firstname, lastname) 
    			   values ($id, $firstname, $lastname)");
    +

    For databases that do not support sequences natively, ADOdb emulates sequences + by creating a table for every sequence.

    +

    Binding

    +

    Binding variables in an SQL statement is another tricky feature. Binding is + useful because it allows pre-compilation of SQL. When inserting multiple records + into a database in a loop, binding can offer a 50% (or greater) speedup. However + many databases such as Access and MySQL do not support binding natively and + there is some overhead in emulating binding. Furthermore, different databases + (specificly Oracle!) implement binding differently. My recommendation is to + use binding if your database queries are too slow, but make sure you are using + a database that supports it like Oracle.

    +

    ADOdb supports portable Prepare/Execute with:

    +
    $stmt = $db->Prepare('select * from customers where custid=? and state=?');
+$rs = $db->Execute($stmt, array($id,'New York'));
    +

    Oracle uses named bind placeholders, not "?", so to support portable binding, we have Param() that generates +the correct placeholder (available since ADOdb 3.92): +

    $sql = 'insert into table (col1,col2) values ('.$DB->Param('a').','.$DB->Param('b').')';
+# generates 'insert into table (col1,col2) values (?,?)'
+# or        'insert into table (col1,col2) values (:a,:b)'
+$stmt = $DB->Prepare($sql);
+$stmt = $DB->Execute($stmt,array('one','two'));
+
    + +

    Portable Native SQL

    +

    ADOdb provides the following functions for portably generating SQL functions + as strings to be merged into your SQL statements (some are only available since + ADOdb 3.92):

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FunctionDescription
    DBDate($date)Pass in a UNIX timestamp or ISO date and it will convert it to a date + string formatted for INSERT/UPDATE
    DBTimeStamp($date)Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp + string formatted for INSERT/UPDATE
    SQLDate($date, $fmt)Portably generate a date formatted using $fmt mask, for use in SELECT + statements.
    OffsetDate($date, $ndays)Portably generate a $date offset by $ndays.
    Concat($s1, $s2, ...)Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, + which allows || operator.
    IfNull($fld, $replaceNull)Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.
    Param($name)Generates bind placeholders, using ? or named conventions as appropriate.
    $db->sysDateProperty that holds the SQL function that returns today's date
    $db->sysTimeStampProperty that holds the SQL function that returns the current +timestamp (date+time). +
    $db->concat_operatorProperty that holds the concatenation operator +
    $db->lengthProperty that holds the name of the SQL strlen function. +
    $db->upperCaseProperty that holds the name of the SQL strtoupper function. +
    $db->randomProperty that holds the SQL to generate a random number between 0.00 and 1.00. +
    $db->substrProperty that holds the name of the SQL substring function. +
    +

     

    +

    DDL and Tuning

    +There are database design tools such as ERWin or Dezign that allow you to generate data definition language commands such as ALTER TABLE or CREATE INDEX from Entity-Relationship diagrams. +

    +However if you prefer to use a PHP-based table creation scheme, adodb provides you with this feature. Here is the code to generate the SQL to create a table with: +

      +
    1. Auto-increment primary key 'ID',
      2. +
    2. The person's 'NAME' VARCHAR(32) NOT NULL and defaults to '',
      3. +
    3. The date and time of record creation 'CREATED',
      4. +
    4. The person's 'AGE', defaulting to 0, type NUMERIC(16).
      5. +
    +

    +Also create a compound index consisting of 'NAME' and 'AGE': +

    +$datadict = NewDataDictionary($connection);
+$flds = "
+  ID I AUTOINCREMENT PRIMARY,
+  NAME C(32) DEFAULT '' NOTNULL,
+  CREATED T DEFTIMESTAMP,
+  AGE N(16) DEFAULT 0
+";
+$sql1 = $datadict->CreateTableSQL('tabname', $flds);
+$sql2 = $datadict->CreateIndexSQL('idx_name_age', 'tabname', 'NAME,AGE');
+
    + +

    Data Types

    +

    Stick to a few data types that are available in most databases. Char, varchar + and numeric/number are supported by most databases. Most other data types (including + integer, boolean and float) cannot be relied on being available. I recommend + using char(1) or number(1) to hold booleans.

    +

    Different databases have different ways of representing dates and timestamps/datetime. + ADOdb attempts to display all dates in ISO (YYYY-MM-DD) format. ADOdb also provides + DBDate( ) and DBTimeStamp( ) to convert dates to formats that are acceptable + to that database. Both functions accept Unix integer timestamps and date strings + in ISO format.

    +
    $date1 = $connection->DBDate(time( ));
    $date2 = $connection->DBTimeStamp('2002-02-23 13:03:33');
    +

    We also provide functions to convert database dates to Unix timestamps:

    +
    $unixts = $recordset->UnixDate('#2002-02-30#'); # MS Access date =gt; unix timestamp
    +

    For date calculations, we have OffsetDate which allows you to calculate dates such as yesterday and next week in a RDBMS independant fashion. For example, if we want to set a field to 6 hour from now, use: +

    +$sql = 'update table set dtimefld='.$db->OffsetDate($db->sysTimeStamp, 6/24).' where ...';
+
    +

    The maximum length of a char/varchar field is also database specific. You can + only assume that field lengths of up to 250 characters are supported. This is + normally impractical for web based forum or content management systems. You + will need to be familiar with how databases handle large objects (LOBs). ADOdb + implements two functions, UpdateBlob( ) and UpdateClob( ) that allow you to + update fields holding Binary Large Objects (eg. pictures) and Character Large + Objects (eg. HTML articles):

    +
    # for oracle 
+$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1,empty_blob())');
+$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
+
+# non-oracle databases
+$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
+
    +

    Null handling is another area where differences can occur. This is a mine-field, + because 3-value logic is tricky. +

    In general, I avoid using nulls except for dates and default all my numeric + and character fields to 0 or the empty string. This maintains consistency with + PHP, where empty strings and zero are treated as equivalent, and avoids SQL + ambiguities when you use the ANY and EXISTS operators. However if your database + has significant amounts of missing or unknown data, using nulls might be a good + idea. +

    + ADOdb also supports a portable IfNull function, so you can define what to display + if the field contains a null. +

    Stored Procedures

    +

    Stored procedures are another problem area. Some databases allow recordsets + to be returned in a stored procedure (Microsoft SQL Server and Sybase), and + others only allow output parameters to be returned. Stored procedures sometimes + need to be wrapped in special syntax. For example, Oracle requires such code + to be wrapped in an anonymous block with BEGIN and END. Also internal sql operators + and functions such as +, ||, TRIM( ), SUBSTR( ) or INSTR( ) vary between vendors. +

    +

    An example of how to call a stored procedure with 2 parameters and 1 return + value follows:

    +
    	switch ($db->databaseType) {
+	case 'mssql':
+	  $sql = 'SP_RUNSOMETHING'; break;
+	case 'oci8':
+	  $sql =
+	  "declare RETVAL integer;begin :RETVAL := SP_RUNSOMETHING(:myid,:group);end;";
+	  break;
+	default:
+	  die('Unsupported feature');
+	}
+	# @RETVAL = SP_RUNSOMETHING @myid,@group
+	$stmt = $db->PrepareSP($sql);	
    	$db->Parameter($stmt,$id,'myid');
+	$db->Parameter($stmt,$group,'group');
+	# true indicates output parameter
    	    $db->Parameter($stmt,$ret,'RETVAL',true);
+	$db->Execute($stmt);
    +

    As you can see, the ADOdb API is the same for both databases. But the stored + procedure SQL syntax is quite different between databases and is not portable, + so be forewarned! However sometimes you have little choice as some systems only + allow data to be accessed via stored procedures. This is when the ultimate portability + solution might be the only solution: treating portable SQL as a localization + exercise...

    +

    SQL as a Localization Exercise

    +

    In general to provide real portability, you will have to treat SQL coding + as a localization exercise. In PHP, it has become common to define separate + language files for English, Russian, Korean, etc. Similarly, I would suggest + you have separate Sybase, Intebase, MySQL, etc files, and conditionally include + the SQL based on the database. For example, each MySQL SQL statement would be + stored in a separate variable, in a file called 'mysql-lang.inc.php'.

    +
    $sqlGetPassword = 'select password from users where userid=%s';
+$sqlSearchKeyword = quot;SELECT * FROM articles WHERE match (title,body) against (%s)";
    +

    In our main PHP file:

    +
    # define which database to load...
+$database = 'mysql';
+include_once("$database-lang.inc.php");
+
+$db = NewADOConnection($database);
+$db->PConnect(...) or die('Failed to connect to database');
+
+# search for a keyword $word
+$rs = $db->Execute(sprintf($sqlSearchKeyWord,$db->qstr($word)));
    +

    Note that we quote the $word variable using the qstr( ) function. This is because + each database quotes strings using different conventions.

    +

    +

    Final Thoughts

    +

    The best way to ensure that you have portable SQL is to have your data tables designed using +sound principles. Learn the theory of normalization and entity-relationship diagrams and model +your data carefully. Understand how joins and indexes work and how they are used to tune performance. +

    Visit the following page for more references on database theory and vendors: + http://php.weblogs.com/sql_tutorial. + Also read this article on Optimizing PHP. +

    +(c) 2002-2014 John Lim. + + + diff --git a/lib/WikiDB/adodb/docs/tute.htm b/lib/WikiDB/adodb/docs/tute.htm index 408ba75cb..6f32da48c 100644 --- a/lib/WikiDB/adodb/docs/tute.htm +++ b/lib/WikiDB/adodb/docs/tute.htm @@ -1,290 +1,290 @@ - - - - - Tutorial: Moving from MySQL to ADODB - - - -

    Tutorial: Moving from MySQL to ADODB

    - -
    		You say eether and I say eyether, 
-		You say neether and I say nyther; 
-		Eether, eyether, neether, nyther - 
-		Let's call the whole thing off ! 
-
    
-		You like potato and I like po-tah-to, 
-		You like tomato and I like to-mah-to; 
-		Potato, po-tah-to, tomato, to-mah-to - 
-		Let's call the whole thing off ! 
-
    -

    I love this song, especially the version with Louis Armstrong and Ella singing - duet. It is all about how hard it is for two people in love to be compatible - with each other. It's about compromise and finding a common ground, and that's - what this article is all about. -

    PHP is all about creating dynamic web-sites with the least fuss and the most - fun. To create these websites we need to use databases to retrieve login information, - to splash dynamic news onto the web page and store forum postings. So let's - say we were using the popular MySQL database for this. Your company has done - such a fantastic job that the Web site is more popular than your wildest dreams. - You find that MySQL cannot scale to handle the workload; time to switch databases. -

    Unfortunately in PHP every database is accessed slightly differently. To connect - to MySQL, you would use mysql_connect(); when you decide to upgrade to - Oracle or Microsoft SQL Server, you would use ocilogon() or mssql_connect() - respectively. What is worse is that the parameters you use for the different - connect functions are different also.. One database says po-tato, the other - database says pota-to. Oh-oh. -

    Let's NOT call the whole thing off

    -

    A database wrapper library such as ADODB comes in handy when you need to ensure portability. It provides - you with a common API to communicate with any supported database so you don't have to call things off.

    - -

    ADODB stands for Active Data Objects DataBase (sorry computer guys are sometimes - not very original). ADODB currently supports MySQL, PostgreSQL, Oracle, Interbase, - Microsoft SQL Server, Access, FoxPro, Sybase, ODBC and ADO. You can download - ADODB from http://php.weblogs.com/adodb. -

    MySQL Example

    -

    The most common database used with PHP is MySQL, so I guess you should be familiar - with the following code. It connects to a MySQL server at localhost, - database mydb, and executes an SQL select statement. The results are - printed, one line per row. -

    $db = mysql_connect("localhost", "root", "password");
-mysql_select_db("mydb",$db);
-$result = mysql_query("SELECT * FROM employees",$db);
-if ($result === false) die("failed"); 
-while ($fields = mysql_fetch_row($result)) {
- for ($i=0, $max=sizeof($fields); $i < $max; $i++) {
-		print $fields[$i].' ';
- }
- print "<br>\n";
-} 
-
    -

    The above code has been color-coded by section. The first section is the connection - phase. The second is the execution of the SQL, and the last section is displaying - the fields. The while loop scans the rows of the result, while the for - loop scans the fields in one row.

    -

    Here is the equivalent code in ADODB

    -
     include("adodb.inc.php");
- $db = NewADOConnection('mysql');
- $db->Connect("localhost", "root", "password", "mydb");
- $result = $db->Execute("SELECT * FROM employees");
- if ($result === false) die("failed");  
- while (!$result->EOF) {
-	for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
-		   print $result->fields[$i].' ';
-	$result->MoveNext();
-	print "<br>\n";
- }
    -

    -

    Now porting to Oracle is as simple as changing the second line to NewADOConnection('oracle'). - Let's walk through the code...

    -

    Connecting to the Database

    -

    -
    include("adodb.inc.php");
-$db = NewADOConnection('mysql');
-$db->Connect("localhost", "root", "password", "mydb");
    -

    The connection code is a bit more sophisticated than MySQL's because our needs - are more sophisticated. In ADODB, we use an object-oriented approach to managing - the complexity of handling multiple databases. We have different classes to - handle different databases. If you aren't familiar with object-oriented programing, - don't worry -- the complexity is all hidden away in the NewADOConnection() - function.

    -

    To conserve memory, we only load the PHP code specific to the database you - are connecting to. We do this by calling NewADOConnection(databasedriver). - Legal database drivers include mysql, mssql, oracle, oci8, postgres, sybase, - vfp, access, ibase and many others.

    -

    Then we create a new instance of the connection class by calling NewADOConnection(). - Finally we connect to the database using $db->Connect().

    -

    Executing the SQL

    -

    $result = $db->Execute("SELECT * - FROM employees");
    - if ($result === false) die("failed")    ; -
    -

    -

    Sending the SQL statement to the server is straight forward. Execute() will - return a recordset object on successful execution. You should check $result - as we do above. -

    An issue that confuses beginners is the fact that we have two types of objects - in ADODB, the connection object and the recordset object. When do we use each? -

    The connection object ($db) is responsible for connecting to the database, - formatting your SQL and querying the database server. The recordset object ($result) - is responsible for retrieving the results and formatting the reply as text or - as an array. -

    The only thing I need to add is that ADODB provides several helper functions - for making INSERT and UPDATE statements easier, which we will cover in the Advanced - section. -

    Retrieving the Data
    -

    -
    while (!$result->EOF) {
-   for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
-	   print $result->fields[$i].' ';
-   $result->MoveNext();
-   print "<br>\n";
-}
    -

    The paradigm for getting the data is that it's like reading a file. For every - line, we check first whether we have reached the end-of-file (EOF). While not - end-of-file, loop through each field in the row. Then move to the next line - (MoveNext) and repeat. -

    The $result->fields[] array is generated by the PHP database - extension. Some database extensions do not index the array by field name. - To force indexing by name - that is associative arrays - - use the $ADODB_FETCH_MODE global variable. -

    -	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$rs1 = $db->Execute('select * from table');
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs2 = $db->Execute('select * from table');
-	print_r($rs1->fields); // shows array([0]=>'v0',[1] =>'v1')
-	print_r($rs2->fields); // shows array(['col1']=>'v0',['col2'] =>'v1')
-
    -

    -As you can see in the above example, both recordsets store and use different fetch modes -based on the $ADODB_FETCH_MODE setting when the recordset was created by Execute().

    -

    ADOConnection

    -

    Object that performs the connection to the database, executes SQL statements - and has a set of utility functions for standardising the format of SQL statements - for issues such as concatenation and date formats.

    - -

    Other Useful Functions

    -

    $recordset->Move($pos) scrolls to that particular row. ADODB supports forward - scrolling for all databases. Some databases will not support backwards scrolling. - This is normally not a problem as you can always cache records to simulate backwards - scrolling. -

    $recordset->RecordCount() returns the number of records accessed by the - SQL statement. Some databases will return -1 because it is not supported. -

    $recordset->GetArray() returns the result as an array. -

    rs2html($recordset) is a function that is generates a HTML table based on the - $recordset passed to it. An example with the relevant lines in bold: -

       include('adodb.inc.php'); 
-   include('tohtml.inc.php'); /* includes the rs2html function */
-   $conn = ADONewConnection('mysql'); 
-   $conn->PConnect('localhost','userid','password','database');
-   $rs = $conn->Execute('select * from table');
-   rs2html($rs); /* recordset to html table */
    -

    There are many other helper functions that are listed in the documentation available at http://php.weblogs.com/adodb_manual. -

    Advanced Material

    -

    Inserts and Updates

    -

    Let's say you want to insert the following data into a database. -

    ID = 3
    - TheDate=mktime(0,0,0,8,31,2001) /* 31st August 2001 */
    - Note= sugar why don't we call it off -

    When you move to another database, your insert might no longer work.

    -

    The first problem is that each database has a different default date format. - MySQL expects YYYY-MM-DD format, while other databases have different defaults. - ADODB has a function called DBDate() that addresses this issue by converting - converting the date to the correct format.

    -

    The next problem is that the don't in the Note needs to be quoted. In - MySQL, we use don\'t but in some other databases (Sybase, Access, Microsoft - SQL Server) we use don''t. The qstr() function addresses this issue.

    -

    So how do we use the functions? Like this:

    -
    $sql = "INSERT INTO table (id, thedate,note) values (" 
-   . $ID . ','
-   . $db->DBDate($TheDate) .','
-   . $db->qstr($Note).")";
-$db->Execute($sql);
    -

    ADODB also supports $connection->Affected_Rows() (returns the - number of rows affected by last update or delete) and $recordset->Insert_ID() - (returns last autoincrement number generated by an insert statement). Be forewarned - that not all databases support the two functions.
    -

    -

    MetaTypes

    -

    You can find out more information about each of the fields (I use the words - fields and columns interchangebly) you are selecting by calling the recordset - method FetchField($fieldoffset). This will return an object with - 3 properties: name, type and max_length. -

    For example:
    -
    $recordset = $conn->Execute("select adate from table");
    $f0 = $recordset->FetchField(0);
-
    -

    Then $f0->name will hold 'adata', $f0->type - will be set to 'date'. If the max_length is unknown, it will be set to - -1. -

    One problem with handling different databases is that each database often calls - the same type by a different name. For example a timestamp type is called - datetime in one database and time in another. So ADODB has a special - MetaType($type, $max_length) function that standardises the types - to the following: -

    C: character and varchar types
    - X: text or long character (eg. more than 255 bytes wide).
    - B: blob or binary image
    - D: date
    - T: timestamp
    - L: logical (boolean)
    - I: integer
    - N: numeric (float, double, money) -

    In the above date example, -

    $recordset = $conn->Execute("select adate from table");
    - $f0 = $recordset->FetchField(0);
    - $type = $recordset->MetaType($f0->type, $f0->max_length);
    - print $type; /* should print 'D'     */ -

    -

    Select Limit and Top Support -

    ADODB has a function called $connection->SelectLimit($sql,$nrows,$offset) that allows -you to retrieve a subset of the recordset. This will take advantage of native -SELECT TOP on Microsoft products and SELECT ... LIMIT with PostgreSQL and MySQL, and -emulated if the database does not support it. -

    Caching Support -

    ADODB allows you to cache recordsets in your file system, and only requery the database -server after a certain timeout period with $connection->CacheExecute($secs2cache,$sql) and -$connection->CacheSelectLimit($secs2cache,$sql,$nrows,$offset). -

    PHP4 Session Handler Support -

    ADODB also supports PHP4 session handlers. You can store your session variables - in a database for true scalability using ADODB. For further information, visit - http://php.weblogs.com/adodb-sessions -

    Commercial Use Encouraged

    -

    If you plan to write commercial PHP applications that you want to resell, you should consider ADODB. It has been released using the lesser GPL, which means you can legally include it in commercial applications, while keeping your code proprietary. Commercial use of ADODB is strongly encouraged! We are using it internally for this reason.

    - -

    Conclusion

    -

    As a thank you for finishing this article, here are the complete lyrics for - let's call the whole thing off.
    -
    -

    -   Refrain 
-
    
-		You say eether and I say eyether, 
-		You say neether and I say nyther; 
-		Eether, eyether, neether, nyther - 
-		Let's call the whole thing off ! 
-
    
-		You like potato and I like po-tah-to, 
-		You like tomato and I like to-mah-to; 
-		Potato, po-tah-to, tomato, to-mah-to - 
-		Let's call the whole thing off ! 
-
    
-But oh, if we call the whole thing off, then we must part. 
-And oh, if we ever part, then that might break my heart. 
-
    
-		So, if you like pajamas and I like pa-jah-mas, 
-		I'll wear pajamas and give up pa-jah-mas. 
-		For we know we 
-		Need each other, so we 
-		Better call the calling off off. 
-		Let's call the whole thing off ! 
-
    
-   Second Refrain 
-
    
-		You say laughter and I say lawfter, 
-		You say after and I say awfter; 
-		Laughter, lawfter, after, awfter - 
-		Let's call the whole thing off ! 
-
    
-		You like vanilla and I like vanella, 
-		You, sa's'parilla and I sa's'parella; 
-		Vanilla, vanella, choc'late, strawb'ry - 
-		Let's call the whole thing off ! 
-
    
-But oh, if we call the whole thing off, then we must part. 
-And oh, if we ever part, then that might break my heart. 
-
    
-		So, if you go for oysters and I go for ersters, 
-		I'll order oysters and cancel the ersters. 
-		For we know we 
-		Need each other, so we 
-		Better call the calling off off. 
-		Let's call the whole thing off ! 
-
    -

    Song and lyrics by George and Ira Gershwin, introduced by Fred Astaire and Ginger Rogers -in the film "Shall We Dance?"

    -

    -(c)2001-2002 John Lim. - - - + + + + + Tutorial: Moving from MySQL to ADODB + + + +

    Tutorial: Moving from MySQL to ADODB

    + +
    		You say eether and I say eyether,
+		You say neether and I say nyther;
+		Eether, eyether, neether, nyther -
+		Let's call the whole thing off !
+
    
+		You like potato and I like po-tah-to,
+		You like tomato and I like to-mah-to;
+		Potato, po-tah-to, tomato, to-mah-to -
+		Let's call the whole thing off !
+
    +

    I love this song, especially the version with Louis Armstrong and Ella singing + duet. It is all about how hard it is for two people in love to be compatible + with each other. It's about compromise and finding a common ground, and that's + what this article is all about. +

    PHP is all about creating dynamic web-sites with the least fuss and the most + fun. To create these websites we need to use databases to retrieve login information, + to splash dynamic news onto the web page and store forum postings. So let's + say we were using the popular MySQL database for this. Your company has done + such a fantastic job that the Web site is more popular than your wildest dreams. + You find that MySQL cannot scale to handle the workload; time to switch databases. +

    Unfortunately in PHP every database is accessed slightly differently. To connect + to MySQL, you would use mysql_connect(); when you decide to upgrade to + Oracle or Microsoft SQL Server, you would use ocilogon() or mssql_connect() + respectively. What is worse is that the parameters you use for the different + connect functions are different also.. One database says po-tato, the other + database says pota-to. Oh-oh. +

    Let's NOT call the whole thing off

    +

    A database wrapper library such as ADODB comes in handy when you need to ensure portability. It provides + you with a common API to communicate with any supported database so you don't have to call things off.

    + +

    ADODB stands for Active Data Objects DataBase (sorry computer guys are sometimes + not very original). ADODB currently supports MySQL, PostgreSQL, Oracle, Interbase, + Microsoft SQL Server, Access, FoxPro, Sybase, ODBC and ADO. You can download + ADODB from http://php.weblogs.com/adodb. +

    MySQL Example

    +

    The most common database used with PHP is MySQL, so I guess you should be familiar + with the following code. It connects to a MySQL server at localhost, + database mydb, and executes an SQL select statement. The results are + printed, one line per row. +

    $db = mysql_connect("localhost", "root", "password");
+mysql_select_db("mydb",$db);
+$result = mysql_query("SELECT * FROM employees",$db);
+if ($result === false) die("failed");
+while ($fields = mysql_fetch_row($result)) {
+ for ($i=0, $max=sizeof($fields); $i < $max; $i++) {
+		print $fields[$i].' ';
+ }
+ print "<br>\n";
+}
+
    +

    The above code has been color-coded by section. The first section is the connection + phase. The second is the execution of the SQL, and the last section is displaying + the fields. The while loop scans the rows of the result, while the for + loop scans the fields in one row.

    +

    Here is the equivalent code in ADODB

    +
     include("adodb.inc.php");
+ $db = NewADOConnection('mysql');
+ $db->Connect("localhost", "root", "password", "mydb");
+ $result = $db->Execute("SELECT * FROM employees");
+ if ($result === false) die("failed");
+ while (!$result->EOF) {
+	for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
+		   print $result->fields[$i].' ';
+	$result->MoveNext();
+	print "<br>\n";
+ }
    +

    +

    Now porting to Oracle is as simple as changing the second line to NewADOConnection('oracle'). + Let's walk through the code...

    +

    Connecting to the Database

    +

    +
    include("adodb.inc.php");
+$db = NewADOConnection('mysql');
+$db->Connect("localhost", "root", "password", "mydb");
    +

    The connection code is a bit more sophisticated than MySQL's because our needs + are more sophisticated. In ADODB, we use an object-oriented approach to managing + the complexity of handling multiple databases. We have different classes to + handle different databases. If you aren't familiar with object-oriented programing, + don't worry -- the complexity is all hidden away in the NewADOConnection() + function.

    +

    To conserve memory, we only load the PHP code specific to the database you + are connecting to. We do this by calling NewADOConnection(databasedriver). + Legal database drivers include mysql, mssql, oracle, oci8, postgres, sybase, + vfp, access, ibase and many others.

    +

    Then we create a new instance of the connection class by calling NewADOConnection(). + Finally we connect to the database using $db->Connect().

    +

    Executing the SQL

    +

    $result = $db->Execute("SELECT * + FROM employees");
    + if ($result === false) die("failed")    ; +
    +

    +

    Sending the SQL statement to the server is straight forward. Execute() will + return a recordset object on successful execution. You should check $result + as we do above. +

    An issue that confuses beginners is the fact that we have two types of objects + in ADODB, the connection object and the recordset object. When do we use each? +

    The connection object ($db) is responsible for connecting to the database, + formatting your SQL and querying the database server. The recordset object ($result) + is responsible for retrieving the results and formatting the reply as text or + as an array. +

    The only thing I need to add is that ADODB provides several helper functions + for making INSERT and UPDATE statements easier, which we will cover in the Advanced + section. +

    Retrieving the Data
    +

    +
    while (!$result->EOF) {
+   for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
+	   print $result->fields[$i].' ';
+   $result->MoveNext();
+   print "<br>\n";
+}
    +

    The paradigm for getting the data is that it's like reading a file. For every + line, we check first whether we have reached the end-of-file (EOF). While not + end-of-file, loop through each field in the row. Then move to the next line + (MoveNext) and repeat. +

    The $result->fields[] array is generated by the PHP database + extension. Some database extensions do not index the array by field name. + To force indexing by name - that is associative arrays - + use the $ADODB_FETCH_MODE global variable. +

    +	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$rs1 = $db->Execute('select * from table');
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs2 = $db->Execute('select * from table');
+	print_r($rs1->fields); // shows array([0]=>'v0',[1] =>'v1')
+	print_r($rs2->fields); // shows array(['col1']=>'v0',['col2'] =>'v1')
+
    +

    +As you can see in the above example, both recordsets store and use different fetch modes +based on the $ADODB_FETCH_MODE setting when the recordset was created by Execute().

    +

    ADOConnection

    +

    Object that performs the connection to the database, executes SQL statements + and has a set of utility functions for standardising the format of SQL statements + for issues such as concatenation and date formats.

    + +

    Other Useful Functions

    +

    $recordset->Move($pos) scrolls to that particular row. ADODB supports forward + scrolling for all databases. Some databases will not support backwards scrolling. + This is normally not a problem as you can always cache records to simulate backwards + scrolling. +

    $recordset->RecordCount() returns the number of records accessed by the + SQL statement. Some databases will return -1 because it is not supported. +

    $recordset->GetArray() returns the result as an array. +

    rs2html($recordset) is a function that is generates a HTML table based on the + $recordset passed to it. An example with the relevant lines in bold: +

       include('adodb.inc.php');
+   include('tohtml.inc.php'); /* includes the rs2html function */
+   $conn = ADONewConnection('mysql');
+   $conn->PConnect('localhost','userid','password','database');
+   $rs = $conn->Execute('select * from table');
+   rs2html($rs); /* recordset to html table */
    +

    There are many other helper functions that are listed in the documentation available at http://php.weblogs.com/adodb_manual. +

    Advanced Material

    +

    Inserts and Updates

    +

    Let's say you want to insert the following data into a database. +

    ID = 3
    + TheDate=mktime(0,0,0,8,31,2001) /* 31st August 2001 */
    + Note= sugar why don't we call it off +

    When you move to another database, your insert might no longer work.

    +

    The first problem is that each database has a different default date format. + MySQL expects YYYY-MM-DD format, while other databases have different defaults. + ADODB has a function called DBDate() that addresses this issue by converting + converting the date to the correct format.

    +

    The next problem is that the don't in the Note needs to be quoted. In + MySQL, we use don\'t but in some other databases (Sybase, Access, Microsoft + SQL Server) we use don''t. The qstr() function addresses this issue.

    +

    So how do we use the functions? Like this:

    +
    $sql = "INSERT INTO table (id, thedate,note) values ("
+   . $ID . ','
+   . $db->DBDate($TheDate) .','
+   . $db->qstr($Note).")";
+$db->Execute($sql);
    +

    ADODB also supports $connection->Affected_Rows() (returns the + number of rows affected by last update or delete) and $recordset->Insert_ID() + (returns last autoincrement number generated by an insert statement). Be forewarned + that not all databases support the two functions.
    +

    +

    MetaTypes

    +

    You can find out more information about each of the fields (I use the words + fields and columns interchangebly) you are selecting by calling the recordset + method FetchField($fieldoffset). This will return an object with + 3 properties: name, type and max_length. +

    For example:
    +
    $recordset = $conn->Execute("select adate from table");
    $f0 = $recordset->FetchField(0);
+
    +

    Then $f0->name will hold 'adata', $f0->type + will be set to 'date'. If the max_length is unknown, it will be set to + -1. +

    One problem with handling different databases is that each database often calls + the same type by a different name. For example a timestamp type is called + datetime in one database and time in another. So ADODB has a special + MetaType($type, $max_length) function that standardises the types + to the following: +

    C: character and varchar types
    + X: text or long character (eg. more than 255 bytes wide).
    + B: blob or binary image
    + D: date
    + T: timestamp
    + L: logical (boolean)
    + I: integer
    + N: numeric (float, double, money) +

    In the above date example, +

    $recordset = $conn->Execute("select adate from table");
    + $f0 = $recordset->FetchField(0);
    + $type = $recordset->MetaType($f0->type, $f0->max_length);
    + print $type; /* should print 'D'     */ +

    +

    Select Limit and Top Support +

    ADODB has a function called $connection->SelectLimit($sql,$nrows,$offset) that allows +you to retrieve a subset of the recordset. This will take advantage of native +SELECT TOP on Microsoft products and SELECT ... LIMIT with PostgreSQL and MySQL, and +emulated if the database does not support it. +

    Caching Support +

    ADODB allows you to cache recordsets in your file system, and only requery the database +server after a certain timeout period with $connection->CacheExecute($secs2cache,$sql) and +$connection->CacheSelectLimit($secs2cache,$sql,$nrows,$offset). +

    PHP4 Session Handler Support +

    ADODB also supports PHP4 session handlers. You can store your session variables + in a database for true scalability using ADODB. For further information, visit + http://php.weblogs.com/adodb-sessions +

    Commercial Use Encouraged

    +

    If you plan to write commercial PHP applications that you want to resell, you should consider ADODB. It has been released using the lesser GPL, which means you can legally include it in commercial applications, while keeping your code proprietary. Commercial use of ADODB is strongly encouraged! We are using it internally for this reason.

    + +

    Conclusion

    +

    As a thank you for finishing this article, here are the complete lyrics for + let's call the whole thing off.
    +
    +

    +   Refrain
+
    
+		You say eether and I say eyether,
+		You say neether and I say nyther;
+		Eether, eyether, neether, nyther -
+		Let's call the whole thing off !
+
    
+		You like potato and I like po-tah-to,
+		You like tomato and I like to-mah-to;
+		Potato, po-tah-to, tomato, to-mah-to -
+		Let's call the whole thing off !
+
    
+But oh, if we call the whole thing off, then we must part.
+And oh, if we ever part, then that might break my heart.
+
    
+		So, if you like pajamas and I like pa-jah-mas,
+		I'll wear pajamas and give up pa-jah-mas.
+		For we know we
+		Need each other, so we
+		Better call the calling off off.
+		Let's call the whole thing off !
+
    
+   Second Refrain
+
    
+		You say laughter and I say lawfter,
+		You say after and I say awfter;
+		Laughter, lawfter, after, awfter -
+		Let's call the whole thing off !
+
    
+		You like vanilla and I like vanella,
+		You, sa's'parilla and I sa's'parella;
+		Vanilla, vanella, choc'late, strawb'ry -
+		Let's call the whole thing off !
+
    
+But oh, if we call the whole thing off, then we must part.
+And oh, if we ever part, then that might break my heart.
+
    
+		So, if you go for oysters and I go for ersters,
+		I'll order oysters and cancel the ersters.
+		For we know we
+		Need each other, so we
+		Better call the calling off off.
+		Let's call the whole thing off !
+
    +

    Song and lyrics by George and Ira Gershwin, introduced by Fred Astaire and Ginger Rogers +in the film "Shall We Dance?"

    +

    +(c) 2001-2014 John Lim. + + + diff --git a/lib/WikiDB/adodb/drivers/adodb-access.inc.php b/lib/WikiDB/adodb/drivers/adodb-access.inc.php index 17876506e..a0932a05a 100644 --- a/lib/WikiDB/adodb/drivers/adodb-access.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-access.inc.php @@ -1,24 +1,24 @@ ADODB_odbc(); } - + function Time() { return time(); } - + function BeginTrans() { return false;} - - function IfNull( $field, $ifNull ) + + function IfNull( $field, $ifNull ) { return " IIF(IsNull($field), $ifNull, $field) "; // if Access } @@ -52,16 +52,16 @@ class ADODB_access extends ADODB_odbc { function MetaTables() { global $ADODB_FETCH_MODE; - + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $qid = odbc_tables($this->_connectionID); $rs = new ADORecordSet_odbc($qid); $ADODB_FETCH_MODE = $savem; if (!$rs) return false; - + $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change; - + $arr = $rs->GetArray(); //print_pre($arr); $arr2 = array(); @@ -73,15 +73,14 @@ class ADODB_access extends ADODB_odbc { }*/ } - -class ADORecordSet_access extends ADORecordSet_odbc { - - var $databaseType = "access"; - + +class ADORecordSet_access extends ADORecordSet_odbc { + + var $databaseType = "access"; + function ADORecordSet_access($id,$mode=false) { return $this->ADORecordSet_odbc($id,$mode); } }// class -} -?> \ No newline at end of file +} diff --git a/lib/WikiDB/adodb/drivers/adodb-ado.inc.php b/lib/WikiDB/adodb/drivers/adodb-ado.inc.php index 15b867799..2c312f7d8 100644 --- a/lib/WikiDB/adodb/drivers/adodb-ado.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-ado.inc.php @@ -1,31 +1,31 @@ _affectedRows = new VARIANT; } @@ -47,14 +47,14 @@ class ADODB_ado extends ADOConnection { if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider; return array('description' => $desc, 'version' => ''); } - + function _affectedrows() { if (PHP_VERSION >= 5) return $this->_affectedRows; - + return $this->_affectedRows->value; } - + // you can also pass a connection string like this: // // $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB'); @@ -62,49 +62,49 @@ class ADODB_ado extends ADOConnection { { $u = 'UID'; $p = 'PWD'; - + if (!empty($this->charPage)) $dbc = new COM('ADODB.Connection',null,$this->charPage); else $dbc = new COM('ADODB.Connection'); - + if (! $dbc) return false; /* special support if provider is mssql or access */ if ($argProvider=='mssql') { $u = 'User Id'; //User parameter name for OLEDB - $p = 'Password'; + $p = 'Password'; $argProvider = "SQLOLEDB"; // SQL Server Provider - + // not yet //if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename"; - + //use trusted conection for SQL if username not specified if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes"; } else if ($argProvider=='access') $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider - - if ($argProvider) $dbc->Provider = $argProvider; - + + if ($argProvider) $dbc->Provider = $argProvider; + if ($argUsername) $argHostname .= ";$u=$argUsername"; if ($argPassword)$argHostname .= ";$p=$argPassword"; - + if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
    \n version=$dbc->version"); // @ added below for php 4.0.1 and earlier @$dbc->Open((string) $argHostname); - + $this->_connectionID = $dbc; - + $dbc->CursorLocation = $this->_cursor_location; return $dbc->State > 0; } - + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL') { return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider); - } - + } + /* adSchemaCatalogs = 1, adSchemaCharacterSets = 2, @@ -146,12 +146,12 @@ class ADODB_ado extends ADOConnection { adSchemaMembers = 38 */ - + function MetaTables() { $arr= array(); $dbc = $this->_connectionID; - + $adors=@$dbc->OpenSchema(20);//tables if ($adors){ $f = $adors->Fields(2);//table/view name @@ -165,25 +165,25 @@ class ADODB_ado extends ADOConnection { } $adors->Close(); } - + return $arr; } - + function MetaColumns($table, $normalize=true) { $table = strtoupper($table); $arr = array(); $dbc = $this->_connectionID; - + $adors=@$dbc->OpenSchema(4);//tables - + if ($adors){ $t = $adors->Fields(2);//table/view name while (!$adors->EOF){ - - + + if (strtoupper($t->Value) == $table) { - + $fld = new ADOFieldObject(); $c = $adors->Fields(3); $fld->name = $c->Value; @@ -191,7 +191,7 @@ class ADODB_ado extends ADOConnection { $fld->max_length = -1; $arr[strtoupper($fld->name)]=$fld; } - + $adors->MoveNext(); } $adors->Close(); @@ -199,20 +199,20 @@ class ADODB_ado extends ADOConnection { $false = false; return empty($arr) ? $false : $arr; } - - + + /* returns queryID or false */ - function _query($sql,$inputarr=false) + function _query($sql,$inputarr=false) { - + $dbc = $this->_connectionID; $false = false; - - // return rs + + // return rs if ($inputarr) { - + if (!empty($this->charPage)) $oCmd = new COM('ADODB.Command',null,$this->charPage); else @@ -238,7 +238,7 @@ class ADODB_ado extends ADOConnection { $len=1; else $this->adoParameterType = 130; - + // name, type, direction 1 = input, len, $p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val); @@ -250,12 +250,12 @@ class ADODB_ado extends ADOConnection { if ($dbc->Errors->Count > 0) return $false; return $rs; } - + $rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option); if ($dbc->Errors->Count > 0) return $false; if (! $rs) return $false; - + if ($rs->State == 0) { $true = true; return $true; // 0 = adStateClosed means no records returned @@ -263,11 +263,11 @@ class ADODB_ado extends ADOConnection { return $rs; } - - function BeginTrans() - { + + function BeginTrans() + { if ($this->transOff) return true; - + if (isset($this->_thisTransactions)) if (!$this->_thisTransactions) return false; else { @@ -279,12 +279,12 @@ class ADODB_ado extends ADOConnection { $this->transCnt += 1; return true; } - - function CommitTrans($ok=true) - { + + function CommitTrans($ok=true) + { if (!$ok) return $this->RollbackTrans(); if ($this->transOff) return true; - + @$this->_connectionID->CommitTrans(); if ($this->transCnt) @$this->transCnt -= 1; return true; @@ -295,10 +295,10 @@ class ADODB_ado extends ADOConnection { if ($this->transCnt) @$this->transCnt -= 1; return true; } - - /* Returns: the last error message from previous database operation */ - function ErrorMsg() + /* Returns: the last error message from previous database operation */ + + function ErrorMsg() { if (!$this->_connectionID) return "No connection established"; $errc = $this->_connectionID->Errors; @@ -307,8 +307,8 @@ class ADODB_ado extends ADOConnection { $err = $errc->Item($errc->Count-1); return $err->Description; } - - function ErrorNo() + + function ErrorNo() { $errc = $this->_connectionID->Errors; if ($errc->Count == 0) return 0; @@ -323,27 +323,27 @@ class ADODB_ado extends ADOConnection { $this->_connectionID = false; return true; } - - + + } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_ado extends ADORecordSet { - +class ADORecordSet_ado extends ADORecordSet { + var $bind = false; - var $databaseType = "ado"; - var $dataProvider = "ado"; + var $databaseType = "ado"; + var $dataProvider = "ado"; var $_tarr = false; // caches the types var $_flds; // and field objects var $canSeek = true; var $hideErrors = true; - + function ADORecordSet_ado($id,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } @@ -355,7 +355,7 @@ class ADORecordSet_ado extends ADORecordSet { // returns the field object function FetchField($fieldOffset = -1) { $off=$fieldOffset+1; // offsets begin at 1 - + $o= new ADOFieldObject(); $rs = $this->_queryID; $f = $rs->Fields($fieldOffset); @@ -363,12 +363,12 @@ class ADORecordSet_ado extends ADORecordSet { $t = $f->Type; $o->type = $this->MetaType($t); $o->max_length = $f->DefinedSize; - $o->ado_type = $t; + $o->ado_type = $t; //print "off=$off name=$o->name type=$o->type len=$o->max_length
    "; return $o; } - + /* Use associative array to get fields array */ function Fields($colname) { @@ -380,25 +380,25 @@ class ADORecordSet_ado extends ADORecordSet { $this->bind[strtoupper($o->name)] = $i; } } - + return $this->fields[$this->bind[strtoupper($colname)]]; } - + function _initrs() { $rs = $this->_queryID; $this->_numOfRows = $rs->RecordCount; - + $f = $rs->Fields; $this->_numOfFields = $f->Count; } - - + + // should only be used to move forward as we normally use forward-only cursors function _seek($row) { - $rs = $this->_queryID; + $rs = $this->_queryID; // absoluteposition doesn't work -- my maths is wrong ? // $rs->AbsolutePosition->$row-2; // return true; @@ -406,10 +406,10 @@ class ADORecordSet_ado extends ADORecordSet { @$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst return true; } - + /* OLEDB types - + enum DBTYPEENUM { DBTYPE_EMPTY = 0, DBTYPE_NULL = 1, @@ -445,9 +445,9 @@ class ADORecordSet_ado extends ADORecordSet { DBTYPE_DBDATE = 133, DBTYPE_DBTIME = 134, DBTYPE_DBTIMESTAMP = 135 - + ADO Types - + adEmpty = 0, adTinyInt = 16, adSmallInt = 2, @@ -467,7 +467,7 @@ class ADORecordSet_ado extends ADORecordSet { adUserDefined = 132, adVariant = 12, adIDispatch = 9, - adIUnknown = 13, + adIUnknown = 13, adGUID = 72, adDate = 7, adDBDate = 133, @@ -496,9 +496,9 @@ class ADORecordSet_ado extends ADORecordSet { $t = $fieldobj->type; $len = $fieldobj->max_length; } - + if (!is_numeric($t)) return $t; - + switch ($t) { case 0: case 12: // variant @@ -511,7 +511,7 @@ class ADORecordSet_ado extends ADORecordSet { case 204: // varBin case 72: // guid if ($len <= $this->blobSize) return 'C'; - + case 201: case 203: return 'X'; @@ -521,12 +521,12 @@ class ADORecordSet_ado extends ADORecordSet { return 'B'; case 7: case 133: return 'D'; - + case 134: case 135: return 'T'; - + case 11: return 'L'; - + case 16:// adTinyInt = 16, case 2://adSmallInt = 2, case 3://adInteger = 3, @@ -539,17 +539,17 @@ class ADORecordSet_ado extends ADORecordSet { default: return 'N'; } } - + // time stamp not supported yet function _fetch() - { + { $rs = $this->_queryID; if (!$rs or $rs->EOF) { $this->fields = false; return false; } $this->fields = array(); - + if (!$this->_tarr) { $tarr = array(); $flds = array(); @@ -559,12 +559,12 @@ class ADORecordSet_ado extends ADORecordSet { $tarr[] = $f->Type; } // bind types and flds only once - $this->_tarr = $tarr; + $this->_tarr = $tarr; $this->_flds = $flds; } $t = reset($this->_tarr); $f = reset($this->_flds); - + if ($this->hideErrors) $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) { //echo "

    ",$t,' ';var_dump($f->value); echo '

    '; @@ -575,12 +575,12 @@ class ADORecordSet_ado extends ADORecordSet { if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value); // VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00 $val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600; - else + else $val = $f->value; $this->fields[] = adodb_date('Y-m-d H:i:s',$val); } - break; - case 133:// A date value (yyyymmdd) + break; + case 133:// A date value (yyyymmdd) if ($val = $f->value) { $this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2); } else @@ -591,7 +591,7 @@ class ADORecordSet_ado extends ADORecordSet { 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); } @@ -610,11 +610,11 @@ class ADORecordSet_ado extends ADORecordSet { else $val = 0; } if(is_null($f->value)) $val = null; - + $this->fields[] = $val; break; default: - $this->fields[] = $f->value; + $this->fields[] = $f->value; break; } //print " $f->value $t, "; @@ -623,27 +623,27 @@ class ADORecordSet_ado extends ADORecordSet { } // for if ($this->hideErrors) error_reporting($olde); @$rs->MoveNext(); // @ needed for some versions of PHP! - + if ($this->fetchMode & ADODB_FETCH_ASSOC) { $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE); } return true; } - + function NextRecordSet() { $rs = $this->_queryID; $this->_queryID = $rs->NextRecordSet(); //$this->_queryID = $this->_QueryId->NextRecordSet(); if ($this->_queryID == null) return false; - + $this->_currentRow = -1; $this->_currentPage = -1; $this->bind = false; $this->fields = false; $this->_flds = false; $this->_tarr = false; - + $this->_inited = false; $this->Init(); return true; @@ -652,9 +652,7 @@ class ADORecordSet_ado extends ADORecordSet { function _close() { $this->_flds = false; @$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk) - $this->_queryID = false; + $this->_queryID = false; } } - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php b/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php index 7aa9d9704..9f5cea25f 100644 --- a/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php @@ -1,31 +1,31 @@ _affectedRows = new VARIANT; } @@ -47,14 +47,14 @@ class ADODB_ado extends ADOConnection { if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider; return array('description' => $desc, 'version' => ''); } - + function _affectedrows() { if (PHP_VERSION >= 5) return $this->_affectedRows; - + return $this->_affectedRows->value; } - + // you can also pass a connection string like this: // // $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB'); @@ -63,73 +63,73 @@ class ADODB_ado extends ADOConnection { // two modes // - if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat // - if $argProvider is not empty, then $argDBorProvider holds db - - + + if ($argProvider) { $argDatabasename = $argDBorProvider; } else { $argDatabasename = ''; if ($argDBorProvider) $argProvider = $argDBorProvider; - else if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */ + else if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */ $argProvider = 'MSDASQL'; } - - + + try { $u = 'UID'; $p = 'PWD'; - + if (!empty($this->charPage)) $dbc = new COM('ADODB.Connection',null,$this->charPage); else $dbc = new COM('ADODB.Connection'); - + if (! $dbc) return false; /* special support if provider is mssql or access */ if ($argProvider=='mssql') { $u = 'User Id'; //User parameter name for OLEDB - $p = 'Password'; + $p = 'Password'; $argProvider = "SQLOLEDB"; // SQL Server Provider - + // not yet //if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename"; - + //use trusted conection for SQL if username not specified if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes"; } else if ($argProvider=='access') $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider - - if ($argProvider) $dbc->Provider = $argProvider; - if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname"; - + if ($argProvider) $dbc->Provider = $argProvider; - if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename"; + if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname"; + + + if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename"; if ($argUsername) $argHostname .= ";$u=$argUsername"; if ($argPassword)$argHostname .= ";$p=$argPassword"; - + if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
    \n version=$dbc->version"); // @ added below for php 4.0.1 and earlier @$dbc->Open((string) $argHostname); - + $this->_connectionID = $dbc; - + $dbc->CursorLocation = $this->_cursor_location; return $dbc->State > 0; } catch (exception $e) { if ($this->debug) echo "
    ",$argHostname,"\n",$e,"
    \n"; } - + return false; } - + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL') { return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider); - } - + } + /* adSchemaCatalogs = 1, adSchemaCharacterSets = 2, @@ -171,12 +171,12 @@ class ADODB_ado extends ADOConnection { adSchemaMembers = 38 */ - + function MetaTables() { $arr= array(); $dbc = $this->_connectionID; - + $adors=@$dbc->OpenSchema(20);//tables if ($adors){ $f = $adors->Fields(2);//table/view name @@ -190,25 +190,25 @@ class ADODB_ado extends ADOConnection { } $adors->Close(); } - + return $arr; } - + function MetaColumns($table, $normalize=true) { $table = strtoupper($table); $arr= array(); $dbc = $this->_connectionID; - + $adors=@$dbc->OpenSchema(4);//tables - + if ($adors){ $t = $adors->Fields(2);//table/view name while (!$adors->EOF){ - - + + if (strtoupper($t->Value) == $table) { - + $fld = new ADOFieldObject(); $c = $adors->Fields(3); $fld->name = $c->Value; @@ -216,28 +216,28 @@ class ADODB_ado extends ADOConnection { $fld->max_length = -1; $arr[strtoupper($fld->name)]=$fld; } - + $adors->MoveNext(); } $adors->Close(); } - + return $arr; } - + /* returns queryID or false */ - function _query($sql,$inputarr=false) + function _query($sql,$inputarr=false) { try { // In PHP5, all COM errors are exceptions, so to maintain old behaviour... - + $dbc = $this->_connectionID; - - // return rs - + + // return rs + $false = false; - + if ($inputarr) { - + if (!empty($this->charPage)) $oCmd = new COM('ADODB.Command',null,$this->charPage); else @@ -261,42 +261,42 @@ class ADODB_ado extends ADOConnection { $len=1; else $this->adoParameterType = 130; - + // name, type, direction 1 = input, len, $p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val); $oCmd->Parameters->Append($p); } - + $p = false; $rs = $oCmd->Execute(); $e = $dbc->Errors; if ($dbc->Errors->Count > 0) return $false; return $rs; } - + $rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option); - + if ($dbc->Errors->Count > 0) return $false; if (! $rs) return $false; - + if ($rs->State == 0) { $true = true; return $true; // 0 = adStateClosed means no records returned } return $rs; - + } catch (exception $e) { - + } return $false; } - - function BeginTrans() - { + + function BeginTrans() + { if ($this->transOff) return true; - + if (isset($this->_thisTransactions)) if (!$this->_thisTransactions) return false; else { @@ -308,11 +308,11 @@ class ADODB_ado extends ADOConnection { $this->transCnt += 1; return true; } - function CommitTrans($ok=true) - { + function CommitTrans($ok=true) + { if (!$ok) return $this->RollbackTrans(); if ($this->transOff) return true; - + @$this->_connectionID->CommitTrans(); if ($this->transCnt) @$this->transCnt -= 1; return true; @@ -323,14 +323,14 @@ class ADODB_ado extends ADOConnection { if ($this->transCnt) @$this->transCnt -= 1; return true; } - - /* Returns: the last error message from previous database operation */ - function ErrorMsg() + /* Returns: the last error message from previous database operation */ + + function ErrorMsg() { if (!$this->_connectionID) return "No connection established"; $errmsg = ''; - + try { $errc = $this->_connectionID->Errors; if (!$errc) return "No Errors object found"; @@ -341,8 +341,8 @@ class ADODB_ado extends ADOConnection { } return $errmsg; } - - function ErrorNo() + + function ErrorNo() { $errc = $this->_connectionID->Errors; if ($errc->Count == 0) return 0; @@ -357,27 +357,27 @@ class ADODB_ado extends ADOConnection { $this->_connectionID = false; return true; } - - + + } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_ado extends ADORecordSet { - +class ADORecordSet_ado extends ADORecordSet { + var $bind = false; - var $databaseType = "ado"; - var $dataProvider = "ado"; + var $databaseType = "ado"; + var $dataProvider = "ado"; var $_tarr = false; // caches the types var $_flds; // and field objects var $canSeek = true; var $hideErrors = true; - + function ADORecordSet_ado($id,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } @@ -389,23 +389,23 @@ class ADORecordSet_ado extends ADORecordSet { // returns the field object function FetchField($fieldOffset = -1) { $off=$fieldOffset+1; // offsets begin at 1 - + $o= new ADOFieldObject(); $rs = $this->_queryID; if (!$rs) return false; - + $f = $rs->Fields($fieldOffset); $o->name = $f->Name; $t = $f->Type; $o->type = $this->MetaType($t); $o->max_length = $f->DefinedSize; $o->ado_type = $t; - + //print "off=$off name=$o->name type=$o->type len=$o->max_length
    "; return $o; } - + /* Use associative array to get fields array */ function Fields($colname) { @@ -417,15 +417,15 @@ class ADORecordSet_ado extends ADORecordSet { $this->bind[strtoupper($o->name)] = $i; } } - + return $this->fields[$this->bind[strtoupper($colname)]]; } - + function _initrs() { $rs = $this->_queryID; - + try { $this->_numOfRows = $rs->RecordCount; } catch (Exception $e) { @@ -434,12 +434,12 @@ class ADORecordSet_ado extends ADORecordSet { $f = $rs->Fields; $this->_numOfFields = $f->Count; } - - + + // should only be used to move forward as we normally use forward-only cursors function _seek($row) { - $rs = $this->_queryID; + $rs = $this->_queryID; // absoluteposition doesn't work -- my maths is wrong ? // $rs->AbsolutePosition->$row-2; // return true; @@ -447,10 +447,10 @@ class ADORecordSet_ado extends ADORecordSet { @$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst return true; } - + /* OLEDB types - + enum DBTYPEENUM { DBTYPE_EMPTY = 0, DBTYPE_NULL = 1, @@ -486,9 +486,9 @@ class ADORecordSet_ado extends ADORecordSet { DBTYPE_DBDATE = 133, DBTYPE_DBTIME = 134, DBTYPE_DBTIMESTAMP = 135 - + ADO Types - + adEmpty = 0, adTinyInt = 16, adSmallInt = 2, @@ -508,7 +508,7 @@ class ADORecordSet_ado extends ADORecordSet { adUserDefined = 132, adVariant = 12, adIDispatch = 9, - adIUnknown = 13, + adIUnknown = 13, adGUID = 72, adDate = 7, adDBDate = 133, @@ -537,9 +537,9 @@ class ADORecordSet_ado extends ADORecordSet { $t = $fieldobj->type; $len = $fieldobj->max_length; } - + if (!is_numeric($t)) return $t; - + switch ($t) { case 0: case 12: // variant @@ -552,7 +552,7 @@ class ADORecordSet_ado extends ADORecordSet { case 204: // varBin case 72: // guid if ($len <= $this->blobSize) return 'C'; - + case 201: case 203: return 'X'; @@ -562,12 +562,12 @@ class ADORecordSet_ado extends ADORecordSet { return 'B'; case 7: case 133: return 'D'; - + case 134: case 135: return 'T'; - + case 11: return 'L'; - + case 16:// adTinyInt = 16, case 2://adSmallInt = 2, case 3://adInteger = 3, @@ -580,17 +580,17 @@ class ADORecordSet_ado extends ADORecordSet { default: return 'N'; } } - + // time stamp not supported yet function _fetch() - { + { $rs = $this->_queryID; if (!$rs or $rs->EOF) { $this->fields = false; return false; } $this->fields = array(); - + if (!$this->_tarr) { $tarr = array(); $flds = array(); @@ -600,12 +600,12 @@ class ADORecordSet_ado extends ADORecordSet { $tarr[] = $f->Type; } // bind types and flds only once - $this->_tarr = $tarr; + $this->_tarr = $tarr; $this->_flds = $flds; } $t = reset($this->_tarr); $f = reset($this->_flds); - + if ($this->hideErrors) $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) { //echo "

    ",$t,' ';var_dump($f->value); echo '

    '; @@ -616,12 +616,12 @@ class ADORecordSet_ado extends ADORecordSet { if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value); // VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00 $val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600; - else + else $val = $f->value; $this->fields[] = adodb_date('Y-m-d H:i:s',$val); } - break; - case 133:// A date value (yyyymmdd) + break; + case 133:// A date value (yyyymmdd) if ($val = $f->value) { $this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2); } else @@ -632,7 +632,7 @@ class ADORecordSet_ado extends ADORecordSet { 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); } @@ -655,11 +655,11 @@ class ADORecordSet_ado extends ADORecordSet { else $val = 0; } if(is_null($f->value)) $val = null; - + $this->fields[] = $val; break; default: - $this->fields[] = $f->value; + $this->fields[] = $f->value; break; } //print " $f->value $t, "; @@ -668,27 +668,27 @@ class ADORecordSet_ado extends ADORecordSet { } // for if ($this->hideErrors) error_reporting($olde); @$rs->MoveNext(); // @ needed for some versions of PHP! - + if ($this->fetchMode & ADODB_FETCH_ASSOC) { $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE); } return true; } - + function NextRecordSet() { $rs = $this->_queryID; $this->_queryID = $rs->NextRecordSet(); //$this->_queryID = $this->_QueryId->NextRecordSet(); if ($this->_queryID == null) return false; - + $this->_currentRow = -1; $this->_currentPage = -1; $this->bind = false; $this->fields = false; $this->_flds = false; $this->_tarr = false; - + $this->_inited = false; $this->Init(); return true; @@ -700,9 +700,7 @@ class ADORecordSet_ado extends ADORecordSet { @$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk) } catch (Exception $e) { } - $this->_queryID = false; + $this->_queryID = false; } } - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php b/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php index d1632eb9e..ad8a98266 100644 --- a/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php @@ -1,13 +1,13 @@ ADODB_ado(); } - + /*function BeginTrans() { return false;} - + function CommitTrans() { return false;} - + function RollbackTrans() { return false;}*/ } - -class ADORecordSet_ado_access extends ADORecordSet_ado { - - var $databaseType = "ado_access"; - + +class ADORecordSet_ado_access extends ADORecordSet_ado { + + var $databaseType = "ado_access"; + function ADORecordSet_ado_access($id,$mode=false) { return $this->ADORecordSet_ado($id,$mode); } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php b/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php index 682f2540b..c03c0fae0 100644 --- a/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php @@ -1,17 +1,17 @@ ADODB_ado(); } - + function _insertid() { return $this->GetOne('select SCOPE_IDENTITY()'); } - + function _affectedrows() { return $this->GetOne('select @@rowcount'); } - - function SetTransactionMode( $transaction_mode ) + + function SetTransactionMode( $transaction_mode ) { $this->_transmode = $transaction_mode; if (empty($transaction_mode)) { @@ -64,25 +64,25 @@ class ADODB_ado_mssql extends ADODB_ado { if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode; $this->Execute("SET TRANSACTION ".$transaction_mode); } - + function qstr($s,$magic_quotes=false) { $s = ADOConnection::qstr($s, $magic_quotes); return str_replace("\0", "\\\\000", $s); } - + function MetaColumns($table, $normalize=true) { $table = strtoupper($table); $arr= array(); $dbc = $this->_connectionID; - + $osoptions = array(); $osoptions[0] = null; $osoptions[1] = null; $osoptions[2] = $table; $osoptions[3] = null; - + $adors=@$dbc->OpenSchema(4, $osoptions);//tables if ($adors){ @@ -93,7 +93,7 @@ class ADODB_ado_mssql extends ADODB_ado { $fld->type = 'CHAR'; // cannot discover type in ADO! $fld->max_length = -1; $arr[strtoupper($fld->name)]=$fld; - + $adors->MoveNext(); } $adors->Close(); @@ -101,10 +101,10 @@ class ADODB_ado_mssql extends ADODB_ado { $false = false; return empty($arr) ? $false : $arr; } - + function CreateSequence($seq='adodbseq',$start=1) { - + $this->Execute('BEGIN TRANSACTION adodbseq'); $start -= 1; $this->Execute("create table $seq (id float(53))"); @@ -113,7 +113,7 @@ class ADODB_ado_mssql extends ADODB_ado { $this->Execute('ROLLBACK TRANSACTION adodbseq'); return false; } - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return true; } @@ -129,26 +129,25 @@ class ADODB_ado_mssql extends ADODB_ado { $this->Execute('ROLLBACK TRANSACTION adodbseq'); return false; } - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return $start; } $num = $this->GetOne("select id from $seq"); - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return $num; - + // in old implementation, pre 1.90, we returned GUID... //return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'"); } - - } // end class - - class ADORecordSet_ado_mssql extends ADORecordSet_ado { - + + } // end class + + class ADORecordSet_ado_mssql extends ADORecordSet_ado { + var $databaseType = 'ado_mssql'; - + function ADORecordSet_ado_mssql($id,$mode=false) { return $this->ADORecordSet_ado($id,$mode); } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-ads.inc.php b/lib/WikiDB/adodb/drivers/adodb-ads.inc.php index 0de57ca7a..4481d2b83 100644 --- a/lib/WikiDB/adodb/drivers/adodb-ads.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-ads.inc.php @@ -1,6 +1,6 @@ _numOfRows != 0 && !$this->EOF) { $this->_currentRow++; - - if ($this->_has_stupid_odbc_fetch_api_change) - $rez = @ads_fetch_into($this->_queryID,$this->fields); - else { - $row = 0; - $rez = @ads_fetch_into($this->_queryID,$row,$this->fields); - } - if ($rez) { - if ($this->fetchMode & ADODB_FETCH_ASSOC) { - $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE); - } - return true; + if( $this->_fetch() ) { + return true; } } $this->fields = false; @@ -770,7 +760,7 @@ class ADORecordSet_ads extends ADORecordSet { function _fetch() { - + $this->fields = false; if ($this->_has_stupid_odbc_fetch_api_change) $rez = @ads_fetch_into($this->_queryID,$this->fields); else { @@ -783,7 +773,6 @@ class ADORecordSet_ads extends ADORecordSet { } return true; } - $this->fields = false; return false; } @@ -793,4 +782,3 @@ class ADORecordSet_ads extends ADORecordSet { } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php b/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php index 6fb598b8f..3338db790 100644 --- a/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php @@ -1,13 +1,13 @@ ADODB_ibase(); } - + function BeginTrans() - { + { if ($this->transOff) return true; $this->transCnt += 1; $this->autoCommit = false; $this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID); return $this->_transactionID; } - + function ServerInfo() { $arr['dialect'] = $this->dialect; switch($arr['dialect']) { - case '': + case '': case '1': $s = 'Interbase 6.5, Dialect 1'; break; case '2': $s = 'Interbase 6.5, Dialect 2'; break; default: @@ -49,44 +49,43 @@ class ADODB_borland_ibase extends ADODB_ibase { $arr['description'] = $s; return $arr; } - + // Note that Interbase 6.5 uses ROWS instead - don't you love forking wars! - // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows + // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows // SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2 // Firebird uses // SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) { if ($nrows > 0) { - if ($offset <= 0) $str = " ROWS $nrows "; + if ($offset <= 0) $str = " ROWS $nrows "; else { $a = $offset+1; $b = $offset+$nrows; $str = " ROWS $a TO $b"; } } else { - // ok, skip + // ok, skip $a = $offset + 1; $str = " ROWS $a TO 999999999"; // 999 million } $sql .= $str; - - return ($secs2cache) ? + + return ($secs2cache) ? $this->CacheExecute($secs2cache,$sql,$inputarr) : $this->Execute($sql,$inputarr); } - + }; - -class ADORecordSet_borland_ibase extends ADORecordSet_ibase { - - var $databaseType = "borland_ibase"; - + +class ADORecordSet_borland_ibase extends ADORecordSet_ibase { + + var $databaseType = "borland_ibase"; + function ADORecordSet_borland_ibase($id,$mode=false) { $this->ADORecordSet_ibase($id,$mode); } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-csv.inc.php b/lib/WikiDB/adodb/drivers/adodb-csv.inc.php index bf8655c99..4fb2dcc6e 100644 --- a/lib/WikiDB/adodb/drivers/adodb-csv.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-csv.inc.php @@ -1,19 +1,19 @@ _insertid; } - + function _affectedrows() { return $this->_affectedrows; } - + function MetaDatabases() { return false; } - + // returns true or false function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) { if (strtolower(substr($argHostname,0,7)) !== 'http://') return false; $this->_url = $argHostname; - return true; + return true; } - + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { @@ -71,24 +71,24 @@ class ADODB_csv extends ADOConnection { $this->_url = $argHostname; return true; } - - function MetaColumns($table, $normalize=true) + + function MetaColumns($table, $normalize=true) { return false; } - - + + // parameters use PostgreSQL convention, not MySQL function SelectLimit($sql,$nrows=-1,$offset=-1) { global $ADODB_FETCH_MODE; - + $url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=". (($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE). "&offset=$offset"; $err = false; $rs = csv2rs($url,$err,false); - + if ($this->debug) print "$url
    $err
    "; $at = strpos($err,'::::'); @@ -99,25 +99,25 @@ class ADODB_csv extends ADOConnection { $this->_errorMsg = substr($err,$at+4,1024); $this->_errorNo = -9999; } - if ($this->_errorNo) + if ($this->_errorNo) if ($fn = $this->raiseErrorFn) { $fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,''); } - - if (is_object($rs)) { - - $rs->databaseType='csv'; + + if (is_object($rs)) { + + $rs->databaseType='csv'; $rs->fetchMode = ($this->fetchMode !== false) ? $this->fetchMode : $ADODB_FETCH_MODE; $rs->connection = $this; } return $rs; } - + // returns queryID or false function _Execute($sql,$inputarr=false) { global $ADODB_FETCH_MODE; - + if (!$this->_bindInputArray && $inputarr) { $sqlarr = explode('?',$sql); $sql = ''; @@ -132,37 +132,37 @@ class ADODB_csv extends ADOConnection { else $sql .= $v; $i += 1; - + } $sql .= $sqlarr[$i]; - if ($i+1 != sizeof($sqlarr)) + if ($i+1 != sizeof($sqlarr)) print "Input Array does not match ?: ".htmlspecialchars($sql); $inputarr = false; } - + $url = $this->_url.'?sql='.urlencode($sql)."&fetch=". (($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE); $err = false; - - + + $rs = csv2rs($url,$err,false); if ($this->debug) print urldecode($url)."
    $err
    "; $at = strpos($err,'::::'); - if ($at === false) { + if ($at === false) { $this->_errorMsg = $err; $this->_errorNo = (integer)$err; } else { $this->_errorMsg = substr($err,$at+4,1024); $this->_errorNo = -9999; } - - if ($this->_errorNo) + + if ($this->_errorNo) if ($fn = $this->raiseErrorFn) { $fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr); } if (is_object($rs)) { $rs->fetchMode = ($this->fetchMode !== false) ? $this->fetchMode : $ADODB_FETCH_MODE; - + $this->_affectedrows = $rs->affectedrows; $this->_insertid = $rs->insertid; $rs->databaseType='csv'; @@ -171,18 +171,18 @@ class ADODB_csv extends ADOConnection { return $rs; } - /* Returns: the last error message from previous database operation */ - function ErrorMsg() + /* Returns: the last error message from previous database operation */ + function ErrorMsg() { return $this->_errorMsg; } - - /* Returns: the last error number from previous database operation */ - function ErrorNo() + + /* Returns: the last error number from previous database operation */ + function ErrorNo() { return $this->_errorNo; } - + // returns true or false function _close() { @@ -195,7 +195,7 @@ class ADORecordset_csv extends ADORecordset { { $this->ADORecordset($id,$mode); } - + function _close() { return true; @@ -203,5 +203,3 @@ class ADORecordset_csv extends ADORecordset { } } // define - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-db2.inc.php b/lib/WikiDB/adodb/drivers/adodb-db2.inc.php index bd863d9a5..d7ff91af5 100644 --- a/lib/WikiDB/adodb/drivers/adodb-db2.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-db2.inc.php @@ -1,6 +1,6 @@ _haserrorfunctions = ADODB_PHPVER >= 0x4050; } - + // returns true or false function _connect($argDSN, $argUsername, $argPassword, $argDatabasename) { global $php_errormsg; - + if (!function_exists('db2_connect')) { ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension which is not installed."); return null; @@ -80,7 +80,7 @@ class ADODB_db2 extends ADOConnection { ini_set('ibm_db2.binmode', $this->binmode); if ($argDatabasename && empty($argDSN)) { - + if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_connect($argDatabasename,null,null); else $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword); } else { @@ -95,27 +95,27 @@ class ADODB_db2 extends ADOConnection { $this->_errorMsg = @db2_conn_errormsg(); if (isset($this->connectStmt)) $this->Execute($this->connectStmt); - + if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema"); return $this->_connectionID != false; } - + // returns true or false function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename) { global $php_errormsg; - + if (!function_exists('db2_connect')) return null; - + // This needs to be set before the connect(). // Replaces the odbc_binmode() call that was in Execute() ini_set('ibm_db2.binmode', $this->binmode); if (isset($php_errormsg)) $php_errormsg = ''; $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; - + if ($argDatabasename && empty($argDSN)) { - + if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_pconnect($argDatabasename,null,null); else $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword); } else { @@ -128,7 +128,7 @@ class ADODB_db2 extends ADOConnection { $this->_errorMsg = @db2_conn_errormsg(); if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID); if (isset($this->connectStmt)) $this->Execute($this->connectStmt); - + if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema"); return $this->_connectionID != false; } @@ -140,10 +140,10 @@ class ADODB_db2 extends ADOConnection { if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts); return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')"; } - + // Format date column in sql string given an input format that understands Y M D function SQLDate($fmt, $col=false) - { + { // use right() and replace() ? if (!$col) $col = $this->sysDate; @@ -152,7 +152,7 @@ class ADODB_db2 extends ADOConnection { return 'TO_CHAR('.$col.", 'YYYY-MM-DD HH24:MI:SS')"; $s = ''; - + $len = strlen($fmt); for ($i=0; $i < $len; $i++) { if ($s) $s .= $this->concat_operator; @@ -179,7 +179,7 @@ class ADODB_db2 extends ADOConnection { case 'H': case 'h': if ($len==1) return "hour($col)"; - if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)"; + if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)"; else $s .= "''"; break; case 'i': @@ -205,26 +205,26 @@ class ADODB_db2 extends ADOConnection { } } return $s; - } - - + } + + function ServerInfo() { - $row = $this->GetRow("SELECT service_level, fixpack_num FROM TABLE(sysproc.env_get_inst_info()) + $row = $this->GetRow("SELECT service_level, fixpack_num FROM TABLE(sysproc.env_get_inst_info()) as INSTANCEINFO"); - - if ($row) { + + if ($row) { $info['version'] = $row[0].':'.$row[1]; $info['fixpack'] = $row[1]; $info['description'] = ''; } else { return ADOConnection::ServerInfo(); } - + return $info; } - + function CreateSequence($seqname='adodbseq',$start=1) { if (empty($this->_genSeqSQL)) return false; @@ -232,13 +232,13 @@ class ADODB_db2 extends ADOConnection { if (!$ok) return false; return true; } - + function DropSequence($seqname) { if (empty($this->_dropSeqSQL)) return false; return $this->Execute(sprintf($this->_dropSeqSQL,$seqname)); } - + function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false) { $nrows = (integer) $nrows; @@ -254,18 +254,18 @@ class ADODB_db2 extends ADOConnection { } $rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr); } - + return $rs; } - + /* This algorithm is not very efficient, but works even if table locking is not available. - + Will return false if unable to generate an ID after $MAXLOOPS attempts. */ function GenID($seq='adodbseq',$start=1) - { + { // if you have to modify the parameter below, your database is overloaded, // or you need to implement generation of id's yourself! $num = $this->GetOne("VALUES NEXTVAL FOR $seq"); @@ -281,40 +281,40 @@ class ADODB_db2 extends ADOConnection { return @db2_conn_errormsg($this->_connectionID); } else return ADOConnection::ErrorMsg(); } - + function ErrorNo() { - + if ($this->_haserrorfunctions) { if ($this->_errorCode !== false) { // bug in 4.0.6, error number can be corrupted string (should be 6 digits) return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode; } - if (empty($this->_connectionID)) $e = @db2_conn_error(); + if (empty($this->_connectionID)) $e = @db2_conn_error(); else $e = @db2_conn_error($this->_connectionID); - + // bug in 4.0.6, error number can be corrupted string (should be 6 digits) // so we check and patch if (strlen($e)<=2) return 0; return $e; } else return ADOConnection::ErrorNo(); } - - + + function BeginTrans() - { + { if (!$this->hasTransactions) return false; - if ($this->transOff) return true; + if ($this->transOff) return true; $this->transCnt += 1; $this->_autocommit = false; return db2_autocommit($this->_connectionID,false); } - - function CommitTrans($ok=true) - { - if ($this->transOff) return true; + + function CommitTrans($ok=true) + { + if ($this->transOff) return true; if (!$ok) return $this->RollbackTrans(); if ($this->transCnt) $this->transCnt -= 1; $this->_autocommit = true; @@ -322,21 +322,21 @@ class ADODB_db2 extends ADOConnection { db2_autocommit($this->_connectionID,true); return $ret; } - + function RollbackTrans() { - if ($this->transOff) return true; + if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; $this->_autocommit = true; $ret = db2_rollback($this->_connectionID); db2_autocommit($this->_connectionID,true); return $ret; } - + function MetaPrimaryKeys($table) { global $ADODB_FETCH_MODE; - + if ($this->uCaseTables) $table = strtoupper($table); $schema = ''; $this->_findschema($table,$schema); @@ -344,16 +344,16 @@ class ADODB_db2 extends ADOConnection { $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $qid = @db2_primarykeys($this->_connectionID,'',$schema,$table); - + if (!$qid) { $ADODB_FETCH_MODE = $savem; return false; } $rs = new ADORecordSet_db2($qid); $ADODB_FETCH_MODE = $savem; - + if (!$rs) return false; - + $arr = $rs->GetArray(); $rs->Close(); $arr2 = array(); @@ -362,11 +362,11 @@ class ADODB_db2 extends ADOConnection { } return $arr2; } - + function MetaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE ) { global $ADODB_FETCH_MODE; - + if ($this->uCaseTables) $table = strtoupper($table); $schema = ''; $this->_findschema($table,$schema); @@ -391,15 +391,15 @@ class ADODB_db2 extends ADOConnection { 5 FKTABLE_SCHEM 6 FKTABLE_NAME 7 FKCOLUMN_NAME - */ + */ if (!$rs) return false; - $foreign_keys = array(); + $foreign_keys = array(); while (!$rs->EOF) { if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) { - if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]])) + if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]])) $foreign_keys[$rs->fields[5].'.'.$rs->fields[6]] = array(); - $foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3]; + $foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3]; } $rs->MoveNext(); } @@ -407,28 +407,28 @@ class ADODB_db2 extends ADOConnection { $rs->Close(); return $foreign_key; } - - + + function MetaTables($ttype=false,$schema=false) { global $ADODB_FETCH_MODE; - + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $qid = db2_tables($this->_connectionID); - + $rs = new ADORecordSet_db2($qid); - + $ADODB_FETCH_MODE = $savem; if (!$rs) { $false = false; return $false; } - + $arr = $rs->GetArray(); $rs->Close(); $arr2 = array(); - + if ($ttype) { $isview = strncmp($ttype,'V',1) === 0; } @@ -437,7 +437,7 @@ class ADODB_db2 extends ADOConnection { $type = $arr[$i][3]; $owner = $arr[$i][1]; $schemaval = ($schema) ? $arr[$i][1].'.' : ''; - if ($ttype) { + if ($ttype) { if ($isview) { if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2]; } else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2]; @@ -445,7 +445,7 @@ class ADODB_db2 extends ADOConnection { } return $arr2; } - + /* See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp / SQL data type codes / @@ -477,7 +477,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 function DB2Types($t) { switch ((integer)$t) { - case 1: + case 1: case 12: case 0: case -95: @@ -488,56 +488,56 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 return 'X'; case -4: //image return 'B'; - - case 9: + + case 9: case 91: return 'D'; - + case 10: case 11: case 92: case 93: return 'T'; - + case 4: case 5: case -6: return 'I'; - + case -11: // uniqidentifier return 'R'; case -7: //bit return 'L'; - + default: return 'N'; } } - + function MetaColumns($table, $normalize=true) { global $ADODB_FETCH_MODE; - + $false = false; if ($this->uCaseTables) $table = strtoupper($table); $schema = ''; $this->_findschema($table,$schema); - + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - + $colname = "%"; $qid = db2_columns($this->_connectionID, "", $schema, $table, $colname); if (empty($qid)) return $false; - + $rs = new ADORecordSet_db2($qid); $ADODB_FETCH_MODE = $savem; - + if (!$rs) return $false; $rs->_fetch(); - + $retarr = array(); - + /* $rs->fields indices 0 TABLE_QUALIFIER @@ -558,7 +558,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 $fld = new ADOFieldObject(); $fld->name = $rs->fields[3]; $fld->type = $this->DB2Types($rs->fields[4]); - + // ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp // access uses precision to store length for char/varchar if ($fld->type == 'C' or $fld->type == 'X') { @@ -566,28 +566,28 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 $fld->max_length = $rs->fields[7]/2; else $fld->max_length = $rs->fields[7]; - } else + } else $fld->max_length = $rs->fields[7]; $fld->not_null = !empty($rs->fields[10]); $fld->scale = $rs->fields[8]; $fld->primary_key = false; - $retarr[strtoupper($fld->name)] = $fld; + $retarr[strtoupper($fld->name)] = $fld; } else if (sizeof($retarr)>0) break; $rs->MoveNext(); } - $rs->Close(); + $rs->Close(); if (empty($retarr)) $retarr = false; $qid = db2_primary_keys($this->_connectionID, "", $schema, $table); if (empty($qid)) return $false; - + $rs = new ADORecordSet_db2($qid); $ADODB_FETCH_MODE = $savem; - + if (!$rs) return $retarr; $rs->_fetch(); - + /* $rs->fields indices 0 TABLE_CAT @@ -604,13 +604,13 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 break; $rs->MoveNext(); } - $rs->Close(); - + $rs->Close(); + if (empty($retarr)) $retarr = false; return $retarr; } - - + + function Prepare($sql) { if (! $this->_bindInputArray) return $sql; // no binding @@ -623,24 +623,24 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 } /* returns queryID or false */ - function _query($sql,$inputarr=false) + function _query($sql,$inputarr=false) { GLOBAL $php_errormsg; if (isset($php_errormsg)) $php_errormsg = ''; $this->_error = ''; - + if ($inputarr) { if (is_array($sql)) { $stmtid = $sql[1]; } else { $stmtid = db2_prepare($this->_connectionID,$sql); - + if ($stmtid == false) { $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; return false; } } - + if (! db2_execute($stmtid,$inputarr)) { if ($this->_haserrorfunctions) { $this->_errorMsg = db2_stmt_errormsg(); @@ -648,7 +648,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 } return false; } - + } else if (is_array($sql)) { $stmtid = $sql[1]; if (!db2_execute($stmtid)) { @@ -660,7 +660,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 } } else $stmtid = @db2_exec($this->_connectionID,$sql); - + $this->_lastAffectedRows = 0; if ($stmtid) { if (@db2_num_fields($stmtid) == 0) { @@ -669,7 +669,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 } else { $this->_lastAffectedRows = 0; } - + if ($this->_haserrorfunctions) { $this->_errorMsg = ''; $this->_errorCode = 0; @@ -689,9 +689,9 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 /* Insert a null into the blob field of the table first. Then use UpdateBlob to store the blob. - + Usage: - + $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1'); */ @@ -699,7 +699,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 { return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false; } - + // returns true or false function _close() { @@ -712,34 +712,34 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 { return $this->_lastAffectedRows; } - + } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_db2 extends ADORecordSet { - +class ADORecordSet_db2 extends ADORecordSet { + var $bind = false; - var $databaseType = "db2"; + var $databaseType = "db2"; var $dataProvider = "db2"; var $useFetchArray; - + function ADORecordSet_db2($id,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - + $this->_queryID = $id; } // returns the field object - function FetchField($offset = -1) + function FetchField($offset = -1) { $o= new ADOFieldObject(); $o->name = @db2_field_name($this->_queryID,$offset); @@ -749,7 +749,7 @@ class ADORecordSet_db2 extends ADORecordSet { else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name); return $o; } - + /* Use associative array to get fields array */ function Fields($colname) { @@ -764,8 +764,8 @@ class ADORecordSet_db2 extends ADORecordSet { return $this->fields[$this->bind[strtoupper($colname)]]; } - - + + function _initrs() { global $ADODB_COUNTRECS; @@ -773,15 +773,15 @@ class ADORecordSet_db2 extends ADORecordSet { $this->_numOfFields = @db2_num_fields($this->_queryID); // some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0 if ($this->_numOfRows == 0) $this->_numOfRows = -1; - } - + } + function _seek($row) { return false; } - + // speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated - function GetArrayLimit($nrows,$offset=-1) + function GetArrayLimit($nrows,$offset=-1) { if ($offset <= 0) { $rs = $this->GetArray($nrows); @@ -791,27 +791,27 @@ class ADORecordSet_db2 extends ADORecordSet { $this->fetchMode = ADODB_FETCH_NUM; $this->Move($offset); $this->fetchMode = $savem; - + if ($this->fetchMode & ADODB_FETCH_ASSOC) { $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE); } - + $results = array(); $cnt = 0; while (!$this->EOF && $nrows != $cnt) { $results[$cnt++] = $this->fields; $this->MoveNext(); } - + return $results; } - - - function MoveNext() + + + function MoveNext() { - if ($this->_numOfRows != 0 && !$this->EOF) { + if ($this->_numOfRows != 0 && !$this->EOF) { $this->_currentRow++; - + $this->fields = @db2_fetch_array($this->_queryID); if ($this->fields) { if ($this->fetchMode & ADODB_FETCH_ASSOC) { @@ -823,8 +823,8 @@ class ADORecordSet_db2 extends ADORecordSet { $this->fields = false; $this->EOF = true; return false; - } - + } + function _fetch() { @@ -838,11 +838,10 @@ class ADORecordSet_db2 extends ADORecordSet { $this->fields = false; return false; } - - function _close() + + function _close() { - return @db2_free_result($this->_queryID); + return @db2_free_result($this->_queryID); } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php b/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php index 12a488313..b58ec1a7f 100644 --- a/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php @@ -1,13 +1,13 @@ $v) { - $arr2[] = $arr[$v]; + $arr2[] = $arr[$v]; } - + return array($sql2,$arr2); } */ /* Smart remapping of :0, :1 bind vars to ? ? - + Handles colons in comments -- and / * * / and in quoted strings. */ @@ -62,41 +62,41 @@ function _colonparser($sql,$arr) $arrsize = sizeof($arr); $state = 'NORM'; $at = 1; - $ch = $sql[0]; + $ch = $sql[0]; $ch2 = @$sql[1]; $sql2 = ''; $arr2 = array(); $nprev = 0; - - + + while (strlen($ch)) { - + switch($ch) { case '/': if ($state == 'NORM' && $ch2 == '*') { $state = 'COMMENT'; - + $at += 1; $ch = $ch2; $ch2 = $at < $lensql ? $sql[$at] : ''; } break; - + case '*': if ($state == 'COMMENT' && $ch2 == '/') { $state = 'NORM'; - + $at += 1; $ch = $ch2; $ch2 = $at < $lensql ? $sql[$at] : ''; } break; - + case "\n": case "\r": if ($state == 'COMMENT2') $state = 'NORM'; break; - + case "'": do { $at += 1; @@ -104,10 +104,10 @@ function _colonparser($sql,$arr) $ch2 = $at < $lensql ? $sql[$at] : ''; } while ($ch !== "'"); break; - + case ':': if ($state == 'COMMENT' || $state == 'COMMENT2') break; - + //echo "$at=$ch $ch2, "; if ('0' <= $ch2 && $ch2 <= '9') { $n = ''; @@ -127,7 +127,7 @@ function _colonparser($sql,$arr) } } break; - + case '-': if ($state == 'NORM') { if ($ch2 == '-') $state = 'COMMENT2'; @@ -137,54 +137,54 @@ function _colonparser($sql,$arr) } break; } - + $at += 1; $ch = $ch2; $ch2 = $at < $lensql ? $sql[$at] : ''; } - + if ($nprev == 0) { $sql2 = $sql; } else { $sql2 .= substr($sql,$nprev); } - + return array($sql2,$arr2); } class ADODB_db2oci extends ADODB_db2 { - var $databaseType = "db2oci"; + var $databaseType = "db2oci"; var $sysTimeStamp = 'sysdate'; var $sysDate = 'trunc(sysdate)'; var $_bindInputArray = true; - + function ADODB_db2oci() { parent::ADODB_db2(); } - + function Param($name,$type='C') { return ':'.$name; } - - + + function MetaTables($ttype=false,$schema=false) { global $ADODB_FETCH_MODE; - + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $qid = db2_tables($this->_connectionID); - + $rs = new ADORecordSet_db2($qid); - + $ADODB_FETCH_MODE = $savem; if (!$rs) { $false = false; return $false; } - + $arr = $rs->GetArray(); $rs->Close(); $arr2 = array(); @@ -199,7 +199,7 @@ class ADODB_db2oci extends ADODB_db2 { $name = $schemaval.$arr[$i][2]; $owner = $arr[$i][1]; if (substr($name,0,8) == 'EXPLAIN_') continue; - if ($ttype) { + if ($ttype) { if ($isview) { if (strncmp($type,'V',1) === 0) $arr2[] = $name; } else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name; @@ -207,19 +207,19 @@ class ADODB_db2oci extends ADODB_db2 { } return $arr2; } - + function _Execute($sql, $inputarr=false ) { if ($inputarr) list($sql,$inputarr) = _colonparser($sql, $inputarr); return parent::_Execute($sql, $inputarr); } }; - -class ADORecordSet_db2oci extends ADORecordSet_db2 { - - var $databaseType = "db2oci"; - + +class ADORecordSet_db2oci extends ADORecordSet_db2 { + + var $databaseType = "db2oci"; + function ADORecordSet_db2oci($id,$mode=false) { return $this->ADORecordSet_db2($id,$mode); @@ -227,4 +227,3 @@ class ADORecordSet_db2oci extends ADORecordSet_db2 { } } //define -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php b/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php index b84d8b880..ebcdab637 100644 --- a/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php @@ -1,13 +1,13 @@ $v) { - $arr2[] = $arr[$v]; + $arr2[] = $arr[$v]; } - + return array($sql2,$arr2); } class ADODB_db2oci extends ADODB_db2 { - var $databaseType = "db2oci"; + var $databaseType = "db2oci"; var $sysTimeStamp = 'sysdate'; var $sysDate = 'trunc(sysdate)'; - + function ADODB_db2oci() { $this->ADODB_db2(); } - - + + function _Execute($sql, $inputarr) { if ($inputarr) list($sql,$inputarr) = _colonscope($sql, $inputarr); return parent::_Execute($sql, $inputarr); } }; - -class ADORecordSet_db2oci extends ADORecordSet_odbc { - - var $databaseType = "db2oci"; - + +class ADORecordSet_db2oci extends ADORecordSet_odbc { + + var $databaseType = "db2oci"; + function ADORecordSet_db2oci($id,$mode=false) { return $this->ADORecordSet_db2($id,$mode); @@ -77,4 +77,3 @@ class ADORecordSet_db2oci extends ADORecordSet_odbc { } } //define -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php b/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php index f5af4d107..569570755 100644 --- a/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php @@ -1,12 +1,12 @@ . + @version V5.19 23-Apr-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). 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. + Contribution by Frank M. Kromann . Set tabs to 8. -*/ +*/ // security - hide paths if (!defined('ADODB_DIR')) die(); @@ -17,26 +17,26 @@ if (! defined("_ADODB_FBSQL_LAYER")) { class ADODB_fbsql extends ADOConnection { var $databaseType = 'fbsql'; var $hasInsertID = true; - var $hasAffectedRows = true; - var $metaTablesSQL = "SHOW TABLES"; + var $hasAffectedRows = true; + var $metaTablesSQL = "SHOW TABLES"; var $metaColumnsSQL = "SHOW COLUMNS FROM %s"; var $fmtTimeStamp = "'Y-m-d H:i:s'"; var $hasLimit = false; - - function ADODB_fbsql() - { + + function ADODB_fbsql() + { } - + function _insertid() { return fbsql_insert_id($this->_connectionID); } - + function _affectedrows() { return fbsql_affected_rows($this->_connectionID); } - + function MetaDatabases() { $qid = fbsql_list_dbs($this->_connectionID); @@ -61,39 +61,39 @@ class ADODB_fbsql extends ADOConnection { if (sizeof($arr) > 0) return "CONCAT($s)"; else return ''; } - + // returns true or false function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) { $this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword); if ($this->_connectionID === false) return false; if ($argDatabasename) return $this->SelectDB($argDatabasename); - return true; + return true; } - + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { $this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword); if ($this->_connectionID === false) return false; if ($argDatabasename) return $this->SelectDB($argDatabasename); - return true; + return true; } - - function MetaColumns($table, $normalize=true) + + function MetaColumns($table, $normalize=true) { if ($this->metaColumnsSQL) { - + $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table)); - + if ($rs === false) return false; - + $retarr = array(); while (!$rs->EOF){ $fld = new ADOFieldObject(); $fld->name = $rs->fields[0]; $fld->type = $rs->fields[1]; - + // split type into type(length): if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) { $fld->type = $query_array[1]; @@ -105,86 +105,86 @@ class ADODB_fbsql extends ADOConnection { $fld->primary_key = ($rs->fields[3] == 'PRI'); $fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false); $fld->binary = (strpos($fld->type,'blob') !== false); - - $retarr[strtoupper($fld->name)] = $fld; + + $retarr[strtoupper($fld->name)] = $fld; $rs->MoveNext(); } $rs->Close(); - return $retarr; + return $retarr; } return false; } - + // returns true or false - function SelectDB($dbName) + function SelectDB($dbName) { $this->database = $dbName; if ($this->_connectionID) { - return @fbsql_select_db($dbName,$this->_connectionID); + return @fbsql_select_db($dbName,$this->_connectionID); } - else return false; + else return false; } - - + + // returns queryID or false function _query($sql,$inputarr=false) { return fbsql_query("$sql;",$this->_connectionID); } - /* Returns: the last error message from previous database operation */ - function ErrorMsg() + /* Returns: the last error message from previous database operation */ + function ErrorMsg() { $this->_errorMsg = @fbsql_error($this->_connectionID); return $this->_errorMsg; } - - /* Returns: the last error number from previous database operation */ - function ErrorNo() + + /* Returns: the last error number from previous database operation */ + function ErrorNo() { return @fbsql_errno($this->_connectionID); } - + // returns true or false function _close() { return @fbsql_close($this->_connectionID); } - + } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_fbsql extends ADORecordSet{ - +class ADORecordSet_fbsql extends ADORecordSet{ + var $databaseType = "fbsql"; var $canSeek = true; - - function ADORecordSet_fbsql($queryID,$mode=false) + + function ADORecordSet_fbsql($queryID,$mode=false) { - if (!$mode) { + if (!$mode) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } switch ($mode) { case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break; case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break; - case ADODB_FETCH_BOTH: + case ADODB_FETCH_BOTH: default: $this->fetchMode = FBSQL_BOTH; break; } return $this->ADORecordSet($queryID); } - + function _initrs() { GLOBAL $ADODB_COUNTRECS; $this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1; $this->_numOfFields = @fbsql_num_fields($this->_queryID); } - + function FetchField($fieldOffset = -1) { @@ -198,25 +198,25 @@ class ADORecordSet_fbsql extends ADORecordSet{ $o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable //$o->max_length = -1; } - + return $o; } - + function _seek($row) { return @fbsql_data_seek($this->_queryID,$row); } - + function _fetch($ignore_fields=false) { $this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode); return ($this->fields == true); } - + function _close() { - return @fbsql_free_result($this->_queryID); + return @fbsql_free_result($this->_queryID); } - + function MetaType($t,$len=-1,$fieldobj=false) { if (is_object($t)) { @@ -227,40 +227,39 @@ class ADORecordSet_fbsql extends ADORecordSet{ $len = -1; // fbsql max_length is not accurate switch (strtoupper($t)) { case 'CHARACTER': - case 'CHARACTER VARYING': - case 'BLOB': - case 'CLOB': - case 'BIT': - case 'BIT VARYING': + case 'CHARACTER VARYING': + case 'BLOB': + case 'CLOB': + case 'BIT': + case 'BIT VARYING': if ($len <= $this->blobSize) return 'C'; - + // so we have to check whether binary... case 'IMAGE': - case 'LONGBLOB': + case 'LONGBLOB': case 'BLOB': case 'MEDIUMBLOB': return !empty($fieldobj->binary) ? 'B' : 'X'; - + case 'DATE': return 'D'; - + case 'TIME': case 'TIME WITH TIME ZONE': - case 'TIMESTAMP': + case 'TIMESTAMP': case 'TIMESTAMP WITH TIME ZONE': return 'T'; - + case 'PRIMARY_KEY': return 'R'; case 'INTEGER': - case 'SMALLINT': + case 'SMALLINT': case 'BOOLEAN': - + if (!empty($fieldobj->primary_key)) return 'R'; else return 'I'; - + default: return 'N'; } } } //class } // defined -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php b/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php index f09ed147e..2e0917dd2 100644 --- a/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php @@ -1,11 +1,11 @@ ADODB_ibase(); } - + function ServerInfo() { $arr['dialect'] = $this->dialect; switch($arr['dialect']) { - case '': + case '': case '1': $s = 'Firebird Dialect 1'; break; case '2': $s = 'Firebird Dialect 2'; break; default: @@ -40,38 +40,37 @@ class ADODB_firebird extends ADODB_ibase { $arr['description'] = $s; return $arr; } - + // Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars! - // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows + // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows // SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2 function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0) { $nrows = (integer) $nrows; $offset = (integer) $offset; $str = 'SELECT '; - if ($nrows >= 0) $str .= "FIRST $nrows "; + if ($nrows >= 0) $str .= "FIRST $nrows "; $str .=($offset>=0) ? "SKIP $offset " : ''; - - $sql = preg_replace('/^[ \t]*select/i',$str,$sql); + + $sql = preg_replace('/^[ \t]*select/i',$str,$sql); if ($secs) $rs = $this->CacheExecute($secs,$sql,$inputarr); else $rs = $this->Execute($sql,$inputarr); - + return $rs; } - - + + }; - -class ADORecordSet_firebird extends ADORecordSet_ibase { - - var $databaseType = "firebird"; - + +class ADORecordSet_firebird extends ADORecordSet_ibase { + + var $databaseType = "firebird"; + function ADORecordSet_firebird($id,$mode=false) { $this->ADORecordSet_ibase($id,$mode); } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php b/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php index f47b33e0b..a638f58ed 100644 --- a/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php @@ -1,23 +1,23 @@ changed transaction handling and added experimental blob stuff - + Docs to interbase at the website http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html - + To use gen_id(), see http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen - + $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database'); $id = $rs->fields[0]; $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)"); @@ -53,26 +53,26 @@ class ADODB_ibase extends ADOConnection { var $poorAffectedRows = true; var $blobEncodeType = 'C'; var $role = false; - - function ADODB_ibase() + + function ADODB_ibase() { if (defined('IBASE_DEFAULT')) $this->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'; if ($this->role) $this->_connectionID = $fn($argHostname,$argUsername,$argPassword, $this->charSet,$this->buffers,$this->dialect,$this->role); - else + else $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 = "''"; } @@ -80,14 +80,14 @@ class ADODB_ibase extends ADOConnection { $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); @@ -99,30 +99,30 @@ class ADODB_ibase extends ADOConnection { 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'); - + $table = strtoupper($table); - + $sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME - FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME + FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\' ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION'; $a = $this->GetCol($sql,false,true); if ($a && sizeof($a)>0) return $a; - return false; + return false; } - + function ServerInfo() { $arr['dialect'] = $this->dialect; switch($arr['dialect']) { - case '': + case '': case '1': $s = 'Interbase 5.5 or earlier'; break; case '2': $s = 'Interbase 5.6'; break; default: @@ -134,16 +134,16 @@ class ADODB_ibase extends ADOConnection { } function BeginTrans() - { + { if ($this->transOff) return true; $this->transCnt += 1; $this->autoCommit = false; $this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID); return $this->_transactionID; } - - function CommitTrans($ok=true) - { + + function CommitTrans($ok=true) + { if (!$ok) return $this->RollbackTrans(); if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; @@ -156,13 +156,13 @@ class ADODB_ibase extends ADOConnection { $this->_transactionID = false; return $ret; } - + // there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently. // it appears that ibase extension cannot support multiple concurrent queryid's - function _Execute($sql,$inputarr=false) + function _Execute($sql,$inputarr=false) { global $ADODB_COUNTRECS; - + if ($this->_logsql) { $savecrecs = $ADODB_COUNTRECS; $ADODB_COUNTRECS = true; // force countrecs @@ -173,20 +173,20 @@ class ADODB_ibase extends ADOConnection { } return $ret; } - + function RollbackTrans() { if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; $ret = false; $this->autoCommit = true; - if ($this->_transactionID) + if ($this->_transactionID) $ret = ibase_rollback($this->_transactionID); - $this->_transactionID = false; - + $this->_transactionID = false; + return $ret; } - + function MetaIndexes ($table, $primary = FALSE, $owner=false) { // save old fetch mode @@ -214,7 +214,7 @@ class ADODB_ibase extends ADOConnection { $ADODB_FETCH_MODE = $save; return $false; } - + $indexes = array(); while ($row = $rs->FetchRow()) { $index = $row[0]; @@ -236,11 +236,11 @@ class ADODB_ibase extends ADOConnection { $this->SetFetchMode($savem); } $ADODB_FETCH_MODE = $save; - + return $indexes; } - + // See http://community.borland.com/article/0,1410,25844,00.html function RowLock($tables,$where,$col=false) { @@ -248,21 +248,21 @@ class ADODB_ibase extends ADOConnection { $this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim? return 1; } - - + + function CreateSequence($seqname,$startID=1) { $ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" )); if (!$ok) return false; return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';'); } - + function DropSequence($seqname) { $seqname = strtoupper($seqname); $this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'"); } - + function GenID($seqname='adodbseq',$startID=1) { $getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE"); @@ -274,13 +274,13 @@ class ADODB_ibase extends ADOConnection { } if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields); else $this->genID = 0; // false - + if ($rs) $rs->Close(); - + return $this->genID; } - function SelectDB($dbName) + function SelectDB($dbName) { return false; } @@ -290,13 +290,13 @@ class ADODB_ibase extends ADOConnection { $this->_errorMsg = ibase_errmsg(); } - function ErrorNo() + function ErrorNo() { if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1]; else return 0; } - function ErrorMsg() + function ErrorMsg() { return $this->_errorMsg; } @@ -311,7 +311,7 @@ class ADODB_ibase extends ADOConnection { // returns query ID if successful, otherwise false // there have been reports of problems with nested queries - the code is probably not re-entrant? function _query($sql,$iarr=false) - { + { if (!$this->autoCommit && $this->_transactionID) { $conn = $this->_transactionID; @@ -341,11 +341,11 @@ class ADODB_ibase extends ADOConnection { case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break; } } - } else $ret = $fn($sql); + } else $ret = $fn($sql); } else { $fn = 'ibase_query'; - - if (is_array($iarr)) { + + if (is_array($iarr)) { if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4 if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack $fnarr = array_merge( array($conn,$sql) , $iarr); @@ -363,7 +363,7 @@ class ADODB_ibase extends ADOConnection { case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break; } } - } else $ret = $fn($conn,$sql); + } else $ret = $fn($conn,$sql); } if ($docommit && $ret === true) ibase_commit($this->_connectionID); @@ -373,11 +373,11 @@ class ADODB_ibase extends ADOConnection { // returns true or false function _close() - { + { if (!$this->autoCommit) @ibase_rollback($this->_connectionID); return @ibase_close($this->_connectionID); } - + //OPN STUFF start function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3) { @@ -385,14 +385,14 @@ class ADODB_ibase extends ADOConnection { $fld->max_length = $flen; $fld->scale = null; switch($ftype){ - case 7: + case 7: case 8: if ($dialect3) { switch($fsubtype){ - case 0: + case 0: $fld->type = ($ftype == 7 ? 'smallint' : 'integer'); break; - case 1: + case 1: $fld->type = 'numeric'; $fld->max_length = $fprecision; $fld->scale = $fscale; @@ -413,15 +413,15 @@ class ADODB_ibase extends ADOConnection { } } break; - case 16: + case 16: if ($dialect3) { switch($fsubtype){ - case 0: + case 0: $fld->type = 'decimal'; $fld->max_length = 18; $fld->scale = 0; break; - case 1: + case 1: $fld->type = 'numeric'; $fld->max_length = $fprecision; $fld->scale = $fscale; @@ -476,21 +476,21 @@ class ADODB_ibase extends ADOConnection { } //OPN STUFF end // returns array of ADOFieldObjects for current table - function MetaColumns($table, $normalize=true) + function MetaColumns($table, $normalize=true) { global $ADODB_FETCH_MODE; - + $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - + $rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table))); - + $ADODB_FETCH_MODE = $save; $false = false; if ($rs === false) { return $false; } - + $retarr = array(); //OPN STUFF start $dialect3 = ($this->dialect==3 ? true : false); @@ -502,16 +502,16 @@ class ADODB_ibase extends ADOConnection { $this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3); if (isset($rs->fields[1]) && $rs->fields[1]) { $fld->not_null = true; - } + } if (isset($rs->fields[2])) { - + $fld->has_default = true; $d = substr($rs->fields[2],strlen('default ')); switch ($fld->type) { case 'smallint': case 'integer': $fld->default_value = (int) $d; break; - case 'char': + case 'char': case 'blob': case 'text': case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break; @@ -527,48 +527,48 @@ class ADODB_ibase extends ADOConnection { $fld->sub_type = null; } //OPN STUFF end - if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld; + if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld; else $retarr[strtoupper($fld->name)] = $fld; - + $rs->MoveNext(); } $rs->Close(); if ( empty($retarr)) return $false; - else return $retarr; + else return $retarr; } - - function BlobEncode( $blob ) + + function BlobEncode( $blob ) { $blobid = ibase_blob_create( $this->_connectionID); ibase_blob_add( $blobid, $blob ); return ibase_blob_close( $blobid ); } - - // since we auto-decode all blob's since 2.42, + + // since we auto-decode all blob's since 2.42, // BlobDecode should not do any transforms function BlobDecode($blob) { - return $blob; + return $blob; } - - - - + + + + // old blobdecode function // still used to auto-decode all blob's - function _BlobDecode_old( $blob ) + function _BlobDecode_old( $blob ) { $blobid = ibase_blob_open($this->_connectionID, $blob ); $realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet - while($string = ibase_blob_get($blobid, 8192)){ - $realblob .= $string; + while($string = ibase_blob_get($blobid, 8192)){ + $realblob .= $string; } ibase_blob_close( $blobid ); return( $realblob ); - } - - function _BlobDecode( $blob ) + } + + function _BlobDecode( $blob ) { if (ADODB_PHPVER >= 0x5000) { $blob_data = ibase_blob_info($this->_connectionID, $blob ); @@ -584,7 +584,7 @@ class ADODB_ibase extends ADOConnection { $realblob = ibase_blob_get($blobid, $this->maxblobsize); while($string = ibase_blob_get($blobid, 8192)){ - $realblob .= $string; + $realblob .= $string; } } else { $realblob = ibase_blob_get($blobid, $blob_data[0]); @@ -593,69 +593,69 @@ class ADODB_ibase extends ADOConnection { ibase_blob_close( $blobid ); return( $realblob ); } - - function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') - { - $fd = fopen($path,'rb'); - if ($fd === false) return false; - $blob_id = ibase_blob_create($this->_connectionID); - - /* fill with data */ - - while ($val = fread($fd,32768)){ - ibase_blob_add($blob_id, $val); - } - - /* close and get $blob_id_str for inserting into table */ - $blob_id_str = ibase_blob_close($blob_id); - - fclose($fd); - return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; - } - + + function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') + { + $fd = fopen($path,'rb'); + if ($fd === false) return false; + $blob_id = ibase_blob_create($this->_connectionID); + + /* fill with data */ + + while ($val = fread($fd,32768)){ + ibase_blob_add($blob_id, $val); + } + + /* close and get $blob_id_str for inserting into table */ + $blob_id_str = ibase_blob_close($blob_id); + + fclose($fd); + return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; + } + /* Insert a null into the blob field of the table first. Then use UpdateBlob to store the blob. - + Usage: - + $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1'); */ - function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') - { - $blob_id = ibase_blob_create($this->_connectionID); - - // ibase_blob_add($blob_id, $val); - - // replacement that solves the problem by which only the first modulus 64K / - // of $val are stored at the blob field //////////////////////////////////// + function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') + { + $blob_id = ibase_blob_create($this->_connectionID); + + // ibase_blob_add($blob_id, $val); + + // replacement that solves the problem by which only the first modulus 64K / + // of $val are stored at the blob field //////////////////////////////////// // Thx Abel Berenstein aberenstein#afip.gov.ar - $len = strlen($val); - $chunk_size = 32768; - $tail_size = $len % $chunk_size; - $n_chunks = ($len - $tail_size) / $chunk_size; - - for ($n = 0; $n < $n_chunks; $n++) { - $start = $n * $chunk_size; - $data = substr($val, $start, $chunk_size); - ibase_blob_add($blob_id, $data); - } - + $len = strlen($val); + $chunk_size = 32768; + $tail_size = $len % $chunk_size; + $n_chunks = ($len - $tail_size) / $chunk_size; + + for ($n = 0; $n < $n_chunks; $n++) { + $start = $n * $chunk_size; + $data = substr($val, $start, $chunk_size); + ibase_blob_add($blob_id, $data); + } + if ($tail_size) { - $start = $n_chunks * $chunk_size; - $data = substr($val, $start, $tail_size); - ibase_blob_add($blob_id, $data); - } - // end replacement ///////////////////////////////////////////////////////// - - $blob_id_str = ibase_blob_close($blob_id); - - return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; - - } - - + $start = $n_chunks * $chunk_size; + $data = substr($val, $start, $tail_size); + ibase_blob_add($blob_id, $data); + } + // end replacement ///////////////////////////////////////////////////////// + + $blob_id_str = ibase_blob_close($blob_id); + + return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; + + } + + function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB') { $blob_id = ibase_blob_create($this->_connectionID); @@ -663,15 +663,15 @@ class ADODB_ibase extends ADOConnection { $blob_id_str = ibase_blob_close($blob_id); return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; } - + // Format date column in sql string given an input format that understands Y M D // Only since Interbase 6.0 - uses EXTRACT // problem - does not zero-fill the day and month yet function SQLDate($fmt, $col=false) - { + { if (!$col) $col = $this->sysDate; $s = ''; - + $len = strlen($fmt); for ($i=0; $i < $len; $i++) { if ($s) $s .= '||'; @@ -696,15 +696,15 @@ class ADODB_ibase extends ADOConnection { case 'H': case 'h': $s .= "(extract(hour from $col))"; - break; + break; case 'I': case 'i': $s .= "(extract(minute from $col))"; - break; + break; case 'S': case 's': $s .= "CAST((extract(second from $col)) AS INTEGER)"; - break; + break; default: if ($ch == '\\') { @@ -729,11 +729,11 @@ class ADORecordset_ibase extends ADORecordSet var $databaseType = "ibase"; var $bind=false; var $_cacheType; - + function ADORecordset_ibase($id,$mode=false) { global $ADODB_FETCH_MODE; - + $this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode; $this->ADORecordSet($id); } @@ -752,20 +752,20 @@ class ADORecordset_ibase extends ADORecordSet $fld->name = ($ibf['alias']); if (empty($fld->name)) $fld->name = ($ibf['name']); break; - case 0: + case 0: $fld->name = strtoupper($ibf['alias']); if (empty($fld->name)) $fld->name = strtoupper($ibf['name']); break; - case 1: + case 1: $fld->name = strtolower($ibf['alias']); if (empty($fld->name)) $fld->name = strtolower($ibf['name']); break; } - + $fld->type = $ibf['type']; $fld->max_length = $ibf['length']; - - /* This needs to be populated from the metadata */ + + /* This needs to be populated from the metadata */ $fld->not_null = false; $fld->has_default = false; $fld->default_value = 'null'; @@ -778,48 +778,48 @@ class ADORecordset_ibase extends ADORecordSet $this->_numOfFields = @ibase_num_fields($this->_queryID); // cache types for blob decode check - for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { - $f1 = $this->FetchField($i); + for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { + $f1 = $this->FetchField($i); $this->_cacheType[] = $f1->type; - } + } } function _seek($row) { return false; } - - function _fetch() + + function _fetch() { - $f = @ibase_fetch_row($this->_queryID); + $f = @ibase_fetch_row($this->_queryID); if ($f === false) { $this->fields = false; return false; } // OPN stuff start - optimized // fix missing nulls and decode blobs automatically - + global $ADODB_ANSI_PADDING_OFF; //$ADODB_ANSI_PADDING_OFF=1; $rtrim = !empty($ADODB_ANSI_PADDING_OFF); - - for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { + + for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { if ($this->_cacheType[$i]=="BLOB") { - if (isset($f[$i])) { - $f[$i] = $this->connection->_BlobDecode($f[$i]); - } else { - $f[$i] = null; - } - } else { - if (!isset($f[$i])) { - $f[$i] = null; + if (isset($f[$i])) { + $f[$i] = $this->connection->_BlobDecode($f[$i]); + } else { + $f[$i] = null; + } + } else { + if (!isset($f[$i])) { + $f[$i] = null; } else if ($rtrim && is_string($f[$i])) { $f[$i] = rtrim($f[$i]); } - } - } - // OPN stuff end - + } + } + // OPN stuff end + $this->fields = $f; if ($this->fetchMode == ADODB_FETCH_ASSOC) { $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE); @@ -840,13 +840,13 @@ class ADORecordset_ibase extends ADORecordSet $this->bind[strtoupper($o->name)] = $i; } } - + return $this->fields[$this->bind[strtoupper($colname)]]; - + } - - function _close() + + function _close() { return @ibase_free_result($this->_queryID); } @@ -861,7 +861,7 @@ class ADORecordset_ibase extends ADORecordSet switch (strtoupper($t)) { case 'CHAR': return 'C'; - + case 'TEXT': case 'VARCHAR': case 'VARYING': @@ -869,14 +869,14 @@ class ADORecordset_ibase extends ADORecordSet return 'X'; case 'BLOB': return 'B'; - + case 'TIMESTAMP': case 'DATE': return 'D'; case 'TIME': return 'T'; //case 'T': return 'T'; //case 'L': return 'L'; - case 'INT': + case 'INT': case 'SHORT': case 'INTEGER': return 'I'; default: return 'N'; @@ -884,4 +884,3 @@ class ADORecordset_ibase extends ADORecordSet } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-informix.inc.php b/lib/WikiDB/adodb/drivers/adodb-informix.inc.php index e53e306d5..93205a802 100644 --- a/lib/WikiDB/adodb/drivers/adodb-informix.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-informix.inc.php @@ -1,6 +1,6 @@ ADORecordset_informix72($id,$mode); } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php b/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php index 606ee587f..267407b07 100644 --- a/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php @@ -1,6 +1,6 @@ version)) return $this->version; - + $arr['description'] = $this->GetOne("select DBINFO('version','full') from systables where tabid = 1"); $arr['version'] = $this->GetOne("select DBINFO('version','major') || DBINFO('version','minor') from systables where tabid = 1"); $this->version = $arr; @@ -104,8 +104,8 @@ class ADODB_informix72 extends ADOConnection { return true; } - function CommitTrans($ok=true) - { + function CommitTrans($ok=true) + { if (!$ok) return $this->RollbackTrans(); if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; @@ -132,7 +132,7 @@ class ADODB_informix72 extends ADOConnection { /* Returns: the last error message from previous database operation Note: This function is NOT available for Microsoft SQL Server. */ - function ErrorMsg() + function ErrorMsg() { if (!empty($this->_logsql)) return $this->_errorMsg; $this->_errorMsg = ifx_errormsg(); @@ -142,11 +142,11 @@ class ADODB_informix72 extends ADOConnection { function ErrorNo() { preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse); - if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; + if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; return 0; } - + function MetaProcedures($NamePattern = false, $catalog = null, $schemaPattern = null) { // save old fetch mode @@ -191,11 +191,11 @@ class ADODB_informix72 extends ADOConnection { return $procedures; } - + function MetaColumns($table, $normalize=true) { global $ADODB_FETCH_MODE; - + $false = false; if (!empty($this->metaColumnsSQL)) { $save = $ADODB_FETCH_MODE; @@ -232,18 +232,18 @@ class ADODB_informix72 extends ADOConnection { $fld->has_default = 0; } - $retarr[strtolower($fld->name)] = $fld; + $retarr[strtolower($fld->name)] = $fld; $rs->MoveNext(); } $rs->Close(); $rspkey->Close(); //!eos - return $retarr; + return $retarr; } return $false; } - + function xMetaColumns($table) { return ADOConnection::MetaColumns($table,false); @@ -292,15 +292,15 @@ class ADODB_informix72 extends ADOConnection { { return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid); } - + // returns true or false function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) { if (!function_exists('ifx_connect')) return null; - + $dbs = $argDatabasename . "@" . $argHostname; - if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); - putenv("INFORMIXSERVER=".trim($argHostname)); + if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); + putenv("INFORMIXSERVER=".trim($argHostname)); $this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword); if ($this->_connectionID === false) return false; #if ($argDatabasename) return $this->SelectDB($argDatabasename); @@ -311,9 +311,9 @@ class ADODB_informix72 extends ADOConnection { function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { if (!function_exists('ifx_connect')) return null; - + $dbs = $argDatabasename . "@" . $argHostname; - putenv("INFORMIXSERVER=".trim($argHostname)); + putenv("INFORMIXSERVER=".trim($argHostname)); $this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword); if ($this->_connectionID === false) return false; #if ($argDatabasename) return $this->SelectDB($argDatabasename); @@ -332,7 +332,7 @@ class ADODB_informix72 extends ADOConnection { function _query($sql,$inputarr=false) { global $ADODB_COUNTRECS; - + // String parameters have to be converted using ifx_create_char if ($inputarr) { foreach($inputarr as $v) { @@ -393,7 +393,7 @@ class ADORecordset_informix72 extends ADORecordSet { function ADORecordset_informix72($id,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } @@ -515,6 +515,3 @@ function ifx_props($coltype,$collength){ } return array($mtype,$length,$precision,$nullable); } - - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php b/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php index c29c6e7e5..720f469b8 100644 --- a/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php @@ -1,18 +1,18 @@ _connectionID = @ldap_connect($host); } else { $conn_info = array( $host,$this->port); - + if ( strstr( $host, ':' ) ) { $conn_info = explode( ':', $host ); - } - + } + $this->_connectionID = @ldap_connect( $conn_info[0], $conn_info[1] ); } if (!$this->_connectionID) { @@ -75,14 +75,14 @@ class ADODB_ldap extends ADOConnection { if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) { $this->_inject_bind_options( $LDAP_CONNECT_OPTIONS ); } - + if ($username) { $bind = @ldap_bind( $this->_connectionID, $username, $password ); } else { $username = 'anonymous'; - $bind = @ldap_bind( $this->_connectionID ); + $bind = @ldap_bind( $this->_connectionID ); } - + if (!$bind) { $e = sprintf($this->_bind_errmsg,ldap_error($this->_connectionID)); $this->_errorMsg = $e; @@ -93,7 +93,7 @@ class ADODB_ldap extends ADOConnection { $this->database = $ldapbase; return $this->_connectionID; } - + /* Valid Domain Values for LDAP Options: @@ -152,32 +152,32 @@ class ADODB_ldap extends ADOConnection { or die( "Unable to set server option: " . $option["OPTION_NAME"] ); } } - + /* returns _queryID or false */ function _query($sql,$inputarr=false) { $rs = @ldap_search( $this->_connectionID, $this->database, $sql ); $this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql.': '.ldap_error($this->_connectionID); - return $rs; + return $rs; } function ErrorMsg() { return $this->_errorMsg; } - + function ErrorNo() { return @ldap_errno($this->_connectionID); } - + /* closes the LDAP connection */ function _close() { @ldap_close( $this->_connectionID ); $this->_connectionID = false; } - + function SelectDB($db) { $this->database = $db; return true; @@ -188,14 +188,14 @@ class ADODB_ldap extends ADOConnection { if( !empty( $this->version ) ) return $this->version; $version = array(); /* - Determines how aliases are handled during search. + Determines how aliases are handled during search. LDAP_DEREF_NEVER (0x00) LDAP_DEREF_SEARCHING (0x01) LDAP_DEREF_FINDING (0x02) LDAP_DEREF_ALWAYS (0x03) - The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but - not when locating the base object of the search. The LDAP_DEREF_FINDING value means - aliases are dereferenced when locating the base object but not during the search. + The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but + not when locating the base object of the search. The LDAP_DEREF_FINDING value means + aliases are dereferenced when locating the base object but not during the search. Default: LDAP_DEREF_NEVER */ ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ; @@ -209,9 +209,9 @@ class ADODB_ldap extends ADOConnection { case 3: $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS'; } - - /* - A limit on the number of entries to return from a search. + + /* + A limit on the number of entries to return from a search. LDAP_NO_LIMIT (0) means no limit. Default: LDAP_NO_LIMIT */ @@ -219,9 +219,9 @@ class ADODB_ldap extends ADOConnection { if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) { $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT'; } - + /* - A limit on the number of seconds to spend on a search. + A limit on the number of seconds to spend on a search. LDAP_NO_LIMIT (0) means no limit. Default: LDAP_NO_LIMIT */ @@ -229,9 +229,9 @@ class ADODB_ldap extends ADOConnection { if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) { $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT'; } - + /* - Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. + Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. LDAP_OPT_ON LDAP_OPT_OFF Default: ON @@ -241,10 +241,10 @@ class ADODB_ldap extends ADOConnection { $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF'; } else { $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON'; - + } /* - Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. + Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. LDAP_OPT_ON LDAP_OPT_OFF Default: OFF @@ -254,7 +254,7 @@ class ADODB_ldap extends ADOConnection { $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF'; } else { $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON'; - + } /* This option indicates the version of the LDAP protocol used when communicating with the primary LDAP server. @@ -267,56 +267,56 @@ class ADODB_ldap extends ADOConnection { $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2'; } else { $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3'; - + } /* The host name (or list of hosts) for the primary LDAP server. */ - ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); - ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); - ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); - ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); - + ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); + ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); + ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); + ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); + return $this->version = $version; - + } } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_ldap extends ADORecordSet{ - +class ADORecordSet_ldap extends ADORecordSet{ + var $databaseType = "ldap"; var $canSeek = false; var $_entryID; /* keeps track of the entry resource identifier */ - - function ADORecordSet_ldap($queryID,$mode=false) + + function ADORecordSet_ldap($queryID,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } switch ($mode) { - case ADODB_FETCH_NUM: - $this->fetchMode = LDAP_NUM; + case ADODB_FETCH_NUM: + $this->fetchMode = LDAP_NUM; break; - case ADODB_FETCH_ASSOC: - $this->fetchMode = LDAP_ASSOC; + case ADODB_FETCH_ASSOC: + $this->fetchMode = LDAP_ASSOC; break; case ADODB_FETCH_DEFAULT: - case ADODB_FETCH_BOTH: + case ADODB_FETCH_BOTH: default: - $this->fetchMode = LDAP_BOTH; + $this->fetchMode = LDAP_BOTH; break; } - - $this->ADORecordSet($queryID); + + $this->ADORecordSet($queryID); } - + function _initrs() { - /* + /* This could be teaked to respect the $COUNTRECS directive from ADODB It's currently being used in the _fetch() function and the GetAssoc() function @@ -328,7 +328,7 @@ class ADORecordSet_ldap extends ADORecordSet{ /* Return whole recordset as a multi-dimensional associative array */ - function GetAssoc($force_array = false, $first2cols = false) + function GetAssoc($force_array = false, $first2cols = false) { $records = $this->_numOfRows; $results = array(); @@ -340,14 +340,14 @@ class ADORecordSet_ldap extends ADORecordSet{ } else { array_shift( $v ); $results[$i][$k] = $v; - } + } } } } - - return $results; + + return $results; } - + function GetRowAssoc() { $results = array(); @@ -358,13 +358,13 @@ class ADORecordSet_ldap extends ADORecordSet{ } else { array_shift( $v ); $results[$k] = $v; - } + } } } - - return $results; + + return $results; } - + function GetRowNums() { $results = array(); @@ -376,48 +376,47 @@ class ADORecordSet_ldap extends ADORecordSet{ } else { array_shift( $v ); $results[$i] = $v; - } + } $i++; } } return $results; } - + function _fetch() - { + { if ( $this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0 ) return false; - + if ( $this->_currentRow == 0 ) { $this->_entryID = ldap_first_entry( $this->connection->_connectionID, $this->_queryID ); } else { $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID ); } - + $this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID ); - $this->_numOfFields = $this->fields['count']; + $this->_numOfFields = $this->fields['count']; switch ( $this->fetchMode ) { - + case LDAP_ASSOC: $this->fields = $this->GetRowAssoc(); break; - + case LDAP_NUM: $this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc()); break; - + case LDAP_BOTH: default: $this->fields = $this->GetRowNums(); break; } - return ( is_array( $this->fields ) ); + return ( is_array( $this->fields ) ); } - + function _close() { - @ldap_free_result( $this->_queryID ); + @ldap_free_result( $this->_queryID ); $this->_queryID = false; } - + } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php b/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php index 04ceb5a2c..58a0259a6 100644 --- a/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php @@ -1,17 +1,17 @@ = 0x4300) { // docs say 4.2.0, but testing shows only since 4.3.0 does it work! - ini_set('mssql.datetimeconvert',0); + ini_set('mssql.datetimeconvert',0); } else { global $ADODB_mssql_mths; // array, months must be upper-case - $ADODB_mssql_date_order = 'mdy'; + $ADODB_mssql_date_order = 'mdy'; $ADODB_mssql_mths = array( 'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6, 'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12); @@ -72,11 +72,11 @@ global $ADODB_mssql_date_order; } class ADODB_mssql extends ADOConnection { - var $databaseType = "mssql"; + var $databaseType = "mssql"; var $dataProvider = "mssql"; var $replaceQuote = "''"; // string to use to replace quotes var $fmtDate = "'Y-m-d'"; - var $fmtTimeStamp = "'Y-m-d H:i:s'"; + var $fmtTimeStamp = "'Y-m-d\TH:i:s'"; var $hasInsertID = true; var $substr = "substring"; var $length = 'len'; @@ -86,7 +86,7 @@ class ADODB_mssql extends ADOConnection { var $metaColumnsSQL = # xtype==61 is datetime "select c.name,t.name,c.length,c.isnullable, c.status, (case when c.xusertype=61 then 0 else c.xprec end), - (case when c.xusertype=61 then 0 else c.xscale end) + (case when c.xusertype=61 then 0 else c.xscale end) from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'"; var $hasTop = 'top'; // support mssql SELECT TOP 10 * FROM TABLE var $hasGenID = true; @@ -104,54 +104,54 @@ class ADODB_mssql extends ADOConnection { var $uniqueOrderBy = true; var $_bindInputArray = true; var $forceNewConnect = false; - - function ADODB_mssql() - { + + function ADODB_mssql() + { $this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0); } function ServerInfo() { global $ADODB_FETCH_MODE; - - + + if ($this->fetchMode === false) { $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - } else + } else $savem = $this->SetFetchMode(ADODB_FETCH_NUM); - + if (0) { $stmt = $this->PrepareSP('sp_server_info'); $val = 2; $this->Parameter($stmt,$val,'attribute_id'); $row = $this->GetRow($stmt); } - + $row = $this->GetRow("execute sp_server_info 2"); - - + + if ($this->fetchMode === false) { $ADODB_FETCH_MODE = $savem; } else $this->SetFetchMode($savem); - + $arr['description'] = $row[2]; $arr['version'] = ADOConnection::_findvers($arr['description']); return $arr; } - - function IfNull( $field, $ifNull ) + + function IfNull( $field, $ifNull ) { return " ISNULL($field, $ifNull) "; // if MS SQL Server } - + function _insertid() { // SCOPE_IDENTITY() - // Returns the last IDENTITY value inserted into an IDENTITY column in - // the same scope. A scope is a module -- a stored procedure, trigger, - // function, or batch. Thus, two statements are in the same scope if + // Returns the last IDENTITY value inserted into an IDENTITY column in + // the same scope. A scope is a module -- a stored procedure, trigger, + // function, or batch. Thus, two statements are in the same scope if // they are in the same stored procedure, function, or batch. if ($this->lastInsID !== false) { return $this->lastInsID; // InsID from sp_executesql call @@ -166,7 +166,7 @@ class ADODB_mssql extends ADOConnection { * Correctly quotes a string so that all strings are escaped. We prefix and append * to the string single-quotes. * An example is $db->qstr("Don't bother",magic_quotes_runtime()); - * + * * @param s the string to quote * @param [magic_quotes] if $s is GET/POST var, set to get_magic_quotes_gpc(). * This undoes the stupidity of magic quotes for GPC. @@ -201,10 +201,10 @@ class ADODB_mssql extends ADOConnection { } var $_dropSeqSQL = "drop table %s"; - + function CreateSequence($seq='adodbseq',$start=1) { - + $this->Execute('BEGIN TRANSACTION adodbseq'); $start -= 1; $this->Execute("create table $seq (id float(53))"); @@ -213,7 +213,7 @@ class ADODB_mssql extends ADOConnection { $this->Execute('ROLLBACK TRANSACTION adodbseq'); return false; } - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return true; } @@ -229,41 +229,41 @@ class ADODB_mssql extends ADOConnection { $this->Execute('ROLLBACK TRANSACTION adodbseq'); return false; } - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return $start; } $num = $this->GetOne("select id from $seq"); - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return $num; - + // in old implementation, pre 1.90, we returned GUID... //return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'"); } - + function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) { if ($nrows > 0 && $offset <= 0) { $sql = preg_replace( '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql); - + if ($secs2cache) $rs = $this->CacheExecute($secs2cache, $sql, $inputarr); else $rs = $this->Execute($sql,$inputarr); } else $rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache); - + return $rs; } - - + + // Format date column in sql string given an input format that understands Y M D function SQLDate($fmt, $col=false) - { + { if (!$col) $col = $this->sysTimeStamp; $s = ''; - + $len = strlen($fmt); for ($i=0; $i < $len; $i++) { if ($s) $s .= '+'; @@ -290,11 +290,11 @@ class ADODB_mssql extends ADOConnection { case 'h': $s .= "substring(convert(char(14),$col,0),13,2)"; break; - + case 'H': $s .= "replace(str(datepart(hh,$col),2),' ','0')"; break; - + case 'i': $s .= "replace(str(datepart(mi,$col),2),' ','0')"; break; @@ -305,7 +305,7 @@ class ADODB_mssql extends ADOConnection { case 'A': $s .= "substring(convert(char(19),$col,0),18,2)"; break; - + default: if ($ch == '\\') { $i++; @@ -318,18 +318,18 @@ class ADODB_mssql extends ADOConnection { return $s; } - + function BeginTrans() { - if ($this->transOff) return true; + if ($this->transOff) return true; $this->transCnt += 1; $ok = $this->Execute('BEGIN TRAN'); return $ok; } - - function CommitTrans($ok=true) - { - if ($this->transOff) return true; + + function CommitTrans($ok=true) + { + if ($this->transOff) return true; if (!$ok) return $this->RollbackTrans(); if ($this->transCnt) $this->transCnt -= 1; $ok = $this->Execute('COMMIT TRAN'); @@ -337,13 +337,13 @@ class ADODB_mssql extends ADOConnection { } function RollbackTrans() { - if ($this->transOff) return true; + if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; $ok = $this->Execute('ROLLBACK TRAN'); return $ok; } - - function SetTransactionMode( $transaction_mode ) + + function SetTransactionMode( $transaction_mode ) { $this->_transmode = $transaction_mode; if (empty($transaction_mode)) { @@ -353,27 +353,27 @@ class ADODB_mssql extends ADOConnection { if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode; $this->Execute("SET TRANSACTION ".$transaction_mode); } - + /* Usage: - + $this->BeginTrans(); $this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables - + # some operation on both tables table1 and table2 - + $this->CommitTrans(); - + See http://www.swynk.com/friends/achigrik/SQL70Locks.asp */ - function RowLock($tables,$where,$col='1 as adodbignore') + function RowLock($tables,$where,$col='1 as adodbignore') { if ($col == '1 as adodbignore') $col = 'top 1 null as ignore'; if (!$this->transCnt) $this->BeginTrans(); return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where"); } - - + + function MetaColumns($table, $normalize=true) { // $arr = ADOConnection::MetaColumns($table); @@ -387,30 +387,30 @@ class ADODB_mssql extends ADOConnection { global $ADODB_FETCH_MODE; $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - + if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false); $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table)); - + if ($schema) { $this->SelectDB($dbName); } - + if (isset($savem)) $this->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; if (!is_object($rs)) { $false = false; return $false; } - + $retarr = array(); while (!$rs->EOF){ $fld = new ADOFieldObject(); $fld->name = $rs->fields[0]; - $fld->type = $rs->fields[1]; - + $fld->type = $rs->fields[1]; + $fld->not_null = (!$rs->fields[3]); - $fld->auto_increment = ($rs->fields[4] == 128); // sys.syscolumns status field. 0x80 = 128 ref: http://msdn.microsoft.com/en-us/library/ms186816.aspx - + $fld->auto_increment = ($rs->fields[4] == 128); // sys.syscolumns status field. 0x80 = 128 ref: http://msdn.microsoft.com/en-us/library/ms186816.aspx + if (isset($rs->fields[5]) && $rs->fields[5]) { if ($rs->fields[5]>0) $fld->max_length = $rs->fields[5]; $fld->scale = $rs->fields[6]; @@ -425,22 +425,22 @@ class ADODB_mssql extends ADOConnection { } $rs->MoveNext(); } - + $rs->Close(); - return $retarr; - + return $retarr; + } - - + + function MetaIndexes($table,$primary=false, $owner=false) { $table = $this->qstr($table); - $sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, + $sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK, CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique - FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id - INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid + FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id + INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table ORDER BY O.name, I.Name, K.keyno"; @@ -451,7 +451,7 @@ class ADODB_mssql extends ADOConnection { if ($this->fetchMode !== FALSE) { $savem = $this->SetFetchMode(FALSE); } - + $rs = $this->Execute($sql); if (isset($savem)) { $this->SetFetchMode($savem); @@ -465,22 +465,22 @@ class ADODB_mssql extends ADOConnection { $indexes = array(); while ($row = $rs->FetchRow()) { if ($primary && !$row[5]) continue; - + $indexes[$row[0]]['unique'] = $row[6]; $indexes[$row[0]]['columns'][] = $row[1]; } return $indexes; } - + function MetaForeignKeys($table, $owner=false, $upper=false) { global $ADODB_FETCH_MODE; - + $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $table = $this->qstr(strtoupper($table)); - - $sql = + + $sql = "select object_name(constid) as constraint_name, col_name(fkeyid, fkey) as column_name, object_name(rkeyid) as referenced_table_name, @@ -488,20 +488,20 @@ class ADODB_mssql extends ADOConnection { from sysforeignkeys where upper(object_name(fkeyid)) = $table order by constraint_name, referenced_table_name, keyno"; - + $constraints = $this->GetArray($sql); - + $ADODB_FETCH_MODE = $save; - + $arr = false; foreach($constraints as $constr) { //print_r($constr); - $arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; + $arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; } if (!$arr) return false; - + $arr2 = false; - + foreach($arr as $k => $v) { foreach($v as $a => $b) { if ($upper) $a = strtoupper($a); @@ -512,55 +512,55 @@ order by constraint_name, referenced_table_name, keyno"; } //From: Fernando Moreira - function MetaDatabases() - { - if(@mssql_select_db("master")) { - $qry=$this->metaDatabasesSQL; - if($rs=@mssql_query($qry,$this->_connectionID)){ - $tmpAr=$ar=array(); - while($tmpAr=@mssql_fetch_row($rs)) - $ar[]=$tmpAr[0]; - @mssql_select_db($this->database); - if(sizeof($ar)) - return($ar); - else - return(false); - } else { - @mssql_select_db($this->database); - return(false); - } - } - return(false); - } + function MetaDatabases() + { + if(@mssql_select_db("master")) { + $qry=$this->metaDatabasesSQL; + if($rs=@mssql_query($qry,$this->_connectionID)){ + $tmpAr=$ar=array(); + while($tmpAr=@mssql_fetch_row($rs)) + $ar[]=$tmpAr[0]; + @mssql_select_db($this->database); + if(sizeof($ar)) + return($ar); + else + return(false); + } else { + @mssql_select_db($this->database); + return(false); + } + } + return(false); + } // "Stein-Aksel Basma" // tested with MSSQL 2000 function MetaPrimaryKeys($table, $owner=false) { global $ADODB_FETCH_MODE; - + $schema = ''; $this->_findschema($table,$schema); if (!$schema) $schema = $this->database; - if ($schema) $schema = "and k.table_catalog like '$schema%'"; + 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 + information_schema.table_constraints tc where tc.constraint_name = k.constraint_name and tc.constraint_type = '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; $false = false; - return $false; + return $false; } - - function MetaTables($ttype=false,$showSchema=false,$mask=false) + + function MetaTables($ttype=false,$showSchema=false,$mask=false) { if ($mask) { $save = $this->metaTablesSQL; @@ -568,32 +568,32 @@ order by constraint_name, referenced_table_name, keyno"; $this->metaTablesSQL .= " AND name like $mask"; } $ret = ADOConnection::MetaTables($ttype,$showSchema); - + if ($mask) { $this->metaTablesSQL = $save; } return $ret; } - - function SelectDB($dbName) + + function SelectDB($dbName) { $this->database = $dbName; $this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions if ($this->_connectionID) { - return @mssql_select_db($dbName); + return @mssql_select_db($dbName); } - else return false; + else return false; } - - function ErrorMsg() + + function ErrorMsg() { if (empty($this->_errorMsg)){ $this->_errorMsg = mssql_get_last_message(); } return $this->_errorMsg; } - - function ErrorNo() + + function ErrorNo() { if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode; if (empty($this->_errorMsg)) { @@ -606,7 +606,7 @@ order by constraint_name, referenced_table_name, keyno"; if (is_array($arr)) return $arr[0]; else return -1; } - + // returns true or false, newconnect supported since php 5.1.0. function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$newconnect=false) { @@ -614,26 +614,26 @@ order by constraint_name, referenced_table_name, keyno"; $this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword,$newconnect); if ($this->_connectionID === false) return false; if ($argDatabasename) return $this->SelectDB($argDatabasename); - return true; + return true; } - - + + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { if (!function_exists('mssql_pconnect')) return null; $this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword); if ($this->_connectionID === false) return false; - + // persistent connections can forget to rollback on crash, so we do it here. if ($this->autoRollback) { $cnt = $this->GetOne('select @@TRANCOUNT'); - while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); + while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); } if ($argDatabasename) return $this->SelectDB($argDatabasename); - return true; + return true; } - + function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true); @@ -646,10 +646,10 @@ order by constraint_name, referenced_table_name, keyno"; $sql2 = $sqlarr[0]; for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) { $sql2 .= '@P'.($i-1) . $sqlarr[$i]; - } + } return array($sql,$this->qstr($sql2),$max,$sql2); } - + function PrepareSP($sql,$param=true) { if (!$this->_has_mssql_init) { @@ -660,7 +660,7 @@ order by constraint_name, referenced_table_name, keyno"; if (!$stmt) return $sql; return array($sql,$stmt); } - + // returns concatenated string // MSSQL requires integers to be cast as strings // automatically cast every datatype to VARCHAR(255) @@ -681,26 +681,26 @@ order by constraint_name, referenced_table_name, keyno"; array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";')); $s = implode('+',$arr); if (sizeof($arr) > 0) return "$s"; - + return ''; } - - /* + + /* Usage: $stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group - + # note that the parameter does not have @ in front! $db->Parameter($stmt,$id,'myid'); $db->Parameter($stmt,$group,'group',false,64); $db->Execute($stmt); - + @param $stmt Statement returned by Prepare() or PrepareSP(). @param $var PHP variable to bind to. Can set to null (for isNull support). @param $name Name of stored procedure variable name to bind to. @param [$isOutput] Indicates direction of parameter 0/false=IN 1=OUT 2= IN/OUT. This is ignored in oci8. @param [$maxLen] Holds an maximum length of the variable. @param [$type] The data type of $var. Legal values depend on driver. - + See mssql_bind documentation at php.net. */ function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false) @@ -711,8 +711,8 @@ order by constraint_name, referenced_table_name, keyno"; } $isNull = is_null($var); // php 4.0.4 and above... - - if ($type === false) + + if ($type === false) switch(gettype($var)) { default: case 'string': $type = SQLVARCHAR; break; @@ -720,7 +720,7 @@ order by constraint_name, referenced_table_name, keyno"; case 'integer': $type = SQLINT4; break; case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0 } - + if ($this->debug) { $prefix = ($isOutput) ? 'Out' : 'In'; $ztype = (empty($type)) ? 'false' : $type; @@ -728,32 +728,32 @@ order by constraint_name, referenced_table_name, keyno"; } /* See http://phplens.com/lens/lensforum/msgs.php?id=7231 - + RETVAL is HARD CODED into php_mssql extension: - The return value (a long integer value) is treated like a special OUTPUT parameter, - called "RETVAL" (without the @). See the example at mssql_execute to - see how it works. - type: one of this new supported PHP constants. - SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 + The return value (a long integer value) is treated like a special OUTPUT parameter, + called "RETVAL" (without the @). See the example at mssql_execute to + see how it works. - type: one of this new supported PHP constants. + SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 */ if ($name !== 'RETVAL') $name = '@'.$name; return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen); } - - /* + + /* Unfortunately, it appears that mssql cannot handle varbinary > 255 chars So all your blobs must be of type "image". - + Remember to set in php.ini the following... - - ; Valid range 0 - 2147483647. Default = 4096. - mssql.textlimit = 0 ; zero to pass through - ; Valid range 0 - 2147483647. Default = 4096. - mssql.textsize = 0 ; zero to pass through + ; Valid range 0 - 2147483647. Default = 4096. + mssql.textlimit = 0 ; zero to pass through + + ; Valid range 0 - 2147483647. Default = 4096. + mssql.textsize = 0 ; zero to pass through */ function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') { - + if (strtoupper($blobtype) == 'CLOB') { $sql = "UPDATE $table SET $column='" . $val . "' WHERE $where"; return $this->Execute($sql) != false; @@ -761,14 +761,14 @@ order by constraint_name, referenced_table_name, keyno"; $sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where"; return $this->Execute($sql) != false; } - + // returns query ID if successful, otherwise false function _query($sql,$inputarr=false) { $this->_errorMsg = false; if (is_array($inputarr)) { - - # bind input params with sp_executesql: + + # bind input params with sp_executesql: # see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm # works only with sql server 7 and newer $getIdentity = false; @@ -784,11 +784,11 @@ order by constraint_name, referenced_table_name, keyno"; if ($decl) { $decl .= ', '; $params .= ', '; - } + } if (is_string($v)) { $len = strlen($v); if ($len == 0) $len = 1; - + if ($len > 4000 ) { // NVARCHAR is max 4000 chars. Let's use NTEXT $decl .= "@P$i NTEXT"; @@ -820,57 +820,57 @@ order by constraint_name, referenced_table_name, keyno"; $this->lastInsID = isset($arr[0]) ? $arr[0] : false; @mssql_data_seek($rez, 0); } - + } else if (is_array($sql)) { # PrepareSP() $rez = mssql_execute($sql[1]); $this->lastInsID = false; - + } else { $rez = mssql_query($sql,$this->_connectionID); $this->lastInsID = false; } return $rez; } - + // returns true or false function _close() - { + { if ($this->transCnt) $this->RollbackTrans(); $rez = @mssql_close($this->_connectionID); $this->_connectionID = false; return $rez; } - + // mssql uses a default date like Dec 30 2000 12:00AM static function UnixDate($v) { return ADORecordSet_array_mssql::UnixDate($v); } - + static function UnixTimeStamp($v) { return ADORecordSet_array_mssql::UnixTimeStamp($v); - } + } } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordset_mssql extends ADORecordSet { +class ADORecordset_mssql extends ADORecordSet { var $databaseType = "mssql"; var $canSeek = true; var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083 // _mths works only in non-localised system - + function ADORecordset_mssql($id,$mode=false) { // freedts check... $this->hasFetchAssoc = function_exists('mssql_fetch_assoc'); - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; @@ -878,15 +878,15 @@ class ADORecordset_mssql extends ADORecordSet { $this->fetchMode = $mode; return $this->ADORecordSet($id,$mode); } - - + + function _initrs() { - GLOBAL $ADODB_COUNTRECS; + GLOBAL $ADODB_COUNTRECS; $this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1; $this->_numOfFields = @mssql_num_fields($this->_queryID); } - + //Contributed by "Sven Axelsson" // get next resultset - requires PHP 4.0.5 or later @@ -911,16 +911,16 @@ class ADORecordset_mssql extends ADORecordSet { $this->bind[strtoupper($o->name)] = $i; } } - + return $this->fields[$this->bind[strtoupper($colname)]]; } - - /* Returns: an object containing field information. + + /* Returns: an object containing field information. Get column information in the Recordset object. fetchField() can be used in order to obtain information about fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by fetchField() is retrieved. */ - function FetchField($fieldOffset = -1) + function FetchField($fieldOffset = -1) { if ($fieldOffset != -1) { $f = @mssql_fetch_field($this->_queryID, $fieldOffset); @@ -932,19 +932,19 @@ class ADORecordset_mssql extends ADORecordSet { if (empty($f)) return $false; return $f; } - - function _seek($row) + + function _seek($row) { return @mssql_data_seek($this->_queryID, $row); } // speedup - function MoveNext() + function MoveNext() { if ($this->EOF) return false; - + $this->_currentRow++; - + if ($this->fetchMode & ADODB_FETCH_ASSOC) { if ($this->fetchMode & ADODB_FETCH_NUM) { //ADODB_FETCH_BOTH mode @@ -966,7 +966,7 @@ class ADORecordset_mssql extends ADORecordSet { $this->fields = false; } } - + if (is_array($this->fields)) { if (ADODB_ASSOC_CASE == 0) { foreach($this->fields as $k=>$v) { @@ -991,14 +991,14 @@ class ADORecordset_mssql extends ADORecordSet { } if ($this->fields) return true; $this->EOF = true; - + return false; } - + // INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4 // also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot! - function _fetch($ignore_fields=false) + function _fetch($ignore_fields=false) { if ($this->fetchMode & ADODB_FETCH_ASSOC) { if ($this->fetchMode & ADODB_FETCH_NUM) { @@ -1019,7 +1019,7 @@ class ADORecordset_mssql extends ADORecordSet { } } } - + if (!$this->fields) { } else if (ADODB_ASSOC_CASE == 0) { foreach($this->fields as $k=>$v) { @@ -1043,13 +1043,13 @@ class ADORecordset_mssql extends ADORecordSet { } return $this->fields; } - + /* close() only needs to be called if you are worried about using too much memory while your script is running. All associated result memory for the specified result identifier will automatically be freed. */ - function _close() + function _close() { - $rez = mssql_free_result($this->_queryID); + $rez = mssql_free_result($this->_queryID); $this->_queryID = false; return $rez; } @@ -1058,36 +1058,36 @@ class ADORecordset_mssql extends ADORecordSet { { return ADORecordSet_array_mssql::UnixDate($v); } - + static function UnixTimeStamp($v) { return ADORecordSet_array_mssql::UnixTimeStamp($v); } - + } class ADORecordSet_array_mssql extends ADORecordSet_array { - function ADORecordSet_array_mssql($id=-1,$mode=false) + function ADORecordSet_array_mssql($id=-1,$mode=false) { $this->ADORecordSet_array($id,$mode); } - + // mssql uses a default date like Dec 30 2000 12:00AM static function UnixDate($v) { - + if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v); - + global $ADODB_mssql_mths,$ADODB_mssql_date_order; - - //Dec 30 2000 12:00AM + + //Dec 30 2000 12:00AM if ($ADODB_mssql_date_order == 'dmy') { if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) { return parent::UnixDate($v); } if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - + $theday = $rr[1]; $themth = substr(strtoupper($rr[2]),0,3); } else { @@ -1095,7 +1095,7 @@ class ADORecordSet_array_mssql extends ADORecordSet_array { return parent::UnixDate($v); } if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - + $theday = $rr[2]; $themth = substr(strtoupper($rr[1]),0,3); } @@ -1104,34 +1104,34 @@ class ADORecordSet_array_mssql extends ADORecordSet_array { // h-m-s-MM-DD-YY return mktime(0,0,0,$themth,$theday,$rr[3]); } - + static function UnixTimeStamp($v) { - + if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v); - + global $ADODB_mssql_mths,$ADODB_mssql_date_order; - + //Dec 30 2000 12:00AM if ($ADODB_mssql_date_order == 'dmy') { if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|" ,$v, $rr)) return parent::UnixTimeStamp($v); if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - + $theday = $rr[1]; $themth = substr(strtoupper($rr[2]),0,3); } else { if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|" ,$v, $rr)) return parent::UnixTimeStamp($v); if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - + $theday = $rr[2]; $themth = substr(strtoupper($rr[1]),0,3); } - + $themth = $ADODB_mssql_mths[$themth]; if ($themth <= 0) return false; - + switch (strtoupper($rr[6])) { case 'P': if ($rr[4]<12) $rr[4] += 12; @@ -1151,7 +1151,7 @@ class ADORecordSet_array_mssql extends ADORecordSet_array { Code Example 1: select object_name(constid) as constraint_name, - object_name(fkeyid) as table_name, + object_name(fkeyid) as table_name, col_name(fkeyid, fkey) as column_name, object_name(rkeyid) as referenced_table_name, col_name(rkeyid, rkey) as referenced_column_name @@ -1170,5 +1170,3 @@ order by constraint_name, ordinal_position http://www.databasejournal.com/scripts/article.php/1440551 */ - -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php b/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php index dd66255d4..69338b4a0 100644 --- a/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php @@ -9,7 +9,7 @@ // ADOdb - Database Abstraction Library for PHP // // http://adodb.sourceforge.net/ // // // -// Copyright (c) 2000-2012 John Lim (jlim\@natsoft.com.my) // +// Copyright (c) 2000-2014 John Lim (jlim\@natsoft.com.my) // // All rights reserved. // // Released under both BSD license and LGPL library license. // // Whenever there is any discrepancy between the two licenses, // @@ -52,7 +52,7 @@ include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php'); class ADODB_mssql_n extends ADODB_mssql { var $databaseType = "mssql_n"; - + function ADODB_mssqlpo() { ADODB_mssql::ADODB_mssql(); @@ -168,4 +168,3 @@ class ADORecordset_mssql_n extends ADORecordset_mssql { $this->ADORecordset_mssql($id,$mode); } } -?> \ No newline at end of file diff --git a/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php b/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php index b9cd4a908..b10d55546 100644 --- a/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php +++ b/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php @@ -1,16 +1,16 @@ = 0x4300) { // docs say 4.2.0, but testing shows only since 4.3.0 does it work! - ini_set('mssql.datetimeconvert',0); + ini_set('mssql.datetimeconvert',0); } else { global $ADODB_mssql_mths; // array, months must be upper-case - $ADODB_mssql_date_order = 'mdy'; + $ADODB_mssql_date_order = 'mdy'; $ADODB_mssql_mths = array( 'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6, 'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12); } -//--------------------------------------------------------------------------- -// Call this to autoset $ADODB_mssql_date_order at the beginning of your code, -// just after you connect to the database. Supports mdy and dmy only. -// Not required for PHP 4.2.0 and above. -function AutoDetect_MSSQL_Date_Order($conn) -{ - global $ADODB_mssql_date_order; - $adate = $conn->GetOne('select getdate()'); - if ($adate) { - $anum = (int) $adate; - if ($anum > 0) { - if ($anum > 31) { - //ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently"); - } else - $ADODB_mssql_date_order = 'dmy'; - } else - $ADODB_mssql_date_order = 'mdy'; - } -} - class ADODB_mssqlnative extends ADOConnection { - var $databaseType = "mssqlnative"; + var $databaseType = "mssqlnative"; var $dataProvider = "mssqlnative"; var $replaceQuote = "''"; // string to use to replace quotes var $fmtDate = "'Y-m-d'"; - var $fmtTimeStamp = "'Y-m-d H:i:s'"; + var $fmtTimeStamp = "'Y-m-d\TH:i:s'"; var $hasInsertID = true; var $substr = "substring"; var $length = 'len'; @@ -111,11 +91,23 @@ class ADODB_mssqlnative extends ADOConnection { var $poorAffectedRows = false; var $metaDatabasesSQL = "select name from sys.sysdatabases where name <> 'master'"; var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))"; - var $metaColumnsSQL = # xtype==61 is datetime - "select c.name,t.name,c.length, - (case when c.xusertype=61 then 0 else c.xprec end), - (case when c.xusertype=61 then 0 else c.xscale end) - from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'"; + var $metaColumnsSQL = + "select c.name, + t.name as type, + c.length, + c.xprec as precision, + c.xscale as scale, + c.isnullable as nullable, + c.cdefault as default_value, + c.xtype, + t.length as type_length, + sc.is_identity + from syscolumns c + join systypes t on t.xusertype=c.xusertype + join sysobjects o on o.id=c.id + join sys.tables st on st.name=o.name + join sys.columns sc on sc.object_id = st.object_id and sc.name=c.name + where o.name='%s'"; var $hasTop = 'top'; // support mssql SELECT TOP 10 * FROM TABLE var $hasGenID = true; var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)'; @@ -131,9 +123,11 @@ class ADODB_mssqlnative extends ADOConnection { var $_bindInputArray = true; var $_dropSeqSQL = "drop table %s"; var $connectionInfo = array(); - - function ADODB_mssqlnative() - { + var $sequences = false; + var $mssql_version = ''; + + function ADODB_mssqlnative() + { if ($this->debug) { error_log("
    ");
             sqlsrv_set_error_handling( SQLSRV_ERRORS_LOG_ALL );
@@ -147,86 +141,189 @@ class ADODB_mssqlnative extends ADOConnection {
             sqlsrv_configure('warnings_return_as_errors', 0);
         }
 	}
+	function ServerVersion() {
+		$data = $this->ServerInfo();
+		if (preg_match('/^09/',$data['version'])){
+			/*
+			 * SQL Server 2005
+			 */
+			$this->mssql_version = 9;
+		} elseif (preg_match('/^10/',$data['version'])){
+			/*
+			 * SQL Server 2008
+			 */
+			$this->mssql_version = 10;
+		} elseif (preg_match('/^11/',$data['version'])){
+			/*
+			 * SQL Server 2012
+			 */
+			$this->mssql_version = 11;
+		} else
+			die("SQL SERVER VERSION {$data['version']} NOT SUPPORTED IN mssqlnative DRIVER");
+	}
 
-	function ServerInfo()
-	{
+	function ServerInfo() {
     	global $ADODB_FETCH_MODE;
+		static $arr = false;
+		if (is_array($arr))
+			return $arr;
 		if ($this->fetchMode === false) {
 			$savem = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		} else 
+		} elseif ($this->fetchMode >=0 && $this->fetchMode <=2) {
+			$savem = $this->fetchMode;
+		} else
 			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+
 		$arrServerInfo = sqlsrv_server_info($this->_connectionID);
 		$ADODB_FETCH_MODE = $savem;
 		$arr['description'] = $arrServerInfo['SQLServerName'].' connected to '.$arrServerInfo['CurrentDatabase'];
 		$arr['version'] = $arrServerInfo['SQLServerVersion'];//ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " ISNULL($field, $ifNull) "; // if MS SQL Server
 	}
-	
+
 	function _insertid()
 	{
 	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
+	// Returns the last IDENTITY value inserted into an IDENTITY column in
+	// the same scope. A scope is a module -- a stored procedure, trigger,
+	// function, or batch. Thus, two statements are in the same scope if
 	// they are in the same stored procedure, function, or batch.
-		return $this->GetOne($this->identitySQL);
+		return $this->lastInsertID;
 	}
 
 	function _affectedrows()
 	{
-        return sqlsrv_rows_affected($this->_queryID);
+		if ($this->_queryID)
+		return sqlsrv_rows_affected($this->_queryID);
+	}
+
+	function GenID($seq='adodbseq',$start=1) {
+		if (!$this->mssql_version)
+			$this->ServerVersion();
+		switch($this->mssql_version){
+		case 9:
+		case 10:
+			return $this->GenID2008();
+			break;
+		case 11:
+			return $this->GenID2012();
+			break;
+		}
 	}
-	
+
 	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		if (!$this->mssql_vesion)
+			$this->ServerVersion();
+
+		switch($this->mssql_version){
+		case 9:
+		case 10:
+			return $this->CreateSequence2008();
+			break;
+		case 11:
+			return $this->CreateSequence2012();
+			break;
+		}
+
+	}
+
+	/**
+	 * For Server 2005,2008, duplicate a sequence with an identity table
+	 */
+	function CreateSequence2008($seq='adodbseq',$start=1)
 	{
 		if($this->debug) error_log("
    CreateSequence($seq,$start)");
-        sqlsrv_begin_transaction($this->_connectionID);
+		sqlsrv_begin_transaction($this->_connectionID);
 		$start -= 1;
 		$this->Execute("create table $seq (id int)");//was float(53)
 		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
 		if (!$ok) {
-            if($this->debug) error_log("
    Error: ROLLBACK");
-            sqlsrv_rollback($this->_connectionID);
+			if($this->debug) error_log("
    Error: ROLLBACK");
+			sqlsrv_rollback($this->_connectionID);
 			return false;
 		}
-        sqlsrv_commit($this->_connectionID);
+		sqlsrv_commit($this->_connectionID);
 		return true;
 	}
 
-	function GenID($seq='adodbseq',$start=1)
+	/**
+	 * Proper Sequences Only available to Server 2012 and up
+	 */
+	function CreateSequence2012($seq='adodb',$start=1){
+		if (!$this->sequences){
+			$sql = "SELECT name FROM sys.sequences";
+			$this->sequences = $this->GetCol($sql);
+		}
+		$ok = $this->Execute("CREATE SEQUENCE $seq START WITH $start INCREMENT BY 1");
+		if (!$ok)
+			die("CANNOT CREATE SEQUENCE" . print_r(sqlsrv_errors(),true));
+		$this->sequences[] = $seq;
+	}
+
+	/**
+	 * For Server 2005,2008, duplicate a sequence with an identity table
+	 */
+	function GenID2008($seq='adodbseq',$start=1)
 	{
-        if($this->debug) error_log("
    GenID($seq,$start)");
-        sqlsrv_begin_transaction($this->_connectionID);
+		if($this->debug) error_log("
    CreateSequence($seq,$start)");
+		sqlsrv_begin_transaction($this->_connectionID);
 		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
 		if (!$ok) {
-			$this->Execute("create table $seq (id int)");
+			$start -= 1;
+			$this->Execute("create table $seq (id int)");//was float(53)
 			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
 			if (!$ok) {
-                if($this->debug) error_log("
    Error: ROLLBACK");
-                sqlsrv_rollback($this->_connectionID);
+				if($this->debug) error_log("
    Error: ROLLBACK");
+				sqlsrv_rollback($this->_connectionID);
 				return false;
 			}
-			sqlsrv_commit($this->_connectionID);
-			return $start;
 		}
 		$num = $this->GetOne("select id from $seq");
-        sqlsrv_commit($this->_connectionID);
-        if($this->debug) error_log(" Returning: $num");
+		sqlsrv_commit($this->_connectionID);
+		return true;
+	}
+	/**
+	 * Only available to Server 2012 and up
+	 * Cannot do this the normal adodb way by trapping an error if the
+	 * sequence does not exist because sql server will auto create a
+	 * sequence with the starting number of -9223372036854775808
+	 */
+	function GenID2012($seq='adodbseq',$start=1)
+	{
+
+		/*
+		 * First time in create an array of sequence names that we
+		 * can use in later requests to see if the sequence exists
+		 * the overhead is creating a list of sequences every time
+		 * we need access to at least 1. If we really care about
+		 * performance, we could maybe flag a 'nocheck' class variable
+		 */
+		if (!$this->sequences){
+			$sql = "SELECT name FROM sys.sequences";
+			$this->sequences = $this->GetCol($sql);
+		}
+		if (!is_array($this->sequences)
+		|| is_array($this->sequences) && !in_array($seq,$this->sequences)){
+			$this->CreateSequence2012($seq='adodbseq',$start=1);
+
+		}
+		$num = $this->GetOne("SELECT NEXT VALUE FOR $seq");
 		return $num;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '+';
@@ -253,11 +350,11 @@ class ADODB_mssqlnative extends ADOConnection {
 			case 'h':
 				$s .= "substring(convert(char(14),$col,0),13,2)";
 				break;
-			
+
 			case 'H':
 				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
 				break;
-				
+
 			case 'i':
 				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
 				break;
@@ -268,7 +365,7 @@ class ADODB_mssqlnative extends ADOConnection {
 			case 'A':
 				$s .= "substring(convert(char(19),$col,0),18,2)";
 				break;
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -281,20 +378,20 @@ class ADODB_mssqlnative extends ADOConnection {
 		return $s;
 	}
 
-	
+
 	function BeginTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
-        if ($this->debug) error_log('
    begin transaction');
+		if ($this->debug) error_log('
    begin transaction');
 		sqlsrv_begin_transaction($this->_connectionID);
-	   	return true;
+		return true;
 	}
-		
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-        if ($this->debug) error_log('
    commit transaction');
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
+		if ($this->debug) error_log('
    commit transaction');
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		sqlsrv_commit($this->_connectionID);
@@ -302,14 +399,14 @@ class ADODB_mssqlnative extends ADOConnection {
 	}
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
-        if ($this->debug) error_log('
    rollback transaction');
+		if ($this->transOff) return true;
+		if ($this->debug) error_log('
    rollback transaction');
 		if ($this->transCnt) $this->transCnt -= 1;
 		sqlsrv_rollback($this->_connectionID);
 		return true;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -319,40 +416,40 @@ class ADODB_mssqlnative extends ADOConnection {
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
+
 	/*
 		Usage:
-		
+
 		$this->BeginTrans();
 		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
-		
+
 		# some operation on both tables table1 and table2
-		
+
 		$this->CommitTrans();
-		
+
 		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
 	*/
-	function RowLock($tables,$where,$col='1 as adodbignore') 
+	function RowLock($tables,$where,$col='1 as adodbignore')
 	{
 		if ($col == '1 as adodbignore') $col = 'top 1 null as ignore';
 		if (!$this->transCnt) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
 	}
-	 
-	function SelectDB($dbName) 
+
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-            $rs = $this->Execute('USE '.$dbName); 
-            if($rs) {
-                return true;
-            } else return false;		
+			$rs = $this->Execute('USE '.$dbName);
+			if($rs) {
+				return true;
+			} else return false;
 		}
-		else return false;	
+		else return false;
 	}
-	
-	function ErrorMsg() 
+
+	function ErrorMsg()
 	{
 		$retErrors = sqlsrv_errors(SQLSRV_ERR_ALL);
 		if($retErrors != null) {
@@ -366,15 +463,15 @@ class ADODB_mssqlnative extends ADOConnection {
 		}
 		return $this->_errorMsg;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
 		$err = sqlsrv_errors(SQLSRV_ERR_ALL);
-        if($err[0]) return $err[0]['code'];
-        else return -1;
+		if($err[0]) return $err[0]['code'];
+		else return -1;
 	}
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
@@ -383,72 +480,72 @@ class ADODB_mssqlnative extends ADOConnection {
 		$connectionInfo["Database"]=$argDatabasename;
 		$connectionInfo["UID"]=$argUsername;
 		$connectionInfo["PWD"]=$argPassword;
-        if ($this->debug) error_log("
    connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
-        //if ($this->debug) error_log("
    _connectionID before: ".serialize($this->_connectionID));
-        if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) { 
-            if ($this->debug) error_log( "
    errors: ".print_r( sqlsrv_errors(), true));
-            return false;
-        }
-        //if ($this->debug) error_log(" _connectionID after: ".serialize($this->_connectionID));
-        //if ($this->debug) error_log("
    defined functions: 
    ".var_export(get_defined_functions(),true)."
    ");
-		return true;	
+		if ($this->debug) error_log("
    connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
+		//if ($this->debug) error_log("
    _connectionID before: ".serialize($this->_connectionID));
+		if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) {
+			if ($this->debug) error_log( "
    errors: ".print_r( sqlsrv_errors(), true));
+			return false;
+		}
+		//if ($this->debug) error_log(" _connectionID after: ".serialize($this->_connectionID));
+		//if ($this->debug) error_log("
    defined functions: 
    ".var_export(get_defined_functions(),true)."
    ");
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		//return null;//not implemented. NOTE: Persistent connections have no effect if PHP is used as a CGI program. (FastCGI!)
-        return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
-	
+
 	function Prepare($sql)
 	{
 		return $sql; // prepare does not work properly with bind parameters as bind parameters are managed by sqlsrv_prepare!
-		
+
 		$stmt = sqlsrv_prepare( $this->_connectionID, $sql);
 		if (!$stmt)  return $sql;
 		return array($sql,$stmt);
 	}
-	
+
 	// returns concatenated string
-    // MSSQL requires integers to be cast as strings
-    // automatically cast every datatype to VARCHAR(255)
-    // @author David Rogers (introspectshun)
-    function Concat()
-    {
-        $s = "";
-        $arr = func_get_args();
-
-        // Split single record on commas, if possible
-        if (sizeof($arr) == 1) {
-            foreach ($arr as $arg) {
-                $args = explode(',', $arg);
-            }
-            $arr = $args;
-        }
+	// MSSQL requires integers to be cast as strings
+	// automatically cast every datatype to VARCHAR(255)
+	// @author David Rogers (introspectshun)
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+
+		// Split single record on commas, if possible
+		if (sizeof($arr) == 1) {
+			foreach ($arr as $arg) {
+				$args = explode(',', $arg);
+			}
+			$arr = $args;
+		}
+
+		array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
+		$s = implode('+',$arr);
+		if (sizeof($arr) > 0) return "$s";
 
-        array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
-        $s = implode('+',$arr);
-        if (sizeof($arr) > 0) return "$s";
-        
 		return '';
-    }
-	
-	/* 
+	}
+
+	/*
 		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
 		So all your blobs must be of type "image".
-		
+
 		Remember to set in php.ini the following...
-		
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textlimit = 0 ; zero to pass through 
 
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textsize = 0 ; zero to pass through 
+		; Valid range 0 - 2147483647. Default = 4096.
+		mssql.textlimit = 0 ; zero to pass through
+
+		; Valid range 0 - 2147483647. Default = 4096.
+		mssql.textsize = 0 ; zero to pass through
 	*/
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
-	
+
 		if (strtoupper($blobtype) == 'CLOB') {
 			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
 			return $this->Execute($sql) != false;
@@ -456,114 +553,129 @@ class ADODB_mssqlnative extends ADOConnection {
 		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
 		return $this->Execute($sql) != false;
 	}
-	
+
 	// returns query ID if successful, otherwise false
 	function _query($sql,$inputarr=false)
 	{
 		$this->_errorMsg = false;
-		if (is_array($inputarr)) {
-            $rez = sqlsrv_query($this->_connectionID,$sql,$inputarr);
-		} else if (is_array($sql)) {
-			// $inputarr is prepared in sqlsrv_prepare();
-            $rez = sqlsrv_execute($this->_connectionID,$sql[1]);
+		
+		if (is_array($sql)) $sql = $sql[1];
+		
+		$insert = false;
+		// handle native driver flaw for retrieving the last insert ID
+		if(preg_match('/^\W*(insert [^;]+);?$/i', $sql)) {
+			$insert = true;
+			$sql .= '; '.$this->identitySQL; // select scope_identity()
+		}
+		if($inputarr) {
+			$rez = sqlsrv_query($this->_connectionID, $sql, $inputarr);
 		} else {
 			$rez = sqlsrv_query($this->_connectionID,$sql);
 		}
-        if ($this->debug) error_log("
    running query: ".var_export($sql,true)."
    input array: ".var_export($inputarr,true)."
    result: ".var_export($rez,true));
-        if(!$rez) $rez = false;
+
+		if ($this->debug) error_log("
    running query: ".var_export($sql,true)."
    input array: ".var_export($inputarr,true)."
    result: ".var_export($rez,true));
+
+		if(!$rez) {
+			$rez = false;
+		} else if ($insert) {
+			// retrieve the last insert ID (where applicable)
+			sqlsrv_next_result($rez);
+			sqlsrv_fetch($rez);
+			$this->lastInsertID = sqlsrv_get_field($rez, 0);
+		}
 		return $rez;
 	}
-	
+
 	// returns true or false
 	function _close()
-	{ 
+	{
 		if ($this->transCnt) $this->RollbackTrans();
 		$rez = @sqlsrv_close($this->_connectionID);
 		$this->_connectionID = false;
 		return $rez;
 	}
-	
+
 	// mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
 		return ADORecordSet_array_mssqlnative::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
-	}	
+	}
 
-	function &MetaIndexes($table,$primary=false, $owner = false)
+	function MetaIndexes($table,$primary=false, $owner = false)
 	{
 		$table = $this->qstr($table);
 
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
 			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
 			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
 			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
 			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
 			ORDER BY O.name, I.Name, K.keyno";
 
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
 
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
+		$rs = $this->Execute($sql);
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		if (!is_object($rs)) {
+			return FALSE;
+		}
 
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
 			if (!$primary && $row[5]) continue;
-			
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-    	}
-        return $indexes;
+
+			$indexes[$row[0]]['unique'] = $row[6];
+			$indexes[$row[0]]['columns'][] = $row[1];
+		}
+		return $indexes;
 	}
-	
+
 	function MetaForeignKeys($table, $owner=false, $upper=false)
 	{
-    	global $ADODB_FETCH_MODE;
-	
+		global $ADODB_FETCH_MODE;
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
-            "select object_name(constid) as constraint_name,
-	            col_name(fkeyid, fkey) as column_name,
-	            object_name(rkeyid) as referenced_table_name,
-   	            col_name(rkeyid, rkey) as referenced_column_name
-            from sysforeignkeys
-            where upper(object_name(fkeyid)) = $table
-            order by constraint_name, referenced_table_name, keyno";
-		
+
+		$sql =
+			"select object_name(constid) as constraint_name,
+				col_name(fkeyid, fkey) as column_name,
+				object_name(rkeyid) as referenced_table_name,
+				col_name(rkeyid, rkey) as referenced_column_name
+			from sysforeignkeys
+			where upper(object_name(fkeyid)) = $table
+			order by constraint_name, referenced_table_name, keyno";
+
 		$constraints =& $this->GetArray($sql);
-		
+
 		$ADODB_FETCH_MODE = $save;
-		
+
 		$arr = false;
 		foreach($constraints as $constr) {
 			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3];
 		}
 		if (!$arr) return false;
-		
+
 		$arr2 = false;
-		
+
 		foreach($arr as $k => $v) {
 			foreach($v as $a => $b) {
 				if ($upper) $a = strtoupper($a);
@@ -574,79 +686,160 @@ class ADODB_mssqlnative extends ADOConnection {
 	}
 
 	//From: Fernando Moreira 
-	function MetaDatabases() 
-	{ 
-	    $this->SelectDB("master");
-        $rs =& $this->Execute($this->metaDatabasesSQL);
-        $rows = $rs->GetRows();
-        $ret = array();
-        for($i=0;$iSelectDB($this->database);
-        if($ret)
-            return $ret;
-        else 
-            return false;
-	} 
+	function MetaDatabases()
+	{
+		$this->SelectDB("master");
+		$rs =& $this->Execute($this->metaDatabasesSQL);
+		$rows = $rs->GetRows();
+		$ret = array();
+		for($i=0;$iSelectDB($this->database);
+		if($ret)
+			return $ret;
+		else
+			return false;
+	}
 
 	// "Stein-Aksel Basma" 
 	// tested with MSSQL 2000
 	function MetaPrimaryKeys($table, $owner=false)
 	{
-    	global $ADODB_FETCH_MODE;
-	
+		global $ADODB_FETCH_MODE;
+
 		$schema = '';
 		$this->_findschema($table,$schema);
 		if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+		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 
+		information_schema.table_constraints tc
 		where tc.constraint_name = k.constraint_name and tc.constraint_type =
 		'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;
 		$false = false;
-		return $false;	  
+		return $false;
 	}
 
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
-	    if ($mask) {
+		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(($mask));
 			$this->metaTablesSQL .= " AND name like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
 
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
+	function MetaColumns($table, $upper=true, $schema=false){
+
+		# start adg
+		static $cached_columns = array();
+		if ($this->cachedSchemaFlush)
+			$cached_columns = array();
+
+		if (array_key_exists($table,$cached_columns)){
+			return $cached_columns[$table];
+		}
+		# end adg
+
+		if (!$this->mssql_version)
+			$this->ServerVersion();
+
+		$this->_findschema($table,$schema);
+		if ($schema) {
+			$dbName = $this->database;
+			$this->SelectDB($schema);
+		}
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+
+		if ($schema) {
+			$this->SelectDB($dbName);
+		}
+
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		if (!is_object($rs)) {
+			$false = false;
+			return $false;
+		}
+
+		$retarr = array();
+		while (!$rs->EOF){
+
+			$fld = new ADOFieldObject();
+			if (array_key_exists(0,$rs->fields)) {
+				$fld->name          = $rs->fields[0];
+				$fld->type          = $rs->fields[1];
+				$fld->max_length    = $rs->fields[2];
+				$fld->precision     = $rs->fields[3];
+				$fld->scale     	= $rs->fields[4];
+				$fld->not_null      =!$rs->fields[5];
+				$fld->has_default   = $rs->fields[6];
+				$fld->xtype         = $rs->fields[7];
+				$fld->type_length   = $rs->fields[8];
+				$fld->auto_increment= $rs->fields[9];
+			} else {
+				$fld->name          = $rs->fields['name'];
+				$fld->type          = $rs->fields['type'];
+				$fld->max_length    = $rs->fields['length'];
+				$fld->precision     = $rs->fields['precision'];
+				$fld->scale     	= $rs->fields['scale'];
+				$fld->not_null      =!$rs->fields['nullable'];
+				$fld->has_default   = $rs->fields['default_value'];
+				$fld->xtype         = $rs->fields['xtype'];
+				$fld->type_length   = $rs->fields['type_length'];
+				$fld->auto_increment= $rs->fields['is_identity'];
+			}
+
+			if ($save == ADODB_FETCH_NUM)
+				$retarr[] = $fld;
+			else
+				$retarr[strtoupper($fld->name)] = $fld;
+
+			$rs->MoveNext();
+
+		}
+		$rs->Close();
+		# start adg
+		$cached_columns[$table] = $retarr;
+		# end adg
+		return $retarr;
+	}
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordset_mssqlnative extends ADORecordSet {	
+class ADORecordset_mssqlnative extends ADORecordSet {
 
 	var $databaseType = "mssqlnative";
 	var $canSeek = false;
 	var $fieldOffset = 0;
 	// _mths works only in non-localised system
-	
+
 	function ADORecordset_mssqlnative($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 
@@ -654,21 +847,30 @@ class ADORecordset_mssqlnative extends ADORecordSet {
 		$this->fetchMode = $mode;
 		return $this->ADORecordSet($id,$mode);
 	}
-	
-	
+
+
 	function _initrs()
 	{
-	    global $ADODB_COUNTRECS;	
-        if ($this->connection->debug) error_log("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
-        /*$retRowsAff = sqlsrv_rows_affected($this->_queryID);//"If you need to determine the number of rows a query will return before retrieving the actual results, appending a SELECT COUNT ... query would let you get that information, and then a call to next_result would move you to the "real" results."
-        error_log("rowsaff: ".serialize($retRowsAff));
+		global $ADODB_COUNTRECS;
+		# KMN # if ($this->connection->debug) error_log("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+		/*$retRowsAff = sqlsrv_rows_affected($this->_queryID);//"If you need to determine the number of rows a query will return before retrieving the actual results, appending a SELECT COUNT ... query would let you get that information, and then a call to next_result would move you to the "real" results."
+		error_log("rowsaff: ".serialize($retRowsAff));
 		$this->_numOfRows = ($ADODB_COUNTRECS)? $retRowsAff:-1;*/
-        $this->_numOfRows = -1;//not supported
-        $fieldmeta = sqlsrv_field_metadata($this->_queryID);
-        $this->_numOfFields = ($fieldmeta)? count($fieldmeta):-1;
-        if ($this->connection->debug) error_log("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+		$this->_numOfRows = -1;//not supported
+		$fieldmeta = sqlsrv_field_metadata($this->_queryID);
+		$this->_numOfFields = ($fieldmeta)? count($fieldmeta):-1;
+		# KMN # if ($this->connection->debug) error_log("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+		/*
+		 * Copy the oracle method and cache the metadata at init time
+		 */
+		if ($this->_numOfFields>0) {
+			$this->_fieldobjs = array();
+			$max = $this->_numOfFields;
+			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
+		}
+
 	}
-	
+
 
 	//Contributed by "Sven Axelsson" 
 	// get next resultset - requires PHP 4.0.5 or later
@@ -693,77 +895,135 @@ class ADORecordset_mssqlnative extends ADORecordSet {
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
-	/*	Returns: an object containing field information. 
+
+	/*	Returns: an object containing field information.
 		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
 		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-
-	function FetchField($fieldOffset = -1) 
+		fetchField() is retrieved.
+		Designed By jcortinap#jc.com.mx
+	*/
+	function _FetchField($fieldOffset = -1)
 	{
-        if ($this->connection->debug) error_log("
    fetchfield: $fieldOffset, fetch array: 
    ".print_r($this->fields,true)."
     backtrace: ".adodb_backtrace(false));
-		if ($fieldOffset != -1) $this->fieldOffset = $fieldOffset;
-		/*$arrKeys = array_keys($this->fields);
-		if(array_key_exists($this->fieldOffset,$arrKeys) && !array_key_exists($arrKeys[$this->fieldOffset],$this->fields)) {
-			$f = false;
-		} else {
-			$f = new ADOFetchObj();
-			$f->name = $arrKeys[$this->fieldOffset];
-			if($fieldOffset == -1) $this->fieldOffset++;
-		}
-
-        if (empty($f)) {
-            $f = false;//PHP Notice: Only variable references should be returned by reference
-        }*/
-		$fieldMeta = @sqlsrv_field_metadata($this->_queryID);
-		$f = new ADOFieldObject();
-		$f->name = $fieldMeta[$this->fieldOffset]['Name'];
-		$f->type = $fieldMeta[$this->fieldOffset]['Type'];
-		$f->max_length = $fieldMeta[$this->fieldOffset]['Size'];
+		$_typeConversion = array(
+			-155 => 'datetimeoffset',
+			-154 => 'time',
+			-152 => 'xml',
+			-151 => 'udt',
+			-11 => 'uniqueidentifier',
+			-10 => 'ntext',
+			-9 => 'nvarchar',
+			-8 => 'nchar',
+			-7 => 'bit',
+			-6 => 'tinyint',
+			-5 => 'bigint',
+			-4 => 'image',
+			-3 => 'varbinary',
+			-2 => 'timestamp',
+			-1 => 'text',
+			1 => 'char',
+			2 => 'numeric',
+			3 => 'decimal',
+			4 => 'int',
+			5 => 'smallint',
+			6 => 'float',
+			7 => 'real',
+			12 => 'varchar',
+			91 => 'date',
+			93 => 'datetime'
+			);
 
+		$fa = @sqlsrv_field_metadata($this->_queryID);
+		if ($fieldOffset != -1) {
+			$fa = $fa[$fieldOffset];
+		}
+		$false = false;
+		if (empty($fa)) {
+			$f = false;//PHP Notice: Only variable references should be returned by reference
+		}
+		else
+		{
+			// Convert to an object
+			$fa = array_change_key_case($fa, CASE_LOWER);
+			$fb = array();
+			if ($fieldOffset != -1)
+			{
+				$fb = array(
+					'name' => $fa['name'],
+					'max_length' => $fa['size'],
+					'column_source' => $fa['name'],
+					'type' => $_typeConversion[$fa['type']]
+					);
+			}
+			else
+			{
+				foreach ($fa as $key => $value)
+				{
+					$fb[] = array(
+						'name' => $value['name'],
+						'max_length' => $value['size'],
+						'column_source' => $value['name'],
+						'type' => $_typeConversion[$value['type']]
+						);
+				}
+			}
+			$f = (object) $fb;
+		}
 		return $f;
 	}
-	
-	function _seek($row) 
+
+	/*
+	 * Fetchfield copies the oracle method, it loads the field information
+	 * into the _fieldobjs array once, to save multiple calls to the
+	 * sqlsrv_field_metadata function
+	 *
+	 * @author 	KM Newnham
+	 * @date 	02/20/2013
+	 */
+	function FetchField($fieldOffset = -1)
+	{
+		return $this->_fieldobjs[$fieldOffset];
+	}
+
+	function _seek($row)
 	{
 		return false;//There is no support for cursors in the driver at this time.  All data is returned via forward-only streams.
 	}
 
 	// speedup
-	function MoveNext() 
+	function MoveNext()
 	{
-        if ($this->connection->debug) error_log("movenext()");
-        //if ($this->connection->debug) error_log("eof (beginning): ".$this->EOF);
+		//# KMN # if ($this->connection->debug) error_log("movenext()");
+		//# KMN # if ($this->connection->debug) error_log("eof (beginning): ".$this->EOF);
 		if ($this->EOF) return false;
-		
+
 		$this->_currentRow++;
-        if ($this->connection->debug) error_log("_currentRow: ".$this->_currentRow);
-		
+		// # KMN # if ($this->connection->debug) error_log("_currentRow: ".$this->_currentRow);
+
 		if ($this->_fetch()) return true;
 		$this->EOF = true;
-        //if ($this->connection->debug) error_log("eof (end): ".$this->EOF);
-		
+		//# KMN # if ($this->connection->debug) error_log("eof (end): ".$this->EOF);
+
 		return false;
 	}
 
-	
+
 	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
 	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
-        if ($this->connection->debug) error_log("_fetch()");
-		if ($this->fetchMode & ADODB_FETCH_BOTH) {
+		# KMN # if ($this->connection->debug) error_log("_fetch()");
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			if ($this->fetchMode & ADODB_FETCH_NUM) {
-                if ($this->connection->debug) error_log("fetch mode: both");
+				//# KMN # if ($this->connection->debug) error_log("fetch mode: both");
 				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_BOTH);
 			} else {
-                if ($this->connection->debug) error_log("fetch mode: assoc");
+				//# KMN # if ($this->connection->debug) error_log("fetch mode: assoc");
 				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
 			}
-			
+
 			if (is_array($this->fields)) {
 				if (ADODB_ASSOC_CASE == 0) {
 					foreach($this->fields as $k=>$v) {
@@ -776,21 +1036,21 @@ class ADORecordset_mssqlnative extends ADORecordSet {
 				}
 			}
 		} else {
-            if ($this->connection->debug) error_log("fetch mode: num");
+			//# KMN # if ($this->connection->debug) error_log("fetch mode: num");
 			$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_NUMERIC);
 		}
-        if(is_array($this->fields) && array_key_exists(1,$this->fields) && !array_key_exists(0,$this->fields)) {//fix fetch numeric keys since they're not 0 based 
-            $arrFixed = array();
-            foreach($this->fields as $key=>$value) {
-                if(is_numeric($key)) {
-                    $arrFixed[$key-1] = $value;
-                } else {
-                    $arrFixed[$key] = $value;
-                }
-            }
-            //if($this->connection->debug) error_log("
    fixing non 0 based return array, old: ".print_r($this->fields,true)." new: ".print_r($arrFixed,true));
-            $this->fields = $arrFixed;
-        }
+		if(is_array($this->fields) && array_key_exists(1,$this->fields) && !array_key_exists(0,$this->fields)) {//fix fetch numeric keys since they're not 0 based
+			$arrFixed = array();
+			foreach($this->fields as $key=>$value) {
+				if(is_numeric($key)) {
+					$arrFixed[$key-1] = $value;
+				} else {
+					$arrFixed[$key] = $value;
+				}
+			}
+			//if($this->connection->debug) error_log("
    fixing non 0 based return array, old: ".print_r($this->fields,true)." new: ".print_r($arrFixed,true));
+			$this->fields = $arrFixed;
+		}
 		if(is_array($this->fields)) {
 			foreach($this->fields as $key=>$value) {
 				if (is_object($value) && method_exists($value, 'format')) {//is DateTime object
@@ -798,16 +1058,16 @@ class ADORecordset_mssqlnative extends ADORecordSet {
 				}
 			}
 		}
-        if($this->fields === null) $this->fields = false;
-        if ($this->connection->debug) error_log("
    after _fetch, fields: 
    ".print_r($this->fields,true)." backtrace: ".adodb_backtrace(false));
+		if($this->fields === null) $this->fields = false;
+		# KMN # if ($this->connection->debug) error_log("
    after _fetch, fields: 
    ".print_r($this->fields,true)." backtrace: ".adodb_backtrace(false));
 		return $this->fields;
 	}
-	
-    /*	close() only needs to be called if you are worried about using too much memory while your script
+
+	/*	close() only needs to be called if you are worried about using too much memory while your script
 		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close() 
+	function _close()
 	{
-		$rez = sqlsrv_free_stmt($this->_queryID);	
+		$rez = sqlsrv_free_stmt($this->_queryID);
 		$this->_queryID = false;
 		return $rez;
 	}
@@ -817,7 +1077,7 @@ class ADORecordset_mssqlnative extends ADORecordSet {
 	{
 		return ADORecordSet_array_mssqlnative::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
@@ -826,26 +1086,26 @@ class ADORecordset_mssqlnative extends ADORecordSet {
 
 
 class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
-	function ADORecordSet_array_mssqlnative($id=-1,$mode=false) 
+	function ADORecordSet_array_mssqlnative($id=-1,$mode=false)
 	{
 		$this->ADORecordSet_array($id,$mode);
 	}
-	
+
 		// mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
-	
+
 		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-		
-    	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM 
+
+		global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+
+		//Dec 30 2000 12:00AM
 		if ($ADODB_mssql_date_order == 'dmy') {
 			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
 				return parent::UnixDate($v);
 			}
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
+
 			$theday = $rr[1];
 			$themth =  substr(strtoupper($rr[2]),0,3);
 		} else {
@@ -853,7 +1113,7 @@ class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
 				return parent::UnixDate($v);
 			}
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
+
 			$theday = $rr[2];
 			$themth = substr(strtoupper($rr[1]),0,3);
 		}
@@ -862,34 +1122,34 @@ class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
 		// h-m-s-MM-DD-YY
 		return  adodb_mktime(0,0,0,$themth,$theday,$rr[3]);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
-	
+
 		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-		
-	    global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
+
+		global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+
 		//Dec 30 2000 12:00AM
 		 if ($ADODB_mssql_date_order == 'dmy') {
 			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 			$theday = $rr[1];
 			$themth =  substr(strtoupper($rr[2]),0,3);
 		} else {
 			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 			$theday = $rr[2];
 			$themth = substr(strtoupper($rr[1]),0,3);
 		}
-		
+
 		$themth = $ADODB_mssql_mths[$themth];
 		if ($themth <= 0) return false;
-		
+
 		switch (strtoupper($rr[6])) {
 		case 'P':
 			if ($rr[4]<12) $rr[4] += 12;
@@ -908,17 +1168,17 @@ class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
 /*
 Code Example 1:
 
-select 	object_name(constid) as constraint_name,
-       	object_name(fkeyid) as table_name, 
-        col_name(fkeyid, fkey) as column_name,
+select	object_name(constid) as constraint_name,
+		object_name(fkeyid) as table_name,
+		col_name(fkeyid, fkey) as column_name,
 	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
+	col_name(rkeyid, rkey) as referenced_column_name
 from sysforeignkeys
 where object_name(fkeyid) = x
 order by constraint_name, table_name, referenced_table_name,  keyno
 
 Code Example 2:
-select 	constraint_name,
+select	constraint_name,
 	column_name,
 	ordinal_position
 from information_schema.key_column_usage
@@ -928,5 +1188,3 @@ order by constraint_name, ordinal_position
 
 http://www.databasejournal.com/scripts/article.php/1440551
 */
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php b/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
index 6c7eb817b..ab226a69f 100644
--- a/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
@@ -1,6 +1,6 @@
 ADORecordset_mssql($id,$mode);
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php b/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
index 3e1f14851..d82f16905 100644
--- a/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
@@ -1,16 +1,16 @@
 rsPrefix .= 'ext_';
 	}
 
@@ -63,19 +67,19 @@ class ADODB_mysql extends ADOConnection {
     }
 	return true;
   }
-  
+
 	function ServerInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " IFNULL($field, $ifNull) "; // if MySQL
 	}
-	
+
     function MetaProcedures($NamePattern = false, $catalog  = null, $schemaPattern  = null)
     {
         // save old fetch mode
@@ -135,84 +139,95 @@ class ADODB_mysql extends ADOConnection {
 
         return $procedures;
     }
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	/**
+	 * Retrieves a list of tables based on given criteria
+	 *
+	 * @param string $ttype Table type = 'TABLE', 'VIEW' or false=both (default)
+	 * @param string $showSchema schema name, false = current schema (default)
+	 * @param string $mask filters the table by name
+	 *
+	 * @return array list of tables
+	 */
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
+			$this->metaTablesSQL .= $this->qstr($showSchema);
+		} else {
+			$this->metaTablesSQL .= "schema()";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
+			$this->metaTablesSQL .= " AND table_name LIKE $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
-	
+
+
 	function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
         // save old fetch mode
         global $ADODB_FETCH_MODE;
-        
+
 		$false = false;
         $save = $ADODB_FETCH_MODE;
         $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
         if ($this->fetchMode !== FALSE) {
                $savem = $this->SetFetchMode(FALSE);
         }
-        
+
         // get index details
         $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
-        
+
         // restore fetchmode
         if (isset($savem)) {
                 $this->SetFetchMode($savem);
         }
         $ADODB_FETCH_MODE = $save;
-        
+
         if (!is_object($rs)) {
                 return $false;
         }
-        
+
         $indexes = array ();
-        
+
         // parse index data into array
         while ($row = $rs->FetchRow()) {
                 if ($primary == FALSE AND $row[2] == 'PRIMARY') {
                         continue;
                 }
-                
+
                 if (!isset($indexes[$row[2]])) {
                         $indexes[$row[2]] = array(
                                 'unique' => ($row[1] == 0),
                                 'columns' => array()
                         );
                 }
-                
+
                 $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
         }
-        
+
         // sort columns by order in the index
         foreach ( array_keys ($indexes) as $index )
         {
                 ksort ($indexes[$index]['columns']);
         }
-        
+
         return $indexes;
 	}
 
-	
+
 	// if magic quotes disabled, use mysql_real_escape_string()
 	function qstr($s,$magic_quotes=false)
 	{
 		if (is_null($s)) return 'NULL';
 		if (!$magic_quotes) {
-		
+
 			if (ADODB_PHPVER >= 0x4300) {
 				if (is_resource($this->_connectionID))
 					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
@@ -220,20 +235,20 @@ class ADODB_mysql extends ADOConnection {
 			if ($this->replaceQuote[0] == '\\'){
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
 			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
 		return "'$s'";
 	}
-	
+
 	function _insertid()
 	{
 		return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
 		//return mysql_insert_id($this->_connectionID);
 	}
-	
+
 	function GetOne($sql,$inputarr=false)
 	{
 	global $ADODB_GETONE_EOF;
@@ -249,17 +264,17 @@ 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);
 	}
-  
+
  	 // See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
 	// Reference on Last_Insert_ID on the recommended way to simulate sequences
  	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
@@ -267,23 +282,23 @@ class ADODB_mysql extends ADOConnection {
 	var $_genSeqCountSQL = "select count(*) from %s";
 	var $_genSeq2SQL = "insert into %s values (%s)";
 	var $_dropSeqSQL = "drop table %s";
-	
+
 	function CreateSequence($seqname='adodbseq',$startID=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
 		$u = strtoupper($seqname);
-		
+
 		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
 		if (!$ok) return false;
 		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 	}
-	
+
 
 	function GenID($seqname='adodbseq',$startID=1)
 	{
 		// post-nuke sets hasGenID to false
 		if (!$this->hasGenID) return false;
-		
+
 		$savelog = $this->_logsql;
 		$this->_logsql = false;
 		$getnext = sprintf($this->_genIDSQL,$seqname);
@@ -297,17 +312,17 @@ class ADODB_mysql extends ADOConnection {
 			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 			$rs = $this->Execute($getnext);
 		}
-		
+
 		if ($rs) {
 			$this->genID = mysql_insert_id($this->_connectionID);
 			$rs->Close();
 		} else
 			$this->genID = 0;
-		
+
 		$this->_logsql = $savelog;
 		return $this->genID;
 	}
-	
+
   	function MetaDatabases()
 	{
 		$qid = mysql_list_dbs($this->_connectionID);
@@ -321,11 +336,11 @@ class ADODB_mysql extends ADOConnection {
 		}
 		return $arr;
 	}
-	
-		
+
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'DATE_FORMAT('.$col.",'";
 		$concat = false;
@@ -333,7 +348,7 @@ class ADODB_mysql extends ADOConnection {
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -344,7 +359,7 @@ class ADODB_mysql extends ADOConnection {
 			case '/':
 				$s .= $ch;
 				break;
-				
+
 			case 'Y':
 			case 'y':
 				$s .= '%Y';
@@ -352,7 +367,7 @@ class ADODB_mysql extends ADOConnection {
 			case 'M':
 				$s .= '%b';
 				break;
-				
+
 			case 'm':
 				$s .= '%m';
 				break;
@@ -360,45 +375,45 @@ class ADODB_mysql extends ADOConnection {
 			case 'd':
 				$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': 
+
+			case 'H':
 				$s .= '%H';
 				break;
-				
+
 			case 'h':
 				$s .= '%I';
 				break;
-				
+
 			case 'i':
 				$s .= '%i';
 				break;
-				
+
 			case 's':
 				$s .= '%s';
 				break;
-				
+
 			case 'a':
 			case 'A':
 				$s .= '%p';
 				break;
-				
+
 			case 'w':
 				$s .= '%w';
 				break;
-				
+
 			 case 'W':
 				$s .= '%U';
 				break;
-				
+
 			case 'l':
 				$s .= '%W';
 				break;
@@ -408,7 +423,7 @@ class ADODB_mysql extends ADOConnection {
 		if ($concat) $s = "CONCAT($s)";
 		return $s;
 	}
-	
+
 
 	// returns concatenated string
 	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
@@ -416,28 +431,28 @@ class ADODB_mysql extends ADOConnection {
 	{
 		$s = "";
 		$arr = func_get_args();
-		
+
 		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
+		$s = implode(',',$arr);
 		if (strlen($s) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
+
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
-		
+
 		$fraction = $dayFraction * 24 * 3600;
 		return '('. $date . ' + INTERVAL ' .	 $fraction.' SECOND)';
-		
+
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
+
 		if (ADODB_PHPVER >= 0x4300)
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
 												$this->forceNewConnect,$this->clientFlags);
@@ -446,17 +461,17 @@ class ADODB_mysql extends ADOConnection {
 												$this->forceNewConnect);
 		else
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
-	
+
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
+
 		if (ADODB_PHPVER >= 0x4300)
 			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
 		else
@@ -464,16 +479,16 @@ class ADODB_mysql extends ADOConnection {
 		if ($this->_connectionID === false) return false;
 		if ($this->autoRollback) $this->RollbackTrans();
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->forceNewConnect = true;
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
-	
- 	function MetaColumns($table, $normalize=true) 
+
+ 	function MetaColumns($table, $normalize=true)
 	{
 		$this->_findschema($table,$schema);
 		if ($schema) {
@@ -483,27 +498,27 @@ class ADODB_mysql extends ADOConnection {
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
+
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
 		if ($schema) {
 			$this->SelectDB($dbName);
 		}
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs)) {
 			$false = false;
 			return $false;
 		}
-			
+
 		$retarr = array();
 		while (!$rs->EOF){
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -539,7 +554,7 @@ class ADODB_mysql extends ADOConnection {
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
@@ -547,89 +562,94 @@ class ADODB_mysql extends ADOConnection {
 			}
 				$rs->MoveNext();
 			}
-		
+
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 	}
-		
+
 	// returns true or false
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-			return @mysql_select_db($dbName,$this->_connectionID);		
+			return @mysql_select_db($dbName,$this->_connectionID);
 		}
-		else return false;	
+		else return false;
 	}
-	
+
 	// parameters use PostgreSQL convention, not MySQL
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
 	{
 		$offsetStr =($offset>=0) ? ((integer)$offset)."," : '';
 		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
+		if ($nrows < 0) $nrows = '18446744073709551615';
+
 		if ($secs)
 			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
 		else
 			$rs = $this->Execute($sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
 		return $rs;
 	}
-	
+
 	// returns queryID or false
 	function _query($sql,$inputarr=false)
 	{
-	//global $ADODB_COUNTRECS;
-		//if($ADODB_COUNTRECS) 
-		return mysql_query($sql,$this->_connectionID);
-		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
+
+	return mysql_query($sql,$this->_connectionID);
+	/*
+	global $ADODB_COUNTRECS;
+		if($ADODB_COUNTRECS)
+			return mysql_query($sql,$this->_connectionID);
+		else
+			return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
+	*/
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
-	
+
 		if ($this->_logsql) return $this->_errorMsg;
 		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
 		else $this->_errorMsg = @mysql_error($this->_connectionID);
 		return $this->_errorMsg;
 	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	{
 		if ($this->_logsql) return $this->_errorCode;
 		if (empty($this->_connectionID))  return @mysql_errno();
 		else return @mysql_errno($this->_connectionID);
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
 		@mysql_close($this->_connectionID);
-		
+
 		$this->charSet = '';
 		$this->_connectionID = false;
 	}
 
-	
+
 	/*
 	* Maximum size of C field
 	*/
 	function CharMax()
 	{
-		return 255; 
+		return 255;
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
 	function TextMax()
 	{
-		return 4294967295; 
+		return 4294967295;
 	}
-	
+
 	// "Innox - Juan Carlos Gonzalez" 
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
      {
@@ -647,7 +667,7 @@ class ADODB_mysql extends ADOConnection {
          $matches = array();
 
          if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	     $foreign_keys = array();	 	 
+	     $foreign_keys = array();
          $num_keys = count($matches[0]);
          for ( $i = 0;  $i < $num_keys;  $i ++ ) {
              $my_field  = explode('`, `', $matches[1][$i]);
@@ -671,26 +691,26 @@ class ADODB_mysql extends ADOConnection {
                  }
              }
          }
-         
+
          return  $foreign_keys;
      }
-	 
-	
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 
-class ADORecordSet_mysql extends ADORecordSet{	
-	
+class ADORecordSet_mysql extends ADORecordSet{
+
 	var $databaseType = "mysql";
 	var $canSeek = true;
-	
-	function ADORecordSet_mysql($queryID,$mode=false) 
+
+	function ADORecordSet_mysql($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -704,9 +724,9 @@ class ADORecordSet_mysql extends ADORecordSet{
 			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	//GLOBAL $ADODB_COUNTRECS;
@@ -714,9 +734,9 @@ class ADORecordSet_mysql extends ADORecordSet{
 		$this->_numOfRows = @mysql_num_rows($this->_queryID);
 		$this->_numOfFields = @mysql_num_fields($this->_queryID);
 	}
-	
-	function FetchField($fieldOffset = -1) 
-	{	
+
+	function FetchField($fieldOffset = -1)
+	{
 		if ($fieldOffset != -1) {
 			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
 			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
@@ -729,7 +749,7 @@ class ADORecordSet_mysql extends ADORecordSet{
 			//if ($o) $o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich#att.com)
 			$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
 		}
-			
+
 		return $o;
 	}
 
@@ -739,13 +759,13 @@ class ADORecordSet_mysql extends ADORecordSet{
 		else $row = ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
-	{	
+	{
 		// added @ by "Michael William Miller" 
 		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -755,13 +775,13 @@ class ADORecordSet_mysql extends ADORecordSet{
 		}
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	function _seek($row)
 	{
 		if ($this->_numOfRows == 0) return false;
 		return @mysql_data_seek($this->_queryID,$row);
 	}
-	
+
 	function MoveNext()
 	{
 		//return adodb_movenext($this);
@@ -776,18 +796,18 @@ class ADORecordSet_mysql extends ADORecordSet{
 		}
 		return false;
 	}
-	
+
 	function _fetch()
 	{
 		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
 		return is_array($this->fields);
 	}
-	
+
 	function _close() {
-		@mysql_free_result($this->_queryID);	
-		$this->_queryID = false;	
+		@mysql_free_result($this->_queryID);
+		$this->_queryID = false;
 	}
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -795,59 +815,59 @@ class ADORecordSet_mysql extends ADORecordSet{
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING': 
+		case 'STRING':
 		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET': 
+		case 'VARCHAR':
+		case 'TINYBLOB':
+		case 'TINYTEXT':
+		case 'ENUM':
+		case 'SET':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 			return 'X';
-			
+
 		// php_mysql extension always returns 'blob' even if 'text'
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 		case 'BINARY':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'YEAR':
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'TINYINT':
 		case 'MEDIUMINT':
-		case 'SMALLINT': 
-			
+		case 'SMALLINT':
+
 			if (!empty($fieldobj->primary_key)) return 'R';
 			else return 'I';
-		
+
 		default: return 'N';
 		}
 	}
 
 }
 
-class ADORecordSet_ext_mysql extends ADORecordSet_mysql {	
-	function ADORecordSet_ext_mysql($queryID,$mode=false) 
+class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
+	function ADORecordSet_ext_mysql($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -863,7 +883,7 @@ class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		return @adodb_movenext($this);
@@ -872,4 +892,3 @@ class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
 
 
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php b/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
index 6d3537c2a..6de3e7f80 100644
--- a/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
@@ -1,26 +1,26 @@
 _transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -74,19 +78,19 @@ class ADODB_mysqli extends ADOConnection {
 	// returns true or false
 	// To add: parameter int $port,
 	//         parameter string $socket
-	function _connect($argHostname = NULL, 
-			  $argUsername = NULL, 
-			  $argPassword = NULL, 
+	function _connect($argHostname = NULL,
+			  $argUsername = NULL,
+			  $argPassword = NULL,
 			  $argDatabasename = NULL, $persist=false)
 	  {
 	  	 if(!extension_loaded("mysqli")) {
 			return null;
 		 }
 	    $this->_connectionID = @mysqli_init();
-	    
+
 	    if (is_null($this->_connectionID)) {
 	      // mysqli_init only fails if insufficient memory
-	      if ($this->debug) 
+	      if ($this->debug)
 				ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
 	      return false;
 	    }
@@ -95,7 +99,7 @@ class ADODB_mysqli extends ADOConnection {
 		read connection options from the standard mysql configuration file
 		/etc/my.cnf - "Bastien Duclaux" 
 		*/
-		foreach($this->optionFlags as $arr) {	
+		foreach($this->optionFlags as $arr) {
 			mysqli_options($this->_connectionID,$arr[0],$arr[1]);
 		}
 
@@ -111,18 +115,18 @@ class ADODB_mysqli extends ADOConnection {
 					$this->port,
 					$this->socket,
 					$this->clientFlags);
- 	     
+
 		if ($ok) {
 	 		if ($argDatabasename)  return $this->SelectDB($argDatabasename);
  			return true;
  	   } else {
-			if ($this->debug) 
+			if ($this->debug)
 		  		ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
 			$this->_connectionID = null;
 			return false;
 	   }
 	}
-	
+
 	// returns true or false
 	// How to force a persistent connection
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
@@ -130,25 +134,25 @@ class ADODB_mysqli extends ADOConnection {
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
 
 	}
-	
+
 	// When is this used? Close old connection first?
-	// In _connect(), check $this->forceNewConnect? 
+	// In _connect(), check $this->forceNewConnect?
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	  {
 	    $this->forceNewConnect = true;
 	    return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	  }
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " IFNULL($field, $ifNull) "; // if MySQL
 	}
-	
+
 	// do not use $ADODB_COUNTRECS
 	function GetOne($sql,$inputarr=false)
 	{
 	global $ADODB_GETONE_EOF;
-	
+
 		$ret = false;
 		$rs = $this->Execute($sql,$inputarr);
 		if ($rs) {
@@ -158,39 +162,39 @@ class ADODB_mysqli extends ADOConnection {
 		}
 		return $ret;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = $this->GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	
+
+
 	function BeginTrans()
-	{	  
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		
+
 		//$this->Execute('SET AUTOCOMMIT=0');
 		mysqli_autocommit($this->_connectionID, false);
 		$this->Execute('BEGIN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
+
+	function CommitTrans($ok=true)
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->Execute('COMMIT');
-		
+
 		//$this->Execute('SET AUTOCOMMIT=1');
 		mysqli_autocommit($this->_connectionID, true);
 		return true;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -200,22 +204,22 @@ class ADODB_mysqli extends ADOConnection {
 		mysqli_autocommit($this->_connectionID, true);
 		return true;
 	}
-	
-	function RowLock($tables,$where='',$col='1 as adodbignore') 
+
+	function RowLock($tables,$where='',$col='1 as adodbignore')
 	{
 		if ($this->transCnt==0) $this->BeginTrans();
 		if ($where) $where = ' where '.$where;
 		$rs = $this->Execute("select $col from $tables $where for update");
-		return !empty($rs); 
+		return !empty($rs);
 	}
-	
+
 	// if magic quotes disabled, use mysql_real_escape_string()
-	// From readme.htm:
+	// From docs-adodb.htm:
 	// Quotes a string to be sent to the database. The $magic_quotes_enabled
-	// parameter may look funny, but the idea is if you are quoting a 
-	// string extracted from a POST/GET variable, then 
-	// pass get_magic_quotes_gpc() as the second parameter. This will 
-	// ensure that the variable is not quoted twice, once by qstr and once 
+	// parameter may look funny, but the idea is if you are quoting a
+	// string extracted from a POST/GET variable, then
+	// pass get_magic_quotes_gpc() as the second parameter. This will
+	// ensure that the variable is not quoted twice, once by qstr and once
 	// by the magic_quotes_gpc.
 	//
 	//Eg. $s = $db->qstr(_GET['name'],get_magic_quotes_gpc());
@@ -224,17 +228,17 @@ class ADODB_mysqli extends ADOConnection {
 		if (is_null($s)) return 'NULL';
 		if (!$magic_quotes) {
 	    	if (PHP_VERSION >= 5)
-	      		return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";   
-	    
+	      		return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";
+
 		if ($this->replaceQuote[0] == '\\')
 			$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-	    return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+	    return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 	  }
 	  // undo magic quotes for "
 	  $s = str_replace('\\"','"',$s);
 	  return "'$s'";
 	}
-	
+
 	function _insertid()
 	{
 	  $result = @mysqli_insert_id($this->_connectionID);
@@ -243,7 +247,7 @@ class ADODB_mysqli extends ADOConnection {
 	  }
 	  return $result;
 	}
-	
+
 	// Only works for INSERT, UPDATE and DELETE query's
 	function _affectedrows()
 	{
@@ -253,7 +257,7 @@ class ADODB_mysqli extends ADOConnection {
 	  }
 	  return $result;
 	}
-  
+
  	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
 	// Reference on Last_Insert_ID on the recommended way to simulate sequences
  	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
@@ -261,22 +265,22 @@ class ADODB_mysqli extends ADOConnection {
 	var $_genSeqCountSQL = "select count(*) from %s";
 	var $_genSeq2SQL = "insert into %s values (%s)";
 	var $_dropSeqSQL = "drop table %s";
-	
+
 	function CreateSequence($seqname='adodbseq',$startID=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
 		$u = strtoupper($seqname);
-		
+
 		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
 		if (!$ok) return false;
 		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 	}
-	
+
 	function GenID($seqname='adodbseq',$startID=1)
 	{
 		// post-nuke sets hasGenID to false
 		if (!$this->hasGenID) return false;
-		
+
 		$getnext = sprintf($this->_genIDSQL,$seqname);
 		$holdtransOK = $this->_transOK; // save the current status
 		$rs = @$this->Execute($getnext);
@@ -288,16 +292,16 @@ class ADODB_mysqli extends ADOConnection {
 			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 			$rs = $this->Execute($getnext);
 		}
-		
+
 		if ($rs) {
 			$this->genID = mysqli_insert_id($this->_connectionID);
 			$rs->Close();
 		} else
 			$this->genID = 0;
-			
+
 		return $this->genID;
 	}
-	
+
   	function MetaDatabases()
 	{
 		$query = "SHOW DATABASES";
@@ -314,63 +318,63 @@ class ADODB_mysqli extends ADOConnection {
         return $ret;
 	}
 
-	  
+
 	function MetaIndexes ($table, $primary = FALSE, $owner = false)
 	{
 		// save old fetch mode
 		global $ADODB_FETCH_MODE;
-		
+
 		$false = false;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== FALSE) {
 		       $savem = $this->SetFetchMode(FALSE);
 		}
-		
+
 		// get index details
 		$rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
-		
+
 		// restore fetchmode
 		if (isset($savem)) {
 		        $this->SetFetchMode($savem);
 		}
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!is_object($rs)) {
 		        return $false;
 		}
-		
+
 		$indexes = array ();
-		
+
 		// parse index data into array
 		while ($row = $rs->FetchRow()) {
 		        if ($primary == FALSE AND $row[2] == 'PRIMARY') {
 		                continue;
 		        }
-		        
+
 		        if (!isset($indexes[$row[2]])) {
 		                $indexes[$row[2]] = array(
 		                        'unique' => ($row[1] == 0),
 		                        'columns' => array()
 		                );
 		        }
-		        
+
 		        $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
 		}
-		
+
 		// sort columns by order in the index
 		foreach ( array_keys ($indexes) as $index )
 		{
 		        ksort ($indexes[$index]['columns']);
 		}
-		
+
 		return $indexes;
 	}
 
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'DATE_FORMAT('.$col.",'";
 		$concat = false;
@@ -385,7 +389,7 @@ class ADODB_mysqli extends ADOConnection {
 			case 'Q':
 			case 'q':
 				$s .= "'),Quarter($col)";
-				
+
 				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
 				else $s .= ",('";
 				$concat = true;
@@ -393,7 +397,7 @@ class ADODB_mysqli extends ADOConnection {
 			case 'M':
 				$s .= '%b';
 				break;
-				
+
 			case 'm':
 				$s .= '%m';
 				break;
@@ -401,38 +405,38 @@ class ADODB_mysqli extends ADOConnection {
 			case 'd':
 				$s .= '%d';
 				break;
-			
-			case 'H': 
+
+			case 'H':
 				$s .= '%H';
 				break;
-				
+
 			case 'h':
 				$s .= '%I';
 				break;
-				
+
 			case 'i':
 				$s .= '%i';
 				break;
-				
+
 			case 's':
 				$s .= '%s';
 				break;
-				
+
 			case 'a':
 			case 'A':
 				$s .= '%p';
 				break;
-			
+
 			case 'w':
 				$s .= '%w';
 				break;
-				
+
 			case 'l':
 				$s .= '%W';
 				break;
-				
+
 			default:
-				
+
 				if ($ch == '\\') {
 					$i++;
 					$ch = substr($fmt,$i,1);
@@ -445,31 +449,31 @@ class ADODB_mysqli extends ADOConnection {
 		if ($concat) $s = "CONCAT($s)";
 		return $s;
 	}
-	
+
 	// returns concatenated string
 	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
 	function Concat()
 	{
 		$s = "";
 		$arr = func_get_args();
-		
+
 		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
+		$s = implode(',',$arr);
 		if (strlen($s) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
+
 	// dayFraction is a day in floating point
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
-		
+
 		$fraction = $dayFraction * 24 * 3600;
 		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
+
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
-	
+
     function MetaProcedures($NamePattern = false, $catalog  = null, $schemaPattern  = null)
     {
         // save old fetch mode
@@ -529,31 +533,42 @@ class ADODB_mysqli extends ADOConnection {
 
         return $procedures;
     }
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	/**
+	 * Retrieves a list of tables based on given criteria
+	 *
+	 * @param string $ttype Table type = 'TABLE', 'VIEW' or false=both (default)
+	 * @param string $showSchema schema name, false = current schema (default)
+	 * @param string $mask filters the table by name
+	 *
+	 * @return array list of tables
+	 */
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
+			$this->metaTablesSQL .= $this->qstr($showSchema);
+		} else {
+			$this->metaTablesSQL .= "schema()";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
+			$this->metaTablesSQL .= " AND table_name LIKE $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
+
 	// "Innox - Juan Carlos Gonzalez" 
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
 	{
 	 global $ADODB_FETCH_MODE;
-		
+
 		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
-		
+
 	    if ( !empty($owner) ) {
 	       $table = "$owner.$table";
 	    }
@@ -561,21 +576,21 @@ class ADODB_mysqli extends ADOConnection {
 		if ($associative) {
 			$create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
 	    } else $create_sql  = $a_create_table[1];
-	
+
 	    $matches = array();
-	
+
 	    if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	 	$foreign_keys = array();	 	 
+	 	$foreign_keys = array();
 	    $num_keys = count($matches[0]);
 	    for ( $i = 0;  $i < $num_keys;  $i ++ ) {
 	        $my_field  = explode('`, `', $matches[1][$i]);
 	        $ref_table = $matches[2][$i];
 	        $ref_field = explode('`, `', $matches[3][$i]);
-	
+
 	        if ( $upper ) {
 	            $ref_table = strtoupper($ref_table);
 	        }
-	
+
 	        // see https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
 			if (!isset($foreign_keys[$ref_table])) {
 				$foreign_keys[$ref_table] = array();
@@ -589,16 +604,16 @@ class ADODB_mysqli extends ADOConnection {
 	            }
 	        }
 	    }
-	    
+
 	    return  $foreign_keys;
 	}
-	
- 	function MetaColumns($table, $normalize=true) 
+
+ 	function MetaColumns($table, $normalize=true)
 	{
 		$false = false;
 		if (!$this->metaColumnsSQL)
 			return $false;
-		
+
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
@@ -609,13 +624,13 @@ class ADODB_mysqli extends ADOConnection {
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs))
 			return $false;
-		
+
 		$retarr = array();
 		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -651,7 +666,7 @@ class ADODB_mysqli extends ADOConnection {
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
@@ -659,47 +674,47 @@ class ADODB_mysqli extends ADOConnection {
 			}
 			$rs->MoveNext();
 		}
-		
+
 		$rs->Close();
 		return $retarr;
 	}
-		
+
 	// returns true or false
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 //	    $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
 	    $this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		
+
 	    if ($this->_connectionID) {
         	$result = @mysqli_select_db($this->_connectionID, $dbName);
 			if (!$result) {
 		    	ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->ErrorMsg());
 			}
-			return $result;		
+			return $result;
 		}
-	    return false;	
+	    return false;
 	}
-	
+
 	// parameters use PostgreSQL convention, not MySQL
 	function SelectLimit($sql,
 			      $nrows = -1,
 			      $offset = -1,
-			      $inputarr = false, 
+			      $inputarr = false,
 			      $secs = 0)
 	{
 		$offsetStr = ($offset >= 0) ? "$offset," : '';
 		if ($nrows < 0) $nrows = '18446744073709551615';
-		
+
 		if ($secs)
 			$rs = $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr );
 		else
 			$rs = $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr );
-			
+
 		return $rs;
 	}
-	
-	
+
+
 	function Prepare($sql)
 	{
 		return $sql;
@@ -710,8 +725,8 @@ class ADODB_mysqli extends ADOConnection {
 		}
 		return array($sql,$stmt);
 	}
-	
-	
+
+
 	// returns queryID or false
 	function _query($sql, $inputarr)
 	{
@@ -722,35 +737,35 @@ class ADODB_mysqli extends ADOConnection {
 		// return value of the stored proc (ie the number of rows affected).
 		// Commented out for reasons of performance. You should retrieve every recordset yourself.
 		//	if (!mysqli_next_result($this->connection->_connectionID))	return false;
-	
+
 		if (is_array($sql)) {
-		
+
 			// Prepare() not supported because mysqli_stmt_execute does not return a recordset, but
 			// returns as bound variables.
-		
+
 			$stmt = $sql[1];
 			$a = '';
 			foreach($inputarr as $k => $v) {
 				if (is_string($v)) $a .= 's';
-				else if (is_integer($v)) $a .= 'i'; 
+				else if (is_integer($v)) $a .= 'i';
 				else $a .= 'd';
 			}
-			
+
 			$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)) {
 		    if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
 		    return false;
 		}
-		
+
 		return $mysql_res;
 		*/
-		
+
 		if ($this->multiQuery) {
 			$rs = mysqli_multi_query($this->_connectionID, $sql.';');
 			if ($rs) {
@@ -759,36 +774,36 @@ class ADODB_mysqli extends ADOConnection {
 			}
 		} else {
 			$rs = mysqli_query($this->_connectionID, $sql, $ADODB_COUNTRECS ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
-		
+
 			if ($rs) return $rs;
 		}
 
 		if($this->debug)
 			ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
-		
+
 		return false;
-		
+
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	  {
-	    if (empty($this->_connectionID)) 
+	    if (empty($this->_connectionID))
 	      $this->_errorMsg = @mysqli_connect_error();
-	    else 
+	    else
 	      $this->_errorMsg = @mysqli_error($this->_connectionID);
 	    return $this->_errorMsg;
 	  }
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	  {
-	    if (empty($this->_connectionID))  
+	    if (empty($this->_connectionID))
 	      return @mysqli_connect_errno();
-	    else 
+	    else
 	      return @mysqli_errno($this->_connectionID);
 	  }
-	
+
 	// returns true or false
 	function _close()
 	  {
@@ -801,15 +816,15 @@ class ADODB_mysqli extends ADOConnection {
 	*/
 	function CharMax()
 	{
-		return 255; 
+		return 255;
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
 	function TextMax()
 	{
-	  return 4294967295; 
+	  return 4294967295;
 	}
 
 
@@ -819,14 +834,14 @@ class ADODB_mysqli extends ADOConnection {
 	// for instance, you may have UTF8 database and server it on-site as latin1 etc.
 	// GetCharSet - get the name of the character set the client is using now
 	// Under Windows, the functions should work with MySQL 4.1.11 and above, the set of charsets supported
-	// depends on compile flags of mysql distribution 
+	// depends on compile flags of mysql distribution
 
   function GetCharSet()
   {
     //we will use ADO's builtin property charSet
     if (!method_exists($this->_connectionID,'character_set_name'))
     	return false;
-    	
+
     $this->charSet = @$this->_connectionID->character_set_name();
     if (!$this->charSet) {
       return false;
@@ -853,50 +868,50 @@ class ADODB_mysqli extends ADOConnection {
 
 
 }
- 
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_mysqli extends ADORecordSet{	
-	
+class ADORecordSet_mysqli extends ADORecordSet{
+
 	var $databaseType = "mysqli";
 	var $canSeek = true;
-	
-	function ADORecordSet_mysqli($queryID, $mode = false) 
+
+	function ADORecordSet_mysqli($queryID, $mode = false)
 	{
-	  if ($mode === false) 
-	   { 
+	  if ($mode === false)
+	   {
 	      global $ADODB_FETCH_MODE;
 	      $mode = $ADODB_FETCH_MODE;
 	   }
-	   
+
 	  switch ($mode)
 	    {
-	    case ADODB_FETCH_NUM: 
-	      $this->fetchMode = MYSQLI_NUM; 
+	    case ADODB_FETCH_NUM:
+	      $this->fetchMode = MYSQLI_NUM;
 	      break;
 	    case ADODB_FETCH_ASSOC:
-	      $this->fetchMode = MYSQLI_ASSOC; 
+	      $this->fetchMode = MYSQLI_ASSOC;
 	      break;
 	    case ADODB_FETCH_DEFAULT:
 	    case ADODB_FETCH_BOTH:
 	    default:
-	      $this->fetchMode = MYSQLI_BOTH; 
+	      $this->fetchMode = MYSQLI_BOTH;
 	      break;
 	    }
 	  $this->adodbFetchMode = $mode;
-	  $this->ADORecordSet($queryID);	
+	  $this->ADORecordSet($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		$this->_numOfRows = $ADODB_COUNTRECS ? @mysqli_num_rows($this->_queryID) : -1;
 		$this->_numOfFields = @mysqli_num_fields($this->_queryID);
 	}
-	
+
 /*
 1      = MYSQLI_NOT_NULL_FLAG
 2      = MYSQLI_PRI_KEY_FLAG
@@ -917,8 +932,8 @@ class ADORecordSet_mysqli extends ADORecordSet{
 131072 = MYSQLI_BINCMP_FLAG
 */
 
-	function FetchField($fieldOffset = -1) 
-	{	
+	function FetchField($fieldOffset = -1)
+	{
 		$fieldnr = $fieldOffset;
 		if ($fieldOffset != -1) {
 		  $fieldOffset = @mysqli_field_seek($this->_queryID, $fieldnr);
@@ -938,18 +953,18 @@ class ADORecordSet_mysqli extends ADORecordSet{
 
 	function GetRowAssoc($upper = true)
 	{
-		if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
+		if ($this->fetchMode == MYSQLI_ASSOC && !$upper)
 		  return $this->fields;
 		$row = ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
-	{	
-	  if ($this->fetchMode != MYSQLI_NUM) 
+	{
+	  if ($this->fetchMode != MYSQLI_NUM)
 	    return @$this->fields[$colname];
-		
+
 	  if (!$this->bind) {
 	    $this->bind = array();
 	    for ($i = 0; $i < $this->_numOfFields; $i++) {
@@ -959,10 +974,10 @@ class ADORecordSet_mysqli extends ADORecordSet{
 	  }
 	  return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	function _seek($row)
 	{
-	  if ($this->_numOfRows == 0) 
+	  if ($this->_numOfRows == 0)
 	    return false;
 
 	  if ($row < 0)
@@ -972,12 +987,12 @@ class ADORecordSet_mysqli extends ADORecordSet{
 	  $this->EOF = false;
 	  return true;
 	}
-		
-		
+
+
 	function NextRecordSet()
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		mysqli_free_result($this->_queryID);
 		$this->_queryID = -1;
 		// Move to the next recordset, or return false if there is none. In a stored proc
@@ -1003,24 +1018,24 @@ class ADORecordSet_mysqli extends ADORecordSet{
 	// 10% speedup to move MoveNext to child class
 	// This is the only implementation that works now (23-10-2003).
 	// Other functions return no or the wrong results.
-	function MoveNext() 
+	function MoveNext()
 	{
 		if ($this->EOF) return false;
 		$this->_currentRow++;
 		$this->fields = @mysqli_fetch_array($this->_queryID,$this->fetchMode);
-		
+
 		if (is_array($this->fields)) return true;
 		$this->EOF = true;
 		return false;
-	}	
-	
+	}
+
 	function _fetch()
 	{
-		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);  
+		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);
 	  	return is_array($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 	    //if results are attached to this pointer from Stored Proceedure calls, the next standard query will die 2014
         //only a problem with persistant connections
@@ -1029,10 +1044,10 @@ class ADORecordSet_mysqli extends ADORecordSet{
            @mysqli_next_result($this->connection->_connectionID);
         }
 
-		mysqli_free_result($this->_queryID); 
-	  	$this->_queryID = false;	
+		mysqli_free_result($this->_queryID);
+	  	$this->_queryID = false;
 	}
-	
+
 /*
 
 0 = MYSQLI_TYPE_DECIMAL
@@ -1069,18 +1084,18 @@ class ADORecordSet_mysqli extends ADORecordSet{
 		    $t = $fieldobj->type;
 		    $len = $fieldobj->max_length;
 		}
-		
-		
+
+
 		 $len = -1; // mysql max_length is not accurate
 		 switch (strtoupper($t)) {
-		 case 'STRING': 
+		 case 'STRING':
 		 case 'CHAR':
-		 case 'VARCHAR': 
-		 case 'TINYBLOB': 
-		 case 'TINYTEXT': 
-		 case 'ENUM': 
-		 case 'SET': 
-		
+		 case 'VARCHAR':
+		 case 'TINYBLOB':
+		 case 'TINYTEXT':
+		 case 'ENUM':
+		 case 'SET':
+
 		case MYSQLI_TYPE_TINY_BLOB :
 		#case MYSQLI_TYPE_CHAR :
 		case MYSQLI_TYPE_STRING :
@@ -1088,61 +1103,61 @@ class ADORecordSet_mysqli extends ADORecordSet{
 		case MYSQLI_TYPE_SET :
 		case 253 :
 		   if ($len <= $this->blobSize) return 'C';
-		   
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 		   return 'X';
-		
-		
+
+
 		   // php_mysql extension always returns 'blob' even if 'text'
 		   // so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
-		
+
 		case MYSQLI_TYPE_BLOB :
 		case MYSQLI_TYPE_LONG_BLOB :
 		case MYSQLI_TYPE_MEDIUM_BLOB :
-		
+
 		   return !empty($fieldobj->binary) ? 'B' : 'X';
 		case 'YEAR':
-		case 'DATE': 
+		case 'DATE':
 		case MYSQLI_TYPE_DATE :
 		case MYSQLI_TYPE_YEAR :
-		
+
 		   return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP':
-		
+
 		case MYSQLI_TYPE_DATETIME :
 		case MYSQLI_TYPE_NEWDATE :
 		case MYSQLI_TYPE_TIME :
 		case MYSQLI_TYPE_TIMESTAMP :
-		
+
 			return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'TINYINT':
 		case 'MEDIUMINT':
-		case 'SMALLINT': 
-		
+		case 'SMALLINT':
+
 		case MYSQLI_TYPE_INT24 :
 		case MYSQLI_TYPE_LONG :
 		case MYSQLI_TYPE_LONGLONG :
 		case MYSQLI_TYPE_SHORT :
 		case MYSQLI_TYPE_TINY :
-		
+
 		   if (!empty($fieldobj->primary_key)) return 'R';
-		   
+
 		   return 'I';
-		
-		
+
+
 		   // Added floating-point types
 		   // Maybe not necessery.
 		 case 'FLOAT':
@@ -1152,23 +1167,23 @@ class ADORecordSet_mysqli extends ADORecordSet{
 		 case 'DEC':
 		 case 'FIXED':
 		 default:
-		 	//if (!is_numeric($t)) echo "
    --- Error in type matching $t -----
    "; 
+		 	//if (!is_numeric($t)) echo "
    --- Error in type matching $t -----
    ";
 		 	return 'N';
 		}
 	} // function
-	
+
 
 } // rs class
- 
+
 }
 
 class ADORecordSet_array_mysqli extends ADORecordSet_array {
-  
-  function ADORecordSet_array_mysqli($id=-1,$mode=false) 
+
+  function ADORecordSet_array_mysqli($id=-1,$mode=false)
   {
     $this->ADORecordSet_array($id,$mode);
   }
-  
+
 	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
@@ -1176,18 +1191,18 @@ class ADORecordSet_array_mysqli extends ADORecordSet_array {
 		    $t = $fieldobj->type;
 		    $len = $fieldobj->max_length;
 		}
-		
-		
+
+
 		 $len = -1; // mysql max_length is not accurate
 		 switch (strtoupper($t)) {
-		 case 'STRING': 
+		 case 'STRING':
 		 case 'CHAR':
-		 case 'VARCHAR': 
-		 case 'TINYBLOB': 
-		 case 'TINYTEXT': 
-		 case 'ENUM': 
-		 case 'SET': 
-		
+		 case 'VARCHAR':
+		 case 'TINYBLOB':
+		 case 'TINYTEXT':
+		 case 'ENUM':
+		 case 'SET':
+
 		case MYSQLI_TYPE_TINY_BLOB :
 		#case MYSQLI_TYPE_CHAR :
 		case MYSQLI_TYPE_STRING :
@@ -1195,61 +1210,61 @@ class ADORecordSet_array_mysqli extends ADORecordSet_array {
 		case MYSQLI_TYPE_SET :
 		case 253 :
 		   if ($len <= $this->blobSize) return 'C';
-		   
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 		   return 'X';
-		
-		
+
+
 		   // php_mysql extension always returns 'blob' even if 'text'
 		   // so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
-		
+
 		case MYSQLI_TYPE_BLOB :
 		case MYSQLI_TYPE_LONG_BLOB :
 		case MYSQLI_TYPE_MEDIUM_BLOB :
-		
+
 		   return !empty($fieldobj->binary) ? 'B' : 'X';
 		case 'YEAR':
-		case 'DATE': 
+		case 'DATE':
 		case MYSQLI_TYPE_DATE :
 		case MYSQLI_TYPE_YEAR :
-		
+
 		   return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP':
-		
+
 		case MYSQLI_TYPE_DATETIME :
 		case MYSQLI_TYPE_NEWDATE :
 		case MYSQLI_TYPE_TIME :
 		case MYSQLI_TYPE_TIMESTAMP :
-		
+
 			return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'TINYINT':
 		case 'MEDIUMINT':
-		case 'SMALLINT': 
-		
+		case 'SMALLINT':
+
 		case MYSQLI_TYPE_INT24 :
 		case MYSQLI_TYPE_LONG :
 		case MYSQLI_TYPE_LONGLONG :
 		case MYSQLI_TYPE_SHORT :
 		case MYSQLI_TYPE_TINY :
-		
+
 		   if (!empty($fieldobj->primary_key)) return 'R';
-		   
+
 		   return 'I';
-		
-		
+
+
 		   // Added floating-point types
 		   // Maybe not necessery.
 		 case 'FLOAT':
@@ -1259,11 +1274,9 @@ class ADORecordSet_array_mysqli extends ADORecordSet_array {
 		 case 'DEC':
 		 case 'FIXED':
 		 default:
-		 	//if (!is_numeric($t)) echo "
    --- Error in type matching $t -----
    "; 
+		 	//if (!is_numeric($t)) echo "
    --- Error in type matching $t -----
    ";
 		 	return 'N';
 		}
 	} // function
-  
-}
 
-?>
\ No newline at end of file
+}
diff --git a/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php b/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
index 4715a1f73..90773010d 100644
--- a/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
@@ -1,15 +1,15 @@
 
-  
+
   Requires mysql client. Works on Windows and Unix.
 */
 
@@ -23,33 +23,33 @@ class ADODB_mysqlt extends ADODB_mysql {
 	var $databaseType = 'mysqlt';
 	var $ansiOuter = true; // for Version 3.23.17 or later
 	var $hasTransactions = true;
-	var $autoRollback = true; // apparently mysql does not autorollback properly 
-	
-	function ADODB_mysqlt() 
-	{			
+	var $autoRollback = true; // apparently mysql does not autorollback properly
+
+	function ADODB_mysqlt()
+	{
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
 	}
-	
+
 	function BeginTrans()
-	{	  
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->Execute('SET AUTOCOMMIT=0');
 		$this->Execute('BEGIN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
+
+	function CommitTrans($ok=true)
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->Execute('COMMIT');
 		$this->Execute('SET AUTOCOMMIT=1');
 		return true;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -58,41 +58,41 @@ class ADODB_mysqlt extends ADODB_mysql {
 		$this->Execute('SET AUTOCOMMIT=1');
 		return true;
 	}
-	
-	function RowLock($tables,$where='',$col='1 as adodbignore') 
+
+	function RowLock($tables,$where='',$col='1 as adodbignore')
 	{
 		if ($this->transCnt==0) $this->BeginTrans();
 		if ($where) $where = ' where '.$where;
 		$rs = $this->Execute("select $col from $tables $where for update");
-		return !empty($rs); 
+		return !empty($rs);
 	}
-	
+
 }
 
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{
 	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) 
+
+	function ADORecordSet_mysqlt($queryID,$mode=false)
 	{
-		if ($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;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = MYSQL_BOTH; break;
 		}
-	
+
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
@@ -107,11 +107,11 @@ class ADORecordSet_mysqlt extends ADORecordSet_mysql{
 	}
 }
 
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
 
-	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
+	function ADORecordSet_ext_mysqlt($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -119,20 +119,18 @@ class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
-		default: 
+		default:
 			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		return adodb_movenext($this);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php b/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
index 824e32cc2..74ee4b406 100644
--- a/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
@@ -1,15 +1,15 @@
 
-  
+
   Requires mysql client. Works on Windows and Unix.
 */
 
@@ -23,20 +23,20 @@ class ADODB_mysqlt extends ADODB_mysql {
 	var $databaseType = 'mysqlt';
 	var $ansiOuter = true; // for Version 3.23.17 or later
 	var $hasTransactions = true;
-	var $autoRollback = true; // apparently mysql does not autorollback properly 
-	
-	function ADODB_mysqlt() 
-	{			
+	var $autoRollback = true; // apparently mysql does not autorollback properly
+
+	function ADODB_mysqlt()
+	{
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
 	}
-	
+
 	/* set transaction mode
-	
+
 	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
 { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
 
 	*/
-	function SetTransactionMode( $transaction_mode ) 
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -46,27 +46,27 @@ class ADODB_mysqlt extends ADODB_mysql {
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
-	
+
 	function BeginTrans()
-	{	  
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->Execute('SET AUTOCOMMIT=0');
 		$this->Execute('BEGIN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
+
+	function CommitTrans($ok=true)
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
 		$ok = $this->Execute('COMMIT');
 		$this->Execute('SET AUTOCOMMIT=1');
 		return $ok ? true : false;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -75,41 +75,41 @@ class ADODB_mysqlt extends ADODB_mysql {
 		$this->Execute('SET AUTOCOMMIT=1');
 		return $ok ? true : false;
 	}
-	
-	function RowLock($tables,$where='',$col='1 as adodbignore') 
+
+	function RowLock($tables,$where='',$col='1 as adodbignore')
 	{
 		if ($this->transCnt==0) $this->BeginTrans();
 		if ($where) $where = ' where '.$where;
 		$rs = $this->Execute("select $col from $tables $where for update");
-		return !empty($rs); 
+		return !empty($rs);
 	}
-	
+
 }
 
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{
 	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) 
+
+	function ADORecordSet_mysqlt($queryID,$mode=false)
 	{
-		if ($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;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = MYSQL_BOTH; break;
 		}
-	
+
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
@@ -124,11 +124,11 @@ class ADORecordSet_mysqlt extends ADORecordSet_mysql{
 	}
 }
 
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
 
-	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
+	function ADORecordSet_ext_mysqlt($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -136,20 +136,18 @@ class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
-		default: 
+		default:
 			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		return adodb_movenext($this);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php b/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
index 2ffb74358..7c1631bf8 100644
--- a/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
@@ -1,7 +1,7 @@
  0 ORDER BY attnum";
 	var $metaColumnsSQL1 = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
-	// netezza doesn't have keys. it does have distributions, so maybe this is 
+	// netezza doesn't have keys. it does have distributions, so maybe this is
 	// something that can be pulled from the system tables
 	var $metaKeySQL = "";
 	var $hasAffectedRows = true;
-	var $hasLimit = true;	
+	var $hasLimit = true;
 	var $true = 't';		// string that represents TRUE for a database
 	var $false = 'f';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -47,52 +47,52 @@ class ADODB_netezza extends ADODB_postgres64 {
 	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
 							// http://bugs.php.net/bug.php?id=25404
 
-							
-	function ADODB_netezza() 
+
+	function ADODB_netezza()
 	{
-	
+
 	}
-	
-	function MetaColumns($table,$upper=true) 
+
+	function MetaColumns($table,$upper=true)
 	{
-	
+
 	// Changed this function to support Netezza which has no concept of keys
 	// could posisbly work on other things from the system table later.
-	
+
 	global $ADODB_FETCH_MODE;
-	
+
 		$table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) return false;
 
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
-			
-			// since we're returning type and length as one string, 
+
+			// since we're returning type and length as one string,
 			// split them out here.
-			
+
 			if ($first = strstr($rs->fields[1], "(")) {
 			 $fld->max_length = trim($first, "()");
 			} else {
 			 $fld->max_length = -1;
 			}
-		
+
 			if ($first = strpos($rs->fields[1], "(")) {
 			 $fld->type = substr($rs->fields[1], 0, $first);
 			} else {
 			 $fld->type = $rs->fields[1];
 			}
-			
+
 			switch ($fld->type) {
 			 case "byteint":
 			 case "boolean":
@@ -116,20 +116,20 @@ class ADODB_netezza extends ADODB_postgres64 {
 			 $fld->max_length = 12;
 			 break;
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		return $retarr;	
-		
+		return $retarr;
+
 	}
 
-		
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -138,10 +138,10 @@ class ADORecordSet_netezza extends ADORecordSet_postgres64
 {
 	var $databaseType = "netezza";
 	var $canSeek = true;
-	
-	function ADORecordSet_netezza($queryID,$mode=false) 
+
+	function ADORecordSet_netezza($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -149,7 +149,7 @@ class ADORecordSet_netezza extends ADORecordSet_postgres64
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = PGSQL_BOTH; break;
@@ -157,7 +157,7 @@ class ADORecordSet_netezza extends ADORecordSet_postgres64
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);
 	}
-	
+
 	// _initrs modified to disable blob handling
 	function _initrs()
 	{
@@ -167,4 +167,3 @@ class ADORecordSet_netezza extends ADORecordSet_postgres64
 	}
 
 }
-?>
diff --git a/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php b/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
index a7417df09..6eac31acb 100644
--- a/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
@@ -1,16 +1,16 @@
 
-  
+
   13 Nov 2000 jlim - removed all ora_* references.
 */
 
@@ -35,7 +35,7 @@ the 20th century (1950-1999). Setting the RR format as the default for all two-d
 year entries allows you to become year-2000 compliant. For example:
 NLS_DATE_FORMAT='RR-MM-DD'
 
-You can also modify the date format using the ALTER SESSION command. 
+You can also modify the date format using the ALTER SESSION command.
 */
 
 # define the LOB descriptor type for the given type
@@ -65,17 +65,17 @@ class ADODB_oci8 extends ADOConnection {
 	var $_initdate = true; // init date to YYYY-MM-DD
 	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW') and table_name not like 'BIN\$%'"; // bin$ tables are recycle bin tables
 	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
-	var $metaColumnsSQL2 = "select column_name,data_type,data_length, data_scale, data_precision, 
+	var $metaColumnsSQL2 = "select column_name,data_type,data_length, data_scale, data_precision,
     case when nullable = 'Y' then 'NULL'
     else 'NOT NULL' end as nulls,
-    data_default from all_tab_cols 
+    data_default from all_tab_cols
   where owner='%s' and table_name='%s' order by column_id"; // when there is a schema
 	var $_bindInputArray = true;
 	var $hasGenID = true;
-	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";	
+	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
 	var $_genSeqSQL = "
 DECLARE
-  PRAGMA AUTONOMOUS_TRANSACTION;
+	PRAGMA AUTONOMOUS_TRANSACTION;
 BEGIN
 	execute immediate 'CREATE SEQUENCE %s START WITH %s';
 END;
@@ -91,31 +91,31 @@ END;
 	var $_hasOciFetchStatement = false;
 	var $_getarray = false; // currently not working
 	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
-	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
+	var $session_sharing_force_blob = false; // alter session on updateblob if set to true
 	var $firstrows = true; // enable first rows optimization on SelectLimit()
 	var $selectOffsetAlg1 = 1000; // when to use 1st algorithm of selectlimit.
 	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
 	var $dateformat = 'YYYY-MM-DD'; // DBDate format
- 	var $useDBDateFormatForTextInput=false;
+	var $useDBDateFormatForTextInput=false;
 	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
 	var $_refLOBs = array();
-		
+
 	// var $ansiOuter = true; // if oracle9
-    
-	function ADODB_oci8() 
+
+	function ADODB_oci8()
 	{
 		$this->_hasOciFetchStatement = ADODB_PHPVER >= 0x4200;
 		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
 	}
-	
+
 	/*  function MetaColumns($table, $normalize=true) added by smondino@users.sourceforge.net*/
-	function MetaColumns($table, $normalize=true) 
+	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-		
+
 		$schema = '';
 		$this->_findschema($table, $schema);
-		
+
 		$false = false;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
@@ -125,7 +125,7 @@ END;
 			$rs = $this->Execute(sprintf($this->metaColumnsSQL2, strtoupper($schema), strtoupper($table)));
 		else
 			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!$rs) {
@@ -134,95 +134,87 @@ END;
 		$retarr = array();
 		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
-	   		$fld->name = $rs->fields[0];
-	   		$fld->type = $rs->fields[1];
-	   		$fld->max_length = $rs->fields[2];
+			$fld->name = $rs->fields[0];
+			$fld->type = $rs->fields[1];
+			$fld->max_length = $rs->fields[2];
 			$fld->scale = $rs->fields[3];
 			if ($rs->fields[1] == 'NUMBER') {
 				if ($rs->fields[3] == 0) $fld->type = 'INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
+				$fld->max_length = $rs->fields[4];
+			}
+			$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
 			return  $false;
-		else 
+		else
 			return $retarr;
 	}
-	
+
 	function Time()
 	{
 		$rs = $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
 		return false;
 	}
- 
-/*
 
-  Multiple modes of connection are supported:
-  
-  a. Local Database
-    $conn->Connect(false,'scott','tiger');
-  
-  b. From tnsnames.ora
-    $conn->Connect(false,'scott','tiger',$tnsname); 
-    $conn->Connect($tnsname,'scott','tiger'); 
-  
-  c. Server + service name
-    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
-  
-  d. Server + SID
-  	$conn->connectSID = true;
-	$conn->Connect($serveraddress,'scott,'tiger',$SID);
-
-
-Example TNSName:
----------------
-NATSOFT.DOMAIN =
-  (DESCRIPTION =
-	(ADDRESS_LIST =
-	  (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
-	)
-	(CONNECT_DATA =
-	  (SERVICE_NAME = natsoft.domain)
-	)
-  )
-  
-  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
-	
-*/
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
+	/**
+	 * Multiple modes of connection are supported:
+	 *
+	 * a. Local Database
+	 *    $conn->Connect(false,'scott','tiger');
+	 *
+	 * b. From tnsnames.ora
+	 *    $conn->Connect($tnsname,'scott','tiger');
+	 *    $conn->Connect(false,'scott','tiger',$tnsname);
+	 *
+	 * c. Server + service name
+	 *    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
+	 *
+	 * d. Server + SID
+	 *    $conn->connectSID = true;
+	 *    $conn->Connect($serveraddress,'scott,'tiger',$SID);
+	 *
+	 * @param string|false $argHostname DB server hostname or TNS name
+	 * @param string $argUsername
+	 * @param string $argPassword
+	 * @param string $argDatabasename Service name, SID (defaults to null)
+	 * @param int $mode Connection mode, defaults to 0
+	 *                  (0 = non-persistent, 1 = persistent, 2 = force new connection)
+	 *
+	 * @return bool
+	 */
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename=null, $mode=0)
 	{
 		if (!function_exists('oci_pconnect')) return null;
-		#adodb_backtrace(); 
-		
-        $this->_errorMsg = false;
+		#adodb_backtrace();
+
+		$this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
 		if($argHostname) { // added by Jorma Tuomainen 
 			if (empty($argDatabasename)) $argDatabasename = $argHostname;
 			else {
 				if(strpos($argHostname,":")) {
 					$argHostinfo=explode(":",$argHostname);
-				   	$argHostname=$argHostinfo[0];
+					$argHostname=$argHostinfo[0];
 					$argHostport=$argHostinfo[1];
-			 	} else {
+				} else {
 					$argHostport = empty($this->port)?  "1521" : $this->port;
-	   			}
-				
+				}
+
 				if (strncasecmp($argDatabasename,'SID=',4) == 0) {
 					$argDatabasename = substr($argDatabasename,4);
 					$this->connectSID = true;
 				}
-				
+
 				if ($this->connectSID) {
 					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
@@ -231,39 +223,37 @@ NATSOFT.DOMAIN =
 					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
 			}
 		}
-				
- 		//if ($argHostname) print "
    Connect: 1st argument should be left blank for $this->databaseType
    ";
+
+		//if ($argHostname) print "
    Connect: 1st argument should be left blank for $this->databaseType
    ";
 		if ($mode==1) {
-			$this->_connectionID = ($this->charSet) ? 
-				oci_pconnect($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				oci_pconnect($argUsername,$argPassword, $argDatabasename)
-				;
+			$this->_connectionID = ($this->charSet)
+				? oci_pconnect($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				: oci_pconnect($argUsername,$argPassword, $argDatabasename);
 			if ($this->_connectionID && $this->autoRollback)  oci_rollback($this->_connectionID);
 		} else if ($mode==2) {
-			$this->_connectionID = ($this->charSet) ? 
-				oci_new_connect($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				oci_new_connect($argUsername,$argPassword, $argDatabasename);
-				
+			$this->_connectionID = ($this->charSet)
+				? oci_new_connect($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				: oci_new_connect($argUsername,$argPassword, $argDatabasename);
 		} else {
-			$this->_connectionID = ($this->charSet) ? 
-				oci_connect($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				oci_connect($argUsername,$argPassword, $argDatabasename);
+			$this->_connectionID = ($this->charSet)
+				? oci_connect($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				: oci_connect($argUsername,$argPassword, $argDatabasename);
 		}
-		if (!$this->_connectionID) return false;
+		if (!$this->_connectionID) {
+			return false;
+		}
+
 		if ($this->_initdate) {
 			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
 		}
-		
-		// looks like: 
+
+		// looks like:
 		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
 		// $vers = oci_server_version($this->_connectionID);
 		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
 		return true;
-   	}
-	
+	}
+
 	function ServerInfo()
 	{
 		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
@@ -276,39 +266,39 @@ NATSOFT.DOMAIN =
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
 	}
-	
+
 	// returns true or false
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
 	}
-	
+
 	function _affectedrows()
 	{
 		if (is_resource($this->_stmt)) return @oci_num_rows($this->_stmt);
 		return 0;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " NVL($field, $ifNull) "; // if Oracle
 	}
-	
+
 	// format and return date string in database date format
 	function DBDate($d,$isfld=false)
 	{
 		if (empty($d) && $d !== 0) return 'null';
-		
+
 		if ($isfld) {
 			$d = _adodb_safedate($d);
 			return 'TO_DATE('.$d.",'".$this->dateformat."')";
 		}
-		
+
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		
+
 		if (is_object($d)) $ds = $d->format($this->fmtDate);
 		else $ds = adodb_date($this->fmtDate,$d);
-		
+
 		return "TO_DATE(".$ds.",'".$this->dateformat."')";
 	}
 
@@ -316,41 +306,41 @@ NATSOFT.DOMAIN =
 	{
 		$d = ADOConnection::DBDate($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
+
 	function BindTimeStamp($ts)
 	{
 		if (empty($ts) && $ts !== 0) return 'null';
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		
+
 		if (is_object($ts)) $tss = $ts->format("'Y-m-d H:i:s'");
 		else $tss = adodb_date("'Y-m-d H:i:s'",$ts);
-		
+
 		return $tss;
 	}
-	
+
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts,$isfld=false)
 	{
 		if (empty($ts) && $ts !== 0) return 'null';
 		if ($isfld) return 'TO_DATE(substr('.$ts.",1,19),'RRRR-MM-DD, HH24:MI:SS')";
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-	
+
 		if (is_object($ts)) $tss = $ts->format("'Y-m-d H:i:s'");
 		else $tss = date("'Y-m-d H:i:s'",$ts);
-		
+
 		return 'TO_DATE('.$tss.",'RRRR-MM-DD, HH24:MI:SS')";
 	}
-	
-	function RowLock($tables,$where,$col='1 as adodbignore') 
+
+	function RowLock($tables,$where,$col='1 as adodbignore')
 	{
 		if ($this->autoCommit) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables where $where for update");
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
@@ -358,25 +348,25 @@ NATSOFT.DOMAIN =
 			$this->metaTablesSQL .= " AND upper(table_name) like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	// Mark Newnham 
+
+	// Mark Newnham
 	function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
+		// save old fetch mode
+		global $ADODB_FETCH_MODE;
 
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
 
 		// get index details
 		$table = strtoupper($table);
@@ -387,83 +377,83 @@ NATSOFT.DOMAIN =
 		$false = false;
 		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
 		if (!is_object($rs)) {
-			if (isset($savem)) 
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-		
+			return $false;
+		}
+
 		if ($row = $rs->FetchRow())
-		   $primary_key = $row[1]; //constraint_name
+			$primary_key = $row[1]; //constraint_name
 
 		if ($primary==TRUE && $primary_key=='') {
-			 if (isset($savem)) 
-                $this->SetFetchMode($savem);
+			if (isset($savem))
+				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 			return $false; //There is no primary key
 		}
 
-        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
+		$rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
 
-		
-        if (!is_object($rs)) {
-			if (isset($savem)) 
+
+		if (!is_object($rs)) {
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
+			return $false;
+		}
 
 		$indexes = array ();
-        // parse index data into array
+		// parse index data into array
 
-        while ($row = $rs->FetchRow()) {
+		while ($row = $rs->FetchRow()) {
 			if ($primary && $row[0] != $primary_key) continue;
-            if (!isset($indexes[$row[0]])) {
+			if (!isset($indexes[$row[0]])) {
 				$indexes[$row[0]] = array(
-				   'unique' => ($row[1] == 'UNIQUE'),
-				   'columns' => array()
+					'unique' => ($row[1] == 'UNIQUE'),
+					'columns' => array()
 				);
-            }
-            $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
-        }
+			}
+			$indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
+		}
 
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index ) {
-            ksort ($indexes[$index]['columns']);
-        }
+		// sort columns by order in the index
+		foreach ( array_keys ($indexes) as $index ) {
+			ksort ($indexes[$index]['columns']);
+		}
 
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
-        return $indexes;
+		return $indexes;
 	}
-	
+
 	function BeginTrans()
-	{	
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 		$this->_commit = OCI_DEFAULT;
-		
+
 		if ($this->_transmode) $ok = $this->Execute("SET TRANSACTION ".$this->_transmode);
 		else $ok = true;
-		
+
 		return $ok ? true : false;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
 		$ret = oci_commit($this->_connectionID);
 		$this->_commit = OCI_COMMIT_ON_SUCCESS;
 		$this->autoCommit = true;
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -473,14 +463,14 @@ NATSOFT.DOMAIN =
 		$this->autoCommit = true;
 		return $ret;
 	}
-	
-	
-	function SelectDB($dbName) 
+
+
+	function SelectDB($dbName)
 	{
 		return false;
 	}
 
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
 		if ($this->_errorMsg !== false) return $this->_errorMsg;
 
@@ -495,29 +485,31 @@ NATSOFT.DOMAIN =
 		return $this->_errorMsg;
 	}
 
-	function ErrorNo() 
+	function ErrorNo()
 	{
 		if ($this->_errorCode !== false) return $this->_errorCode;
-		
+
 		if (is_resource($this->_stmt)) $arr = @oci_error($this->_stmt);
 		if (empty($arr)) {
 			$arr = @oci_error($this->_connectionID);
 			if ($arr == false) $arr = @oci_error();
 			if ($arr == false) return '';
 		}
-		
+
 		$this->_errorMsg = $arr['message'];
 		$this->_errorCode = $arr['code'];
-		
+
 		return $arr['code'];
 	}
-	
-	// Format date column in sql string given an input format that understands Y M D
+
+	/**
+	 * Format date column in sql string given an input format that understands Y M D
+	 */
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'TO_CHAR('.$col.",'";
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
@@ -530,11 +522,11 @@ NATSOFT.DOMAIN =
 			case 'q':
 				$s .= 'Q';
 				break;
-				
+
 			case 'M':
 				$s .= 'Mon';
 				break;
-				
+
 			case 'm':
 				$s .= 'MM';
 				break;
@@ -542,40 +534,40 @@ NATSOFT.DOMAIN =
 			case 'd':
 				$s .= 'DD';
 				break;
-			
+
 			case 'H':
 				$s.= 'HH24';
 				break;
-				
+
 			case 'h':
 				$s .= 'HH';
 				break;
-				
+
 			case 'i':
 				$s .= 'MI';
 				break;
-			
+
 			case 's':
 				$s .= 'SS';
 				break;
-			
+
 			case 'a':
 			case 'A':
 				$s .= 'AM';
 				break;
-				
+
 			case 'w':
 				$s .= 'D';
 				break;
-				
+
 			case 'l':
 				$s .= 'DAY';
 				break;
-				
-			 case 'W':
+
+			case 'W':
 				$s .= 'WW';
 				break;
-				
+
 			default:
 			// handle escape characters...
 				if ($ch == '\\') {
@@ -584,56 +576,59 @@ NATSOFT.DOMAIN =
 				}
 				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
 				else $s .= '"'.$ch.'"';
-				
+
 			}
 		}
 		return $s. "')";
 	}
-	
+
 	function GetRandRow($sql, $arr = false)
 	{
 		$sql = "SELECT * FROM ($sql ORDER BY dbms_random.value) WHERE rownum = 1";
-		
+
 		return $this->GetRow($sql,$arr);
 	}
-	
-	/*
-	This algorithm makes use of
-	
-	a. FIRST_ROWS hint
-	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
-	that is, minimum resource usage to return the first row. Results will be returned 
-	as soon as they are identified. 
-
-	b. Uses rownum tricks to obtain only the required rows from a given offset.
-	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
-	 This idea by Tomas V V Cox.
-	 
-	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
-	 out this function then, and the slower SelectLimit() in the base class will be used.
-	*/
+
+	/**
+	 * This algorithm makes use of
+	 *
+	 * a. FIRST_ROWS hint
+	 * The FIRST_ROWS hint explicitly chooses the approach to optimize response
+	 * time, that is, minimum resource usage to return the first row. Results
+	 * will be returned as soon as they are identified.
+	 *
+	 * b. Uses rownum tricks to obtain only the required rows from a given offset.
+	 * As this uses complicated sql statements, we only use this if $offset >= 100.
+	 * This idea by Tomas V V Cox.
+	 *
+	 * This implementation does not appear to work with oracle 8.0.5 or earlier.
+	 * Comment out this function then, and the slower SelectLimit() in the base
+	 * class will be used.
+	 */
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		// seems that oracle only supports 1 hint comment in 8i
 		if ($this->firstrows) {
 			if ($nrows > 500 && $nrows < 1000) $hint = "FIRST_ROWS($nrows)";
 			else $hint = 'FIRST_ROWS';
-			
+
 			if (strpos($sql,'/*+') !== false)
 				$sql = str_replace('/*+ ',"/*+$hint ",$sql);
 			else
 				$sql = preg_replace('/^[ \t\n]*select/i',"SELECT /*+$hint*/",$sql);
-		}
-		
+			$hint = "/*+ $hint */";
+		} else
+			$hint = '';
+
 		if ($offset == -1 || ($offset < $this->selectOffsetAlg1 && 0 < $nrows && $nrows < 1000)) {
-			if ($nrows > 0) {	
+			if ($nrows > 0) {
 				if ($offset > 0) $nrows += $offset;
 				//$inputarr['adodb_rownum'] = $nrows;
 				if ($this->databaseType == 'oci8po') {
 					$sql = "select * from (".$sql.") where rownum <= ?";
 				} else {
 					$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
-				} 
+				}
 				$inputarr['adodb_offset'] = $nrows;
 				$nrows = -1;
 			}
@@ -641,21 +636,21 @@ NATSOFT.DOMAIN =
 
 			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 			return $rs;
-			
+
 		} else {
-			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
-			
-			 // Let Oracle return the name of the columns
+			// Algorithm by Tomas V V Cox, from PEAR DB oci8.php
+
+			// Let Oracle return the name of the columns
 			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
-		
+
 			$false = false;
 			if (! $stmt_arr = $this->Prepare($q_fields)) {
 				return $false;
 			}
 			$stmt = $stmt_arr[1];
-			 
+
 			if (is_array($inputarr)) {
-			 	foreach($inputarr as $k => $v) {
+				foreach($inputarr as $k => $v) {
 					if (is_array($v)) {
 						if (sizeof($v) == 2) // suggested by g.giunta@libero.
 							oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1]);
@@ -668,86 +663,82 @@ NATSOFT.DOMAIN =
 							$bindarr[$k] = $v;
 						} else { 				// dynamic sql, so rebind every time
 							oci_bind_by_name($stmt,":$k",$inputarr[$k],$len);
-							
 						}
 					}
 				}
 			}
-			
-			 if (!oci_execute($stmt, OCI_DEFAULT)) {
-				 oci_free_statement($stmt); 
-				 return $false;
-			 }
-			 
-			 $ncols = oci_num_fields($stmt);
-			 for ( $i = 1; $i <= $ncols; $i++ ) {
-				 $cols[] = '"'.oci_field_name($stmt, $i).'"';
-			 }
-			 $result = false;
-			
-			 oci_free_statement($stmt); 
-			 $fields = implode(',', $cols);
-			 if ($nrows <= 0) $nrows = 999999999999;
-			 else $nrows += $offset;
-			 $offset += 1; // in Oracle rownum starts at 1
-			
+
+			if (!oci_execute($stmt, OCI_DEFAULT)) {
+				oci_free_statement($stmt);
+				return $false;
+			}
+
+			$ncols = oci_num_fields($stmt);
+			for ( $i = 1; $i <= $ncols; $i++ ) {
+				$cols[] = '"'.oci_field_name($stmt, $i).'"';
+			}
+			$result = false;
+
+			oci_free_statement($stmt);
+			$fields = implode(',', $cols);
+			if ($nrows <= 0) $nrows = 999999999999;
+			else $nrows += $offset;
+			$offset += 1; // in Oracle rownum starts at 1
+
 			if ($this->databaseType == 'oci8po') {
-					 $sql = "SELECT /*+ FIRST_ROWS */ $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= ?".
-					  ") WHERE adodb_rownum >= ?";
+					$sql = "SELECT $hint $fields FROM".
+						"(SELECT rownum as adodb_rownum, $fields FROM".
+						" ($sql) WHERE rownum <= ?".
+						") WHERE adodb_rownum >= ?";
 				} else {
-					 $sql = "SELECT /*+ FIRST_ROWS */ $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= :adodb_nrows".
-					  ") WHERE adodb_rownum >= :adodb_offset";
-				} 
+					$sql = "SELECT $hint $fields FROM".
+						"(SELECT rownum as adodb_rownum, $fields FROM".
+						" ($sql) WHERE rownum <= :adodb_nrows".
+						") WHERE adodb_rownum >= :adodb_offset";
+				}
 				$inputarr['adodb_nrows'] = $nrows;
 				$inputarr['adodb_offset'] = $offset;
-				
+
 			if ($secs2cache>0) $rs = $this->CacheExecute($secs2cache, $sql,$inputarr);
 			else $rs = $this->Execute($sql,$inputarr);
 			return $rs;
 		}
-	
 	}
-	
-	/**
-	* Usage:
-	* Store BLOBs and CLOBs
-	*
-	* Example: to store $var in a blob
-	*
-	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
-	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
-	*
-	*  to get length of LOB:
-	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
-	*
-	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
-	* under oracle 8.1.7.0. Run:
-	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-	* before UpdateBlob() then...
-	*/
 
+	/**
+	 * Usage:
+	 * Store BLOBs and CLOBs
+	 *
+	 * Example: to store $var in a blob
+	 *    $conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
+	 *    $conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
+	 *
+	 * $blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
+	 *
+	 * to get length of LOB:
+	 *    select DBMS_LOB.GETLENGTH(ablob) from TABLE
+	 *
+	 * If you are using CURSOR_SHARING = force, it appears this will case a segfault
+	 * under oracle 8.1.7.0. Run:
+	 *    $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+	 * before UpdateBlob() then...
+	 */
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
-		
+
 		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
-		
+
 		switch(strtoupper($blobtype)) {
 		default: ADOConnection::outp("UpdateBlob: Unknown blobtype=$blobtype"); return false;
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
-		
-		if ($this->databaseType == 'oci8po') 
+
+		if ($this->databaseType == 'oci8po')
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
+		else
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
+
 		$desc = oci_new_descriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
 		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
@@ -758,14 +749,14 @@ NATSOFT.DOMAIN =
 		$desc->free();
 		if ($commit) $this->CommitTrans();
 		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
-		
+
 		if ($rez) $rs->Close();
 		return $rez;
 	}
-	
+
 	/**
-	* Usage:  store file pointed to by $val in a blob
-	*/
+	 * Usage:  store file pointed to by $val in a blob
+	 */
 	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		switch(strtoupper($blobtype)) {
@@ -773,55 +764,55 @@ NATSOFT.DOMAIN =
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
-		
-		if ($this->databaseType == 'oci8po') 
+
+		if ($this->databaseType == 'oci8po')
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
+		else
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
+
 		$desc = oci_new_descriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
-		
+
 		$this->BeginTrans();
 		$rs = ADODB_oci8::Execute($sql,$arr);
 		if ($rez = !empty($rs)) $desc->savefile($val);
 		$desc->free();
 		$this->CommitTrans();
-		
+
 		if ($rez) $rs->Close();
 		return $rez;
 	}
 
-		/**
-	 * Execute SQL 
+	/**
+	 * Execute SQL
 	 *
 	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
 	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
 	 * @return 		RecordSet or false
 	 */
-	function Execute($sql,$inputarr=false) 
+	function Execute($sql,$inputarr=false)
 	{
 		if ($this->fnExecute) {
 			$fn = $this->fnExecute;
 			$ret = $fn($this,$sql,$inputarr);
 			if (isset($ret)) return $ret;
 		}
-		if ($inputarr) {
-			#if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
-			$element0 = reset($inputarr); 
+		if ($inputarr !== false) {
+			if (!is_array($inputarr)) $inputarr = array($inputarr);
+
+			$element0 = reset($inputarr);
 			$array2d =  $this->bulkBind && is_array($element0) && !is_object(reset($element0));
-			
+
 			# see http://phplens.com/lens/lensforum/msgs.php?id=18786
 			if ($array2d || !$this->_bindInputArray) {
-			
+
 			# is_object check because oci8 descriptors can be passed in
 			if ($array2d && $this->_bindInputArray) {
 				if (is_string($sql))
 					$stmt = $this->Prepare($sql);
 				else
 					$stmt = $sql;
-					
+
 				foreach($inputarr as $arr) {
 					$ret = $this->_Execute($stmt,$arr);
 					if (!$ret) return $ret;
@@ -834,10 +825,10 @@ NATSOFT.DOMAIN =
 				#var_dump($sqlarr);echo "
    ";var_dump($inputarr);echo"
    ";
 				foreach($sqlarr as $k => $str) {
 						if ($k == 0) { $sql = $str; continue; }
-						// we need $lastnomatch because of the following datetime, 
+						// we need $lastnomatch because of the following datetime,
 						// eg. '10:10:01', which causes code to think that there is bind param :10 and :1
-						$ok = preg_match('/^([0-9]*)/', $str, $arr); 
-			
+						$ok = preg_match('/^([0-9]*)/', $str, $arr);
+
 						if (!$ok) $sql .= $str;
 						else {
 							$at = $arr[1];
@@ -855,31 +846,30 @@ NATSOFT.DOMAIN =
 							} else {
 								$sql .= ':'.$str;
 							}
-							
+
 						}
 					}
 					$inputarr = false;
 				}
 			}
 			$ret = $this->_Execute($sql,$inputarr);
-			
-			
+
+
 		} else {
 			$ret = $this->_Execute($sql,false);
 		}
 
 		return $ret;
 	}
-	
+
 	/*
-		Example of usage:
-		
-		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
+	 * Example of usage:
+	 *    $stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
 	*/
 	function Prepare($sql,$cursor=false)
 	{
 	static $BINDNUM = 0;
-	
+
 		$stmt = oci_parse($this->_connectionID,$sql);
 
 		if (!$stmt) {
@@ -887,40 +877,40 @@ NATSOFT.DOMAIN =
 			$this->_errorCode = false;
 			$arr = @oci_error($this->_connectionID);
 			if ($arr === false) return false;
-		
+
 			$this->_errorMsg = $arr['message'];
 			$this->_errorCode = $arr['code'];
 			return false;
 		}
-		
+
 		$BINDNUM += 1;
-		
+
 		$sttype = @oci_statement_type($stmt);
 		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
 			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? oci_new_cursor($this->_connectionID) : false);
 		}
 		return array($sql,$stmt,0,$BINDNUM);
 	}
-	
+
 	/*
-		Call an oracle stored procedure and returns a cursor variable as a recordset. 
+		Call an oracle stored procedure and returns a cursor variable as a recordset.
 		Concept by Robert Tuttle robert@ud.com
-		
+
 		Example:
 			Note: we return a cursor variable in :RS2
 			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
-			
+
 			$rs = $db->ExecuteCursor(
-				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
+				"BEGIN :RS2 = adodb.getdata(:VAR1); END;",
 				'RS2',
 				array('VAR1' => 'Mr Bean'));
-			
+
 	*/
 	function ExecuteCursor($sql,$cursorName='rs',$params=false)
 	{
 		if (is_array($sql)) $stmt = $sql;
 		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate oci_new_cursor
-	
+
 		if (is_array($stmt) && sizeof($stmt) >= 5) {
 			$hasref = true;
 			$ignoreCur = false;
@@ -932,7 +922,7 @@ NATSOFT.DOMAIN =
 			}
 		} else
 			$hasref = false;
-			
+
 		$rs = $this->Execute($stmt);
 		if ($rs) {
 			if ($rs->databaseType == 'array') oci_free_cursor($stmt[4]);
@@ -940,46 +930,45 @@ NATSOFT.DOMAIN =
 		}
 		return $rs;
 	}
-	
-	/*
-		Bind a variable -- very, very fast for executing repeated statements in oracle. 
-		Better than using
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
-					array($p1,$p2,$p3));
-			}
-		
-		Usage:
-			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
-			$DB->Bind($stmt, $p1);
-			$DB->Bind($stmt, $p2);
-			$DB->Bind($stmt, $p3);
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$DB->Execute($stmt);
-			}
-			
-		Some timings:		
-			** Test table has 3 cols, and 1 index. Test to insert 1000 records
-			Time 0.6081s (1644.60 inserts/sec) with direct oci_parse/oci_execute
-			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
-			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
-			
-		Now if PHP only had batch/bulk updating like Java or PL/SQL...
-	
-		Note that the order of parameters differs from oci_bind_by_name,
-		because we default the names to :0, :1, :2
-	*/
+
+	/**
+	 * Bind a variable -- very, very fast for executing repeated statements in oracle.
+	 *
+	 * Better than using
+	 *    for ($i = 0; $i < $max; $i++) {
+	 *        $p1 = ?; $p2 = ?; $p3 = ?;
+	 *        $this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", array($p1,$p2,$p3));
+	 *    }
+	 *
+	 * Usage:
+	 *    $stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
+	 *    $DB->Bind($stmt, $p1);
+	 *    $DB->Bind($stmt, $p2);
+	 *    $DB->Bind($stmt, $p3);
+	 *    for ($i = 0; $i < $max; $i++) {
+	 *        $p1 = ?; $p2 = ?; $p3 = ?;
+	 *        $DB->Execute($stmt);
+	 *    }
+	 *
+	 * Some timings to insert 1000 records, test table has 3 cols, and 1 index.
+	 * - Time 0.6081s (1644.60 inserts/sec) with direct oci_parse/oci_execute
+	 * - Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
+	 * - Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
+	 *
+	 * Now if PHP only had batch/bulk updating like Java or PL/SQL...
+	 *
+	 * Note that the order of parameters differs from oci_bind_by_name,
+	 * because we default the names to :0, :1, :2
+	 */
 	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
 	{
-		
+
 		if (!is_array($stmt)) return false;
-        
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return oci_bind_by_name($stmt[1],":".$name,$stmt[4],$size,$type);
-        }
-        
+
+		if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) {
+			return oci_bind_by_name($stmt[1],":".$name,$stmt[4],$size,$type);
+		}
+
 		if ($name == false) {
 			if ($type !== false) $rez = oci_bind_by_name($stmt[1],":".$stmt[2],$var,$size,$type);
 			else $rez = oci_bind_by_name($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
@@ -988,17 +977,17 @@ NATSOFT.DOMAIN =
 			if ($this->debug) {
 				ADOConnection::outp("Bind: name = $name");
 			}
-            //we have to create a new Descriptor here
+			//we have to create a new Descriptor here
 			$numlob = count($this->_refLOBs);
-        	$this->_refLOBs[$numlob]['LOB'] = oci_new_descriptor($this->_connectionID, oci_lob_desc($type));
+			$this->_refLOBs[$numlob]['LOB'] = oci_new_descriptor($this->_connectionID, oci_lob_desc($type));
 			$this->_refLOBs[$numlob]['TYPE'] = $isOutput;
-			
+
 			$tmp = $this->_refLOBs[$numlob]['LOB'];
-	        $rez = oci_bind_by_name($stmt[1], ":".$name, $tmp, -1, $type);
+			$rez = oci_bind_by_name($stmt[1], ":".$name, $tmp, -1, $type);
 			if ($this->debug) {
 				ADOConnection::outp("Bind: descriptor has been allocated, var (".$name.") binded");
 			}
-			
+
 			// if type is input then write data to lob now
 			if ($isOutput == false) {
 				$var = $this->BlobEncode($var);
@@ -1012,36 +1001,36 @@ NATSOFT.DOMAIN =
 			}
 			$rez = $tmp;
 		} else {
-			if ($this->debug) 
+			if ($this->debug)
 				ADOConnection::outp("Bind: name = $name");
-			
+
 			if ($type !== false) $rez = oci_bind_by_name($stmt[1],":".$name,$var,$size,$type);
 			else $rez = oci_bind_by_name($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
 		}
-		
+
 		return $rez;
 	}
-	
+
 	function Param($name,$type='C')
 	{
 		return ':'.$name;
 	}
-	
-	/* 
-	Usage:
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group');
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See oci_bind_by_name documentation at php.net.
+
+	/**
+	 * Usage:
+	 *    $stmt = $db->Prepare('select * from table where id =:myid and group=:group');
+	 *    $db->Parameter($stmt,$id,'myid');
+	 *    $db->Parameter($stmt,$group,'group');
+	 *    $db->Execute($stmt);
+	 *
+	 * @param $stmt Statement returned by Prepare() or PrepareSP().
+	 * @param $var PHP variable to bind to
+	 * @param $name Name of stored procedure variable name to bind to.
+	 * @param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
+	 * @param [$maxLen] Holds an maximum length of the variable.
+	 * @param [$type] The data type of $var. Legal values depend on driver.
+	 *
+	 * @link http://php.net/oci_bind_by_name
 	*/
 	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
 	{
@@ -1052,27 +1041,27 @@ NATSOFT.DOMAIN =
 			}
 			return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
 	}
-	
-	/*
-	returns query ID if successful, otherwise false
-	this version supports:
-	
-	   1. $db->execute('select * from table');
-	   
-	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->execute($prepared_statement, array(1,2,3));
-		  
-	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-	   
-	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
-		  $db->execute($stmt);
-	*/ 
+
+	/**
+	 * returns query ID if successful, otherwise false
+	 * this version supports:
+	 *
+	 * 1. $db->execute('select * from table');
+	 *
+	 * 2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+	 *    $db->execute($prepared_statement, array(1,2,3));
+	 *
+	 * 3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
+	 *
+	 * 4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+	 *    $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3);
+	 *    $db->execute($stmt);
+	 */
 	function _query($sql,$inputarr=false)
 	{
 		if (is_array($sql)) { // is prepared sql
 			$stmt = $sql[1];
-			
+
 			// we try to bind to permanent array, so that oci_bind_by_name is persistent
 			// and carried out once only - note that max array element size is 4000 chars
 			if (is_array($inputarr)) {
@@ -1093,12 +1082,12 @@ NATSOFT.DOMAIN =
 		} else {
 			$stmt=oci_parse($this->_connectionID,$sql);
 		}
-			
+
 		$this->_stmt = $stmt;
 		if (!$stmt) return false;
-	
+
 		if (defined('ADODB_PREFETCH_ROWS')) @oci_set_prefetch($stmt,ADODB_PREFETCH_ROWS);
-			
+
 		if (is_array($inputarr)) {
 			foreach($inputarr as $k => $v) {
 				if (is_array($v)) {
@@ -1106,13 +1095,13 @@ NATSOFT.DOMAIN =
 						oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1]);
 					else
 						oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					
+
 					if ($this->debug==99) {
-						if (is_object($v[0])) 
+						if (is_object($v[0]))
 							echo "name=:$k",' len='.$v[1],' type='.$v[2],'
    ';
 						else
 							echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'
    ';
-						
+
 					}
 				} else {
 					$len = -1;
@@ -1125,13 +1114,13 @@ NATSOFT.DOMAIN =
 				}
 			}
 		}
-		
-        $this->_errorMsg = false;
+
+		$this->_errorMsg = false;
 		$this->_errorCode = false;
 		if (oci_execute($stmt,$this->_commit)) {
-			
+
 			if (count($this -> _refLOBs) > 0) {
-		
+
 				foreach ($this -> _refLOBs as $key => $value) {
 					if ($this -> _refLOBs[$key]['TYPE'] == true) {
 						$tmp = $this -> _refLOBs[$key]['LOB'] -> load();
@@ -1141,45 +1130,45 @@ NATSOFT.DOMAIN =
 						//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
 						$this -> _refLOBs[$key]['VAR'] = $tmp;
 					} else {
-                        $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
+						$this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
 						$this -> _refLOBs[$key]['LOB']->free();
 						unset($this -> _refLOBs[$key]);
-                        if ($this->debug) {
+						if ($this->debug) {
 							ADOConnection::outp("IN LOB: LOB has been saved. 
    ");
 						}
-                    }					
+					}
 				}
 			}
-		
-            switch (@oci_statement_type($stmt)) {
-                case "SELECT":
+
+			switch (@oci_statement_type($stmt)) {
+				case "SELECT":
 					return $stmt;
-				
+
 				case 'DECLARE':
-                case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
+				case "BEGIN":
+					if (is_array($sql) && !empty($sql[4])) {
 						$cursor = $sql[4];
 						if (is_resource($cursor)) {
-							$ok = oci_execute($cursor);	
-	                        return $cursor;
+							$ok = oci_execute($cursor);
+							return $cursor;
 						}
 						return $stmt;
-                    } else {
+					} else {
 						if (is_resource($stmt)) {
 							oci_free_statement($stmt);
 							return true;
 						}
-                        return $stmt;
-                    }
-                    break;
-                default :
-					
-                    return true;
-            }
+						return $stmt;
+					}
+					break;
+				default :
+
+					return true;
+			}
 		}
 		return false;
 	}
-	
+
 	// From Oracle Whitepaper: PHP Scalability and High Availability
 	function IsConnectionError($err)
 	{
@@ -1205,12 +1194,12 @@ NATSOFT.DOMAIN =
 		}
 		return false;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
 		if (!$this->_connectionID) return;
-		
+
 		if (!$this->autoCommit) oci_rollback($this->_connectionID);
 		if (count($this->_refLOBs) > 0) {
 			foreach ($this ->_refLOBs as $key => $value) {
@@ -1219,16 +1208,16 @@ NATSOFT.DOMAIN =
 			}
 		}
 		oci_close($this->_connectionID);
-		
+
 		$this->_stmt = false;
 		$this->_connectionID = false;
 	}
-	
+
 	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
 	{
 		if ($internalKey) return array('ROWID');
-		
-	// tested with oracle 8.1.7
+
+		// tested with oracle 8.1.7
 		$table = strtoupper($table);
 		if ($owner) {
 			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
@@ -1246,7 +1235,7 @@ SELECT /*+ RULE */ distinct b.column_name
 	$owner_clause
 	AND (a.constraint_name = b.constraint_name)";
 
- 		$rs = $this->Execute($sql);
+		$rs = $this->Execute($sql);
 		if ($rs && !$rs->EOF) {
 			$arr = $rs->GetArray();
 			$a = array();
@@ -1257,12 +1246,21 @@ SELECT /*+ RULE */ distinct b.column_name
 		}
 		else return false;
 	}
-	
-	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
-	function MetaForeignKeys($table, $owner=false)
+
+	/**
+	 * returns assoc array where keys are tables, and values are foreign keys
+	 *
+	 * @param	str		$table
+	 * @param	str		$owner	[optional][default=NULL]
+	 * @param	bool	$upper	[optional][discarded]
+	 * @return	mixed[]			Array of foreign key information
+	 *
+	 * @link http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
+	 */
+	function MetaForeignKeys($table, $owner=false, $upper=false)
 	{
-	global $ADODB_FETCH_MODE;
-	
+		global $ADODB_FETCH_MODE;
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
@@ -1271,14 +1269,14 @@ SELECT /*+ RULE */ distinct b.column_name
 			$tabp = 'user_';
 		} else
 			$tabp = 'all_';
-			
+
 		$owner = ' and owner='.$this->qstr(strtoupper($owner));
-		
-		$sql = 
-"select constraint_name,r_owner,r_constraint_name 
+
+		$sql =
+"select constraint_name,r_owner,r_constraint_name
 	from {$tabp}constraints
 	where constraint_type = 'R' and table_name = $table $owner";
-		
+
 		$constraints = $this->GetArray($sql);
 		$arr = false;
 		foreach($constraints as $constr) {
@@ -1287,50 +1285,50 @@ SELECT /*+ RULE */ distinct b.column_name
 			$rcons = $this->qstr($constr[2]);
 			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
 			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
-			
-			if ($cols && $tabcol) 
+
+			if ($cols && $tabcol)
 				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
 					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
 				}
 		}
 		$ADODB_FETCH_MODE = $save;
-		
+
 		return $arr;
 	}
 
-	
+
 	function CharMax()
 	{
 		return 4000;
 	}
-	
+
 	function TextMax()
 	{
 		return 4000;
 	}
-	
+
 	/**
 	 * Quotes a string.
 	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
 	 *
-	 * @return  quoted string to be sent back to database
+	 * @param string $s the string to quote
+	 * @param bool $magic_quotes if $s is GET/POST var, set to get_magic_quotes_gpc().
+	 *             This undoes the stupidity of magic quotes for GPC.
+	 *
+	 * @return string quoted string to be sent back to database
 	 */
 	function qstr($s,$magic_quotes=false)
-	{	
+	{
 		//$nofixquotes=false;
-	
+
 		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
-		if (!$magic_quotes) {	
+		if (!$magic_quotes) {
 			if ($this->replaceQuote[0] == '\\'){
 				$s = str_replace('\\','\\\\',$s);
 			}
 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for " unless sybase is on
 		if (!ini_get('magic_quotes_sybase')) {
 			$s = str_replace('\\"','"',$s);
@@ -1340,11 +1338,11 @@ SELECT /*+ RULE */ distinct b.column_name
 			return "'".$s."'";
 		}
 	}
-	
+
 }
 
 /*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
+	Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 class ADORecordset_oci8 extends ADORecordSet {
@@ -1352,12 +1350,12 @@ class ADORecordset_oci8 extends ADORecordSet {
 	var $databaseType = 'oci8';
 	var $bind=false;
 	var $_fieldobjs;
-	
+
 	//var $_arr = false;
-		
+
 	function ADORecordset_oci8($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -1366,11 +1364,11 @@ class ADORecordset_oci8 extends ADORecordSet {
 		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;
-		case ADODB_FETCH_NUM: 
+		case ADODB_FETCH_NUM:
 		default:
 		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		}
-		
+
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;
 	}
@@ -1379,22 +1377,22 @@ class ADORecordset_oci8 extends ADORecordSet {
 	function Init()
 	{
 		if ($this->_inited) return;
-		
+
 		$this->_inited = true;
 		if ($this->_queryID) {
-			
+
 			$this->_currentRow = 0;
 			@$this->_initrs();
 			if ($this->_numOfFields) $this->EOF = !$this->_fetch();
 			else $this->EOF = true;
-			
+
 			/*
 			// based on idea by Gaetano Giunta to detect unusual oracle errors
 			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
 			$err = oci_error($this->_queryID);
 			if ($err && $this->connection->debug) ADOConnection::outp($err);
 			*/
-			
+
 			if (!is_array($this->fields)) {
 				$this->_numOfRows = 0;
 				$this->fields = array();
@@ -1406,7 +1404,7 @@ class ADORecordset_oci8 extends ADORecordSet {
 			$this->EOF = true;
 		}
 	}
-	
+
 	function _initrs()
 	{
 		$this->_numOfRows = -1;
@@ -1418,11 +1416,14 @@ class ADORecordset_oci8 extends ADORecordSet {
 		}
 	}
 
-	  /*		Returns: an object containing field information.
-			  Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			  fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			  fetchField() is retrieved.		*/
-
+	/**
+	 * Get column information in the Recordset object.
+	 * fetchField() can be used in order to obtain information about fields
+	 * in a certain query result. If the field offset isn't specified, the next
+	 * field that wasn't yet retrieved by fetchField() is retrieved
+	 *
+	 * @return object containing field information
+	 */
 	function _FetchField($fieldOffset = -1)
 	{
 		$fld = new ADOFieldObject;
@@ -1430,47 +1431,49 @@ class ADORecordset_oci8 extends ADORecordSet {
 		$fld->name =oci_field_name($this->_queryID, $fieldOffset);
 		$fld->type = oci_field_type($this->_queryID, $fieldOffset);
 		$fld->max_length = oci_field_size($this->_queryID, $fieldOffset);
-	 	switch($fld->type) {
-		case 'NUMBER':
-	 		$p = oci_field_precision($this->_queryID, $fieldOffset);
-			$sc = oci_field_scale($this->_queryID, $fieldOffset);
-			if ($p != 0 && $sc == 0) $fld->type = 'INT';
-			$fld->scale = $p;
-			break;
-		
-	 	case 'CLOB':
-		case 'NCLOB':
-		case 'BLOB': 
-			$fld->max_length = -1;
-			break;
+
+		switch($fld->type) {
+			case 'NUMBER':
+				$p = oci_field_precision($this->_queryID, $fieldOffset);
+				$sc = oci_field_scale($this->_queryID, $fieldOffset);
+				if ($p != 0 && $sc == 0) $fld->type = 'INT';
+				$fld->scale = $p;
+				break;
+
+			case 'CLOB':
+			case 'NCLOB':
+			case 'BLOB':
+				$fld->max_length = -1;
+				break;
 		}
 		return $fld;
 	}
-	
+
 	/* For some reason, oci_field_name fails when called after _initrs() so we cache it */
 	function FetchField($fieldOffset = -1)
 	{
 		return $this->_fieldobjs[$fieldOffset];
 	}
-	
-	
-	/*
+
+
+/*
 	// 10% speedup to move MoveNext to child class
-	function _MoveNext() 
+	function _MoveNext()
 	{
 	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
-		
+
 		if ($this->EOF) return false;
-		
+
 		$this->_currentRow++;
 		if($this->fields = @oci_fetch_array($this->_queryID,$this->fetchMode))
 			return true;
 		$this->EOF = true;
-		
+
 		return false;
-	}	*/
-	
-	
+	}
+*/
+
+
 	function MoveNext()
 	{
 		if ($this->fields = @oci_fetch_array($this->_queryID,$this->fetchMode)) {
@@ -1483,52 +1486,53 @@ class ADORecordset_oci8 extends ADORecordSet {
 		}
 		return false;
 	}
-	
-	/*
+
+/*
 	# does not work as first record is retrieved in _initrs(), so is not included in GetArray()
-	function GetArray($nRows = -1) 
+	function GetArray($nRows = -1)
 	{
 	global $ADODB_OCI8_GETARRAY;
-	
+
 		if (true ||  !empty($ADODB_OCI8_GETARRAY)) {
 			# does not support $ADODB_ANSI_PADDING_OFF
-	
+
 			//OCI_RETURN_NULLS and OCI_RETURN_LOBS is set by oci_fetch_all
 			switch($this->adodbFetchMode) {
 			case ADODB_FETCH_NUM:
-			
+
 				$ncols = @oci_fetch_all($this->_queryID, $results, 0, $nRows, oci_fetch_all_BY_ROW+OCI_NUM);
 				$results = array_merge(array($this->fields),$results);
 				return $results;
-				
-			case ADODB_FETCH_ASSOC: 
+
+			case ADODB_FETCH_ASSOC:
 				if (ADODB_ASSOC_CASE != 2 || $this->databaseType != 'oci8') break;
-				
+
 				$ncols = @oci_fetch_all($this->_queryID, $assoc, 0, $nRows, oci_fetch_all_BY_ROW);
 				$results = array_merge(array($this->fields),$assoc);
 				return $results;
-			
+
 			default:
 				break;
 			}
 		}
-			
+
 		$results = ADORecordSet::GetArray($nRows);
 		return $results;
-		
-	} */
-	
-	/* Optimize SelectLimit() by using oci_fetch() */
-	function GetArrayLimit($nrows,$offset=-1) 
+
+	}
+*/
+
+	// Optimize SelectLimit() by using oci_fetch()
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$arr = $this->GetArray($nrows);
 			return $arr;
 		}
 		$arr = array();
-		for ($i=1; $i < $offset; $i++) 
+		for ($i=1; $i < $offset; $i++)
 			if (!@oci_fetch($this->_queryID)) return $arr;
-			
+
 		if (!$this->fields = @oci_fetch_array($this->_queryID,$this->fetchMode)) return $arr;;
 		$results = array();
 		$cnt = 0;
@@ -1536,12 +1540,12 @@ class ADORecordset_oci8 extends ADORecordSet {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
 
-	
-	/* Use associative array to get fields array */
+
+	// Use associative array to get fields array
 	function Fields($colname)
 	{
 		if (!$this->bind) {
@@ -1551,10 +1555,10 @@ class ADORecordset_oci8 extends ADORecordSet {
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
+
+		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 
 
 	function _seek($row)
@@ -1562,15 +1566,17 @@ class ADORecordset_oci8 extends ADORecordSet {
 		return false;
 	}
 
-	function _fetch() 
+	function _fetch()
 	{
 		return $this->fields = @oci_fetch_array($this->_queryID,$this->fetchMode);
 	}
 
-	/*		close() only needs to be called if you are worried about using too much memory while your script
-			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
-
-	function _close() 
+	/**
+	 * close() only needs to be called if you are worried about using too much
+	 * memory while your script is running. All associated result memory for the
+	 * specified result identifier will automatically be freed.
+	 */
+	function _close()
 	{
 		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
 		if (!empty($this->_refcursor)) {
@@ -1578,59 +1584,69 @@ class ADORecordset_oci8 extends ADORecordSet {
 			$this->_refcursor = false;
 		}
 		@oci_free_statement($this->_queryID);
- 		$this->_queryID = false;
-		
+		$this->_queryID = false;
 	}
 
-	function MetaType($t,$len=-1)
+	/**
+	 * not the fastest implementation - quick and dirty - jlim
+	 * for best performance, use the actual $rs->MetaType().
+	 *
+	 * @param	mixed	$t
+	 * @param	int		$len		[optional] Length of blobsize
+	 * @param	bool	$fieldobj	[optional][discarded]
+	 * @return	str					The metatype of the field
+	 */
+	function MetaType($t, $len=-1, $fieldobj=false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
+
 		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
+		case 'VARCHAR':
+		case 'VARCHAR2':
 		case 'CHAR':
 		case 'VARBINARY':
 		case 'BINARY':
 		case 'NCHAR':
 		case 'NVARCHAR':
 		case 'NVARCHAR2':
-				 if ($len <= $this->blobSize) return 'C';
-		
+			if ($len <= $this->blobSize) return 'C';
+
 		case 'NCLOB':
 		case 'LONG':
 		case 'LONG VARCHAR':
 		case 'CLOB':
 		return 'X';
-		
+
 		case 'LONG RAW':
 		case 'LONG VARBINARY':
 		case 'BLOB':
 			return 'B';
-		
-		case 'DATE': 
+
+		case 'DATE':
 			return  ($this->connection->datetime) ? 'T' : 'D';
-		
-		
+
+
 		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'SMALLINT':
-		case 'INTEGER': 
+		case 'INTEGER':
 			return 'I';
-			
-		default: return 'N';
+
+		default:
+			return 'N';
 		}
 	}
 }
 
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
-	function ADORecordSet_ext_oci8($queryID,$mode=false) 
+class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {
+	function ADORecordSet_ext_oci8($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -1639,16 +1655,15 @@ class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {
 		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;
-		case ADODB_FETCH_NUM: 
+		case ADODB_FETCH_NUM:
 		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;
 	}
-	
+
 	function MoveNext()
 	{
 		return adodb_movenext($this);
 	}
 }
-?>
diff --git a/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php b/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
index ff199370e..7dd5fa617 100644
--- a/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
@@ -1,12 +1,12 @@
 ADODB_oci8();
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		// seems that oracle only supports 1 hint comment in 8i
@@ -33,12 +33,12 @@ class ADODB_oci805 extends ADODB_oci8 {
 			$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
 		else
 			$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		
-		/* 
-			The following is only available from 8.1.5 because order by in inline views not 
+
+		/*
+			The following is only available from 8.1.5 because order by in inline views not
 			available before then...
 			http://www.jlcomp.demon.co.uk/faq/top_sql.html
-		if ($nrows > 0) {	
+		if ($nrows > 0) {
 			if ($offset > 0) $nrows += $offset;
 			$sql = "select * from ($sql) where rownum <= $nrows";
 			$nrows = -1;
@@ -49,11 +49,10 @@ class ADODB_oci805 extends ADODB_oci8 {
 	}
 }
 
-class ADORecordset_oci805 extends ADORecordset_oci8 {	
+class ADORecordset_oci805 extends ADORecordset_oci8 {
 	var $databaseType = "oci805";
 	function ADORecordset_oci805($id,$mode=false)
 	{
 		$this->ADORecordset_oci8($id,$mode);
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php b/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
index a39c0332d..fc3aba570 100644
--- a/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
@@ -1,12 +1,12 @@
 
 
    Should some emulation of RecordCount() be implemented?
-  
+
 */
 
 // security - hide paths
@@ -27,33 +27,33 @@ class ADODB_oci8po extends ADODB_oci8 {
 	var $dataProvider = 'oci8';
 	var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
 	var $metaTablesSQL = "select lower(table_name),table_type from cat where table_type in ('TABLE','VIEW')";
-	
+
 	function ADODB_oci8po()
 	{
 		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
 		# oci8po does not support adodb extension: adodb_movenext()
 	}
-	
+
 	function Param($name,$type='C')
 	{
 		return '?';
 	}
-	
+
 	function Prepare($sql,$cursor=false)
 	{
 		$sqlarr = explode('?',$sql);
 		$sql = $sqlarr[0];
 		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
 			$sql .=  ':'.($i-1) . $sqlarr[$i];
-		} 
+		}
 		return ADODB_oci8::Prepare($sql,$cursor);
 	}
-	
-	function Execute($sql,$inputarr=false) 
+
+	function Execute($sql,$inputarr=false)
 	{
 		return ADOConnection::Execute($sql,$inputarr);
 	}
-	
+
 	// emulate handling of parameters ? ?, replacing with :bind0 :bind1
 	function _query($sql,$inputarr=false)
 	{
@@ -62,7 +62,7 @@ class ADODB_oci8po extends ADODB_oci8 {
 			if (is_array($sql)) {
 				foreach($inputarr as $v) {
 					$arr['bind'.$i++] = $v;
-				} 
+				}
 			} else {
 				$sqlarr = explode('?',$sql);
 				$sql = $sqlarr[0];
@@ -82,7 +82,7 @@ class ADODB_oci8po extends ADODB_oci8 {
 class ADORecordset_oci8po extends ADORecordset_oci8 {
 
 	var $databaseType = 'oci8po';
-	
+
 	function ADORecordset_oci8po($queryID,$mode=false)
 	{
 		$this->ADORecordset_oci8($queryID,$mode);
@@ -91,7 +91,7 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 	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++) {
@@ -101,7 +101,7 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 		}
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	// lowercase field names...
 	function _FetchField($fieldOffset = -1)
 	{
@@ -133,12 +133,12 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 	}*/
 
 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	function MoveNext()
 	{
 		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
 		global $ADODB_ANSI_PADDING_OFF;
 			$this->_currentRow++;
-			
+
 			if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
 			if (!empty($ADODB_ANSI_PADDING_OFF)) {
 				foreach($this->fields as $k => $v) {
@@ -152,16 +152,16 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 			$this->_currentRow++;
 		}
 		return false;
-	}	
-	
+	}
+
 	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$arr = $this->GetArray($nrows);
 			return $arr;
 		}
-		for ($i=1; $i < $offset; $i++) 
+		for ($i=1; $i < $offset; $i++)
 			if (!@OCIFetch($this->_queryID)) {
 				$arr = array();
 				return $arr;
@@ -177,7 +177,7 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
 
@@ -185,10 +185,10 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 	function _updatefields()
 	{
 		if (ADODB_ASSOC_CASE == 2) return; // native
-	
+
 		$arr = array();
 		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
+
 		foreach($this->fields as $k => $v) {
 			if (is_integer($k)) $arr[$k] = $v;
 			else {
@@ -200,13 +200,13 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 		}
 		$this->fields = $arr;
 	}
-	
-	function _fetch() 
+
+	function _fetch()
 	{
 		$ret = @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
 		if ($ret) {
 		global $ADODB_ANSI_PADDING_OFF;
-	
+
 				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
 				if (!empty($ADODB_ANSI_PADDING_OFF)) {
 					foreach($this->fields as $k => $v) {
@@ -216,8 +216,5 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 		}
 		return $ret;
 	}
-	
-}
-
 
-?>
\ No newline at end of file
+}
diff --git a/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php b/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php
new file mode 100644
index 000000000..3029bc710
--- /dev/null
+++ b/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php
@@ -0,0 +1,87 @@
+
+
+   Should some emulation of RecordCount() be implemented?
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
+
+class ADODB_oci8quercus extends ADODB_oci8 {
+	var $databaseType = 'oci8quercus';
+	var $dataProvider = 'oci8';
+
+	function ADODB_oci8quercus()
+	{
+	}
+
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8quercus extends ADORecordset_oci8 {
+
+	var $databaseType = 'oci8quercus';
+
+	function ADORecordset_oci8quercus($queryID,$mode=false)
+	{
+		$this->ADORecordset_oci8($queryID,$mode);
+	}
+
+	function _FetchField($fieldOffset = -1)
+	{
+	global $QUERCUS;
+		$fld = new ADOFieldObject;
+
+		if (!empty($QUERCUS)) {
+			$fld->name = oci_field_name($this->_queryID, $fieldOffset);
+			$fld->type = oci_field_type($this->_queryID, $fieldOffset);
+			$fld->max_length = oci_field_size($this->_queryID, $fieldOffset);
+
+			//if ($fld->name == 'VAL6_NUM_12_4') $fld->type = 'NUMBER';
+			switch($fld->type) {
+				case 'string': $fld->type = 'VARCHAR'; break;
+				case 'real': $fld->type = 'NUMBER'; break;
+			}
+		} else {
+			$fieldOffset += 1;
+			$fld->name = oci_field_name($this->_queryID, $fieldOffset);
+			$fld->type = oci_field_type($this->_queryID, $fieldOffset);
+			$fld->max_length = oci_field_size($this->_queryID, $fieldOffset);
+		}
+	 	switch($fld->type) {
+		case 'NUMBER':
+	 		$p = oci_field_precision($this->_queryID, $fieldOffset);
+			$sc = oci_field_scale($this->_queryID, $fieldOffset);
+			if ($p != 0 && $sc == 0) $fld->type = 'INT';
+			$fld->scale = $p;
+			break;
+
+	 	case 'CLOB':
+		case 'NCLOB':
+		case 'BLOB':
+			$fld->max_length = -1;
+			break;
+		}
+
+		return $fld;
+	}
+
+}
diff --git a/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php b/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
index fb7ea90af..0b271a417 100644
--- a/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
@@ -1,26 +1,26 @@
 _haserrorfunctions = ADODB_PHPVER >= 0x4050;
 		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
 	}
-	
+
 		// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 	global $php_errormsg;
-		
+
 		if (!function_exists('odbc_connect')) return null;
-		
+
 		if (!empty($argDatabasename) && stristr($argDSN, 'Database=') === false) {
 			$argDSN = trim($argDSN);
 			$endDSN = substr($argDSN, strlen($argDSN) - 1);
 			if ($endDSN != ';') $argDSN .= ';';
 			$argDSN .= 'Database='.$argDatabasename;
 		}
-		
+
 		if (isset($php_errormsg)) $php_errormsg = '';
 		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
 		else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
 		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		return $this->_connectionID != false;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 	global $php_errormsg;
-	
+
 		if (!function_exists('odbc_connect')) return null;
-		
+
 		if (isset($php_errormsg)) $php_errormsg = '';
 		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 		if ($this->debug && $argDatabasename) {
@@ -83,27 +83,27 @@ class ADODB_odbc extends ADOConnection {
 	//	print "dsn=$argDSN u=$argUsername p=$argPassword
    "; flush();
 		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
 		else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
-		
+
 		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 		if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		return $this->_connectionID != false;
 	}
 
-	
+
 	function ServerInfo()
 	{
-	
+
 		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
 			$dsn = strtoupper($this->host);
 			$first = true;
 			$found = false;
-			
+
 			if (!function_exists('odbc_data_source')) return false;
-			
+
 			while(true) {
-				
+
 				$rez = @odbc_data_source($this->_connectionID,
 					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
 				$first = false;
@@ -112,7 +112,7 @@ class ADODB_odbc extends ADOConnection {
 					$found = true;
 					break;
 				}
-			} 
+			}
 			if (!$found) return ADOConnection::ServerInfo();
 			if (!isset($rez['version'])) $rez['version'] = '';
 			return $rez;
@@ -121,7 +121,7 @@ class ADODB_odbc extends ADOConnection {
 		}
 	}
 
-	
+
 	function CreateSequence($seqname='adodbseq',$start=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
@@ -130,22 +130,22 @@ class ADODB_odbc extends ADOConnection {
 		$start -= 1;
 		return $this->Execute("insert into $seqname values($start)");
 	}
-	
+
 	var $_dropSeqSQL = 'drop table %s';
 	function DropSequence($seqname)
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 		$MAXLOOPS = 100;
@@ -153,14 +153,14 @@ class ADODB_odbc extends ADOConnection {
 		while (--$MAXLOOPS>=0) {
 			$num = $this->GetOne("select id from $seq");
 			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));
 				$start -= 1;
 				$num = '0';
 				$ok = $this->Execute("insert into $seq values($start)");
 				if (!$ok) return false;
-			} 
+			}
 			$this->Execute("update $seq set id=id+1 where id=$num");
-			
+
 			if ($this->affected_rows() > 0) {
 				$num += 1;
 				$this->genID = $num;
@@ -188,40 +188,40 @@ class ADODB_odbc extends ADOConnection {
 			return @odbc_errormsg($this->_connectionID);
 		} else return ADOConnection::ErrorMsg();
 	}
-	
+
 	function ErrorNo()
 	{
-		
+
 		if ($this->_haserrorfunctions) {
 			if ($this->_errorCode !== false) {
 				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
 				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
 			}
 
-			if (empty($this->_connectionID)) $e = @odbc_error(); 
+			if (empty($this->_connectionID)) $e = @odbc_error();
 			else $e = @odbc_error($this->_connectionID);
-			
+
 			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
 			 // so we check and patch
 			if (strlen($e)<=2) return 0;
 			return $e;
 		} else return ADOConnection::ErrorNo();
 	}
-	
-	
+
+
 
 	function BeginTrans()
-	{	
+	{
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->_autocommit = false;
 		return odbc_autocommit($this->_connectionID,false);
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
@@ -229,21 +229,21 @@ class ADODB_odbc extends ADOConnection {
 		odbc_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
 		$ret = odbc_rollback($this->_connectionID);
 		odbc_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
-	function MetaPrimaryKeys($table)
+
+	function MetaPrimaryKeys($table,$owner=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
@@ -251,17 +251,17 @@ class ADODB_odbc extends ADOConnection {
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = @odbc_primarykeys($this->_connectionID,'',$schema,$table);
-		
+
 		if (!$qid) {
 			$ADODB_FETCH_MODE = $savem;
 			return false;
 		}
 		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return false;
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
+
 		$arr = $rs->GetArray();
 		$rs->Close();
 		//print_r($arr);
@@ -271,39 +271,39 @@ class ADODB_odbc extends ADOConnection {
 		}
 		return $arr2;
 	}
-	
-	
-	
-	function MetaTables($ttype=false)
+
+
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = odbc_tables($this->_connectionID);
-		
+
 		$rs = new ADORecordSet_odbc($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
+
 		$arr = $rs->GetArray();
 		//print_r($arr);
-		
+
 		$rs->Close();
 		$arr2 = array();
-		
+
 		if ($ttype) {
 			$isview = strncmp($ttype,'V',1) === 0;
 		}
 		for ($i=0; $i < sizeof($arr); $i++) {
 			if (!$arr[$i][2]) continue;
 			$type = $arr[$i][3];
-			if ($ttype) { 
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
 				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
@@ -311,7 +311,7 @@ class ADODB_odbc extends ADOConnection {
 		}
 		return $arr2;
 	}
-	
+
 /*
 See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
 / SQL data type codes /
@@ -343,7 +343,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 	function ODBCTypes($t)
 	{
 		switch ((integer)$t) {
-		case 1:	
+		case 1:
 		case 12:
 		case 0:
 		case -95:
@@ -354,52 +354,52 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 			return 'X';
 		case -4: //image
 			return 'B';
-				
-		case 9:	
+
+		case 9:
 		case 91:
 			return 'D';
-		
+
 		case 10:
 		case 11:
 		case 92:
 		case 93:
 			return 'T';
-			
+
 		case 4:
 		case 5:
 		case -6:
 			return 'I';
-			
+
 		case -11: // uniqidentifier
 			return 'R';
 		case -7: //bit
 			return 'L';
-		
+
 		default:
 			return 'N';
 		}
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = 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
 			$qid2 = odbc_tables($this->_connectionID);
-			$rs = new ADORecordSet_odbc($qid2);		
+			$rs = new ADORecordSet_odbc($qid2);
 			$ADODB_FETCH_MODE = $savem;
 			if (!$rs) return false;
 			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 			$rs->_fetch();
-			
+
 			while (!$rs->EOF) {
 				if ($table == strtoupper($rs->fields[2])) {
 					$q = $rs->fields[0];
@@ -409,38 +409,38 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			
+
 			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
 		} */
-		
+
 		switch ($this->databaseType) {
 		case 'access':
 		case 'vfp':
 			$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),'%');
 			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
 			break;
 		}
 		if (empty($qid)) return $false;
-		
+
 		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return $false;
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 		$rs->_fetch();
-		
+
 		$retarr = array();
-		
+
 		/*
 		$rs->fields indices
 		0 TABLE_QUALIFIER
@@ -462,31 +462,31 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 				$fld = new ADOFieldObject();
 				$fld->name = $rs->fields[3];
 				$fld->type = $this->ODBCTypes($rs->fields[4]);
-				
+
 				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
 				// access uses precision to store length for char/varchar
 				if ($fld->type == 'C' or $fld->type == 'X') {
-					if ($this->databaseType == 'access') 
+					if ($this->databaseType == 'access')
 						$fld->max_length = $rs->fields[6];
 					else if ($rs->fields[4] <= -95) // UNICODE
 						$fld->max_length = $rs->fields[7]/2;
 					else
 						$fld->max_length = $rs->fields[7];
-				} else 
+				} else
 					$fld->max_length = $rs->fields[7];
 				$fld->not_null = !empty($rs->fields[10]);
 				$fld->scale = $rs->fields[8];
-				$retarr[strtoupper($fld->name)] = $fld;	
+				$retarr[strtoupper($fld->name)] = $fld;
 			} else if (sizeof($retarr)>0)
 				break;
 			$rs->MoveNext();
 		}
 		$rs->Close(); //-- crashes 4.03pl1 -- why?
-		
+
 		if (empty($retarr)) $retarr = false;
 		return $retarr;
 	}
-	
+
 	function Prepare($sql)
 	{
 		if (! $this->_bindInputArray) return $sql; // no binding
@@ -499,24 +499,24 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 	}
 
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
 	GLOBAL $php_errormsg;
 		if (isset($php_errormsg)) $php_errormsg = '';
 		$this->_error = '';
-		
+
 		if ($inputarr) {
 			if (is_array($sql)) {
 				$stmtid = $sql[1];
 			} else {
 				$stmtid = odbc_prepare($this->_connectionID,$sql);
-	
+
 				if ($stmtid == false) {
 					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 					return false;
 				}
 			}
-			
+
 			if (! odbc_execute($stmtid,$inputarr)) {
 				//@odbc_free_result($stmtid);
 				if ($this->_haserrorfunctions) {
@@ -525,7 +525,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 				}
 				return false;
 			}
-		
+
 		} else if (is_array($sql)) {
 			$stmtid = $sql[1];
 			if (!odbc_execute($stmtid)) {
@@ -538,7 +538,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 			}
 		} else
 			$stmtid = odbc_exec($this->_connectionID,$sql);
-		
+
 		$this->_lastAffectedRows = 0;
 		if ($stmtid) {
 			if (@odbc_num_fields($stmtid) == 0) {
@@ -549,7 +549,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 				odbc_binmode($stmtid,$this->binmode);
 				odbc_longreadlen($stmtid,$this->maxblobsize);
 			}
-			
+
 			if ($this->_haserrorfunctions) {
 				$this->_errorMsg = '';
 				$this->_errorCode = 0;
@@ -568,9 +568,9 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 	/*
 		Insert a null into the blob field of the table first.
 		Then use UpdateBlob to store the blob.
-		
+
 		Usage:
-		 
+
 		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
@@ -578,7 +578,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -591,31 +591,31 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 	{
 		return $this->_lastAffectedRows;
 	}
-	
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_odbc extends ADORecordSet {	
-	
+class ADORecordSet_odbc extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "odbc";		
+	var $databaseType = "odbc";
 	var $dataProvider = "odbc";
 	var $useFetchArray;
 	var $_has_stupid_odbc_fetch_api_change;
-	
+
 	function ADORecordSet_odbc($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $id;
-		
+
 		// the following is required for mysql odbc driver in 4.3.1 -- why?
 		$this->EOF = false;
 		$this->_currentRow = -1;
@@ -624,11 +624,11 @@ class ADORecordSet_odbc extends ADORecordSet {
 
 
 	// returns the field object
-	function FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
-		
+
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$o->name = @odbc_field_name($this->_queryID,$off);
 		$o->type = @odbc_field_type($this->_queryID,$off);
@@ -637,7 +637,7 @@ class ADORecordSet_odbc extends ADORecordSet {
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -652,8 +652,8 @@ class ADORecordSet_odbc extends ADORecordSet {
 
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
-		
+
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
@@ -663,15 +663,15 @@ class ADORecordSet_odbc extends ADORecordSet {
 		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
 		//$this->useFetchArray = $this->connection->useFetchArray;
 		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}	
-	
+	}
+
 	function _seek($row)
 	{
 		return false;
 	}
-	
+
 	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$rs = $this->GetArray($nrows);
@@ -681,48 +681,38 @@ class ADORecordSet_odbc extends ADORecordSet {
 		$this->fetchMode = ADODB_FETCH_NUM;
 		$this->Move($offset);
 		$this->fetchMode = $savem;
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 		}
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
-	function MoveNext() 
+
+
+	function MoveNext()
 	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
+		if ($this->_numOfRows != 0 && !$this->EOF) {
 			$this->_currentRow++;
-			
-			if ($this->_has_stupid_odbc_fetch_api_change)
-				$rez = @odbc_fetch_into($this->_queryID,$this->fields);
-			else {
-				$row = 0;
-				$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
-			}
-			if ($rez) {
-				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-					$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				}
+			if( $this->_fetch() ) {
 				return true;
 			}
 		}
 		$this->fields = false;
 		$this->EOF = true;
 		return false;
-	}	
-	
+	}
+
 	function _fetch()
 	{
-
+		$this->fields = false;
 		if ($this->_has_stupid_odbc_fetch_api_change)
 			$rez = @odbc_fetch_into($this->_queryID,$this->fields);
 		else {
@@ -735,14 +725,12 @@ class ADORecordSet_odbc extends ADORecordSet {
 			}
 			return true;
 		}
-		$this->fields = false;
 		return false;
 	}
-	
-	function _close() 
+
+	function _close()
 	{
-		return @odbc_free_result($this->_queryID);		
+		return @odbc_free_result($this->_queryID);
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php b/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
index b7bfcf716..217ecb3b8 100644
--- a/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
@@ -1,15 +1,15 @@
 Connect($dsn, $userid, $pwd);
 USING CLI INTERFACE
 ===================
 
-I have had reports that the $host and $database params have to be reversed in 
+I have had reports that the $host and $database params have to be reversed in
 Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
 
 > The symptom is that if I change the database engine from postgres or any other to DB2 then the following
-> connection command becomes wrong despite being described this version to be correct in the docs. 
+> connection command becomes wrong despite being described this version to be correct in the docs.
 >
 > $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
 >
-> In case of DB2 I had to swap the first and last arguments in order to connect properly. 
+> In case of DB2 I had to swap the first and last arguments in order to connect properly.
 
 
 System Error 5
@@ -96,12 +96,12 @@ if (!defined('ADODB_ODBC_DB2')){
 define('ADODB_ODBC_DB2',1);
 
 class ADODB_ODBC_DB2 extends ADODB_odbc {
-	var $databaseType = "db2";	
+	var $databaseType = "db2";
 	var $concat_operator = '||';
 	var $sysTime = 'CURRENT TIME';
 	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	// The complete string representation of a timestamp has the form 
+	// The complete string representation of a timestamp has the form
 	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
 	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
 	var $ansiOuter = true;
@@ -109,18 +109,18 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
 	var $_bindInputArray = true;
 	 var $hasInsertID = true;
 	var $rsPrefix = 'ADORecordset_odbc_';
-	
+
 	function ADODB_DB2()
 	{
 		if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
 		$this->ADODB_odbc();
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " COALESCE($field, $ifNull) "; // if DB2 UDB
 	}
-	
+
 	function ServerInfo()
 	{
 		//odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
@@ -128,54 +128,54 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
 		//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
 		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
 	}
-	
+
 	function _insertid()
 	{
 		return $this->GetOne($this->identitySQL);
 	}
-	
+
 	function RowLock($tables,$where,$col='1 as adodbignore')
 	{
 		if ($this->_autocommit) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables where $where for update");
 	}
-	
+
 	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, "", $qschema, $qtable, "");
-		
+
 		$rs = new ADORecordSet_odbc($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
+
 		$arr = $rs->GetArray();
 		//print_r($arr);
-		
+
 		$rs->Close();
 		$arr2 = array();
-		
+
 		if ($ttype) {
 			$isview = strncmp($ttype,'V',1) === 0;
 		}
 		for ($i=0; $i < sizeof($arr); $i++) {
-		
+
 			if (!$arr[$i][2]) continue;
 			if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
-			
+
 			$type = $arr[$i][3];
-			
+
 			if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2];
-			
-			if ($ttype) { 
+
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
 				} else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
@@ -197,11 +197,11 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
 		// get index details
 		$table = strtoupper($table);
 		$SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'";
-        if ($primary) 
+        if ($primary)
 			$SQL.= " AND UNIQUERULE='P'";
 		$rs = $this->Execute($SQL);
         if (!is_object($rs)) {
-			if (isset($savem)) 
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
             return $false;
@@ -216,20 +216,20 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
 			$cols = ltrim($row[2],'+');
 			$indexes[$row[0]]['columns'] = explode('+', $cols);
         }
-		if (isset($savem)) { 
+		if (isset($savem)) {
             $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
         return $indexes;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 	// use right() and replace() ?
 		if (!$col) $col = $this->sysDate;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '||';
@@ -251,7 +251,7 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
 				break;
 			case 'H':
 			case 'h':
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
 				else $s .= "''";
 				break;
 			case 'i':
@@ -275,9 +275,9 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
 			}
 		}
 		return $s;
-	} 
- 
-	
+	}
+
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
 	{
 		$nrows = (integer) $nrows;
@@ -293,17 +293,17 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
 			}
 			$rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
 		}
-		
+
 		return $rs;
 	}
-	
+
 };
- 
 
-class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
-	
-	var $databaseType = "db2";		
-	
+
+class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {
+
+	var $databaseType = "db2";
+
 	function ADORecordSet_db2($id,$mode=false)
 	{
 		$this->ADORecordSet_odbc($id,$mode);
@@ -316,53 +316,52 @@ class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		switch (strtoupper($t)) {
 		case 'VARCHAR':
 		case 'CHAR':
 		case 'CHARACTER':
 		case 'C':
 			if ($len <= $this->blobSize) return 'C';
-		
+
 		case 'LONGCHAR':
 		case 'TEXT':
 		case 'CLOB':
 		case 'DBCLOB': // double-byte
 		case 'X':
 			return 'X';
-		
+
 		case 'BLOB':
 		case 'GRAPHIC':
 		case 'VARGRAPHIC':
 			return 'B';
-			
+
 		case 'DATE':
 		case 'D':
 			return 'D';
-		
+
 		case 'TIME':
 		case 'TIMESTAMP':
 		case 'T':
 			return 'T';
-		
-		//case 'BOOLEAN': 
+
+		//case 'BOOLEAN':
 		//case 'BIT':
 		//	return 'L';
-			
+
 		//case 'COUNTER':
 		//	return 'R';
-			
+
 		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'SMALLINT':
 		case 'I':
 			return 'I';
-			
+
 		default: return 'N';
 		}
 	}
 }
 
 } //define
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php b/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
index 847a6d44e..d6894cdb5 100644
--- a/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
@@ -1,14 +1,14 @@
  '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'))";
 	var $metaColumnsSQL = # xtype==61 is datetime
 	"select c.name,t.name,c.length,c.isnullable, c.status,
 		(case when c.xusertype=61 then 0 else c.xprec end),
-		(case when c.xusertype=61 then 0 else c.xscale end) 
+		(case when c.xusertype=61 then 0 else c.xscale end)
 		from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
 	var $hasTop = 'top';		// support mssql/interbase SELECT TOP 10 * FROM TABLE
 	var $sysDate = 'GetDate()';
@@ -42,13 +42,13 @@ class  ADODB_odbc_mssql extends ADODB_odbc {
 	var $ansiOuter = true; // for mssql7 or later
 	var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
 	var $hasInsertID = true;
-	var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON, 
+	var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON,
 														  # concatenating a null value with a string yields a NULL result
-	
+
 	function ADODB_odbc_mssql()
 	{
 		$this->ADODB_odbc();
-		//$this->curmode = SQL_CUR_USE_ODBC;	
+		//$this->curmode = SQL_CUR_USE_ODBC;
 	}
 
 	// crashes php...
@@ -65,31 +65,31 @@ class  ADODB_odbc_mssql extends ADODB_odbc {
 		return $arr;
 	}
 
-	function IfNull( $field, $ifNull ) 
+	function IfNull( $field, $ifNull )
 	{
 		return " ISNULL($field, $ifNull) "; // if MS SQL Server
 	}
-	
+
 	function _insertid()
 	{
 	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
+	// Returns the last IDENTITY value inserted into an IDENTITY column in
+	// the same scope. A scope is a module -- a stored procedure, trigger,
+	// function, or batch. Thus, two statements are in the same scope if
 	// they are in the same stored procedure, function, or batch.
 			return $this->GetOne($this->identitySQL);
 	}
-	
-	
+
+
 	function MetaForeignKeys($table, $owner=false, $upper=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
+
+		$sql =
 "select object_name(constid) as constraint_name,
 	col_name(fkeyid, fkey) as column_name,
 	object_name(rkeyid) as referenced_table_name,
@@ -97,20 +97,20 @@ class  ADODB_odbc_mssql extends ADODB_odbc {
 from sysforeignkeys
 where upper(object_name(fkeyid)) = $table
 order by constraint_name, referenced_table_name, keyno";
-		
+
 		$constraints = $this->GetArray($sql);
-		
+
 		$ADODB_FETCH_MODE = $save;
-		
+
 		$arr = false;
 		foreach($constraints as $constr) {
 			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3];
 		}
 		if (!$arr) return false;
-		
+
 		$arr2 = false;
-		
+
 		foreach($arr as $k => $v) {
 			foreach($v as $a => $b) {
 				if ($upper) $a = strtoupper($a);
@@ -119,8 +119,8 @@ order by constraint_name, referenced_table_name, keyno";
 		}
 		return $arr2;
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {//$this->debug=1;
 			$save = $this->metaTablesSQL;
@@ -128,13 +128,13 @@ order by constraint_name, referenced_table_name, keyno";
 			$this->metaTablesSQL .= " AND name like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 
@@ -146,30 +146,30 @@ order by constraint_name, referenced_table_name, keyno";
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
+
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
 		if ($schema) {
 			$this->SelectDB($dbName);
 		}
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs)) {
 			$false = false;
 			return $false;
 		}
-			
+
 		$retarr = array();
 		while (!$rs->EOF){
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
-			$fld->type = $rs->fields[1];		
-			
+			$fld->type = $rs->fields[1];
+
 			$fld->not_null = (!$rs->fields[3]);
-			$fld->auto_increment = ($rs->fields[4] == 128);		// sys.syscolumns status field. 0x80 = 128 ref: http://msdn.microsoft.com/en-us/library/ms186816.aspx 
-		
+			$fld->auto_increment = ($rs->fields[4] == 128);		// sys.syscolumns status field. 0x80 = 128 ref: http://msdn.microsoft.com/en-us/library/ms186816.aspx
+
 
 			if (isset($rs->fields[5]) && $rs->fields[5]) {
 				if ($rs->fields[5]>0) $fld->max_length = $rs->fields[5];
@@ -186,22 +186,22 @@ order by constraint_name, referenced_table_name, keyno";
 			}
 				$rs->MoveNext();
 			}
-		
+
 			$rs->Close();
-			return $retarr;	
-			
+			return $retarr;
+
 	}
-	
-	
+
+
 	function MetaIndexes($table,$primary=false, $owner=false)
 	{
 		$table = $this->qstr($table);
 
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
 			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
 			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
 			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
 			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
 			ORDER BY O.name, I.Name, K.keyno";
@@ -212,7 +212,7 @@ order by constraint_name, referenced_table_name, keyno";
         if ($this->fetchMode !== FALSE) {
         	$savem = $this->SetFetchMode(FALSE);
         }
-        
+
         $rs = $this->Execute($sql);
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -226,20 +226,20 @@ order by constraint_name, referenced_table_name, keyno";
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
 			if (!$primary && $row[5]) continue;
-			
+
             $indexes[$row[0]]['unique'] = $row[6];
             $indexes[$row[0]]['columns'][] = $row[1];
     	}
         return $indexes;
 	}
-	
+
 	function _query($sql,$inputarr=false)
 	{
 		if (is_string($sql)) $sql = str_replace('||','+',$sql);
 		return ADODB_odbc::_query($sql,$inputarr);
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -249,33 +249,33 @@ order by constraint_name, referenced_table_name, keyno";
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
+
 	// "Stein-Aksel Basma" 
 	// tested with MSSQL 2000
 	function MetaPrimaryKeys($table)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = '';
 		$this->_findschema($table,$schema);
 		//if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-	
+		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 
+		information_schema.table_constraints tc
 		where tc.constraint_name = k.constraint_name and tc.constraint_type =
 		'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;
 		$false = false;
-		return $false;	  
+		return $false;
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		if ($nrows > 0 && $offset <= 0) {
@@ -284,16 +284,16 @@ order by constraint_name, referenced_table_name, keyno";
 			$rs = $this->Execute($sql,$inputarr);
 		} else
 			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			
+
 		return $rs;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '+';
@@ -320,11 +320,11 @@ order by constraint_name, referenced_table_name, keyno";
 			case 'h':
 				$s .= "substring(convert(char(14),$col,0),13,2)";
 				break;
-			
+
 			case 'H':
 				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
 				break;
-				
+
 			case 'i':
 				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
 				break;
@@ -335,7 +335,7 @@ order by constraint_name, referenced_table_name, keyno";
 			case 'A':
 				$s .= "substring(convert(char(19),$col,0),18,2)";
 				break;
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -348,15 +348,14 @@ order by constraint_name, referenced_table_name, keyno";
 		return $s;
 	}
 
-} 
- 
-class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
-	
+}
+
+class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {
+
 	var $databaseType = 'odbc_mssql';
-	
+
 	function ADORecordSet_odbc_mssql($id,$mode=false)
 	{
 		return $this->ADORecordSet_odbc($id,$mode);
-	}	
+	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php b/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
index b0fa8c356..222e7726d 100644
--- a/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
@@ -1,14 +1,14 @@
 ADODB_odbc();
 	}
-		
-	function MetaTables() 
+
+	function MetaTables()
 	{
 		$false = false;
 		$rs = $this->Execute($this->metaTablesSQL);
@@ -49,13 +49,13 @@ class  ADODB_odbc_oracle extends ADODB_odbc {
 		$rs->Close();
 		return $arr2;
 	}
-	
-	function MetaColumns($table, $normalize=true) 
+
+	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		if ($rs === false) {	
+		if ($rs === false) {
 			$false = false;
 			return $false;
 		}
@@ -65,26 +65,26 @@ class  ADODB_odbc_oracle extends ADODB_odbc {
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
-			
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		return $retarr;	
+		return $retarr;
 	}
 
 	// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 	global $php_errormsg;
-	
+
 		$php_errormsg = '';
 		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
 		$this->_errorMsg = $php_errormsg;
-		
+
 		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
 		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
 		return $this->_connectionID != false;
@@ -96,20 +96,19 @@ class  ADODB_odbc_oracle extends ADODB_odbc {
 		$php_errormsg = '';
 		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
 		$this->_errorMsg = $php_errormsg;
-		
+
 		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
 		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
 		return $this->_connectionID != false;
 	}
-} 
- 
-class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
-	
+}
+
+class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {
+
 	var $databaseType = 'odbc_oracle';
-	
+
 	function ADORecordSet_odbc_oracle($id,$mode=false)
 	{
 		return $this->ADORecordSet_odbc($id,$mode);
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php b/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
index 931d4b10b..2209b6c1d 100644
--- a/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
@@ -1,6 +1,6 @@
 fmtDate,$d);
-		return "convert(date, $d, 120)"; 
+		return "convert(date, $d, 120)";
 	}
-	
+
 	function DBTimeStamp($d,$isfld=false)
 	{
 		if (empty($d) && $d !== 0) return 'null';
 		if ($isfld) return "convert(datetime, $d, 120)";
-		
+
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
 		$d = adodb_date($this->fmtDate,$d);
-		return "convert(datetime, $d, 120)"; 
+		return "convert(datetime, $d, 120)";
 	}
 */
-	
+
 	function _insertid()
 	{
 	// SCOPE_IDENTITY()
@@ -180,9 +180,9 @@ class ADODB_odbtp extends ADOConnection{
 			$this->_errorMsg = $this->ErrorMsg() ;
 			return false;
 		}
-		
+
 		odbtp_convert_datetime($this->_connectionID,true);
-		
+
 		if ($this->_dontPoolDBC) {
 			if (function_exists('odbtp_dont_pool_dbc'))
 				@odbtp_dont_pool_dbc($this->_connectionID);
@@ -193,7 +193,7 @@ class ADODB_odbtp extends ADOConnection{
 		$this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, $this->_connectionID);
 		$dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, $this->_connectionID));
 		$this->odbc_name = $dbms;
-		
+
 		// Account for inconsistent DBMS names
 		if( $this->odbc_driver == ODB_DRIVER_ORACLE )
 			$dbms = 'oracle';
@@ -298,7 +298,7 @@ class ADODB_odbtp extends ADOConnection{
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		return true;
 	}
-	
+
 	function MetaTables($ttype='',$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
@@ -306,9 +306,9 @@ class ADODB_odbtp extends ADOConnection{
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
+
 		$arr = $this->GetArray("||SQLTables||||$ttype");
-		
+
 		if (isset($savefm)) $this->SetFetchMode($savefm);
 		$ADODB_FETCH_MODE = $savem;
 
@@ -320,7 +320,7 @@ class ADODB_odbtp extends ADOConnection{
 		}
 		return $arr2;
 	}
-	
+
 	function MetaColumns($table,$upper=true)
 	{
 	global $ADODB_FETCH_MODE;
@@ -332,9 +332,9 @@ class ADODB_odbtp extends ADOConnection{
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute( "||SQLColumns||$schema|$table" );
-		
+
 		if (isset($savefm)) $this->SetFetchMode($savefm);
 		$ADODB_FETCH_MODE = $savem;
 
@@ -402,7 +402,7 @@ class ADODB_odbtp extends ADOConnection{
 			$false = false;
 			return $false;
 		}
-		
+
 		$arr2 = array();
 
 		foreach($arr as $k => $v) {
@@ -463,10 +463,10 @@ class ADODB_odbtp extends ADOConnection{
 	function Prepare($sql)
 	{
 		if (! $this->_bindInputArray) return $sql; // no binding
-		
+
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
 		$stmt = @odbtp_prepare($sql,$this->_connectionID);
 		if (!$stmt) {
 		//	print "Prepare Error for ($sql) ".$this->ErrorMsg()."
    ";
@@ -481,7 +481,7 @@ class ADODB_odbtp extends ADOConnection{
 
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
 		$stmt = @odbtp_prepare_proc($sql,$this->_connectionID);
 		if (!$stmt) return false;
 		return array($sql,$stmt);
@@ -553,16 +553,16 @@ class ADODB_odbtp extends ADOConnection{
 				return array();
 		}
 	}
-	
+
 	function MetaIndexes_mssql($table,$primary=false, $owner = false)
 	{
 		$table = strtolower($this->qstr($table));
 
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
 			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
 			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
 			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
 			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND lower(O.Name) = $table
 			ORDER BY O.name, I.Name, K.keyno";
@@ -573,7 +573,7 @@ class ADODB_odbtp extends ADOConnection{
         if ($this->fetchMode !== FALSE) {
         	$savem = $this->SetFetchMode(FALSE);
         }
-        
+
         $rs = $this->Execute($sql);
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -587,13 +587,13 @@ class ADODB_odbtp extends ADOConnection{
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
 			if ($primary && !$row[5]) continue;
-			
+
             $indexes[$row[0]]['unique'] = $row[6];
             $indexes[$row[0]]['columns'][] = $row[1];
     	}
         return $indexes;
 	}
-	
+
 	function IfNull( $field, $ifNull )
 	{
 		switch( $this->odbc_driver ) {
@@ -608,10 +608,10 @@ class ADODB_odbtp extends ADOConnection{
 	function _query($sql,$inputarr=false)
 	{
 	global $php_errormsg;
-	
+
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
  		if ($inputarr) {
 			if (is_array($sql)) {
 				$stmtid = $sql[1];
@@ -628,7 +628,7 @@ class ADODB_odbtp extends ADOConnection{
 				@odbtp_input( $stmtid, $param );
 				@odbtp_set( $stmtid, $param, $inputarr[$param-1] );
 			}*/
-			
+
 			$param = 1;
 			foreach($inputarr as $v) {
 				@odbtp_input( $stmtid, $param );
@@ -636,7 +636,7 @@ class ADODB_odbtp extends ADOConnection{
 				$param += 1;
 				if ($param > $num_params) break;
 			}
-			
+
 			if (!@odbtp_execute($stmtid) ) {
 				return false;
 			}
@@ -836,4 +836,3 @@ class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
 		return $this->ADORecordSet_odbtp($id,$mode);
 	}
 }
-?>
diff --git a/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php b/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
index 51128f099..0db44086e 100644
--- a/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
@@ -1,6 +1,6 @@
 ADODB_odbtp();
 	}
 }
-?>
diff --git a/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php b/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
index dca50d687..a92d84ea1 100644
--- a/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
@@ -1,14 +1,14 @@
 fmtDate,$d);
 		return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
 	}
-	
+
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts)
 	{
@@ -49,43 +49,43 @@ class ADODB_oracle extends ADOConnection {
 		else $ds = adodb_date($this->fmtTimeStamp,$ts);
 		return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
-	
-	
+
+
 	function BindDate($d)
 	{
 		$d = ADOConnection::DBDate($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
+
 	function BindTimeStamp($d)
 	{
 		$d = ADOConnection::DBTimeStamp($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
 
-	
+
+
 	function BeginTrans()
-	{	  
+	{
 		 $this->autoCommit = false;
 		 ora_commitoff($this->_connectionID);
 		 return true;
 	}
 
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		   if (!$ok) return $this->RollbackTrans();
 		   $ret = ora_commit($this->_connectionID);
 		   ora_commiton($this->_connectionID);
 		   return $ret;
 	}
 
-	
+
 	function RollbackTrans()
 	{
 		$ret = ora_rollback($this->_connectionID);
@@ -95,8 +95,8 @@ class ADODB_oracle extends ADOConnection {
 
 
 	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
-	function ErrorMsg() 
- 	{   
+	function ErrorMsg()
+ 	{
         if ($this->_errorMsg !== false) return $this->_errorMsg;
 
         if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
@@ -104,8 +104,8 @@ class ADODB_oracle extends ADOConnection {
 		return $this->_errorMsg;
 	}
 
- 
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_errorCode !== false) return $this->_errorCode;
 
@@ -114,17 +114,17 @@ class ADODB_oracle extends ADOConnection {
         return $this->_errorCode;
 	}
 
-	
+
 
 		// returns true or false
 		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
 		{
 			if (!function_exists('ora_plogon')) return null;
-				
+
             //  Reset error messages before connecting
             $this->_errorMsg = false;
 		    $this->_errorCode = false;
-        
+
             // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
             // the oracle home to the host name of remote DB?
 //			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
@@ -184,7 +184,7 @@ class ADODB_oracle extends ADOConnection {
 		    $this->_errorCode = false;
 
 			$curs = ora_open($this->_connectionID);
-		 
+
 		 	if ($curs === false) return false;
 			$this->_curs = $curs;
 			if (!ora_parse($curs,$sql)) return false;
@@ -193,7 +193,7 @@ class ADODB_oracle extends ADOConnection {
             // that we can obtain ONLY from the cursor (and not from the connection)
             $this->_errorCode = @ora_errorcode($curs);
             $this->_errorMsg = @ora_error($curs);
-            //             
+            // 
 		 	@ora_close($curs);
 			return false;
 		}
@@ -221,15 +221,15 @@ class ADORecordset_oracle extends ADORecordSet {
 
 	function ADORecordset_oracle($queryID,$mode=false)
 	{
-		
-		if ($mode === false) { 
+
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $queryID;
-	
+
 		$this->_inited = true;
 		$this->fields = array();
 		if ($queryID) {
@@ -241,7 +241,7 @@ class ADORecordset_oracle extends ADORecordSet {
 			$this->_numOfFields = 0;
 			$this->EOF = true;
 		}
-		
+
 		return $this->_queryID;
 	}
 
@@ -271,10 +271,10 @@ class ADORecordset_oracle extends ADORecordSet {
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
    function _initrs()
    {
 		   $this->_numOfRows = -1;
@@ -291,14 +291,14 @@ class ADORecordset_oracle extends ADORecordSet {
 // should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
 		if ($this->fetchMode & ADODB_FETCH_ASSOC)
 			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
-   		else 
+   		else
 			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
    }
 
    /*		close() only needs to be called if you are worried about using too much memory while your script
 		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
 
-   function _close() 
+   function _close()
 {
 		   return @ora_close($this->_queryID);
    }
@@ -310,7 +310,7 @@ class ADORecordset_oracle extends ADORecordSet {
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		switch (strtoupper($t)) {
 		case 'VARCHAR':
 		case 'VARCHAR2':
@@ -326,17 +326,16 @@ class ADORecordset_oracle extends ADORecordSet {
 		case 'LONG VARBINARY':
 		case 'BLOB':
 				return 'B';
-		
+
 		case 'DATE': return 'D';
-		
+
 		//case 'T': return 'T';
-		
+
 		case 'BIT': return 'L';
-		case 'INT': 
+		case 'INT':
 		case 'SMALLINT':
 		case 'INTEGER': return 'I';
 		default: return 'N';
 		}
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php b/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
index 5100db194..4ac616440 100644
--- a/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
@@ -1,16 +1,16 @@
 _driver;
@@ -101,7 +101,7 @@ class ADODB_pdo extends ADOConnection {
 		$this->random = $d->random;
 		$this->concat_operator = $d->concat_operator;
 		$this->nameQuote = $d->nameQuote;
-				
+
 		$this->hasGenID = $d->hasGenID;
 		$this->_genIDSQL = $d->_genIDSQL;
 		$this->_genSeqSQL = $d->_genSeqSQL;
@@ -109,18 +109,18 @@ class ADODB_pdo extends ADOConnection {
 
 		$d->_init($this);
 	}
-	
+
 	function Time()
 	{
 		if (!empty($this->_driver->_hasdual)) $sql = "select $this->sysTimeStamp from dual";
 		else $sql = "select $this->sysTimeStamp";
-		
+
 		$rs = $this->_Execute($sql);
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
 		return false;
 	}
-	
+
 	// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist=false)
 	{
@@ -139,7 +139,7 @@ class ADODB_pdo extends ADOConnection {
 			$this->_errormsg = 'Connection attempt failed: '.$e->getMessage();
 			return false;
 		}
-		
+
 		if ($this->_connectionID) {
 			switch(ADODB_ASSOC_CASE){
 			case 0: $m = PDO::CASE_LOWER; break;
@@ -147,10 +147,10 @@ class ADODB_pdo extends ADOConnection {
 			default:
 			case 2: $m = PDO::CASE_NATURAL; break;
 			}
-			
+
 			//$this->_connectionID->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_SILENT );
 			$this->_connectionID->setAttribute(PDO::ATTR_CASE,$m);
-			
+
 			$class = 'ADODB_pdo_'.$this->dsnType;
 			//$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
 			switch($this->dsnType) {
@@ -166,7 +166,7 @@ class ADODB_pdo extends ADOConnection {
 				$this->_driver = new $class();
 			else
 				$this->_driver = new ADODB_pdo_base();
-			
+
 			$this->_driver->_connectionID = $this->_connectionID;
 			$this->_UpdatePDO();
 			return true;
@@ -174,27 +174,28 @@ class ADODB_pdo extends ADOConnection {
 		$this->_driver = new ADODB_pdo_base();
 		return false;
 	}
-	
-	function Concat() 
+
+	function Concat()
 	{
 		$args = func_get_args();
-		if(method_exists($this->_driver, 'Concat')) 
-			return call_user_func_array(array($this->_driver, 'Concat'), $args); 
-		
-		return call_user_func_array(array($this,'parent::Concat'), $args); 
+		if(method_exists($this->_driver, 'Concat'))
+			return call_user_func_array(array($this->_driver, 'Concat'), $args);
+
+		if (PHP_VERSION >= 5.3) return call_user_func_array('parent::Concat', $args);
+		return call_user_func_array(array($this,'parent::Concat'), $args);
 	}
-	
+
 	// returns true or false
 	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argDSN, $argUsername, $argPassword, $argDatabasename, true);
 	}
-	
+
 	/*------------------------------------------------------------------------------*/
-	
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{	
+
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
 		$save = $this->_driver->fetchMode;
 		$this->_driver->fetchMode = $this->fetchMode;
 	 	$this->_driver->debug = $this->debug;
@@ -202,50 +203,50 @@ class ADODB_pdo extends ADOConnection {
 		$this->_driver->fetchMode = $save;
 		return $ret;
 	}
-	
-	
+
+
 	function ServerInfo()
 	{
 		return $this->_driver->ServerInfo();
 	}
-	
+
 	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		return $this->_driver->MetaTables($ttype,$showSchema,$mask);
 	}
-	
+
 	function MetaColumns($table,$normalize=true)
 	{
 		return $this->_driver->MetaColumns($table,$normalize);
 	}
-	
+
 	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 	{
 		$obj = $stmt[1];
 		if ($type) $obj->bindParam($name,$var,$type,$maxLen);
 		else $obj->bindParam($name, $var);
 	}
-	
+
 	function OffsetDate($dayFraction,$date=false)
-    {   
+    {
         return $this->_driver->OffsetDate($dayFraction,$date);
     }
-	
+
 	function ErrorMsg()
 	{
 		if ($this->_errormsg !== false) return $this->_errormsg;
 		if (!empty($this->_stmt)) $arr = $this->_stmt->errorInfo();
 		else if (!empty($this->_connectionID)) $arr = $this->_connectionID->errorInfo();
 		else return 'No Connection Established';
-		
-		
+
+
 		if ($arr) {
 		 	if (sizeof($arr)<2) return '';
 			if ((integer)$arr[0]) return $arr[2];
 			else return '';
 		} else return '-1';
 	}
-	
+
 
 	function ErrorNo()
 	{
@@ -257,71 +258,71 @@ class ADODB_pdo extends ADOConnection {
 			else $err = -1;
 		} else
 			return 0;
-			
+
 		if ($err == '00000') return 0; // allows empty check
 		return $err;
 	}
 
-	function SetTransactionMode($transaction_mode) 
+	function SetTransactionMode($transaction_mode)
 	{
-		if(method_exists($this->_driver, 'SetTransactionMode')) 
-			return $this->_driver->SetTransactionMode($transaction_mode); 
-		
-		return parent::SetTransactionMode($seqname); 
+		if(method_exists($this->_driver, 'SetTransactionMode'))
+			return $this->_driver->SetTransactionMode($transaction_mode);
+
+		return parent::SetTransactionMode($seqname);
 	}
 
 	function BeginTrans()
-	{	
-		if(method_exists($this->_driver, 'BeginTrans')) 
-			return $this->_driver->BeginTrans(); 
-		
+	{
+		if(method_exists($this->_driver, 'BeginTrans'))
+			return $this->_driver->BeginTrans();
+
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->_autocommit = false;
 		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,false);
 		return $this->_connectionID->beginTransaction();
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if(method_exists($this->_driver, 'CommitTrans')) 
-			return $this->_driver->CommitTrans($ok); 
-		
+
+	function CommitTrans($ok=true)
+	{
+		if(method_exists($this->_driver, 'CommitTrans'))
+			return $this->_driver->CommitTrans($ok);
+
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
-		
+
 		$ret = $this->_connectionID->commit();
 		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if(method_exists($this->_driver, 'RollbackTrans')) 
-			return $this->_driver->RollbackTrans(); 
-		
+		if(method_exists($this->_driver, 'RollbackTrans'))
+			return $this->_driver->RollbackTrans();
+
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
-		
+
 		$ret = $this->_connectionID->rollback();
 		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
 		return $ret;
 	}
-	
+
 	function Prepare($sql)
 	{
 		$this->_stmt = $this->_connectionID->prepare($sql);
 		if ($this->_stmt) return array($sql,$this->_stmt);
-		
+
 		return false;
 	}
-	
+
 	function PrepareStmt($sql)
 	{
 		$stmt = $this->_connectionID->prepare($sql);
@@ -329,34 +330,34 @@ class ADODB_pdo extends ADOConnection {
 		$obj = new ADOPDOStatement($stmt,$this);
 		return $obj;
 	}
-	
+
 	function CreateSequence($seqname='adodbseq',$startID=1)
 	{
-		if(method_exists($this->_driver, 'CreateSequence')) 
-			return $this->_driver->CreateSequence($seqname, $startID); 
-		
-		return parent::CreateSequence($seqname, $startID); 
+		if(method_exists($this->_driver, 'CreateSequence'))
+			return $this->_driver->CreateSequence($seqname, $startID);
+
+		return parent::CreateSequence($seqname, $startID);
 	}
-	
+
 	function DropSequence($seqname='adodbseq')
 	{
-		if(method_exists($this->_driver, 'DropSequence')) 
-			return $this->_driver->DropSequence($seqname); 
-		
-		return parent::DropSequence($seqname); 
+		if(method_exists($this->_driver, 'DropSequence'))
+			return $this->_driver->DropSequence($seqname);
+
+		return parent::DropSequence($seqname);
 	}
 
 	function GenID($seqname='adodbseq',$startID=1)
 	{
-		if(method_exists($this->_driver, 'GenID')) 
-			return $this->_driver->GenID($seqname, $startID); 
-		
-		return parent::GenID($seqname, $startID); 
+		if(method_exists($this->_driver, 'GenID'))
+			return $this->_driver->GenID($seqname, $startID);
+
+		return parent::GenID($seqname, $startID);
 	}
 
-	
+
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
 		if (is_array($sql)) {
 			$stmt = $sql[1];
@@ -369,19 +370,19 @@ class ADODB_pdo extends ADOConnection {
 			$this->_driver->debug = $this->debug;
 			if ($inputarr) $ok = $stmt->execute($inputarr);
 			else $ok = $stmt->execute();
-		} 
-		
-		
+		}
+
+
 		$this->_errormsg = false;
 		$this->_errorno = false;
-			
+
 		if ($ok) {
 			$this->_stmt = $stmt;
 			return $stmt;
 		}
-		
+
 		if ($stmt) {
-			
+
 			$arr = $stmt->errorinfo();
 			if ((integer)$arr[1]) {
 				$this->_errormsg = $arr[2];
@@ -406,7 +407,7 @@ class ADODB_pdo extends ADOConnection {
 	{
 		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
 	}
-	
+
 	function _insertid()
 	{
 		return ($this->_connectionID) ? $this->_connectionID->lastInsertId() : 0;
@@ -417,30 +418,30 @@ class ADODB_pdo_base extends ADODB_pdo {
 
 	var $sysDate = "'?'";
 	var $sysTimeStamp = "'?'";
-	
+
 
 	function _init($parentDriver)
 	{
 		$parentDriver->_bindInputArray = true;
 		#$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
 	}
-	
+
 	function ServerInfo()
 	{
 		return ADOConnection::ServerInfo();
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
-	
+
 	function MetaTables()
 	{
 		return false;
 	}
-	
+
 	function MetaColumns()
 	{
 		return false;
@@ -449,17 +450,17 @@ class ADODB_pdo_base extends ADODB_pdo {
 
 class ADOPDOStatement {
 
-	var $databaseType = "pdo";		
+	var $databaseType = "pdo";
 	var $dataProvider = "pdo";
 	var $_stmt;
 	var $_connectionID;
-	
+
 	function ADOPDOStatement($stmt,$connection)
 	{
 		$this->_stmt = $stmt;
 		$this->_connectionID = $connection;
 	}
-	
+
 	function Execute($inputArr=false)
 	{
 		$savestmt = $this->_connectionID->_stmt;
@@ -467,19 +468,19 @@ class ADOPDOStatement {
 		$this->_connectionID->_stmt = $savestmt;
 		return $rs;
 	}
-	
+
 	function InParameter(&$var,$name,$maxLen=4000,$type=false)
 	{
 
 		if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
 		else $this->_stmt->bindParam($name, $var);
 	}
-	
+
 	function Affected_Rows()
 	{
 		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
 	}
-	
+
 	function ErrorMsg()
 	{
 		if ($this->_stmt) $arr = $this->_stmt->errorInfo();
@@ -490,12 +491,12 @@ class ADOPDOStatement {
 			else return '';
 		} else return '-1';
 	}
-	
+
 	function NumCols()
 	{
 		return ($this->_stmt) ? $this->_stmt->columnCount() : 0;
 	}
-	
+
 	function ErrorNo()
 	{
 		if ($this->_stmt) return $this->_stmt->errorCode();
@@ -507,15 +508,15 @@ class ADOPDOStatement {
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_pdo extends ADORecordSet {	
-	
+class ADORecordSet_pdo extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "pdo";		
+	var $databaseType = "pdo";
 	var $dataProvider = "pdo";
-	
+
 	function ADORecordSet_pdo($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -523,17 +524,17 @@ class ADORecordSet_pdo extends ADORecordSet {
 		switch($mode) {
 		case ADODB_FETCH_NUM: $mode = PDO::FETCH_NUM; break;
 		case ADODB_FETCH_ASSOC:  $mode = PDO::FETCH_ASSOC; break;
-		
-		case ADODB_FETCH_BOTH: 
+
+		case ADODB_FETCH_BOTH:
 		default: $mode = PDO::FETCH_BOTH; break;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $id;
 		$this->ADORecordSet($id);
 	}
 
-	
+
 	function Init()
 	{
 		if ($this->_inited) return;
@@ -552,21 +553,21 @@ class ADORecordSet_pdo extends ADORecordSet {
 			$this->EOF = true;
 		}
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		$this->_numOfRows = ($ADODB_COUNTRECS) ? @$this->_queryID->rowCount() : -1;
 		if (!$this->_numOfRows) $this->_numOfRows = -1;
 		$this->_numOfFields = $this->_queryID->columnCount();
 	}
 
 	// returns the field object
-	function FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
 		if (!$arr) {
@@ -583,34 +584,34 @@ class ADORecordSet_pdo extends ADORecordSet {
 		else $o->type = adodb_pdo_type($arr['pdo_type']);
 		$o->max_length = $arr['len'];
 		$o->precision = $arr['precision'];
-		
+
 		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;
 	}
-	
+
 	function _seek($row)
 	{
 		return false;
 	}
-	
+
 	function _fetch()
 	{
 		if (!$this->_queryID) return false;
-		
+
 		$this->fields = $this->_queryID->fetch($this->fetchMode);
 		return !empty($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 		$this->_queryID = false;
 	}
-	
+
 	function Fields($colname)
 	{
 		if ($this->adodbFetchMode != ADODB_FETCH_NUM) return @$this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -622,5 +623,3 @@ class ADORecordSet_pdo extends ADORecordSet {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php b/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
index 06867ebf6..0b1ba8b2c 100644
--- a/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
@@ -2,41 +2,41 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
   Set tabs to 8.
- 
-*/ 
+
+*/
 
 class ADODB_pdo_mssql extends ADODB_pdo {
-	
+
 	var $hasTop = 'top';
 	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
 	var $sysTimeStamp = 'GetDate()';
-	
-	
+
+
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO mssql driver
 		$parentDriver->_bindInputArray = false;
 		$parentDriver->hasInsertID = true;
 	}
-	
+
 	function ServerInfo()
 	{
 		return ADOConnection::ServerInfo();
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -46,16 +46,15 @@ class ADODB_pdo_mssql extends ADODB_pdo {
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		return false;
 	}
-	
+
 	function MetaColumns($table,$normalize=true)
 	{
 		return false;
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php b/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
index 187f97867..524d1492e 100644
--- a/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
@@ -2,16 +2,16 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
   Set tabs to 8.
- 
-*/ 
+
+*/
 
 class ADODB_pdo_mysql extends ADODB_pdo {
-	var $metaTablesSQL = "SHOW TABLES";	
+	var $metaTablesSQL = "SHOW TABLES";
 	var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
 	var $sysDate = 'CURDATE()';
 	var $sysTimeStamp = 'NOW()';
@@ -23,59 +23,59 @@ class ADODB_pdo_mysql extends ADODB_pdo {
 
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false;
 		#$parentDriver->_bindInputArray = false;
 		$parentDriver->hasInsertID = true;
 		$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
 	}
-	
+
 		// dayFraction is a day in floating point
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
-		
+
 		$fraction = $dayFraction * 24 * 3600;
 		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
+
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
-	
-	function Concat() 
-	{	
+
+	function Concat()
+	{
 		$s = "";
 		$arr = func_get_args();
 
 		// suggestion by andrew005#mnogo.ru
 		$s = implode(',',$arr);
-		if (strlen($s) > 0) return "CONCAT($s)"; return ''; 
+		if (strlen($s) > 0) return "CONCAT($s)"; return '';
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
 			$this->metaTablesSQL .= " from $showSchema";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
 			$this->metaTablesSQL .= " like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -85,7 +85,7 @@ class ADODB_pdo_mysql extends ADODB_pdo {
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
-	
+
  	function MetaColumns($table,$normalize=true)
 	{
 		$this->_findschema($table,$schema);
@@ -96,27 +96,27 @@ class ADODB_pdo_mysql extends ADODB_pdo {
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
+
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
 		if ($schema) {
 			$this->SelectDB($dbName);
 		}
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs)) {
 			$false = false;
 			return $false;
 		}
-			
+
 		$retarr = array();
 		while (!$rs->EOF){
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -141,7 +141,7 @@ class ADODB_pdo_mysql extends ADODB_pdo {
 			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
 			$fld->binary = (strpos($type,'blob') !== false);
 			$fld->unsigned = (strpos($type,'unsigned') !== false);
-				
+
 			if (!$fld->binary) {
 				$d = $rs->fields[4];
 				if ($d != '' && $d != 'NULL') {
@@ -151,7 +151,7 @@ class ADODB_pdo_mysql extends ADODB_pdo {
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
@@ -159,19 +159,19 @@ class ADODB_pdo_mysql extends ADODB_pdo {
 			}
 				$rs->MoveNext();
 			}
-		
+
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 	}
-		
-	
+
+
 	// parameters use PostgreSQL convention, not MySQL
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
 	{
 		$offsetStr =($offset>=0) ? "$offset," : '';
 		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
+		if ($nrows < 0) $nrows = '18446744073709551615';
+
 		if ($secs)
 			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
 		else
@@ -179,4 +179,3 @@ class ADODB_pdo_mysql extends ADODB_pdo {
 		return $rs;
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php b/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
index aeb36bb66..2ff56f52a 100644
--- a/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
@@ -2,13 +2,13 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
   Set tabs to 8.
- 
-*/ 
+
+*/
 
 class ADODB_pdo_oci extends ADODB_pdo_base {
 
@@ -18,11 +18,11 @@ class ADODB_pdo_oci extends ADODB_pdo_base {
 	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
 	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
 	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW')";
-	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; 
-		
+	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno";
+
  	var $_initdate = true;
 	var $_hasdual = true;
-	
+
 	function _init($parentDriver)
 	{
 		$parentDriver->_bindInputArray = true;
@@ -31,8 +31,8 @@ class ADODB_pdo_oci extends ADODB_pdo_base {
 			$parentDriver->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
 		}
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
@@ -40,24 +40,24 @@ class ADODB_pdo_oci extends ADODB_pdo_base {
 			$this->metaTablesSQL .= " AND table_name like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
+
 	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = false;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!$rs) {
@@ -73,21 +73,19 @@ class ADODB_pdo_oci extends ADODB_pdo_base {
 			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
 				$fld->type ='INT';
 	     		$fld->max_length = $rs->fields[4];
-	    	}	
+	    	}
 		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
 			return  $false;
-		else 
+		else
 			return $retarr;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php b/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
index 89dfad552..671ceabbb 100644
--- a/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
@@ -1,46 +1,46 @@
  0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
 
 	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
 WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
+ and c.relnamespace=n.oid and n.nspname='%s'
+	and a.attname not like '....%%' AND a.attnum > 0
 	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
+
 	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key
 	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
+
 	var $hasAffectedRows = true;
 	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
+	// below suggested by Freek Dijkstra
 	var $true = 't';		// string that represents TRUE for a database
 	var $false = 'f';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -53,23 +53,23 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
 	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
 	var $random = 'random()';		/// random function
 	var $concat_operator='||';
-	
+
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO pgsql driver
 		$parentDriver->hasInsertID = true;
 		$parentDriver->_nestedSQL = true;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
 		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
@@ -77,17 +77,17 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
 		  	$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
 		 else
 		  	$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
+
 		return $rs;
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$info = $this->ServerInfo();
 		if ($info['version'] >= 7.3) {
 	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
+	union
         select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
 		}
 		if ($mask) {
@@ -95,59 +95,59 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
 			$mask = $this->qstr(strtolower($mask));
 			if ($info['version']>=7.3)
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
+ union
 select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
 			else
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
+select tablename,'T' from pg_tables where tablename like $mask
+ union
 select viewname,'V' from pg_views where viewname like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	function MetaColumns($table,$normalize=true) 
+
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = false;
 		$this->_findschema($table,$schema);
-		
+
 		if ($normalize) $table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
 		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) {
 			$false = false;
 			return $false;
 		}
 		if (!empty($this->metaKeySQL)) {
 			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
+			// Of course, a modified version of the metaColumnsSQL query using a
+			// LEFT JOIN would have been much more elegant, but postgres does
 			// not support OUTER JOINS. So here is the clumsy way.
-			
+
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
+
 			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
 			// fetch all result in once for performance.
 			$keys = $rskey->GetArray();
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			$rskey->Close();
 			unset($rskey);
 		}
@@ -159,7 +159,7 @@ select viewname,'V' from pg_views where viewname like $mask";
 			$rsdef = $this->Execute($sql);
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			if ($rsdef) {
 				while (!$rsdef->EOF) {
 					$num = $rsdef->fields['num'];
@@ -177,9 +177,9 @@ select viewname,'V' from pg_views where viewname like $mask";
 			}
 			unset($rsdef);
 		}
-	
+
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
@@ -201,30 +201,28 @@ select viewname,'V' from pg_views where viewname like $mask";
 			if ($rs->fields[4] == $this->true) {
 				$fld->not_null = true;
 			}
-			
+
 			// Freek
 			if (is_array($keys)) {
 				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true)
 						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true)
 						$fld->unique = true; // What name is more compatible?
 				}
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr)) {
 			$false = false;
 			return $false;
-		} else return $retarr;	
-		
+		} else return $retarr;
+
 	}
 
 }
-
-?>
diff --git a/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php b/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
index aa393220a..05557e238 100644
--- a/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
@@ -1,14 +1,14 @@
 pdoDriver = $parentDriver;
@@ -49,8 +49,8 @@ class ADODB_pdo_sqlite extends ADODB_pdo {
 
 		return $arr;
 	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$parent = $this->pdoDriver;
 		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
@@ -111,33 +111,33 @@ class ADODB_pdo_sqlite extends ADODB_pdo {
 	}
 
 	function BeginTrans()
-	{	
+	{
 		$parent = $this->pdoDriver;
-		if ($parent->transOff) return true; 
+		if ($parent->transOff) return true;
 		$parent->transCnt += 1;
 		$parent->_autocommit = false;
 		return $parent->Execute("BEGIN {$parent->_transmode}");
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		$parent = $this->pdoDriver;
-		if ($parent->transOff) return true; 
+		if ($parent->transOff) return true;
 		if (!$ok) return $parent->RollbackTrans();
 		if ($parent->transCnt) $parent->transCnt -= 1;
 		$parent->_autocommit = true;
-		
+
 		$ret = $parent->Execute('COMMIT');
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
 		$parent = $this->pdoDriver;
-		if ($parent->transOff) return true; 
+		if ($parent->transOff) return true;
 		if ($parent->transCnt) $parent->transCnt -= 1;
 		$parent->_autocommit = true;
-		
+
 		$ret = $parent->Execute('ROLLBACK');
 		return $ret;
 	}
@@ -156,7 +156,7 @@ class ADODB_pdo_sqlite extends ADODB_pdo {
 	  $rs = $parent->Execute("PRAGMA table_info('$tab')");
 	  if (isset($savem)) $parent->SetFetchMode($savem);
 	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
+	    $ADODB_FETCH_MODE = $save;
 	    return $false;
 	  }
 	  $arr = array();
@@ -174,7 +174,7 @@ class ADODB_pdo_sqlite extends ADODB_pdo {
 	    $fld->primary_key = $r['pk'];
 	    $fld->default_value = $r['dflt_value'];
 	    $fld->scale = 0;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
+	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;
 	    else $arr[strtoupper($fld->name)] = $fld;
 	  }
 	  $rs->Close();
@@ -185,19 +185,18 @@ class ADODB_pdo_sqlite extends ADODB_pdo {
 	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$parent = $this->pdoDriver;
-		
+
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtoupper($mask));
 			$this->metaTablesSQL .= " AND name LIKE $mask";
 		}
-		
+
 		$ret = $parent->GetCol($this->metaTablesSQL);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
    }
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php b/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
index 98a57eecf..d3831cd4d 100644
--- a/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
@@ -1,14 +1,12 @@
 
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php b/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
index ee938fc81..2a5bc40d6 100644
--- a/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
@@ -1,29 +1,29 @@
 
-					jlim - changed concat operator to || and data types to MetaType to match documented pgsql types 
-		 	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm  
+			  jlim - changed concat operator to || and data types to MetaType to match documented pgsql types
+					 see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm
   22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" 
   27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" 
-  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk. 
+  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk.
   31 Jan 2002 jlim - finally installed postgresql. testing
   01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-  
+
   See http://www.varlena.com/varlena/GeneralBits/47.php
-  
+
 	-- What indexes are on my table?
 	select * from pg_indexes where tablename = 'tablename';
-	
+
 	-- What triggers are on my table?
-	select c.relname as "Table", t.tgname as "Trigger Name", 
+	select c.relname as "Table", t.tgname as "Trigger Name",
 	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
 	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
 	   p.proname as "Function Name"
@@ -31,7 +31,7 @@
 	where t.tgfoid = p.oid and t.tgrelid = c.oid
 	   and t.tgconstrrelid = cc.oid
 	   and c.relname = 'tablename';
-	
+
 	-- What constraints are on my table?
 	select r.relname as "Table", c.conname as "Constraint Name",
 	   contype as "Constraint Type", conkey as "Key Columns",
@@ -50,7 +50,7 @@ function adodb_addslashes($s)
 	$len = strlen($s);
 	if ($len == 0) return "''";
 	if (strncmp($s,"'",1) === 0 && substr($s,$len-1) == "'") return $s; // already quoted
-	
+
 	return "'".addslashes($s)."'";
 }
 
@@ -59,38 +59,41 @@ class ADODB_postgres64 extends ADOConnection{
 	var $dataProvider = 'postgres';
 	var $hasInsertID = true;
 	var $_resultid = false;
-  	var $concat_operator='||';
+	var $concat_operator='||';
 	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
-    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
-	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
+	var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
+		and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
+			'sql_packages', 'sql_sizing', 'sql_sizing_profiles')
+	union
+		select viewname,'V' from pg_views where viewname not like 'pg\_%'";
 	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
 	var $isoDates = true; // accepts dates in ISO format
 	var $sysDate = "CURRENT_DATE";
 	var $sysTimeStamp = "CURRENT_TIMESTAMP";
 	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-		FROM pg_class c, pg_attribute a,pg_type t 
+	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum
+		FROM pg_class c, pg_attribute a,pg_type t
 		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
-AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+		AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
 
 	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
-	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
+		FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
+		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
+		and c.relnamespace=n.oid and n.nspname='%s'
+		and a.attname not like '....%%' AND a.attnum > 0
+		AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+
 	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
-	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key
+		FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a
+		WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid
+		AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum)
+		AND a.attrelid = bc.oid AND bc.relname = '%s'";
+
 	var $hasAffectedRows = true;
 	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
+	// below suggested by Freek Dijkstra
 	var $true = 'TRUE';		// string that represents TRUE for a database
 	var $false = 'FALSE';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -104,39 +107,39 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
 	var $random = 'random()';		/// random function
 	var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
 							// http://bugs.php.net/bug.php?id=25404
-	
+
 	var $uniqueIisR = true;
 	var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
 	var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
-	
+
 	var $_pnum = 0;
-	
-	// The last (fmtTimeStamp is not entirely correct: 
-	// PostgreSQL also has support for time zones, 
-	// and writes these time in this format: "2001-03-01 18:59:26+02". 
-	// There is no code for the "+02" time zone information, so I just left that out. 
-	// I'm not familiar enough with both ADODB as well as Postgres 
+
+	// The last (fmtTimeStamp is not entirely correct:
+	// PostgreSQL also has support for time zones,
+	// and writes these time in this format: "2001-03-01 18:59:26+02".
+	// There is no code for the "+02" time zone information, so I just left that out.
+	// I'm not familiar enough with both ADODB as well as Postgres
 	// to know what the concequences are. The other values are correct (wheren't in 0.94)
-	// -- Freek Dijkstra 
+	// -- Freek Dijkstra
 
-	function ADODB_postgres64() 
+	function __construct()
 	{
-	// changes the metaColumnsSQL, adds columns: attnum[6]
+		// changes the metaColumnsSQL, adds columns: attnum[6]
 	}
-	
+
 	function ServerInfo()
 	{
 		if (isset($this->version)) return $this->version;
-		
+
 		$arr['description'] = $this->GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		$this->version = $arr;
 		return $arr;
 	}
 
-	function IfNull( $field, $ifNull ) 
+	function IfNull( $field, $ifNull )
 	{
-		return " coalesce($field, $ifNull) "; 
+		return " coalesce($field, $ifNull) ";
 	}
 
 	// get the last id - never tested
@@ -150,10 +153,10 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
 		}
 		return false;
 	}
-	
+
 /* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
-Using a OID as a unique identifier is not generally wise. 
-Unless you are very careful, you might end up with a tuple having 
+Using a OID as a unique identifier is not generally wise.
+Unless you are very careful, you might end up with a tuple having
 a different OID if a database must be reloaded. */
 	function _insertid($table,$column)
 	{
@@ -165,13 +168,13 @@ a different OID if a database must be reloaded. */
 
 // I get this error with PHP before 4.0.6 - jlim
 // Warning: This compilation does not support pg_cmdtuples() in adodb-postgres.inc.php on line 44
-   function _affectedrows()
-   {
-   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-	   	return pg_cmdtuples($this->_resultid);
-   }
-   
-	
+	function _affectedrows()
+	{
+		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
+		return pg_cmdtuples($this->_resultid);
+	}
+
+
 		// returns true/false
 	function BeginTrans()
 	{
@@ -179,23 +182,23 @@ a different OID if a database must be reloaded. */
 		$this->transCnt += 1;
 		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
 	}
-	
-	function RowLock($tables,$where,$col='1 as adodbignore') 
+
+	function RowLock($tables,$where,$col='1 as adodbignore')
 	{
 		if (!$this->transCnt) $this->BeginTrans();
 		return $this->GetOne("select $col from $tables where $where for update");
 	}
 
-	// returns true/false. 
-	function CommitTrans($ok=true) 
-	{ 
+	// returns true/false.
+	function CommitTrans($ok=true)
+	{
 		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		$this->transCnt -= 1;
 		return @pg_Exec($this->_connectionID, "commit");
 	}
-	
+
 	// returns true/false
 	function RollbackTrans()
 	{
@@ -203,68 +206,70 @@ a different OID if a database must be reloaded. */
 		$this->transCnt -= 1;
 		return @pg_Exec($this->_connectionID, "rollback");
 	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$info = $this->ServerInfo();
 		if ($info['version'] >= 7.3) {
-		$this->metaTablesSQL = "select table_name,'T' from information_schema.tables where table_schema not in ( 'pg_catalog','information_schema')
+		$this->metaTablesSQL = "
+			select table_name,'T' from information_schema.tables where table_schema not in ( 'pg_catalog','information_schema')
 			union
-		       select table_name,'V' from information_schema.views where table_schema not in ( 'pg_catalog','information_schema') ";
+			select table_name,'V' from information_schema.views where table_schema not in ( 'pg_catalog','information_schema') ";
 		}
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtolower($mask));
 			if ($info['version']>=7.3)
-				$this->metaTablesSQL = "select table_name,'T' from information_schema.tables where table_name like $mask and table_schema not in ( 'pg_catalog','information_schema')
-			union
-		       select table_name,'V' from information_schema.views where table_name like $mask and table_schema not in ( 'pg_catalog','information_schema') ";
+				$this->metaTablesSQL = "
+					select table_name,'T' from information_schema.tables where table_name like $mask and table_schema not in ( 'pg_catalog','information_schema')
+					union
+					select table_name,'V' from information_schema.views where table_name like $mask and table_schema not in ( 'pg_catalog','information_schema') ";
 			else
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
-select viewname,'V' from pg_views where viewname like $mask";
+					select tablename,'T' from pg_tables where tablename like $mask
+					union
+					select viewname,'V' from pg_views where viewname like $mask";
 		}
 		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	
+
+
 	// if magic quotes disabled, use pg_escape_string()
 	function qstr($s,$magic_quotes=false)
 	{
 		if (is_bool($s)) return $s ? 'true' : 'false';
-		 
+
 		if (!$magic_quotes) {
 			if (ADODB_PHPVER >= 0x5200 && $this->_connectionID) {
 				return  "'".pg_escape_string($this->_connectionID,$s)."'";
-			} 
+			}
 			if (ADODB_PHPVER >= 0x4200) {
 				return  "'".pg_escape_string($s)."'";
 			}
 			if ($this->replaceQuote[0] == '\\'){
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
 			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
 		return "'$s'";
 	}
-	
-	
-	
+
+
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'TO_CHAR('.$col.",'";
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
@@ -277,11 +282,11 @@ select viewname,'V' from pg_views where viewname like $mask";
 			case 'q':
 				$s .= 'Q';
 				break;
-				
+
 			case 'M':
 				$s .= 'Mon';
 				break;
-				
+
 			case 'm':
 				$s .= 'MM';
 				break;
@@ -289,37 +294,37 @@ select viewname,'V' from pg_views where viewname like $mask";
 			case 'd':
 				$s .= 'DD';
 				break;
-			
+
 			case 'H':
 				$s.= 'HH24';
 				break;
-				
+
 			case 'h':
 				$s .= 'HH';
 				break;
-				
+
 			case 'i':
 				$s .= 'MI';
 				break;
-			
+
 			case 's':
 				$s .= 'SS';
 				break;
-			
+
 			case 'a':
 			case 'A':
 				$s .= 'AM';
 				break;
-				
+
 			case 'w':
 				$s .= 'D';
 				break;
-			
+
 			case 'l':
 				$s .= 'DAY';
 				break;
-			
-			 case 'W':
+
+			case 'W':
 				$s .= 'WW';
 				break;
 
@@ -331,44 +336,44 @@ select viewname,'V' from pg_views where viewname like $mask";
 				}
 				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
 				else $s .= '"'.$ch.'"';
-				
+
 			}
 		}
 		return $s. "')";
 	}
-	
-	
-	
-	/* 
-	* Load a Large Object from a file 
-	* - the procedure stores the object id in the table and imports the object using 
-	* postgres proprietary blob handling routines 
+
+
+
+	/*
+	* Load a Large Object from a file
+	* - the procedure stores the object id in the table and imports the object using
+	* postgres proprietary blob handling routines
 	*
 	* contributed by Mattia Rossi mattia@technologist.com
 	* modified for safe mode by juraj chlebec
-	*/ 
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		pg_exec ($this->_connectionID, "begin"); 
-		
+	*/
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	{
+		pg_exec ($this->_connectionID, "begin");
+
 		$fd = fopen($path,'r');
 		$contents = fread($fd,filesize($path));
 		fclose($fd);
-		
+
 		$oid = pg_lo_create($this->_connectionID);
 		$handle = pg_lo_open($this->_connectionID, $oid, 'w');
 		pg_lo_write($handle, $contents);
 		pg_lo_close($handle);
-		
-		// $oid = pg_lo_import ($path); 
-		pg_exec($this->_connectionID, "commit"); 
-		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
-		$rez = !empty($rs); 
-		return $rez; 
-	} 
-	
+
+		// $oid = pg_lo_import ($path);
+		pg_exec($this->_connectionID, "commit");
+		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype);
+		$rez = !empty($rs);
+		return $rez;
+	}
+
 	/*
-	* Deletes/Unlinks a Blob from the database, otherwise it 
+	* Deletes/Unlinks a Blob from the database, otherwise it
 	* will be left behind
 	*
 	* Returns TRUE on success or FALSE on failure.
@@ -391,8 +396,8 @@ select viewname,'V' from pg_views where viewname like $mask";
 		if (strlen($oid)>16) return false;
 		return is_numeric($oid);
 	}
-	
-	/* 
+
+	/*
 	* If an OID is detected, then we use pg_lo_* to open the oid file and read the
 	* real blob from the db using the oid supplied as a parameter. If you are storing
 	* blobs using bytea, we autodetect and process it so this function is not needed.
@@ -403,108 +408,108 @@ select viewname,'V' from pg_views where viewname like $mask";
 	*
 	* Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
 	* added maxsize parameter, which defaults to $db->maxblobsize if not defined.
-	*/ 
-	function BlobDecode($blob,$maxsize=false,$hastrans=true) 
+	*/
+	function BlobDecode($blob,$maxsize=false,$hastrans=true)
 	{
 		if (!$this->GuessOID($blob)) return $blob;
-		
-		if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
+
+		if ($hastrans) @pg_exec($this->_connectionID,"begin");
 		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
 		if ($fd === false) {
 			if ($hastrans) @pg_exec($this->_connectionID,"commit");
 			return $blob;
 		}
 		if (!$maxsize) $maxsize = $this->maxblobsize;
-		$realblob = @pg_loread($fd,$maxsize); 
-		@pg_loclose($fd); 
-		if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
+		$realblob = @pg_loread($fd,$maxsize);
+		@pg_loclose($fd);
+		if ($hastrans) @pg_exec($this->_connectionID,"commit");
 		return $realblob;
 	}
-	
-	/* 
+
+	/*
 		See http://www.postgresql.org/idocs/index.php?datatype-binary.html
-	 	
-		NOTE: SQL string literals (input strings) must be preceded with two backslashes 
-		due to the fact that they must pass through two parsers in the PostgreSQL 
+
+		NOTE: SQL string literals (input strings) must be preceded with two backslashes
+		due to the fact that they must pass through two parsers in the PostgreSQL
 		backend.
 	*/
 	function BlobEncode($blob)
 	{
 		if (ADODB_PHPVER >= 0x5200) return pg_escape_bytea($this->_connectionID, $blob);
 		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
-		
+
 		/*92=backslash, 0=null, 39=single-quote*/
 		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
 		$fixch = array('\\\\134','\\\\000','\\\\047');
 		return adodb_str_replace($badch,$fixch,$blob);
-		
+
 		// note that there is a pg_escape_bytea function only for php 4.2.0 or later
 	}
-	
+
 	// assumes bytea for blob, and varchar for clob
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		if ($blobtype == 'CLOB') {
-    		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
+			return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
 		}
 		// do not use bind params which uses qstr(), as blobencode() already quotes data
 		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
 	}
-	
+
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
 		else if (strncmp($date,"'",1) == 0) {
 			$len = strlen($date);
 			if (10 <= $len && $len <= 12) $date = 'date '.$date;
 			else $date = 'timestamp '.$date;
 		}
-		
-		
+
+
 		return "($date+interval'".($dayFraction * 1440)." minutes')";
 		#return "($date+interval'$dayFraction days')";
 	}
-	
+
 
 	// for schema support, pass in the $table param "$schema.$tabname".
 	// converts field names to lowercase, $upper is ignored
 	// see http://phplens.com/lens/lensforum/msgs.php?id=14018 for more info
-	function MetaColumns($table,$normalize=true) 
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = false;
 		$false = false;
 		$this->_findschema($table,$schema);
-		
+
 		if ($normalize) $table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
 		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) {
 			return $false;
 		}
 		if (!empty($this->metaKeySQL)) {
 			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
+			// Of course, a modified version of the metaColumnsSQL query using a
+			// LEFT JOIN would have been much more elegant, but postgres does
 			// not support OUTER JOINS. So here is the clumsy way.
-			
+
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
+
 			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
 			// fetch all result in once for performance.
 			$keys = $rskey->GetArray();
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			$rskey->Close();
 			unset($rskey);
 		}
@@ -516,7 +521,7 @@ select viewname,'V' from pg_views where viewname like $mask";
 			$rsdef = $this->Execute($sql);
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			if ($rsdef) {
 				while (!$rsdef->EOF) {
 					$num = $rsdef->fields['num'];
@@ -534,15 +539,15 @@ select viewname,'V' from pg_views where viewname like $mask";
 			}
 			unset($rsdef);
 		}
-	
+
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
 			$fld->attnum = $rs->fields[6];
-			
+
 			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
 			if ($fld->max_length <= 0) $fld->max_length = -1;
 			if ($fld->type == 'numeric') {
@@ -558,99 +563,107 @@ select viewname,'V' from pg_views where viewname like $mask";
 
 			//Freek
 			$fld->not_null = $rs->fields[4] == 't';
-			
-			
+
+
 			// Freek
 			if (is_array($keys)) {
 				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't') 
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't')
 						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't') 
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't')
 						$fld->unique = true; // What name is more compatible?
 				}
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
 			return  $false;
 		else
-			return $retarr;	
-		
+			return $retarr;
+
 	}
-	
+
 	function Param($name,$type='C')
 	{
-		$this->_pnum += 1;
+		if ($name) {
+			$this->_pnum += 1;
+		} else {
+			// Reset param num if $name is false
+			$this->_pnum = 1;
+		}
 		return '$'.$this->_pnum;
 	}
-	
-	  function MetaIndexes ($table, $primary = FALSE, $owner = false)
-      {
-         global $ADODB_FETCH_MODE;
-                
-				$schema = false;
-				$this->_findschema($table,$schema);
-
-				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
-					$sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
-FROM pg_catalog.pg_class c 
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-	,pg_namespace n 
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\'';
-				} else {
-	                $sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
-FROM pg_catalog.pg_class c
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
-    			}
-				            
-                if ($primary == FALSE) {
-                	$sql .= ' AND i.indisprimary=false;';
-                }
-                
-                $save = $ADODB_FETCH_MODE;
-                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                if ($this->fetchMode !== FALSE) {
-                        $savem = $this->SetFetchMode(FALSE);
-                }
-                
-                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
-                if (isset($savem)) {
-                        $this->SetFetchMode($savem);
-                }
-                $ADODB_FETCH_MODE = $save;
-
-                if (!is_object($rs)) {
-                	$false = false;
-					return $false;
-                }
-				
-                $col_names = $this->MetaColumnNames($table,true,true); 
-				//3rd param is use attnum, 
-				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
-                $indexes = array();
-                while ($row = $rs->FetchRow()) {
-                        $columns = array();
-                        foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col];
-                        }
-                        
-                        $indexes[$row[0]] = array(
-                                'unique' => ($row[1] == 't'),
-                                'columns' => $columns
-                        );
-                }
-                return $indexes;
-        }
+
+	function MetaIndexes ($table, $primary = FALSE, $owner = false)
+	{
+		global $ADODB_FETCH_MODE;
+
+		$schema = false;
+		$this->_findschema($table,$schema);
+
+		if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
+			$sql = '
+				SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+				FROM pg_catalog.pg_class c
+				JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+				JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+					,pg_namespace n
+				WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))
+				and c.relnamespace=c2.relnamespace
+				and c.relnamespace=n.oid
+				and n.nspname=\'%s\'';
+		} else {
+			$sql = '
+				SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+				FROM pg_catalog.pg_class c
+				JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+				JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+				WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
+		}
+
+		if ($primary == FALSE) {
+			$sql .= ' AND i.indisprimary=false;';
+		}
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
+
+		$rs = $this->Execute(sprintf($sql,$table,$table,$schema));
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		if (!is_object($rs)) {
+			$false = false;
+			return $false;
+		}
+
+		$col_names = $this->MetaColumnNames($table,true,true);
+		//3rd param is use attnum,
+		// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
+		$indexes = array();
+		while ($row = $rs->FetchRow()) {
+			$columns = array();
+			foreach (explode(' ', $row[2]) as $col) {
+				$columns[] = $col_names[$col];
+			}
+
+			$indexes[$row[0]] = array(
+				'unique' => ($row[1] == 't'),
+				'columns' => $columns
+			);
+		}
+		return $indexes;
+	}
 
 	// returns true or false
 	//
@@ -659,59 +672,67 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 	// 	$db->Connect('host1','user1','secret');
 	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
 	{
-		
 		if (!function_exists('pg_connect')) return null;
-		
+
 		$this->_errorMsg = false;
-		
+
 		if ($user || $pwd || $db) {
 			$user = adodb_addslashes($user);
 			$pwd = adodb_addslashes($pwd);
 			if (strlen($db) == 0) $db = 'template1';
 			$db = adodb_addslashes($db);
-		   	if ($str)  {
-			 	$host = explode(":", $str);
+			if ($str)  {
+				$host = explode(":", $str);
 				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
 				else $str = '';
 				if (isset($host[1])) $str .= " port=$host[1]";
 				else if (!empty($this->port)) $str .= " port=".$this->port;
 			}
-		   		if ($user) $str .= " user=".$user;
-		   		if ($pwd)  $str .= " password=".$pwd;
-				if ($db)   $str .= " dbname=".$db;
+			if ($user) $str .= " user=".$user;
+			if ($pwd)  $str .= " password=".$pwd;
+			if ($db)   $str .= " dbname=".$db;
 		}
 
 		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
-		
+
 		if ($ctype === 1) { // persistent
 			$this->_connectionID = pg_pconnect($str);
 		} else {
 			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
-			static $ncnt;
-			
+				static $ncnt;
+
 				if (empty($ncnt)) $ncnt = 1;
 				else $ncnt += 1;
-				
+
 				$str .= str_repeat(' ',$ncnt);
 			}
 			$this->_connectionID = pg_connect($str);
 		}
 		if ($this->_connectionID === false) return false;
 		$this->Execute("set datestyle='ISO'");
-		
+
 		$info = $this->ServerInfo();
 		$this->pgVersion = (float) substr($info['version'],0,3);
 		if ($this->pgVersion >= 7.1) { // good till version 999
 			$this->_nestedSQL = true;
 		}
+
+		# PostgreSQL 9.0 changed the default output for bytea from 'escape' to 'hex'
+		# PHP does not handle 'hex' properly ('x74657374' is returned as 't657374')
+		# https://bugs.php.net/bug.php?id=59831 states this is in fact not a bug,
+		# so we manually set bytea_output
+		if (version_compare($info['version'], '9.0', '>=')) {
+			$this->Execute('set bytea_output=escape');
+		}
+
 		return true;
 	}
-	
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
 	{
-	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
 	}
-	 
+
 	// returns true or false
 	//
 	// examples:
@@ -721,7 +742,7 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 	{
 		return $this->_connect($str,$user,$pwd,$db,1);
 	}
-	
+
 
 	// returns queryID or false
 	function _query($sql,$inputarr=false)
@@ -731,19 +752,19 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 		if ($inputarr) {
 		/*
 			It appears that PREPARE/EXECUTE is slower for many queries.
-			
+
 			For query executed 1000 times:
-			"select id,firstname,lastname from adoxyz 
+			"select id,firstname,lastname from adoxyz
 				where firstname not like ? and lastname not like ? and id = ?"
-				
+
 			with plan = 1.51861286163 secs
 			no plan =   1.26903700829 secs
 
-			
+
 
 		*/
 			$plan = 'P'.md5($sql);
-				
+
 			$execp = '';
 			foreach($inputarr as $v) {
 				if ($execp) $execp .= ',';
@@ -753,11 +774,11 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 					$execp .= $v;
 				}
 			}
-			
+
 			if ($execp) $exsql = "EXECUTE $plan ($execp)";
 			else $exsql = "EXECUTE $plan";
-			
-			
+
+
 			$rez = @pg_exec($this->_connectionID,$exsql);
 			if (!$rez) {
 			# Perhaps plan does not exist? Prepare/compile plan.
@@ -780,7 +801,7 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 					$sql .= $v.' $'.$i;
 					$i++;
 				}
-				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
+				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);
 				//adodb_pr($s);
 				$rez = pg_exec($this->_connectionID,$s);
 				//echo $this->ErrorMsg();
@@ -799,18 +820,18 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 			$this->_resultid = $rez;
 			return true;
 		}
-		
+
 		return $rez;
 	}
-	
+
 	function _errconnect()
 	{
 		if (defined('DB_ERROR_CONNECT_FAILED')) return DB_ERROR_CONNECT_FAILED;
 		else return 'Database connection failed';
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
 		if ($this->_errorMsg !== false) return $this->_errorMsg;
 		if (ADODB_PHPVER >= 0x4300) {
@@ -818,7 +839,7 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 				$this->_errorMsg = @pg_result_error($this->_resultid);
 				if ($this->_errorMsg) return $this->_errorMsg;
 			}
-			
+
 			if (!empty($this->_connectionID)) {
 				$this->_errorMsg = @pg_last_error($this->_connectionID);
 			} else $this->_errorMsg = $this->_errconnect();
@@ -828,14 +849,14 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 		}
 		return $this->_errorMsg;
 	}
-	
+
 	function ErrorNo()
 	{
 		$e = $this->ErrorMsg();
 		if (strlen($e)) {
 			return ADOConnection::MetaError($e);
-		 }
-		 return 0;
+		}
+		return 0;
 	}
 
 	// returns true or false
@@ -850,8 +871,8 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 		$this->_connectionID = false;
 		return true;
 	}
-	
-	
+
+
 	/*
 	* Maximum size of C field
 	*/
@@ -859,7 +880,7 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 	{
 		return 1000000000;  // should be 1 Gb?
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
@@ -867,21 +888,22 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
 	{
 		return 1000000000; // should be 1 Gb?
 	}
-	
-		
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
+	Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 class ADORecordSet_postgres64 extends ADORecordSet{
 	var $_blobArr;
 	var $databaseType = "postgres64";
 	var $canSeek = true;
-	function ADORecordSet_postgres64($queryID,$mode=false) 
+
+	function __construct($queryID, $mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -889,22 +911,24 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = PGSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
+
+		// Parent's constructor
 		$this->ADORecordSet($queryID);
 	}
-	
+
 	function GetRowAssoc($upper=true)
 	{
 		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
 		$row = ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
-	
+
 
 	function _initrs()
 	{
@@ -912,11 +936,11 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 		$qid = $this->_queryID;
 		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
 		$this->_numOfFields = @pg_numfields($qid);
-		
+
 		// cache types for blob decode check
 		// apparently pg_fieldtype actually performs an sql query on the database to get the type.
 		if (empty($this->connection->noBlobs))
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
 			if (pg_fieldtype($qid,$i) == 'bytea') {
 				$this->_blobArr[$i] = pg_fieldname($qid,$i);
 			}
@@ -927,7 +951,7 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 	function Fields($colname)
 	{
 		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -935,32 +959,32 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
+		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
-	function FetchField($off = 0) 
+	function FetchField($off = 0)
 	{
 		// offsets begin at 0
-		
+
 		$o= new ADOFieldObject();
 		$o->name = @pg_fieldname($this->_queryID,$off);
 		$o->type = @pg_fieldtype($this->_queryID,$off);
 		$o->max_length = @pg_fieldsize($this->_queryID,$off);
-		return $o;	
+		return $o;
 	}
 
 	function _seek($row)
 	{
 		return @pg_fetch_row($this->_queryID,$row);
 	}
-	
+
 	function _decode($blob)
 	{
 		if ($blob === NULL) return NULL;
 //		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
 		return pg_unescape_bytea($blob);
 	}
-	
+
 	function _fixblobs()
 	{
 		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
@@ -974,9 +998,9 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 			}
 		}
 	}
-	
+
 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
@@ -991,23 +1015,23 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 			$this->EOF = true;
 		}
 		return false;
-	}		
-	
+	}
+
 	function _fetch()
 	{
-				
+
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
+			return false;
 
 		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
+
 		if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-			
+
 		return (is_array($this->fields));
 	}
 
-	function _close() 
-	{ 
+	function _close()
+	{
 		return @pg_freeresult($this->_queryID);
 	}
 
@@ -1025,54 +1049,53 @@ class ADORecordSet_postgres64 extends ADORecordSet{
 				case 'CHARACTER':
 				case 'VARCHAR':
 				case 'NAME':
-		   		case 'BPCHAR':
+				case 'BPCHAR':
 				case '_VARCHAR':
 				case 'INET':
 				case 'MACADDR':
 					if ($len <= $this->blobSize) return 'C';
-				
+
 				case 'TEXT':
 					return 'X';
-		
+
 				case 'IMAGE': // user defined type
 				case 'BLOB': // user defined type
 				case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
 				case 'VARBIT':
 				case 'BYTEA':
 					return 'B';
-				
+
 				case 'BOOL':
 				case 'BOOLEAN':
 					return 'L';
-				
+
 				case 'DATE':
 					return 'D';
-				
-				
+
+
 				case 'TIMESTAMP WITHOUT TIME ZONE':
 				case 'TIME':
 				case 'DATETIME':
 				case 'TIMESTAMP':
 				case 'TIMESTAMPTZ':
 					return 'T';
-				
-				case 'SMALLINT': 
-				case 'BIGINT': 
-				case 'INTEGER': 
-				case 'INT8': 
+
+				case 'SMALLINT':
+				case 'BIGINT':
+				case 'INTEGER':
+				case 'INT8':
 				case 'INT4':
 				case 'INT2':
 					if (isset($fieldobj) &&
 				empty($fieldobj->primary_key) && (!$this->connection->uniqueIisR || empty($fieldobj->unique))) return 'I';
-				
+
 				case 'OID':
 				case 'SERIAL':
 					return 'R';
-				
-				 default:
-				 	return 'N';
+
+				default:
+					return 'N';
 			}
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php b/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
index 02daebe38..740650282 100644
--- a/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
@@ -1,11 +1,11 @@
  0 AND 
-									a.attrelid = c.oid 
+						 WHERE c.relkind in ('r','v') AND
+									(c.relname='%s' or c.relname = lower('%s')) AND
+									a.attname not like '....%%' AND
+									a.attnum > 0 AND
+									a.attrelid = c.oid
 						 ORDER BY a.attnum";
 
    // used when schema defined
 	var $metaColumnsSQL1 = "
-						 SELECT a.attname, 
-									CASE 
+						 SELECT a.attname,
+									CASE
 											   WHEN x.sequence_name != '' THEN 'SERIAL'
 											   ELSE t.typname
 									END AS typname,
 									a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
-						 FROM pg_class c, pg_namespace n, pg_attribute a 
-						 JOIN pg_type t ON a.atttypid = t.oid 
-						 LEFT JOIN 
-									(SELECT c.relname as sequence_name,  
-												  c1.relname as related_table, 
+						 FROM pg_class c, pg_namespace n, pg_attribute a
+						 JOIN pg_type t ON a.atttypid = t.oid
+						 LEFT JOIN
+									(SELECT c.relname as sequence_name,
+												  c1.relname as related_table,
 												  a.attname as related_column
-									FROM pg_class c 
-									   JOIN pg_depend d ON d.objid = c.oid 
-									   LEFT JOIN pg_class c1 ON d.refobjid = c1.oid 
-									   LEFT JOIN pg_attribute a ON (d.refobjid, d.refobjsubid) = (a.attrelid, a.attnum) 
-									WHERE c.relkind = 'S' AND c1.relname = '%s') x 
+									FROM pg_class c
+									   JOIN pg_depend d ON d.objid = c.oid
+									   LEFT JOIN pg_class c1 ON d.refobjid = c1.oid
+									   LEFT JOIN pg_attribute a ON (d.refobjid, d.refobjsubid) = (a.attrelid, a.attnum)
+									WHERE c.relkind = 'S' AND c1.relname = '%s') x
 									ON x.related_column= a.attname
 						 WHERE c.relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
-									AND c.relnamespace=n.oid and n.nspname='%s' 
-									AND a.attname not like '....%%' AND a.attnum > 0 
-									AND a.atttypid = t.oid AND a.attrelid = c.oid  
+									AND c.relnamespace=n.oid and n.nspname='%s'
+									AND a.attname not like '....%%' AND a.attnum > 0
+									AND a.atttypid = t.oid AND a.attrelid = c.oid
 						 ORDER BY a.attnum";
 
-	
-	function ADODB_postgres7() 
+
+	function __construct()
 	{
-		$this->ADODB_postgres64();
+		parent::__construct();
 		if (ADODB_ASSOC_CASE !== 2) {
 			$this->rsPrefix .= 'assoc_';
 		}
 		$this->_bindInputArray = PHP_VERSION >= 5.1;
 	}
 
-	
-	// the following should be compat with postgresql 7.2, 
+
+	// the following should be compat with postgresql 7.2,
 	// which makes obsolete the LIMIT limit,offset syntax
-	 function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	 function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	 {
 		 $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : '';
 		 $limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
@@ -95,7 +95,7 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 		  	$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
 		 else
 		  	$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
+
 		return $rs;
 	 }
  	/*
@@ -111,7 +111,7 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 
 	/*
 		I discovered that the MetaForeignKeys method no longer worked for Postgres 8.3.
-		I went ahead and modified it to work for both 8.2 and 8.3. 
+		I went ahead and modified it to work for both 8.2 and 8.3.
 		Please feel free to include this change in your next release of adodb.
 		 William Kolodny [William.Kolodny#gt-t.net]
 	*/
@@ -121,15 +121,15 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 	  SELECT fum.ftblname AS lookup_table, split_part(fum.rf, ')'::text, 1) AS lookup_field,
 	     fum.ltable AS dep_table, split_part(fum.lf, ')'::text, 1) AS dep_field
 	  FROM (
-	  SELECT fee.ltable, fee.ftblname, fee.consrc, split_part(fee.consrc,'('::text, 2) AS lf, 
+	  SELECT fee.ltable, fee.ftblname, fee.consrc, split_part(fee.consrc,'('::text, 2) AS lf,
 	    split_part(fee.consrc, '('::text, 3) AS rf
 	  FROM (
 	      SELECT foo.relname AS ltable, foo.ftblname,
 	          pg_get_constraintdef(foo.oid) AS consrc
 	      FROM (
 	          SELECT c.oid, c.conname AS name, t.relname, ft.relname AS ftblname
-	          FROM pg_constraint c 
-	          JOIN pg_class t ON (t.oid = c.conrelid) 
+	          FROM pg_constraint c
+	          JOIN pg_class t ON (t.oid = c.conrelid)
 	          JOIN pg_class ft ON (ft.oid = c.confrelid)
 	          JOIN pg_namespace nft ON (nft.oid = ft.relnamespace)
 	          LEFT JOIN pg_description ds ON (ds.objoid = c.oid)
@@ -142,9 +142,9 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 	  ORDER BY fum.ftblname, fum.ltable, split_part(fum.lf, ')'::text, 1)
 	  ";
 	  $rs = $this->Execute($sql);
-	
+
 	  if (!$rs || $rs->EOF) return false;
-	
+
 	  $a = array();
 	  while (!$rs->EOF) {
 	    if ($upper) {
@@ -154,11 +154,11 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 	    }
 		$rs->MoveNext();
 	  }
-	
+
 	  return $a;
-	
+
 	}
-	
+
 	// from  Edward Jaramilla, improved version - works on pg 7.4
 	function _old_MetaForeignKeys($table, $owner=false, $upper=false)
 	{
@@ -173,20 +173,20 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 		c.relname = \''.strtolower($table).'\'
 		ORDER BY
 			t.tgrelid';
-		
+
 		$rs = $this->Execute($sql);
-		
+
 		if (!$rs || $rs->EOF) return false;
-		
+
 		$arr = $rs->GetArray();
 		$a = array();
 		foreach($arr as $v) {
 			$data = explode(chr(0), $v['args']);
 			$size = count($data)-1; //-1 because the last node is empty
 			for($i = 4; $i < $size; $i++) {
-				if ($upper) 
+				if ($upper)
 					$a[strtoupper($data[2])][] = strtoupper($data[$i].'='.$data[++$i]);
-				else 
+				else
 					$a[$data[2]][] = $data[$i].'='.$data[++$i];
 			}
 		}
@@ -199,7 +199,7 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 			// We don't have native support for parameterized queries, so let's emulate it at the parent
 			return ADODB_postgres64::_query($sql, $inputarr);
 		}
-		
+
 		$this->_pnum = 0;
 		$this->_errorMsg = false;
 		// -- added Cristiano da Cunha Duarte
@@ -213,7 +213,7 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 				else $sql .= $v.' $'.$i;
 				$i++;
 			}
-			
+
 			$rez = pg_query_params($this->_connectionID,$sql, $inputarr);
 		} else {
 			$rez = pg_query($this->_connectionID,$sql);
@@ -225,10 +225,10 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 			}
 			$this->_resultid = $rez;
 			return true;
-		}		
+		}
 		return $rez;
 	}
-	
+
  	 // this is a set of functions for managing client encoding - very important if the encodings
 	// of your database and your output target (i.e. HTML) don't match
 	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
@@ -246,7 +246,7 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 			return $this->charSet;
 		}
 	}
-	
+
 	// SetCharSet - switch the client encoding
 	function SetCharSet($charset_name)
 	{
@@ -260,7 +260,7 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 	}
 
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -268,21 +268,21 @@ class ADODB_postgres7 extends ADODB_postgres64 {
 class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
 
 	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_postgres7($queryID,$mode=false) 
+
+
+	function __construct($queryID, $mode=false)
 	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
+		parent::__construct($queryID, $mode);
 	}
-	
-	 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+
+	// 10% speedup to move MoveNext to child class
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
 			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
 				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
+
 				if (is_array($this->fields)) {
 					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
 					return true;
@@ -292,43 +292,43 @@ class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
 			$this->EOF = true;
 		}
 		return false;
-	}		
+	}
 
 }
 
 class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
 
 	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
+
+
+	function __construct($queryID, $mode=false)
 	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
+		parent::__construct($queryID, $mode);
 	}
-	
+
 	function _fetch()
 	{
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
         	return false;
 
 		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
+
 		if ($this->fields) {
 			if (isset($this->_blobArr)) $this->_fixblobs();
 			$this->_updatefields();
 		}
-			
+
 		return (is_array($this->fields));
 	}
-	
+
 		// Create associative array
 	function _updatefields()
 	{
 		if (ADODB_ASSOC_CASE == 2) return; // native
-	
+
 		$arr = array();
 		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
+
 		foreach($this->fields as $k => $v) {
 			if (is_integer($k)) $arr[$k] = $v;
 			else {
@@ -340,29 +340,28 @@ class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
 		}
 		$this->fields = $arr;
 	}
-	
-	function MoveNext() 
+
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
 			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
 				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
+
 				if (is_array($this->fields)) {
 					if ($this->fields) {
 						if (isset($this->_blobArr)) $this->_fixblobs();
-					
+
 						$this->_updatefields();
 					}
 					return true;
 				}
 			}
-			
-			
+
+
 			$this->fields = false;
 			$this->EOF = true;
 		}
 		return false;
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php b/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
index f05649cfa..2bd236a51 100644
--- a/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
@@ -1,12 +1,48 @@
 
\ No newline at end of file
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-postgres7.inc.php");
+
+class ADODB_postgres8 extends ADODB_postgres7
+{
+	var $databaseType = 'postgres8';
+
+
+	/**
+	 * Retrieve last inserted ID
+	 * Don't use OIDs, since as per {@link http://php.net/function.pg-last-oid php manual }
+	 * they won't be there in Postgres 8.1
+	 * (and they're not what the application wants back, anyway).
+	 * @param string $table
+	 * @param string $column
+	 * @return int last inserted ID for given table/column, or the most recently
+	 *             returned one if $table or $column are empty
+	 */
+	function _insertid($table, $column)
+	{
+		return empty($table) || empty($column)
+			? $this->GetOne("SELECT lastval()")
+			: $this->GetOne("SELECT currval(pg_get_serial_sequence('$table', '$column'))");
+	}
+}
+
+class ADORecordSet_postgres8 extends ADORecordSet_postgres7
+{
+	var $databaseType = "postgres8";
+}
+
+class ADORecordSet_assoc_postgres8 extends ADORecordSet_assoc_postgres7
+{
+	var $databaseType = "postgres8";
+}
diff --git a/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php b/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
index 8cf9f7af8..4d4ac8d11 100644
--- a/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
@@ -1,57 +1,30 @@
 ADODB_postgres7();
-	}
+include_once(ADODB_DIR."/drivers/adodb-postgres8.inc.php");
 
-	// Don't use OIDs, as they typically won't be there, and
-	// they're not what the application wants back, anyway.
-	function _insertid($table,$column)
-	{
-		return empty($table) || empty($column)
-			? $this->GetOne("SELECT lastval()")
-			: $this->GetOne("SELECT currval(pg_get_serial_sequence('$table','$column'))");
-	}
+class ADODB_postgres9 extends ADODB_postgres8
+{
+	var $databaseType = 'postgres9';
 }
 
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres9 extends ADORecordSet_postgres7{
+class ADORecordSet_postgres9 extends ADORecordSet_postgres8
+{
 	var $databaseType = "postgres9";
-	
-	function ADORecordSet_postgres9($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres7($queryID,$mode);
-	}
 }
 
-class ADORecordSet_assoc_postgres9 extends ADORecordSet_postgres7{
+class ADORecordSet_assoc_postgres9 extends ADORecordSet_assoc_postgres8
+{
 	var $databaseType = "postgres9";
-	
-	function ADORecordSet_assoc_postgres9($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres7($queryID,$mode);
-	}
 }
-?>
diff --git a/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php b/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
index 0c068fdc5..3aa6bde90 100644
--- a/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
@@ -1,13 +1,13 @@
 ADORecordset($id,$mode);
 		}
 	};
 } // define
-	
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php b/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
index 731da2169..5a51fa2a3 100644
--- a/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
@@ -1,13 +1,13 @@
 curmode = SQL_CUR_USE_ODBC;
 		$this->ADODB_odbc();
 	}
-	
+
 	function ServerInfo()
 	{
 		$info = ADODB_odbc::ServerInfo();
@@ -52,7 +52,7 @@ class ADODB_SAPDB extends ADODB_odbc {
 
 		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
 	}
-		
+
  	function MetaIndexes ($table, $primary = FALSE, $owner = false)
 	{
 		$table = $this->Quote(strtoupper($table));
@@ -67,7 +67,7 @@ class ADODB_SAPDB extends ADODB_odbc {
         if ($this->fetchMode !== FALSE) {
         	$savem = $this->SetFetchMode(FALSE);
         }
-        
+
         $rs = $this->Execute($sql);
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -91,7 +91,7 @@ class ADODB_SAPDB extends ADODB_odbc {
 		}
         return $indexes;
 	}
-	
+
  	function MetaColumns ($table)
 	{
 		global $ADODB_FETCH_MODE;
@@ -101,7 +101,7 @@ class ADODB_SAPDB extends ADODB_odbc {
         	$savem = $this->SetFetchMode(FALSE);
         }
 		$table = $this->Quote(strtoupper($table));
-		
+
 		$retarr = array();
 		foreach($this->GetAll("SELECT COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER BY pos") as $column)
 		{
@@ -130,7 +130,7 @@ class ADODB_SAPDB extends ADODB_odbc {
 					}
 				}
 			}
-			$retarr[$fld->name] = $fld;	
+			$retarr[$fld->name] = $fld;
 		}
         if (isset($savem)) {
         	$this->SetFetchMode($savem);
@@ -139,14 +139,14 @@ class ADODB_SAPDB extends ADODB_odbc {
 
 		return $retarr;
 	}
-	
+
 	function MetaColumnNames($table)
 	{
 		$table = $this->Quote(strtoupper($table));
 
 		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table ORDER BY pos");
 	}
-	
+
 	// unlike it seems, this depends on the db-session and works in a multiuser environment
 	function _insertid($table,$column)
 	{
@@ -155,25 +155,25 @@ class ADODB_SAPDB extends ADODB_odbc {
 
 	/*
 		SelectLimit implementation problems:
-	
+
 	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
 	 	which is not ideal...
-		
+
 	  		select * from table where rowno < 10 order by 1
-	  
+
 	  	This means that we have to use the adoconnection base class SelectLimit when
 	  	there is an "order by".
-		
+
 		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
 	 */
-	
+
 };
- 
 
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {	
-	
-	var $databaseType = "sapdb";		
-	
+
+class  ADORecordSet_sapdb extends ADORecordSet_odbc {
+
+	var $databaseType = "sapdb";
+
 	function ADORecordSet_sapdb($id,$mode=false)
 	{
 		$this->ADORecordSet_odbc($id,$mode);
@@ -181,4 +181,3 @@ class  ADORecordSet_sapdb extends ADORecordSet_odbc {
 }
 
 } //define
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php b/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
index 8b699d88f..a0a7b86bb 100644
--- a/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
@@ -1,10 +1,10 @@
 load_blobvar_from_var($blobVarName, $varName);
 
@@ -53,9 +53,9 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){
  define('ADODB_SYBASE_SQLANYWHERE',1);
 
  class ADODB_sqlanywhere extends ADODB_odbc {
-  	var $databaseType = "sqlanywhere";	
+  	var $databaseType = "sqlanywhere";
 	var $hasInsertID = true;
-	
+
 	function ADODB_sqlanywhere()
 	{
 		$this->ADODB_odbc();
@@ -152,9 +152,9 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){
   }
  }; //class
 
- class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
+ class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {
 
-  var $databaseType = "sqlanywhere";		
+  var $databaseType = "sqlanywhere";
 
  function ADORecordSet_sqlanywhere($id,$mode=false)
  {
@@ -166,4 +166,3 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){
 
 
 } //define
-?>
diff --git a/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php b/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
index 72764ffdb..e7cf35343 100644
--- a/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
@@ -1,14 +1,14 @@
 fmtDate)."'";
 	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
 	}
   }*/
-	
+
 	function ServerInfo()
 	{
 		$arr['version'] = sqlite_libversion();
@@ -51,34 +51,34 @@ class ADODB_sqlite extends ADOConnection {
 		$arr['encoding'] = sqlite_libencoding();
 		return $arr;
 	}
-	
+
 	function BeginTrans()
-	{	  
-		 if ($this->transOff) return true; 
+	{
+		 if ($this->transOff) return true;
 		 $ret = $this->Execute("BEGIN TRANSACTION");
 		 $this->transCnt += 1;
 		 return true;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		$ret = $this->Execute("COMMIT");
 		if ($this->transCnt>0)$this->transCnt -= 1;
 		return !empty($ret);
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$ret = $this->Execute("ROLLBACK");
 		if ($this->transCnt>0)$this->transCnt -= 1;
 		return !empty($ret);
 	}
-	
+
 	// mark newnham
-	function MetaColumns($table, $normalize=true) 
+	function MetaColumns($table, $normalize=true)
 	{
 	  global $ADODB_FETCH_MODE;
 	  $false = false;
@@ -88,7 +88,7 @@ class ADODB_sqlite extends ADOConnection {
 	  $rs = $this->Execute("PRAGMA table_info('$table')");
 	  if (isset($savem)) $this->SetFetchMode($savem);
 	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
+	    $ADODB_FETCH_MODE = $save;
 	    return $false;
 	  }
 	  $arr = array();
@@ -104,19 +104,19 @@ class ADODB_sqlite extends ADOConnection {
 	    $fld->max_length = $size;
 	    $fld->not_null = $r['notnull'];
 	    $fld->default_value = $r['dflt_value'];
-	    $fld->scale = 0;	
+	    $fld->scale = 0;
 		if (isset($r['pk']) && $r['pk']) $fld->primary_key=1;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
+	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;
 	    else $arr[strtoupper($fld->name)] = $fld;
 	  }
 	  $rs->Close();
 	  $ADODB_FETCH_MODE = $save;
 	  return $arr;
 	}
-	
+
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false;
 		$parentDriver->hasInsertID = true;
 	}
@@ -125,55 +125,55 @@ class ADODB_sqlite extends ADOConnection {
 	{
 		return sqlite_last_insert_rowid($this->_connectionID);
 	}
-	
+
 	function _affectedrows()
 	{
         return sqlite_changes($this->_connectionID);
     }
-	
-	function ErrorMsg() 
+
+	function ErrorMsg()
  	{
 		if ($this->_logsql) return $this->_errorMsg;
 		return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) : '';
 	}
- 
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		return $this->_errorNo;
 	}
-	
+
 	function SQLDate($fmt, $col=false)
 	{
 		$fmt = $this->qstr($fmt);
 		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
 	}
-	
-	
+
+
 	function _createFunctions()
 	{
 		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
 		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
 	}
-	
+
 
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sqlite_open')) return null;
 		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
+
 		$this->_connectionID = sqlite_open($argHostname);
 		if ($this->_connectionID === false) return false;
 		$this->_createFunctions();
 		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sqlite_open')) return null;
 		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
+
 		$this->_connectionID = sqlite_popen($argHostname);
 		if ($this->_connectionID === false) return false;
 		$this->_createFunctions();
@@ -187,11 +187,11 @@ class ADODB_sqlite extends ADOConnection {
 		if (!$rez) {
 			$this->_errorNo = sqlite_last_error($this->_connectionID);
 		}
-		
+
 		return $rez;
 	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
 		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
@@ -199,20 +199,20 @@ class ADODB_sqlite extends ADOConnection {
 	   		$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
 	  	else
 	   		$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-			
+
 		return $rs;
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	var $_genSeqSQL = "create table %s (id integer)";
-	
+
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 		$MAXLOOPS = 100;
@@ -220,14 +220,14 @@ class ADODB_sqlite extends ADOConnection {
 		while (--$MAXLOOPS>=0) {
 			@($num = $this->GetOne("select id from $seq"));
 			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));
 				$start -= 1;
 				$num = '0';
 				$ok = $this->Execute("insert into $seq values($start)");
 				if (!$ok) return false;
-			} 
+			}
 			$this->Execute("update $seq set id=id+1 where id=$num");
-			
+
 			if ($this->affected_rows() > 0) {
 				$num += 1;
 				$this->genID = $num;
@@ -248,14 +248,14 @@ class ADODB_sqlite extends ADOConnection {
 		$start -= 1;
 		return $this->Execute("insert into $seqname values($start)");
 	}
-	
+
 	var $_dropSeqSQL = 'drop table %s';
 	function DropSequence($seqname)
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -275,7 +275,7 @@ class ADODB_sqlite extends ADOConnection {
 		$SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE type='index' AND tbl_name='%s'", strtolower($table));
         $rs = $this->Execute($SQL);
         if (!is_object($rs)) {
-			if (isset($savem)) 
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
             return $false;
@@ -301,7 +301,7 @@ class ADODB_sqlite extends ADOConnection {
 			array_pop($cols);
 			$indexes[$row[0]]['columns'] = $cols;
 		}
-		if (isset($savem)) { 
+		if (isset($savem)) {
             $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
@@ -321,8 +321,8 @@ class ADORecordset_sqlite extends ADORecordSet {
 
 	function ADORecordset_sqlite($queryID,$mode=false)
 	{
-		
-		if ($mode === false) { 
+
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -332,9 +332,9 @@ class ADORecordset_sqlite extends ADORecordSet {
 		default: $this->fetchMode = SQLITE_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		
+
 		$this->_queryID = $queryID;
-	
+
 		$this->_inited = true;
 		$this->fields = array();
 		if ($queryID) {
@@ -346,7 +346,7 @@ class ADORecordset_sqlite extends ADORecordSet {
 			$this->_numOfFields = 0;
 			$this->EOF = true;
 		}
-		
+
 		return $this->_queryID;
 	}
 
@@ -359,7 +359,7 @@ class ADORecordset_sqlite extends ADORecordSet {
 		$fld->max_length = -1;
 		return $fld;
 	}
-	
+
    function _initrs()
    {
 		$this->_numOfRows = @sqlite_num_rows($this->_queryID);
@@ -376,24 +376,23 @@ class ADORecordset_sqlite extends ADORecordSet {
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
    function _seek($row)
    {
    		return sqlite_seek($this->_queryID, $row);
    }
 
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
 		$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
 		return !empty($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php b/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
index 7ed672d87..af8351739 100644
--- a/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
@@ -1,14 +1,14 @@
 fmtDate)."'";
 	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
 	}
   }*/
-	
+
 	function ServerInfo()
 	{
 		$arr['version'] = $this->_connectionID->version(); //**tochange
@@ -54,34 +54,34 @@ class ADODB_sqlite3 extends ADOConnection {
 		//$arr['encoding'] = sqlite_libencoding();//**tochange
 		return $arr;
 	}
-	
+
 	function BeginTrans()
-	{	  
-		 if ($this->transOff) return true; 
+	{
+		 if ($this->transOff) return true;
 		 $ret = $this->Execute("BEGIN TRANSACTION");
 		 $this->transCnt += 1;
 		 return true;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		$ret = $this->Execute("COMMIT");
 		if ($this->transCnt>0)$this->transCnt -= 1;
 		return !empty($ret);
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$ret = $this->Execute("ROLLBACK");
 		if ($this->transCnt>0)$this->transCnt -= 1;
 		return !empty($ret);
 	}
-	
+
 	// mark newnham
-	function MetaColumns($table, $normalize=true) 
+	function MetaColumns($table, $normalize=true)
 	{
 	  global $ADODB_FETCH_MODE;
 	  $false = false;
@@ -91,12 +91,12 @@ class ADODB_sqlite3 extends ADOConnection {
 	  $rs = $this->Execute("PRAGMA table_info('$table')");
 	  if (isset($savem)) $this->SetFetchMode($savem);
 	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
+	    $ADODB_FETCH_MODE = $save;
 	    return $false;
 	  }
 	  $arr = array();
 	  while ($r = $rs->FetchRow()) {
-	  
+
 	    $type = explode('(',$r['type']);
 	    $size = '';
 	    if (sizeof($type)==2)
@@ -110,17 +110,17 @@ class ADODB_sqlite3 extends ADOConnection {
 	    $fld->default_value = $r['dflt_value'];
 	    $fld->scale = 0;
 		if (isset($r['pk']) && $r['pk']) $fld->primary_key=1;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
+	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;
 	    else $arr[strtoupper($fld->name)] = $fld;
 	  }
 	  $rs->Close();
 	  $ADODB_FETCH_MODE = $save;
 	  return $arr;
 	}
-	
+
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false;
 		$parentDriver->hasInsertID = true;
 	}
@@ -130,67 +130,67 @@ class ADODB_sqlite3 extends ADOConnection {
 		//return sqlite_last_insert_rowid($this->_connectionID)->; //**change
 		return $this->_connectionID->lastInsertRowID();
 	}
-	
+
 	function _affectedrows()
 	{
 		return $this->_connectionID->changes();
        //return sqlite3_changes($this->_connectionID); //**tochange
     }
-	
-	function ErrorMsg() 
+
+	function ErrorMsg()
  	{
 		if ($this->_logsql) return $this->_errorMsg;
-		
+
 		return ($this->_errorNo) ? $this->ErrorNo() : ''; //**tochange?
 	}
- 
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		return $this->_connectionID->lastErrorCode(); //**tochange??
 	}
-	
+
 	function SQLDate($fmt, $col=false)
 	{
 		$fmt = $this->qstr($fmt);
 		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
 	}
-	
-	
+
+
 	function _createFunctions()
 	{
 		//@sqlite3_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1); *change
 		$this->_connectionID->createFunction('adodb_date', 'adodb_date', 1);
-		
+
 		//@sqlite3_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);**change
 		$this->_connectionID->createFunction('adodb_date2', 'adodb_date2', 2);
 	}
-	
+
 
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) //**tochange: all the function need to be changed, just hacks for the moment
 	{
-		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename; 
-		$this->_connectionID = new SQLite3($argDatabasename); 
+		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
+		$this->_connectionID = new SQLite3($argDatabasename);
 		$this->_createFunctions();
-		
+
 		return true; // hack
 		/*
 		if (!function_exists('sqlite_open')) return null;
 		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
+
 		$this->_connectionID = sqlite_open($argHostname);
 		if ($this->_connectionID === false) return false;
 		$this->_createFunctions();
 		return true;
 		*/
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) //**tochange
 	{
 		if (!function_exists('sqlite_open')) return null;
 		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
+
 		$this->_connectionID = sqlite_popen($argHostname);
 		if ($this->_connectionID === false) return false;
 		$this->_createFunctions();
@@ -206,11 +206,11 @@ class ADODB_sqlite3 extends ADOConnection {
 			//$this->_errorNo = sqlite3_last_error($this->_connectionID);**change
 			$this->_connectionID->lastErrorCode();
 		}
-		
+
 		return $rez;
 	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
 		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
@@ -218,20 +218,20 @@ class ADODB_sqlite3 extends ADOConnection {
 	   		$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
 	  	else
 	   		$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-			
+
 		return $rs;
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	var $_genSeqSQL = "create table %s (id integer)";
-	
+
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 		$MAXLOOPS = 100;
@@ -239,14 +239,14 @@ class ADODB_sqlite3 extends ADOConnection {
 		while (--$MAXLOOPS>=0) {
 			@($num = $this->GetOne("select id from $seq"));
 			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));
 				$start -= 1;
 				$num = '0';
 				$ok = $this->Execute("insert into $seq values($start)");
 				if (!$ok) return false;
-			} 
+			}
 			$this->Execute("update $seq set id=id+1 where id=$num");
-			
+
 			if ($this->affected_rows() > 0) {
 				$num += 1;
 				$this->genID = $num;
@@ -267,14 +267,14 @@ class ADODB_sqlite3 extends ADOConnection {
 		$start -= 1;
 		return $this->Execute("insert into $seqname values($start)");
 	}
-	
+
 	var $_dropSeqSQL = 'drop table %s';
 	function DropSequence($seqname)
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -295,7 +295,7 @@ class ADODB_sqlite3 extends ADOConnection {
 		$SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE type='index' AND tbl_name='%s'", strtolower($table));
         $rs = $this->Execute($SQL);
         if (!is_object($rs)) {
-			if (isset($savem)) 
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
             return $false;
@@ -321,7 +321,7 @@ class ADODB_sqlite3 extends ADOConnection {
 			array_pop($cols);
 			$indexes[$row[0]]['columns'] = $cols;
 		}
-		if (isset($savem)) { 
+		if (isset($savem)) {
             $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
@@ -344,8 +344,8 @@ class ADORecordset_sqlite3 extends ADORecordSet {
 	//function ADORecordset_sqlite($queryID,$mode=false)**change
 	function ADORecordset_sqlite3($queryID,$mode=false)
 	{
-		
-		if ($mode === false) { 
+
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -358,9 +358,9 @@ class ADORecordset_sqlite3 extends ADORecordSet {
 		default: $this->fetchMode = SQLITE3_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		
+
 		$this->_queryID = $queryID;
-	
+
 		$this->_inited = true;
 		$this->fields = array();
 		if ($queryID) {
@@ -372,7 +372,7 @@ class ADORecordset_sqlite3 extends ADORecordSet {
 			$this->_numOfFields = 0;
 			$this->EOF = true;
 		}
-		
+
 		return $this->_queryID;
 	}
 
@@ -386,14 +386,14 @@ class ADORecordset_sqlite3 extends ADORecordSet {
 		$fld->max_length = -1;
 		return $fld;
 	}
-	
+
    function _initrs()
    {
 		//$this->_numOfRows = @sqlite_num_rows($this->_queryID); **tochange but sqlite3 doesn't implement this!
 		$this->_numOfRows = 1;
 		//$this->_numOfFields = @sqlite3_num_fields($this->_queryID);**change
 		$this->_numOfFields = $this->_queryID->numColumns();
-		
+
    }
 
 	function Fields($colname)
@@ -407,25 +407,24 @@ class ADORecordset_sqlite3 extends ADORecordSet {
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
    function _seek($row)
    {
    		return sqlite3_seek($this->_queryID, $row);//**tochange but sqlite3 seems not to implement seek!
    }
 
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
 		//$this->fields = @sqlite3_fetch_array($this->_queryID,$this->fetchMode);**change
 		$this->fields = $this->_queryID->fetchArray($this->fetchMode);
 		return !empty($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php b/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
index ee601ae9d..f1b8b99e0 100644
--- a/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
@@ -1,6 +1,6 @@
 ADORecordset_sqlite($queryID,$mode);
    }
-   
+
    // Modified to strip table names from returned fields
    function _fetch($ignore_fields=false)
    {
@@ -59,4 +59,3 @@ class ADORecordset_sqlitepo extends ADORecordset_sqlite {
       return !empty($this->fields);
    }
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php b/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
index ebc213ab4..d4ad1eb07 100644
--- a/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
@@ -1,25 +1,25 @@
 GetOne('select @@rowcount');
+		return $this->GetOne('select @@rowcount');
 	}
 
-			  
+
 	function BeginTrans()
-	{	
-	
+	{
+
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		   
+
 		$this->Execute('BEGIN TRAN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if ($this->transOff) return true;
-		
+
 		if (!$ok) return $this->RollbackTrans();
-	
+
 		$this->transCnt -= 1;
 		$this->Execute('COMMIT TRAN');
 		return true;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -84,30 +86,30 @@ class ADODB_sybase extends ADOConnection {
 		$this->Execute('ROLLBACK TRAN');
 		return true;
 	}
-	
+
 	// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
-	function RowLock($tables,$where,$col='top 1 null as ignore') 
+	function RowLock($tables,$where,$col='top 1 null as ignore')
 	{
 		if (!$this->_hastrans) $this->BeginTrans();
 		$tables = str_replace(',',' HOLDLOCK,',$tables);
 		return $this->GetOne("select $col from $tables HOLDLOCK where $where");
-		
-	}	
-		
-	function SelectDB($dbName) 
+
+	}
+
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-			return @sybase_select_db($dbName);		
+			return @sybase_select_db($dbName);
 		}
-		else return false;	
+		else return false;
 	}
 
 	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/	
+		Note: This function is NOT available for Microsoft SQL Server.	*/
+
 
-	
 	function ErrorMsg()
 	{
 		if ($this->_logsql) return $this->_errorMsg;
@@ -122,164 +124,175 @@ class ADODB_sybase extends ADOConnection {
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sybase_connect')) return null;
-		
+
+		// Sybase connection on custom port
+		if ($this->port) {
+			$argHostname .= ':' . $this->port;
+		}
+
 		if ($this->charSet) {
- 			$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword, $this->charSet);
-       	} else {
-       		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
-       	}
+			$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword, $this->charSet);
+		} else {
+			$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
+		}
 
-		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sybase_connect')) return null;
-		
+
+		// Sybase connection on custom port
+		if ($this->port) {
+			$argHostname .= ':' . $this->port;
+		}
+
 		if ($this->charSet) {
- 			$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword, $this->charSet);
-       	} else {
-       		$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
-       	}
+			$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword, $this->charSet);
+		} else {
+			$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
+		}
+
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	// returns query ID if successful, otherwise false
 	function _query($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
 			return sybase_unbuffered_query($sql,$this->_connectionID);
 		else
 			return sybase_query($sql,$this->_connectionID);
 	}
-	
+
 	// See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		if ($secs2cache > 0) {// we do not cache rowcount, so we have to load entire recordset
 			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 			return $rs;
 		}
-		
+
 		$nrows = (integer) $nrows;
 		$offset = (integer) $offset;
-		
+
 		$cnt = ($nrows >= 0) ? $nrows : 999999999;
 		if ($offset > 0 && $cnt) $cnt += $offset;
-		
-		$this->Execute("set rowcount $cnt"); 
+
+		$this->Execute("set rowcount $cnt");
 		$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
 		$this->Execute("set rowcount 0");
-		
+
 		return $rs;
 	}
 
 	// returns true or false
 	function _close()
-	{ 
+	{
 		return @sybase_close($this->_connectionID);
 	}
-	
+
 	static function UnixDate($v)
 	{
 		return ADORecordSet_array_sybase::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}	
-	
-	
+	}
+
+
 
 	# Added 2003-10-05 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    // Format date column in sql string given an input format that understands Y M D
-    function SQLDate($fmt, $col=false)
-    {
-        if (!$col) $col = $this->sysTimeStamp;
-        $s = '';
-
-        $len = strlen($fmt);
-        for ($i=0; $i < $len; $i++) {
-            if ($s) $s .= '+';
-            $ch = $fmt[$i];
-            switch($ch) {
-            case 'Y':
-            case 'y':
-                $s .= "datename(yy,$col)";
-                break;
-            case 'M':
-                $s .= "convert(char(3),$col,0)";
-                break;
-            case 'm':
-                $s .= "str_replace(str(month($col),2),' ','0')";
-                break;
-            case 'Q':
-            case 'q':
-                $s .= "datename(qq,$col)";
-                break;
-            case 'D':
-            case 'd':
-                $s .= "str_replace(str(datepart(dd,$col),2),' ','0')";
-                break;
-            case 'h':
-                $s .= "substring(convert(char(14),$col,0),13,2)";
-                break;
-
-            case 'H':
-                $s .= "str_replace(str(datepart(hh,$col),2),' ','0')";
-                break;
-
-            case 'i':
-                $s .= "str_replace(str(datepart(mi,$col),2),' ','0')";
-                break;
-            case 's':
-                $s .= "str_replace(str(datepart(ss,$col),2),' ','0')";
-                break;
-            case 'a':
-            case 'A':
-                $s .= "substring(convert(char(19),$col,0),18,2)";
-                break;
-
-            default:
-                if ($ch == '\\') {
-                    $i++;
-                    $ch = substr($fmt,$i,1);
-                }
-                $s .= $this->qstr($ch);
-                break;
-            }
-        }
-        return $s;
-    }
-	
+	# Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
+	# to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = '';
+
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '+';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "datename(yy,$col)";
+				break;
+			case 'M':
+				$s .= "convert(char(3),$col,0)";
+				break;
+			case 'm':
+				$s .= "str_replace(str(month($col),2),' ','0')";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "datename(qq,$col)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "str_replace(str(datepart(dd,$col),2),' ','0')";
+				break;
+			case 'h':
+				$s .= "substring(convert(char(14),$col,0),13,2)";
+				break;
+
+			case 'H':
+				$s .= "str_replace(str(datepart(hh,$col),2),' ','0')";
+				break;
+
+			case 'i':
+				$s .= "str_replace(str(datepart(mi,$col),2),' ','0')";
+				break;
+			case 's':
+				$s .= "str_replace(str(datepart(ss,$col),2),' ','0')";
+				break;
+			case 'a':
+			case 'A':
+				$s .= "substring(convert(char(19),$col,0),18,2)";
+				break;
+
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+
 	# Added 2003-10-07 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    function MetaPrimaryKeys($table)
-    {
-        $sql = "SELECT c.column_name " .
-               "FROM syscolumn c, systable t " .
-               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
-               "AND t.table_type='BASE' " .
-               "AND c.pkey = 'Y' " .
-               "ORDER BY c.column_id";
-
-        $a = $this->GetCol($sql);
-        if ($a && sizeof($a)>0) return $a;
-        return false;
-    }
+	# Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
+	# to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
+	function MetaPrimaryKeys($table)
+	{
+		$sql = "SELECT c.column_name " .
+			   "FROM syscolumn c, systable t " .
+			   "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
+			   "AND t.table_type='BASE' " .
+			   "AND c.pkey = 'Y' " .
+			   "ORDER BY c.column_id";
+
+		$a = $this->GetCol($sql);
+		if ($a && sizeof($a)>0) return $a;
+		return false;
+	}
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -288,16 +301,16 @@ $ADODB_sybase_mths = array(
 	'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
 	'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
 
-class ADORecordset_sybase extends ADORecordSet {	
+class ADORecordset_sybase extends ADORecordSet {
 
 	var $databaseType = "sybase";
 	var $canSeek = true;
 	// _mths works only in non-localised system
-	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
+	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
 
 	function ADORecordset_sybase($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -305,12 +318,12 @@ class ADORecordset_sybase extends ADORecordSet {
 		else $this->fetchMode = $mode;
 		$this->ADORecordSet($id,$mode);
 	}
-	
-	/*	Returns: an object containing field information. 
+
+	/*	Returns: an object containing field information.
 		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
 		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
 		fetchField() is retrieved.	*/
-	function FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
 		if ($fieldOffset != -1) {
 			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
@@ -322,25 +335,26 @@ class ADORecordset_sybase extends ADORecordSet {
 		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
 		return $o;
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
 		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
 		$this->_numOfFields = @sybase_num_fields($this->_queryID);
 	}
-	
-	function _seek($row) 
+
+	function _seek($row)
 	{
 		return @sybase_data_seek($this->_queryID, $row);
-	}		
+	}
 
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
 		if ($this->fetchMode == ADODB_FETCH_NUM) {
 			$this->fields = @sybase_fetch_row($this->_queryID);
 		} else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-			$this->fields = @sybase_fetch_row($this->_queryID);
+			$this->fields = @sybase_fetch_assoc($this->_queryID);
+
 			if (is_array($this->fields)) {
 				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 				return true;
@@ -355,19 +369,19 @@ class ADORecordset_sybase extends ADORecordSet {
 
 		return false;
 	}
-	
+
 	/*	close() only needs to be called if you are worried about using too much memory while your script
 		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
 	function _close() {
-		return @sybase_free_result($this->_queryID);		
+		return @sybase_free_result($this->_queryID);
 	}
-	
+
 	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
 		return ADORecordSet_array_sybase::UnixDate($v);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_sybase::UnixTimeStamp($v);
@@ -379,25 +393,25 @@ class ADORecordSet_array_sybase extends ADORecordSet_array {
 	{
 		$this->ADORecordSet_array($id);
 	}
-	
+
 		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
 	global $ADODB_sybase_mths;
-	
+
 		//Dec 30 2000 12:00AM
 		if (!preg_match( "/([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})/"
 			,$v, $rr)) return parent::UnixDate($v);
-			
+
 		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 		$themth = substr(strtoupper($rr[1]),0,3);
 		$themth = $ADODB_sybase_mths[$themth];
 		if ($themth <= 0) return false;
 		// h-m-s-MM-DD-YY
 		return  adodb_mktime(0,0,0,$themth,$rr[2],$rr[3]);
 	}
-	
+
 	static function UnixTimeStamp($v)
 	{
 	global $ADODB_sybase_mths;
@@ -406,11 +420,11 @@ class ADORecordSet_array_sybase extends ADORecordSet_array {
 		if (!preg_match( "/([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})/"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 		$themth = substr(strtoupper($rr[1]),0,3);
 		$themth = $ADODB_sybase_mths[$themth];
 		if ($themth <= 0) return false;
-		
+
 		switch (strtoupper($rr[6])) {
 		case 'P':
 			if ($rr[4]<12) $rr[4] += 12;
@@ -425,4 +439,3 @@ class ADORecordSet_array_sybase extends ADORecordSet_array {
 		return  adodb_mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
 	}
 }
-?>
diff --git a/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php b/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
index baf68e220..28de2dd43 100644
--- a/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
@@ -1,12 +1,12 @@
 metaTablesSQL) {
 			// complicated state saving by the need for backward compat
-			
+
 			if ($ttype == 'VIEWS'){
 						$sql = str_replace('U', 'V', $this->metaTablesSQL);
 			}elseif (false === $ttype){
 						$sql = str_replace('U',"U' OR type='V", $this->metaTablesSQL);
-			}else{ // TABLES OR ANY OTHER 
+			}else{ // TABLES OR ANY OTHER
 						$sql = $this->metaTablesSQL;
 			}
 			$rs = $this->Execute($sql);
-			
+
 			if ($rs === false || !method_exists($rs, 'GetArray')){
 					return $false;
 			}
@@ -71,11 +71,11 @@ class ADODB_sybase_ase extends ADODB_sybase {
 	}
 
 	// fix a bug which prevent the metaColumns query to be executed for Sybase ASE
-	function MetaColumns($table,$upper=false) 
+	function MetaColumns($table,$upper=false)
 	{
 		$false = false;
 		if (!empty($this->metaColumnsSQL)) {
-		
+
 			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
 			if ($rs === false) return $false;
 
@@ -89,11 +89,11 @@ class ADODB_sybase_ase extends ADODB_sybase {
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return $false;
 	}
-	
+
 	function getProcedureList($schema)
 	{
 			return false;
@@ -104,7 +104,7 @@ class ADODB_sybase_ase extends ADODB_sybase {
 		if (!function_exists('sybase_connect')){
 				return 'Your PHP doesn\'t contain the Sybase connection module!';
 		}
-		return parent::ErrorMsg();	
+		return parent::ErrorMsg();
 	}
 }
 
@@ -114,6 +114,5 @@ function ADORecordset_sybase_ase($id,$mode=false)
 	{
 		$this->ADORecordSet_sybase($id,$mode);
 	}
-	
+
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php b/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
index a035e5219..9b7798b05 100644
--- a/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
@@ -1,13 +1,13 @@
 ADODB_odbc();
 	}
-	
+
 	function Time()
 	{
 		return time();
 	}
-	
+
 	function BeginTrans() { return false;}
-	
+
 	// quote string to be sent back to database
 	function qstr($s,$nofixquotes=false)
 	{
@@ -53,7 +53,7 @@ class ADODB_vfp extends ADODB_odbc {
 		return "'".$s."'";
 	}
 
-	
+
 	// TOP requires ORDER BY for VFP
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
@@ -61,17 +61,17 @@ class ADODB_vfp extends ADODB_odbc {
 		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
-	
+
 
 
 };
- 
 
-class  ADORecordSet_vfp extends ADORecordSet_odbc {	
-	
-	var $databaseType = "vfp";		
 
-	
+class  ADORecordSet_vfp extends ADORecordSet_odbc {
+
+	var $databaseType = "vfp";
+
+
 	function ADORecordSet_vfp($id,$mode=false)
 	{
 		return $this->ADORecordSet_odbc($id,$mode);
@@ -89,19 +89,18 @@ class  ADORecordSet_vfp extends ADORecordSet_odbc {
 			if ($len <= $this->blobSize) return 'C';
 		case 'M':
 			return 'X';
-			 
+
 		case 'D': return 'D';
-		
+
 		case 'T': return 'T';
-		
+
 		case 'L': return 'L';
-		
+
 		case 'I': return 'I';
-		
+
 		default: return 'N';
 		}
 	}
 }
 
 } //define
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-ar.inc.php b/lib/WikiDB/adodb/lang/adodb-ar.inc.php
new file mode 100644
index 000000000..2189778e8
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-ar.inc.php
@@ -0,0 +1,32 @@
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'			    => 'ar',
+	    DB_ERROR			=> 'ÎØà ÛíÑ ãÍÏÏ',
+	    DB_ERROR_ALREADY_EXISTS	=> 'ãæÌæÏ ãÓÈÞÇ',
+	    DB_ERROR_CANNOT_CREATE	=> 'áÇ íãßä ÅäÔÇÁ',
+	    DB_ERROR_CANNOT_DELETE	=> 'áÇ íãßä ÍÐÝ',
+	    DB_ERROR_CANNOT_DROP	=> 'áÇ íãßä ÍÐÝ',
+	    DB_ERROR_CONSTRAINT 	=> 'ÚãáíÉ ÅÏÎÇá ããäæÚÉ',
+	    DB_ERROR_DIVZERO		=> 'ÚãáíÉ ÇáÊÞÓíã Úáì ÕÝÑ',
+	    DB_ERROR_INVALID		=> 'ÛíÑ ÕÍíÍ',
+	    DB_ERROR_INVALID_DATE	=> 'ÕíÛÉ æÞÊ Ãæ ÊÇÑíÎ ÛíÑ ÕÍíÍÉ',
+	    DB_ERROR_INVALID_NUMBER	=> 'ÕíÛÉ ÑÞã ÛíÑ ÕÍíÍÉ',
+	    DB_ERROR_MISMATCH		=> 'ÛíÑ ãÊØÇÈÞ',
+	    DB_ERROR_NODBSELECTED	=> 'áã íÊã ÅÎÊíÇÑ ÞÇÚÏÉ ÇáÈíÇäÇÊ ÈÚÏ',
+	    DB_ERROR_NOSUCHFIELD	=> 'áíÓ åäÇáß ÍÞá ÈåÐÇ ÇáÇÓã',
+	    DB_ERROR_NOSUCHTABLE	=> 'áíÓ åäÇáß ÌÏæá ÈåÐÇ ÇáÇÓã',
+	    DB_ERROR_NOT_CAPABLE	=> 'ÞÇÚÏÉ ÇáÈíÇäÇÊ ÇáãÑÊÈØ ÈåÇ ÛíÑ ÞÇÏÑÉ',
+	    DB_ERROR_NOT_FOUND		=> 'áã íÊã ÅíÌÇÏå',
+	    DB_ERROR_NOT_LOCKED 	=> 'ÛíÑ ãÞÝæá',
+	    DB_ERROR_SYNTAX		=> 'ÎØÃ Ýí ÇáÕíÛÉ',
+	    DB_ERROR_UNSUPPORTED	=> 'ÛíÑ ãÏÚæã',
+	    DB_ERROR_VALUE_COUNT_ON_ROW => 'ÚÏÏ ÇáÞíã Ýí ÇáÓÌá',
+	    DB_ERROR_INVALID_DSN	=> 'DSN ÛíÑ ÕÍíÍ',
+	    DB_ERROR_CONNECT_FAILED	=> 'ÝÔá ÚãáíÉ ÇáÅÊÕÇá',
+	    0			       => 'áíÓ åäÇáß ÃÎØÇÁ', // DB_OK
+	    DB_ERROR_NEED_MORE_DATA	=> 'ÇáÈíÇäÇÊ ÇáãÒæÏÉ ÛíÑ ßÇÝíÉ',
+	    DB_ERROR_EXTENSION_NOT_FOUND=> 'áã íÊã ÅíÌÇÏ ÇáÅÖÇÝÉ ÇáãÊÚáÞÉ',
+	    DB_ERROR_NOSUCHDB		=> 'áíÓ åäÇáß ÞÇÚÏÉ ÈíÇäÇÊ ÈåÐÇ ÇáÇÓã',
+	    DB_ERROR_ACCESS_VIOLATION	=> 'ÓãÇÍíÇÊ ÛíÑ ßÇÝíÉ'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-bg.inc.php b/lib/WikiDB/adodb/lang/adodb-bg.inc.php
new file mode 100644
index 000000000..c8bf07f3a
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-bg.inc.php
@@ -0,0 +1,36 @@
+
+*/
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'bg',
+            DB_ERROR                    => 'íåèçâåñòíà ãðåøêà',
+            DB_ERROR_ALREADY_EXISTS     => 'âå÷å ñúùåñòâóâà',
+            DB_ERROR_CANNOT_CREATE      => 'íå ìîæå äà áúäå ñúçäàäåíà',
+            DB_ERROR_CANNOT_DELETE      => 'íå ìîæå äà áúäå èçòðèòà',
+            DB_ERROR_CANNOT_DROP        => 'íå ìîæå äà áúäå óíèùîæåíà',
+            DB_ERROR_CONSTRAINT         => 'íàðóøåíî óñëîâèå',
+            DB_ERROR_DIVZERO            => 'äåëåíèå íà íóëà',
+            DB_ERROR_INVALID            => 'íåïðàâèëíî',
+            DB_ERROR_INVALID_DATE       => 'íåêîðåêòíà äàòà èëè ÷àñ',
+            DB_ERROR_INVALID_NUMBER     => 'íåâàëèäåí íîìåð',
+            DB_ERROR_MISMATCH           => 'ïîãðåøíà óïîòðåáà',
+            DB_ERROR_NODBSELECTED       => 'íå å èçáðàíà áàçà äàííè',
+            DB_ERROR_NOSUCHFIELD        => 'íåñúùåñòâóâàùî ïîëå',
+            DB_ERROR_NOSUCHTABLE        => 'íåñúùåñòâóâàùà òàáëèöà',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+            DB_ERROR_NOT_FOUND          => 'íå å íàìåðåíà',
+            DB_ERROR_NOT_LOCKED         => 'íå å çàêëþ÷åíà',
+            DB_ERROR_SYNTAX             => 'ãðåøåí ñèíòàêñèñ',
+            DB_ERROR_UNSUPPORTED        => 'íå ñå ïîääúðæà',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'íåêîðåêòåí áðîé êîëîíè â ðåäà',
+            DB_ERROR_INVALID_DSN        => 'íåâàëèäåí DSN',
+            DB_ERROR_CONNECT_FAILED     => 'âðúçêàòà íå ìîæå äà áúäå îñúùåñòâåíà',
+            0	                        => 'íÿìà ãðåøêè', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ïðåäîñòàâåíèòå äàííè ñà íåäîñòàòú÷íè',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'ðàçøèðåíèåòî íå å íàìåðåíî',
+            DB_ERROR_NOSUCHDB           => 'íåñúùåñòâóâàùà áàçà äàííè',
+            DB_ERROR_ACCESS_VIOLATION   => 'íÿìàòå äîñòàòú÷íî ïðàâà'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php b/lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php
new file mode 100644
index 000000000..297e6c9bd
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php
@@ -0,0 +1,36 @@
+
+*/
+
+$ADODB_LANG_ARRAY = array (
+            'LANG'                      => 'bgutf8',
+            DB_ERROR                    => 'неизвестна грешка',
+            DB_ERROR_ALREADY_EXISTS     => 'вече съществува',
+            DB_ERROR_CANNOT_CREATE      => 'не може да бъде създадена',
+            DB_ERROR_CANNOT_DELETE      => 'не може да бъде изтрита',
+            DB_ERROR_CANNOT_DROP        => 'не може да бъде унищожена',
+            DB_ERROR_CONSTRAINT         => 'нарушено условие',
+            DB_ERROR_DIVZERO            => 'деление на нула',
+            DB_ERROR_INVALID            => 'неправилно',
+            DB_ERROR_INVALID_DATE       => 'некоректна дата или час',
+            DB_ERROR_INVALID_NUMBER     => 'невалиден номер',
+            DB_ERROR_MISMATCH           => 'погрешна употреба',
+            DB_ERROR_NODBSELECTED       => 'не е избрана база данни',
+            DB_ERROR_NOSUCHFIELD        => 'несъществуващо поле',
+            DB_ERROR_NOSUCHTABLE        => 'несъществуваща таблица',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+            DB_ERROR_NOT_FOUND          => 'не е намерена',
+            DB_ERROR_NOT_LOCKED         => 'не е заключена',
+            DB_ERROR_SYNTAX             => 'грешен синтаксис',
+            DB_ERROR_UNSUPPORTED        => 'не се поддържа',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'некоректен брой колони в реда',
+            DB_ERROR_INVALID_DSN        => 'невалиден DSN',
+            DB_ERROR_CONNECT_FAILED     => 'връзката не може да бъде осъществена',
+            0	                        => 'няма грешки', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'предоставените данни са недостатъчни',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'разширението не е намерено',
+            DB_ERROR_NOSUCHDB           => 'несъществуваща база данни',
+            DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-ca.inc.php b/lib/WikiDB/adodb/lang/adodb-ca.inc.php
new file mode 100644
index 000000000..ea48d43a5
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-ca.inc.php
@@ -0,0 +1,33 @@
+ 'ca',
+            DB_ERROR                    => 'error desconegut',
+            DB_ERROR_ALREADY_EXISTS     => 'ja existeix',
+            DB_ERROR_CANNOT_CREATE      => 'no es pot crear',
+            DB_ERROR_CANNOT_DELETE      => 'no es pot esborrar',
+            DB_ERROR_CANNOT_DROP        => 'no es pot eliminar',
+            DB_ERROR_CONSTRAINT         => 'violació de constraint',
+            DB_ERROR_DIVZERO            => 'divisió per zero',
+            DB_ERROR_INVALID            => 'no és vàlid',
+            DB_ERROR_INVALID_DATE       => 'la data o l\'hora no són vàlides',
+            DB_ERROR_INVALID_NUMBER     => 'el nombre no és vàlid',
+            DB_ERROR_MISMATCH           => 'no hi ha coincidència',
+            DB_ERROR_NODBSELECTED       => 'cap base de dades seleccionada',
+            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
+            DB_ERROR_NOSUCHTABLE        => 'taula inexistent',
+            DB_ERROR_NOT_CAPABLE        => 'l\'execució secundària de DB no pot',
+            DB_ERROR_NOT_FOUND          => 'no trobat',
+            DB_ERROR_NOT_LOCKED         => 'no blocat',
+            DB_ERROR_SYNTAX             => 'error de sintaxi',
+            DB_ERROR_UNSUPPORTED        => 'no suportat',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'el nombre de columnes no coincideix amb el nombre de valors en la fila',
+            DB_ERROR_INVALID_DSN        => 'el DSN no és vàlid',
+            DB_ERROR_CONNECT_FAILED     => 'connexió fallida',
+            0	                       => 'cap error', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'les dades subministrades són insuficients',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensió no trobada',
+            DB_ERROR_NOSUCHDB           => 'base de dades inexistent',
+            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficients'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-cn.inc.php b/lib/WikiDB/adodb/lang/adodb-cn.inc.php
new file mode 100644
index 000000000..34fc114ec
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-cn.inc.php
@@ -0,0 +1,34 @@
+ 'cn',
+            DB_ERROR                    => 'δ֪´íÎó',
+            DB_ERROR_ALREADY_EXISTS     => 'ÒѾ­´æÔÚ',
+            DB_ERROR_CANNOT_CREATE      => '²»ÄÜ´´½¨',
+            DB_ERROR_CANNOT_DELETE      => '²»ÄÜɾ³ý',
+            DB_ERROR_CANNOT_DROP        => '²»ÄܶªÆú',
+            DB_ERROR_CONSTRAINT         => 'Ô¼ÊøÏÞÖÆ',
+            DB_ERROR_DIVZERO            => '±»0³ý',
+            DB_ERROR_INVALID            => 'ÎÞЧ',
+            DB_ERROR_INVALID_DATE       => 'ÎÞЧµÄÈÕÆÚ»òÕßʱ¼ä',
+            DB_ERROR_INVALID_NUMBER     => 'ÎÞЧµÄÊý×Ö',
+            DB_ERROR_MISMATCH           => '²»Æ¥Åä',
+            DB_ERROR_NODBSELECTED       => 'ûÓÐÊý¾Ý¿â±»Ñ¡Ôñ',
+            DB_ERROR_NOSUCHFIELD        => 'ûÓÐÏàÓ¦µÄ×Ö¶Î',
+            DB_ERROR_NOSUCHTABLE        => 'ûÓÐÏàÓ¦µÄ±í',
+            DB_ERROR_NOT_CAPABLE        => 'Êý¾Ý¿âºǫ́²»¼æÈÝ',
+            DB_ERROR_NOT_FOUND          => 'ûÓз¢ÏÖ',
+            DB_ERROR_NOT_LOCKED         => 'ûÓб»Ëø¶¨',
+            DB_ERROR_SYNTAX             => 'Óï·¨´íÎó',
+            DB_ERROR_UNSUPPORTED        => '²»Ö§³Ö',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'ÔÚÐÐÉÏÀÛ¼ÆÖµ',
+            DB_ERROR_INVALID_DSN        => 'ÎÞЧµÄÊý¾ÝÔ´ (DSN)',
+            DB_ERROR_CONNECT_FAILED     => 'Á¬½Óʧ°Ü',
+            0	                       => 'ûÓдíÎó', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ÌṩµÄÊý¾Ý²»ÄÜ·ûºÏÒªÇó',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'À©Õ¹Ã»Óб»·¢ÏÖ',
+            DB_ERROR_NOSUCHDB           => 'ûÓÐÏàÓ¦µÄÊý¾Ý¿â',
+            DB_ERROR_ACCESS_VIOLATION   => 'ûÓкÏÊʵÄȨÏÞ'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-cz.inc.php b/lib/WikiDB/adodb/lang/adodb-cz.inc.php
new file mode 100644
index 000000000..62beacdd3
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-cz.inc.php
@@ -0,0 +1,39 @@
+
+
+$ADODB_LANG_ARRAY = array (
+            'LANG'                      => 'cz',
+            DB_ERROR                    => 'neznámá chyba',
+            DB_ERROR_ALREADY_EXISTS     => 'ji? existuje',
+            DB_ERROR_CANNOT_CREATE      => 'nelze vytvo?it',
+            DB_ERROR_CANNOT_DELETE      => 'nelze smazat',
+            DB_ERROR_CANNOT_DROP        => 'nelze odstranit',
+            DB_ERROR_CONSTRAINT         => 'poru?ení omezující podmínky',
+            DB_ERROR_DIVZERO            => 'd?lení nulou',
+            DB_ERROR_INVALID            => 'neplatné',
+            DB_ERROR_INVALID_DATE       => 'neplatné datum nebo ?as',
+            DB_ERROR_INVALID_NUMBER     => 'neplatné ?íslo',
+            DB_ERROR_MISMATCH           => 'nesouhlasí',
+            DB_ERROR_NODBSELECTED       => '?ádná databáze není vybrána',
+            DB_ERROR_NOSUCHFIELD        => 'pole nenalezeno',
+            DB_ERROR_NOSUCHTABLE        => 'tabulka nenalezena',
+            DB_ERROR_NOT_CAPABLE        => 'nepodporováno',
+            DB_ERROR_NOT_FOUND          => 'nenalezeno',
+            DB_ERROR_NOT_LOCKED         => 'nezam?eno',
+            DB_ERROR_SYNTAX             => 'syntaktická chyba',
+            DB_ERROR_UNSUPPORTED        => 'nepodporováno',
+            DB_ERROR_VALUE_COUNT_ON_ROW => '',
+            DB_ERROR_INVALID_DSN        => 'neplatné DSN',
+            DB_ERROR_CONNECT_FAILED     => 'p?ipojení selhalo',
+            0	                        => 'bez chyb', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'málo zdrojových dat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'roz?í?ení nenalezeno',
+            DB_ERROR_NOSUCHDB           => 'databáze neexistuje',
+            DB_ERROR_ACCESS_VIOLATION   => 'nedostate?ná práva'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-da.inc.php b/lib/WikiDB/adodb/lang/adodb-da.inc.php
index ca0e72d61..3c336fbf3 100644
--- a/lib/WikiDB/adodb/lang/adodb-da.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-da.inc.php
@@ -30,4 +30,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'database ikke fundet',
             DB_ERROR_ACCESS_VIOLATION   => 'utilstrækkelige rettigheder'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-de.inc.php b/lib/WikiDB/adodb/lang/adodb-de.inc.php
index 44c57e9ff..8923e7155 100644
--- a/lib/WikiDB/adodb/lang/adodb-de.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-de.inc.php
@@ -30,4 +30,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'keine Datenbank',
             DB_ERROR_ACCESS_VIOLATION   => 'ungen¨gende Rechte'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-en.inc.php b/lib/WikiDB/adodb/lang/adodb-en.inc.php
index 498cb2e15..05828554c 100644
--- a/lib/WikiDB/adodb/lang/adodb-en.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-en.inc.php
@@ -33,4 +33,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_STATEMENT_TIMEOUT  => 'statement timeout',
             DB_ERROR_SERIALIZATION_FAILURE => 'could not serialize access'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-es.inc.php b/lib/WikiDB/adodb/lang/adodb-es.inc.php
index 1e0afbb40..a80a64415 100644
--- a/lib/WikiDB/adodb/lang/adodb-es.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-es.inc.php
@@ -30,4 +30,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'base de datos no encontrada',
             DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficientes'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php b/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php
index 16ca00e2f..2ec11231f 100644
--- a/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php
@@ -1,5 +1,5 @@
  'datumbazo ne ekzistas',
             DB_ERROR_ACCESS_VIOLATION   => 'ne suficxe da rajto por atingo'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-fa.inc.php b/lib/WikiDB/adodb/lang/adodb-fa.inc.php
index a58a21cc6..7fa46183e 100644
--- a/lib/WikiDB/adodb/lang/adodb-fa.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-fa.inc.php
@@ -32,4 +32,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'چنین بانک اطلاعاتی وجود ندارد',
             DB_ERROR_ACCESS_VIOLATION   => 'حق دسترسی ناکافی'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-fr.inc.php b/lib/WikiDB/adodb/lang/adodb-fr.inc.php
index 11127cd60..3fbc2f444 100644
--- a/lib/WikiDB/adodb/lang/adodb-fr.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-fr.inc.php
@@ -30,4 +30,3 @@ $ADODB_LANG_ARRAY = array (
 	DB_ERROR_NOSUCHDB           => 'base de données inconnue',
 	DB_ERROR_ACCESS_VIOLATION   => 'droits insuffisants'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-hu.inc.php b/lib/WikiDB/adodb/lang/adodb-hu.inc.php
new file mode 100644
index 000000000..f7c7a6d3e
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-hu.inc.php
@@ -0,0 +1,33 @@
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'hu',
+            DB_ERROR                    => 'ismeretlen hiba',
+            DB_ERROR_ALREADY_EXISTS     => 'már létezik',
+            DB_ERROR_CANNOT_CREATE      => 'nem sikerült létrehozni',
+            DB_ERROR_CANNOT_DELETE      => 'nem sikerült törölni',
+            DB_ERROR_CANNOT_DROP        => 'nem sikerült eldobni',
+            DB_ERROR_CONSTRAINT         => 'szabályok megszegése',
+            DB_ERROR_DIVZERO            => 'osztás nullával',
+            DB_ERROR_INVALID            => 'érvénytelen',
+            DB_ERROR_INVALID_DATE       => 'érvénytelen dátum vagy idõ',
+            DB_ERROR_INVALID_NUMBER     => 'érvénytelen szám',
+            DB_ERROR_MISMATCH           => 'nem megfelelõ',
+            DB_ERROR_NODBSELECTED       => 'nincs kiválasztott adatbázis',
+            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mezõ',
+            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen tábla',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend nem támogatja',
+            DB_ERROR_NOT_FOUND          => 'nem található',
+            DB_ERROR_NOT_LOCKED         => 'nincs lezárva',
+            DB_ERROR_SYNTAX             => 'szintaktikai hiba',
+            DB_ERROR_UNSUPPORTED        => 'nem támogatott',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron végzett érték számlálás',
+            DB_ERROR_INVALID_DSN        => 'hibás DSN',
+            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakozás',
+            0	                       => 'nincs hiba', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'túl kevés az adat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'bõvítmény nem található',
+            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatbázis',
+            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosultság'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-it.inc.php b/lib/WikiDB/adodb/lang/adodb-it.inc.php
index ac5cc5a7d..b7f8048c7 100644
--- a/lib/WikiDB/adodb/lang/adodb-it.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-it.inc.php
@@ -1,5 +1,5 @@
  'it',
@@ -31,4 +31,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'database non trovato',
             DB_ERROR_ACCESS_VIOLATION   => 'permessi insufficienti'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-nl.inc.php b/lib/WikiDB/adodb/lang/adodb-nl.inc.php
index abe77b528..43e3ee694 100644
--- a/lib/WikiDB/adodb/lang/adodb-nl.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-nl.inc.php
@@ -30,4 +30,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'onbekende database',
             DB_ERROR_ACCESS_VIOLATION   => 'onvoldoende rechten'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-pl.inc.php b/lib/WikiDB/adodb/lang/adodb-pl.inc.php
new file mode 100644
index 000000000..96bc9197b
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-pl.inc.php
@@ -0,0 +1,34 @@
+
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'pl',
+            DB_ERROR                    => 'niezidentyfikowany b³±d',
+            DB_ERROR_ALREADY_EXISTS     => 'ju¿ istniej±',
+            DB_ERROR_CANNOT_CREATE      => 'nie mo¿na stworzyæ',
+            DB_ERROR_CANNOT_DELETE      => 'nie mo¿na usun±æ',
+            DB_ERROR_CANNOT_DROP        => 'nie mo¿na porzuciæ',
+            DB_ERROR_CONSTRAINT         => 'pogwa³cenie uprawnieñ',
+            DB_ERROR_DIVZERO            => 'dzielenie przez zero',
+            DB_ERROR_INVALID            => 'b³êdny',
+            DB_ERROR_INVALID_DATE       => 'b³êdna godzina lub data',
+            DB_ERROR_INVALID_NUMBER     => 'b³êdny numer',
+            DB_ERROR_MISMATCH           => 'niedopasowanie',
+            DB_ERROR_NODBSELECTED       => 'baza danych nie zosta³a wybrana',
+            DB_ERROR_NOSUCHFIELD        => 'nie znaleziono pola',
+            DB_ERROR_NOSUCHTABLE        => 'nie znaleziono tabeli',
+            DB_ERROR_NOT_CAPABLE        => 'nie zdolny',
+            DB_ERROR_NOT_FOUND          => 'nie znaleziono',
+            DB_ERROR_NOT_LOCKED         => 'nie zakmniêty',
+            DB_ERROR_SYNTAX             => 'b³±d sk³adni',
+            DB_ERROR_UNSUPPORTED        => 'nie obs³uguje',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'warto¶æ liczona w szeregu',
+            DB_ERROR_INVALID_DSN        => 'b³êdny DSN',
+            DB_ERROR_CONNECT_FAILED     => 'po³±czenie nie zosta³o zrealizowane',
+            0	                       => 'brak b³êdów', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilo¶æ informacji',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'nie znaleziono rozszerzenia',
+            DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
+            DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-pt-br.inc.php b/lib/WikiDB/adodb/lang/adodb-pt-br.inc.php
new file mode 100644
index 000000000..865881f6f
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-pt-br.inc.php
@@ -0,0 +1,34 @@
+ 'pt-br',
+            DB_ERROR                    => 'erro desconhecido',
+            DB_ERROR_ALREADY_EXISTS     => 'já existe',
+            DB_ERROR_CANNOT_CREATE      => 'impossível criar',
+            DB_ERROR_CANNOT_DELETE      => 'impossível excluír',
+            DB_ERROR_CANNOT_DROP        => 'impossível remover',
+            DB_ERROR_CONSTRAINT         => 'violação do confinamente',
+            DB_ERROR_DIVZERO            => 'divisão por zero',
+            DB_ERROR_INVALID            => 'inválido',
+            DB_ERROR_INVALID_DATE       => 'data ou hora inválida',
+            DB_ERROR_INVALID_NUMBER     => 'número inválido',
+            DB_ERROR_MISMATCH           => 'erro',
+            DB_ERROR_NODBSELECTED       => 'nenhum banco de dados selecionado',
+            DB_ERROR_NOSUCHFIELD        => 'campo inválido',
+            DB_ERROR_NOSUCHTABLE        => 'tabela inexistente',
+            DB_ERROR_NOT_CAPABLE        => 'capacidade inválida para este BD',
+            DB_ERROR_NOT_FOUND          => 'não encontrado',
+            DB_ERROR_NOT_LOCKED         => 'não bloqueado',
+            DB_ERROR_SYNTAX             => 'erro de sintaxe',
+            DB_ERROR_UNSUPPORTED        =>
+'não suportado',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'a quantidade de colunas não corresponde ao de valores',
+            DB_ERROR_INVALID_DSN        => 'DSN inválido',
+            DB_ERROR_CONNECT_FAILED     => 'falha na conexão',
+            0				=> 'sem erro', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'dados insuficientes',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensão não encontrada',
+            DB_ERROR_NOSUCHDB           => 'banco de dados não encontrado',
+            DB_ERROR_ACCESS_VIOLATION   => 'permissão insuficiente'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-ro.inc.php b/lib/WikiDB/adodb/lang/adodb-ro.inc.php
index bcd7d1322..b6ddd3132 100644
--- a/lib/WikiDB/adodb/lang/adodb-ro.inc.php
+++ b/lib/WikiDB/adodb/lang/adodb-ro.inc.php
@@ -32,4 +32,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'nu exista baza de date',
             DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
 );
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/lang/adodb-ru1251.inc.php b/lib/WikiDB/adodb/lang/adodb-ru1251.inc.php
new file mode 100644
index 000000000..c0ce5f2dc
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-ru1251.inc.php
@@ -0,0 +1,34 @@
+ 'ru1251',
+            DB_ERROR                    => 'íåèçâåñòíàÿ îøèáêà',
+            DB_ERROR_ALREADY_EXISTS     => 'óæå ñóùåñòâóåò',
+            DB_ERROR_CANNOT_CREATE      => 'íåâîçìîæíî ñîçäàòü',
+            DB_ERROR_CANNOT_DELETE      => 'íåâîçìîæíî óäàëèòü',
+            DB_ERROR_CANNOT_DROP        => 'íåâîçìîæíî óäàëèòü (drop)',
+            DB_ERROR_CONSTRAINT         => 'íàðóøåíèå óñëîâèé ïðîâåðêè',
+            DB_ERROR_DIVZERO            => 'äåëåíèå íà 0',
+            DB_ERROR_INVALID            => 'íåïðàâèëüíî',
+            DB_ERROR_INVALID_DATE       => 'íåêîððåêòíàÿ äàòà èëè âðåìÿ',
+            DB_ERROR_INVALID_NUMBER     => 'íåêîððåêòíîå ÷èñëî',
+            DB_ERROR_MISMATCH           => 'îøèáêà',
+            DB_ERROR_NODBSELECTED       => 'ÁÄ íå âûáðàíà',
+            DB_ERROR_NOSUCHFIELD        => 'íå ñóùåñòâóåò ïîëå',
+            DB_ERROR_NOSUCHTABLE        => 'íå ñóùåñòâóåò òàáëèöà',
+            DB_ERROR_NOT_CAPABLE        => 'ÑÓÁÄ íå â ñîñòîÿíèè',
+            DB_ERROR_NOT_FOUND          => 'íå íàéäåíî',
+            DB_ERROR_NOT_LOCKED         => 'íå çàáëîêèðîâàíî',
+            DB_ERROR_SYNTAX             => 'ñèíòàêñè÷åñêàÿ îøèáêà',
+            DB_ERROR_UNSUPPORTED        => 'íå ïîääåðæèâàåòñÿ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'ñ÷åò÷èê çíà÷åíèé â ñòðîêå',
+            DB_ERROR_INVALID_DSN        => 'íåïðàâèëüíàÿ DSN',
+            DB_ERROR_CONNECT_FAILED     => 'ñîåäèíåíèå íåóñïåøíî',
+            0                               => 'íåò îøèáêè', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ïðåäîñòàâëåíî íåäîñòàòî÷íî äàííûõ',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'ðàñøèðåíèå íå íàéäåíî',
+            DB_ERROR_NOSUCHDB           => 'íå ñóùåñòâóåò ÁÄ',
+            DB_ERROR_ACCESS_VIOLATION   => 'íåäîñòàòî÷íî ïðàâ äîñòóïà'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-sv.inc.php b/lib/WikiDB/adodb/lang/adodb-sv.inc.php
new file mode 100644
index 000000000..37cef4e8b
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-sv.inc.php
@@ -0,0 +1,32 @@
+ 'en',
+            DB_ERROR                    => 'Okänt fel',
+            DB_ERROR_ALREADY_EXISTS     => 'finns redan',
+            DB_ERROR_CANNOT_CREATE      => 'kan inte skapa',
+            DB_ERROR_CANNOT_DELETE      => 'kan inte ta bort',
+            DB_ERROR_CANNOT_DROP        => 'kan inte släppa',
+            DB_ERROR_CONSTRAINT         => 'begränsning kränkt',
+            DB_ERROR_DIVZERO            => 'division med noll',
+            DB_ERROR_INVALID            => 'ogiltig',
+            DB_ERROR_INVALID_DATE       => 'ogiltigt datum eller tid',
+            DB_ERROR_INVALID_NUMBER     => 'ogiltigt tal',
+            DB_ERROR_MISMATCH           => 'felaktig matchning',
+            DB_ERROR_NODBSELECTED       => 'ingen databas vald',
+            DB_ERROR_NOSUCHFIELD        => 'inget sådant fält',
+            DB_ERROR_NOSUCHTABLE        => 'ingen sådan tabell',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend klarar det inte',
+            DB_ERROR_NOT_FOUND          => 'finns inte',
+            DB_ERROR_NOT_LOCKED         => 'inte låst',
+            DB_ERROR_SYNTAX             => 'syntaxfel',
+            DB_ERROR_UNSUPPORTED        => 'stöds ej',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'värde räknat på rad',
+            DB_ERROR_INVALID_DSN        => 'ogiltig DSN',
+            DB_ERROR_CONNECT_FAILED     => 'anslutning misslyckades',
+            0	                       => 'inget fel', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'otillräckligt med data angivet',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'utökning hittades ej',
+            DB_ERROR_NOSUCHDB           => 'ingen sådan databas',
+            DB_ERROR_ACCESS_VIOLATION   => 'otillräckliga rättigheter'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb-uk1251.inc.php b/lib/WikiDB/adodb/lang/adodb-uk1251.inc.php
new file mode 100644
index 000000000..01002b7d7
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb-uk1251.inc.php
@@ -0,0 +1,34 @@
+ 'uk1251',
+            DB_ERROR                    => 'íåâ³äîìà ïîìèëêà',
+            DB_ERROR_ALREADY_EXISTS     => 'âæå ³ñíóº',
+            DB_ERROR_CANNOT_CREATE      => 'íåìîæëèâî ñòâîðèòè',
+            DB_ERROR_CANNOT_DELETE      => 'íåìîæëèâî âèäàëèòè',
+            DB_ERROR_CANNOT_DROP        => 'íåìîæëèâî çíèùèòè (drop)',
+            DB_ERROR_CONSTRAINT         => 'ïîðóøåííÿ óìîâ ïåðåâ³ðêè',
+            DB_ERROR_DIVZERO            => 'ä³ëåííÿ íà 0',
+            DB_ERROR_INVALID            => 'íåïðàâèëüíî',
+            DB_ERROR_INVALID_DATE       => 'íåïðàâèëüíà äàòà ÷è ÷àñ',
+            DB_ERROR_INVALID_NUMBER     => 'íåïðàâèëüíå ÷èñëî',
+            DB_ERROR_MISMATCH           => 'ïîìèëêà',
+            DB_ERROR_NODBSELECTED       => 'íå âèáðàíî ÁÄ',
+            DB_ERROR_NOSUCHFIELD        => 'íå ³ñíóº ïîëå',
+            DB_ERROR_NOSUCHTABLE        => 'íå ³ñíóº òàáëèöÿ',
+            DB_ERROR_NOT_CAPABLE        => 'ÑÓÁÄ íå â ñòàí³',
+            DB_ERROR_NOT_FOUND          => 'íå çíàéäåíî',
+            DB_ERROR_NOT_LOCKED         => 'íå çàáëîêîâàíî',
+            DB_ERROR_SYNTAX             => 'ñèíòàêñè÷íà ïîìèëêà',
+            DB_ERROR_UNSUPPORTED        => 'íå ï³äòðèìóºòüñÿ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'ðàõ³âíèê çíà÷åíü â ñòð³÷ö³',
+            DB_ERROR_INVALID_DSN        => 'íåïðàâèëüíà DSN',
+            DB_ERROR_CONNECT_FAILED     => 'ç\'ºäíàííÿ íåóñï³øíå',
+            0                               => 'âñå ãàðàçä', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'íàäàíî íåäîñòàòíüî äàíèõ',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'ðîçøèðåííÿ íå çíàéäåíî',
+            DB_ERROR_NOSUCHDB           => 'íå ³ñíóº ÁÄ',
+            DB_ERROR_ACCESS_VIOLATION   => 'íåäîñòàòíüî ïðàâ äîñòóïà'
+);
diff --git a/lib/WikiDB/adodb/lang/adodb_th.inc.php b/lib/WikiDB/adodb/lang/adodb_th.inc.php
new file mode 100644
index 000000000..9bdc3f8cb
--- /dev/null
+++ b/lib/WikiDB/adodb/lang/adodb_th.inc.php
@@ -0,0 +1,32 @@
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'th',
+            DB_ERROR                    => 'error ไม่รู้สาเหตุ',
+            DB_ERROR_ALREADY_EXISTS     => 'มีà¹?ล้ว',
+            DB_ERROR_CANNOT_CREATE      => 'สร้างไม่ได้',
+            DB_ERROR_CANNOT_DELETE      => 'ลบไม่ได้',
+            DB_ERROR_CANNOT_DROP        => 'drop ไม่ได้',
+            DB_ERROR_CONSTRAINT         => 'constraint violation',
+            DB_ERROR_DIVZERO            => 'หาà¸?ด้วยสูà¸?',
+            DB_ERROR_INVALID            => 'ไม่ valid',
+            DB_ERROR_INVALID_DATE       => 'วันที่ เวลา ไม่ valid',
+            DB_ERROR_INVALID_NUMBER     => 'เลขไม่ valid',
+            DB_ERROR_MISMATCH           => 'mismatch',
+            DB_ERROR_NODBSELECTED       => 'ไม่ได้เลือà¸?à¸?านข้อมูล',
+            DB_ERROR_NOSUCHFIELD        => 'ไม่มีฟีลด์นี้',
+            DB_ERROR_NOSUCHTABLE        => 'ไม่มีตารางนี้',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+            DB_ERROR_NOT_FOUND          => 'ไม่พบ',
+            DB_ERROR_NOT_LOCKED         => 'ไม่ได้ล๊อà¸?',
+            DB_ERROR_SYNTAX             => 'ผิด syntax',
+            DB_ERROR_UNSUPPORTED        => 'ไม่ support',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+            DB_ERROR_INVALID_DSN        => 'invalid DSN',
+            DB_ERROR_CONNECT_FAILED     => 'ไม่สามารถ connect',
+            0	                        => 'no error', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ข้อมูลไม่เพียงพอ',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'ไม่พบ extension',
+            DB_ERROR_NOSUCHDB           => 'ไม่มีข้อมูลนี้',
+            DB_ERROR_ACCESS_VIOLATION   => 'permissions ไม่พอ'
+);
diff --git a/lib/WikiDB/adodb/license.txt b/lib/WikiDB/adodb/license.txt
index 2353871c0..d90f4e5ff 100644
--- a/lib/WikiDB/adodb/license.txt
+++ b/lib/WikiDB/adodb/license.txt
@@ -1,182 +1,182 @@
-ADOdb is dual licensed using BSD and LGPL. 
-
-In plain English, you do not need to distribute your application  in source code form, nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license.
-
-For more info about ADOdb, visit http://adodb.sourceforge.net/
-
-BSD Style-License
-=================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list 
-of conditions and the following disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list 
-of conditions and the following disclaimer in the documentation and/or other materials 
-provided with the distribution. 
-
-Neither the name of the John Lim nor the names of its contributors may be used to 
-endorse or promote products derived from this software without specific prior written 
-permission. 
-
-DISCLAIMER:
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-==========================================================
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999 
- 
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
- 
- 
-Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
-
-
-a) The modified work must itself be a software library. 
-b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
-c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
-d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
-(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
-
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
-
-
-a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
-b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
-c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
-d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
-e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
-
-
-a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
-b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
-
-NO WARRANTY 
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-
-
+ADOdb is dual licensed using BSD and LGPL.
+
+In plain English, you do not need to distribute your application  in source code form, nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license.
+
+For more info about ADOdb, visit http://adodb.sourceforge.net/
+
+BSD Style-License
+=================
+
+Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this list
+of conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution.
+
+Neither the name of the John Lim nor the names of its contributors may be used to
+endorse or promote products derived from this software without specific prior written
+permission.
+
+DISCLAIMER:
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+==========================================================
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+
+Preamble
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
+
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
+
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
+
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
+
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
+
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
+
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
+
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
+
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
+
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
+
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
+
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
+
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
+
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
+
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
+
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
+
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
+
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+
+a) The modified work must itself be a software library.
+b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
+c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
+d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
+(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
+
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
+
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
+
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
+
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
+
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
+
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
+
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
+
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
+
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
+
+
+a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
+b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
+c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
+d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
+e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
+
+
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
+b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
+
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
 END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php b/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
index 7f1dea050..f000fb5c6 100644
--- a/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
+++ b/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
@@ -1,15 +1,15 @@
 
-	Richard Tango-Lowy                           
+	Richard Tango-Lowy 
 */
 
 require_once 'Auth/Container.php';
@@ -44,7 +44,7 @@ class Auth_Container_ADOdb extends Auth_Container
      */
     var $db = null;
     var $dsn = '';
-	
+
     /**
      * User that is currently selected from the DB.
      * @var string
@@ -64,7 +64,7 @@ class Auth_Container_ADOdb extends Auth_Container
     function Auth_Container_ADOdb($dsn)
     {
         $this->_setDefaults();
-		
+
         if (is_array($dsn)) {
             $this->_parseOptions($dsn);
 
@@ -96,7 +96,7 @@ class Auth_Container_ADOdb extends Auth_Container
 	   	    		return PEAR::raiseError($err);
 	    		}
         	}
-        	
+
         } else {
             return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
                                     41,
@@ -105,7 +105,7 @@ class Auth_Container_ADOdb extends Auth_Container
                                     null
                                     );
         }
-        
+
         if(!$this->db) {
         	return PEAR::raiseError(ADODB_Pear_error());
         } else {
@@ -128,7 +128,7 @@ class Auth_Container_ADOdb extends Auth_Container
     function _prepare()
     {
     	if(!$this->db) {
-    		$res = $this->_connect($this->options['dsn']);  		
+    		$res = $this->_connect($this->options['dsn']);
     	}
         return true;
     }
@@ -234,11 +234,11 @@ class Auth_Container_ADOdb extends Auth_Container
         else{
             $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
         }
-        
+
         $query = "SELECT ".$sql_from.
                 " FROM ".$this->options['table'].
                 " WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
-        
+
         $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
         $rset = $this->db->Execute( $query );
         $res = $rset->fetchRow();
@@ -402,4 +402,3 @@ function dump( $var, $str, $vardump = false ) {
 	( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
 	print "
    ";
 }
-?>
diff --git a/lib/WikiDB/adodb/pear/auth_adodb_example.php b/lib/WikiDB/adodb/pear/auth_adodb_example.php
new file mode 100644
index 000000000..3b7cf5e85
--- /dev/null
+++ b/lib/WikiDB/adodb/pear/auth_adodb_example.php
@@ -0,0 +1,25 @@
+
+    
+    
+    
+    
+    
+ $dsn, 'table' => 'auth', 'cryptType' => 'none',
+                'usernamecol' => 'username', 'passwordcol' => 'password');
+$a = new Auth("ADOdb", $params, "loginFunction");
+$a->start();
+
+if ($a->getAuth()) {
+    echo "Success";
+    // * The output of your site goes here.
+}
diff --git a/lib/WikiDB/adodb/pear/readme.Auth.txt b/lib/WikiDB/adodb/pear/readme.Auth.txt
index db2831976..f5b162cc1 100644
--- a/lib/WikiDB/adodb/pear/readme.Auth.txt
+++ b/lib/WikiDB/adodb/pear/readme.Auth.txt
@@ -1,20 +1,20 @@
-From: Rich Tango-Lowy (richtl#arscognita.com)
-Date: Sat, May 29, 2004 11:20 am
-
-OK, I hacked out an ADOdb container for PEAR-Auth. The error handling's 
-a bit of a mess, but all the methods work.
-
-Copy ADOdb.php to your pear/Auth/Container/ directory.
-
-Use the ADOdb container exactly as you would the DB
-container, but specify 'ADOdb' instead of 'DB':
-
-$dsn = "mysql://myuser:mypass@localhost/authdb";
-$a = new Auth("ADOdb", $dsn, "loginFunction");
-
-
--------------------
-
-John Lim adds:
-
-See http://pear.php.net/manual/en/package.authentication.php
+From: Rich Tango-Lowy (richtl#arscognita.com)
+Date: Sat, May 29, 2004 11:20 am
+
+OK, I hacked out an ADOdb container for PEAR-Auth. The error handling's
+a bit of a mess, but all the methods work.
+
+Copy ADOdb.php to your pear/Auth/Container/ directory.
+
+Use the ADOdb container exactly as you would the DB
+container, but specify 'ADOdb' instead of 'DB':
+
+$dsn = "mysql://myuser:mypass@localhost/authdb";
+$a = new Auth("ADOdb", $dsn, "loginFunction");
+
+
+-------------------
+
+John Lim adds:
+
+See http://pear.php.net/manual/en/package.authentication.php
diff --git a/lib/WikiDB/adodb/perf/perf-db2.inc.php b/lib/WikiDB/adodb/perf/perf-db2.inc.php
index 26bf318e7..9eb0c3299 100644
--- a/lib/WikiDB/adodb/perf/perf-db2.inc.php
+++ b/lib/WikiDB/adodb/perf/perf-db2.inc.php
@@ -1,15 +1,15 @@
  array('RATIO',
-			"SELECT 
-				case when sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0 
-				else 100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)) end 
+			"SELECT
+				case when sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0
+				else 100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)) end
 				FROM TABLE(SNAPSHOT_APPL('',-2)) as t",
 			'=WarnCacheRatio'),
-			
+
 	'Data Cache',
 		'data cache buffers' => array('DATAC',
 		'select sum(npages) from SYSCAT.BUFFERPOOLS',
@@ -60,7 +60,7 @@ class perf_db2 extends adodb_perf{
 	{
 		$this->conn = $conn;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
 		$save = $this->conn->LogSQL(false);
@@ -85,18 +85,22 @@ class perf_db2 extends adodb_perf{
 		$s = ob_get_contents();
 		ob_end_clean();
 		$this->conn->LogSQL($save);
-		
+
 		$s .= $this->Tracer($sql);
 		return $s;
 	}
-	
-	
-	function Tables()
+
+	/**
+	 *  Gets a list of tables
+	 *
+	 * @param int $throwaway discarded variable to match the parent method
+	 * @return string The formatted table list
+	 */
+	function Tables($throwaway=0)
 	{
 		$rs = $this->conn->Execute("select tabschema,tabname,card as rows,
-			npages pages_used,fpages pages_allocated, tbspace tablespace  
+			npages pages_used,fpages pages_allocated, tbspace tablespace
 			from syscat.tables where tabschema not in ('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
 		return rs2html($rs,false,false,false,false);
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/perf/perf-informix.inc.php b/lib/WikiDB/adodb/perf/perf-informix.inc.php
index e41bb83f4..6de76c719 100644
--- a/lib/WikiDB/adodb/perf/perf-informix.inc.php
+++ b/lib/WikiDB/adodb/perf/perf-informix.inc.php
@@ -1,15 +1,15 @@
  array('RATIOH',
@@ -47,24 +47,23 @@ class perf_informix extends adodb_perf{
 		'data reads' => array('IO',
 		"select value from sysmaster:sysprofile where name='pagreads'",
 		'Page reads'),
-		
+
 		'data writes' => array('IO',
 		"select value from sysmaster:sysprofile where name='pagwrites'",
 		'Page writes'),
-	
+
 	'Connections',
 		'current connections' => array('SESS',
 		'select count(*) from sysmaster:syssessions',
 		'Number of sessions'),
-	
+
 	false
-	
+
 	);
-	
+
 	function perf_informix(&$conn)
 	{
 		$this->conn = $conn;
 	}
 
 }
-?>
diff --git a/lib/WikiDB/adodb/perf/perf-mssql.inc.php b/lib/WikiDB/adodb/perf/perf-mssql.inc.php
index ecb884325..2ff4fea09 100644
--- a/lib/WikiDB/adodb/perf/perf-mssql.inc.php
+++ b/lib/WikiDB/adodb/perf/perf-mssql.inc.php
@@ -1,16 +1,16 @@
  array('RATIO',
@@ -46,7 +46,7 @@ class perf_mssql extends adodb_perf{
 		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
 		'data writes' => array('IO',
 		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
-			
+
 	'Data Cache',
 		'data cache size' => array('DATAC',
 		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
@@ -63,8 +63,8 @@ class perf_mssql extends adodb_perf{
 
 		false
 	);
-	
-	
+
+
 	function perf_mssql(&$conn)
 	{
 		if ($conn->dataProvider == 'odbc') {
@@ -73,10 +73,10 @@ class perf_mssql extends adodb_perf{
 		}
 		$this->conn = $conn;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
-		
+
 		$save = $this->conn->LogSQL(false);
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
@@ -88,12 +88,12 @@ class perf_mssql extends adodb_perf{
 				}
 			}
 		}
-		
+
 		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
 		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
 		$sql = str_replace('?',"''",$sql);
 		global $ADODB_FETCH_MODE;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$rs = $this->conn->Execute($sql);
@@ -107,20 +107,20 @@ class perf_mssql extends adodb_perf{
 				$rs->MoveNext();
 			}
 			$s .= '';
-			
+
 			$rs->NextRecordSet();
 		}
-		
+
 		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
 		$this->conn->LogSQL($save);
 		$s .= $this->Tracer($sql);
 		return $s;
 	}
-	
+
 	function Tables()
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		//$this->conn->debug=1;
@@ -142,23 +142,21 @@ class perf_mssql extends adodb_perf{
 		$ADODB_FETCH_MODE = $save;
 		return $s.'';
 	}
-	
+
 	function sp_who()
 	{
 		$arr = $this->conn->GetArray('sp_who');
 		return sizeof($arr);
 	}
-	
+
 	function HealthCheck($cli=false)
 	{
-		
+
 		$this->conn->Execute('dbcc traceon(3604)');
 		$html =  adodb_perf::HealthCheck($cli);
 		$this->conn->Execute('dbcc traceoff(3604)');
 		return $html;
 	}
-	
-	
-}
 
-?>
\ No newline at end of file
+
+}
diff --git a/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php b/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
index f5f7b45e4..b67d37058 100644
--- a/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
+++ b/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
@@ -1,16 +1,16 @@
  array('RATIO',
@@ -46,7 +46,7 @@ class perf_mssqlnative extends adodb_perf{
 		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
 		'data writes' => array('IO',
 		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
-			
+
 	'Data Cache',
 		'data cache size' => array('DATAC',
 		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
@@ -63,8 +63,8 @@ class perf_mssqlnative extends adodb_perf{
 
 		false
 	);
-	
-	
+
+
 	function perf_mssqlnative(&$conn)
 	{
 		if ($conn->dataProvider == 'odbc') {
@@ -73,10 +73,10 @@ class perf_mssqlnative extends adodb_perf{
 		}
 		$this->conn =& $conn;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
-		
+
 		$save = $this->conn->LogSQL(false);
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
@@ -88,12 +88,12 @@ class perf_mssqlnative extends adodb_perf{
 				}
 			}
 		}
-		
+
 		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
 		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
 		$sql = str_replace('?',"''",$sql);
 		global $ADODB_FETCH_MODE;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$rs =& $this->conn->Execute($sql);
@@ -107,20 +107,20 @@ class perf_mssqlnative extends adodb_perf{
 				$rs->MoveNext();
 			}
 			$s .= '';
-			
+
 			$rs->NextRecordSet();
 		}
-		
+
 		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
 		$this->conn->LogSQL($save);
 		$s .= $this->Tracer($sql);
 		return $s;
 	}
-	
-	function Tables()
+
+	function Tables($orderby='1')
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		//$this->conn->debug=1;
@@ -142,23 +142,21 @@ class perf_mssqlnative extends adodb_perf{
 		$ADODB_FETCH_MODE = $save;
 		return $s.'';
 	}
-	
+
 	function sp_who()
 	{
 		$arr = $this->conn->GetArray('sp_who');
 		return sizeof($arr);
 	}
-	
+
 	function HealthCheck($cli=false)
 	{
-		
+
 		$this->conn->Execute('dbcc traceon(3604)');
 		$html =  adodb_perf::HealthCheck($cli);
 		$this->conn->Execute('dbcc traceoff(3604)');
 		return $html;
 	}
-	
-	
-}
 
-?>
\ No newline at end of file
+
+}
diff --git a/lib/WikiDB/adodb/perf/perf-mysql.inc.php b/lib/WikiDB/adodb/perf/perf-mysql.inc.php
index 9e5eada6f..338654d59 100644
--- a/lib/WikiDB/adodb/perf/perf-mysql.inc.php
+++ b/lib/WikiDB/adodb/perf/perf-mysql.inc.php
@@ -1,24 +1,24 @@
  array('RATIO',
@@ -49,7 +49,7 @@ class perf_mysql extends adodb_perf{
 		'data writes' => array('IO',
 			'=GetWrites',
 			'Number of inserts/updates/deletes * coef (Key_writes is not accurate)'),
-		
+
 	'Data Cache',
 		'MyISAM data cache size' => array('DATAC',
 			array("show variables", 'key_buffer_size'),
@@ -70,25 +70,25 @@ class perf_mysql extends adodb_perf{
 		'table cache' => array('CACHE',
 			array("show variables", 'table_cache'),
 			'Number of tables to keep open'),
-	'Connections',	
+	'Connections',
 		'current connections' => array('SESS',
 			array('show status','Threads_connected'),
 			''),
 		'max connections' => array( 'SESS',
 			array("show variables",'max_connections'),
 			''),
-	
+
 		false
 	);
-	
+
 	function perf_mysql(&$conn)
 	{
 		$this->conn = $conn;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
-		
+
 		if (strtoupper(substr(trim($sql),0,6)) !== 'SELECT') return '
    Unable to EXPLAIN non-select statement
    ';
 		$save = $this->conn->LogSQL(false);
 		if ($partial) {
@@ -102,12 +102,12 @@ class perf_mysql extends adodb_perf{
 			}
 		}
 		$sql = str_replace('?',"''",$sql);
-		
+
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
 			$sql = $this->conn->GetOne("select sql1 from adodb_logsql where sql1 like $sqlq");
 		}
-		
+
 		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
 		$rs = $this->conn->Execute('EXPLAIN '.$sql);
 		$s .= rs2html($rs,false,false,false,false);
@@ -115,95 +115,95 @@ class perf_mysql extends adodb_perf{
 		$s .= $this->Tracer($sql);
 		return $s;
 	}
-	
+
 	function Tables()
 	{
 		if (!$this->tablesSQL) return false;
-		
+
 		$rs = $this->conn->Execute($this->tablesSQL);
 		if (!$rs) return false;
-		
+
 		$html = rs2html($rs,false,false,false,false);
 		return $html;
 	}
-	
+
 	function GetReads()
 	{
 	global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$rs = $this->conn->Execute('show status');
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$rs) return 0;
 		$val = 0;
 		while (!$rs->EOF) {
 			switch($rs->fields[0]) {
-			case 'Com_select': 
+			case 'Com_select':
 				$val = $rs->fields[1];
 				$rs->Close();
 				return $val;
 			}
 			$rs->MoveNext();
-		} 
-		
+		}
+
 		$rs->Close();
-		
+
 		return $val;
 	}
-	
+
 	function GetWrites()
 	{
 	global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$rs = $this->conn->Execute('show status');
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$rs) return 0;
 		$val = 0.0;
 		while (!$rs->EOF) {
 			switch($rs->fields[0]) {
-			case 'Com_insert': 
+			case 'Com_insert':
 				$val += $rs->fields[1]; break;
-			case 'Com_delete': 
+			case 'Com_delete':
 				$val += $rs->fields[1]; break;
-			case 'Com_update': 
+			case 'Com_update':
 				$val += $rs->fields[1]/2;
 				$rs->Close();
 				return $val;
 			}
 			$rs->MoveNext();
-		} 
-		
+		}
+
 		$rs->Close();
-		
+
 		return $val;
 	}
-	
+
 	function FindDBHitRatio()
 	{
 		// first find out type of table
 		//$this->conn->debug=1;
-		
+
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$rs = $this->conn->Execute('show table status');
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$rs) return '';
 		$type = strtoupper($rs->fields[1]);
 		$rs->Close();
@@ -216,29 +216,29 @@ class perf_mysql extends adodb_perf{
 		default:
 			return $type.' not supported';
 		}
-		
+
 	}
-	
+
 	function GetQHitRatio()
 	{
 		//Total number of queries = Qcache_inserts + Qcache_hits + Qcache_not_cached
 		$hits = $this->_DBParameter(array("show status","Qcache_hits"));
 		$total = $this->_DBParameter(array("show status","Qcache_inserts"));
 		$total += $this->_DBParameter(array("show status","Qcache_not_cached"));
-		
+
 		$total += $hits;
 		if ($total) return round(($hits*100)/$total,2);
 		return 0;
 	}
-	
+
 	/*
 		Use session variable to store Hit percentage, because MySQL
 		does not remember last value of SHOW INNODB STATUS hit ratio
-		
+
 		# 1st query to SHOW INNODB STATUS
 		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
 		Buffer pool hit rate 1000 / 1000
-		
+
 		# 2nd query to SHOW INNODB STATUS
 		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
 		No buffer pool activity since the last printout
@@ -246,16 +246,16 @@ class perf_mysql extends adodb_perf{
 	function GetInnoDBHitRatio()
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$rs = $this->conn->Execute('show engine innodb status');
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$rs || $rs->EOF) return 0;
 		$stat = $rs->fields[0];
 		$rs->Close();
@@ -271,35 +271,35 @@ class perf_mysql extends adodb_perf{
 		}
 		return 0;
 	}
-	
+
 	function GetKeyHitRatio()
 	{
 		$hits = $this->_DBParameter(array("show status","Key_read_requests"));
 		$reqs = $this->_DBParameter(array("show status","Key_reads"));
 		if ($reqs == 0) return 0;
-		
+
 		return round(($hits/($reqs+$hits))*100,2);
 	}
-	
-    // start hack 
+
+    // start hack
     var $optimizeTableLow = 'CHECK TABLE %s FAST QUICK';
     var $optimizeTableHigh = 'OPTIMIZE TABLE %s';
-    
-    /** 
+
+    /**
      * @see adodb_perf#optimizeTable
      */
-     function optimizeTable( $table, $mode = ADODB_OPT_LOW) 
+     function optimizeTable( $table, $mode = ADODB_OPT_LOW)
      {
         if ( !is_string( $table)) return false;
-        
+
         $conn = $this->conn;
         if ( !$conn) return false;
-        
+
         $sql = '';
         switch( $mode) {
             case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
             case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
-            default : 
+            default :
             {
                 // May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0)
                 ADOConnection::outp( sprintf( "
    %s: '%s' using of undefined mode '%s'
    ", __CLASS__, __FUNCTION__, $mode));
@@ -307,9 +307,8 @@ class perf_mysql extends adodb_perf{
             }
         }
         $sql = sprintf( $sql, $table);
-        
+
         return $conn->Execute( $sql) !== false;
      }
-    // end hack 
+    // end hack
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/perf/perf-oci8.inc.php b/lib/WikiDB/adodb/perf/perf-oci8.inc.php
index 84d7ae306..5dbd7c81c 100644
--- a/lib/WikiDB/adodb/perf/perf-oci8.inc.php
+++ b/lib/WikiDB/adodb/perf/perf-oci8.inc.php
@@ -1,15 +1,15 @@
  array('RATIOH',
-			"select round((1-(phy.value / (cur.value + con.value)))*100,2) 
+			"select round((1-(phy.value / (cur.value + con.value)))*100,2)
 			from v\$sysstat cur, v\$sysstat con, v\$sysstat phy
 			where cur.name = 'db block gets' and
 			      con.name = 'consistent gets' and
 			      phy.name = 'physical reads'",
 			'=WarnCacheRatio'),
-		
+
 		'sql cache hit ratio' => array( 'RATIOH',
 			'select round(100*(sum(pins)-sum(reloads))/sum(pins),2)  from v$librarycache',
 			'increase shared_pool_size if too ratio low'),
-			
+
 		'datadict cache hit ratio' => array('RATIOH',
-		"select      
-           round((1 - (sum(getmisses) / (sum(gets) +          
+		"select
+           round((1 - (sum(getmisses) / (sum(gets) +
    		 sum(getmisses))))*100,2)
 		from  v\$rowcache",
 		'increase shared_pool_size if too ratio low'),
-		
+
 		'memory sort ratio' => array('RATIOH',
-		"SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE), 
+		"SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE),
        0,1,(a.VALUE + b.VALUE)),2)
-FROM   v\$sysstat a, 
+FROM   v\$sysstat a,
        v\$sysstat b
 WHERE  a.name = 'sorts (disk)'
 AND    b.name = 'sorts (memory)'",
@@ -67,20 +67,20 @@ AND    b.name = 'sorts (memory)'",
 	'IO',
 		'data reads' => array('IO',
 		"select value from v\$sysstat where name='physical reads'"),
-	
+
 	'data writes' => array('IO',
 		"select value from v\$sysstat where name='physical writes'"),
-	
+
 	'Data Cache',
-	
+
 		'data cache buffers' => array( 'DATAC',
-		"select a.value/b.value  from v\$parameter a, v\$parameter b 
+		"select a.value/b.value  from v\$parameter a, v\$parameter b
 			where a.name = 'db_cache_size' and b.name= 'db_block_size'",
 			'Number of cache buffers. Tune db_cache_size if the data cache hit ratio is too low.'),
 		'data cache blocksize' => array('DATAC',
 			"select value from v\$parameter where name='db_block_size'",
-			'' ),			
-	
+			'' ),
+
 	'Memory Pools',
 		'Mem Max Target (11g+)' => array( 'DATAC',
 		"select value from v\$parameter where name = 'memory_max_target'",
@@ -111,7 +111,7 @@ AND    b.name = 'sorts (memory)'",
 			'this pool is for large mem allocations (not because it is larger than shared pool), for MTS sessions, parallel queries, io buffers (large_pool_size) ' ),
 
 		'dynamic memory usage' => array('CACHE', "select '-' from dual", '=DynMemoryUsage'),
-		
+
 		'Connections',
 		'current connections' => array('SESS',
 			'select count(*) from sys.v_$session where username is not null',
@@ -120,20 +120,20 @@ AND    b.name = 'sorts (memory)'",
 			"select value from v\$parameter where name='sessions'",
 			''),
 
-	'Memory Utilization',		
+	'Memory Utilization',
 		'data cache utilization ratio' => array('RATIOU',
 			"select round((1-bytes/sgasize)*100, 2)
 			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
 			where name = 'free memory' and pool = 'shared pool'",
 		'Percentage of data cache actually in use - should be over 85%'),
-		
-		'shared pool utilization ratio' => array('RATIOU', 
+
+		'shared pool utilization ratio' => array('RATIOU',
 		'select round((sga.bytes/case when p.value=0 then sga.bytes else to_number(p.value) end)*100,2)
 		from v$sgastat sga, v$parameter p
 		where sga.name = \'free memory\' and sga.pool = \'shared pool\'
 		and p.name = \'shared_pool_size\'',
 		'Percentage of shared pool actually used - too low is bad, too high is worse'),
-		
+
 		'large pool utilization ratio' => array('RATIOU',
 			"select round((1-bytes/sgasize)*100, 2)
 			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
@@ -149,7 +149,7 @@ AND    b.name = 'sorts (memory)'",
 		'rollback segments' => array('ROLLBACK',
 			"select count(*) from sys.v_\$rollstat",
 			''),
-	
+
 		'peak transactions' => array('ROLLBACK',
 			"select max_utilization  tx_hwm
     		from sys.v_\$resource_limit
@@ -158,7 +158,7 @@ AND    b.name = 'sorts (memory)'",
 		'max transactions' => array('ROLLBACK',
 			"select value from v\$parameter where name = 'transactions'",
 			'max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)'),
-	'Parameters',	
+	'Parameters',
 		'cursor sharing' => array('CURSOR',
 			"select value from v\$parameter where name = 'cursor_sharing'",
 			'Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See cursor_sharing.'),
@@ -179,40 +179,40 @@ having count(*) > 100)",'These are sql statements that should be using bind vari
 //		'Historical wait SQL' => array('WAITS','select \'Last 2 days\' from dual','=TopHistoricalWaits'), -- requires AWR license
 	'Backup',
 		'Achivelog Mode' => array('BACKUP', 'select log_mode from v$database', '=LogMode'),
-	
+
 		'DBID' => array('BACKUP','select dbid from v$database','Primary key of database, used for recovery with an RMAN Recovery Catalog'),
-		'Archive Log Dest' => array('BACKUP', "SELECT NVL(v1.value,v2.value) 
+		'Archive Log Dest' => array('BACKUP', "SELECT NVL(v1.value,v2.value)
 FROM v\$parameter v1, v\$parameter v2 WHERE v1.name='log_archive_dest' AND v2.name='log_archive_dest_10'", ''),
-	
+
 		'Flashback Area' => array('BACKUP', "select nvl(value,'Flashback Area not used') from v\$parameter where name=lower('DB_RECOVERY_FILE_DEST')", 'Flashback area is a folder where all backup data and logs can be stored and managed by Oracle. If Error: message displayed, then it is not in use.'),
-	
+
 		'Flashback Usage' => array('BACKUP', "select nvl('-','Flashback Area not used') from v\$parameter where name=lower('DB_RECOVERY_FILE_DEST')", '=FlashUsage', 'Flashback area usage.'),
-		
+
 		'Control File Keep Time' => array('BACKUP', "select value from v\$parameter where name='control_file_record_keep_time'",'No of days to keep RMAN info in control file.  Recommended set to x2 or x3 times the frequency of your full backup.'),
 		'Recent RMAN Jobs' => array('BACKUP', "select '-' from dual", "=RMAN"),
-		
+
 		//		'Control File Keep Time' => array('BACKUP', "select value from v\$parameter where name='control_file_record_keep_time'",'No of days to keep RMAN info in control file. I recommend it be set to x2 or x3 times the frequency of your full backup.'),
       'Storage', 'Tablespaces' => array('TABLESPACE', "select '-' from dual", "=TableSpace"),
 		false
-		
+
 	);
-	
-	
+
+
 	function perf_oci8(&$conn)
 	{
 	global $gSQLBlockRows;
-	
+
 		$gSQLBlockRows = 1000;
-		$savelog = $conn->LogSQL(false);	
+		$savelog = $conn->LogSQL(false);
 		$this->version = $conn->ServerInfo();
-		$conn->LogSQL($savelog);	
+		$conn->LogSQL($savelog);
 		$this->conn = $conn;
 	}
-	
+
 	function LogMode()
 	{
 		$mode = $this->conn->GetOne("select log_mode from v\$database");
-		
+
 		if ($mode == 'ARCHIVELOG') return 'To turn off archivelog:
    
 	
    
         SQLPLUS> connect sys as sysdba;
@@ -222,7 +222,7 @@ FROM v\$parameter v1, v\$parameter v2 WHERE v1.name='log_archive_dest' AND v2.na
         SQLPLUS> alter database noarchivelog;
         SQLPLUS> alter database open;
 
    ';
-		
+
 		return 'To turn on archivelog:
    
 	
    
         SQLPLUS> connect sys as sysdba;
@@ -234,24 +234,24 @@ FROM v\$parameter v1, v\$parameter v2 WHERE v1.name='log_archive_dest' AND v2.na
         SQLPLUS> alter database open;
 
    ';
 	}
-	
+
 	function TopRecentWaits()
 	{
-		
-		$rs = $this->conn->Execute("select * from (   
+
+		$rs = $this->conn->Execute("select * from (
 		select event, round(100*time_waited/(select sum(time_waited) from v\$system_event where wait_class <> 'Idle'),1) \"% Wait\",
     total_waits,time_waited, average_wait,wait_class from v\$system_event where wait_class <> 'Idle' order by 2 desc
 	) where rownum <=5");
-		
-		$ret = rs2html($rs,false,false,false,false);		
+
+		$ret = rs2html($rs,false,false,false,false);
 		return " 
    ".$ret." 
    ";
-		
+
 	}
-	
+
 	function TopHistoricalWaits()
 	{
 		$days = 2;
-		
+
 		$rs = $this->conn->Execute("select * from (   SELECT
          b.wait_class,B.NAME,
         round(sum(wait_time+TIME_WAITED)/1000000) waitsecs,
@@ -264,36 +264,36 @@ WHERE   A.SAMPLE_TIME BETWEEN sysdate-$days and sysdate
        and parsing_schema_name not in ('SYS','SYSMAN','DBSNMP','SYSTEM')
 GROUP BY b.wait_class,parsing_schema_name,C.SQL_TEXT, B.NAME,A.sql_id
 order by 3 desc) where rownum <=10");
-		
-		$ret = rs2html($rs,false,false,false,false);		
+
+		$ret = rs2html($rs,false,false,false,false);
 		return " 
    ".$ret." 
    ";
-		
+
 	}
-	
+
 	function TableSpace()
 	{
 
 		$rs = $this->conn->Execute(
-	"select tablespace_name,round(sum(bytes)/1024/1024) as Used_MB,round(sum(maxbytes)/1024/1024) as Max_MB, round(sum(bytes)/sum(maxbytes),4) * 100 as PCT 
+	"select tablespace_name,round(sum(bytes)/1024/1024) as Used_MB,round(sum(maxbytes)/1024/1024) as Max_MB, round(sum(bytes)/sum(maxbytes),4) * 100 as PCT
 	from dba_data_files
    group by tablespace_name order by 2 desc");
-		
+
 		$ret = "
    Tablespace".rs2html($rs,false,false,false,false);
 
 		$rs = $this->conn->Execute("select * from dba_data_files order by tablespace_name, 1");
 		$ret .= "
    Datafile".rs2html($rs,false,false,false,false);
-		
+
 		return " 
    ".$ret." 
    ";
 	}
-	
+
 	function RMAN()
 	{
-		$rs = $this->conn->Execute("select * from (select start_time, end_time, operation, status, mbytes_processed, output_device_type  
+		$rs = $this->conn->Execute("select * from (select start_time, end_time, operation, status, mbytes_processed, output_device_type
 			from V\$RMAN_STATUS order by start_time desc) where rownum <=10");
-		
-		$ret = rs2html($rs,false,false,false,false);		
+
+		$ret = rs2html($rs,false,false,false,false);
 		return " 
    ".$ret." 
    ";
-		
+
 	}
 
 	function DynMemoryUsage()
@@ -304,15 +304,15 @@ order by 3 desc) where rownum <=10");
 		} else
 			$rs = $this->conn->Execute("select name, round(bytes/1024./1024,2) as \"CurrSize (M)\" from  V\$sgainfo");
 
-			
-		$ret = rs2html($rs,false,false,false,false);		
+
+		$ret = rs2html($rs,false,false,false,false);
 		return " 
    ".$ret." 
    ";
 	}
 
 	function FlashUsage()
 	{
         $rs = $this->conn->Execute("select * from  V\$FLASH_RECOVERY_AREA_USAGE");
-		$ret = rs2html($rs,false,false,false,false);		
+		$ret = rs2html($rs,false,false,false,false);
 		return " 
    ".$ret." 
    ";
 	}
 
@@ -320,7 +320,7 @@ order by 3 desc) where rownum <=10");
 	{
 		if ($val == 100 && $this->version['version'] < 10) $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. ';
 	}
 
@@ -328,15 +328,15 @@ order by 3 desc) where rownum <=10");
 	{
 		if ($val == 0 && $this->version['version'] < 10) $s = 'Too Low. ';
 		else $s = '';
-		
+
 		return $s.'Percentage of indexed data blocks expected in the cache.
 			Recommended is 20 (fast disk array) to 30 (slower hard disks). Default is 0.
 			 See optimizer_index_caching.';
 		}
-	
+
 	function PGA()
-	{	
-		
+	{
+
 		//if ($this->version['version'] < 9) return 'Oracle 9i or later required';
 	}
 
@@ -344,30 +344,30 @@ order by 3 desc) where rownum <=10");
 	{
 		$t = "
    PGA Advice Estimate
    ";
 		if ($this->version['version'] < 9) return $t.'Oracle 9i or later required';
-		
+
 		$rs = $this->conn->Execute('select a.MB,
-			case when a.targ = 1 then \'<<= Current \' 
-			when a.targ < 1  or a.pct <= b.pct then null 
-			else 
+			case when a.targ = 1 then \'<<= Current \'
+			when a.targ < 1  or a.pct <= b.pct then null
+			else
 			\'- BETTER than Current by \'||round(a.pct/b.pct*100-100,2)||\'%\' end as "Percent Improved",
 	a.targ as  "PGA Size Factor",a.pct "% Perf"
-	from 
+	from
        (select round(pga_target_for_estimate/1024.0/1024.0,0) MB,
-              pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
+              pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r
               from v$pga_target_advice) a left join
        (select round(pga_target_for_estimate/1024.0/1024.0,0) MB,
-              pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
-              from v$pga_target_advice) b on 
-      a.r = b.r+1 where 
+              pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r
+              from v$pga_target_advice) b on
+      a.r = b.r+1 where
           b.pct < 100');
 		if (!$rs) return $t."Only in 9i or later";
 	//	$rs->Close();
 		if ($rs->EOF) return $t."PGA could be too big";
-		
+
 		return $t.rs2html($rs,false,false,true,false);
 	}
 
-	function Explain($sql,$partial=false) 
+	function Explain($sql,$partial=false)
 	{
 		$savelog = $this->conn->LogSQL(false);
 		$rs = $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
@@ -403,10 +403,10 @@ CREATE TABLE PLAN_TABLE (
 
    ";
 			return false;
 		}
-		
+
 		$rs->Close();
 	//	$this->conn->debug=1;
-	
+
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
 			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
@@ -417,9 +417,9 @@ CREATE TABLE PLAN_TABLE (
 				}
 			}
 		}
-		
-		$s = "
    Explain: ".htmlspecialchars($sql)."
    ";	
-		
+
+		$s = "
    Explain: ".htmlspecialchars($sql)."
    ";
+
 		$this->conn->BeginTrans();
 		$id = "ADODB ".microtime();
 
@@ -432,13 +432,13 @@ CREATE TABLE PLAN_TABLE (
 			return $s;
 		}
 		$rs = $this->conn->Execute("
-		select 
-  '
    '||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'
    '  as Operation, 
+		select
+  '
    '||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'
    '  as Operation,
   object_name,COST,CARDINALITY,bytes
-		FROM plan_table 
-START WITH id = 0  and STATEMENT_ID='$id'  
+		FROM plan_table
+START WITH id = 0  and STATEMENT_ID='$id'
 CONNECT BY prior id=parent_id and statement_id='$id'");
-		
+
 		$s .= rs2html($rs,false,false,false,false);
 		$this->conn->RollbackTrans();
 		$this->conn->LogSQL($savelog);
@@ -449,22 +449,22 @@ CONNECT BY prior id=parent_id and statement_id='$id'");
 	function CheckMemory()
 	{
 		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
-		
+
 		 $rs = $this->conn->Execute("
-select  a.name Buffer_Pool, b.size_for_estimate as cache_mb_estimate, 
-	case when b.size_factor=1 then 
+select  a.name Buffer_Pool, b.size_for_estimate as cache_mb_estimate,
+	case when b.size_factor=1 then
    		'<<= Current'
 	 when a.estd_physical_read_factor-b.estd_physical_read_factor > 0.001 and b.estd_physical_read_factor<1 then
 		'- BETTER than current by ' || round((1-b.estd_physical_read_factor)/b.estd_physical_read_factor*100,2) || '%'
-	else ' ' end as RATING, 
+	else ' ' end as RATING,
    b.estd_physical_read_factor \"Phys. Reads Factor\",
    round((a.estd_physical_read_factor-b.estd_physical_read_factor)/b.estd_physical_read_factor*100,2) as \"% Improve\"
-   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r,name from v\$db_cache_advice order by name,1) a , 
-   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r,name from v\$db_cache_advice order by name,1) b 
+   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r,name from v\$db_cache_advice order by name,1) a ,
+   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r,name from v\$db_cache_advice order by name,1) b
    where a.r = b.r-1 and a.name = b.name
   ");
 		if (!$rs) return false;
-		
+
 		/*
 		The v$db_cache_advice utility show the marginal changes in physical data block reads for different sizes of db_cache_size
 		*/
@@ -500,18 +500,18 @@ select  a.name Buffer_Pool, b.size_for_estimate as cache_mb_estimate,
 						$prefix = '';
 						$suffix = '';
 					}
-					
+
 					$s .=  "\n".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'';
 				}
 				$sql = $rs->fields[2];
-				$check = $rs->fields[0].'::'.$rs->fields[1];			
+				$check = $rs->fields[0].'::'.$rs->fields[1];
 			} else
 				$sql .= $rs->fields[2];
 			if (substr($sql,strlen($sql)-1) == "\0") $sql = substr($sql,0,strlen($sql)-1);
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		
+
 		$carr = explode('::',$check);
 		$prefix = "';
 		$suffix = '';
@@ -520,11 +520,11 @@ select  a.name Buffer_Pool, b.size_for_estimate as cache_mb_estimate,
 			$suffix = '';
 		}
 		$s .=  "\n".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'';
-					
+
 		return $s."\n\n";
 	}
-	
-	// code thanks to Ixora. 
+
+	// code thanks to Ixora.
 	// http://www.ixora.com.au/scripts/query_opt.htm
 	// requires oracle 8.1.7 or later
 	function SuspiciousSQL($numsql=10)
@@ -535,7 +535,7 @@ select
   s.executions  executes,
   p.sql_text
 from
-  ( 
+  (
     select
       address,
       buffer_gets,
@@ -543,7 +543,7 @@ from
       pct,
       rank() over (order by buffer_gets desc)  ranking
     from
-      ( 
+      (
 	select
 	  address,
 	  buffer_gets,
@@ -571,34 +571,34 @@ order by
 		}
 
 		if (isset($_GET['sql'])) return $this->_SuspiciousSQL($numsql);
-		
+
 		$s = '';
 		$timer = time();
 		$s .= $this->_SuspiciousSQL($numsql);
 		$timer = time() - $timer;
-		
+
 		if ($timer > $this->noShowIxora) return $s;
 		$s .= '
    ';
-		
+
 		$save = $ADODB_CACHE_MODE;
 		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$savelog = $this->conn->LogSQL(false);
 		$rs = $this->conn->SelectLimit($sql);
 		$this->conn->LogSQL($savelog);
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_CACHE_MODE = $save;
 		if ($rs) {
 			$s .= "\n
    Ixora Suspicious SQL
    ";
 			$s .= $this->tohtml($rs,'expsixora');
 		}
-		
+
 		return $s;
 	}
-	
-	// code thanks to Ixora. 
+
+	// code thanks to Ixora.
 	// http://www.ixora.com.au/scripts/query_opt.htm
 	// requires oracle 8.1.7 or later
 	function ExpensiveSQL($numsql = 10)
@@ -609,7 +609,7 @@ select
   s.executions  executes,
   p.sql_text
 from
-  ( 
+  (
     select
       address,
       disk_reads,
@@ -640,50 +640,50 @@ order by
 ";
 		global $ADODB_CACHE_MODE;
   		if (isset($_GET['expeixora']) && isset($_GET['sql'])) {
-			$partial = empty($_GET['part']);	
+			$partial = empty($_GET['part']);
 			echo "".$this->Explain($_GET['sql'],$partial)."\n";
 		}
 		if (isset($_GET['sql'])) {
 			 $var = $this->_ExpensiveSQL($numsql);
 			 return $var;
 		}
-		
-		$s = '';		
+
+		$s = '';
 		$timer = time();
 		$s .= $this->_ExpensiveSQL($numsql);
 		$timer = time() - $timer;
 		if ($timer > $this->noShowIxora) return $s;
-		
+
 		$s .= '
    ';
 		$save = $ADODB_CACHE_MODE;
 		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$savelog = $this->conn->LogSQL(false);
 		$rs = $this->conn->Execute($sql);
 		$this->conn->LogSQL($savelog);
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_CACHE_MODE = $save;
-		
+
 		if ($rs) {
 			$s .= "\n
    Ixora Expensive SQL
    ";
 			$s .= $this->tohtml($rs,'expeixora');
 		}
-	
+
 		return $s;
 	}
-	
-	function clearsql() 
+
+	function clearsql()
 	{
 		$perf_table = adodb_perf::table();
 	// using the naive "delete from $perf_table where created<".$this->conn->sysTimeStamp will cause the table to lock, possibly
 	// for a long time
-		$sql = 
+		$sql =
 "DECLARE cnt pls_integer;
 BEGIN
 	cnt := 0;
-	FOR rec IN (SELECT ROWID AS rr FROM $perf_table WHERE createdconn->Execute($sql);
 	}
-	
+
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/perf/perf-postgres.inc.php b/lib/WikiDB/adodb/perf/perf-postgres.inc.php
index 9c7fab3bb..81ae2ffaf 100644
--- a/lib/WikiDB/adodb/perf/perf-postgres.inc.php
+++ b/lib/WikiDB/adodb/perf/perf-postgres.inc.php
@@ -1,16 +1,16 @@
  array('RATIO',
@@ -86,45 +86,45 @@ class perf_postgres extends adodb_perf{
 			'Cost of doing a seek (default=4). See random_page_cost'),
 		false
 	);
-	
+
 	function perf_postgres(&$conn)
 	{
 		$this->conn = $conn;
 	}
-	
-	var $optimizeTableLow  = 'VACUUM %s'; 
+
+	var $optimizeTableLow  = 'VACUUM %s';
 	var $optimizeTableHigh = 'VACUUM ANALYZE %s';
 
 /**
  * @see adodb_perf#optimizeTable
  */
 
-	function optimizeTable($table, $mode = ADODB_OPT_LOW) 
+	function optimizeTable($table, $mode = ADODB_OPT_LOW)
 	{
 	    if(! is_string($table)) return false;
-	    
+
 	    $conn = $this->conn;
 	    if (! $conn) return false;
-	    
+
 	    $sql = '';
 	    switch($mode) {
 	        case ADODB_OPT_LOW : $sql = $this->optimizeTableLow;  break;
 	        case ADODB_OPT_HIGH: $sql = $this->optimizeTableHigh; break;
-	        default            : 
+	        default            :
 	        {
 	            ADOConnection::outp(sprintf("
    %s: '%s' using of undefined mode '%s'
    ", __CLASS__, 'optimizeTable', $mode));
 	            return false;
 	        }
 	    }
 	    $sql = sprintf($sql, $table);
-	    
-	    return $conn->Execute($sql) !== false;  
+
+	    return $conn->Execute($sql) !== false;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
 		$save = $this->conn->LogSQL(false);
-		
+
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
 			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
@@ -150,4 +150,3 @@ class perf_postgres extends adodb_perf{
 		return $s;
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/pivottable.inc.php b/lib/WikiDB/adodb/pivottable.inc.php
index 75786563c..d4695d2ff 100644
--- a/lib/WikiDB/adodb/pivottable.inc.php
+++ b/lib/WikiDB/adodb/pivottable.inc.php
@@ -1,16 +1,16 @@
 databaseType,'access') !== false; 
+
+	$iif = strpos($db->databaseType,'access') !== false;
 		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
-	
+
 	//$hidecnt = false;
-	
+
  	if ($where) $where = "\nWHERE $where";
 	if (!is_array($colfield)) $colarr = $db->GetCol("select distinct $colfield from $tables $where order by 1");
 	if (!$aggfield) $hidecnt = false;
-	
+
 	$sel = "$rowfields, ";
 	if (is_array($colfield)) {
 		foreach ($colfield as $k => $v) {
 			$k = trim($k);
 			if (!$hidecnt) {
-				$sel .= $iif ? 
+				$sel .= $iif ?
 					"\n\t$aggfn(IIF($v,1,0)) AS \"$k\", "
 					:
 					"\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
@@ -59,7 +59,7 @@
 					:
 					"\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
 			}
-		} 
+		}
 	} else {
 		foreach ($colarr as $v) {
 			if (!is_numeric($v)) $vq = $db->qstr($v);
@@ -84,20 +84,20 @@
 	}
 	if ($aggfield && $aggfield != '1'){
 		$agg = "$aggfn($aggfield)";
-		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";		
+		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";
 	}
-	
+
 	if ($showcount)
 		$sel .= "\n\tSUM(1) as Total";
 	else
 		$sel = substr($sel,0,strlen($sel)-2);
-	
-	
+
+
 	// Strip aliases
 	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
-	
+
 	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
-	
+
 	return $sql;
  }
 
@@ -109,7 +109,7 @@ if (0) {
 # Query the main "product" table
 # Set the rows to CompanyName and QuantityPerUnit
 # and the columns to the Categories
-# and define the joins to link to lookup tables 
+# and define the joins to link to lookup tables
 # "categories" and "suppliers"
 #
 
@@ -117,27 +117,27 @@ if (0) {
  	$gDB,  											# adodb connection
  	'products p ,categories c ,suppliers s',  		# tables
 	'CompanyName,QuantityPerUnit',					# row fields
-	'CategoryName',									# column fields 
+	'CategoryName',									# column fields
 	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
 );
  print "
    $sql";
  $rs = $gDB->Execute($sql);
  rs2html($rs);
- 
+
 /*
 Generated SQL:
 
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
-	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
-	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
-	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products", 
-	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
-	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
-	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
+SELECT CompanyName,QuantityPerUnit,
+	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages",
+	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments",
+	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections",
+	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products",
+	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals",
+	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry",
+	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce",
+	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood",
+	SUM(1) as Total
+FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID
 GROUP BY CompanyName,QuantityPerUnit
 */
 //=====================================================================
@@ -147,7 +147,7 @@ GROUP BY CompanyName,QuantityPerUnit
 # Query the main "product" table
 # Set the rows to CompanyName and QuantityPerUnit
 # and the columns to the UnitsInStock for diiferent ranges
-# and define the joins to link to lookup tables 
+# and define the joins to link to lookup tables
 # "categories" and "suppliers"
 #
  $sql = PivotTableSQL(
@@ -155,7 +155,7 @@ GROUP BY CompanyName,QuantityPerUnit
  	'products p ,categories c ,suppliers s',	# tables
 	'CompanyName,QuantityPerUnit',				# row fields
 												# column ranges
-array(										
+array(
 ' 0 ' => 'UnitsInStock <= 0',
 "1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
 "6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
@@ -171,17 +171,16 @@ array(
  rs2html($rs);
  /*
  Generated SQL:
- 
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ", 
-	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5", 
-	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10", 
-	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
+
+SELECT CompanyName,QuantityPerUnit,
+	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ",
+	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5",
+	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10",
+	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15",
 	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 16+",
-	SUM(UnitsInStock) AS "Sum UnitsInStock", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
+	SUM(UnitsInStock) AS "Sum UnitsInStock",
+	SUM(1) as Total
+FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID
 GROUP BY CompanyName,QuantityPerUnit
  */
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/readme.txt b/lib/WikiDB/adodb/readme.txt
deleted file mode 100644
index add9a7d71..000000000
--- a/lib/WikiDB/adodb/readme.txt
+++ /dev/null
@@ -1,68 +0,0 @@
->> ADODB Library for PHP5
-
-(c) 2000-2012 John Lim (jlim@natsoft.com)
-
-Released under both BSD and GNU Lesser GPL library license. 
-This means you can use it in proprietary products.
-
-
-Introduction
-============
-
-PHP's database access functions are not standardised. This creates a 
-need for a database class library to hide the differences between the 
-different databases (encapsulate the differences) so we can easily 
-switch databases.
-
-We currently support MySQL, Interbase, Sybase, PostgreSQL, Oracle, 
-Microsoft SQL server,  Foxpro ODBC, Access ODBC, Informix, DB2,
-Sybase SQL Anywhere, generic ODBC and Microsoft's ADO. 
-
-We hope more people will contribute drivers to support other databases.
-
-
-Documentation and Examples
-==========================
-
-Refer to the adodb/docs directory for full documentation and examples. 
-There is also a  tutorial tute.htm that contrasts ADODB code with 
-mysql code.
-
-
-
-Files
-=====
-
-adodb.inc.php is the main file. You need to include only this file.
-
-adodb-*.inc.php are the database specific driver code.
-
-test.php contains a list of test commands to exercise the class library.
-
-adodb-session.php is the PHP4 session handling code.
-
-testdatabases.inc.php contains the list of databases to apply the tests on.
-
-Benchmark.php is a simple benchmark to test the throughput of a simple SELECT 
-statement for databases described in testdatabases.inc.php. The benchmark
-tables are created in test.php.
-
-readme.htm is the main documentation.
-
-tute.htm is the tutorial.
-
-
-More Info
-=========
-
-For more information, including installation see readme.htm
-or visit
-           http://adodb.sourceforge.net/
-
-
->> Feature Requests and Bug Reports
-
-Email to jlim@natsoft.com
-
-
- 
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/rsfilter.inc.php b/lib/WikiDB/adodb/rsfilter.inc.php
index f55de2c26..f3cd5338c 100644
--- a/lib/WikiDB/adodb/rsfilter.inc.php
+++ b/lib/WikiDB/adodb/rsfilter.inc.php
@@ -1,29 +1,29 @@
 databaseType != 'array') {
 		if (!$rs->connection) return false;
-		
+
 		$rs = $rs->connection->_rs2rs($rs);
 	}
 	$rows = $rs->RecordCount();
@@ -49,13 +49,12 @@ function RSFilter($rs,$fn)
       } else {
 			$fn($rs->_array[$i],$rs);
       }
-	  
+
 	}
 	if (!$rs->EOF) {
 		$rs->_currentRow = 0;
 		$rs->fields = $rs->_array[0];
 	}
-	
+
 	return $rs;
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/server.php b/lib/WikiDB/adodb/server.php
index faead3a72..f067476ea 100644
--- a/lib/WikiDB/adodb/server.php
+++ b/lib/WikiDB/adodb/server.php
@@ -1,29 +1,29 @@
 SelectLimit($sql,$nrows,$offset);
-} else 
+} else
 	$rs = $conn->Execute($sql);
-if ($rs){ 
+if ($rs){
 	//$rs->timeToLive = 1;
 	echo _rs2serialize($rs,$conn,$sql);
 	$rs->Close();
 } else
 	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-compress-bzip2.php b/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
index 5e7d02204..65c258aba 100644
--- a/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
+++ b/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
@@ -1,8 +1,8 @@
 
diff --git a/lib/WikiDB/adodb/session/adodb-compress-gzip.php b/lib/WikiDB/adodb/session/adodb-compress-gzip.php
index 24dc0a9fa..0d6324f0f 100644
--- a/lib/WikiDB/adodb/session/adodb-compress-gzip.php
+++ b/lib/WikiDB/adodb/session/adodb-compress-gzip.php
@@ -2,8 +2,8 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+         Contributed by Ross Smith (adodb@netebb.com).
   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.
@@ -89,5 +89,3 @@ class ADODB_Compress_Gzip {
 }
 
 return 1;
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-cryptsession.php b/lib/WikiDB/adodb/session/adodb-cryptsession.php
index 75389d2e1..59f05234c 100644
--- a/lib/WikiDB/adodb/session/adodb-cryptsession.php
+++ b/lib/WikiDB/adodb/session/adodb-cryptsession.php
@@ -2,8 +2,8 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+         Contributed by Ross Smith (adodb@netebb.com).
   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.
@@ -23,5 +23,3 @@ if (!defined('ADODB_SESSION')) {
 require_once  ADODB_SESSION . '/adodb-encrypt-md5.php';
 
 ADODB_Session::filter(new ADODB_Encrypt_MD5());
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-cryptsession2.php b/lib/WikiDB/adodb/session/adodb-cryptsession2.php
index e2bd136be..348cac5cc 100644
--- a/lib/WikiDB/adodb/session/adodb-cryptsession2.php
+++ b/lib/WikiDB/adodb/session/adodb-cryptsession2.php
@@ -2,8 +2,8 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+         Contributed by Ross Smith (adodb@netebb.com).
   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.
@@ -23,5 +23,3 @@ if (!defined('ADODB_SESSION')) {
 require_once  ADODB_SESSION . '/adodb-encrypt-md5.php';
 
 ADODB_Session::filter(new ADODB_Encrypt_MD5());
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php b/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
index eb731ff9a..03ea7b049 100644
--- a/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
+++ b/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
@@ -2,8 +2,8 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+         Contributed by Ross Smith (adodb@netebb.com).
   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.
@@ -105,5 +105,3 @@ class ADODB_Encrypt_MCrypt {
 }
 
 return 1;
-
-?>
diff --git a/lib/WikiDB/adodb/session/adodb-encrypt-md5.php b/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
index 6ab6fb7c4..0965d537e 100644
--- a/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
+++ b/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
@@ -1,8 +1,8 @@
 
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-encrypt-secret.php b/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
index 692173742..078c02d5f 100644
--- a/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
+++ b/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
@@ -1,8 +1,8 @@
 
diff --git a/lib/WikiDB/adodb/session/adodb-encrypt-sha1.php b/lib/WikiDB/adodb/session/adodb-encrypt-sha1.php
index 0884af602..70655153f 100644
--- a/lib/WikiDB/adodb/session/adodb-encrypt-sha1.php
+++ b/lib/WikiDB/adodb/session/adodb-encrypt-sha1.php
@@ -10,7 +10,7 @@ include_once ADODB_SESSION . '/crypt.inc.php';
 
 class ADODB_Encrypt_SHA1 {
 
-	function write($data, $key) 
+	function write($data, $key)
 	{
 		$sha1crypt = new SHA1Crypt();
 		return $sha1crypt->encrypt($data, $key);
@@ -18,7 +18,7 @@ class ADODB_Encrypt_SHA1 {
 	}
 
 
-	function read($data, $key) 
+	function read($data, $key)
 	{
 		$sha1crypt = new SHA1Crypt();
 		return $sha1crypt->decrypt($data, $key);
@@ -29,4 +29,3 @@ class ADODB_Encrypt_SHA1 {
 
 
 return 1;
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-sess.txt b/lib/WikiDB/adodb/session/adodb-sess.txt
index d23dac42d..c6c768586 100644
--- a/lib/WikiDB/adodb/session/adodb-sess.txt
+++ b/lib/WikiDB/adodb/session/adodb-sess.txt
@@ -1,131 +1,131 @@
-John,
-
-I have been an extremely satisfied ADODB user for several years now.
-
-To give you something back for all your hard work, I've spent the last 3
-days rewriting the adodb-session.php code.
-
-----------
-What's New
-----------
-
-Here's a list of the new code's benefits:
-
-* Combines the functionality of the three files:
-
-adodb-session.php
-adodb-session-clob.php
-adodb-cryptsession.php
-
-each with very similar functionality, into a single file adodb-session.php.
-This will ease maintenance and support issues.
-
-* Supports multiple encryption and compression schemes.
-  Currently, we support:
-
-  MD5Crypt (crypt.inc.php)
-  MCrypt
-  Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
-  GZip
-  BZip2
-
-These can be stacked, so if you want to compress and then encrypt your
-session data, it's easy.
-Also, the built-in MCrypt functions will be *much* faster, and more secure,
-than the MD5Crypt code.
-
-* adodb-session.php contains a single class ADODB_Session that encapsulates
-all functionality.
-  This eliminates the use of global vars and defines (though they are
-supported for backwards compatibility).
-
-* All user defined parameters are now static functions in the ADODB_Session
-class.
-
-New parameters include:
-
-* encryptionKey(): Define the encryption key used to encrypt the session.
-Originally, it was a hard coded string.
-
-* persist(): Define if the database will be opened in persistent mode.
-Originally, the user had to call adodb_sess_open().
-
-* dataFieldName(): Define the field name used to store the session data, as
-'DATA' appears to be a reserved word in the following cases:
-	ANSI SQL
-	IBM DB2
-	MS SQL Server
-	Postgres
-	SAP
-
-* filter(): Used to support multiple, simulataneous encryption/compression
-schemes.
-
-* Debug support is improved thru _rsdump() function, which is called after
-every database call.
-
-------------
-What's Fixed
-------------
-
-The new code includes several bug fixes and enhancements:
-
-* sesskey is compared in BINARY mode for MySQL, to avoid problems with
-session keys that differ only by case.
-  Of course, the user should define the sesskey field as BINARY, to
-correctly fix this problem, otherwise performance will suffer.
-
-* In ADODB_Session::gc(), if $expire_notify is true, the multiple DELETES in
-the original code have been optimized to a single DELETE.
-
-* In ADODB_Session::destroy(), since "SELECT expireref, sesskey FROM $table
-WHERE sesskey = $qkey" will only return a single value, we don't loop on the
-result, we simply process the row, if any.
-
-* We close $rs after every use.
-
----------------
-What's the Same
----------------
-
-I know backwards compatibility is *very* important to you.  Therefore, the
-new code is 100% backwards compatible.
-
-If you like my code, but don't "trust" it's backwards compatible, maybe we
-offer it as beta code, in a new directory for a release or two?
-
-------------
-What's To Do
-------------
-
-I've vascillated over whether to use a single function to get/set
-parameters:
-
-$user = ADODB_Session::user(); 	// get
-ADODB_Session::user($user);		// set
-
-or to use separate functions (which is the PEAR/Java way):
-
-$user = ADODB_Session::getUser();
-ADODB_Session::setUser($user);
-
-I've chosen the former as it's makes for a simpler API, and reduces the
-amount of code, but I'd be happy to change it to the latter.
-
-Also, do you think the class should be a singleton class, versus a static
-class?
-
-Let me know if you find this code useful, and will be including it in the
-next release of ADODB.
-
-If so, I will modify the current documentation to detail the new
-functionality.  To that end, what file(s) contain the documentation?  Please
-send them to me if they are not publically available.
-
-Also, if there is *anything* in the code that you like to see changed, let
-me know.
-
-Thanks,
-
-Ross
-
+John,
+
+I have been an extremely satisfied ADODB user for several years now.
+
+To give you something back for all your hard work, I've spent the last 3
+days rewriting the adodb-session.php code.
+
+----------
+What's New
+----------
+
+Here's a list of the new code's benefits:
+
+* Combines the functionality of the three files:
+
+adodb-session.php
+adodb-session-clob.php
+adodb-cryptsession.php
+
+each with very similar functionality, into a single file adodb-session.php.
+This will ease maintenance and support issues.
+
+* Supports multiple encryption and compression schemes.
+  Currently, we support:
+
+  MD5Crypt (crypt.inc.php)
+  MCrypt
+  Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
+  GZip
+  BZip2
+
+These can be stacked, so if you want to compress and then encrypt your
+session data, it's easy.
+Also, the built-in MCrypt functions will be *much* faster, and more secure,
+than the MD5Crypt code.
+
+* adodb-session.php contains a single class ADODB_Session that encapsulates
+all functionality.
+  This eliminates the use of global vars and defines (though they are
+supported for backwards compatibility).
+
+* All user defined parameters are now static functions in the ADODB_Session
+class.
+
+New parameters include:
+
+* encryptionKey(): Define the encryption key used to encrypt the session.
+Originally, it was a hard coded string.
+
+* persist(): Define if the database will be opened in persistent mode.
+Originally, the user had to call adodb_sess_open().
+
+* dataFieldName(): Define the field name used to store the session data, as
+'DATA' appears to be a reserved word in the following cases:
+	ANSI SQL
+	IBM DB2
+	MS SQL Server
+	Postgres
+	SAP
+
+* filter(): Used to support multiple, simulataneous encryption/compression
+schemes.
+
+* Debug support is improved thru _rsdump() function, which is called after
+every database call.
+
+------------
+What's Fixed
+------------
+
+The new code includes several bug fixes and enhancements:
+
+* sesskey is compared in BINARY mode for MySQL, to avoid problems with
+session keys that differ only by case.
+  Of course, the user should define the sesskey field as BINARY, to
+correctly fix this problem, otherwise performance will suffer.
+
+* In ADODB_Session::gc(), if $expire_notify is true, the multiple DELETES in
+the original code have been optimized to a single DELETE.
+
+* In ADODB_Session::destroy(), since "SELECT expireref, sesskey FROM $table
+WHERE sesskey = $qkey" will only return a single value, we don't loop on the
+result, we simply process the row, if any.
+
+* We close $rs after every use.
+
+---------------
+What's the Same
+---------------
+
+I know backwards compatibility is *very* important to you.  Therefore, the
+new code is 100% backwards compatible.
+
+If you like my code, but don't "trust" it's backwards compatible, maybe we
+offer it as beta code, in a new directory for a release or two?
+
+------------
+What's To Do
+------------
+
+I've vascillated over whether to use a single function to get/set
+parameters:
+
+$user = ADODB_Session::user(); 	// get
+ADODB_Session::user($user);		// set
+
+or to use separate functions (which is the PEAR/Java way):
+
+$user = ADODB_Session::getUser();
+ADODB_Session::setUser($user);
+
+I've chosen the former as it's makes for a simpler API, and reduces the
+amount of code, but I'd be happy to change it to the latter.
+
+Also, do you think the class should be a singleton class, versus a static
+class?
+
+Let me know if you find this code useful, and will be including it in the
+next release of ADODB.
+
+If so, I will modify the current documentation to detail the new
+functionality.  To that end, what file(s) contain the documentation?  Please
+send them to me if they are not publically available.
+
+Also, if there is *anything* in the code that you like to see changed, let
+me know.
+
+Thanks,
+
+Ross
+
diff --git a/lib/WikiDB/adodb/session/adodb-session-clob.php b/lib/WikiDB/adodb/session/adodb-session-clob.php
index 5d687f20c..24304f2d1 100644
--- a/lib/WikiDB/adodb/session/adodb-session-clob.php
+++ b/lib/WikiDB/adodb/session/adodb-session-clob.php
@@ -2,8 +2,8 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+         Contributed by Ross Smith (adodb@netebb.com).
   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.
@@ -20,5 +20,3 @@ if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session.php';
 }
 ADODB_Session::clob('CLOB');
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-session-clob2.php b/lib/WikiDB/adodb/session/adodb-session-clob2.php
index 30b0c6baf..27c3beb7c 100644
--- a/lib/WikiDB/adodb/session/adodb-session-clob2.php
+++ b/lib/WikiDB/adodb/session/adodb-session-clob2.php
@@ -2,8 +2,8 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+         Contributed by Ross Smith (adodb@netebb.com).
   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.
@@ -20,5 +20,3 @@ if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session2.php';
 }
 ADODB_Session::clob('CLOB');
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-session.php b/lib/WikiDB/adodb/session/adodb-session.php
index e0fb5ae08..335a54a9d 100644
--- a/lib/WikiDB/adodb/session/adodb-session.php
+++ b/lib/WikiDB/adodb/session/adodb-session.php
@@ -2,8 +2,8 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+         Contributed by Ross Smith (adodb@netebb.com).
   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.
@@ -34,16 +34,16 @@ if (defined('ADODB_SESSION')) return 1;
 define('ADODB_SESSION', dirname(__FILE__));
 
 
-/* 
-	Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821 
-	
-	From Kerr Schere, to unserialize session data stored via ADOdb. 
-	1. Pull the session data from the db and loop through it. 
-	2. Inside the loop, you will need to urldecode the data column. 
+/*
+	Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821
+
+	From Kerr Schere, to unserialize session data stored via ADOdb.
+	1. Pull the session data from the db and loop through it.
+	2. Inside the loop, you will need to urldecode the data column.
 	3. After urldecode, run the serialized string through this function:
 
 */
-function adodb_unserialize( $serialized_string ) 
+function adodb_unserialize( $serialized_string )
 {
 	$variables = array( );
 	$a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
@@ -57,7 +57,7 @@ function adodb_unserialize( $serialized_string )
 	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
 	Since adodb 4.61.
 */
-function adodb_session_regenerate_id() 
+function adodb_session_regenerate_id()
 {
 	$conn = ADODB_Session::_conn();
 	if (!$conn) return false;
@@ -73,7 +73,7 @@ function adodb_session_regenerate_id()
 	}
 	$new_id = session_id();
 	$ok = $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
-	
+
 	/* it is possible that the update statement fails due to a collision */
 	if (!$ok) {
 		session_id($old_id);
@@ -81,7 +81,7 @@ function adodb_session_regenerate_id()
 		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -111,13 +111,13 @@ class ADODB_Session {
 	/////////////////////
 	// getter/setter methods
 	/////////////////////
-	
+
 	/*
-	
+
 	function Lock($lock=null)
 	{
 	static $_lock = false;
-	
+
 		if (!is_null($lock)) $_lock = $lock;
 		return $lock;
 	}
@@ -219,7 +219,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	function persist($persist = null) 
+	function persist($persist = null)
 	{
 		static $_persist = true;
 
@@ -492,7 +492,7 @@ class ADODB_Session {
 	/////////////////////
 	// public methods
 	/////////////////////
-	
+
 	function config($driver, $host, $user, $password, $database=false,$options=false)
 	{
 		ADODB_Session::driver($driver);
@@ -500,9 +500,9 @@ class ADODB_Session {
 		ADODB_Session::user($user);
 		ADODB_Session::password($password);
 		ADODB_Session::database($database);
-		
+
 		if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
-		
+
 		if (isset($options['table'])) ADODB_Session::table($options['table']);
 		if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
 		if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
@@ -513,7 +513,7 @@ class ADODB_Session {
 
 		If $conn already exists, reuse that connection
 	*/
-	function open($save_path, $session_name, $persist = null) 
+	function open($save_path, $session_name, $persist = null)
 	{
 		$conn = ADODB_Session::_conn();
 
@@ -560,7 +560,7 @@ class ADODB_Session {
 		if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
 		else
 			ADOConnection::outp('
    Session: connection failed
    ', false);
-		
+
 
 		return $ok;
 	}
@@ -568,7 +568,7 @@ class ADODB_Session {
 	/*!
 		Close the connection
 	*/
-	function close() 
+	function close()
 	{
 /*
 		$conn = ADODB_Session::_conn();
@@ -580,7 +580,7 @@ class ADODB_Session {
 	/*
 		Slurp in the session variables and return the serialized string
 	*/
-	function read($key) 
+	function read($key)
 	{
 		$conn	= ADODB_Session::_conn();
 		$data	= ADODB_Session::dataFieldName();
@@ -595,15 +595,15 @@ class ADODB_Session {
 
 		$qkey = $conn->quote($key);
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-	
+
 		$sql = "SELECT $data FROM $table WHERE sesskey = $binary $qkey AND expiry >= " . time();
-		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
+		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if
 		  developer has commited elsewhere... :(
 		 */
 		#if (ADODB_Session::Lock())
 		#	$rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
 		#else
-		
+
 			$rs = $conn->Execute($sql);
 		//ADODB_Session::_dumprs($rs);
 		if ($rs) {
@@ -634,12 +634,12 @@ class ADODB_Session {
 
 		If the data has not been modified since the last read(), we do not write.
 	*/
-	function write($key, $val) 
+	function write($key, $val)
 	{
 	global $ADODB_SESSION_READONLY;
-	
+
 		if (!empty($ADODB_SESSION_READONLY)) return;
-		
+
 		$clob			= ADODB_Session::clob();
 		$conn			= ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
@@ -650,12 +650,12 @@ class ADODB_Session {
 		$filter			= ADODB_Session::filter();
 		$lifetime		= ADODB_Session::lifetime();
 		$table			= ADODB_Session::table();
-	
+
 		if (!$conn) {
 			return false;
 		}
 		$qkey = $conn->qstr($key);
-	
+
 		//assert('$table');
 
 		$expiry = time() + $lifetime;
@@ -668,7 +668,7 @@ class ADODB_Session {
 			if ($debug) {
 				ADOConnection::outp( '
    Session: Only updating date - crc32 not changed
    ');
 			}
-			
+
 			$expirevar = '';
 			if ($expire_notify) {
 				$var = reset($expire_notify);
@@ -677,8 +677,8 @@ class ADODB_Session {
 					$expirevar = $$var;
 				}
 			}
-			
-			
+
+
 			$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
 			$rs = $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
 			return true;
@@ -702,7 +702,7 @@ class ADODB_Session {
 		if (!$clob) {	// no lobs, simply use replace()
 			$arr[$data] = $val;
 			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
-			
+
 		} else {
 			// what value shall we insert/update for lob row?
 			switch ($driver) {
@@ -719,7 +719,7 @@ class ADODB_Session {
 					$lob_value = 'null';
 					break;
 			}
-			
+
 			$conn->StartTrans();
 			$expiryref = $conn->qstr($arr['expireref']);
 			// do we insert or update? => as for sesskey
@@ -730,15 +730,15 @@ class ADODB_Session {
 				$sql = "INSERT INTO $table (expiry, $data, sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
 			}
 			if ($rs)$rs->Close();
-			
+
 
 			$err = '';
 			$rs1 = $conn->Execute($sql);
 			if (!$rs1) $err = $conn->ErrorMsg()."\n";
-			
+
 			$rs2 = $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
 			if (!$rs2) $err .= $conn->ErrorMsg()."\n";
-			
+
 			$rs = ($rs && $rs2) ? true : false;
 			$conn->CompleteTrans();
 		}
@@ -810,7 +810,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	function gc($maxlifetime) 
+	function gc($maxlifetime)
 	{
 		$conn			= ADODB_Session::_conn();
 		$debug			= ADODB_Session::debug();
@@ -846,11 +846,11 @@ class ADODB_Session {
 					$rs->MoveNext();
 				}
 				$rs->Close();
-				
+
 				$conn->CompleteTrans();
 			}
 		} else {
-		
+
 			if (1) {
 				$sql = "SELECT sesskey FROM $table WHERE expiry < $time";
 				$arr = $conn->GetAll($sql);
@@ -927,8 +927,6 @@ function adodb_sess_open($save_path, $session_name, $persist = true) {
 
 // for backwards compatability only
 function adodb_sess_gc($t)
-{	
+{
 	return ADODB_Session::gc($t);
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/adodb-session2.php b/lib/WikiDB/adodb/session/adodb-session2.php
index 7caa44382..5e5e6d540 100644
--- a/lib/WikiDB/adodb/session/adodb-session2.php
+++ b/lib/WikiDB/adodb/session/adodb-session2.php
@@ -2,13 +2,13 @@
 
 
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+         Contributed by Ross Smith (adodb@netebb.com).
   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.
 	  Set tabs to 4 for best viewing.
-	  
+
 
 */
 
@@ -36,10 +36,10 @@ CREATE UNIQUE INDEX SESS2_PK ON SESSIONS2(SESSKEY);
 CREATE INDEX SESS2_EXP_REF ON SESSIONS2(EXPIREREF);
 
 
- 
+
  MySQL
  =====
- 
+
 CREATE TABLE sessions2(
 	sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
 	expiry TIMESTAMP NOT NULL ,
@@ -64,16 +64,16 @@ if (defined('ADODB_SESSION')) return 1;
 define('ADODB_SESSION', dirname(__FILE__));
 define('ADODB_SESSION2', ADODB_SESSION);
 
-/* 
-	Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821 
-	
-	From Kerr Schere, to unserialize session data stored via ADOdb. 
-	1. Pull the session data from the db and loop through it. 
-	2. Inside the loop, you will need to urldecode the data column. 
+/*
+	Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821
+
+	From Kerr Schere, to unserialize session data stored via ADOdb.
+	1. Pull the session data from the db and loop through it.
+	2. Inside the loop, you will need to urldecode the data column.
 	3. After urldecode, run the serialized string through this function:
 
 */
-function adodb_unserialize( $serialized_string ) 
+function adodb_unserialize( $serialized_string )
 {
 	$variables = array( );
 	$a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
@@ -87,7 +87,7 @@ function adodb_unserialize( $serialized_string )
 	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
 	Since adodb 4.61.
 */
-function adodb_session_regenerate_id() 
+function adodb_session_regenerate_id()
 {
 	$conn = ADODB_Session::_conn();
 	if (!$conn) return false;
@@ -103,7 +103,7 @@ function adodb_session_regenerate_id()
 	}
 	$new_id = session_id();
 	$ok = $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
-	
+
 	/* it is possible that the update statement fails due to a collision */
 	if (!$ok) {
 		session_id($old_id);
@@ -111,7 +111,7 @@ function adodb_session_regenerate_id()
 		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -141,20 +141,20 @@ class ADODB_Session {
 	/////////////////////
 	// getter/setter methods
 	/////////////////////
-	
+
 	/*
-	
+
 	function Lock($lock=null)
 	{
 	static $_lock = false;
-	
+
 		if (!is_null($lock)) $_lock = $lock;
 		return $lock;
 	}
 	*/
 	/*!
 	*/
-	static function driver($driver = null) 
+	static function driver($driver = null)
 	{
 		static $_driver = 'mysql';
 		static $set = false;
@@ -193,7 +193,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function user($user = null) 
+	static function user($user = null)
 	{
 		static $_user = 'root';
 		static $set = false;
@@ -213,7 +213,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function password($password = null) 
+	static function password($password = null)
 	{
 		static $_password = '';
 		static $set = false;
@@ -233,11 +233,11 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function database($database = null) 
+	static function database($database = null)
 	{
 		static $_database = '';
 		static $set = false;
-		
+
 		if (!is_null($database)) {
 			$_database = trim($database);
 			$set = true;
@@ -252,7 +252,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function persist($persist = null) 
+	static function persist($persist = null)
 	{
 		static $_persist = true;
 
@@ -265,7 +265,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function lifetime($lifetime = null) 
+	static function lifetime($lifetime = null)
 	{
 		static $_lifetime;
 		static $set = false;
@@ -293,7 +293,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function debug($debug = null) 
+	static function debug($debug = null)
 	{
 		static $_debug = false;
 		static $set = false;
@@ -318,7 +318,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function expireNotify($expire_notify = null) 
+	static function expireNotify($expire_notify = null)
 	{
 		static $_expire_notify;
 		static $set = false;
@@ -338,7 +338,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function table($table = null) 
+	static function table($table = null)
 	{
 		static $_table = 'sessions2';
 		static $set = false;
@@ -358,7 +358,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function optimize($optimize = null) 
+	static function optimize($optimize = null)
 	{
 		static $_optimize = false;
 		static $set = false;
@@ -380,7 +380,7 @@ class ADODB_Session {
 	*/
 	static function syncSeconds($sync_seconds = null) {
 		//echo ("
    WARNING: ADODB_SESSION::syncSeconds is longer used, please remove this function for your code
    ");
-		
+
 		return 0;
 	}
 
@@ -507,7 +507,7 @@ class ADODB_Session {
 			return;
 		}
 		$rs = $conn->_rs2rs($rs);
-		
+
 		require_once ADODB_SESSION.'/../tohtml.inc.php';
 		rs2html($rs);
 		$rs->MoveFirst();
@@ -516,7 +516,7 @@ class ADODB_Session {
 	/////////////////////
 	// public methods
 	/////////////////////
-	
+
 	static function config($driver, $host, $user, $password, $database=false,$options=false)
 	{
 		ADODB_Session::driver($driver);
@@ -524,9 +524,9 @@ class ADODB_Session {
 		ADODB_Session::user($user);
 		ADODB_Session::password($password);
 		ADODB_Session::database($database);
-		
-		if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
-		
+
+		if (strncmp($driver, 'oci8', 4) == 0) $options['lob'] = 'CLOB';
+
 		if (isset($options['table'])) ADODB_Session::table($options['table']);
 		if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
 		if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
@@ -537,7 +537,7 @@ class ADODB_Session {
 
 		If $conn already exists, reuse that connection
 	*/
-	static function open($save_path, $session_name, $persist = null) 
+	static function open($save_path, $session_name, $persist = null)
 	{
 		$conn = ADODB_Session::_conn();
 
@@ -566,10 +566,10 @@ class ADODB_Session {
 		$conn = ADONewConnection($driver);
 
 		if ($debug) {
-			$conn->debug = true;		
+			$conn->debug = true;
 			ADOConnection::outp( " driver=$driver user=$user db=$database ");
 		}
-		
+
 		if (empty($conn->_connectionID)) { // not dsn
 			if ($persist) {
 				switch($persist) {
@@ -586,7 +586,7 @@ class ADODB_Session {
 		if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
 		else
 			ADOConnection::outp('
    Session: connection failed
    ', false);
-		
+
 
 		return $ok;
 	}
@@ -594,7 +594,7 @@ class ADODB_Session {
 	/*!
 		Close the connection
 	*/
-	static function close() 
+	static function close()
 	{
 /*
 		$conn = ADODB_Session::_conn();
@@ -606,7 +606,7 @@ class ADODB_Session {
 	/*
 		Slurp in the session variables and return the serialized string
 	*/
-	static function read($key) 
+	static function read($key)
 	{
 		$conn	= ADODB_Session::_conn();
 		$filter	= ADODB_Session::filter();
@@ -619,12 +619,12 @@ class ADODB_Session {
 		//assert('$table');
 
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-	
+
 		global $ADODB_SESSION_SELECT_FIELDS;
-		if (!isset($ADODB_SESSION_SELECT_FIELDS)) $ADODB_SESSION_SELECT_FIELDS = 'sessdata';		
-		$sql = "SELECT $ADODB_SESSION_SELECT_FIELDS FROM $table WHERE sesskey = $binary ".$conn->Param(0)." AND expiry >= " . $conn->sysTimeStamp;		
-		
-		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
+		if (!isset($ADODB_SESSION_SELECT_FIELDS)) $ADODB_SESSION_SELECT_FIELDS = 'sessdata';
+		$sql = "SELECT $ADODB_SESSION_SELECT_FIELDS FROM $table WHERE sesskey = $binary ".$conn->Param(0)." AND expiry >= " . $conn->sysTimeStamp;
+
+		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if
 		  developer has commited elsewhere... :(
 		 */
 		#if (ADODB_Session::Lock())
@@ -660,12 +660,12 @@ class ADODB_Session {
 
 		If the data has not been modified since the last read(), we do not write.
 	*/
-	static function write($key, $oval) 
+	static function write($key, $oval)
 	{
 	global $ADODB_SESSION_READONLY;
-	
+
 		if (!empty($ADODB_SESSION_READONLY)) return;
-		
+
 		$clob			= ADODB_Session::clob();
 		$conn			= ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
@@ -675,13 +675,13 @@ class ADODB_Session {
 		$filter			= ADODB_Session::filter();
 		$lifetime		= ADODB_Session::lifetime();
 		$table			= ADODB_Session::table();
-	
+
 		if (!$conn) {
 			return false;
 		}
 		if ($debug) $conn->debug = 1;
 		$sysTimeStamp = $conn->sysTimeStamp;
-		
+
 		//assert('$table');
 
 		$expiry = $conn->OffsetDate($lifetime/(24*3600),$sysTimeStamp);
@@ -694,7 +694,7 @@ class ADODB_Session {
 			if ($debug) {
 				echo '
    Session: Only updating date - crc32 not changed
    ';
 			}
-			
+
 			$expirevar = '';
 			if ($expire_notify) {
 				$var = reset($expire_notify);
@@ -703,8 +703,8 @@ class ADODB_Session {
 					$expirevar = $$var;
 				}
 			}
-			
-			
+
+
 			$sql = "UPDATE $table SET expiry = $expiry ,expireref=".$conn->Param('0').", modified = $sysTimeStamp WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= $sysTimeStamp";
 			$rs = $conn->Execute($sql,array($expirevar,$key));
 			return true;
@@ -723,60 +723,48 @@ class ADODB_Session {
 			if (isset($$var)) {
 				$expireref = $$var;
 			}
-		} 
+		}
 
 		if (!$clob) {	// no lobs, simply use replace()
 			$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
 			if ($rs) $rs->Close();
-					
+
 			if ($rs && reset($rs->fields) > 0) {
 				$sql = "UPDATE $table SET expiry=$expiry, sessdata=".$conn->Param(0).", expireref= ".$conn->Param(1).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param(2);
-				
+
 			} else {
-				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified) 
+				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified)
 					VALUES ($expiry,".$conn->Param('0').", ". $conn->Param('1').", ".$conn->Param('2').", $sysTimeStamp, $sysTimeStamp)";
 			}
-			
-	
+
+
 			$rs = $conn->Execute($sql,array($val,$expireref,$key));
-			
+
 		} else {
 			// what value shall we insert/update for lob row?
-			switch ($driver) {
-				// empty_clob or empty_lob for oracle dbs
-				case 'oracle':
-				case 'oci8':
-				case 'oci8po':
-				case 'oci805':
-					$lob_value = sprintf('empty_%s()', strtolower($clob));
-					break;
-
-				// null for all other
-				default:
-					$lob_value = 'null';
-					break;
-			}
-			
+			if (strncmp($driver, 'oci8', 4) == 0) $lob_value = sprintf('empty_%s()', strtolower($clob));
+			else $lob_value = 'null';
+
 			$conn->StartTrans();
-			
+
 			$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
-					
+
 			if ($rs && reset($rs->fields) > 0) {
 				$sql = "UPDATE $table SET expiry=$expiry, sessdata=$lob_value, expireref= ".$conn->Param(0).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('1');
-				
+
 			} else {
-				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified) 
+				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified)
 					VALUES ($expiry,$lob_value, ". $conn->Param('0').", ".$conn->Param('1').", $sysTimeStamp, $sysTimeStamp)";
 			}
-			
+
 			$rs = $conn->Execute($sql,array($expireref,$key));
-			
+
 			$qkey = $conn->qstr($key);
 			$rs2 = $conn->UpdateBlob($table, 'sessdata', $val, " sesskey=$qkey", strtoupper($clob));
 			if ($debug) echo "
    ",htmlspecialchars($oval), "
    ";
 			$rs = @$conn->CompleteTrans();
-			
-			
+
+
 		}
 
 		if (!$rs) {
@@ -849,7 +837,7 @@ class ADODB_Session {
 
 	/*!
 	*/
-	static function gc($maxlifetime) 
+	static function gc($maxlifetime)
 	{
 		$conn			= ADODB_Session::_conn();
 		$debug			= ADODB_Session::debug();
@@ -869,7 +857,7 @@ class ADODB_Session {
 		} else {
 			$COMMITNUM = 20;
 		}
-		
+
 		//assert('$table');
 
 		$time = $conn->OffsetDate(-$maxlifetime/24/3600,$conn->sysTimeStamp);
@@ -881,7 +869,7 @@ class ADODB_Session {
 		} else {
 			$fn = false;
 		}
-		
+
 		$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
 		$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time ORDER BY 2"; # add order by to prevent deadlock
 		$rs = $conn->SelectLimit($sql,1000);
@@ -906,10 +894,10 @@ class ADODB_Session {
 				}
 			}
 			$rs->Close();
-			
+
 			if ($tr) $conn->CommitTrans();
 		}
-		
+
 
 		// suggested by Cameron, "GaM3R" 
 		if ($optimize) {
@@ -926,7 +914,7 @@ class ADODB_Session {
 			}
 		}
 
-		
+
 		return true;
 	}
 }
@@ -942,8 +930,6 @@ function adodb_sess_open($save_path, $session_name, $persist = true) {
 
 // for backwards compatability only
 function adodb_sess_gc($t)
-{	
+{
 	return ADODB_Session::gc($t);
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/crypt.inc.php b/lib/WikiDB/adodb/session/crypt.inc.php
index 61d145b69..1468cb1ae 100644
--- a/lib/WikiDB/adodb/session/crypt.inc.php
+++ b/lib/WikiDB/adodb/session/crypt.inc.php
@@ -155,4 +155,3 @@ class SHA1Crypt{
 
 
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/old/adodb-cryptsession.php b/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
index c2560d1e8..1edb2e3b0 100644
--- a/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
+++ b/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
@@ -1,26 +1,26 @@
 
-	
+
   Set tabs to 4 for best viewing.
-  
+
   Latest version of ADODB is available at http://php.weblogs.com/adodb
   ======================================================================
-  
+
  This file provides PHP4 session management using the ADODB database
 wrapper library.
- 
+
  Example
  =======
- 
+
 	include('adodb.inc.php');
 	#---------------------------------#
-	include('adodb-cryptsession.php'); 
+	include('adodb-cryptsession.php');
 	#---------------------------------#
 	session_start();
 	session_register('AVAR');
@@ -28,12 +28,12 @@ wrapper library.
 	print "
 -- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
 
- 
+
  Installation
  ============
  1. Create a new database in MySQL or Access "sessions" like
 so:
- 
+
   create table sessions (
 	   SESSKEY char(32) not null,
 	   EXPIRY int(11) unsigned not null,
@@ -41,17 +41,17 @@ so:
 	   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'
-	
+
   3. Recommended is PHP 4.0.2 or later. There are documented
 session bugs in earlier versions of PHP.
 
@@ -65,13 +65,13 @@ if (!defined('_ADODB_LAYER')) {
 }
 
  /* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60); 
+ define('ADODB_SESSION_SYNCH_SECS',60);
 
 if (!defined('ADODB_SESSION')) {
 
  define('ADODB_SESSION',1);
- 
-GLOBAL 	$ADODB_SESSION_CONNECT, 
+
+GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESSION_DRIVER,
 	$ADODB_SESSION_USER,
 	$ADODB_SESSION_PWD,
@@ -81,10 +81,10 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESS_DEBUG,
 	$ADODB_SESS_INSERT,
 	$ADODB_SESSION_EXPIRE_NOTIFY,
-	$ADODB_SESSION_TBL; 
+	$ADODB_SESSION_TBL;
 
 	//$ADODB_SESS_DEBUG = true;
-	
+
 	/* SET THE FOLLOWING PARAMETERS */
 if (empty($ADODB_SESSION_DRIVER)) {
 	$ADODB_SESSION_DRIVER='mysql';
@@ -102,7 +102,7 @@ if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
 	$ADODB_SESSION_EXPIRE_NOTIFY = false;
 }
 
-function ADODB_Session_Key() 
+function ADODB_Session_Key()
 {
 $ADODB_CRYPT_KEY = 'CRYPTED ADODB SESSIONS ROCK!';
 
@@ -118,20 +118,20 @@ if ($ADODB_SESS_LIFE <= 1) {
 	$ADODB_SESS_LIFE=1440;
 }
 
-function adodb_sess_open($save_path, $session_name) 
+function adodb_sess_open($save_path, $session_name)
 {
-GLOBAL 	$ADODB_SESSION_CONNECT, 
+GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESSION_DRIVER,
 	$ADODB_SESSION_USER,
 	$ADODB_SESSION_PWD,
 	$ADODB_SESSION_DB,
 	$ADODB_SESS_CONN,
 	$ADODB_SESS_DEBUG;
-	
+
 	$ADODB_SESS_INSERT = false;
-	
+
 	if (isset($ADODB_SESS_CONN)) return true;
-	
+
 	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
 	if (!empty($ADODB_SESS_DEBUG)) {
 		$ADODB_SESS_CONN->debug = true;
@@ -139,10 +139,10 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	}
 	return $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
 			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-	
+
 }
 
-function adodb_sess_close() 
+function adodb_sess_close()
 {
 global $ADODB_SESS_CONN;
 
@@ -150,7 +150,7 @@ global $ADODB_SESS_CONN;
 	return true;
 }
 
-function adodb_sess_read($key) 
+function adodb_sess_read($key)
 {
 $Crypt = new MD5Crypt;
 global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
@@ -167,20 +167,20 @@ global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
 		return $v;
 	}
 	else $ADODB_SESS_INSERT = true;
-	
+
 	return '';
 }
 
-function adodb_sess_write($key, $val) 
+function adodb_sess_write($key, $val)
 {
 $Crypt = new MD5Crypt;
 	global $ADODB_SESS_INSERT,$ADODB_SESS_CONN, $ADODB_SESS_LIFE, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
 
 	$expiry = time() + $ADODB_SESS_LIFE;
 
-	// encrypt session data..	
+	// encrypt session data..
 	$val = $Crypt->Encrypt(rawurlencode($val), ADODB_Session_Key());
-	
+
 	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
 	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
 		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -197,16 +197,16 @@ $Crypt = new MD5Crypt;
 	} else {
 		// bug in access driver (could be odbc?) means that info is not commited
 		// properly unless select statement executed in Win2000
-	
+
 	if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
 	}
 	return isset($rs);
 }
 
-function adodb_sess_destroy($key) 
+function adodb_sess_destroy($key)
 {
 	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
+
 	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
 		reset($ADODB_SESSION_EXPIRE_NOTIFY);
 		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -252,7 +252,7 @@ function adodb_sess_gc($maxlifetime) {
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			
+
 			$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
 			$ADODB_SESS_CONN->CommitTrans();
 		}
@@ -260,12 +260,12 @@ function adodb_sess_gc($maxlifetime) {
 		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
 		$ADODB_SESS_CONN->Execute($qry);
 	}
-	
+
 	// suggested by Cameron, "GaM3R" 
 	if (defined('ADODB_SESSION_OPTIMIZE'))
 	{
 	global $ADODB_SESSION_DRIVER;
-	
+
 		switch( $ADODB_SESSION_DRIVER ) {
 			case 'mysql':
 			case 'mysqlt':
@@ -273,34 +273,34 @@ function adodb_sess_gc($maxlifetime) {
 				break;
 			case 'postgresql':
 			case 'postgresql7':
-				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
 				break;
 		}
 	}
-	
+
 	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
 	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-	
+
 	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
 	if ($rs && !$rs->EOF) {
-	
+
 		$dbts = reset($rs->fields);
 		$rs->Close();
 		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
 		$t = time();
 		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
-			$msg = 
+			$msg =
 			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
 			error_log($msg);
 			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
 -- $msg
    ");
 		}
 	}
-	
+
 	return true;
 }
 
-session_module_name('user'); 
+session_module_name('user');
 session_set_save_handler(
 	"adodb_sess_open",
 	"adodb_sess_close",
@@ -321,4 +321,3 @@ if (0) {
 -- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
 }
 */
-?>
diff --git a/lib/WikiDB/adodb/session/old/adodb-session-clob.php b/lib/WikiDB/adodb/session/old/adodb-session-clob.php
index 2c3bfbd3c..bdb5b05af 100644
--- a/lib/WikiDB/adodb/session/old/adodb-session-clob.php
+++ b/lib/WikiDB/adodb/session/old/adodb-session-clob.php
@@ -1,20 +1,20 @@
 ";
-	
+
 To force non-persistent connections, call adodb_session_open first before session_start():
 
 	include('adodb.inc.php');
@@ -34,11 +34,11 @@ To force non-persistent connections, call adodb_session_open first before sessio
 	print "
 -- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
 
- 
+
  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,
@@ -56,7 +56,7 @@ To force non-persistent connections, call adodb_session_open first before sessio
 	$ADODB_SESSION_DB ='database';
 	$ADODB_SESSION_TBL = 'sessions'
 	$ADODB_SESSION_USE_LOBS = false; (or, if you wanna use CLOBS (= 'CLOB') or ( = 'BLOB')
-	
+
   3. Recommended is PHP 4.1.0 or later. There are documented
 	 session bugs in earlier versions of PHP.
 
@@ -64,24 +64,24 @@ To force non-persistent connections, call adodb_session_open first before sessio
   	 you can tag a session with an EXPIREREF, and before the session
 	 record is deleted, we can call a function that will pass the EXPIREREF
 	 as the first parameter, and the session key as the second parameter.
-	 
+
 	 To do this, define a notification function, say NotifyFn:
-	 
+
 	 	function NotifyFn($expireref, $sesskey)
 	 	{
 	 	}
-	 
+
 	 Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
 	 This is an array with 2 elements, the first being the name of the variable
-	 you would like to store in the EXPIREREF field, and the 2nd is the 
+	 you would like to store in the EXPIREREF field, and the 2nd is the
 	 notification function's name.
-	 
-	 In this example, we want to be notified when a user's session 
-	 has expired, so we store the user id in the global variable $USERID, 
+
+	 In this example, we want to be notified when a user's session
+	 has expired, so we store the user id in the global variable $USERID,
 	 store this value in the EXPIREREF field:
-	 
+
 	 	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-		
+
 	Then when the NotifyFn is called, we are passed the $USERID as the first
 	parameter, eg. NotifyFn($userid, $sesskey).
 */
@@ -93,14 +93,14 @@ if (!defined('_ADODB_LAYER')) {
 if (!defined('ADODB_SESSION')) {
 
  define('ADODB_SESSION',1);
- 
+
  /* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60); 
+ define('ADODB_SESSION_SYNCH_SECS',60);
 
 /****************************************************************************************\
 	Global definitions
 \****************************************************************************************/
-GLOBAL 	$ADODB_SESSION_CONNECT, 
+GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESSION_DRIVER,
 	$ADODB_SESSION_USER,
 	$ADODB_SESSION_PWD,
@@ -112,9 +112,9 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESSION_CRC,
 	$ADODB_SESSION_USE_LOBS,
 	$ADODB_SESSION_TBL;
-	
+
 	if (!isset($ADODB_SESSION_USE_LOBS)) $ADODB_SESSION_USE_LOBS = 'CLOB';
-	
+
 	$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
 	if ($ADODB_SESS_LIFE <= 1) {
 	 // bug in PHP 4.0.3 pl 1  -- how about other versions?
@@ -123,11 +123,11 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	}
 	$ADODB_SESSION_CRC = false;
 	//$ADODB_SESS_DEBUG = true;
-	
+
 	//////////////////////////////////
 	/* SET THE FOLLOWING PARAMETERS */
 	//////////////////////////////////
-	
+
 	if (empty($ADODB_SESSION_DRIVER)) {
 		$ADODB_SESSION_DRIVER='mysql';
 		$ADODB_SESSION_CONNECT='localhost';
@@ -135,7 +135,7 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 		$ADODB_SESSION_PWD ='';
 		$ADODB_SESSION_DB ='xphplens_2';
 	}
-	
+
 	if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
 		$ADODB_SESSION_EXPIRE_NOTIFY = false;
 	}
@@ -143,7 +143,7 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	if (empty($ADODB_SESSION_TBL)){
 		$ADODB_SESSION_TBL = 'sessions';
 	}
-	
+
 
 	// defaulting $ADODB_SESSION_USE_LOBS
 	if (!isset($ADODB_SESSION_USE_LOBS) || empty($ADODB_SESSION_USE_LOBS)) {
@@ -158,28 +158,28 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESS['db'] = $ADODB_SESSION_DB;
 	$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
 	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
-	
+
 	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
 	$ADODB_SESS['table'] = $ADODB_SESS_TBL;
 	*/
-	
+
 /****************************************************************************************\
-	Create the connection to the database. 
-	
+	Create the connection to the database.
+
 	If $ADODB_SESS_CONN already exists, reuse that connection
 \****************************************************************************************/
-function adodb_sess_open($save_path, $session_name,$persist=true) 
+function adodb_sess_open($save_path, $session_name,$persist=true)
 {
 GLOBAL $ADODB_SESS_CONN;
 	if (isset($ADODB_SESS_CONN)) return true;
-	
-GLOBAL 	$ADODB_SESSION_CONNECT, 
+
+GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESSION_DRIVER,
 	$ADODB_SESSION_USER,
 	$ADODB_SESSION_PWD,
 	$ADODB_SESSION_DB,
 	$ADODB_SESS_DEBUG;
-	
+
 	// cannot use & below - do not know why...
 	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
 	if (!empty($ADODB_SESS_DEBUG)) {
@@ -190,7 +190,7 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
 	else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
 			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-	
+
 	if (!$ok) ADOConnection::outp( "
 -- Session: connection failed
    ",false);
 }
@@ -198,7 +198,7 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 /****************************************************************************************\
 	Close the connection
 \****************************************************************************************/
-function adodb_sess_close() 
+function adodb_sess_close()
 {
 global $ADODB_SESS_CONN;
 
@@ -209,7 +209,7 @@ global $ADODB_SESS_CONN;
 /****************************************************************************************\
 	Slurp in the session variables and return the serialized string
 \****************************************************************************************/
-function adodb_sess_read($key) 
+function adodb_sess_read($key)
 {
 global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
 
@@ -217,50 +217,50 @@ global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
 	if ($rs) {
 		if ($rs->EOF) {
 			$v = '';
-		} else 
+		} else
 			$v = rawurldecode(reset($rs->fields));
-			
+
 		$rs->Close();
-		
+
 		// new optimization adodb 2.1
 		$ADODB_SESSION_CRC = strlen($v).crc32($v);
-		
+
 		return $v;
 	}
-	
+
 	return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
 }
 
 /****************************************************************************************\
 	Write the serialized data to a database.
-	
+
 	If the data has not been modified since adodb_sess_read(), we do not write.
 \****************************************************************************************/
-function adodb_sess_write($key, $val) 
+function adodb_sess_write($key, $val)
 {
 	global
-		$ADODB_SESS_CONN, 
-		$ADODB_SESS_LIFE, 
+		$ADODB_SESS_CONN,
+		$ADODB_SESS_LIFE,
 		$ADODB_SESSION_TBL,
-		$ADODB_SESS_DEBUG, 
+		$ADODB_SESS_DEBUG,
 		$ADODB_SESSION_CRC,
 		$ADODB_SESSION_EXPIRE_NOTIFY,
 		$ADODB_SESSION_DRIVER,			// added
 		$ADODB_SESSION_USE_LOBS;		// added
 
 	$expiry = time() + $ADODB_SESS_LIFE;
-	
+
 	// crc32 optimization since adodb 2.1
 	// now we only update expiry date, thx to sebastian thom in adodb 2.32
 	if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
 		if ($ADODB_SESS_DEBUG) echo "
 -- Session: Only updating date - crc32 not changed
    ";
 		$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
-		$rs = $ADODB_SESS_CONN->Execute($qry);	
+		$rs = $ADODB_SESS_CONN->Execute($qry);
 		return true;
 	}
 	$val = rawurlencode($val);
-	
+
 	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
 	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
 		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -268,7 +268,7 @@ function adodb_sess_write($key, $val)
 		$arr['expireref'] = $$var;
 	}
 
-	
+
 	if ($ADODB_SESSION_USE_LOBS === false) {	// no lobs, simply use replace()
 		$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr, 'sesskey',$autoQuote = true);
 		if (!$rs) {
@@ -318,16 +318,16 @@ function adodb_sess_write($key, $val)
 	}  else {
 		// bug in access driver (could be odbc?) means that info is not commited
 		// properly unless select statement executed in Win2000
-		if ($ADODB_SESS_CONN->databaseType == 'access') 
+		if ($ADODB_SESS_CONN->databaseType == 'access')
 			$rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
 	}
 	return !empty($rs);
 }
 
-function adodb_sess_destroy($key) 
+function adodb_sess_destroy($key)
 {
 	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
+
 	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
 		reset($ADODB_SESSION_EXPIRE_NOTIFY);
 		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -352,10 +352,10 @@ function adodb_sess_destroy($key)
 	return $rs ? true : false;
 }
 
-function adodb_sess_gc($maxlifetime) 
+function adodb_sess_gc($maxlifetime)
 {
 	global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
+
 	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
 		reset($ADODB_SESSION_EXPIRE_NOTIFY);
 		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -373,21 +373,21 @@ function adodb_sess_gc($maxlifetime)
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			
+
 			//$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
 			$ADODB_SESS_CONN->CommitTrans();
-			
+
 		}
 	} else {
 		$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time());
-	
+
 		if ($ADODB_SESS_DEBUG) ADOConnection::outp("
 -- Garbage Collection: $qry
    ");
 	}
 	// suggested by Cameron, "GaM3R" 
 	if (defined('ADODB_SESSION_OPTIMIZE')) {
 	global $ADODB_SESSION_DRIVER;
-	
+
 		switch( $ADODB_SESSION_DRIVER ) {
 			case 'mysql':
 			case 'mysqlt':
@@ -395,7 +395,7 @@ function adodb_sess_gc($maxlifetime)
 				break;
 			case 'postgresql':
 			case 'postgresql7':
-				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
 				break;
 		}
 		if (!empty($opt_qry)) {
@@ -404,27 +404,27 @@ function adodb_sess_gc($maxlifetime)
 	}
 	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
 	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-	
+
 	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
 	if ($rs && !$rs->EOF) {
-	
+
 		$dbts = reset($rs->fields);
 		$rs->Close();
 		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
 		$t = time();
 		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
-			$msg = 
+			$msg =
 			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
 			error_log($msg);
 			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
 -- $msg
    ");
 		}
 	}
-	
+
 	return true;
 }
 
-session_module_name('user'); 
+session_module_name('user');
 session_set_save_handler(
 	"adodb_sess_open",
 	"adodb_sess_close",
@@ -444,5 +444,3 @@ if (0) {
 	ADOConnection::outp( "
 -- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ",false);
 }
-
-?>
diff --git a/lib/WikiDB/adodb/session/old/adodb-session.php b/lib/WikiDB/adodb/session/old/adodb-session.php
index d4a100336..e9b6418f4 100644
--- a/lib/WikiDB/adodb/session/old/adodb-session.php
+++ b/lib/WikiDB/adodb/session/old/adodb-session.php
@@ -1,20 +1,20 @@
 ";
-	
+
 To force non-persistent connections, call adodb_session_open first before session_start():
 
 	include('adodb.inc.php');
@@ -34,11 +34,11 @@ To force non-persistent connections, call adodb_session_open first before sessio
 	print "
 -- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
 
- 
+
  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,
@@ -46,7 +46,7 @@ To force non-persistent connections, call adodb_session_open first before sessio
 	   DATA text not null,
 	  primary key (sesskey)
   );
-  
+
   For oracle:
     create table sessions (
 	   SESSKEY char(32) not null,
@@ -59,14 +59,14 @@ To force non-persistent connections, call adodb_session_open first before sessio
 
   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'
-	
+
   3. Recommended is PHP 4.1.0 or later. There are documented
 	 session bugs in earlier versions of PHP.
 
@@ -74,24 +74,24 @@ To force non-persistent connections, call adodb_session_open first before sessio
   	 you can tag a session with an EXPIREREF, and before the session
 	 record is deleted, we can call a function that will pass the EXPIREREF
 	 as the first parameter, and the session key as the second parameter.
-	 
+
 	 To do this, define a notification function, say NotifyFn:
-	 
+
 	 	function NotifyFn($expireref, $sesskey)
 	 	{
 	 	}
-	 
+
 	 Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
 	 This is an array with 2 elements, the first being the name of the variable
-	 you would like to store in the EXPIREREF field, and the 2nd is the 
+	 you would like to store in the EXPIREREF field, and the 2nd is the
 	 notification function's name.
-	 
-	 In this example, we want to be notified when a user's session 
-	 has expired, so we store the user id in the global variable $USERID, 
+
+	 In this example, we want to be notified when a user's session
+	 has expired, so we store the user id in the global variable $USERID,
 	 store this value in the EXPIREREF field:
-	 
+
 	 	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-		
+
 	Then when the NotifyFn is called, we are passed the $USERID as the first
 	parameter, eg. NotifyFn($userid, $sesskey).
 */
@@ -103,14 +103,14 @@ if (!defined('_ADODB_LAYER')) {
 if (!defined('ADODB_SESSION')) {
 
  define('ADODB_SESSION',1);
- 
+
  /* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60); 
+ define('ADODB_SESSION_SYNCH_SECS',60);
 
  /*
 	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
 */
-function adodb_session_regenerate_id() 
+function adodb_session_regenerate_id()
 {
 	$conn = ADODB_Session::_conn();
 	if (!$conn) return false;
@@ -126,7 +126,7 @@ function adodb_session_regenerate_id()
 	}
 	$new_id = session_id();
 	$ok = $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
-	
+
 	/* it is possible that the update statement fails due to a collision */
 	if (!$ok) {
 		session_id($old_id);
@@ -134,14 +134,14 @@ function adodb_session_regenerate_id()
 		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
 		return false;
 	}
-	
+
 	return true;
 }
 
 /****************************************************************************************\
 	Global definitions
 \****************************************************************************************/
-GLOBAL 	$ADODB_SESSION_CONNECT, 
+GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESSION_DRIVER,
 	$ADODB_SESSION_USER,
 	$ADODB_SESSION_PWD,
@@ -152,8 +152,8 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESSION_EXPIRE_NOTIFY,
 	$ADODB_SESSION_CRC,
 	$ADODB_SESSION_TBL;
-	
-	
+
+
 	$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
 	if ($ADODB_SESS_LIFE <= 1) {
 	 // bug in PHP 4.0.3 pl 1  -- how about other versions?
@@ -162,11 +162,11 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	}
 	$ADODB_SESSION_CRC = false;
 	//$ADODB_SESS_DEBUG = true;
-	
+
 	//////////////////////////////////
 	/* SET THE FOLLOWING PARAMETERS */
 	//////////////////////////////////
-	
+
 	if (empty($ADODB_SESSION_DRIVER)) {
 		$ADODB_SESSION_DRIVER='mysql';
 		$ADODB_SESSION_CONNECT='localhost';
@@ -174,7 +174,7 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 		$ADODB_SESSION_PWD ='';
 		$ADODB_SESSION_DB ='xphplens_2';
 	}
-	
+
 	if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
 		$ADODB_SESSION_EXPIRE_NOTIFY = false;
 	}
@@ -182,7 +182,7 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	if (empty($ADODB_SESSION_TBL)){
 		$ADODB_SESSION_TBL = 'sessions';
 	}
-	
+
 	/*
 	$ADODB_SESS['driver'] = $ADODB_SESSION_DRIVER;
 	$ADODB_SESS['connect'] = $ADODB_SESSION_CONNECT;
@@ -191,28 +191,28 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESS['db'] = $ADODB_SESSION_DB;
 	$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
 	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
-	
+
 	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
 	$ADODB_SESS['table'] = $ADODB_SESS_TBL;
 	*/
-	
+
 /****************************************************************************************\
-	Create the connection to the database. 
-	
+	Create the connection to the database.
+
 	If $ADODB_SESS_CONN already exists, reuse that connection
 \****************************************************************************************/
-function adodb_sess_open($save_path, $session_name,$persist=true) 
+function adodb_sess_open($save_path, $session_name,$persist=true)
 {
 GLOBAL $ADODB_SESS_CONN;
 	if (isset($ADODB_SESS_CONN)) return true;
-	
-GLOBAL 	$ADODB_SESSION_CONNECT, 
+
+GLOBAL 	$ADODB_SESSION_CONNECT,
 	$ADODB_SESSION_DRIVER,
 	$ADODB_SESSION_USER,
 	$ADODB_SESSION_PWD,
 	$ADODB_SESSION_DB,
 	$ADODB_SESS_DEBUG;
-	
+
 	// cannot use & below - do not know why...
 	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
 	if (!empty($ADODB_SESS_DEBUG)) {
@@ -223,7 +223,7 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
 	else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
 			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-	
+
 	if (!$ok) ADOConnection::outp( "
 -- Session: connection failed
    ",false);
 }
@@ -231,7 +231,7 @@ GLOBAL 	$ADODB_SESSION_CONNECT,
 /****************************************************************************************\
 	Close the connection
 \****************************************************************************************/
-function adodb_sess_close() 
+function adodb_sess_close()
 {
 global $ADODB_SESS_CONN;
 
@@ -242,7 +242,7 @@ global $ADODB_SESS_CONN;
 /****************************************************************************************\
 	Slurp in the session variables and return the serialized string
 \****************************************************************************************/
-function adodb_sess_read($key) 
+function adodb_sess_read($key)
 {
 global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
 
@@ -250,48 +250,48 @@ global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
 	if ($rs) {
 		if ($rs->EOF) {
 			$v = '';
-		} else 
+		} else
 			$v = rawurldecode(reset($rs->fields));
-			
+
 		$rs->Close();
-		
+
 		// new optimization adodb 2.1
 		$ADODB_SESSION_CRC = strlen($v).crc32($v);
-		
+
 		return $v;
 	}
-	
+
 	return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
 }
 
 /****************************************************************************************\
 	Write the serialized data to a database.
-	
+
 	If the data has not been modified since adodb_sess_read(), we do not write.
 \****************************************************************************************/
-function adodb_sess_write($key, $val) 
+function adodb_sess_write($key, $val)
 {
 	global
-		$ADODB_SESS_CONN, 
-		$ADODB_SESS_LIFE, 
+		$ADODB_SESS_CONN,
+		$ADODB_SESS_LIFE,
 		$ADODB_SESSION_TBL,
-		$ADODB_SESS_DEBUG, 
+		$ADODB_SESS_DEBUG,
 		$ADODB_SESSION_CRC,
 		$ADODB_SESSION_EXPIRE_NOTIFY;
 
 	$expiry = time() + $ADODB_SESS_LIFE;
-	
+
 	// crc32 optimization since adodb 2.1
 	// now we only update expiry date, thx to sebastian thom in adodb 2.32
 	if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
 		if ($ADODB_SESS_DEBUG) echo "
 -- Session: Only updating date - crc32 not changed
    ";
 		$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
-		$rs = $ADODB_SESS_CONN->Execute($qry);	
+		$rs = $ADODB_SESS_CONN->Execute($qry);
 		return true;
 	}
 	$val = rawurlencode($val);
-	
+
 	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
 	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
 		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -300,23 +300,23 @@ function adodb_sess_write($key, $val)
 	}
 	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr,
     	'sesskey',$autoQuote = true);
-	
+
 	if (!$rs) {
 		ADOConnection::outp( '
 -- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'
    ',false);
 	}  else {
 		// bug in access driver (could be odbc?) means that info is not commited
 		// properly unless select statement executed in Win2000
-		if ($ADODB_SESS_CONN->databaseType == 'access') 
+		if ($ADODB_SESS_CONN->databaseType == 'access')
 			$rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
 	}
 	return !empty($rs);
 }
 
-function adodb_sess_destroy($key) 
+function adodb_sess_destroy($key)
 {
 	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
+
 	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
 		reset($ADODB_SESSION_EXPIRE_NOTIFY);
 		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -341,10 +341,10 @@ function adodb_sess_destroy($key)
 	return $rs ? true : false;
 }
 
-function adodb_sess_gc($maxlifetime) 
+function adodb_sess_gc($maxlifetime)
 {
 	global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
+
 	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
 		reset($ADODB_SESSION_EXPIRE_NOTIFY);
 		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -362,21 +362,21 @@ function adodb_sess_gc($maxlifetime)
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			
+
 			$ADODB_SESS_CONN->CommitTrans();
-			
+
 		}
 	} else {
 		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
 		$ADODB_SESS_CONN->Execute($qry);
-	
+
 		if ($ADODB_SESS_DEBUG) ADOConnection::outp("
 -- Garbage Collection: $qry
    ");
 	}
 	// suggested by Cameron, "GaM3R" 
 	if (defined('ADODB_SESSION_OPTIMIZE')) {
 	global $ADODB_SESSION_DRIVER;
-	
+
 		switch( $ADODB_SESSION_DRIVER ) {
 			case 'mysql':
 			case 'mysqlt':
@@ -384,7 +384,7 @@ function adodb_sess_gc($maxlifetime)
 				break;
 			case 'postgresql':
 			case 'postgresql7':
-				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
 				break;
 		}
 		if (!empty($opt_qry)) {
@@ -393,29 +393,29 @@ function adodb_sess_gc($maxlifetime)
 	}
 	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
 	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-	
+
 	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
 	if ($rs && !$rs->EOF) {
-	
+
 		$dbts = reset($rs->fields);
 		$rs->Close();
 		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
 		$t = time();
-	
+
 		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
-		
-			$msg = 
+
+			$msg =
 			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
 			error_log($msg);
 			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
 -- $msg
    ");
 		}
 	}
-	
+
 	return true;
 }
 
-session_module_name('user'); 
+session_module_name('user');
 session_set_save_handler(
 	"adodb_sess_open",
 	"adodb_sess_close",
@@ -435,5 +435,3 @@ if (0) {
 	ADOConnection::outp( "
 -- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ",false);
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/old/crypt.inc.php b/lib/WikiDB/adodb/session/old/crypt.inc.php
index b99bbba55..9c347db06 100644
--- a/lib/WikiDB/adodb/session/old/crypt.inc.php
+++ b/lib/WikiDB/adodb/session/old/crypt.inc.php
@@ -61,4 +61,3 @@ class MD5Crypt{
 		}
 
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/session/session_schema.xml b/lib/WikiDB/adodb/session/session_schema.xml
index 3c61ff645..27e47bfee 100644
--- a/lib/WikiDB/adodb/session/session_schema.xml
+++ b/lib/WikiDB/adodb/session/session_schema.xml
@@ -8,7 +8,7 @@
       
       
     
- 
+
     
       
       
diff --git a/lib/WikiDB/adodb/session/session_schema2.xml b/lib/WikiDB/adodb/session/session_schema2.xml
index 22f8dafed..f0d3ec94a 100644
--- a/lib/WikiDB/adodb/session/session_schema2.xml
+++ b/lib/WikiDB/adodb/session/session_schema2.xml
@@ -8,19 +8,19 @@
       
       
     
- 
 
-	
+
+
     
       
       
     
-	
+
 	 	
 	     
       
     
-	
+
 	 	
 	     
       
diff --git a/lib/WikiDB/adodb/tests/benchmark.php b/lib/WikiDB/adodb/tests/benchmark.php
index a1b3bb335..0d41310e3 100644
--- a/lib/WikiDB/adodb/tests/benchmark.php
+++ b/lib/WikiDB/adodb/tests/benchmark.php
@@ -3,25 +3,25 @@
 
 
 	ADODB Benchmarks
- 
+
 
 
-ADODB Version: $ADODB_version Host: $db->host   Database: $db->database";
-	
-	// perform query once to cache results so we are only testing throughput 
+
+	// perform query once to cache results so we are only testing throughput
 	$rs = $db->Execute($sql);
 	if (!$rs){
 		print "Error in recordset
    ";
 		return;
-	}	
+	}
 	$arr = $rs->GetArray();
 	//$db->debug = true;
 	global $ADODB_COUNTRECS;
 	$ADODB_COUNTRECS = false;
 	$start = microtime();
 	for ($i=0; $i < $max; $i++) {
-		$rs = $db->Execute($sql);	
+		$rs = $db->Execute($sql);
 		$arr = $rs->GetArray();
 	   //		 print $arr[0][1];
 	}
 	$end =  microtime();
 	$start = explode(' ',$start);
 	$end = explode(' ',$end);
-	
+
 	//print_r($start);
 	//print_r($end);
-	
+
 	  //  print_r($arr);
 	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
 	printf ("
    seconds = %8.2f for %d iterations each with %d records
    ",$total,$max, sizeof($arr));
diff --git a/lib/WikiDB/adodb/tests/client.php b/lib/WikiDB/adodb/tests/client.php
index 7bf145e7f..2b73bc458 100644
--- a/lib/WikiDB/adodb/tests/client.php
+++ b/lib/WikiDB/adodb/tests/client.php
@@ -1,21 +1,21 @@
 
 
 ';
  var_dump(parse_url('odbc_mssql://userserver/'));
  die();
- 
+
 include('../adodb.inc.php');
 include('../tohtml.inc.php');
 
@@ -27,7 +27,7 @@ include('../tohtml.inc.php');
 	if ($err) print $err;
 	return $rs;
  }
- 
+
  function print_pre($s)
  {
  	print "
    ";print_r($s);print "
    ";
@@ -42,37 +42,37 @@ $sql2 = "insert into products (productname) values ('testprod 1')";
 $sql3 = "insert into products (productname) values ('testprod 2')";
 $sql4 = "delete from products where productid>80";
 $sql5 = 'select * from products';
-	
+
 if ($testhttp) {
 	print "Client Driver Tests
    ";
 	print "
    Test Error
    ";
 	$rs = send2server($serverURL,$sql1);
 	print_pre($rs);
 	print "
    ";
-	
+
 	print "
    Test Insert
    ";
-	
+
 	$rs = send2server($serverURL,$sql2);
 	print_pre($rs);
 	print "
    ";
-	
+
 	print "
    Test Insert2
    ";
-	
+
 	$rs = send2server($serverURL,$sql3);
 	print_pre($rs);
 	print "
    ";
-	
+
 	print "
    Test Delete
    ";
-	
+
 	$rs = send2server($serverURL,$sql4);
 	print_pre($rs);
 	print "
    ";
-	
-	
+
+
 	print "
    Test Select
    ";
 	$rs = send2server($serverURL,$sql5);
 	if ($rs) rs2html($rs);
-	
+
 	print "
    ";
 }
 
@@ -112,21 +112,21 @@ http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29
 adorecordset Object
 (
 	[dataProvider] => native
-	[fields] => 
+	[fields] =>
 	[blobSize] => 64
-	[canSeek] => 
+	[canSeek] =>
 	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
+	[emptyTimeStamp] =>
+	[emptyDate] =>
+	[debug] =>
 	[timeToLive] => 0
-	[bind] => 
+	[bind] =>
 	[_numOfRows] => -1
 	[_numOfFields] => 0
 	[_queryID] => 1
 	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
+	[_closed] =>
+	[_inited] =>
 	[sql] => insert into products (productname) values ('testprod')
 	[affectedrows] => 1
 	[insertid] => 81
@@ -141,21 +141,21 @@ http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29
 adorecordset Object
 (
 	[dataProvider] => native
-	[fields] => 
+	[fields] =>
 	[blobSize] => 64
-	[canSeek] => 
+	[canSeek] =>
 	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
+	[emptyTimeStamp] =>
+	[emptyDate] =>
+	[debug] =>
 	[timeToLive] => 0
-	[bind] => 
+	[bind] =>
 	[_numOfRows] => -1
 	[_numOfFields] => 0
 	[_queryID] => 1
 	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
+	[_closed] =>
+	[_inited] =>
 	[sql] => insert into products (productname) values ('testprod')
 	[affectedrows] => 1
 	[insertid] => 82
@@ -170,21 +170,21 @@ http://localhost/php/adodb/server.php?sql=delete+from+products+where+productid%3
 adorecordset Object
 (
 	[dataProvider] => native
-	[fields] => 
+	[fields] =>
 	[blobSize] => 64
-	[canSeek] => 
+	[canSeek] =>
 	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
+	[emptyTimeStamp] =>
+	[emptyDate] =>
+	[debug] =>
 	[timeToLive] => 0
-	[bind] => 
+	[bind] =>
 	[_numOfRows] => -1
 	[_numOfFields] => 0
 	[_queryID] => 1
 	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
+	[_closed] =>
+	[_inited] =>
 	[sql] => delete from products where productid>80
 	[affectedrows] => 2
 	[insertid] => 0
@@ -192,7 +192,6 @@ adorecordset Object
 
 [more stuff deleted]
  .
- . 
+ .
  .
 */
-?>
diff --git a/lib/WikiDB/adodb/tests/pdo.php b/lib/WikiDB/adodb/tests/pdo.php
index b66018f8e..31ca59697 100644
--- a/lib/WikiDB/adodb/tests/pdo.php
+++ b/lib/WikiDB/adodb/tests/pdo.php
@@ -5,80 +5,80 @@ include('../adodb.inc.php');
 echo "
    ";
 try {
 	echo "New Connection\n";
-	
-	
+
+
 	$dsn = 'pdo_mysql://root:@localhost/northwind?persist';
-	
+
 	if (!empty($dsn)) {
 		$DB = NewADOConnection($dsn) || die("CONNECT FAILED");
 		$connstr = $dsn;
 	} else {
-	
+
 		$DB = NewADOConnection('pdo');
-		
+
 		echo "Connect\n";
-		
+
 		$u = ''; $p = '';
 		/*
 		$connstr = 'odbc:nwind';
-		
+
 		$connstr = 'oci:';
 		$u = 'scott';
 		$p = 'natsoft';
-		
-		
+
+
 		$connstr ="sqlite:d:\inetpub\adodb\sqlite.db";
 		*/
-		
+
 		$connstr = "mysql:dbname=northwind";
 		$u = 'root';
-		
+
 		$connstr = "pgsql:dbname=test";
 		$u = 'tester';
 		$p = 'test';
-		
+
 		$DB->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	
+
 	}
-	
+
 	echo "connection string=$connstr\n Execute\n";
-	
+
 	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 	$rs = $DB->Execute("select * from ADOXYZ where id<3");
 	if  ($DB->ErrorNo()) echo "*** errno=".$DB->ErrorNo() . " ".($DB->ErrorMsg())."\n";
-	
-	
+
+
 	//print_r(get_class_methods($DB->_stmt));
-	
+
 	if (!$rs) die("NO RS");
-	
+
 	echo "Meta\n";
 	for ($i=0; $i < $rs->NumCols(); $i++) {
 		var_dump($rs->FetchField($i));
 		echo "
    ";
 	}
-	
+
 	echo "FETCH\n";
 	$cnt = 0;
 	while (!$rs->EOF) {
-		adodb_pr($rs->fields); 
+		adodb_pr($rs->fields);
 		$rs->MoveNext();
 		if ($cnt++ > 1000) break;
 	}
-	
+
 	echo "
    --------------------------------------------------------
    \n\n\n";
-	
+
 	$stmt = $DB->PrepareStmt("select * from ADOXYZ");
-	
+
 	$rs = $stmt->Execute();
 	$cols = $stmt->NumCols(); // execute required
-	
+
 	echo "COLS = $cols";
 	for($i=1;$i<=$cols;$i++) {
 		$v = $stmt->_stmt->getColumnMeta($i);
 		var_dump($v);
 	}
-	
+
 	echo "e=".$stmt->ErrorNo() . " ".($stmt->ErrorMsg())."\n";
 	while ($arr = $rs->FetchRow()) {
 		adodb_pr($arr);
@@ -90,5 +90,3 @@ try {
 	echo $e;
 	echo "
    ";
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test-active-record.php b/lib/WikiDB/adodb/tests/test-active-record.php
index 85fb71c0d..59471620c 100644
--- a/lib/WikiDB/adodb/tests/test-active-record.php
+++ b/lib/WikiDB/adodb/tests/test-active-record.php
@@ -2,7 +2,7 @@
 
 	include_once('../adodb.inc.php');
 	include_once('../adodb-active-record.inc.php');
-	
+
 	// uncomment the following if you want to test exceptions
 	if (@$_GET['except']) {
 		if (PHP_VERSION >= 5) {
@@ -15,7 +15,7 @@
 	$db->debug=1;
 	ADOdb_Active_Record::SetDatabaseAdapter($db);
 
-	
+
 	$db->Execute("CREATE TEMPORARY TABLE `persons` (
 	                `id` int(10) unsigned NOT NULL auto_increment,
 	                `name_first` varchar(100) NOT NULL default '',
@@ -24,7 +24,7 @@
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-			   
+
 	$db->Execute("CREATE TEMPORARY TABLE `children` (
 	                `id` int(10) unsigned NOT NULL auto_increment,
 					`person_id` int(10) unsigned NOT NULL,
@@ -34,14 +34,14 @@
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-			   
+
 	class Person extends ADOdb_Active_Record{ function ret($v) {return $v;} }
 	$person = new Person();
 	ADOdb_Active_Record::$_quoteNames = '111';
-	
+
 	echo "
    Output of getAttributeNames: ";
 	var_dump($person->getAttributeNames());
-	
+
 	/**
 	 * Outputs the following:
 	 * array(4) {
@@ -55,42 +55,42 @@
 	 *    string(13) "favorite_color"
 	 *  }
 	 */
-	
+
 	$person = new Person();
 	$person->name_first = 'Andi';
 	$person->name_last  = 'Gutmans';
 	$person->save(); // this save() will fail on INSERT as favorite_color is a must fill...
-	
-	
+
+
 	$person = new Person();
 	$person->name_first     = 'Andi';
 	$person->name_last      = 'Gutmans';
 	$person->favorite_color = 'blue';
 	$person->save(); // this save will perform an INSERT successfully
-	
+
 	echo "
    The Insert ID generated:"; print_r($person->id);
-	
+
 	$person->favorite_color = 'red';
 	$person->save(); // this save() will perform an UPDATE
-	
+
 	$person = new Person();
 	$person->name_first     = 'John';
 	$person->name_last      = 'Lim';
 	$person->favorite_color = 'lavender';
 	$person->save(); // this save will perform an INSERT successfully
-	
+
 	// load record where id=2 into a new ADOdb_Active_Record
 	$person2 = new Person();
 	$person2->Load('id=2');
-	
+
 	$activeArr = $db->GetActiveRecordsClass($class = "Person",$table = "Persons","id=".$db->Param(0),array(2));
 	$person2 = $activeArr[0];
-	echo "
    Name (should be John): ",$person->name_first, " 
     Class (should be Person): ",get_class($person2),"
    ";	
-	
+	echo "
    Name (should be John): ",$person->name_first, " 
     Class (should be Person): ",get_class($person2),"
    ";
+
 	$db->Execute("insert into children (person_id,name_first,name_last) values (2,'Jill','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (2,'Joan','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (2,'JAMIE','Lim')");
-	
+
 	$newperson2 = new Person();
 	$person2->HasMany('children','person_id');
 	$person2->Load('id=2');
@@ -104,13 +104,13 @@
 		var_dump($c);
 		echo "error loading hasMany should have 3 array elements Jill Joan Jamie
    ";
 	}
-	
+
 	class Child extends ADOdb_Active_Record{};
 	$ch = new Child('children',array('id'));
 	$ch->BelongsTo('person','person_id','id');
 	$ch->Load('id=1');
 	if ($ch->name_first !== 'Jill') echo "error in Loading Child
    ";
-	
+
 	$p = $ch->person;
 	if ($p->name_first != 'John') echo "Error loading belongsTo
    ";
 	else echo "OK loading BelongTo
    ";
@@ -119,7 +119,7 @@
 	$p->LoadRelations('children', "	Name_first like 'J%' order by id",1,2);
 	if (sizeof($p->children) == 2 && $p->children[1]->name_first == 'JAMIE') echo "OK LoadRelations
    ";
 	else echo "error LoadRelations
    ";
-	
+
 		$db->Execute("CREATE TEMPORARY TABLE `persons2` (
 	                `id` int(10) unsigned NOT NULL auto_increment,
 	                `name_first` varchar(100) NOT NULL default '',
@@ -128,14 +128,13 @@
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-	
+
 	$p = new adodb_active_record('persons2');
 	$p->name_first = 'James';
-	
+
 	$p->name_last = 'James';
-	
+
 	$p->HasMany('children','person_id');
 	$p->children;
 	var_dump($p);
 	$p->Save();
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test-active-recs2.php b/lib/WikiDB/adodb/tests/test-active-recs2.php
index d35751e99..f5898fcda 100644
--- a/lib/WikiDB/adodb/tests/test-active-recs2.php
+++ b/lib/WikiDB/adodb/tests/test-active-recs2.php
@@ -74,4 +74,3 @@ $rec->Save();
 $rec->Delete();
 
 echo "
    Affected Rows after delete=".$db->Affected_Rows()."
    ";
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test-active-relations.php b/lib/WikiDB/adodb/tests/test-active-relations.php
index eb0f636db..7a98d479f 100644
--- a/lib/WikiDB/adodb/tests/test-active-relations.php
+++ b/lib/WikiDB/adodb/tests/test-active-relations.php
@@ -2,7 +2,7 @@
 
 	include_once('../adodb.inc.php');
 	include_once('../adodb-active-record.inc.php');
-	
+
 
 	$db = NewADOConnection('mysql://root@localhost/northwind');
 	$db->debug=1;
@@ -16,7 +16,7 @@
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-			   
+
 	$db->Execute("CREATE TEMPORARY TABLE `children` (
 	                `id` int(10) unsigned NOT NULL auto_increment,
 					`person_id` int(10) unsigned NOT NULL,
@@ -26,26 +26,26 @@
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-			   
-	
+
+
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Jill','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
-	
+
 	ADODB_Active_Record::TableHasMany('persons', 'children','person_id');
 	class person extends ADOdb_Active_Record{}
-	
+
 	$person = new person();
 #	$person->HasMany('children','person_id');  ## this is affects all other instances of Person
-	
+
 	$person->name_first     = 'John';
 	$person->name_last      = 'Lim';
 	$person->favorite_color = 'lavender';
 	$person->save(); // this save will perform an INSERT successfully
-	
+
 	$person2 = new person();
 	$person2->Load('id=1');
-	
+
 	$c = $person2->children;
 	if (is_array($c) && sizeof($c) == 3 && $c[0]->name_first=='Jill' && $c[1]->name_first=='Joan'
 		&& $c[2]->name_first == 'JAMIE') echo "OK Loaded HasMany
    ";
@@ -53,14 +53,14 @@
 		var_dump($c);
 		echo "error loading hasMany should have 3 array elements Jill Joan Jamie
    ";
 	}
-	
+
 	class child extends ADOdb_Active_Record{};
 	ADODB_Active_Record::TableBelongsTo('children','person','person_id','id');
 	$ch = new Child('children',array('id'));
-	
+
 	$ch->Load('id=1');
 	if ($ch->name_first !== 'Jill') echo "error in Loading Child
    ";
-	
+
 	$p = $ch->person;
 	if (!$p || $p->name_first != 'John') echo "Error loading belongsTo
    ";
 	else echo "OK loading BelongTo
    ";
@@ -73,7 +73,7 @@
 		 	var_dump($p->children);
 			echo "error LoadRelations
    ";
 		}
-		
+
 		unset($p->children);
 		$p->LoadRelations('children', " name_first like 'J%' order by id",1,2);
 	}
@@ -83,5 +83,3 @@
 		$c->name_first .= ' K.';
 		$c->Save();
 	}
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test-active-relationsx.php b/lib/WikiDB/adodb/tests/test-active-relationsx.php
index fbfddf661..0f28f728c 100644
--- a/lib/WikiDB/adodb/tests/test-active-relationsx.php
+++ b/lib/WikiDB/adodb/tests/test-active-relationsx.php
@@ -5,14 +5,14 @@ $err_count = 0;
 	function found($obj, $cond)
 	{
 		$res = var_export($obj, true);
-		return (strpos($res, $cond));		
+		return (strpos($res, $cond));
 	}
-	
+
 	function notfound($obj, $cond)
 	{
 		return !found($obj, $cond);
 	}
-	
+
 	function ar_assert($bool)
 	{
 		global $err_count;
@@ -20,7 +20,7 @@ $err_count = 0;
 			$err_count ++;
 		return $bool;
 	}
-	
+
 		define('WEB', true);
 	function ar_echo($txt)
 	{
@@ -31,7 +31,7 @@ $err_count = 0;
 
 	include_once('../adodb.inc.php');
 	include_once('../adodb-active-recordx.inc.php');
-	
+
 
 	$db = NewADOConnection('mysql://root@localhost/test');
 	$db->debug=0;
@@ -62,7 +62,7 @@ $err_count = 0;
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-	
+
 	$db->Execute("CREATE TABLE `artists` (
 	                `name` varchar(100) NOT NULL default '',
 	                `artistuniqueid` int(10) unsigned NOT NULL auto_increment,
@@ -81,7 +81,7 @@ $err_count = 0;
 	$db->Execute("insert into children (person_id,name_first,name_last,favorite_pet) values (1,'Jill','Lim','tortoise')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
-			   
+
 	$db->Execute("insert into artists (artistuniqueid, name) values(1,'Elvis Costello')");
 	$db->Execute("insert into songs (recordid, name, artistid) values(1,'No Hiding Place', 1)");
 	$db->Execute("insert into songs (recordid, name, artistid) values(2,'American Gangster Time', 1)");
@@ -121,7 +121,7 @@ $err_count = 0;
 			parent::__construct('children', false, false, array('new' => true));
 		}
 	}
-	
+
 	class Artist extends ADOdb_Active_Record
 	{
 		function __construct()
@@ -152,21 +152,21 @@ $err_count = 0;
 	$person->name_last		= 'Cat';
 	$person->favorite_color	= 'green';
 	$person->save();
-	
+
 	$child = new Child();
 	$child->name_first		= 'Fluffy';
 	$child->name_last		= 'Cat';
 	$child->favorite_pet	= 'Cat Lady';
 	$child->person_id		= $person->id;
 	$child->save();
-	
+
 	$child = new Child();
 	$child->name_first		= 'Sun';
 	$child->name_last		= 'Cat';
 	$child->favorite_pet	= 'Cat Lady';
 	$child->person_id		= $person->id;
 	$child->save();
-	
+
 	$err_count = 0;
 
 	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
@@ -212,7 +212,7 @@ $err_count = 0;
 	ar_echo((ar_assert(found($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n");
 	ar_echo((ar_assert(found($people, "'name_first' => 'Joan'"))) ? "[OK] Found Joan\n" : "[!!] Find failed\n");
 	ar_echo((ar_assert(found($people, "'name_first' => 'JAMIE'"))) ? "[OK] Found JAMIE\n" : "[!!] Find failed\n");
-		
+
 	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
 	ar_echo("person->Load('people.id=1') [Join Method]\n");
 	ar_echo("Load() always uses the join method since it returns only one row\n");
@@ -225,7 +225,7 @@ $err_count = 0;
 	ar_echo((ar_assert(found($person, "'favorite_pet' => 'tortoise'"))) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n");
 	ar_echo((ar_assert(found($person, "'name_first' => 'Joan'"))) ? "[OK] Found Joan\n" : "[!!] Find failed\n");
 	ar_echo((ar_assert(found($person, "'name_first' => 'JAMIE'"))) ? "[OK] Found JAMIE\n" : "[!!] Find failed\n");
-	
+
 	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
 	ar_echo("child->Load('children.id=1') [Join Method]\n");
 	ar_echo("We are now loading from the 'children' table, not from 'people'\n");
@@ -273,7 +273,7 @@ $err_count = 0;
 	ar_echo((ar_assert(found($kids, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n");
 	ar_echo((ar_assert(notfound($kids, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n");
 	ar_echo((ar_assert(notfound($kids, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Found relation when I shouldn't\n");
-	
+
 	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
 	ar_echo("rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n");
 	ar_echo("In rugrat's constructor it is specified that\nit must forget any existing relation\n");
@@ -284,7 +284,7 @@ $err_count = 0;
 	ar_echo((ar_assert(notfound($rugrats, "'favorite_color' => 'lavender'"))) ? "[OK] No relation found\n" : "[!!] Found relation when I shouldn't\n");
 	ar_echo((ar_assert(notfound($rugrats, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n");
 	ar_echo((ar_assert(notfound($rugrats, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Found relation when I shouldn't\n");
-	
+
 	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
 	ar_echo("kid->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n");
 	ar_echo("Note how only rugrat forgot its relations - kid is fine.\n");
@@ -295,7 +295,7 @@ $err_count = 0;
 	ar_echo((ar_assert(found($kids, "'favorite_color' => 'lavender'"))) ? "[OK] I did not forget relation: person\n" : "[!!] I should not have forgotten relation: person\n");
 	ar_echo((ar_assert(notfound($kids, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n");
 	ar_echo((ar_assert(notfound($kids, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Found relation when I shouldn't\n");
-	
+
 	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
 	ar_echo("rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n");
 	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
@@ -304,7 +304,7 @@ $err_count = 0;
 	$arugrat = $rugrats[0];
 	ar_echo((ar_assert(found($arugrat, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
 	ar_echo((ar_assert(notfound($arugrat, "'favorite_color' => 'lavender'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n");
-	
+
 	ar_echo("\n-- Loading relations:\n\n");
 	$arugrat->belongsTo('person');
 	$arugrat->LoadRelations('person', 'order by id', 0, 2);
@@ -336,7 +336,7 @@ $err_count = 0;
 	ar_echo((ar_assert(found($people, "'name_first' => 'Lady'"))) ? "[OK] Found Cat Lady\n" : "[!!] Find failed\n");
 	ar_echo((ar_assert(found($people, "'name_first' => 'Fluffy'"))) ? "[OK] Found Fluffy\n" : "[!!] Find failed\n");
 	ar_echo((ar_assert(found($people, "'name_first' => 'Sun'"))) ? "[OK] Found Sun\n" : "[!!] Find failed\n");
-	
+
 	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
 	ar_echo("artist->Load('artistuniqueid=1') [Join Method]\n");
 	ar_echo("Yes, we are dabbling in the musical field now..\n");
@@ -416,4 +416,3 @@ $err_count = 0;
 	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
 	ar_echo("Test suite complete. " . (($err_count > 0) ? "$err_count errors found.\n" : "Success.\n"));
 	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
-?>
diff --git a/lib/WikiDB/adodb/tests/test-datadict.php b/lib/WikiDB/adodb/tests/test-datadict.php
index 20a9bbde7..2ee135dca 100644
--- a/lib/WikiDB/adodb/tests/test-datadict.php
+++ b/lib/WikiDB/adodb/tests/test-datadict.php
@@ -1,11 +1,11 @@
 debug = 1;
-	
+
 	$opts = array('REPLACE','mysql' => 'ENGINE=INNODB', 'oci8' => 'TABLESPACE USERS');
-	
+
 /*	$flds = array(
-		array('id',	'I',								
+		array('id',	'I',
 							'AUTO','KEY'),
-							
+
 		array('name' => 'firstname', 'type' => 'varchar','size' => 30,
 							'DEFAULT'=>'Joan'),
-							
+
 		array('lastname','varchar',28,
 							'DEFAULT'=>'Chen','key'),
-							
+
 		array('averylonglongfieldname','X',1024,
 							'NOTNULL','default' => 'test'),
-							
+
 		array('price','N','7.2',
 							'NOTNULL','default' => '0.00'),
-							
-		array('MYDATE', 'D', 
+
+		array('MYDATE', 'D',
 							'DEFDATE'),
 		array('TS','T',
 							'DEFTIMESTAMP')
 	);*/
-	
+
 	$flds = "
 ID            I           AUTO KEY,
 FIRSTNAME     VARCHAR(30) DEFAULT 'Joan' INDEX idx_name,
@@ -60,25 +60,25 @@ TS_SUBSEC   TS DEFTIMESTAMP
 
 	$sqla = $dict->CreateDatabase('KUTU',array('postgres'=>"LOCATION='/u01/postdata'"));
 	$dict->SetSchema('KUTU');
-	
+
 	$sqli = ($dict->CreateTableSQL('testtable',$flds, $opts));
 	$sqla = array_merge($sqla,$sqli);
-	
+
 	$sqli = $dict->CreateIndexSQL('idx','testtable','price,firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
 	$sqla = array_merge($sqla,$sqli);
 	$sqli = $dict->CreateIndexSQL('idx2','testtable','price,lastname');//,array('BITMAP','FULLTEXT','CLUSTERED'));
 	$sqla = array_merge($sqla,$sqli);
-	
+
 	$addflds = array(array('height', 'F'),array('weight','F'));
 	$sqli = $dict->AddColumnSQL('testtable',$addflds);
 	$sqla = array_merge($sqla,$sqli);
 	$addflds = array(array('height', 'F','NOTNULL'),array('weight','F','NOTNULL'));
 	$sqli = $dict->AlterColumnSQL('testtable',$addflds);
 	$sqla = array_merge($sqla,$sqli);
-	
-	
+
+
 	printsqla($dbType,$sqla);
-	
+
 	if (file_exists('d:\inetpub\wwwroot\php\phplens\adodb\adodb.inc.php'))
 	if ($dbType == 'mysqlt') {
 		$db->Connect('localhost', "root", "", "test");
@@ -92,7 +92,7 @@ TS_SUBSEC   TS DEFTIMESTAMP
 		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
 		if ($sqla2) printsqla($dbType,$sqla2);
 	}
-	
+
 	if ($dbType == 'odbc_mssql') {
 		$dsn = $dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=localhost;Database=northwind;";
 		if (@$db->Connect($dsn, "sa", "natsoft", "test"));
@@ -100,13 +100,13 @@ TS_SUBSEC   TS DEFTIMESTAMP
 		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
 		if ($sqla2) printsqla($dbType,$sqla2);
 	}
-	
-	
-	
+
+
+
 	adodb_pr($dict->databaseType);
 	printsqla($dbType, $dict->DropColumnSQL('table',array('my col','`col2_with_Quotes`','A_col3','col3(10)')));
 	printsqla($dbType, $dict->ChangeTableSQL('adoxyz','LASTNAME varchar(32)'));
-	
+
 }
 
 function printsqla($dbType,$sqla)
@@ -170,7 +170,7 @@ DROP SEQUENCE KUTU.SEQ_testtable;
 /
 CREATE SEQUENCE KUTU.SEQ_testtable;
 /
-CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON KUTU.testtable 
+CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON KUTU.testtable
 		FOR EACH ROW
 		BEGIN
 		  select KUTU.SEQ_testtable.nextval into :new.id from dual;
@@ -247,4 +247,3 @@ echo "
    ";
 foreach($ff as $xml) echo htmlspecialchars($xml);
 echo "
    ";
 include_once('test-xmlschema.php');
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test-perf.php b/lib/WikiDB/adodb/tests/test-perf.php
index bdeae2815..62465bef6 100644
--- a/lib/WikiDB/adodb/tests/test-perf.php
+++ b/lib/WikiDB/adodb/tests/test-perf.php
@@ -9,7 +9,7 @@ if (isset($_GET)) {
 	foreach($_GET as $k => $v) {
 		if (strncmp($k,'test',4) == 0) $_SESSION['_db'] = $k;
 	}
-} 
+}
 
 if (isset($_SESSION['_db'])) {
 	$_db = $_SESSION['_db'];
@@ -21,13 +21,13 @@ echo "
    Performance Monitoring
    ";
 include_once('testdatabases.inc.php');
 
 
-function testdb($db) 
+function testdb($db)
 {
 	if (!$db) return;
 	echo "";print_r($db->ServerInfo()); echo " user=".$db->user."";
-	
-	$perf = NewPerfMonitor($db); 
-	
+
+	$perf = NewPerfMonitor($db);
+
 	# unit tests
 	if (0) {
 		//$DB->debug=1;
@@ -37,14 +37,12 @@ function testdb($db)
 		echo($perf->ExpensiveSQL());
 		echo($perf->InvalidSQL());
 		echo $perf->Tables();
-	
+
 		echo "
    ";
 		echo $perf->HealthCheckCLI();
 		$perf->Poll(3);
 		die();
 	}
-	
+
 	if ($perf) $perf->UI(3);
 }
- 
-?>
diff --git a/lib/WikiDB/adodb/tests/test-pgblob.php b/lib/WikiDB/adodb/tests/test-pgblob.php
index c190e5b85..3add99e64 100644
--- a/lib/WikiDB/adodb/tests/test-pgblob.php
+++ b/lib/WikiDB/adodb/tests/test-pgblob.php
@@ -10,11 +10,11 @@ function getmicrotime()
 function doloop()
 {
 global $db,$MAX;
-	
-	$sql = "select id,firstname,lastname from adoxyz where 
+
+	$sql = "select id,firstname,lastname from adoxyz where
 		firstname not like ? and lastname not like ? and id=?";
 	$offset = 0;
-	/*$sql = "select * from juris9.employee join juris9.emp_perf_plan on epp_empkey = emp_id 
+	/*$sql = "select * from juris9.employee join juris9.emp_perf_plan on epp_empkey = emp_id
 		where emp_name not like ? and emp_name not like ? and emp_id=28000+?";
 	$offset = 28000;*/
 	for ($i=1; $i <= $MAX; $i++) {
@@ -84,5 +84,3 @@ echo "
    ";
 echo "INSERTED: ", $val;
 echo "
    ";
 echo "RETURNED: ", $v;
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test-php5.php b/lib/WikiDB/adodb/tests/test-php5.php
index 1725f0ba2..bfc6e330c 100644
--- a/lib/WikiDB/adodb/tests/test-php5.php
+++ b/lib/WikiDB/adodb/tests/test-php5.php
@@ -1,8 +1,8 @@
 PHP ".PHP_VERSION."\n";
 try {
@@ -24,7 +24,7 @@ try {
 switch($dbt) {
 case 'oci8po':
 	$db = NewADOConnection("oci8po");
-	
+
 	$db->Connect('localhost','scott','natsoft','sherkhan');
 	break;
 default:
@@ -32,7 +32,7 @@ case 'mysql':
 	$db = NewADOConnection("mysql");
 	$db->Connect('localhost','root','','northwind');
 	break;
-	
+
 case 'mysqli':
 	$db = NewADOConnection("mysqli://root:@localhost/northwind");
 	//$db->Connect('localhost','root','','test');
@@ -85,7 +85,7 @@ echo "
    Active Record
    ";
 
 	include_once("../adodb-active-record.inc.php");
 	ADOdb_Active_Record::SetDatabaseAdapter($db);
-	
+
 try {
 	class City extends ADOdb_Active_Record{};
 	$a = new City();
@@ -95,15 +95,15 @@ try {
 }
 
 try {
-	
+
 	$a = new City();
-	
+
 	echo "
    Successfully created City()
    ";
 	#var_dump($a->GetPrimaryKeys());
 	$a->city = 'Kuala Lumpur';
 	$a->Save();
 	$a->Update();
-	#$a->SetPrimaryKeys(array('city'));	
+	#$a->SetPrimaryKeys(array('city'));
 	$a->country = "M'sia";
 	$a->save();
 	$a->Delete();
@@ -112,4 +112,3 @@ try {
 }
 
 //include_once("test-active-record.php");
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test-xmlschema.php b/lib/WikiDB/adodb/tests/test-xmlschema.php
index 2d15c111b..c56cfec8e 100644
--- a/lib/WikiDB/adodb/tests/test-xmlschema.php
+++ b/lib/WikiDB/adodb/tests/test-xmlschema.php
@@ -13,7 +13,7 @@ $db->Connect( 'localhost', 'root', '', 'test' ) || die('fail connect1');
 // To create a schema object and build the query array.
 $schema = new adoSchema( $db );
 
-// To upgrade an existing schema object, use the following 
+// To upgrade an existing schema object, use the following
 // To upgrade an existing database to the provided schema,
 // uncomment the following line:
 #$schema->upgradeSchema();
@@ -51,4 +51,3 @@ $db2->debug=1;
 
 foreach ($sql as $s)
 $db2->Execute($s);
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test.php b/lib/WikiDB/adodb/tests/test.php
index 00799acea..1ce1e6ac0 100644
--- a/lib/WikiDB/adodb/tests/test.php
+++ b/lib/WikiDB/adodb/tests/test.php
@@ -1,11 +1,11 @@
 	
    
 	
    
 	
     
    
 	
    
-Execute('select lastname,firstname,lastname,id from ADOXYZ');
 	$arr = $rs->GetAssoc();
 	echo "
    ";print_r($arr);
 	die();*/
-	
+
 	if (!$db) die("testdb: database not inited");
 	GLOBAL $EXECS, $CACHED;
-	
+
 	$EXECS = 0;
 	$CACHED = 0;
 	//$db->Execute("drop table adodb_logsql");
 	if ((rand()%3) == 0) @$db->Execute("delete from adodb_logsql");
 	$db->debug=1;
-	
+
 	$db->fnExecute = 'CountExecs';
 	$db->fnCacheExecute = 'CountCachedExecs';
-	
+
 	if (empty($_GET['nolog'])) {
 		echo "
    SQL Logging enabled
    ";
 		$db->LogSQL();/*
 		$sql =
-"SELECT t1.sid, t1.sid, t1.title, t1.hometext, t1.notes, t1.aid, t1.informant, 
-t2.url, t2.email, t1.catid, t3.title, t1.topic, t4.topicname, t4.topicimage, 
-t4.topictext, t1.score, t1.ratings, t1.counter, t1.comments, t1.acomm 
-FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_topics` `t4` 
-	WHERE ((t2.aid=t1.aid) AND (t3.catid=t1.catid) AND (t4.topicid=t1.topic) 
-	AND ((t1.alanguage='german') OR (t1.alanguage='')) AND (t1.ihome='0')) 
+"SELECT t1.sid, t1.sid, t1.title, t1.hometext, t1.notes, t1.aid, t1.informant,
+t2.url, t2.email, t1.catid, t3.title, t1.topic, t4.topicname, t4.topicimage,
+t4.topictext, t1.score, t1.ratings, t1.counter, t1.comments, t1.acomm
+FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_topics` `t4`
+	WHERE ((t2.aid=t1.aid) AND (t3.catid=t1.catid) AND (t4.topicid=t1.topic)
+	AND ((t1.alanguage='german') OR (t1.alanguage='')) AND (t1.ihome='0'))
 	ORDER BY t1.time DESC";
 		$db->SelectLimit($sql);
 		echo $db->ErrorMsg();*/
@@ -121,16 +121,19 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 	$ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
 	$db->debug = false;
 	//print $db->UnixTimeStamp('2003-7-22 23:00:00');
-	
+
 	$phpv = phpversion();
 	if (defined('ADODB_EXTENSION')) $ext = '   Extension '.ADODB_EXTENSION.' installed';
 	else $ext = '';
-	print "
    ADODB Version: $ADODB_vers Host: $db->host   Database: $db->database   PHP: $phpv $ext
    ";
-	
+	print "
    ADODB Version: $ADODB_vers";
+	print "
    Host: $db->host";
+	print "
    Database: $db->database";
+	print "
    PHP: $phpv $ext
    ";
+
 	flush();
 
-	if (function_exists('date_default_timezone_set')) date_default_timezone_set('Asia/Kuala_Lumpur');
-	
+	print "Current timezone: " . date_default_timezone_get() . "
    ";
+
 	$arr = $db->ServerInfo();
 	print_r($arr);
 	echo E_ALL,' ',E_STRICT, "
    ";
@@ -138,11 +141,11 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 	echo error_reporting(),'
    ';
 	flush();
 	#$db->debug=1;
-	$tt  = $db->Time(); 
+	$tt  = $db->Time();
 	if ($tt == 0) echo '
    $db->Time failed';
 	else echo "
    db->Time: ".date('d-m-Y H:i:s',$tt);
 	echo '
    ';
-	
+
 	echo "Date=",$db->UserDate('2002-04-07'),'
    ';
 	print "date1 (1969-02-20) = ".$db->DBDate('1969-2-20');
 	print "
    date1 (1999-02-20) = ".$db->DBDate('1999-2-20');
@@ -177,9 +180,9 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 	$rs=$db->Execute('select * from ADOXYZ order by id');
 	if($rs === false) $create = true;
 	else $rs->Close();
-	
+
 	//if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
-	
+
 	if ($create) {
 		if (false && $db->databaseType == 'ibase') {
 			print "Please create the following table for testing:
    $createtab
    ";
@@ -195,7 +198,7 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 	echo "
    Testing Metatypes
    ";
 	$t = $db->MetaType('varchar');
 	if ($t != 'C') Err("Bad Metatype for varchar");
-	
+
 	$rs = $db->Execute("delete from ADOXYZ"); // some ODBC drivers will fail the drop so we delete
 	if ($rs) {
 		if(! $rs->EOF) print "Error: RecordSet returned by Execute('delete...') should show EOF
    ";
@@ -215,7 +218,7 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 	}
 	if ($rs) $rs->Close();
 	flush();
-	//$db->debug=true;	
+	//$db->debug=true;
 	print "
    Testing Commit: ";
 	$time = $db->DBDate(time());
 	if (!$db->BeginTrans()) {
@@ -242,8 +245,8 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 			} else print "Commit failed
    ";
 		}
 		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
-		
-		/* ROLLBACK */	
+
+		/* ROLLBACK */
 		if (!$db->BeginTrans()) print "
    Error in BeginTrans()
    ";
 		print "
    Testing Rollback: ";
 		$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (100,'Should Not','Exist (Rollback)',$time)");
@@ -254,13 +257,13 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 			if ($rs) $rs->Close();
 		} else
 			print "Commit failed
    ";
-			
+
 		$rs = $db->Execute('delete from ADOXYZ where id>50');
 		if ($rs) $rs->Close();
-		
+
 		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
 	}
-	
+
 	if (1) {
 		print "
    Testing MetaDatabases()
    ";
 		print_r( $db->MetaDatabases());
@@ -269,35 +272,35 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 		$a = $db->MetaTables();
 		if ($a===false) print "MetaTables not supported
    ";
 		else {
-			print "Array of tables and views: "; 
+			print "Array of tables and views: ";
 			foreach($a as $v) print " ($v) ";
 			print '
    ';
 		}
-		
+
 		$a = $db->MetaTables('VIEW');
 		if ($a===false) print "MetaTables not supported (views)
    ";
 		else {
-			print "Array of views: "; 
+			print "Array of views: ";
 			foreach($a as $v) print " ($v) ";
 			print '
    ';
 		}
-		
+
 		$a = $db->MetaTables(false,false,'aDo%');
 		if ($a===false) print "MetaTables not supported (mask)
    ";
 		else {
-			print "Array of ado%: "; 
+			print "Array of ado%: ";
 			foreach($a as $v) print " ($v) ";
 			print '
    ';
 		}
-		
+
 		$a = $db->MetaTables('TABLE');
 		if ($a===false) print "MetaTables not supported
    ";
 		else {
-			print "Array of tables: "; 
+			print "Array of tables: ";
 			foreach($a as $v) print " ($v) ";
 			print '
    ';
 		}
-		
+
 		$db->debug=0;
 		$rez = $db->MetaColumns("NOSUCHTABLEHERE");
 		if ($rez !== false) {
@@ -312,9 +315,9 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 			foreach($a as $v) {print_r($v); echo "
    ";}
 			echo "";
 		}
-		
+
 		print "
    Testing MetaIndexes
    ";
-		
+
 		$a = $db->MetaIndexes(('ADOXYZ'),true);
 		if ($a===false) print "MetaIndexes not supported
    ";
 		else {
@@ -328,13 +331,13 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
 	}
 	$rs = $db->Execute('delete from ADOXYZ');
 	if ($rs) $rs->Close();
-	
+
 	$db->debug = false;
-	
-	
+
+
 	switch ($db->databaseType) {
 	case 'vfp':
-		
+
 		if (0) {
 			// memo test
 			$rs = $db->Execute("select data from memo");
@@ -354,7 +357,7 @@ ef")."
    ";//'
 		print_r($arr);
 		if (!$arr) Err("No MetaForeignKeys");
 		break;
-	
+
 	case 'odbc_mssql':
 	case 'mssqlpo':
 		print "
    Testing Foreign Keys
    ";
@@ -362,17 +365,17 @@ ef")."
    ";//'
 		print_r($arr);
 		if (!$arr) Err("Bad MetaForeignKeys");
 		if ($db->databaseType == 'odbc_mssql') break;
-	
-	case 'mssql': 
-	
-		
+
+	case 'mssql':
+
+
 /*
 ASSUME Northwind available...
 
 CREATE PROCEDURE SalesByCategory
 	@CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
 AS
-IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
+IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998'
 BEGIN
 	SELECT @OrdYear = '1998'
 END
@@ -380,8 +383,8 @@ END
 SELECT ProductName,
 	TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * (1-OD.Discount) * OD.UnitPrice)), 0)
 FROM [Order Details] OD, Orders O, Products P, Categories C
-WHERE OD.OrderID = O.OrderID 
-	AND OD.ProductID = P.ProductID 
+WHERE OD.OrderID = O.OrderID
+	AND OD.ProductID = P.ProductID
 	AND P.CategoryID = C.CategoryID
 	AND C.CategoryName = @CategoryName
 	AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
@@ -410,35 +413,35 @@ GO
 
 		$cat = 'Dairy Products';
 		$yr = '1998';
-		
+
 		$stmt = $db->PrepareSP('SalesByCategory');
 		$db->InParameter($stmt,$cat,'CategoryName');
 		$db->InParameter($stmt,$yr,'OrdYear');
 		$rs = $db->Execute($stmt);
 		rs2html($rs);
-		
+
 		$cat = 'Grains/Cereals';
 		$yr = 1998;
-		
+
 		$stmt = $db->PrepareSP('SalesByCategory');
 		$db->InParameter($stmt,$cat,'CategoryName');
 		$db->InParameter($stmt,$yr,'OrdYear');
 		$rs = $db->Execute($stmt);
 		rs2html($rs);
-		
+
 		$ADODB_FETCH_MODE = $assoc;
-		
+
 		/*
 		Test out params - works in PHP 4.2.3 and 4.3.3 and 4.3.8 but not 4.3.0:
-		
-			CREATE PROCEDURE at_date_interval 
-				@days INTEGER, 
-				@start VARCHAR(20) OUT, 
-				@end VARCHAR(20) OUT 	
-			AS 
-			BEGIN 
-				set @start = CONVERT(VARCHAR(20), getdate(), 101) 
-				set @end =CONVERT(VARCHAR(20), dateadd(day, @days, getdate()), 101 ) 
+
+			CREATE PROCEDURE at_date_interval
+				@days INTEGER,
+				@start VARCHAR(20) OUT,
+				@end VARCHAR(20) OUT
+			AS
+			BEGIN
+				set @start = CONVERT(VARCHAR(20), getdate(), 101)
+				set @end =CONVERT(VARCHAR(20), dateadd(day, @days, getdate()), 101 )
 			END
 			GO
 		*/
@@ -447,20 +450,20 @@ GO
 		$days = 10;
 		$begin_date = '';
 		$end_date = '';
-		$db->InParameter($stmt,$days,'days', 4, SQLINT4); 
-		$db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR ); 
-		$db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR ); 
+		$db->InParameter($stmt,$days,'days', 4, SQLINT4);
+		$db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR );
+		$db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR );
 		$db->Execute($stmt);
 		if (empty($begin_date) or empty($end_date) or $begin_date == $end_date) {
 			Err("MSSQL SP Test for OUT Failed");
 			print "begin=$begin_date end=$end_date
    ";
 		} else print "(Today +10days) = (begin=$begin_date end=$end_date)
    ";
-	
+
 		$db->debug = $saved;
 		break;
-	case 'oci8': 
+	case 'oci8':
 	case 'oci8po':
-		
+
 		if (0) {
 		$t = getmicrotime();
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
@@ -470,16 +473,16 @@ GO
 		echo "
    t = ",getmicrotime() - $t,"
    ";
 		die();
 		}
-		
+
 		# cleanup
 		$db->Execute("delete from photos where id=99 or id=1");
 		$db->Execute("insert into photos (id) values(1)");
 		$db->Execute("update photos set photo=null,descclob=null where id=1");
-		
+
 		$saved = $db->debug;
 		$db->debug=true;
-		
-		
+
+
 
 		/*
 		CREATE TABLE PHOTOS
@@ -489,29 +492,29 @@ GO
 		  DESCRIPTION  VARCHAR2(4000 BYTE),
 		  DESCCLOB     CLOB
 		);
-		
+
 		INSERT INTO PHOTOS (ID) VALUES(1);
 		*/
 		$s = '';
 		for ($i = 0; $i <= 500; $i++) {
 			$s .= '1234567890';
 		}
-		
+
 		$sql = "INSERT INTO photos ( ID, photo) ".
 			"VALUES ( :id, empty_blob() )".
 			" RETURNING photo INTO :xx";
 
-		
+
 		$blob_data = $s;
 		$id = 99;
-		
+
  		$stmt = $db->PrepareSP($sql);
 		$db->InParameter($stmt, $id, 'id');
 		$blob = $db->InParameter($stmt, $s, 'xx',-1, OCI_B_BLOB);
 		$db->StartTrans();
 		$result = $db->Execute($stmt);
 		$db->CompleteTrans();
-		
+
 		$s2= $db->GetOne("select photo from photos where id=99");
 		echo "
    ---$s2";
 		if ($s !== $s2) Err("insert blob does not match");
@@ -523,7 +526,7 @@ GO
 			$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");
@@ -531,8 +534,8 @@ GO
 			$s2= $db->GetOne("select descclob from photos where id=1");
 			if ($s !== $s2) Err("updateclob does not match");
 		}
-		
-		
+
+
 		$s = '';
 		$s2 = '';
 		print "
    Testing Foreign Keys
    ";
@@ -541,8 +544,8 @@ GO
 		if (!$arr) Err("Bad MetaForeignKeys");
 /*
 -- TEST PACKAGE
--- "Set scan off" turns off substitution variables. 
-Set scan off; 
+-- "Set scan off" turns off substitution variables.
+Set scan off;
 
 CREATE OR REPLACE PACKAGE Adodb AS
 TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
@@ -571,7 +574,7 @@ PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
 	BEGIN
 		output := 'Cinta Hati '||input;
 	END;
-	
+
 PROCEDURE data_in(input IN VARCHAR) IS
 	ignore varchar(1000);
 	BEGIN
@@ -589,7 +592,7 @@ END Adodb;
 
 		print "
    Testing Cursor Variables
    ";
 		$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:zz,'A%'); END;",'zz');
-	
+
 		if ($rs && !$rs->EOF) {
 			$v = $db->GetOne("SELECT count(*) FROM tab where tname like 'A%'");
 			if ($v == $rs->RecordCount()) print "Test 1 RowCount: OK
    ";
@@ -598,9 +601,9 @@ END Adodb;
 			print "Error in using Cursor Variables 1
    ";
 		}
 		if ($rs) $rs->Close();
-		
+
 		print "
    Testing Stored Procedures for oci8
    ";
-		
+
 		$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
 		$a1 = 'Malaysia';
 		//$a2 = ''; # a2 doesn't even need to be defined!
@@ -613,21 +616,21 @@ END Adodb;
 		} else {
 			print "Error in using Stored Procedure IN/Out Variables
    ";
 		}
-		
+
 		$tname = 'A%';
-		
+
 		$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
 		$db->Parameter($stmt,$tname,'tablename');
 		$rs = $db->Execute($stmt);
 		rs2html($rs);
-		
+
 		$stmt = $db->PrepareSP("begin adodb.data_in(:a1); end;");
 		$db->InParameter($stmt,$a1,'a1');
 		$db->Execute($stmt);
-		
+
 		$db->debug = $saved;
 		break;
-	
+
 	default:
 		break;
 	}
@@ -638,7 +641,7 @@ END Adodb;
 	);
 	//$db->debug=1;
 	print "
    Testing Bulk Insert of 3 rows
    ";
-	
+
 //	$db->debug=1;
 //	$db->Execute('select * from table where val=? AND value=?', array('val'=>'http ://www.whatever.com/test?=21', 'value'=>'blabl'));
 
@@ -652,14 +655,14 @@ END Adodb;
 	$db->bulkBind = false;
 	$rs = $db->Execute('select * from ADOXYZ order by id');
 	if (!$rs || $rs->RecordCount() != 3) Err("Bad bulk insert");
-	
+
 	rs2html($rs);
-	
+
 	$db->Execute('delete from ADOXYZ');
-		
+
 	print "
    Inserting 50 rows
    ";
 
-	for ($i = 0; $i < 5; $i++) {	
+	for ($i = 0; $i < 5; $i++) {
 
 	$time = $db->DBDate(time());
 	if (empty($_GET['hide'])) $db->debug = true;
@@ -671,16 +674,16 @@ END Adodb;
   row2 varchar(16),
   PRIMARY KEY  (row1))";
   		//$db->debug=1;
-  		if (!$db->Execute("delete from mytable")) 
+  		if (!$db->Execute("delete from mytable"))
 			$db->Execute($sqlt);
-			
+
 		$ok = $db->Execute("insert into mytable (row2) values ('test')");
 		$ins_id=$db->Insert_ID();
 		echo "Insert ID=";var_dump($ins_id);
 		if ($ins_id == 0) Err("Bad Insert_ID()");
 		$ins_id2 = $db->GetOne("select row1 from mytable");
 		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-		
+
 		$arr = array(0=>'Caroline',1=>'Miranda');
 		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
 		break;
@@ -693,33 +696,33 @@ END Adodb;
   PRIMARY KEY  (`row1`),
   KEY `myindex` (`row1`,`row2`)
 ) ";
-		if (!$db->Execute("delete from mytable")) 
+		if (!$db->Execute("delete from mytable"))
 			$db->Execute($sqlt);
-			
+
 		$ok = $db->Execute("insert into mytable (row2) values ('test')");
 		$ins_id=$db->Insert_ID();
 		echo "Insert ID=";var_dump($ins_id);
 		if ($ins_id == 0) Err("Bad Insert_ID()");
 		$ins_id2 = $db->GetOne("select row1 from mytable");
 		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-		
+
 	default:
 		$arr = array(0=>'Caroline',1=>'Miranda');
 		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
 		break;
-	
+
 	case 'oci8':
 	case 'oci805':
 		$arr = array('first'=>'Caroline','last'=>'Miranda');
 		$amt = rand() % 100;
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,:first,:last,$time)";		
+		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,:first,:last,$time)";
 		break;
 	}
 	if ($i & 1) {
 		$sql = $db->Prepare($sql);
 	}
 	$rs = $db->Execute($sql,$arr);
-		
+
 	if ($rs === false) Err( 'Error inserting with parameters');
 	else $rs->Close();
 	$db->debug = false;
@@ -740,45 +743,45 @@ END Adodb;
 	$db->debug=1;
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 	$cnt = $db->GetOne("select count(*) from ADOXYZ");
-	$rs = $db->Execute('update ADOXYZ set id=id+1');	
+	$rs = $db->Execute('update ADOXYZ set id=id+1');
 	if (!is_object($rs)) {
 		print_r($rs);
 		err("Update should return object");
-	} 
+	}
 	if (!$rs) err("Update generated error");
-	
-	$nrows = $db->Affected_Rows();   
+
+	$nrows = $db->Affected_Rows();
 	if ($nrows === false) print "
    Affected_Rows() not supported
    ";
 	else if ($nrows != $cnt)  print "
    Affected_Rows() Error: $nrows returned (should be 50) 
    ";
 	else print "
    Affected_Rows() passed
    ";
 	}
-	
+
 	if ($db->dataProvider == 'oci8')  $array = array('zid'=>1,'zdate'=>date('Y-m-d',time()));
 	else $array=array(1,date('Y-m-d',time()));
-	
-	
+
+
 	#$array = array(1,date('Y-m-d',time()));
-	$id = $db->GetOne("select id from ADOXYZ 
+	$id = $db->GetOne("select id from ADOXYZ
 		where id=".$db->Param('zid')." and created>=".$db->Param('ZDATE')."",
 		$array);
 	if ($id != 1) Err("Bad bind; id=$id");
 	else echo "
    Bind date/integer 1 passed";
-	
+
 	$array =array(1,$db->BindDate(time()));
-	$id = $db->GetOne("select id from ADOXYZ 
+	$id = $db->GetOne("select id from ADOXYZ
 		where id=".$db->Param('0')." and created>=".$db->Param('1')."",
 		$array);
 	if ($id != 1) Err("Bad bind; id=$id");
 	else echo "
    Bind date/integer 2 passed";
-	
+
 	$db->debug = false;
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
  //////////////////////////////////////////////////////////////////////////////////////////
-	
+
 	$rs = $db->Execute("select * from ADOXYZ where firstname = 'not known'");
 	if (!$rs ||  !$rs->EOF) print "
    Error on empty recordset
    ";
 	else if ($rs->RecordCount() != 0) {
-		print "
    Error on RecordCount. Should be 0. Was ".$rs->RecordCount()."
    "; 
+		print "
    Error on RecordCount. Should be 0. Was ".$rs->RecordCount()."
    ";
 		print_r($rs->fields);
 	}
 	if ($db->databaseType !== 'odbc') {
@@ -818,7 +821,7 @@ END Adodb;
 	$rs = $db->Execute('select * from ADOXYZ');
 	if ($rs) {
 		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
-		
+
 		while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
 			if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
 				print_r($o);
@@ -844,13 +847,13 @@ END Adodb;
 		}
 	}
 	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
+
 	$savefetch = $ADODB_FETCH_MODE;
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	
+
 	print "
    CacheSelectLimit  Test...
    ";
 	$rs = $db->CacheSelectLimit('select  id, firstname from  ADOXYZ order by id',2);
-	
+
 	if (ADODB_ASSOC_CASE == 2 || $db->dataProvider == 'oci8') {
 		$id = 'ID';
 		$fname = 'FIRSTNAME';
@@ -858,8 +861,8 @@ END Adodb;
 		$id = 'id';
 		$fname = 'firstname';
 	}
-	
-	
+
+
 	if ($rs && !$rs->EOF) {
 		if (isset($rs->fields[0])) {
 			Err("ASSOC has numeric fields");
@@ -867,7 +870,7 @@ END Adodb;
 		}
 		if ($rs->fields[$id] != 1)  {Err("Error"); print_r($rs->fields);};
 		if (trim($rs->fields[$fname]) != 'Caroline')  {print Err("Error 2"); print_r($rs->fields);};
-		
+
 		$rs->MoveNext();
 		if ($rs->fields[$id] != 2)  {Err("Error 3"); print_r($rs->fields);};
 		$rs->MoveNext();
@@ -876,7 +879,7 @@ END Adodb;
 			print_r($rs);
 		}
 	}
-	
+
 	print "
    FETCH_MODE = ASSOC: Should get 1, Caroline ASSOC_CASE=".ADODB_ASSOC_CASE."
    ";
 	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',2);
 	if ($rs && !$rs->EOF) {
@@ -892,7 +895,7 @@ END Adodb;
 			print_r($rs->fields);
 		}
 	}
-	
+
 	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 	print "
    FETCH_MODE = NUM: Should get 1, Caroline
    ";
 	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
@@ -905,13 +908,13 @@ END Adodb;
 
 	}
 	$ADODB_FETCH_MODE = $savefetch;
-	
+
 	$db->debug = false;
 	print "
    GetRowAssoc Upper: Should get 1, Caroline
    ";
 	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
 	if ($rs && !$rs->EOF) {
 		$arr = $rs->GetRowAssoc();
-		
+
 		if ($arr[strtoupper($id)] != 1) {Err("Error 1");print_r($arr);};
 		if (trim($arr[strtoupper($fname)]) != 'Caroline') {Err("Error 2"); print_r($arr);};
 		$rs->MoveNext();
@@ -926,37 +929,37 @@ END Adodb;
 		if (trim($arr['firstname']) != 'Caroline') {Err("Error 2"); print_r($arr);};
 
 	}
-	
+
 	print "
    GetCol Test
    ";
 	$col = $db->GetCol('select distinct firstname from ADOXYZ order by 1');
 	if (!is_array($col)) Err("Col size is wrong");
 	if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col elements wrong");
-	
-	
+
+
 	$col = $db->CacheGetCol('select distinct firstname from ADOXYZ order by 1');
 	if (!is_array($col)) Err("Col size is wrong");
 	if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col elements wrong");
 
 	$db->debug = true;
-	
-		
+
+
 	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 "
    ";
-	
-	
-	
+
+
+
 	print "
    SelectLimit Distinct Test 1: Should see Caroline, John and Mary
    ";
 	$rs = $db->SelectLimit('select distinct * from ADOXYZ order by id',3);
-	
-	
+
+
 	if ($rs && !$rs->EOF) {
 		if (trim($rs->fields[1]) != 'Caroline') Err("Error 1 (exp Caroline), ".$rs->fields[1]);
 		$rs->MoveNext();
-		
+
 		if (trim($rs->fields[1]) != 'John') Err("Error 2 (exp John), ".$rs->fields[1]);
 		$rs->MoveNext();
 		if (trim($rs->fields[1]) != 'Mary') Err("Error 3 (exp Mary),".$rs->fields[1]);
@@ -964,7 +967,7 @@ END Adodb;
 		if (! $rs->EOF) Err("Error EOF");
 		//rs2html($rs);
 	} else Err("Failed SelectLimit Test 1");
-	
+
 	print "
    SelectLimit Test 2: Should see Mary, George and Mr. Alan
    ";
 	$rs = $db->SelectLimit('select * from ADOXYZ order by id',3,2);
 	if ($rs && !$rs->EOF) {
@@ -978,7 +981,7 @@ END Adodb;
 	//	rs2html($rs);
 	}
 	 else Err("Failed SelectLimit Test 2 ". ($rs ? 'EOF':'no RS'));
-	
+
 	print "
    SelectLimit Test 3: Should see Wai Hun and Steven
    ";
 	$db->debug=1;
 	global $A; $A=1;
@@ -997,10 +1000,10 @@ END Adodb;
 	}
 	 else Err("Failed SelectLimit Test 3");
 		$db->debug = false;
-	
-	
+
+
 	$rs = $db->Execute("select * from ADOXYZ order by id");
-	print "
    Testing Move()
    ";	
+	print "
    Testing Move()
    ";
 	if (!$rs)Err( "Failed Move SELECT");
 	else {
 		if (!$rs->Move(2)) {
@@ -1012,13 +1015,13 @@ END Adodb;
 				print "
    $db->databaseType: MoveFirst failed -- probably cannot scroll backwards
    ";
 			}
 			else print "MoveFirst() OK
    ";
-						
+
 						// Move(3) tests error handling -- MoveFirst should not move cursor
 			$rs->Move(3);
 			if (trim($rs->Fields("firstname")) != 'George') {
 				print '
    '.$rs->Fields("id")."$db->databaseType: Move(3) failed
    ";
 			} else print "Move(3) OK
    ";
-						
+
 			$rs->Move(7);
 			if (trim($rs->Fields("firstname")) != 'Yat Sun') {
 				print '
    '.$rs->Fields("id")."$db->databaseType: Move(7) failed
    ";
@@ -1036,17 +1039,17 @@ END Adodb;
 				$rs->Move(3);
 				if (trim($rs->Fields("firstname")) != 'George') {
 					print '
    '.$rs->Fields("id")."$db->databaseType: Move(3) after MoveLast failed
    ";
-					
+
 				} else print "Move(3) after MoveLast() OK
    ";
 			}
-			
+
 			print "
    Empty Move Test";
 			$rs = $db->Execute("select * from ADOXYZ where id > 0 and id < 0");
 			$rs->MoveFirst();
 			if (!$rs->EOF || $rs->fields) Err("Error in empty move first");
 		}
 	}
-	
+
 	$rs = $db->Execute('select * from ADOXYZ where id = 2');
 	if ($rs->EOF || !is_array($rs->fields)) Err("Error in select");
 	$rs->MoveNext();
@@ -1071,14 +1074,14 @@ END Adodb;
 	$ADODB_FETCH_MODE = $save;
 	print "
    Testing GetArray() ";
 	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	
+
 	$rs = $db->Execute("select * from ADOXYZ order by id");
 	if ($rs) {
 		$arr = $rs->GetArray(10);
 		if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' || trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]."   ERROR
    ";
 		else print " OK
    ";
 	}
-	
+
 	$arr = $db->GetArray("select x from ADOXYZ");
 	$e = $db->ErrorMsg(); $e2 = $db->ErrorNo();
 	echo "Testing error handling, should see illegal column 'x' error=$e ($e2) 
    ";
@@ -1088,11 +1091,11 @@ END Adodb;
 	$fcnt = 0;
 	if ($rs)
 	while ($o = $rs->FetchNextObject()) {
-		$fcnt += 1;	
+		$fcnt += 1;
 	}
 	if ($fcnt == 1) print " OK
    ";
 	else print "FAILED
    ";
-	
+
 	$stmt = $db->Prepare("select * from ADOXYZ where id < 3");
 	$rs = $db->Execute($stmt);
 	if (!$rs) Err("Prepare failed");
@@ -1102,29 +1105,29 @@ END Adodb;
 		if (sizeof($arr) != 2) Err("Prepare failed 3");
 	}
 	print "Testing GetAssoc() ";
-	
-	
+
+
 	if ($db->dataProvider == 'mysql') {
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		$arr = $db->GetAssoc("SELECT 'adodb', '0'");
 		var_dump($arr);
 		die();
 	}
-	
+
 	$savecrecs = $ADODB_COUNTRECS;
 	$ADODB_COUNTRECS = false;
 	//$arr = $db->GetArray("select  lastname,firstname from ADOXYZ");
 	//print_r($arr);
 	print "
    ";
 	$rs = $db->Execute("select distinct lastname,firstname,created from ADOXYZ");
-	
+
 	if ($rs) {
 		$arr = $rs->GetAssoc();
 		//print_r($arr);
 		if (empty($arr['See']) || trim(reset($arr['See'])) != 'Wai Hun') print $arr['See']."   ERROR
    ";
 		else print " OK 1";
 	}
-	
+
 	$arr = $db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
 	if ($arr) {
 		//print_r($arr);
@@ -1137,41 +1140,41 @@ END Adodb;
 	$query = $db->Prepare("select count(*) from ADOXYZ");
 	$rs = $db->CacheExecute(10,$query);
 	if (reset($rs->fields) != 50) echo Err("$cnt wrong for Prepare/CacheGetOne");
-	
+
 	for ($loop=0; $loop < 1; $loop++) {
 	print "Testing GetMenu() and CacheExecute
    ";
 	$db->debug = true;
 	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	
-	
 
 
-	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu('menu','Steven').'
    '; 
+
+
+	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu('menu','Steven').'
    ';
 	else print " Fail
    ";
 	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	
+
 	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu('menu','Steven',false).'
    ';
 	else print " Fail
    ";
-	
+
 	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	
+
 	if ($rs) print ' 1st line set to **** , Steven selected: '. $rs->GetMenu('menu','Steven','1st:****').'
    ';
 	else print " Fail
    ";
-	
 
-	
+
+
 	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
 	if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'
    ';
 	else print " Fail
    ";
 	print '
    ';
-	
+
 	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
 	if ($rs) {
 		print ' Multiple, Alan and George selected: '. $rs->GetMenu('menu',array('Alan','George'),false,true);
 		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
 	} else print " Fail
    ";
 	print '
    ';
-	
+
 	print "Testing GetMenu3()
    ";
 	$rs = $db->Execute("select ".$db->Concat('firstname',"'-'",'id').",id, lastname from ADOXYZ order by lastname,id");
 	if ($rs) print "Grouped Menu: ".$rs->GetMenu3('name');
@@ -1180,7 +1183,7 @@ END Adodb;
 
 	print "Testing GetMenu2() 
    ";
 	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu2('menu',('Oey')).'
    '; 
+	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu2('menu',('Oey')).'
    ';
 	else print " Fail
    ";
 	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
 	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu2('menu',('Oey'),false).'
    ';
@@ -1192,55 +1195,55 @@ END Adodb;
 	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
 	print_r($rs->fields); echo $rs->fetchMode;echo "
    ";
 	echo $rs->Fields($fname);
-	
+
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
 	print_r($rs->fields);echo "
    ";
 	echo $rs->Fields($fname);
 	$db->debug = false;
-	
+
 	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 	// phplens
-	
+
 	$sql = 'select * from ADOXYZ where 0=1';
 	echo "
    **Testing '$sql' (phplens compat 1)
    ";
 	$rs = $db->Execute($sql);
 	if (!$rs) err( "No recordset returned for '$sql'");
 	if (!$rs->FieldCount()) err( "No fields returned for $sql");
 	if (!$rs->FetchField(1)) err( "FetchField failed for $sql");
-	
+
 	$sql = 'select * from ADOXYZ order by 1';
 	echo "
    **Testing '$sql' (phplens compat 2)
    ";
 	$rs = $db->Execute($sql);
 	if (!$rs) err( "No recordset returned for '$sql'
    ".$db->ErrorMsg()."    ");
-	
-	
+
+
 	$sql = 'select * from ADOXYZ order by 1,1';
 	echo "
    **Testing '$sql' (phplens compat 3)
    ";
 	$rs = $db->Execute($sql);
 	if (!$rs) err( "No recordset returned for '$sql'
    ".$db->ErrorMsg()."    ");
-	
-	
+
+
 	// Move
 	$rs1 = $db->Execute("select id from ADOXYZ where id <= 2 order by 1");
 	$rs2 = $db->Execute("select id from ADOXYZ where id = 3 or id = 4 order by 1");
 
 	if ($rs1) $rs1->MoveLast();
 	if ($rs2) $rs2->MoveLast();
-	
+
 	if (empty($rs1) || empty($rs2) || $rs1->fields[0] != 2 || $rs2->fields[0] != 4) {
 		$a = $rs1->fields[0];
 		$b = $rs2->fields[0];
 		print "
    Error in multiple recordset test rs1=$a rs2=$b (should be rs1=2 rs2=4)
    ";
 	} else
 		print "
    Testing multiple recordsets OK
    ";
-		
-	
+
+
 	echo "
     GenID test: ";
-	for ($i=1; $i <= 10; $i++) 
+	for ($i=1; $i <= 10; $i++)
 		echo  "($i: ",$val = $db->GenID($db->databaseType.'abcseq7' ,5), ") ";
 	if ($val == 0) Err("GenID not supported");
-	
+
 	if ($val) {
 		$db->DropSequence('abc_seq2');
 		$db->CreateSequence('abc_seq2');
@@ -1251,17 +1254,17 @@ END Adodb;
 		if ($val != 1) Err("Drop and Create Sequence not supported ($val)");
 	}
 	echo "
    ";
-	
+
 	if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
 		$sql = "select firstnames from ADOXYZ";
 		print "
    Testing execution of illegal statement: $sql
    ";
 		if ($db->Execute($sql) === false) {
 			print "
    This returns the following ErrorMsg(): ".$db->ErrorMsg()." and ErrorNo(): ".$db->ErrorNo().'
    ';
-		} else 
+		} else
 			print "
    Error in error handling -- Execute() should return false
    ";
-	} else 
+	} else
 		print "
    ADO skipped error handling of bad select statement
    ";
-	
+
 	print "
    ASSOC TEST 2
    ";
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 	$rs = $db->query('select * from ADOXYZ order by id');
@@ -1272,38 +1275,38 @@ END Adodb;
 		Err("Error No = $ee");
 	}
 	print_r($rs->fields);
-	for($i=0;$i<$rs->FieldCount();$i++) 
-	{ 
-		$fld=$rs->FetchField($i); 
-		print "
     Field name is ".$fld->name; 
-		print " ".$rs->Fields($fld->name); 
-	} 
-
-		
+	for($i=0;$i<$rs->FieldCount();$i++)
+	{
+		$fld=$rs->FetchField($i);
+		print "
     Field name is ".$fld->name;
+		print " ".$rs->Fields($fld->name);
+	}
+
+
 	print "
    BOTH TEST 2
    ";
 	if ($db->dataProvider == 'ado') {
 		print "ADODB_FETCH_BOTH not supported for dataProvider=".$db->dataProvider."
    ";
 	} else {
 		$ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
 		$rs = $db->query('select * from ADOXYZ order by id');
-		for($i=0;$i<$rs->FieldCount();$i++) 
-		{ 
-			$fld=$rs->FetchField($i); 
-			print "
     Field name is ".$fld->name; 
-			print " ".$rs->Fields($fld->name); 
-		} 
+		for($i=0;$i<$rs->FieldCount();$i++)
+		{
+			$fld=$rs->FetchField($i);
+			print "
     Field name is ".$fld->name;
+			print " ".$rs->Fields($fld->name);
+		}
 	}
-	
+
 	print "
    NUM TEST 2
    ";
 	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 	$rs = $db->query('select * from ADOXYZ order by id');
-	for($i=0;$i<$rs->FieldCount();$i++) 
-	{ 
-		$fld=$rs->FetchField($i); 
-		print "
     Field name is ".$fld->name; 
-		print " ".$rs->Fields($fld->name); 
-	} 
-	
+	for($i=0;$i<$rs->FieldCount();$i++)
+	{
+		$fld=$rs->FetchField($i);
+		print "
     Field name is ".$fld->name;
+		print " ".$rs->Fields($fld->name);
+	}
+
 	print "
    ASSOC Test of SelectLimit
    ";
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 	$rs = $db->selectlimit('select * from ADOXYZ order by id',3,4);
@@ -1317,8 +1320,8 @@ END Adodb;
 		$rs->MoveNext();
 	}
 	if ($cnt != 3) print "
    Count should be 3, instead it was $cnt
    ";
-	
-	
+
+
 	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 	if ($db->sysDate) {
 		$saved = $db->debug;
@@ -1328,7 +1331,7 @@ END Adodb;
 			print "
    Invalid date {$rs->fields[0]}
    ";
 		} else
 			print "
    Passed \$sysDate test ({$rs->fields[0]})
    ";
-		
+
 		print_r($rs->FetchField(0));
 		print time();
 		$db->debug=$saved;
@@ -1339,14 +1342,14 @@ END Adodb;
 	print "
    Test CSV
    ";
 	include_once('../toexport.inc.php');
 	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' he,\'"\' q  from ADOXYZ',10);	
-	
+	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' he,\'"\' q  from ADOXYZ',10);
+
 	print "
    ";
 	print rs2csv($rs);
 	print "
    ";
-	
-	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'The	"young man", he said\' from ADOXYZ',10);	
-	
+
+	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'The	"young man", he said\' from ADOXYZ',10);
+
 	if (PHP_VERSION < 5) {
 		print "
    ";
 		rs2tabout($rs);
@@ -1354,7 +1357,7 @@ END Adodb;
 	}
 	#print " CacheFlush ";
 	#$db->CacheFlush();
-	
+
 	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A');
 	$sql = "SELECT $date from ADOXYZ";
 	print "
    Test SQLDate: ".htmlspecialchars($sql)."
    ";
@@ -1362,8 +1365,13 @@ END Adodb;
 	$d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
 	if (!$rs) Err("SQLDate query returned no recordset");
 	else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: 
    act:$d 
    sql:".$rs->fields[0]);
-	
-	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
+
+	$dbdate = $db->DBDate("1974-02-25");
+	if (substr($db->dataProvider, 0, 8) == 'postgres') {
+		$dbdate .= "::TIMESTAMP";
+	}
+
+	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A', $dbdate);
 	$sql = "SELECT $date from ADOXYZ";
 	print "
    Test SQLDate: ".htmlspecialchars($sql)."
    ";
 	$db->debug=1;
@@ -1376,27 +1384,27 @@ END Adodb;
 	} else if ($d != reset($rs->fields)) {
 		Err("SQLDate 2 failed expected: 
    act:$d 
    sql:".$rs->fields[0].' 
    '.$db->ErrorMsg());
 	}
-	
-	
+
+
 	print "
    Test Filter
    ";
 	$db->debug = 1;
-	
+
 	$rs = $db->SelectLimit('select * from ADOXYZ where id < 3 order by id');
-	
+
 	$rs = RSFilter($rs,'do_strtolower');
 	if (trim($rs->fields[1]) != 'caroline'  && trim($rs->fields[2]) != 'miranda') {
 		err('**** RSFilter failed');
 		print_r($rs->fields);
 	}
-	
+
 	rs2html($rs);
-		
+
 	$db->debug=1;
-	
-	
+
+
 	print "
    Test Replace
    ";
-	
-	$ret = $db->Replace('ADOXYZ', 
+
+	$ret = $db->Replace('ADOXYZ',
 		array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
 		array('id'),
 		$autoq = true);
@@ -1415,24 +1423,24 @@ END Adodb;
 		}
 		$ADODB_COUNTRECS = $savec;
 	}
-	$ret = $db->Replace('ADOXYZ', 
+	$ret = $db->Replace('ADOXYZ',
 		array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
 		array('id','firstname'),
 		$autoq = true);
 	if ($ret != 2) print "Replace failed: ";
 	print "test A return value=$ret (2 expected) 
    ";
-	
-	$ret = $db->Replace('ADOXYZ', 
+
+	$ret = $db->Replace('ADOXYZ',
 		array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
 		'id',
 		$autoq = true);
-	if ($ret != 1) 
+	if ($ret != 1)
 		if ($db->dataProvider == 'ibase' && $ret == 2);
 		else print "Replace failed: ";
 	print "test B return value=$ret (1 or if ibase then 2 expected) 
    ";
-	
+
 	print "
    rs2rs Test
    ";
-	
+
 	$rs = $db->Execute('select * from ADOXYZ where id>= 1 order by id');
 	$rs = $db->_rs2rs($rs);
 	$rs->valueX = 'X';
@@ -1449,7 +1457,7 @@ END Adodb;
  		$db,  			# adodb connection
  		'ADOXYZ',  		# tables
 		'firstname',	# row fields
-		'lastname',		# column fields 
+		'lastname',		# column fields
 		false,			# join
 		'ID', 			# sum
 		'Sum ',			# label for sum
@@ -1459,17 +1467,17 @@ END Adodb;
 	$rs = $db->Execute($sql);
 	if ($rs) rs2html($rs);
 	else Err("Pivot sql error");
-	
+
 	$pear = false; //true;
 	$db->debug=false;
-	
+
 	if ($pear) {
 	// PEAR TESTS BELOW
 	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
+
 	include_once "PEAR.php";
 	$rs = $db->query('select * from ADOXYZ where id>0 and id<10 order by id');
-	
+
 	$i = 0;
 	if ($rs && !$rs->EOF) {
 		while ($arr = $rs->fetchRow()) {
@@ -1484,20 +1492,20 @@ END Adodb;
 		}
 		$rs->Close();
 	}
-	
-	
+
+
 	if ($i != $db->GetOne('select count(*) from ADOXYZ where id>0 and id<10')) {
 		print "
    PEAR DB emulation error 1.1 EOF ($i)
    ";
 		$pear = false;
 	}
-	
+
 	$rs = $db->limitQuery('select * from ADOXYZ where id>0 order by id',$i=3,$top=3);
 	$i2 = $i;
 	if ($rs && !$rs->EOF) {
 
 		while (!is_object($rs->fetchInto($arr))) {
 			$i2++;
-			
+
 	//			print_r($arr);
 	//		print "$i ";print_r($arr);
 			if ($arr[0] != $i2) {
@@ -1516,7 +1524,7 @@ END Adodb;
 	if ($pear) print "
    PEAR DB emulation passed.
    ";
 	flush();
 
-	
+
 	$rs = $db->SelectLimit("select ".$db->sysDate." from ADOXYZ",1);
 	$date = $rs->fields[0];
 	if (!$date) Err("Bad sysDate");
@@ -1526,9 +1534,9 @@ END Adodb;
 		else echo "Passed UserDate: $ds
    ";
 	}
 	$db->debug=1;
-	if ($db->dataProvider == 'oci8') 
+	if ($db->dataProvider == 'oci8')
 		$rs = $db->SelectLimit("select to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from ADOXYZ",1);
-	else 
+	else
 		$rs = $db->SelectLimit("select ".$db->sysTimeStamp." from ADOXYZ",1);
 	$date = $rs->fields[0];
 	if (!$date) Err("Bad sysTimeStamp");
@@ -1536,7 +1544,7 @@ END Adodb;
 		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
 		if ($ds != date("H \\h\\r\\s-d m Y")) Err("Bad UserTimeStamp: ".$ds.", correct is ".date("H \\h\\r\\s-d m Y"));
 		else echo "Passed UserTimeStamp: $ds
    ";
-		
+
 		$date = 100;
 		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
 		$ds2 = date("H \\h\\r\\s-d m Y",$date);
@@ -1544,12 +1552,12 @@ END Adodb;
 		else echo "Passed UserTimeStamp 2: $ds
    ";
 	}
 	flush();
-	
+
 	if ($db->hasTransactions) {
 		$db->debug=1;
 		echo "
    Testing StartTrans CompleteTrans
    ";
 		$db->raiseErrorFn = false;
-		
+
 		$db->SetTransactionMode('SERIALIZABLE');
 		$db->StartTrans();
 		$rs = $db->Execute('select * from notable');
@@ -1569,7 +1577,7 @@ END Adodb;
 			if ($name == "Carolx") Err("Error: CompleteTrans (2) should have failed");
 			else echo "
     -- Passed StartTrans test1 - rolling back
    ";
 		}
-		
+
 		$db->StartTrans();
 			$db->BeginTrans();
 		$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
@@ -1588,10 +1596,10 @@ END Adodb;
 	$cnt = _adodb_getcount($db, 'select * from ADOXYZ where firstname in (select firstname from ADOXYZ)');
 	echo "Count= $cnt";
 	$db->debug=$saved;
-	
+
 	global $TESTERRS;
 	$debugerr = true;
-	
+
 	global $ADODB_LANG;$ADODB_LANG = 'fr';
 	$db->debug = false;
 	$TESTERRS = 0;
@@ -1612,35 +1620,35 @@ END Adodb;
 	$rs = false;
 
 	flush();
-	
+
 	print "
    SetFetchMode() tests
    ";
 	$db->SetFetchMode(ADODB_FETCH_ASSOC);
 	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
 	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;	
+
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
 	//var_dump($rs->fields);
 	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;	
+
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 	$db->SetFetchMode(ADODB_FETCH_NUM);
 	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
 	if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
-	
+
 	flush();
-	
+
 	print "
    Test MetaTables again with SetFetchMode()
    ";
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 	$db->SetFetchMode(ADODB_FETCH_ASSOC);
 	print_r($db->MetaTables());
 	print "
    ";
-	
+
 	////////////////////////////////////////////////////////////////////
-	
+
 	print "
    Testing Bad Connection
    ";
 	flush();
-	
+
 	if (true || PHP_VERSION < 5)  {
 		if ($db->dataProvider == 'odbtp') $db->databaseType = 'odbtp';
 		$conn = NewADOConnection($db->databaseType);
@@ -1648,13 +1656,13 @@ END Adodb;
 		if (1) $conn->PConnect('abc','baduser','badpassword');
 		if ($TESTERRS == 2) print "raiseErrorFn tests passed
    ";
 		else print "raiseErrorFn tests failed ($TESTERRS)
    ";
-		
+
 		flush();
 	}
 	////////////////////////////////////////////////////////////////////
-	
+
 	global $nocountrecs;
-	
+
 	if (isset($nocountrecs) && $ADODB_COUNTRECS) err("Error: \$ADODB_COUNTRECS is set");
 	if (empty($nocountrecs) && $ADODB_COUNTRECS==false) err("Error: \$ADODB_COUNTRECS is not set");
 
@@ -1669,10 +1677,10 @@ END Adodb;
 	if ($rs2) $rs2->Close();
 	if ($rs) $rs->Close();
 	$db->Close();
-	
+
 	if ($db->transCnt != 0) Err("Error in transCnt=$db->transCnt (should be 0)");
-	
-	
+
+
 	printf("
    Total queries=%d; total cached=%d
    ",$EXECS+$CACHED, $CACHED);
 	flush();
 }
@@ -1706,7 +1714,7 @@ if (@$_SERVER['COMPUTERNAME'] == 'TIGRESS') {
 	CheckWS('mysqlt');
 	CheckWS('postgres');
 	CheckWS('oci8po');
-	
+
 	CheckWS('firebird');
 	CheckWS('sybase');
 	if (!ini_get('safe_mode')) CheckWS('informix');
@@ -1714,7 +1722,7 @@ if (@$_SERVER['COMPUTERNAME'] == 'TIGRESS') {
 	CheckWS('ado_mssql');
 	CheckWS('ado_access');
 	CheckWS('mssql');
-	
+
 	CheckWS('vfp');
 	CheckWS('sqlanywhere');
 	CheckWS('db2');
@@ -1733,7 +1741,7 @@ if (sizeof($_GET) == 0) $testmysql = true;
 foreach($_GET as $k=>$v)  {
 	//global $$k;
 	$$k = $v;
-}	
+}
 
 ?>
 
@@ -1741,11 +1749,11 @@ foreach($_GET as $k=>$v)  {
 
 
    ADODB Test
    
 
-This script tests the following databases: Interbase, Oracle, Visual FoxPro, Microsoft Access (ODBC and ADO), MySQL, MSSQL (ODBC, native, ADO). 
+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 adodb.sourceforge.net.
    
 
-Test GetInsertSQL/GetUpdateSQL   
+Test GetInsertSQL/GetUpdateSQL  
 	Sessions  
 	Paging  
 	Perf Monitor
    
@@ -1763,6 +1771,6 @@ echo "
    vers=",ADOConnection::Version();
 
 
 ?>
-
    ADODB Database Library  (c) 2000-2012 John Lim. All rights reserved. Released under BSD and LGPL, PHP .
    
+
    ADODB Database Library  (c) 2000-2014 John Lim. All rights reserved. Released under BSD and LGPL, PHP .
    
 
 
diff --git a/lib/WikiDB/adodb/tests/test2.php b/lib/WikiDB/adodb/tests/test2.php
index 7580dcafa..eb3b02582 100644
--- a/lib/WikiDB/adodb/tests/test2.php
+++ b/lib/WikiDB/adodb/tests/test2.php
@@ -9,13 +9,13 @@
 	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
 	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
 		. 'DATA SOURCE=' . $access . ';';
-		
+
 	echo "
    PHP ",PHP_VERSION,"
    ";
-	
+
 	$db->Connect($myDSN) || die('fail');
-	
+
 	print_r($db->ServerInfo());
-	
+
 	try {
 	$rs = $db->Execute("select $db->sysTimeStamp,* from adoxyz where id>02xx");
 	print_r($rs->fields);
@@ -23,4 +23,3 @@
 	print_r($e);
 	echo "
     Date m/d/Y =",$db->UserDate($rs->fields[4],'m/d/Y');
 	}
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test3.php b/lib/WikiDB/adodb/tests/test3.php
index 31828055f..fc881a4fc 100644
--- a/lib/WikiDB/adodb/tests/test3.php
+++ b/lib/WikiDB/adodb/tests/test3.php
@@ -1,8 +1,8 @@
 Execute("select bad from badder");
 	adodb_pr($e);
 	$e = adodb_backtrace($e->trace);
 }
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test4.php b/lib/WikiDB/adodb/tests/test4.php
index c7cdb1f9c..ff0c53ebf 100644
--- a/lib/WikiDB/adodb/tests/test4.php
+++ b/lib/WikiDB/adodb/tests/test4.php
@@ -1,18 +1,18 @@
 Walt's new stuff failed: $insertS
 // This code tests an update
 
 $sql = "
-SELECT * 
-FROM ADOXYZ WHERE lastname=".$conn->Param('var'). " ORDER BY 1"; 
-// Select a record to update 
+SELECT *
+FROM ADOXYZ WHERE lastname=".$conn->Param('var'). " ORDER BY 1";
+// Select a record to update
 
 $varr = array('var'=>$record['lastname'].'');
 $rs = $conn->Execute($sql,$varr); // Execute the query and get the existing record to update
@@ -140,4 +140,3 @@ rs2html($rs);
 
 
 testsql();
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/test5.php b/lib/WikiDB/adodb/tests/test5.php
index e6c441885..4af762cd6 100644
--- a/lib/WikiDB/adodb/tests/test5.php
+++ b/lib/WikiDB/adodb/tests/test5.php
@@ -1,16 +1,16 @@
 PConnect("susetikus","tester","test","test");
 	print $conn->databaseType.':'.$conn->GenID().'
    ';
 }
-?>
diff --git a/lib/WikiDB/adodb/tests/test_rs_array.php b/lib/WikiDB/adodb/tests/test_rs_array.php
index 1de37b223..547b20ad6 100644
--- a/lib/WikiDB/adodb/tests/test_rs_array.php
+++ b/lib/WikiDB/adodb/tests/test_rs_array.php
@@ -44,4 +44,3 @@ while (!$rs->EOF) {
 
 
 die();
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/testcache.php b/lib/WikiDB/adodb/tests/testcache.php
index a0a2525dd..3e08e1fc5 100644
--- a/lib/WikiDB/adodb/tests/testcache.php
+++ b/lib/WikiDB/adodb/tests/testcache.php
@@ -1,13 +1,13 @@
 
 
 Execute('select * from products');
 
 $arr = $rs->GetArray();
 print sizeof($arr);
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/testdatabases.inc.php b/lib/WikiDB/adodb/tests/testdatabases.inc.php
index 2c52cfca1..5c30edd80 100644
--- a/lib/WikiDB/adodb/tests/testdatabases.inc.php
+++ b/lib/WikiDB/adodb/tests/testdatabases.inc.php
@@ -1,12 +1,12 @@
 
 
@@ -15,7 +15,7 @@ V4.80 8 Mar 2006  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved
 > Access
    
 > Interbase
    
 > MSSQL
    
- > MySQL
    
+> MySQL
    
 > MySQL ODBC
    
 > MySQLi
 
    
@@ -23,6 +23,7 @@ V4.80 8 Mar 2006  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved
 > MySQL Proxy
    
 > Oracle (oci8) 
    
 > PostgreSQL
    
+> PostgreSQL 9
    
 > PostgreSQL ODBC
    
 
 > PgSQL PDO
    
@@ -54,7 +55,7 @@ if (isset($nocountrecs)) $ADODB_COUNTRECS = false;
 
 if (sizeof($_GET) || !isset($_SERVER['HTTP_HOST'])) {
 	echo "
    ";
-	ADOLoadCode2("sybase"); 
+	ADOLoadCode2("sybase");
 	ADOLoadCode2("postgres");
 	ADOLoadCode2("postgres7");
 	ADOLoadCode2("firebird");
@@ -77,23 +78,46 @@ function ADOLoadCode2($d)
 }
 
 flush();
+
+// dregad 2014-04-15 added serial field to avoid error with lastval()
+$pg_test_table = "create table ADOXYZ (id integer, firstname char(24), lastname varchar,created date, ser serial)";
+$pg_hostname = 'localhost';
+$pg_user = 'tester';
+$pg_password = 'test';
+$pg_database = 'northwind';
+$pg_errmsg = "ERROR: PostgreSQL requires a database called '$pg_database' "
+	. "on server '$pg_hostname', user '$pg_user', password '$pg_password'.
    ";
+
 if (!empty($testpostgres)) {
 	//ADOLoadCode("postgres");
 
 	$db = ADONewConnection('postgres');
 	print "
    Connecting $db->databaseType...
    ";
-	if ($db->Connect("localhost","tester","test","northwind")) {
-		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname varchar,created date)");
-	}else
-		print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.
    ".$db->ErrorMsg();
+	if ($db->Connect($pg_hostname, $pg_user, $pg_password, $pg_database)) {
+		testdb($db, $pg_test_table);
+	} else {
+		print $pg_errmsg . $db->ErrorMsg();
+	}
+}
+
+if (!empty($testpostgres9)) {
+	//ADOLoadCode("postgres");
+
+	$db = ADONewConnection('postgres9');
+	print "
    Connecting $db->databaseType...
    ";
+	if ($db->Connect($pg_hostname, $pg_user, $pg_password, $pg_database)) {
+		testdb($db, $pg_test_table);
+	} else {
+		print $pg_errmsg . $db->ErrorMsg();
+	}
 }
 
-if (!empty($testpgodbc)) { 
-	
+if (!empty($testpgodbc)) {
+
 	$db = ADONewConnection('odbc');
 	$db->hasTransactions = false;
 	print "
    Connecting $db->databaseType...
    ";
-	
+
 	if ($db->PConnect('Postgresql')) {
 		$db->hasTransactions = true;
 		testdb($db,
@@ -108,7 +132,7 @@ if (!empty($testibase)) {
 	if ($db->PConnect("localhost:d:\\firebird\\151\\examples\\EMPLOYEE.fdb", "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();
-	
+
 }
 
 
@@ -117,16 +141,16 @@ if (!empty($testsqlite)) {
 	$dsn = "sqlite://$path/";
 	$db = ADONewConnection($dsn);
 	//echo $dsn;
-	
+
 	//$db = ADONewConnection('sqlite');
-	
+
 
 	if ($db && $db->PConnect("d:\\inetpub\\adodb\\sqlite.db", "", "", "")) {
 		print "
    Connecting $db->databaseType...
    ";
 		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	} else 
+	} else
 		print "ERROR: SQLite";
-	
+
 }
 
 if (!empty($testpdopgsql)) {
@@ -145,7 +169,7 @@ if (!empty($testpdomysql)) {
 	$db = ADONewConnection('pdo');
 	print "
    Connecting $db->databaseType...
    ";
 	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	
+
 	testdb($db,
 		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
 }
@@ -156,7 +180,7 @@ if (!empty($testpdomssql)) {
 	$db = ADONewConnection('pdo');
 	print "
    Connecting $db->databaseType...
    ";
 	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	
+
 	testdb($db,
 		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
 }
@@ -201,19 +225,19 @@ if (!empty($testaccess)) {
 	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
 	$dsn = "nwind";
 	$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";
-	
+
 }
 
 if (!empty($testaccess) && !empty($testado)) { // ADO ACCESS
 
 	$db = ADONewConnection("ado_access");
 	print "
    Connecting $db->databaseType...
    ";
-	
+
 	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
 	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
 		. 'DATA SOURCE=' . $access . ';';
@@ -223,7 +247,7 @@ if (!empty($testaccess) && !empty($testado)) { // ADO ACCESS
 		print "ADO version=".$db->_connectionID->version."
    ";
 		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
 	} else print "ERROR: Access test requires a Access database $access".'
    '.$db->ErrorMsg();
-	
+
 }
 
 if (!empty($testvfp)) { // ODBC
@@ -233,15 +257,15 @@ if (!empty($testvfp)) { // ODBC
 	if ( $db->PConnect("vfp-adoxyz")) {
 		testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
 	 } else print "ERROR: Visual FoxPro test requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
-	
+
 	echo "
    ";
 	$db = ADONewConnection('odbtp');
-	
+
 	if ( $db->PConnect('localhost','DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBF;SOURCEDB=d:\inetpub\adodb;EXCLUSIVE=NO;')) {
 	print "
    Connecting $db->databaseType...
    ";flush();
 	testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
 	 } else print "ERROR: Visual FoxPro odbtp requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
-	
+
 }
 
 
@@ -254,7 +278,7 @@ if (!empty($testmysql)) { // MYSQL
 	$user = 'root'; $password = ''; $database = 'northwind';
 	$db = ADONewConnection("mysqlt://$user:$password@$server/$database?persist");
 	print "
    Connecting $db->databaseType...
    ";
-	
+
 	if (true || $db->PConnect($server, "root", "", "northwind")) {
 		//$db->Execute("DROP TABLE ADOXYZ") || die('fail drop');
 		//$db->debug=1;$db->Execute('drop table ADOXYZ');
@@ -280,7 +304,7 @@ if (!empty($testmysqli)) { // MYSQL
 
 // REQUIRES MySQL server at localhost with database 'test'
 if (!empty($testmysqlodbc)) { // MYSQL
-	
+
 	$db = ADONewConnection('odbc');
 	$db->hasTransactions = false;
 	print "
    Connecting $db->databaseType...
    ";
@@ -306,22 +330,22 @@ if (!empty($testproxy)){
 
 ADOLoadCode('oci805');
 ADOLoadCode("oci8po");
-	
+
 if (!empty($testoracle)) {
 	$dsn = "oci8";//://scott:natsoft@kk2?persist";
 	$db = ADONewConnection($dsn );//'oci8');
-	
+
 	//$db->debug=1;
 	print "
    Connecting $db->databaseType...
    ";
 	if ($db->Connect('mobydick', "scott", "natsoft",'SID=mobydick'))
 		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	else 
+	else
 		print "ERROR: Oracle test requires an Oracle server setup with scott/natsoft".'
    '.$db->ErrorMsg();
 
 }
 ADOLoadCode("oracle"); // no longer supported
-if (false && !empty($testoracle)) { 
-	
+if (false && !empty($testoracle)) {
+
 	$db = ADONewConnection();
 	print "
    Connecting $db->databaseType...
    ";
 	if ($db->PConnect("", "scott", "tiger", "natsoft.domain"))
@@ -335,16 +359,16 @@ if (!empty($testdb2)) {
 	if (PHP_VERSION>=5.1) {
 		$db = ADONewConnection("db2");
 		print "
    Connecting $db->databaseType...
    ";
-		
+
 		#$db->curMode = SQL_CUR_USE_ODBC;
 		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
 		if ($db->Connect('localhost','natsoft','guest','test')) {
 			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
 		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'
    '.$db->ErrorMsg();
-	} else { 
+	} else {
 		$db = ADONewConnection("odbc_db2");
 		print "
    Connecting $db->databaseType...
    ";
-		
+
 		$dsn = "db2test";
 		#$db->curMode = SQL_CUR_USE_ODBC;
 		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
@@ -355,14 +379,14 @@ if (!empty($testdb2)) {
 echo "
    ";
 flush();
 	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";
-	
+
 	$db = ADONewConnection('odbtp');
 	if ($db->Connect('127.0.0.1',$dsn)) {
-		
+
 		$db->debug=1;
 		 $arr = $db->GetArray( "||SQLProcedures" ); adodb_pr($arr);
 	     $arr = $db->GetArray( "||SQLProcedureColumns|||GET_ROUTINE_SAR" );adodb_pr($arr);
-	
+
 		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
 	} else echo ("ERROR Connection");
 	echo $db->ErrorMsg();
@@ -378,7 +402,7 @@ if (false && !empty($testmssql)) { // MS SQL Server -- the extension is buggy --
 	$db = ADONewConnection("mssqlpo");
 	//$db->debug=1;
 	print "
    Connecting $db->databaseType...
    ";
-	
+
 	$ok = $db->Connect('','sa','natsoft','northwind');
 	echo $db->ErrorMsg();
 	if ($ok /*or $db->PConnect("mangrove", "sa", "natsoft", "ai")*/) {
@@ -386,16 +410,16 @@ if (false && !empty($testmssql)) { // MS SQL Server -- the extension is buggy --
 	//	$db->Execute('drop table adoxyz');
 		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
 	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='$server', userid='adodb', password='natsoft', database='ai'".'
    '.$db->ErrorMsg();
-	
+
 }
 
 
 ADOLoadCode('odbc_mssql');
 if (!empty($testmssql)) { // MS SQL Server via ODBC
 	$db = ADONewConnection();
-	
+
 	print "
    Connecting $db->databaseType...
    ";
-	
+
 	$dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=$server;Database=northwind;";
 	$dsn = 'condor';
 	if ($db->PConnect($dsn, "sa", "natsoft", ""))  {
@@ -407,19 +431,19 @@ if (!empty($testmssql)) { // MS SQL Server via ODBC
 
 ADOLoadCode("ado_mssql");
 if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC -- DSN-less
-	
+
 	$db = ADONewConnection("ado_mssql");
 	//$db->debug=1;
 	print "
    Connecting DSN-less $db->databaseType...
    ";
-	
+
 	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
 		. "SERVER=$server;DATABASE=NorthWind;UID=adodb;PWD=natsoft;Trusted_Connection=No";
 
-		
+
 	if ($db->PConnect($myDSN, "", "", ""))
 		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
 	else print "ERROR: MSSQL test 2 requires MS SQL 7";
-	
+
 }
 
 if (!empty($testmssql) && !empty($testado)) { // ADO ACCESS MSSQL with OLEDB provider
@@ -437,11 +461,11 @@ if (!empty($testmssql) && !empty($testado)) { // ADO ACCESS MSSQL with OLEDB pro
 
 if (extension_loaded('odbtp') && !empty($testmssql)) { // MS SQL Server via ODBC
 	$db = ADONewConnection('odbtp');
-	
+
 	$dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=$server;Database=northwind;uid=adodb;pwd=natsoft";
-	
+
 	if ($db->PConnect('localhost',$dsn, "", ""))  {
-		print "
    Connecting $db->databaseType...
    ";				
+		print "
    Connecting $db->databaseType...
    ";
 		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";
@@ -450,5 +474,3 @@ if (extension_loaded('odbtp') && !empty($testmssql)) { // MS SQL Server via ODBC
 
 
 print "
    Tests Completed
    ";
-
-?>
diff --git a/lib/WikiDB/adodb/tests/testgenid.php b/lib/WikiDB/adodb/tests/testgenid.php
index bc54adac6..3310734a5 100644
--- a/lib/WikiDB/adodb/tests/testgenid.php
+++ b/lib/WikiDB/adodb/tests/testgenid.php
@@ -1,7 +1,7 @@
 Execute("drop table $table");
 	//$db->debug=true;
-	
+
 	$ctr = 5000;
 	$lastnum = 0;
-	
+
 	while (--$ctr >= 0) {
 		$num = $db->GenID($table);
-		if ($num === false) {	
+		if ($num === false) {
 			print "GenID returned false";
 			break;
 		}
@@ -33,4 +33,3 @@ function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24)
 		$lastnum = $num;
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/testmssql.php b/lib/WikiDB/adodb/tests/testmssql.php
index b98fc2e75..25a8cb219 100644
--- a/lib/WikiDB/adodb/tests/testmssql.php
+++ b/lib/WikiDB/adodb/tests/testmssql.php
@@ -1,18 +1,18 @@
 Execute('insert into blobtest (id) values(1)');
 $conn->UpdateBlobFile('blobtest','b1','../cute_icons_for_site/adodb.gif','id=1');
 $rs = $conn->Execute('select b1 from blobtest where id=1');
 
-$output = "c:\\temp\\test_out-".date('H-i-s').".gif"; 
+$output = "c:\\temp\\test_out-".date('H-i-s').".gif";
 print "Saving file $output, size=".strlen($rs->fields[0])."
    ";
-$fd = fopen($output, "wb"); 
-fwrite($fd, $rs->fields[0]); 
-fclose($fd); 
+$fd = fopen($output, "wb");
+fwrite($fd, $rs->fields[0]);
+fclose($fd);
 
 print " View Image";
 //$rs = $conn->Execute('SELECT id,SUBSTRING(b1, 1, 10) FROM blobtest');
 //rs2html($rs);
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/testoci8.php b/lib/WikiDB/adodb/tests/testoci8.php
index fbb43d3e0..febb2ed83 100644
--- a/lib/WikiDB/adodb/tests/testoci8.php
+++ b/lib/WikiDB/adodb/tests/testoci8.php
@@ -1,13 +1,13 @@
 
 
 PConnect('','scott','natsoft');
 	if (!empty($testblob)) {
 		$varHoldingBlob = 'ABC DEF GEF John TEST';
@@ -24,9 +24,9 @@ if (0) {
 		// create table atable (id integer, ablob blob);
 		$db->Execute('insert into ATABLE (id,ablob) values('.$num.',empty_blob())');
 		$db->UpdateBlob('ATABLE', 'ablob', $varHoldingBlob, 'id='.$num, 'BLOB');
-		
+
 		$rs = $db->Execute('select * from atable');
-		
+
 		if (!$rs) die("Empty RS");
 		if ($rs->EOF) die("EOF RS");
 		rs2html($rs);
@@ -36,7 +36,7 @@ if (0) {
 	$rs = $db->Execute(
 		$stmt,
 		array($i));
-			
+
 		if (!$rs) die("Empty RS");
 		if ($rs->EOF) die("EOF RS");
 		rs2html($rs);
@@ -53,9 +53,9 @@ 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);
@@ -80,4 +80,3 @@ if (0) {
 	if ($rs->EOF) die("EOF RS");
 	rs2html($rs);
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/testoci8cursor.php b/lib/WikiDB/adodb/tests/testoci8cursor.php
index 3b20dd341..8946e676a 100644
--- a/lib/WikiDB/adodb/tests/testoci8cursor.php
+++ b/lib/WikiDB/adodb/tests/testoci8cursor.php
@@ -1,21 +1,21 @@
 ExecuteCursor("BEGIN adodb.open_tab(:RS,'A%'); END;");
-	
+
 	if ($rs && !$rs->EOF) {
 		print "Test 1 RowCount: ".$rs->RecordCount()."
    ";
 	} else {
 		print "Error in using Cursor Variables 1
    ";
 	}
-	
+
 	print "
    Testing Stored Procedures for oci8
    ";
-	
+
 	$stid = $db->PrepareSP('BEGIN adodb.myproc('.MYNUM.', :myov); END;');
 	$db->OutParameter($stid, $myov, 'myov');
 	$db->Execute($stid);
 	if ($myov != MYNUM) print "
    Error with myproc
    ";
-	
-	
+
+
 	$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;",true);
 	$a1 = 'Malaysia';
 	//$a2 = ''; # a2 doesn't even need to be defined!
@@ -98,14 +98,11 @@ include('../tohtml.inc.php');
 	} else {
 		print "Error in using Stored Procedure IN/Out Variables
    ";
 	}
-	
-	
+
+
 	$tname = 'A%';
-	
+
 	$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
 	$db->Parameter($stmt,$tname,'tablename');
 	$rs = $db->Execute($stmt);
 	rs2html($rs);
-		
-		
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/testpaging.php b/lib/WikiDB/adodb/tests/testpaging.php
index 57cb07b1c..f81a481fd 100644
--- a/lib/WikiDB/adodb/tests/testpaging.php
+++ b/lib/WikiDB/adodb/tests/testpaging.php
@@ -1,11 +1,11 @@
 Connect('','scott','natsoft');
-	
-$sql = "select * from (select  ID, firstname as \"First Name\", lastname as \"Last Name\" from adoxyz 
+
+$sql = "select * from (select  ID, firstname as \"First Name\", lastname as \"Last Name\" from adoxyz
 	 order  by  1)";
 }
 
@@ -83,4 +83,3 @@ $pager->showPageLinks = true;
 $pager->linksPerPage = 10;
 $pager->cache = 60;
 $pager->Render($rows=7);
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/testpear.php b/lib/WikiDB/adodb/tests/testpear.php
index 72d30886e..68dd7b912 100644
--- a/lib/WikiDB/adodb/tests/testpear.php
+++ b/lib/WikiDB/adodb/tests/testpear.php
@@ -1,11 +1,11 @@
 FetchRow()) {
 }
 
 if ($cnt != 50) print "Error in \$cnt = $cnt";
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/testsessions.php b/lib/WikiDB/adodb/tests/testsessions.php
index dad52642b..cf1d9afc7 100644
--- a/lib/WikiDB/adodb/tests/testsessions.php
+++ b/lib/WikiDB/adodb/tests/testsessions.php
@@ -1,12 +1,12 @@
 PHP ".PHP_VERSION."";
 	print "
    \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
-	
+
 	print "
     Cookies: ";
 	print_r($_COOKIE);
-	
+
 	var_dump($_SESSION['MONKEY']);
-	
+
 ### RANDOMLY PERFORM Garbage Collection
 ### In real-production environment, this is done for you
 ### by php's session extension, which calls adodb_sess_gc()
@@ -81,10 +81,10 @@ default:
 ### session.cookie_lifetime and session.gc_probability
 
 	if (rand() % 5 == 0) {
-	
+
 		print "
    Garbage Collection
    ";
 		adodb_sess_gc(10);
-		
+
 		if (rand() % 2 == 0) {
 			print "
    Random own session destroy
    ";
 			session_destroy();
@@ -96,4 +96,3 @@ default:
 		$rr = $DB->qstr(rand());
 		$DB->Execute("insert into {$options['table']} (sesskey,expiry,expireref,sessdata,created,modified) values ($sessk,$olddate, $rr,'',$olddate,$olddate)");
 	}
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/time.php b/lib/WikiDB/adodb/tests/time.php
index 65e9e08ff..8261e1e92 100644
--- a/lib/WikiDB/adodb/tests/time.php
+++ b/lib/WikiDB/adodb/tests/time.php
@@ -3,16 +3,14 @@
 include_once('../adodb-time.inc.php');
 adodb_date_test();
 ?>
-" );
 echo( "Converted: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
-
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tests/tmssql.php b/lib/WikiDB/adodb/tests/tmssql.php
index d634f0cc0..0f81311aa 100644
--- a/lib/WikiDB/adodb/tests/tmssql.php
+++ b/lib/WikiDB/adodb/tests/tmssql.php
@@ -1,18 +1,18 @@
 mssql";
 	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
 	mssql_select_db('northwind',$db);
-	
+
 	$rs = mssql_query('select getdate() as date',$db);
 	$o = mssql_fetch_row($rs);
 	print_r($o);
 	mssql_free_result($rs);
-	
+
 	print "
    Delete
    "; flush();
 	$rs2 = mssql_query('delete from adoxyz',$db);
 	$p = mssql_num_rows($rs2);
@@ -29,7 +29,7 @@ include_once('DB.php');
 	$password = 'natsoft';
 	$hostname = 'JAGUAR\vsdotnet';
 	$databasename = 'northwind';
-	
+
 	$dsn = "mssql://$username:$password@$hostname/$databasename";
 	$conn = DB::connect($dsn);
 	print "date=".$conn->GetOne('select getdate()')."
    ";
@@ -57,12 +57,12 @@ include_once('../adodb.inc.php');
 
 $ACCEPTIP = '127.0.0.1';
 
-$remote = $_SERVER["REMOTE_ADDR"]; 
+$remote = $_SERVER["REMOTE_ADDR"];
 
 if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
+ if ($remote != '127.0.0.1' && $remote != $ACCEPTIP)
  	die("Unauthorised client: '$remote'");
-	
+
 ?>
 mssql
 pear
@@ -77,4 +77,3 @@ if (!empty($_GET['do'])) {
 		$do();
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/toexport.inc.php b/lib/WikiDB/adodb/toexport.inc.php
index b27917e99..c078d8d41 100644
--- a/lib/WikiDB/adodb/toexport.inc.php
+++ b/lib/WikiDB/adodb/toexport.inc.php
@@ -1,17 +1,17 @@
 FieldTypesArray();
 		reset($fieldTypes);
 		$i = 0;
 		while(list(,$o) = each($fieldTypes)) {
-		
+
 			$v = ($o) ? $o->name : 'Field'.($i++);
 			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
 			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
 			$elements[] = $v;
-			
+
 		}
 		$s .= implode($sep, $elements).$NEWLINE;
 	}
 	$hasNumIndex = isset($rs->fields[0]);
-	
+
 	$line = 0;
 	$max = $rs->FieldCount();
-	
+
 	while (!$rs->EOF) {
 		$elements = array();
 		$i = 0;
-		
+
 		if ($hasNumIndex) {
 			for ($j=0; $j < $max; $j++) {
 				$v = $rs->fields[$j];
@@ -100,7 +100,7 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote =
 				else $v = 'Object';
 				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
 				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
-				
+
 				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
 				else $elements[] = $v;
 			}
@@ -108,7 +108,7 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote =
 			foreach($rs->fields as $v) {
 				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
 				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
-				
+
 				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
 				else $elements[] = $v;
 			}
@@ -122,13 +122,12 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote =
 			$s = '';
 		}
 	}
-	
+
 	if ($fp) {
 		if ($fp === true) echo $s;
 		else fwrite($fp,$s);
 		$s = '';
 	}
-	
+
 	return $s;
 }
-?>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/tohtml.inc.php b/lib/WikiDB/adodb/tohtml.inc.php
index bb596f780..808edf4a1 100644
--- a/lib/WikiDB/adodb/tohtml.inc.php
+++ b/lib/WikiDB/adodb/tohtml.inc.php
@@ -1,12 +1,12 @@
-
-*/ 
+*/
 
 // specific code for tohtml
 GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
@@ -47,17 +47,17 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 		printf(ADODB_BAD_RS,'rs2html');
 		return false;
 	}
-	
+
 	if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
 	//else $docnt = true;
 	$typearr = array();
 	$ncols = $rs->FieldCount();
 	$hdr = "\n\n";
-	for ($i=0; $i < $ncols; $i++) {	
+	for ($i=0; $i < $ncols; $i++) {
 		$field = $rs->FetchField($i);
 		if ($field) {
 			if ($zheaderarray) $fname = $zheaderarray[$i];
-			else $fname = htmlspecialchars($field->name);	
+			else $fname = htmlspecialchars($field->name);
 			$typearr[$i] = $rs->MetaType($field->type,$field->max_length);
  			//print " $field->name $field->type $typearr[$i] ";
 		} else {
@@ -70,17 +70,17 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 	$hdr .= "\n";
 	if ($echo) print $hdr."\n\n";
 	else $html = $hdr;
-	
+
 	// smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...
 	$numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || isset($rs->fields[2]);
 	while (!$rs->EOF) {
-		
+
 		$s .= "\n";
-		
+
 		for ($i=0; $i < $ncols; $i++) {
 			if ($i===0) $v=($numoffset) ? $rs->fields[0] : reset($rs->fields);
 			else $v = ($numoffset) ? $rs->fields[$i] : next($rs->fields);
-			
+
 			$type = $typearr[$i];
 			switch($type) {
 			case 'D':
@@ -89,7 +89,7 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 					if (empty($v)) {
 					$s .= "\n";
 					} else {
-						$s .= "	\n";				
+						$s .= "	\n";
 					}
 					break;
 				}
@@ -97,7 +97,7 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 				if (empty($v)) $s .= "\n";
 				else $s .= "	\n";
 			break;
-			
+
 			case 'N':
 				if (abs(abs($v) - round($v,0)) < 0.00000001)
 					$v = round($v);
@@ -107,7 +107,7 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 				$vv = stripslashes((trim($v)));
 				if (strlen($vv) == 0) $vv .= ' ';
 				$s .= "	\n";
-			   	
+
 			break;
 			/*
 			case 'B':
@@ -134,11 +134,11 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 				$v = trim($v);
 				if (strlen($v) == 0) $v = ' ';
 				$s .= "	\n";
-			  
+
 			}
 		} // for
 		$s .= "\n\n";
-			  
+
 		$rows += 1;
 		if ($rows >= $gSQLMaxRows) {
 			$rows = "
    Truncated at $gSQLMaxRows
    ";
@@ -146,10 +146,10 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 		} // switch
 
 		$rs->MoveNext();
-	
+
 	// additional EOF check to prevent a widow header
 		if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
-	
+
 		//if (connection_aborted()) break;// not needed as PHP aborts script, unlike ASP
 			if ($echo) print $s . "
       ".$rs->UserDate($v,"D d, M Y") ."".$rs->UserDate($v,"D d, M Y") ."   ".$rs->UserTimeStamp($v,"D d, M Y, H:i:s") ."".$vv ."". str_replace("\n",'
    ',stripslashes($v)) ."
    \n\n";
 			else $html .= $s ."\n\n";
@@ -159,17 +159,17 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
 
 	if ($echo) print $s."\n\n";
 	else $html .= $s."\n\n";
-	
+
 	if ($docnt) if ($echo) print "
    ".$rows." Rows
    ";
-	
+
 	return ($echo) ? $rows : $html;
  }
- 
+
 // pass in 2 dimensional array
 function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
 {
 	if (!$ztabhtml) $ztabhtml = 'BORDER=1';
-	
+
 	$s = "";//';print_r($arr);
 
 	if ($zheaderarray) {
@@ -179,11 +179,11 @@ function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
 		}
 		$s .= "\n";
 	}
-	
+
 	for ($i=0; $i
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/xmlschema.dtd b/lib/WikiDB/adodb/xmlschema.dtd
index 4a055da4e..2d0b579d3 100644
--- a/lib/WikiDB/adodb/xmlschema.dtd
+++ b/lib/WikiDB/adodb/xmlschema.dtd
@@ -3,7 +3,7 @@
 
 
 
-
 
 
diff --git a/lib/WikiDB/adodb/xmlschema03.dtd b/lib/WikiDB/adodb/xmlschema03.dtd
index a7c8864ff..97850bc7f 100644
--- a/lib/WikiDB/adodb/xmlschema03.dtd
+++ b/lib/WikiDB/adodb/xmlschema03.dtd
@@ -1,43 +1,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ]>
\ No newline at end of file
diff --git a/lib/WikiDB/adodb/xsl/convert-0.1-0.2.xsl b/lib/WikiDB/adodb/xsl/convert-0.1-0.2.xsl
index 6cd9e5bf1..5b2e3cecd 100644
--- a/lib/WikiDB/adodb/xsl/convert-0.1-0.2.xsl
+++ b/lib/WikiDB/adodb/xsl/convert-0.1-0.2.xsl
@@ -3,38 +3,38 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 >
 	
-	
+
 	
 	
 		
 ADODB XMLSchema
 http://adodb-xmlschema.sourceforge.net
 
-		
+
 		
 			0.2
-			
+
 			
 		
 	
-	
+
 	
 	
 		
-		
+
 		
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
-			
+
 			
 				
 					
@@ -43,23 +43,23 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 					
@@ -71,7 +71,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -80,7 +80,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -104,49 +104,49 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
-			
+
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 					
@@ -157,45 +157,45 @@ http://adodb-xmlschema.sourceforge.net
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
diff --git a/lib/WikiDB/adodb/xsl/convert-0.1-0.3.xsl b/lib/WikiDB/adodb/xsl/convert-0.1-0.3.xsl
index 381aa4fe7..3202dce43 100644
--- a/lib/WikiDB/adodb/xsl/convert-0.1-0.3.xsl
+++ b/lib/WikiDB/adodb/xsl/convert-0.1-0.3.xsl
@@ -3,38 +3,38 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 >
 	
-	
+
 	
 	
 		
 ADODB XMLSchema
 http://adodb-xmlschema.sourceforge.net
 
-		
+
 		
 			0.3
-			
+
 			
 		
 	
-	
+
 	
 	
 		
-		
+
 		
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
-			
+
 			
 				
 					
@@ -43,23 +43,23 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 				
@@ -75,7 +75,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -87,7 +87,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -96,7 +96,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -120,49 +120,49 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
-			
+
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 					
@@ -173,45 +173,45 @@ http://adodb-xmlschema.sourceforge.net
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
diff --git a/lib/WikiDB/adodb/xsl/convert-0.2-0.1.xsl b/lib/WikiDB/adodb/xsl/convert-0.2-0.1.xsl
index 61841b483..6398e3e55 100644
--- a/lib/WikiDB/adodb/xsl/convert-0.2-0.1.xsl
+++ b/lib/WikiDB/adodb/xsl/convert-0.2-0.1.xsl
@@ -3,38 +3,38 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 >
 	
-	
+
 	
 	
 		
 ADODB XMLSchema
 http://adodb-xmlschema.sourceforge.net
 
-		
+
 		
 			0.1
-			
+
 			
 		
 	
-	
+
 	
 	
 		
-		
+
 		
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
-			
+
 			
 				
 					
@@ -43,24 +43,24 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
-			
+
 		
-		
+
 		
 	
-	
+
 	
 	
 		
 			
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 					
@@ -72,7 +72,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -81,7 +81,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -105,50 +105,50 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
 			
-			
+
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 					
@@ -159,45 +159,45 @@ http://adodb-xmlschema.sourceforge.net
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
diff --git a/lib/WikiDB/adodb/xsl/convert-0.2-0.3.xsl b/lib/WikiDB/adodb/xsl/convert-0.2-0.3.xsl
index 26bd9e9aa..9e1f2ae34 100644
--- a/lib/WikiDB/adodb/xsl/convert-0.2-0.3.xsl
+++ b/lib/WikiDB/adodb/xsl/convert-0.2-0.3.xsl
@@ -3,36 +3,36 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 >
 	
-	
+
 	
 	
 		
 ADODB XMLSchema
 http://adodb-xmlschema.sourceforge.net
 
-		
+
 		
 			0.3
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
-			
+
 			
 				
 					
@@ -41,27 +41,27 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
-			
+
 			
-			
+
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 					
@@ -84,9 +84,9 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
-			
+
 			
 				
 					
@@ -98,7 +98,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -107,7 +107,7 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 					
@@ -131,66 +131,66 @@ http://adodb-xmlschema.sourceforge.net
 					
 				
 			
-			
+
 			
 				
 			
-			
+
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
-			
+
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 					
@@ -201,80 +201,80 @@ http://adodb-xmlschema.sourceforge.net
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
 				
 			
-			
+
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
-			
+
 			
 		
 	
-	
+
 	
 	
 		
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
 			
-			
+
 			
 		
 	
diff --git a/lib/WikiDB/adodb/xsl/remove-0.2.xsl b/lib/WikiDB/adodb/xsl/remove-0.2.xsl
index 9b10a528c..c82c3ad88 100644
--- a/lib/WikiDB/adodb/xsl/remove-0.2.xsl
+++ b/lib/WikiDB/adodb/xsl/remove-0.2.xsl
@@ -3,48 +3,48 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 >
 	
-	
+
 	
 	
 		
 ADODB XMLSchema
 http://adodb-xmlschema.sourceforge.net
 
-		
+
 		
 Uninstallation Schema
 
-		
+
 		
 			0.2
-			
+
 			
 				
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
-				
+
 				
 					
 				
-				
+
 				
 					
 				
-				
+
 				
-				
+
 				
 			
 		
 	
-	
+
 	
 	
 		
diff --git a/lib/WikiDB/adodb/xsl/remove-0.3.xsl b/lib/WikiDB/adodb/xsl/remove-0.3.xsl
index 768e092bf..4b1cd02ee 100644
--- a/lib/WikiDB/adodb/xsl/remove-0.3.xsl
+++ b/lib/WikiDB/adodb/xsl/remove-0.3.xsl
@@ -3,48 +3,48 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 >
 	
-	
+
 	
 	
 		
 ADODB XMLSchema
 http://adodb-xmlschema.sourceforge.net
 
-		
+
 		
 Uninstallation Schema
 
-		
+
 		
 			0.3
-			
+
 			
 				
 			
 		
 	
-	
+
 	
 	
 		
 			
 				
-				
+
 				
 					
 				
-				
+
 				
 					
 				
-				
+
 				
-				
+
 				
 			
 		
 	
-	
+
 	
 	
 		
-- 
2.45.0