diff --git a/composer.json b/composer.json index dcaf5ad723..ac72f4a84b 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "guzzlehttp/psr7": "^1.6", "http-interop/http-factory-guzzle": "^1.0", "laminas/laminas-diactoros": "^2.2", - "adodb/adodb-php": "^5.20", + "adodb/adodb-php": "^5.21", "phpmailer/phpmailer": "^6.1", "smarty/smarty": "^3.1", "psr/log": "^1.1", diff --git a/composer.lock b/composer.lock index 8315c3a37b..422d8dc178 100644 --- a/composer.lock +++ b/composer.lock @@ -1,27 +1,30 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c9fd087f3f3bc2f9f6472e7fcbd89e8c", + "content-hash": "69d97f3bc55fd23ae1aa1adbbda47d13", "packages": [ { "name": "adodb/adodb-php", - "version": "v5.20.17", + "version": "v5.21.3", "source": { "type": "git", "url": "https://github.com/ADOdb/ADOdb.git", - "reference": "c47e5c272e98a06e1c92248b5d9d1ae0afe71c97" + "reference": "c5415722049f36c446a4034d15f1d17943f11458" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/c47e5c272e98a06e1c92248b5d9d1ae0afe71c97", - "reference": "c47e5c272e98a06e1c92248b5d9d1ae0afe71c97", + "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/c5415722049f36c446a4034d15f1d17943f11458", + "reference": "c5415722049f36c446a4034d15f1d17943f11458", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^5.5.9 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" }, "type": "library", "autoload": { @@ -50,7 +53,7 @@ } ], "description": "ADOdb is a PHP database abstraction layer library", - "homepage": "http://adodb.org/", + "homepage": "https://adodb.org/", "keywords": [ "abstraction", "database", @@ -58,7 +61,11 @@ "library", "php" ], - "time": "2020-03-31T17:32:58+00:00" + "support": { + "issues": "https://github.com/ADOdb/ADOdb/issues", + "source": "https://github.com/ADOdb/ADOdb" + }, + "time": "2021-10-31T14:56:48+00:00" }, { "name": "fig/http-message-util", @@ -1961,5 +1968,6 @@ "platform-dev": [], "platform-overrides": { "php": "7.4.2" - } + }, + "plugin-api-version": "2.1.0" } diff --git a/composer.phar b/composer.phar new file mode 100644 index 0000000000..71993641d8 Binary files /dev/null and b/composer.phar differ diff --git a/vendor/adodb/adodb-php/.gitattributes b/vendor/adodb/adodb-php/.gitattributes deleted file mode 100644 index 2cb098d876..0000000000 --- a/vendor/adodb/adodb-php/.gitattributes +++ /dev/null @@ -1,17 +0,0 @@ -# Default behavior -* text=auto - -# Text files to be normalized to lf line endings -*.php text -*.htm* text -*.sql text -*.txt text -*.xml text -*.xsl text - -# Windows-only files -*.bat eol=crlf - -# Binary files -*.gif binary - diff --git a/vendor/adodb/adodb-php/.gitignore b/vendor/adodb/adodb-php/.gitignore deleted file mode 100644 index 0d777b27ee..0000000000 --- a/vendor/adodb/adodb-php/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# IDE/Editor temporary files -*~ -*.swp -*.bak -*.tmp -.project -.settings/ -/nbproject/ -.idea/ - diff --git a/vendor/adodb/adodb-php/.mailmap b/vendor/adodb/adodb-php/.mailmap deleted file mode 100644 index 1f2f7e7f0e..0000000000 --- a/vendor/adodb/adodb-php/.mailmap +++ /dev/null @@ -1,4 +0,0 @@ -Andreas Fernandez -Mike Benoit MikeB -Mike Benoit mike.benoit - diff --git a/vendor/adodb/adodb-php/LICENSE.md b/vendor/adodb/adodb-php/LICENSE.md index 26956d3039..d00e2b1f2d 100644 --- a/vendor/adodb/adodb-php/LICENSE.md +++ b/vendor/adodb/adodb-php/LICENSE.md @@ -10,7 +10,7 @@ In plain English, you do not need to distribute your application in source code nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license. -For more information about ADOdb, visit http://adodb.org/ +For more information about ADOdb, visit https://adodb.org/ BSD 3-Clause License -------------------- diff --git a/vendor/adodb/adodb-php/README.md b/vendor/adodb/adodb-php/README.md index 273c24ce3e..e432b2fb0a 100644 --- a/vendor/adodb/adodb-php/README.md +++ b/vendor/adodb/adodb-php/README.md @@ -1,4 +1,4 @@ -ADOdb Library for PHP5 +ADOdb Library for PHP ====================== [![Join chat on Gitter](https://img.shields.io/gitter/room/form-data/form-data.svg)](https://gitter.im/adodb/adodb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) @@ -16,7 +16,7 @@ or, at your option, any later version. This means you can use it in proprietary products; see [License](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md) for details. -Home page: http://adodb.org/ +Home page: https://adodb.org/ Introduction @@ -27,8 +27,8 @@ 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, +The library currently supports MySQL, Firebird & Interbase, PostgreSQL, SQLite3, Oracle, +Microsoft SQL Server, Foxpro ODBC, Access ODBC, Informix, DB2, Sybase, Sybase SQL Anywhere, generic ODBC and Microsoft's ADO. We hope more people will contribute drivers to support other databases. @@ -48,12 +48,12 @@ You can debug using: debug = true; -$db->Connect($server, $user, $password, $database); -$rs = $db->Execute('select * from some_small_table'); +$db->connect($server, $user, $password, $database); +$rs = $db->execute('select * from some_small_table'); print "
";
-print_r($rs->GetRows());
+print_r($rs->getRows());
 print "
"; ``` @@ -61,14 +61,14 @@ print ""; Documentation and Examples ========================== -Refer to the [ADOdb website](http://adodb.org/) for library documentation and examples. The documentation can also be [downloaded for offline viewing](https://sourceforge.net/projects/adodb/files/Documentation/). +Refer to the [ADOdb website](https://adodb.org/) for library documentation and examples. The documentation can also be [downloaded for offline viewing](https://sourceforge.net/projects/adodb/files/Documentation/). -- [Main documentation](http://adodb.org/dokuwiki/doku.php?id=v5:userguide:userguide_index): Query, update and insert records using a portable API. -- [Data dictionary](http://adodb.org/dokuwiki/doku.php?id=v5:dictionary:dictionary_index) describes how to create database tables and indexes in a portable manner. -- [Database performance monitoring](http://adodb.org/dokuwiki/doku.php?id=v5:performance:performance_index) allows you to perform health checks, tune and monitor your database. -- [Database-backed sessions](http://adodb.org/dokuwiki/doku.php?id=v5:session:session_index). +- [Main documentation](https://adodb.org/dokuwiki/doku.php?id=v5:userguide:userguide_index): Query, update and insert records using a portable API. +- [Data dictionary](https://adodb.org/dokuwiki/doku.php?id=v5:dictionary:dictionary_index) describes how to create database tables and indexes in a portable manner. +- [Database performance monitoring](https://adodb.org/dokuwiki/doku.php?id=v5:performance:performance_index) allows you to perform health checks, tune and monitor your database. +- [Database-backed sessions](https://adodb.org/dokuwiki/doku.php?id=v5:session:session_index). -There is also a [tutorial](http://adodb.org/dokuwiki/doku.php?id=v5:userguide:mysql_tutorial) that contrasts ADOdb code with PHP native MySQL code. +There is also a [tutorial](https://adodb.org/dokuwiki/doku.php?id=v5:userguide:mysql_tutorial) that contrasts ADOdb code with PHP native MySQL code. Files @@ -96,7 +96,6 @@ 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 diff --git a/vendor/adodb/adodb-php/adodb-active-record.inc.php b/vendor/adodb/adodb-php/adodb-active-record.inc.php index 9f1157096e..8f3b00538f 100644 --- a/vendor/adodb/adodb-php/adodb-active-record.inc.php +++ b/vendor/adodb/adodb-php/adodb-active-record.inc.php @@ -1,23 +1,25 @@ $d) { - if (PHP_VERSION >= 5) { - if ($d->db === $db) { - return $k; - } - } else { - if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) { - return $k; - } - } + foreach($_ADODB_ACTIVE_DBS as $k => $d) { + if($d->db === $db) { + return $k; } + } - $obj = new ADODB_Active_DB(); - $obj->db = $db; - $obj->tables = array(); + $obj = new ADODB_Active_DB(); + $obj->db = $db; + $obj->tables = array(); - if ($index == false) { - $index = sizeof($_ADODB_ACTIVE_DBS); - } + if ($index == false) { + $index = sizeof($_ADODB_ACTIVE_DBS); + } - $_ADODB_ACTIVE_DBS[$index] = $obj; + $_ADODB_ACTIVE_DBS[$index] = $obj; - return sizeof($_ADODB_ACTIVE_DBS)-1; + return sizeof($_ADODB_ACTIVE_DBS)-1; } class ADODB_Active_Record { static $_changeNames = true; // dynamically pluralize table names - static $_quoteNames = false; + + /** @var bool|string Allows override of global $ADODB_QUOTE_FIELDNAMES */ + public $_quoteNames; static $_foreignSuffix = '_id'; // var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat] @@ -120,7 +118,12 @@ public function __set($name, $value) // php5 constructor function __construct($table = false, $pkeyarr=false, $db=false) { - global $_ADODB_ACTIVE_DBS; + global $_ADODB_ACTIVE_DBS, $ADODB_QUOTE_FIELDNAMES; + + // Set the local override for field quoting, only if not defined yet + if (!isset($this->_quoteNames)) { + $this->_quoteNames = $ADODB_QUOTE_FIELDNAMES; + } if ($db == false && is_object($pkeyarr)) { $db = $pkeyarr; @@ -499,7 +502,6 @@ function UpdateActiveTable($pkeys=false,$forceUpdate=false) break; default: foreach($cols as $name => $fldobj) { - $name = ($fldobj->name); if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) { $this->$name = $fldobj->default_value; @@ -522,7 +524,7 @@ function UpdateActiveTable($pkeys=false,$forceUpdate=false) $activetab->_created = time(); $s = serialize($activetab); if (!function_exists('adodb_write_file')) { - include(ADODB_DIR.'/adodb-csvlib.inc.php'); + include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); } adodb_write_file($fname,$s); } @@ -700,9 +702,14 @@ function LastInsertID(&$db,$fieldname) $val = false; } - if (is_null($val) || $val === false) { + if (is_null($val) || $val === false) + { + $SQL = sprintf("SELECT MAX(%s) FROM %s", + $this->nameQuoter($db,$fieldname), + $this->nameQuoter($db,$this->_table) + ); // this might not work reliably in multi-user environment - return $db->GetOne("select max(".$fieldname.") from ".$this->_table); + return $db->GetOne($SQL); } return $val; } @@ -749,10 +756,11 @@ function GenWhere(&$db, &$table) foreach($keys as $k) { $f = $table->flds[$k]; if ($f) { - $parr[] = $k.' = '.$this->doquote($db,$this->$k,$db->MetaType($f->type)); + $columnName = $this->nameQuoter($db,$k); + $parr[] = $columnName.' = '.$this->doquote($db,$this->$k,$db->MetaType($f->type)); } } - return implode(' and ', $parr); + return implode(' AND ', $parr); } @@ -774,7 +782,7 @@ function _QName($n,$db=false) function Load($where=null,$bindarr=false, $lock = false) { - global $ADODB_FETCH_MODE; + global $ADODB_FETCH_MODE; $db = $this->DB(); if (!$db) { @@ -788,7 +796,9 @@ function Load($where=null,$bindarr=false, $lock = false) $savem = $db->SetFetchMode(false); } - $qry = "select * from ".$this->_table; + $qry = sprintf("SELECT * FROM %s", + $this->nameQuoter($db,$this->_table) + ); if($where) { $qry .= ' WHERE '.$where; @@ -813,7 +823,7 @@ function LoadLocked($where=null, $bindarr=false) } # useful for multiple record inserts - # see http://phplens.com/lens/lensforum/msgs.php?id=17795 + # see PHPLens Issue No: 17795 function Reset() { $this->_where=null; @@ -862,7 +872,7 @@ function Insert() $val = $this->$name; if(!is_array($val) || !is_null($val) || !array_key_exists($name, $table->keys)) { $valarr[] = $val; - $names[] = $this->_QName($name,$db); + $names[] = $this->nameQuoter($db,$name); $valstr[] = $db->Param($cnt); $cnt += 1; } @@ -871,12 +881,18 @@ function Insert() if (empty($names)){ foreach($table->flds as $name=>$fld) { $valarr[] = null; - $names[] = $name; + $names[] = $this->nameQuoter($db,$name); $valstr[] = $db->Param($cnt); $cnt += 1; } } - $sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')'; + + $tableName = $this->nameQuoter($db,$this->_table); + $sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', + $tableName, + implode(',',$names), + implode(',',$valstr) + ); $ok = $db->Execute($sql,$valarr); if ($ok) { @@ -907,7 +923,14 @@ function Delete() $table = $this->TableInfo(); $where = $this->GenWhere($db,$table); - $sql = 'DELETE FROM '.$this->_table.' WHERE '.$where; + + $tableName = $this->nameQuoter($db,$this->_table); + + $sql = sprintf('DELETE FROM %s WHERE %s', + $tableName, + $where + ); + $ok = $db->Execute($sql); return $ok ? true : false; @@ -979,7 +1002,19 @@ function Replace() break; } - $ok = $db->Replace($this->_table,$arr,$pkey); + $newArr = array(); + foreach($arr as $k=>$v) + $newArr[$this->nameQuoter($db,$k)] = $v; + $arr = $newArr; + + $newPkey = array(); + foreach($pkey as $k=>$v) + $newPkey[$k] = $this->nameQuoter($db,$v); + $pkey = $newPkey; + + $tableName = $this->nameQuoter($db,$this->_table); + + $ok = $db->Replace($tableName,$arr,$pkey); if ($ok) { $this->_saved = true; // 1= update 2=insert if ($ok == 2) { @@ -1051,7 +1086,7 @@ function Update() } $valarr[] = $val; - $pairs[] = $this->_QName($name,$db).'='.$db->Param($cnt); + $pairs[] = $this->nameQuoter($db,$name).'='.$db->Param($cnt); $cnt += 1; } @@ -1060,7 +1095,13 @@ function Update() return -1; } - $sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where; + $tableName = $this->nameQuoter($db,$this->_table); + + $sql = sprintf('UPDATE %s SET %s WHERE %s', + $tableName, + implode(',',$pairs), + $where); + $ok = $db->Execute($sql,$valarr); if ($ok) { $this->_original = $neworig; @@ -1078,6 +1119,31 @@ function GetAttributeNames() return array_keys($table->flds); } + /** + * Quotes the table, column and field names. + * + * This honours the internal {@see $_quoteNames} property, which overrides + * the global $ADODB_QUOTE_FIELDNAMES directive. + * + * @param ADOConnection $db The database connection + * @param string $name The table or column name to quote + * + * @return string The quoted name + */ + private function nameQuoter($db, $name) + { + global $ADODB_QUOTE_FIELDNAMES; + + $save = $ADODB_QUOTE_FIELDNAMES; + $ADODB_QUOTE_FIELDNAMES = $this->_quoteNames; + + $string = _adodb_quote_fieldname($db, $name); + + $ADODB_QUOTE_FIELDNAMES = $save; + + return $string; + } + }; function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr, $primkeyArr, @@ -1087,6 +1153,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr $save = $db->SetFetchMode(ADODB_FETCH_NUM); + $qry = "select * from ".$table; if (!empty($whereOrderBy)) { @@ -1125,7 +1192,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr // arrRef will be the structure that knows about our objects. // It is an associative array. // We will, however, return arr, preserving regular 0.. order so that - // obj[0] can be used by app developpers. + // obj[0] can be used by app developers. $arrRef = array(); $bTos = array(); // Will store belongTo's indices if any foreach($rows as $row) { diff --git a/vendor/adodb/adodb-php/adodb-active-recordx.inc.php b/vendor/adodb/adodb-php/adodb-active-recordx.inc.php index 9c946f4012..5de5b13096 100644 --- a/vendor/adodb/adodb-php/adodb-active-recordx.inc.php +++ b/vendor/adodb/adodb-php/adodb-active-recordx.inc.php @@ -1,27 +1,27 @@ $d) { - if (PHP_VERSION >= 5) { - if ($d->db === $db) { - return $k; - } - } else { - if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) { - return $k; - } - } + foreach($_ADODB_ACTIVE_DBS as $k => $d) { + if ($d->db === $db) { + return $k; } + } - $obj = new ADODB_Active_DB(); - $obj->db = $db; - $obj->tables = array(); + $obj = new ADODB_Active_DB(); + $obj->db = $db; + $obj->tables = array(); - $_ADODB_ACTIVE_DBS[] = $obj; + $_ADODB_ACTIVE_DBS[] = $obj; - return sizeof($_ADODB_ACTIVE_DBS)-1; + return sizeof($_ADODB_ACTIVE_DBS)-1; } @@ -551,7 +545,7 @@ function UpdateActiveTable($pkeys=false,$forceUpdate=false) $activetab->_created = time(); $s = serialize($activetab); if (!function_exists('adodb_write_file')) { - include(ADODB_DIR.'/adodb-csvlib.inc.php'); + include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); } adodb_write_file($fname,$s); } @@ -1298,7 +1292,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind if (!isset($_ADODB_ACTIVE_DBS)) { - include(ADODB_DIR.'/adodb-active-record.inc.php'); + include_once(ADODB_DIR.'/adodb-active-record.inc.php'); } if (!class_exists($class)) { $db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); @@ -1309,7 +1303,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind // arrRef will be the structure that knows about our objects. // It is an associative array. // We will, however, return arr, preserving regular 0.. order so that - // obj[0] can be used by app developpers. + // obj[0] can be used by app developers. $arrRef = array(); $bTos = array(); // Will store belongTo's indices if any foreach($rows as $row) { diff --git a/vendor/adodb/adodb-php/adodb-csvlib.inc.php b/vendor/adodb/adodb-php/adodb-csvlib.inc.php index 46a069085d..c81254bfc0 100644 --- a/vendor/adodb/adodb-php/adodb-csvlib.inc.php +++ b/vendor/adodb/adodb-php/adodb-csvlib.inc.php @@ -1,4 +1,26 @@ $str

"; -$a= Lens_ParseArgs($str); +$a= lens_ParseArgs($str); print "
";
 print_r($a);
 print "
"; @@ -53,7 +56,7 @@ function ctype_alnum($text) { @param tokenchars Include the following characters in tokens apart from A-Z and 0-9 @returns 2 dimensional array containing parsed tokens. */ -function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') +function lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') { $pos = 0; $intoken = false; @@ -164,6 +167,7 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') class ADODB_DataDict { + /** @var ADOConnection */ var $connection; var $debug = false; var $dropTable = 'DROP TABLE %s'; @@ -179,45 +183,60 @@ class ADODB_DataDict { var $serverInfo = array(); var $autoIncrement = false; var $dataProvider; - var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql + var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changeTableSQL var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob - /// in other words, we use a text area for editting. + /// in other words, we use a text area for editing. + /** @var string Uppercase driver name */ + var $upperName; + + /* + * Indicates whether a BLOB/CLOB field will allow a NOT NULL setting + * The type is whatever is matched to an X or X2 or B type. We must + * explicitly set the value in the driver to switch the behaviour on + */ + public $blobAllowsNotNull; + /* + * Indicates whether a BLOB/CLOB field will allow a DEFAULT set + * The type is whatever is matched to an X or X2 or B type. We must + * explicitly set the value in the driver to switch the behaviour on + */ + public $blobAllowsDefaultValue; - function GetCommentSQL($table,$col) + function getCommentSQL($table,$col) { return false; } - function SetCommentSQL($table,$col,$cmt) + function setCommentSQL($table,$col,$cmt) { return false; } - function MetaTables() + function metaTables() { - if (!$this->connection->IsConnected()) return array(); - return $this->connection->MetaTables(); + if (!$this->connection->isConnected()) return array(); + return $this->connection->metaTables(); } - function MetaColumns($tab, $upper=true, $schema=false) + function metaColumns($tab, $upper=true, $schema=false) { - if (!$this->connection->IsConnected()) return array(); - return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema); + if (!$this->connection->isConnected()) return array(); + return $this->connection->metaColumns($this->tableName($tab), $upper, $schema); } - function MetaPrimaryKeys($tab,$owner=false,$intkey=false) + function metaPrimaryKeys($tab,$owner=false,$intkey=false) { - if (!$this->connection->IsConnected()) return array(); - return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey); + if (!$this->connection->isConnected()) return array(); + return $this->connection->metaPrimaryKeys($this->tableName($tab), $owner, $intkey); } - function MetaIndexes($table, $primary = false, $owner = false) + function metaIndexes($table, $primary = false, $owner = false) { - if (!$this->connection->IsConnected()) return array(); - return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner); + if (!$this->connection->isConnected()) return array(); + return $this->connection->metaIndexes($this->tableName($table), $primary, $owner); } - function MetaType($t,$len=-1,$fieldobj=false) + function metaType($t,$len=-1,$fieldobj=false) { static $typeMap = array( 'VARCHAR' => 'C', @@ -323,15 +342,15 @@ function MetaType($t,$len=-1,$fieldobj=false) "SQLBOOL" => 'L' ); - if (!$this->connection->IsConnected()) { + if (!$this->connection->isConnected()) { $t = strtoupper($t); if (isset($typeMap[$t])) return $typeMap[$t]; - return 'N'; + return ADODB_DEFAULT_METATYPE; } - return $this->connection->MetaType($t,$len,$fieldobj); + return $this->connection->metaType($t,$len,$fieldobj); } - function NameQuote($name = NULL,$allowBrackets=false) + function nameQuote($name = NULL,$allowBrackets=false) { if (!is_string($name)) { return FALSE; @@ -360,16 +379,16 @@ function NameQuote($name = NULL,$allowBrackets=false) return $name; } - function TableName($name) + function tableName($name) { if ( $this->schema ) { - return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name); + return $this->nameQuote($this->schema) .'.'. $this->nameQuote($name); } - return $this->NameQuote($name); + return $this->nameQuote($name); } - // Executes the sql array returned by GetTableSQL and GetIndexSQL - function ExecuteSQLArray($sql, $continueOnError = true) + // Executes the sql array returned by getTableSQL and getIndexSQL + function executeSQLArray($sql, $continueOnError = true) { $rez = 2; $conn = $this->connection; @@ -377,10 +396,10 @@ function ExecuteSQLArray($sql, $continueOnError = true) foreach($sql as $line) { if ($this->debug) $conn->debug = true; - $ok = $conn->Execute($line); + $ok = $conn->execute($line); $conn->debug = $saved; if (!$ok) { - if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); + if ($this->debug) ADOConnection::outp($conn->errorMsg()); if (!$continueOnError) return 0; $rez = 1; } @@ -406,17 +425,17 @@ function ExecuteSQLArray($sql, $continueOnError = true) N: Numeric or decimal number */ - function ActualType($meta) + function actualType($meta) { return $meta; } - function CreateDatabase($dbname,$options=false) + function createDatabase($dbname,$options=false) { - $options = $this->_Options($options); + $options = $this->_options($options); $sql = array(); - $s = 'CREATE DATABASE ' . $this->NameQuote($dbname); + $s = 'CREATE DATABASE ' . $this->nameQuote($dbname); if (isset($options[$this->upperName])) $s .= ' '.$options[$this->upperName]; @@ -427,7 +446,7 @@ function CreateDatabase($dbname,$options=false) /* Generates the SQL to create index. Returns an array of sql strings. */ - function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false) + function createIndexSQL($idxname, $tabname, $flds, $idxoptions = false) { if (!is_array($flds)) { $flds = explode(',',$flds); @@ -435,27 +454,27 @@ function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false) 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); + $flds[$key] = $this->nameQuote($fld,$allowBrackets=true); } - return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions)); + return $this->_indexSQL($this->nameQuote($idxname), $this->tableName($tabname), $flds, $this->_options($idxoptions)); } - function DropIndexSQL ($idxname, $tabname = NULL) + function dropIndexSQL ($idxname, $tabname = NULL) { - return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname))); + return array(sprintf($this->dropIndex, $this->nameQuote($idxname), $this->tableName($tabname))); } - function SetSchema($schema) + function setSchema($schema) { $this->schema = $schema; } - function AddColumnSQL($tabname, $flds) + function addColumnSQL($tabname, $flds) { - $tabname = $this->TableName ($tabname); + $tabname = $this->tableName($tabname); $sql = array(); - list($lines,$pkey,$idxs) = $this->_GenFields($flds); + list($lines,$pkey,$idxs) = $this->_genFields($flds); // genfields can return FALSE at times if ($lines == null) $lines = array(); $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' '; @@ -464,7 +483,7 @@ function AddColumnSQL($tabname, $flds) } if (is_array($idxs)) { foreach($idxs as $idx => $idxdef) { - $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql_idxs = $this->createIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); $sql = array_merge($sql, $sql_idxs); } } @@ -474,19 +493,19 @@ function AddColumnSQL($tabname, $flds) /** * Change the definition of one column * - * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table, - * to allow, recreating the table and copying the content over to the new table + * As some DBMs can't do that on their own, you need to supply the complete definition of the new table, + * to allow recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' - * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' + * @param string $tableflds='' complete definition of the new table, eg. for postgres, default '' + * @param array/string $tableoptions='' options for the new table see createTableSQL, default '' * @return array with SQL strings */ - function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') + function alterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') { - $tabname = $this->TableName ($tabname); + $tabname = $this->tableName($tabname); $sql = array(); - list($lines,$pkey,$idxs) = $this->_GenFields($flds); + list($lines,$pkey,$idxs) = $this->_genFields($flds); // genfields can return FALSE at times if ($lines == null) $lines = array(); $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; @@ -495,7 +514,7 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') } if (is_array($idxs)) { foreach($idxs as $idx => $idxdef) { - $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql_idxs = $this->createIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); $sql = array_merge($sql, $sql_idxs); } @@ -506,71 +525,71 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') /** * Rename one column * - * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql) + * Some DBMs can only do this together with changeing the type of the column (even if that stays the same, eg. mysql) * @param string $tabname table-name * @param string $oldcolumn column-name to be renamed * @param string $newcolumn new column-name - * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default='' + * @param string $flds='' complete column-definition-string like for addColumnSQL, only used by mysql atm., default='' * @return array with SQL strings */ - function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='') + function renameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='') { - $tabname = $this->TableName ($tabname); + $tabname = $this->tableName($tabname); if ($flds) { - list($lines,$pkey,$idxs) = $this->_GenFields($flds); + list($lines,$pkey,$idxs) = $this->_genFields($flds); // genfields can return FALSE at times if ($lines == null) $lines = array(); $first = current($lines); list(,$column_def) = preg_split("/[\t ]+/",$first,2); } - return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def)); + return array(sprintf($this->renameColumn,$tabname,$this->nameQuote($oldcolumn),$this->nameQuote($newcolumn),$column_def)); } /** * Drop one column * - * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table, + * Some DBM's can't do that on their own, you need to supply the complete definition of the new table, * to allow, recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' - * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' + * @param string $tableflds='' complete definition of the new table, eg. for postgres, default '' + * @param array/string $tableoptions='' options for the new table see createTableSQL, default '' * @return array with SQL strings */ - function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') + function dropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') { - $tabname = $this->TableName ($tabname); + $tabname = $this->tableName($tabname); if (!is_array($flds)) $flds = explode(',',$flds); $sql = array(); $alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' '; foreach($flds as $v) { - $sql[] = $alter . $this->NameQuote($v); + $sql[] = $alter . $this->nameQuote($v); } return $sql; } - function DropTableSQL($tabname) + function dropTableSQL($tabname) { - return array (sprintf($this->dropTable, $this->TableName($tabname))); + return array (sprintf($this->dropTable, $this->tableName($tabname))); } - function RenameTableSQL($tabname,$newname) + function renameTableSQL($tabname,$newname) { - return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname))); + return array (sprintf($this->renameTable, $this->tableName($tabname),$this->tableName($newname))); } /** Generate the SQL to create table. Returns an array of sql strings. */ - function CreateTableSQL($tabname, $flds, $tableoptions=array()) + function createTableSQL($tabname, $flds, $tableoptions=array()) { - list($lines,$pkey,$idxs) = $this->_GenFields($flds, true); + 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); + $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 @@ -579,12 +598,12 @@ function CreateTableSQL($tabname, $flds, $tableoptions=array()) // creating sql that double-drops the sequence if ($this->autoIncrement && isset($taboptions['REPLACE'])) unset($taboptions['REPLACE']); - $tsql = $this->_Triggers($tabname,$taboptions); + $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']); + $sql_idxs = $this->createIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); $sql = array_merge($sql, $sql_idxs); } } @@ -594,13 +613,13 @@ function CreateTableSQL($tabname, $flds, $tableoptions=array()) - function _GenFields($flds,$widespacing=false) + function _genFields($flds,$widespacing=false) { if (is_string($flds)) { $padding = ' '; $txt = $flds.$padding; $flds = array(); - $flds0 = Lens_ParseArgs($txt,','); + $flds0 = lens_ParseArgs($txt,','); $hasparam = false; foreach($flds0 as $f0) { $f1 = array(); @@ -643,8 +662,8 @@ function _GenFields($flds,$widespacing=false) $pkey = array(); $idxs = array(); foreach($flds as $fld) { - $fld = _array_change_key_case($fld); - + if (is_array($fld)) + $fld = array_change_key_case($fld,CASE_UPPER); $fname = false; $fdefault = false; $fautoinc = false; @@ -660,18 +679,23 @@ function _GenFields($flds,$widespacing=false) $funsigned = false; $findex = ''; $funiqueindex = false; + $fOptions = array(); //----------------- // 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); + if ($attr == 2 && is_numeric($v)) + $attr = 'SIZE'; + elseif ($attr == 2 && strtoupper($ftype) == 'ENUM') + $attr = 'ENUM'; + 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 'TYPE': $ty = $v; $ftype = $this->actualType(strtoupper($v)); break; case 'SIZE': $dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,','); @@ -697,6 +721,8 @@ function _GenFields($flds,$widespacing=false) // let INDEX keyword create a 'very standard' index on column case 'INDEX': $findex = $v; break; case 'UNIQUE': $funiqueindex = true; break; + case 'ENUM': + $fOptions['ENUM'] = $v; break; } //switch } // foreach $fld @@ -708,7 +734,7 @@ function _GenFields($flds,$widespacing=false) } $fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname)); - $fname = $this->NameQuote($fname); + $fname = $this->nameQuote($fname); if (!strlen($ftype)) { if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'"); @@ -717,14 +743,24 @@ function _GenFields($flds,$widespacing=false) $ftype = strtoupper($ftype); } - $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec); + $ftype = $this->_getSize($ftype, $ty, $fsize, $fprec, $fOptions); - if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls + if (($ty == 'X' || $ty == 'X2' || $ty == 'XL' || $ty == 'B') && !$this->blobAllowsNotNull) + /* + * some blob types do not accept nulls, so we override the + * previously defined value + */ + $fnotnull = false; - if ($fprimary) $pkey[] = $fname; + if ($fprimary) + $pkey[] = $fname; - // some databases do not allow blobs to have defaults - if ($ty == 'X') $fdefault = false; + if (($ty == 'X' || $ty == 'X2' || $ty == 'XL' || $ty == 'B') && !$this->blobAllowsDefaultValue) + /* + * some databases do not allow blobs to have defaults, so we + * override the previously defined value + */ + $fdefault = false; // build list of indexes if ($findex != '') { @@ -769,11 +805,11 @@ function _GenFields($flds,$widespacing=false) // convert default date into database-aware code if ($ty == 'T') { - $fdefault = $this->connection->DBTimeStamp($fdefault); + $fdefault = $this->connection->dbTimeStamp($fdefault); } else { - $fdefault = $this->connection->DBDate($fdefault); + $fdefault = $this->connection->dbDate($fdefault); } } else @@ -783,7 +819,7 @@ function _GenFields($flds,$widespacing=false) $fdefault = $this->connection->qstr($fdefault); } } - $suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); + $suffix = $this->_createSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); // add index creation if ($widespacing) $fname = str_pad($fname,24); @@ -806,19 +842,38 @@ function _GenFields($flds,$widespacing=false) $ftype is the actual type $ty is the type defined originally in the DDL */ - function _GetSize($ftype, $ty, $fsize, $fprec) + function _getSize($ftype, $ty, $fsize, $fprec, $options=false) { if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) { $ftype .= "(".$fsize; if (strlen($fprec)) $ftype .= ",".$fprec; $ftype .= ')'; } + + /* + * Handle additional options + */ + if (is_array($options)) + { + foreach($options as $type=>$value) + { + switch ($type) + { + case 'ENUM': + $ftype .= '(' . $value . ')'; + break; + + default: + } + } + } + return $ftype; } // return string must begin with space - function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned) + function _createSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned) { $suffix = ''; if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault"; @@ -827,7 +882,7 @@ function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint return $suffix; } - function _IndexSQL($idxname, $tabname, $flds, $idxoptions) + function _indexSQL($idxname, $tabname, $flds, $idxoptions) { $sql = array(); @@ -856,25 +911,26 @@ function _IndexSQL($idxname, $tabname, $flds, $idxoptions) return $sql; } - function _DropAutoIncrement($tabname) + function _dropAutoIncrement($tabname) { return false; } - function _TableSQL($tabname,$lines,$pkey,$tableoptions) + function _tableSQL($tabname,$lines,$pkey,$tableoptions) { $sql = array(); if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) { $sql[] = sprintf($this->dropTable,$tabname); if ($this->autoIncrement) { - $sInc = $this->_DropAutoIncrement($tabname); + $sInc = $this->_dropAutoIncrement($tabname); if ($sInc) $sql[] = $sInc; } if ( isset ($tableoptions['DROP']) ) { return $sql; } } + $s = "CREATE TABLE $tabname (\n"; $s .= implode(",\n", $lines); if (sizeof($pkey)>0) { @@ -898,7 +954,7 @@ function _TableSQL($tabname,$lines,$pkey,$tableoptions) GENERATE TRIGGERS IF NEEDED used when table has auto-incrementing field that is emulated using triggers */ - function _Triggers($tabname,$taboptions) + function _triggers($tabname,$taboptions) { return array(); } @@ -906,7 +962,7 @@ function _Triggers($tabname,$taboptions) /** Sanitize options, so that array elements with no keys are promoted to keys */ - function _Options($opts) + function _options($opts) { if (!is_array($opts)) return array(); $newopts = array(); @@ -938,25 +994,25 @@ function _getSizePrec($size) 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) + 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); + 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); + $cols = $this->metaColumns($tablename); $this->connection->raiseErrorFn = $save_handler; - if (isset($savem)) $this->connection->SetFetchMode($savem); + if (isset($savem)) $this->connection->setFetchMode($savem); $ADODB_FETCH_MODE = $save; if ( empty($cols)) { - return $this->CreateTableSQL($tablename, $flds, $tableoptions); + return $this->createTableSQL($tablename, $flds, $tableoptions); } if (is_array($flds)) { @@ -976,7 +1032,7 @@ function ChangeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFlds=f $c = $cols[$k]; $ml = $c->max_length; - $mt = $this->MetaType($c->type,$ml); + $mt = $this->metaType($c->type,$ml); if (isset($c->scale)) $sc = $c->scale; else $sc = 99; // always force change if scale not known. @@ -998,16 +1054,16 @@ function ChangeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFlds=f // already exists, alter table instead - list($lines,$pkey,$idxs) = $this->_GenFields($flds); + list($lines,$pkey,$idxs) = $this->_genFields($flds); // genfields can return FALSE at times if ($lines == null) $lines = array(); - $alter = 'ALTER TABLE ' . $this->TableName($tablename); + $alter = 'ALTER TABLE ' . $this->tableName($tablename); $sql = array(); foreach ( $lines as $id => $v ) { if ( isset($cols[$id]) && is_object($cols[$id]) ) { - $flds = Lens_ParseArgs($v,','); + $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 diff --git a/vendor/adodb/adodb-php/adodb-error.inc.php b/vendor/adodb/adodb-php/adodb-error.inc.php index 107ecae395..517cf9b013 100644 --- a/vendor/adodb/adodb-php/adodb-error.inc.php +++ b/vendor/adodb/adodb-php/adodb-error.inc.php @@ -1,19 +1,27 @@ DB_ERROR_CANNOT_CREATE, 1007 => DB_ERROR_ALREADY_EXISTS, 1008 => DB_ERROR_CANNOT_DROP, - 1045 => DB_ERROR_ACCESS_VIOLATION, + 1045 => DB_ERROR_ACCESS_VIOLATION, 1046 => DB_ERROR_NODBSELECTED, - 1049 => DB_ERROR_NOSUCHDB, + 1049 => DB_ERROR_NOSUCHDB, 1050 => DB_ERROR_ALREADY_EXISTS, 1051 => DB_ERROR_NOSUCHTABLE, 1054 => DB_ERROR_NOSUCHFIELD, @@ -257,8 +269,8 @@ function adodb_error_mysql() 1136 => DB_ERROR_VALUE_COUNT_ON_ROW, 1146 => DB_ERROR_NOSUCHTABLE, 1048 => DB_ERROR_CONSTRAINT, - 2002 => DB_ERROR_CONNECT_FAILED, - 2005 => DB_ERROR_CONNECT_FAILED + 2002 => DB_ERROR_CONNECT_FAILED, + 2005 => DB_ERROR_CONNECT_FAILED ); return $MAP; diff --git a/vendor/adodb/adodb-php/adodb-errorhandler.inc.php b/vendor/adodb/adodb-php/adodb-errorhandler.inc.php index 2906151df8..0cd3f218b4 100644 --- a/vendor/adodb/adodb-php/adodb-errorhandler.inc.php +++ b/vendor/adodb/adodb-php/adodb-errorhandler.inc.php @@ -1,18 +1,23 @@ 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. - */ diff --git a/vendor/adodb/adodb-php/adodb-lib.inc.php b/vendor/adodb/adodb-php/adodb-lib.inc.php index cd333ce227..ced5e12619 100644 --- a/vendor/adodb/adodb-php/adodb-lib.inc.php +++ b/vendor/adodb/adodb-php/adodb-lib.inc.php @@ -1,25 +1,40 @@ array_pop($tmp)]; + } if ($arr) if (strpos($arr[1], '(') !== false) { $at = strpos($sql, $arr[1]); @@ -39,6 +54,7 @@ function adodb_strip_order_by($sql) } else { $sql = str_replace($arr[1], '', $sql); } + return $sql; } @@ -118,98 +134,79 @@ function adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs) } } -// 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) -{ - if (is_array($an_array)) { - $new_array = array(); - foreach($an_array as $key=>$value) - $new_array[strtoupper($key)] = $value; - - return $new_array; - } - - return $an_array; -} function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc) { - if (count($fieldArray) == 0) return 0; - $first = true; - $uSet = ''; + // Add Quote around table name to support use of spaces / reserved keywords + $table=sprintf('%s%s%s', $zthis->nameQuote,$table,$zthis->nameQuote); - if (!is_array($keyCol)) { - $keyCol = array($keyCol); - } - foreach($fieldArray as $k => $v) { - if ($v === null) { - $v = 'NULL'; - $fieldArray[$k] = $v; - } else if ($autoQuote && /*!is_numeric($v) /*and strncmp($v,"'",1) !== 0 -- sql injection risk*/ strcasecmp($v,$zthis->null2null)!=0) { - $v = $zthis->qstr($v); - $fieldArray[$k] = $v; - } - if (in_array($k,$keyCol)) continue; // skip UPDATE if is key - - if ($first) { - $first = false; - $uSet = "$k=$v"; - } else - $uSet .= ",$k=$v"; - } + if (count($fieldArray) == 0) return 0; - $where = false; - foreach ($keyCol as $v) { - if (isset($fieldArray[$v])) { - if ($where) $where .= ' and '.$v.'='.$fieldArray[$v]; - else $where = $v.'='.$fieldArray[$v]; - } + if (!is_array($keyCol)) { + $keyCol = array($keyCol); + } + $uSet = ''; + foreach($fieldArray as $k => $v) { + if ($v === null) { + $v = 'NULL'; + $fieldArray[$k] = $v; + } else if ($autoQuote && /*!is_numeric($v) /*and strncmp($v,"'",1) !== 0 -- sql injection risk*/ strcasecmp($v,$zthis->null2null)!=0) { + $v = $zthis->qstr($v); + $fieldArray[$k] = $v; } + if (in_array($k,$keyCol)) continue; // skip UPDATE if is key - if ($uSet && $where) { - $update = "UPDATE $table SET $uSet WHERE $where"; + // Add Quote around column name to support use of spaces / reserved keywords + $uSet .= sprintf(',%s%s%s=%s',$zthis->nameQuote,$k,$zthis->nameQuote,$v); + } + $uSet = ltrim($uSet, ','); - $rs = $zthis->Execute($update); + // Add Quote around column name in where clause + $where = ''; + foreach ($keyCol as $v) { + if (isset($fieldArray[$v])) { + $where .= sprintf(' and %s%s%s=%s ', $zthis->nameQuote,$v,$zthis->nameQuote,$fieldArray[$v]); + } + } + if ($where) { + $where = substr($where, 5); + } + if ($uSet && $where) { + $update = "UPDATE $table SET $uSet WHERE $where"; + $rs = $zthis->Execute($update); - if ($rs) { - if ($zthis->poorAffectedRows) { - /* - The Select count(*) wipes out any errors that the update would have returned. - http://phplens.com/lens/lensforum/msgs.php?id=5696 - */ - if ($zthis->ErrorNo()<>0) return 0; + if ($rs) { + if ($zthis->poorAffectedRows) { + // The Select count(*) wipes out any errors that the update would have returned. + // PHPLens Issue No: 5696 + if ($zthis->ErrorNo()<>0) return 0; - # affected_rows == 0 if update field values identical to old values - # for mysql - which is silly. + // affected_rows == 0 if update field values identical to old values + // for mysql - which is silly. + $cnt = $zthis->GetOne("select count(*) from $table where $where"); + if ($cnt > 0) return 1; // record already exists + } else { + if (($zthis->Affected_Rows()>0)) return 1; + } + } else + return 0; + } - $cnt = $zthis->GetOne("select count(*) from $table where $where"); - if ($cnt > 0) return 1; // record already exists - } else { - if (($zthis->Affected_Rows()>0)) return 1; - } - } else - return 0; - } + $iCols = $iVals = ''; + foreach($fieldArray as $k => $v) { + if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col - // print "

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

'; - $first = true; - foreach($fieldArray as $k => $v) { - if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col + // Add Quote around Column Name + $iCols .= sprintf(',%s%s%s',$zthis->nameQuote,$k,$zthis->nameQuote); + $iVals .= ",$v"; + } + $iCols = ltrim($iCols, ','); + $iVals = ltrim($iVals, ','); - if ($first) { - $first = false; - $iCols = "$k"; - $iVals = "$v"; - } else { - $iCols .= ",$k"; - $iVals .= ",$v"; - } - } - $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; - $rs = $zthis->Execute($insert); - return ($rs) ? 2 : 0; + $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; + $rs = $zthis->Execute($insert); + return ($rs) ? 2 : 0; } function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, @@ -407,10 +404,23 @@ 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) || - preg_match('/\s+UNION\s+/is',$sql)) { + /* + * These databases require a "SELECT * FROM (SELECT" type + * statement to have an alias for the result + */ + $requiresAlias = ''; + $requiresAliasArray = array('postgres9','postgres','mysql','mysqli','mssql','mssqlnative','sqlsrv'); + if (in_array($zthis->databaseType,$requiresAliasArray) + || in_array($zthis->dsnType,$requiresAliasArray) + ) { + $requiresAlias = '_ADODB_ALIAS_'; + } + 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 @@ -421,32 +431,47 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) $rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; } else $rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; - - } else if (strncmp($zthis->databaseType,'postgres',8) == 0 - || strncmp($zthis->databaseType,'mysql',5) == 0 - || strncmp($zthis->databaseType,'mssql',5) == 0 - || strncmp($zthis->dsnType,'sqlsrv',5) == 0 - || strncmp($zthis->dsnType,'mssql',5) == 0 - ){ - $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_"; } else { - $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)"; + $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) $requiresAlias"; } + } else { - // now replace SELECT ... FROM with SELECT COUNT(*) FROM - if ( strpos($sql, '_ADODB_COUNT') !== FALSE ) { - $rewritesql = preg_replace('/^\s*?SELECT\s+_ADODB_COUNT(.*)_ADODB_COUNT\s/is','SELECT COUNT(*) ',$sql); - } else { - $rewritesql = preg_replace('/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql); + // Replace 'SELECT ... FROM' with 'SELECT COUNT(*) FROM' + // Parse the query one char at a time starting after the SELECT + // to find the FROM clause's position, ignoring any sub-queries. + $start = stripos($sql, 'SELECT') + 7; + if ($start === false) { + // Not a SELECT statement - probably should trigger an exception here + return 0; + } + $len = strlen($sql); + $numParentheses = 0; + for ($pos = $start; $pos < $len; $pos++) { + switch ($sql[$pos]) { + case '(': $numParentheses++; continue 2; + case ')': $numParentheses--; continue 2; + } + // Ignore whatever is between parentheses (sub-queries) + if ($numParentheses > 0) { + continue; + } + // Exit loop if 'FROM' keyword was found + if (strtoupper(substr($sql, $pos, 4)) == 'FROM') { + break; + } } + $rewritesql = 'SELECT COUNT(*) ' . substr($sql, $pos); + // 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 + // also see PHPLens Issue No: 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 (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 @@ -455,18 +480,23 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) } else { $qryRecs = $zthis->GetOne($rewritesql,$inputarr); - } + } if ($qryRecs !== false) return $qryRecs; } + //-------------------------------------------- // 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); + if (preg_match('/\s*UNION\s*/is', $sql)) { + $rewritesql = $sql; + } else { + $rewritesql = $rewritesql = adodb_strip_order_by($sql); + } - if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0]; + if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) { + $rewritesql .= $limitarr[0]; + } if ($secs2cache) { $rstest = $zthis->CacheExecute($secs2cache,$rewritesql,$inputarr); @@ -476,18 +506,11 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr); } if ($rstest) { - $qryRecs = $rstest->RecordCount(); + $qryRecs = $rstest->RecordCount(); if ($qryRecs == -1) { - global $ADODB_EXTENSION; - // some databases will return -1 on MoveLast() - change to MoveNext() - if ($ADODB_EXTENSION) { - while(!$rstest->EOF) { - adodb_movenext($rstest); - } - } else { - while(!$rstest->EOF) { - $rstest->MoveNext(); - } + // some databases will return -1 on MoveLast() - change to MoveNext() + while(!$rstest->EOF) { + $rstest->MoveNext(); } $qryRecs = $rstest->_currentRow; } @@ -650,148 +673,193 @@ function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr return $rsreturn; } -function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=2) +/** + * Performs case conversion and quoting of the given field name. + * + * See Global variable $ADODB_QUOTE_FIELDNAMES. + * + * @param ADOConnection $zthis + * @param string $fieldName + * + * @return string Quoted field name + */ +function _adodb_quote_fieldname($zthis, $fieldName) { global $ADODB_QUOTE_FIELDNAMES; - if (!$rs) { - printf(ADODB_BAD_RS,'GetUpdateSQL'); - return false; - } + // Case conversion - defaults to UPPER + $case = is_bool($ADODB_QUOTE_FIELDNAMES) ? 'UPPER' : $ADODB_QUOTE_FIELDNAMES; + switch ($case) { + case 'LOWER': + $fieldName = strtolower($fieldName); + break; + case 'NATIVE': + // Do nothing + break; + case 'UPPER': + case 'BRACKETS': + default: + $fieldName = strtoupper($fieldName); + break; + } - $fieldUpdatedCount = 0; - $arrFields = _array_change_key_case($arrFields); + // Quote field if requested, or necessary (field contains space) + if ($ADODB_QUOTE_FIELDNAMES || strpos($fieldName, ' ') !== false ) { + if ($ADODB_QUOTE_FIELDNAMES === 'BRACKETS') { + return $zthis->leftBracket . $fieldName . $zthis->rightBracket; + } else { + return $zthis->nameQuote . $fieldName . $zthis->nameQuote; + } + } else { + return $fieldName; + } +} - $hasnumeric = isset($rs->fields[0]); - $setFields = ''; +function _adodb_getupdatesql(&$zthis, &$rs, $arrFields, $forceUpdate=false, $force=2) +{ + if (!$rs) { + printf(ADODB_BAD_RS,'GetUpdateSQL'); + return false; + } - // Loop through all of the fields in the recordset - for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) { - // Get the field from the recordset - $field = $rs->FetchField($i); + $fieldUpdatedCount = 0; + if (is_array($arrFields)) + $arrFields = array_change_key_case($arrFields,CASE_UPPER); - // If the recordset field is one - // of the fields passed in then process. - $upperfname = strtoupper($field->name); - if (adodb_key_exists($upperfname,$arrFields,$force)) { + $hasnumeric = isset($rs->fields[0]); + $setFields = ''; - // 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. + // Loop through all of the fields in the recordset + for ($i=0, $max=$rs->fieldCount(); $i < $max; $i++) { + // Get the field from the recordset + $field = $rs->fetchField($i); - if ($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 the recordset field is one + // 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 ($forceUpdate || strcmp($val, $arrFields[$upperfname])) { - // Set the counter for the number of fields that will be updated. - $fieldUpdatedCount++; + 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 = ''; - // Based on the datatype of the field - // Format the value properly for the database - $type = $rs->MetaType($field->type); + if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) { + // Set the counter for the number of fields that will be updated. + $fieldUpdatedCount++; + // Based on the datatype of the field + // Format the value properly for the database + $type = $rs->metaType($field->type); - if ($type == 'null') { - $type = 'C'; - } + if ($type == 'null') { + $type = 'C'; + } - if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) { - switch ($ADODB_QUOTE_FIELDNAMES) { - case 'LOWER': - $fnameq = $zthis->nameQuote.strtolower($field->name).$zthis->nameQuote;break; - case 'NATIVE': - $fnameq = $zthis->nameQuote.$field->name.$zthis->nameQuote;break; - case 'UPPER': - default: - $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;break; - } - } else - $fnameq = $upperfname; + $fnameq = _adodb_quote_fieldname($zthis, $field->name); - //********************************************************// - if (is_null($arrFields[$upperfname]) + //********************************************************// + if (is_null($arrFields[$upperfname]) || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0) - || $arrFields[$upperfname] === $zthis->null2null - ) - { - switch ($force) { + || $arrFields[$upperfname] === $zthis->null2null + ) { - //case 0: - // //Ignore empty values. This is allready handled in "adodb_key_exists" function. - //break; + switch ($force) { - case 1: - //Set null - $setFields .= $field->name . " = null, "; - break; + //case 0: + // // Ignore empty values. This is already handled in "adodb_key_exists" function. + // break; + + case 1: + // set null + $setFields .= $fnameq . " = null, "; + break; + + case 2: + // set empty + $arrFields[$upperfname] = ""; + $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq, $arrFields); + break; - case 2: - //Set empty - $arrFields[$upperfname] = ""; - $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq); - break; 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) { - $setFields .= $field->name . " = null, "; - } else { - $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq); - } - break; - } - //********************************************************// - } else { - //we do this so each driver can customize the sql for - //DB specific column types. - //Oracle needs BLOB types to be handled with a returning clause - //postgres has special needs as well - $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq, - $arrFields, $magicq); + 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) { + $setFields .= $fnameq . " = null, "; + } else { + $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq, $arrFields); + } + break; + + case ADODB_FORCE_NULL_AND_ZERO: + + switch ($type) { + case 'N': + case 'I': + case 'L': + $setFields .= $fnameq . ' = 0, '; + break; + default: + $setFields .= $fnameq . ' = null, '; + break; + } + break; + } + //********************************************************// + } else { + // we do this so each driver can customize the sql for + // DB specific column types. + // Oracle needs BLOB types to be handled with a returning clause + // postgres has special needs as well + $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq, $arrFields); } } } + } - // If there were any modified fields then build the rest of the update query. - if ($fieldUpdatedCount > 0 || $forceUpdate) { - // Get the table name from the existing query. - if (!empty($rs->tableName)) $tableName = $rs->tableName; - else { - preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); - $tableName = $tableName[1]; - } - // 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) { - #var_dump($whereClause); - if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard)); - else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard)); - else if (preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard)); - else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see https://sourceforge.net/p/adodb/bugs/37/ - } else - $whereClause = array(false,false); + // If there were any modified fields then build the rest of the update query. + if ($fieldUpdatedCount > 0 || $forceUpdate) { + // Get the table name from the existing query. + if (!empty($rs->tableName)) { + $tableName = $rs->tableName; + } else { + preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); + $tableName = $tableName[1]; + } - if ($discard) - $whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1])); + // Get the full where clause excluding the word "WHERE" from the existing query. + preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause); - $sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2); - if (strlen($whereClause[1]) > 0) - $sql .= ' WHERE '.$whereClause[1]; + $discard = false; + // not a good hack, improvements? + if ($whereClause) { + #var_dump($whereClause); + if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard)); + else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard)); + else if (preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard)); + else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see https://sourceforge.net/p/adodb/bugs/37/ + } else { + $whereClause = array(false, false); + } - return $sql; + if ($discard) { + $whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1])); + } - } else { - return false; + $sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2); + if (strlen($whereClause[1]) > 0) { + $sql .= ' WHERE '.$whereClause[1]; + } + return $sql; + } else { + return false; } } @@ -802,10 +870,10 @@ function adodb_key_exists($key, &$arr,$force=2) return (!empty($arr[$key])) || (isset($arr[$key]) && strlen($arr[$key])>0); } - if (isset($arr[$key])) return true; + if (isset($arr[$key])) + return true; ## null check below - if (ADODB_PHPVER >= 0x4010) return array_key_exists($key,$arr); - return false; + return array_key_exists($key,$arr); } /** @@ -815,18 +883,18 @@ function adodb_key_exists($key, &$arr,$force=2) * * */ -function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2) +function _adodb_getinsertsql(&$zthis, &$rs, $arrFields, $force=2) { static $cacheRS = false; static $cacheSig = 0; static $cacheCols; - global $ADODB_QUOTE_FIELDNAMES; $tableName = ''; $values = ''; $fields = ''; $recordSet = null; - $arrFields = _array_change_key_case($arrFields); + if (is_array($arrFields)) + $arrFields = array_change_key_case($arrFields,CASE_UPPER); $fieldInsertedCount = 0; if (is_string($rs)) { @@ -870,19 +938,7 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2) $upperfname = strtoupper($field->name); if (adodb_key_exists($upperfname,$arrFields,$force)) { $bad = false; - if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) { - switch ($ADODB_QUOTE_FIELDNAMES) { - case 'LOWER': - $fnameq = $zthis->nameQuote.strtolower($field->name).$zthis->nameQuote;break; - case 'NATIVE': - $fnameq = $zthis->nameQuote.$field->name.$zthis->nameQuote;break; - case 'UPPER': - default: - $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;break; - } - } else - $fnameq = $upperfname; - + $fnameq = _adodb_quote_fieldname($zthis, $field->name); $type = $recordSet->MetaType($field->type); /********************************************************/ @@ -893,29 +949,44 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2) { switch ($force) { - case 0: // we must always set null if missing + case ADODB_FORCE_IGNORE: // we must always set null if missing $bad = true; break; - case 1: + case ADODB_FORCE_NULL: $values .= "null, "; break; - case 2: + case ADODB_FORCE_EMPTY: //Set empty $arrFields[$upperfname] = ""; - $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,$arrFields, $magicq); + $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields); break; default: - case 3: + case ADODB_FORCE_VALUE: //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) { $values .= "null, "; } else { - $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq); + $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields); } break; + + case ADODB_FORCE_NULL_AND_ZERO: + switch ($type) + { + case 'N': + case 'I': + case 'L': + $values .= '0, '; + break; + default: + $values .= "null, "; + break; + } + break; + } // switch /*********************************************************/ @@ -924,8 +995,7 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2) //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); + $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields); } if ($bad) continue; @@ -976,7 +1046,7 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2) * @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) { $sql = ''; @@ -1008,7 +1078,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie } else { //this is to maintain compatibility //with older adodb versions. - $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); + $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, false); } break; @@ -1031,19 +1101,19 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie } else { //this is to maintain compatibility //with older adodb versions. - $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); + $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, false); } break; default: - $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); + $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, 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, $recurse=true) { if ($recurse) { @@ -1052,7 +1122,7 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, if ($type == 'L') $type = 'C'; break; case 'oci8': - return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq); + return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields); } } @@ -1061,7 +1131,7 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, case "C": case "X": case 'B': - $val = $zthis->qstr($arrFields[$fname],$magicq); + $val = $zthis->qstr($arrFields[$fname]); break; case "D": @@ -1091,9 +1161,7 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, if ($action == 'I') return $val . ", "; - return $fnameq . "=" . $val . ", "; - } @@ -1105,8 +1173,16 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr) foreach($inputarr as $kk=>$vv) { if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...'; if (is_null($vv)) $ss .= "($kk=>null) "; - else $ss .= "($kk=>'$vv') "; + else + { + if (is_array($vv)) + { + $vv = sprintf("Array Of Values: [%s]", implode(',',$vv)); + } + $ss .= "($kk=>'$vv') "; + } } + $ss = "[ $ss ]"; } $sqlTxt = is_array($sql) ? $sql[0] : $sql; diff --git a/vendor/adodb/adodb-php/adodb-loadbalancer.inc.php b/vendor/adodb/adodb-php/adodb-loadbalancer.inc.php new file mode 100644 index 0000000000..2e4f3928d3 --- /dev/null +++ b/vendor/adodb/adodb-php/adodb-loadbalancer.inc.php @@ -0,0 +1,773 @@ + 0, 'write' => 0, 'readonly' => 0); + + /** + * @var array Weights of all connections for each type. + */ + protected $total_connection_weights = array('all' => 0, 'write' => 0, 'readonly' => 0); + + /** + * @var bool When in transactions, always use this connection. + */ + protected $pinned_connection_id = false; + + /** + * @var array Last connection_id for each database type. + */ + protected $last_connection_id = array('write' => false, 'readonly' => false, 'all' => false); + + /** + * @var bool Session variables that must be maintained across all connections, ie: SET TIME ZONE. + */ + protected $session_variables = false; + + /** + * @var bool Called immediately after connecting to any DB. + */ + protected $user_defined_session_init_sql = false; + + + /** + * Defines SQL queries that are executed each time a new database connection is established. + * + * @param $sql + * @return bool + */ + public function setSessionInitSQL($sql) + { + $this->user_defined_session_init_sql[] = $sql; + + return true; + } + + /** + * Adds a new database connection to the pool, but no actual connection is made until its needed. + * + * @param $obj + * @return bool + * @throws Exception + */ + public function addConnection($obj) + { + if ($obj instanceof ADOdbLoadBalancerConnection) { + $this->connections[] = $obj; + end($this->connections); + $i = key($this->connections); + + $this->total_connections[$obj->type]++; + $this->total_connections['all']++; + + $this->total_connection_weights[$obj->type] += abs($obj->weight); + $this->total_connection_weights['all'] += abs($obj->weight); + + if ($obj->type == 'write') { + $this->connections_write[] = $i; + } else { + $this->connections_readonly[] = $i; + } + + return true; + } + + throw new Exception('Connection object is not an instance of ADOdbLoadBalancerConnection'); + } + + /** + * Removes a database connection from the pool. + * + * @param $i + * @return bool + */ + public function removeConnection($i) + { + if (isset($this->connections[$i])) { + $obj = $this->connections[ $i ]; + + $this->total_connections[ $obj->type ]--; + $this->total_connections['all']--; + + $this->total_connection_weights[ $obj->type ] -= abs($obj->weight); + $this->total_connection_weights['all'] -= abs($obj->weight); + + if ($obj->type == 'write') { + unset($this->connections_write[array_search($i, $this->connections_write)]); + // Reindex array. + $this->connections_write = array_values($this->connections_write); + } else { + unset($this->connections_readonly[array_search($i, $this->connections_readonly)]); + // Reindex array. + $this->connections_readonly = array_values($this->connections_readonly); + } + + // Remove any sticky connections as well. + if ($this->last_connection_id[$obj->type] == $i) { + $this->last_connection_id[$obj->type] = false; + } + + unset($this->connections[$i]); + + return true; + } + + return false; + } + + /** + * Returns a database connection of the specified type. + * + * Takes into account the connection weight for load balancing. + * + * @param string $type Type of database connection, either: 'write' capable or 'readonly' + * @return bool|int|string + */ + private function getConnectionByWeight($type) + { + if ($type == 'readonly') { + $total_weight = $this->total_connection_weights['all']; + } else { + $total_weight = $this->total_connection_weights['write']; + } + + $i = false; + if (is_array($this->connections)) { + $n = 0; + $num = mt_rand(0, $total_weight); + foreach ($this->connections as $i => $connection_obj) { + if ($connection_obj->weight > 0 && ($type == 'readonly' || $connection_obj->type == 'write')) { + $n += $connection_obj->weight; + if ($n >= $num) { + break; + } + } + } + } + + return $i; + } + + /** + * Returns the proper database connection when taking into account sticky sessions and load balancing. + * + * @param $type + * @return bool|int|mixed|string + */ + public function getLoadBalancedConnection($type) + { + if ($this->total_connections == 0) { + $connection_id = 0; + } else { + if ($this->enable_sticky_sessions == true && $this->last_connection_id[$type] !== false) { + $connection_id = $this->last_connection_id[$type]; + } else { + if ($type == 'write' && $this->total_connections['write'] == 1) { + $connection_id = $this->connections_write[0]; + } else { + $connection_id = $this->getConnectionByWeight($type); + } + } + } + + return $connection_id; + } + + /** + * Returns the ADODB connection object by connection_id. + * + * Ensures that it's connected and the session variables are executed. + * + * @param $connection_id + * @return bool|ADOConnection + * @throws Exception + */ + private function _getConnection($connection_id) + { + if (isset($this->connections[$connection_id])) { + $connection_obj = $this->connections[$connection_id]; + /** @var ADOConnection $adodb_obj */ + $adodb_obj = $connection_obj->getADOdbObject(); + if (is_object($adodb_obj) && $adodb_obj->_connectionID == false) { + try { + if ($connection_obj->persistent_connection == true) { + $adodb_obj->Pconnect( + $connection_obj->host, + $connection_obj->user, + $connection_obj->password, + $connection_obj->database + ); + } else { + $adodb_obj->Connect( + $connection_obj->host, + $connection_obj->user, + $connection_obj->password, + $connection_obj->database + ); + } + } catch (Exception $e) { + // Connection error, see if there are other connections to try still. + throw $e; // No connections left, reThrow exception so application can catch it. + } + + if (is_array($this->user_defined_session_init_sql)) { + foreach ($this->user_defined_session_init_sql as $session_init_sql) { + $adodb_obj->Execute($session_init_sql); + } + } + $this->executeSessionVariables($adodb_obj); + } + + return $adodb_obj; + } else { + throw new Exception('Unable to return Connection object...'); + } + } + + /** + * Returns the ADODB connection object by database type. + * + * Ensures that it's connected and the session variables are executed. + * + * @param string $type + * @param null $pin_connection + * @return ADOConnection|bool + * @throws Exception + */ + public function getConnection($type = 'write', $pin_connection = null) + { + while (($type == 'write' && $this->total_connections['write'] > 0) + || ($type == 'readonly' && $this->total_connections['all'] > 0) + ) { + if ($this->pinned_connection_id !== false) { + $connection_id = $this->pinned_connection_id; + } else { + $connection_id = $this->getLoadBalancedConnection($type); + } + + if ($connection_id !== false) { + try { + $adodb_obj = $this->_getConnection($connection_id); + // $connection_obj = $this->connections[$connection_id]; + break; + } catch (Exception $e) { + // Connection error, see if there are other connections to try still. + $this->removeConnection($connection_id); + if ( ($type == 'write' && $this->total_connections['write'] == 0) + || ($type == 'readonly' && $this->total_connections['all'] == 0) + ) { + throw $e; + } + } + } else { + throw new Exception('Connection ID is invalid!'); + } + } + + $this->last_connection_id[$type] = $connection_id; + + if ($pin_connection === true) { + $this->pinned_connection_id = $connection_id; + } elseif ($pin_connection === false && $adodb_obj->transOff <= 1) { + // UnPin connection only if we are 1 level deep in a transaction. + $this->pinned_connection_id = false; + + // When unpinning connection, reset last_connection_id so readonly + // queries don't get stuck on the write capable connection. + $this->last_connection_id['write'] = false; + $this->last_connection_id['readonly'] = false; + } + + return $adodb_obj; + } + + /** + * This is a hack to work around pass by reference error. + * + * Parameter 1 to ADOConnection::GetInsertSQL() expected to be a reference, + * value given in adodb-loadbalancer.inc.php on line 83 + * + * @param $arr + * @return array + */ + private function makeValuesReferenced($arr) + { + $refs = array(); + + foreach ($arr as $key => $value) { + $refs[$key] = &$arr[$key]; + } + + return $refs; + } + + /** + * Allow setting session variables that are maintained across connections. + * + * Its important that these are set using name/value, so it can determine + * if the same variable is set multiple times causing bloat/clutter when + * new connections are established. For example if the time_zone is set to + * many different ones through the course of a single connection, a new + * connection should only set it to the most recent value. + * + * @param $name + * @param $value + * @param bool $execute_immediately + * @return array|bool|mixed + * @throws Exception + */ + public function setSessionVariable($name, $value, $execute_immediately = true) + { + $this->session_variables[$name] = $value; + + if ($execute_immediately == true) { + return $this->executeSessionVariables(); + } else { + return true; + } + } + + /** + * Executes the session variables on a given ADODB object. + * + * @param ADOConnection|bool $adodb_obj + * @return array|bool|mixed + * @throws Exception + */ + private function executeSessionVariables($adodb_obj = false) + { + if (is_array($this->session_variables)) { + $sql = ''; + foreach ($this->session_variables as $name => $value) { + // $sql .= 'SET SESSION '. $name .' '. $value; + // MySQL uses: SET SESSION foo_bar='foo' + // PGSQL uses: SET SESSION foo_bar 'foo' + // So leave it up to the user to pass the proper value with '=' if needed. + // This may be a candidate to move into ADOdb proper. + $sql .= 'SET SESSION ' . $name . ' ' . $value; + } + + if ($adodb_obj !== false) { + return $adodb_obj->Execute($sql); + } else { + return $this->ClusterExecute($sql); + } + } + + return false; + } + + /** + * Executes the same SQL QUERY on the entire cluster of connections. + * Would be used for things like SET SESSION TIME ZONE calls and such. + * + * @param $sql + * @param bool $inputarr + * @param bool $return_all_results + * @param bool $existing_connections_only + * @return array|bool|mixed + * @throws Exception + */ + public function clusterExecute( + $sql, + $inputarr = false, + $return_all_results = false, + $existing_connections_only = true + ) { + if (is_array($this->connections) && count($this->connections) > 0) { + foreach ($this->connections as $key => $connection_obj) { + if ($existing_connections_only == false + || ($existing_connections_only == true + && $connection_obj->getADOdbObject()->_connectionID !== false + ) + ) { + $adodb_obj = $this->_getConnection($key); + if (is_object($adodb_obj)) { + $result_arr[] = $adodb_obj->Execute($sql, $inputarr); + } + } + } + + if (isset($result_arr) && $return_all_results == true) { + return $result_arr; + } else { + // Loop through all results checking to see if they match, if they do return the first one + // otherwise return an array of all results. + if (isset($result_arr)) { + foreach ($result_arr as $result) { + if ($result == false) { + return $result_arr; + } + } + + return $result_arr[0]; + } else { + // When using lazy connections, there are cases where + // setSessionVariable() is called early on, but there are + // no connections to execute the queries on yet. + // This captures that case and forces a RETURN TRUE to occur. + // As likely the queries will be executed as soon as a + // connection is established. + return true; + } + } + } + + return false; + } + + /** + * Determines if a SQL query is read-only or not. + * + * @param string $sql SQL Query to test. + * @return bool + */ + public function isReadOnlyQuery($sql) + { + if ( stripos($sql, 'SELECT') === 0 + && stripos($sql, 'FOR UPDATE') === false + && stripos($sql, ' INTO ') === false + && stripos($sql, 'LOCK IN') === false + ) { + return true; + } + + return false; + } + + /** + * Use this instead of __call() as it significantly reduces the overhead of call_user_func_array(). + * + * @param $sql + * @param bool $inputarr + * @return array|bool|mixed + * @throws Exception + */ + public function execute($sql, $inputarr = false) + { + $type = 'write'; + $pin_connection = null; + + // Prevent leading spaces from causing isReadOnlyQuery/stripos from failing. + $sql = trim($sql); + + // SELECT queries that can write and therefore must be run on a write capable connection. + // SELECT ... FOR UPDATE; + // SELECT ... INTO ... + // SELECT .. LOCK IN ... (MYSQL) + if ($this->isReadOnlyQuery($sql) == true) { + $type = 'readonly'; + } elseif (stripos($sql, 'SET') === 0) { + // SET SQL statements should likely use setSessionVariable() instead, + // so state is properly maintained across connections, especially when they are lazily created. + return $this->ClusterExecute($sql, $inputarr); + } + + $adodb_obj = $this->getConnection($type, $pin_connection); + if ($adodb_obj !== false) { + return $adodb_obj->Execute($sql, $inputarr); + } + + return false; + } + + /** + * Magic method to intercept method and callback to the proper ADODB object for write/readonly connections. + * + * @param string $method ADODB method to call. + * @param array $args Arguments to the ADODB method. + * @return bool|mixed + * @throws Exception + */ + public function __call($method, $args) + { + $type = 'write'; + $pin_connection = null; + + // Intercept specific methods to determine if they are read-only or not. + $method = strtolower($method); + switch ($method) { + // case 'execute': // This is the direct overloaded function above instead. + case 'getone': + case 'getrow': + case 'getall': + case 'getcol': + case 'getassoc': + case 'selectlimit': + if ($this->isReadOnlyQuery(trim($args[0])) == true) { + $type = 'readonly'; + } + break; + case 'cachegetone': + case 'cachegetrow': + case 'cachegetall': + case 'cachegetcol': + case 'cachegetassoc': + case 'cacheexecute': + case 'cacheselect': + case 'pageexecute': + case 'cachepageexecute': + $type = 'readonly'; + break; + // case 'ignoreerrors': + // // When ignoreerrors is called, PIN to the connection until its called again. + // if (!isset($args[0]) || (isset($args[0]) && $args[0] == FALSE)) { + // $pin_connection = TRUE; + // } else { + // $pin_connection = FALSE; + // } + // break; + + // Manual transactions + case 'begintrans': + case 'settransactionmode': + $pin_connection = true; + break; + case 'rollbacktrans': + case 'committrans': + $pin_connection = false; + break; + // Smart transactions + case 'starttrans': + $pin_connection = true; + break; + case 'completetrans': + case 'failtrans': + // getConnection() will only unpin the transaction if we're exiting the last nested transaction + $pin_connection = false; + break; + + // Functions that don't require any connection and therefore + // shouldn't force a connection be established before they run. + case 'qstr': + case 'escape': + case 'binddate': + case 'bindtimestamp': + case 'setfetchmode': + $type = false; // No connection necessary. + break; + + // Default to assuming write connection is required to be on the safe side. + default: + break; + } + + if ($type === false) { + if (is_array($this->connections) && count($this->connections) > 0) { + foreach ($this->connections as $key => $connection_obj) { + $adodb_obj = $connection_obj->getADOdbObject(); + return call_user_func_array(array($adodb_obj, $method), $this->makeValuesReferenced($args)); // Just makes the function call on the first object. + } + } + } else { + $adodb_obj = $this->getConnection($type, $pin_connection); + if (is_object($adodb_obj)) { + $result = call_user_func_array(array($adodb_obj, $method), $this->makeValuesReferenced($args)); + + return $result; + } + } + return false; + } + + /** + * Magic method to proxy property getter calls back to the proper ADODB object currently in use. + * + * @param $property + * @return mixed + * @throws Exception + */ + public function __get($property) + { + if (is_array($this->connections) && count($this->connections) > 0) { + foreach ($this->connections as $key => $connection_obj) { + // Just returns the property from the first object. + return $connection_obj->getADOdbObject()->$property; + } + } + + return false; + } + + /** + * Magic method to proxy property setter calls back to the proper ADODB object currently in use. + * + * @param $property + * @param $value + * @return mixed + * @throws Exception + */ + public function __set($property, $value) + { + // Special function to set object properties on all objects + // without initiating a connection to the database. + if (is_array($this->connections) && count($this->connections) > 0) { + foreach ($this->connections as $key => $connection_obj) { + $connection_obj->getADOdbObject()->$property = $value; + } + + return true; + } + + return false; + } + + /** + * Override the __clone() magic method. + */ + private function __clone() + { + } +} + +/** + * Class ADOdbLoadBalancerConnection + */ +class ADOdbLoadBalancerConnection +{ + /** + * @var bool ADOdb drive name. + */ + protected $driver = false; + + /** + * @var bool ADODB object. + */ + protected $adodb_obj = false; + + /** + * @var string Type of connection, either 'write' capable or 'readonly' + */ + public $type = 'write'; + + /** + * @var int Weight of connection, lower receives less queries, higher receives more queries. + */ + public $weight = 1; + + /** + * @var bool Determines if the connection persistent. + */ + public $persistent_connection = false; + + /** + * @var string Database connection host + */ + public $host = ''; + + /** + * @var string Database connection user + */ + public $user = ''; + + /** + * @var string Database connection password + */ + public $password = ''; + + /** + * @var string Database connection database name + */ + public $database = ''; + + /** + * ADOdbLoadBalancerConnection constructor to setup the ADODB object. + * + * @param $driver + * @param string $type + * @param int $weight + * @param bool $persistent_connection + * @param string $argHostname + * @param string $argUsername + * @param string $argPassword + * @param string $argDatabaseName + */ + public function __construct( + $driver, + $type = 'write', + $weight = 1, + $persistent_connection = false, + $argHostname = '', + $argUsername = '', + $argPassword = '', + $argDatabaseName = '' + ) { + if ($type !== 'write' && $type !== 'readonly') { + return false; + } + + $this->adodb_obj = ADONewConnection($driver); + + $this->type = $type; + $this->weight = $weight; + $this->persistent_connection = $persistent_connection; + + $this->host = $argHostname; + $this->user = $argUsername; + $this->password = $argPassword; + $this->database = $argDatabaseName; + + return true; + } + + /** + * Returns the ADODB object for this connection. + * + * @return bool + */ + public function getADOdbObject() + { + return $this->adodb_obj; + } +} diff --git a/vendor/adodb/adodb-php/adodb-memcache.lib.inc.php b/vendor/adodb/adodb-php/adodb-memcache.lib.inc.php index b1010fa438..7f110e7493 100644 --- a/vendor/adodb/adodb-php/adodb-memcache.lib.inc.php +++ b/vendor/adodb/adodb-php/adodb-memcache.lib.inc.php @@ -1,4 +1,23 @@ memCache = true; /// should we use memCache instead of caching in files -$db->memCacheHost = array($ip1, $ip2, $ip3); -$db->memCachePort = 11211; /// this is default memCache port -$db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib) - -$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? + // $library will be populated with the proper library on connect + // and is used later when there are differences in specific calls + // between memcache and memcached + var $library = false; + //----------------------------- // memcache specific variables @@ -60,18 +56,23 @@ function __construct(&$obj) // implement as lazy connection. The connection only occurs on CacheExecute call function connect(&$err) { - if (!function_exists('memcache_pconnect')) { - $err = 'Memcache module PECL extension not found!'; + // do we have memcache or memcached? + if (class_exists('Memcache')) { + $this->library='Memcache'; + $memcache = new MemCache; + } elseif (class_exists('Memcached')) { + $this->library='Memcached'; + $memcache = new MemCached; + } else { + $err = 'Neither the Memcache nor Memcached PECL extensions were found!'; return false; } - $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)) { + if (!@$memcache->addServer($host,$this->port)) { $failcnt += 1; } } @@ -93,8 +94,25 @@ function writecache($filename, $contents, $debug, $secs2cache) } 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"); + $failed=false; + switch ($this->library) { + case 'Memcache': + if (!$this->_memcache->set($filename, $contents, $this->compress ? MEMCACHE_COMPRESSED : 0, $secs2cache)) { + $failed=true; + } + break; + case 'Memcached': + if (!$this->_memcache->set($filename, $contents, $secs2cache)) { + $failed=true; + } + break; + default: + $failed=true; + break; + } + + if($failed) { + if ($debug) ADOConnection::outp(" Failed to save data at the memcache server!
\n"); return false; } @@ -110,7 +128,7 @@ function readcache($filename, &$err, $secs2cache, $rsClass) $rs = $this->_memcache->get($filename); if (!$rs) { - $err = 'Item with such key doesn\'t exists on the memcached server.'; + $err = 'Item with such key doesn\'t exist on the memcache server.'; return $false; } @@ -176,8 +194,8 @@ function flushcache($filename, $debug=false) $del = $this->_memcache->delete($filename); 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"); + if (!$del) ADOConnection::outp("flushcache: $key entry doesn't exist on memcache server!
\n"); + else ADOConnection::outp("flushcache: $key entry flushed from memcache server!
\n"); return $del; } diff --git a/vendor/adodb/adodb-php/adodb-pager.inc.php b/vendor/adodb/adodb-php/adodb-pager.inc.php index 8c6bd15219..cfe981d32c 100644 --- a/vendor/adodb/adodb-php/adodb-pager.inc.php +++ b/vendor/adodb/adodb-php/adodb-pager.inc.php @@ -1,28 +1,24 @@ implemented Render_PageLinks(). - - Please note, this class is entirely unsupported, - and no free support requests except for bug reports - will be entertained by the author. - -*/ class ADODB_Pager { var $id; // unique id for pager (defaults to 'adodb') var $db; // ADODB connection object @@ -275,7 +271,7 @@ function Render($rows=10) } //------------------------------------------------------ - // override this to control overall layout and formating + // override this to control overall layout and formatting function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige') { echo "
", diff --git a/vendor/adodb/adodb-php/adodb-pear.inc.php b/vendor/adodb/adodb-php/adodb-pear.inc.php index 0457979fb4..c48ef132d2 100644 --- a/vendor/adodb/adodb-php/adodb-pear.inc.php +++ b/vendor/adodb/adodb-php/adodb-pear.inc.php @@ -1,18 +1,25 @@ + * and Tomas V.V.Cox . Portions (c)1997-2002 The PHP Group. * - * PEAR DB Emulation Layer for ADODB. + * This file is part of ADOdb, a Database Abstraction Layer library for PHP. * - * The following code is modelled on PEAR DB code by Stig Bakken | - * and Tomas V.V.Cox . Portions (c)1997-2002 The PHP Group. + * @package ADOdb + * @link https://adodb.org Project's web site and documentation + * @link https://github.com/ADOdb/ADOdb Source code and issue tracker + * + * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause + * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option, + * any later version. This means you can use it in proprietary products. + * See the LICENSE.md file distributed with this source code for details. + * @license BSD-3-Clause + * @license LGPL-2.1-or-later + * + * @copyright 2000-2013 John Lim + * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community */ /* @@ -336,7 +343,7 @@ function parseDSN($dsn) $parsed['hostspec'] = urldecode($str); } - // Get dabase if any + // Get database if any // $dsn => database if (!empty($dsn)) { $parsed['database'] = $dsn; diff --git a/vendor/adodb/adodb-php/adodb-perf.inc.php b/vendor/adodb/adodb-php/adodb-perf.inc.php index 24e482c539..d9d8a99378 100644 --- a/vendor/adodb/adodb-php/adodb-perf.inc.php +++ b/vendor/adodb/adodb-php/adodb-perf.inc.php @@ -1,22 +1,23 @@ _queryID); } $ok = $conn->Execute($isql,$arr); + if($conn instanceof ADODB_mysqli && $conn->_queryID){ + mysqli_free_result($conn->_queryID); + } } else $ok = true; @@ -229,7 +233,7 @@ class adodb_perf { var $cliFormat = "%32s => %s \r\n"; var $sql1 = 'sql1'; // used for casting sql1 to text for mssql var $explain = true; - var $helpurl = 'LogSQL help'; + var $helpurl = 'LogSQL help'; var $createTableSQL = false; var $maxLength = 2000; @@ -263,12 +267,6 @@ function _CPULoad() // Algorithm is taken from // http://social.technet.microsoft.com/Forums/en-US/winservergen/thread/414b0e1b-499c-411e-8a02-6a12e339c0f1/ if (strncmp(PHP_OS,'WIN',3)==0) { - if (PHP_VERSION == '5.0.0') return false; - if (PHP_VERSION == '5.0.1') return false; - 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; @@ -593,7 +591,7 @@ function DBParameter($param) } /* - Raw function returning array of poll paramters + Raw function returning array of poll parameters */ function PollParameters() { @@ -694,12 +692,6 @@ function UI($pollsecs=5) } $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']; @@ -724,7 +716,7 @@ function UI($pollsecs=5) if (empty($_GET['hidem'])) echo "
- ADOdb Performance Monitor for $app
+ ADOdb Performance Monitor for $app
Performance Stats   View SQL   View Tables   Poll Stats", $allowsql ? '   Run SQL' : '', @@ -767,7 +759,6 @@ function UI($pollsecs=5) echo $this->Tables(); break; } global $ADODB_vers; - echo "

$ADODB_vers Sponsored by phpLens
"; } /* @@ -956,7 +947,7 @@ function DoSQLForm() undomq(trim($sql)); + $sql = trim($sql); if (substr($sql,strlen($sql)-1) === ';') { $print = true; $sqla = $this->SplitSQL($sql); @@ -1000,18 +991,6 @@ function SplitSQL($sql) return $arr; } - function undomq($m) - { - if (get_magic_quotes_gpc()) { - // undo the damage - $m = str_replace('\\\\','\\',$m); - $m = str_replace('\"','"',$m); - $m = str_replace('\\\'','\'',$m); - } - return $m; -} - - /************************************************************************/ /** diff --git a/vendor/adodb/adodb-php/adodb-php4.inc.php b/vendor/adodb/adodb-php/adodb-php4.inc.php deleted file mode 100644 index 1003262e38..0000000000 --- a/vendor/adodb/adodb-php/adodb-php4.inc.php +++ /dev/null @@ -1,16 +0,0 @@ - 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()
-	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 -not handled currently. - -This library is independant of the rest of ADOdb, and can be used -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 -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). - -Since 0.06, we handle this correctly, so: - -adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) - == 24 * 3600 (1 day) - -============================================================================= - -COPYRIGHT - -(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 - -============================================================================= - -BUG REPORTS - -These should be posted to the ADOdb forums at - - http://phplens.com/lens/lensforum/topics.php?id=4 +/** + * ADOdb Date Library. + * + * 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 + * 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 would take too + * long with the current implementation of adodb_mktime(). + * + * Replaces native functions as follows: + * - getdate() with adodb_getdate() + * - 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 + * not handled currently. + * + * To improve performance, the native date functions are used whenever + * possible, the library only switches to PHP code when the dates fall outside + * of the 32-bit signed integer range. + * + * This library is independent of the rest of ADOdb, and can be used + * as standalone code. + * + * 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). We handle this correctly, so: + * adodb_mktime(0, 0, 0, 10, 15, 1582) - adodb_mktime(0, 0, 0, 10, 4, 1582) + * == 24 * 3600 (1 day) + * + * This file is part of ADOdb, a Database Abstraction Layer library for PHP. + * + * @package ADOdb + * @link https://adodb.org Project's web site and documentation + * @link https://github.com/ADOdb/ADOdb Source code and issue tracker + * + * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause + * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option, + * any later version. This means you can use it in proprietary products. + * See the LICENSE.md file distributed with this source code for details. + * @license BSD-3-Clause + * @license LGPL-2.1-or-later + * + * @copyright 2003-2013 John Lim + * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community + */ +/* ============================================================================= FUNCTION DESCRIPTIONS @@ -268,7 +256,7 @@ * 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 compatibility 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 @@ -348,7 +336,7 @@ function adodb_daylight_sv(&$arr, $is_gmt) - 9 Aug 2003 0.10 Fixed bug with dates after 2038. -See http://phplens.com/lens/lensforum/msgs.php?id=6980 +See PHPLens Issue No: 6980 - 1 July 2003 0.09 Added support for Q (Quarter). @@ -404,8 +392,6 @@ function adodb_daylight_sv(&$arr, $is_gmt) */ define('ADODB_DATE_VERSION',0.35); -$ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2); - /* This code was originally for windows. But apparently this problem happens also with Linux, RH 7.3 and later! @@ -532,8 +518,8 @@ function adodb_date_test() 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

"; + // Test string formatting + print "

Testing date formatting

"; $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); @@ -737,13 +723,12 @@ function adodb_get_gmt_diff_ts($ts) */ function adodb_get_gmt_diff($y,$m,$d) { -static $TZ,$tzo; -global $ADODB_DATETIME_CLASS; + static $TZ,$tzo; if (!defined('ADODB_TEST_DATES')) $y = false; else if ($y < 1970 || $y >= 2038) $y = false; - if ($ADODB_DATETIME_CLASS && $y !== false) { + if ($y !== false) { $dt = new DateTime(); $dt->setISODate($y,$m,$d); if (empty($tzo)) { @@ -1035,20 +1020,20 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false) 0 => $origd ); } -/* - if ($isphp5) - $dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); - else - $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); - break;*/ -function adodb_tz_offset($gmt,$isphp5) + +/** + * Compute timezone offset. + * + * @param int $gmt Time offset from GMT, in seconds + * @param bool $ignored Param leftover from removed PHP4-compatibility code + * kept to avoid altering function signature. + * @return string + */ +function adodb_tz_offset($gmt, $ignored=true) { - $zhrs = abs($gmt)/3600; + $zhrs = abs($gmt) / 3600; $hrs = floor($zhrs); - 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) ? '+' : '-', $hrs, ($zhrs - $hrs) * 60); } @@ -1081,10 +1066,8 @@ function adodb_date2($fmt, $d=false, $is_gmt=false) */ function adodb_date($fmt,$d=false,$is_gmt=false) { -static $daylight; -global $ADODB_DATETIME_CLASS; -static $jan1_1971; - + static $daylight; + static $jan1_1971; if (!isset($daylight)) { $daylight = function_exists('adodb_daylight_sv'); @@ -1093,7 +1076,15 @@ function adodb_date($fmt,$d=false,$is_gmt=false) 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 + + /* + * Format 'Q' is an ADOdb custom format, not supported in PHP + * so if there is a 'Q' in the format, we force it to use our + * function. There is a trivial overhead in this + */ + + if ((abs($d) <= 0x7FFFFFFF) && strpos($fmt,'Q') === false) + { // 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); @@ -1116,8 +1107,6 @@ function adodb_date($fmt,$d=false,$is_gmt=false) $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 @@ -1128,12 +1117,9 @@ function adodb_date($fmt,$d=false,$is_gmt=false) $dates .= date('e'); break; case 'T': - if ($ADODB_DATETIME_CLASS) { - $dt = new DateTime(); - $dt->SetDate($year,$month,$day); - $dates .= $dt->Format('T'); - } else - $dates .= date('T'); + $dt = new DateTime(); + $dt->SetDate($year,$month,$day); + $dates .= $dt->Format('T'); break; // YEAR case 'L': $dates .= $arr['leap'] ? '1' : '0'; break; @@ -1152,14 +1138,16 @@ function adodb_date($fmt,$d=false,$is_gmt=false) $gmt = adodb_get_gmt_diff($year,$month,$day); - $dates .= ' '.adodb_tz_offset($gmt,$isphp5); + $dates .= ' '.adodb_tz_offset($gmt); break; case 'Y': $dates .= $year; break; case 'y': $dates .= substr($year,strlen($year)-2,2); break; // MONTH case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break; - case 'Q': $dates .= ($month+3)>>2; break; + case 'Q': + $dates .= ceil($month / 3); + break; case 'n': $dates .= $month; break; case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break; case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break; @@ -1167,6 +1155,9 @@ function adodb_date($fmt,$d=false,$is_gmt=false) case 't': $dates .= $arr['ndays']; break; case 'z': $dates .= $arr['yday']; break; case 'w': $dates .= adodb_dow($year,$month,$day); break; + case 'W': + $dates .= sprintf('%02d',ceil( $arr['yday'] / 7) - 1); + break; case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break; case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break; case 'j': $dates .= $day; break; @@ -1185,7 +1176,7 @@ function adodb_date($fmt,$d=false,$is_gmt=false) case 'O': $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day); - $dates .= adodb_tz_offset($gmt,$isphp5); + $dates .= adodb_tz_offset($gmt); break; case 'H': @@ -1389,7 +1380,7 @@ function adodb_strftime($fmt, $ts=false,$is_gmt=false) $sep = substr($tstr,2,1); $hasAM = strrpos($tstr,'M') !== false; */ - # see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24 + # see PHPLens Issue No: 14865 for reasoning, and changelog for version 0.24 $dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am $sep = substr($dstr,2,1); $tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am diff --git a/vendor/adodb/adodb-php/adodb-xmlschema.inc.php b/vendor/adodb/adodb-php/adodb-xmlschema.inc.php index b53d4e284b..58e3affd6c 100644 --- a/vendor/adodb/adodb-php/adodb-xmlschema.inc.php +++ b/vendor/adodb/adodb-php/adodb-xmlschema.inc.php @@ -1,21 +1,29 @@ mgq = get_magic_quotes_runtime(); - if ($this->mgq !== false) { - ini_set('magic_quotes_runtime', 0); - } - $this->db = $db; $this->debug = $this->db->debug; - $this->dict = NewDataDictionary( $this->db ); + $this->dict = newDataDictionary( $this->db ); $this->sqlArray = array(); $this->schemaVersion = XMLS_SCHEMA_VERSION; $this->executeInline( XMLS_EXECUTE_INLINE ); @@ -2195,11 +2191,7 @@ function getSQL( $format = NULL, $sqlArray = NULL ) { * Call this method to clean up after an adoSchema object that is no longer in use. * @deprecated adoSchema now cleans up automatically. */ - function Destroy() { - if ($this->mgq !== false) { - ini_set('magic_quotes_runtime', $this->mgq ); - } - } + function Destroy() {} } /** diff --git a/vendor/adodb/adodb-php/adodb-xmlschema03.inc.php b/vendor/adodb/adodb-php/adodb-xmlschema03.inc.php index 4d1faad365..de1ea26c7d 100644 --- a/vendor/adodb/adodb-php/adodb-xmlschema03.inc.php +++ b/vendor/adodb/adodb-php/adodb-xmlschema03.inc.php @@ -1,21 +1,29 @@ currentElement = strtoupper( $tag ); switch( $this->currentElement ) { @@ -345,8 +353,16 @@ function _tag_open( &$parser, $tag, $attributes ) { * * @access private */ - function _tag_cdata( &$parser, $cdata ) { + function _tag_cdata( $parser, $cdata ) { switch( $this->currentElement ) { + // Table or field comment + case 'DESCR': + if( isset( $this->current_field ) ) { + $this->addFieldOpt( $this->current_field, $this->currentElement, $cdata ); + } else { + $this->addTableComment( $cdata ); + } + break; // Table/field constraint case 'CONSTRAINT': if( isset( $this->current_field ) ) { @@ -373,7 +389,7 @@ function _tag_cdata( &$parser, $cdata ) { * * @access private */ - function _tag_close( &$parser, $tag ) { + function _tag_close( $parser, $tag ) { $this->currentElement = ''; switch( strtoupper( $tag ) ) { @@ -449,7 +465,7 @@ function addData( $attributes ) { * @return array Field specifier array */ function addField( $name, $type, $size = NULL, $opts = NULL ) { - $field_id = $this->FieldID( $name ); + $field_id = $this->fieldID( $name ); // Set the field index so we know where we are $this->current_field = $field_id; @@ -506,11 +522,15 @@ function addFieldOpt( $field, $opt, $value = NULL ) { */ function addTableOpt( $opt ) { if(isset($this->currentPlatform)) { - $this->opts[$this->parent->db->databaseType] = $opt; + $this->opts[$this->parent->db->dataProvider] = $opt; } return $this->opts; } + function addTableComment( $opt ) { + $this->opts['comment'] = $opt; + return $this->opts; + } /** * Generates the SQL that will create the table in the database @@ -522,9 +542,9 @@ function create( &$xmls ) { $sql = array(); // drop any existing indexes - if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) { + if( is_array( $legacy_indexes = $xmls->dict->metaIndexes( $this->name ) ) ) { foreach( $legacy_indexes as $index => $index_details ) { - $sql[] = $xmls->dict->DropIndexSQL( $index, $this->name ); + $sql[] = $xmls->dict->dropIndexSQL( $index, $this->name ); } } @@ -534,10 +554,10 @@ function create( &$xmls ) { } // if table exists - if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) { + if( is_array( $legacy_fields = $xmls->dict->metaColumns( $this->name ) ) ) { // drop table if( $this->drop_table ) { - $sql[] = $xmls->dict->DropTableSQL( $this->name ); + $sql[] = $xmls->dict->dropTableSQL( $this->name ); return $sql; } @@ -545,7 +565,7 @@ function create( &$xmls ) { // drop any existing fields not in schema foreach( $legacy_fields as $field_id => $field ) { if( !isset( $this->fields[$field_id] ) ) { - $sql[] = $xmls->dict->DropColumnSQL( $this->name, $field->name ); + $sql[] = $xmls->dict->dropColumnSQL( $this->name, $field->name ); } } // if table doesn't exist @@ -591,21 +611,21 @@ function create( &$xmls ) { if( empty( $legacy_fields ) ) { // Create the new table - $sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts ); - logMsg( end( $sql ), 'Generated CreateTableSQL' ); + $sql[] = $xmls->dict->createTableSQL( $this->name, $fldarray, $this->opts ); + logMsg( end( $sql ), 'Generated createTableSQL' ); } else { // Upgrade an existing table logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" ); switch( $xmls->upgrade ) { // Use ChangeTableSQL case 'ALTER': - logMsg( 'Generated ChangeTableSQL (ALTERing table)' ); - $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts ); + logMsg( 'Generated changeTableSQL (ALTERing table)' ); + $sql[] = $xmls->dict->changeTableSQL( $this->name, $fldarray, $this->opts ); break; case 'REPLACE': logMsg( 'Doing upgrade REPLACE (testing)' ); - $sql[] = $xmls->dict->DropTableSQL( $this->name ); - $sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts ); + $sql[] = $xmls->dict->dropTableSQL( $this->name ); + $sql[] = $xmls->dict->createTableSQL( $this->name, $fldarray, $this->opts ); break; // ignore table default: @@ -698,7 +718,7 @@ function __construct( &$parent, $attributes = NULL ) { * * @access private */ - function _tag_open( &$parser, $tag, $attributes ) { + function _tag_open( $parser, $tag, $attributes ) { $this->currentElement = strtoupper( $tag ); switch( $this->currentElement ) { @@ -725,7 +745,7 @@ function _tag_open( &$parser, $tag, $attributes ) { * * @access private */ - function _tag_cdata( &$parser, $cdata ) { + function _tag_cdata( $parser, $cdata ) { switch( $this->currentElement ) { // Index field name case 'COL': @@ -741,7 +761,7 @@ function _tag_cdata( &$parser, $cdata ) { * * @access private */ - function _tag_close( &$parser, $tag ) { + function _tag_close( $parser, $tag ) { $this->currentElement = ''; switch( strtoupper( $tag ) ) { @@ -758,7 +778,7 @@ function _tag_close( &$parser, $tag ) { * @return string Field list */ function addField( $name ) { - $this->columns[$this->FieldID( $name )] = $name; + $this->columns[$this->fieldID( $name )] = $name; // Return the field list return $this->columns; @@ -795,7 +815,7 @@ function create( &$xmls ) { } } - return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts ); + return $xmls->dict->createIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts ); } /** @@ -841,7 +861,7 @@ function __construct( &$parent, $attributes = NULL ) { * * @access private */ - function _tag_open( &$parser, $tag, $attributes ) { + function _tag_open( $parser, $tag, $attributes ) { $this->currentElement = strtoupper( $tag ); switch( $this->currentElement ) { @@ -863,7 +883,7 @@ function _tag_open( &$parser, $tag, $attributes ) { * * @access private */ - function _tag_cdata( &$parser, $cdata ) { + function _tag_cdata( $parser, $cdata ) { switch( $this->currentElement ) { // Index field name case 'F': @@ -879,7 +899,7 @@ function _tag_cdata( &$parser, $cdata ) { * * @access private */ - function _tag_close( &$parser, $tag ) { + function _tag_close( $parser, $tag ) { $this->currentElement = ''; switch( strtoupper( $tag ) ) { @@ -903,7 +923,7 @@ function addField( $attributes ) { // Set the field index so we know where we are if( isset( $attributes['NAME'] ) ) { - $this->current_field = $this->FieldID( $attributes['NAME'] ); + $this->current_field = $this->fieldID( $attributes['NAME'] ); } else { $this->current_field = count( $this->data[$this->row] ); } @@ -935,12 +955,12 @@ function addData( $cdata ) { * @return array Array containing index creation SQL */ function create( &$xmls ) { - $table = $xmls->dict->TableName($this->parent->name); + $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 ); + $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; @@ -1027,19 +1047,19 @@ function create( &$xmls ) { $where .= $key . ' = ' . $xmls->db->qstr( $mfields[$key] ); } } - $records = $xmls->db->Execute( 'SELECT * FROM ' . $table . ' WHERE ' . $where ); - switch( $records->RecordCount() ) { + $records = $xmls->db->execute( 'SELECT * FROM ' . $table . ' WHERE ' . $where ); + switch( $records->recordCount() ) { case 0: // No matching record, so safe to insert. logMsg( "No matching records. Inserting new row with unique data" ); - $sql[] = $xmls->db->GetInsertSQL( $records, $mfields ); + $sql[] = $xmls->db->getInsertSQL( $records, $mfields ); break; case 1: // Exactly one matching record, so we can update if the mode permits. logMsg( "One matching record..." ); if( $mode == XMLS_MODE_UPDATE ) { logMsg( "...Updating existing row from unique data" ); - $sql[] = $xmls->db->GetUpdateSQL( $records, $mfields ); + $sql[] = $xmls->db->getUpdateSQL( $records, $mfields ); } break; default: @@ -1115,7 +1135,7 @@ function __construct( &$parent, $attributes = NULL ) { * * @access private */ - function _tag_open( &$parser, $tag, $attributes ) { + function _tag_open( $parser, $tag, $attributes ) { $this->currentElement = strtoupper( $tag ); switch( $this->currentElement ) { @@ -1137,7 +1157,7 @@ function _tag_open( &$parser, $tag, $attributes ) { /** * XML Callback to process CDATA elements */ - function _tag_cdata( &$parser, $cdata ) { + function _tag_cdata( $parser, $cdata ) { switch( $this->currentElement ) { // Line of queryset SQL data case 'QUERY': @@ -1153,7 +1173,7 @@ function _tag_cdata( &$parser, $cdata ) { * * @access private */ - function _tag_close( &$parser, $tag ) { + function _tag_close( $parser, $tag ) { $this->currentElement = ''; switch( strtoupper( $tag ) ) { @@ -1353,12 +1373,6 @@ class adoSchema { */ var $objectPrefix = ''; - /** - * @var long Original Magic Quotes Runtime value - * @access private - */ - var $mgq; - /** * @var long System debug * @access private @@ -1407,15 +1421,9 @@ class adoSchema { * @param object $db ADOdb database connection object. */ function __construct( $db ) { - // Initialize the environment - $this->mgq = get_magic_quotes_runtime(); - if ($this->mgq !== false) { - ini_set('magic_quotes_runtime', 0 ); - } - $this->db = $db; $this->debug = $this->db->debug; - $this->dict = NewDataDictionary( $this->db ); + $this->dict = newDataDictionary( $this->db ); $this->sqlArray = array(); $this->schemaVersion = XMLS_SCHEMA_VERSION; $this->executeInline( XMLS_EXECUTE_INLINE ); @@ -1440,7 +1448,7 @@ function __construct( $db ) { * @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE) * @returns string Upgrade method used */ - function SetUpgradeMethod( $method = '' ) { + function setUpgradeMethod( $method = '' ) { if( !is_string( $method ) ) { return FALSE; } @@ -1488,7 +1496,7 @@ function SetUpgradeMethod( $method = '' ) { * @param int $mode XMLS_MODE_INSERT, XMLS_MODE_UPDATE, or XMLS_MODE_IGNORE * @return int current mode */ - function ExistingData( $mode = NULL ) { + function existingData( $mode = NULL ) { if( is_int( $mode ) ) { switch( $mode ) { case XMLS_MODE_UPDATE: @@ -1523,7 +1531,7 @@ function ExistingData( $mode = NULL ) { * * @see ParseSchema(), ExecuteSchema() */ - function ExecuteInline( $mode = NULL ) { + function executeInline( $mode = NULL ) { if( is_bool( $mode ) ) { $this->executeInline = $mode; } @@ -1544,7 +1552,7 @@ function ExecuteInline( $mode = NULL ) { * * @see addSQL(), ExecuteSchema() */ - function ContinueOnError( $mode = NULL ) { + function continueOnError( $mode = NULL ) { if( is_bool( $mode ) ) { $this->continueOnError = $mode; } @@ -1565,8 +1573,8 @@ function ContinueOnError( $mode = NULL ) { * @param bool $returnSchema Return schema rather than parsing. * @return array Array of SQL queries, ready to execute */ - function ParseSchema( $filename, $returnSchema = FALSE ) { - return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema ); + function parseSchema( $filename, $returnSchema = FALSE ) { + return $this->parseSchemaString( $this->convertSchemaFile( $filename ), $returnSchema ); } /** @@ -1575,22 +1583,22 @@ function ParseSchema( $filename, $returnSchema = FALSE ) { * Call this method to load the specified schema directly from a file (see * the DTD for the proper format) and generate the SQL necessary to create * the database described by the schema. Use this method when you are dealing - * with large schema files. Otherwise, ParseSchema() is faster. + * with large schema files. Otherwise, parseSchema() is faster. * This method does not automatically convert the schema to the latest axmls * schema version. You must convert the schema manually using either the - * ConvertSchemaFile() or ConvertSchemaString() method. - * @see ParseSchema() - * @see ConvertSchemaFile() - * @see ConvertSchemaString() + * convertSchemaFile() or convertSchemaString() method. + * @see parseSchema() + * @see convertSchemaFile() + * @see convertSchemaString() * * @param string $file Name of XML schema file. * @param bool $returnSchema Return schema rather than parsing. * @return array Array of SQL queries, ready to execute. * - * @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString() - * @see ParseSchema(), ParseSchemaString() + * @deprecated Replaced by adoSchema::parseSchema() and adoSchema::parseSchemaString() + * @see parseSchema(), parseSchemaString() */ - function ParseSchemaFile( $filename, $returnSchema = FALSE ) { + function parseSchemaFile( $filename, $returnSchema = FALSE ) { // Open the file if( !($fp = fopen( $filename, 'r' )) ) { logMsg( 'Unable to open file' ); @@ -1598,7 +1606,7 @@ function ParseSchemaFile( $filename, $returnSchema = FALSE ) { } // do version detection here - if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) { + if( $this->schemaFileVersion( $filename ) != $this->schemaVersion ) { logMsg( 'Invalid Schema Version' ); return FALSE; } @@ -1636,13 +1644,13 @@ function ParseSchemaFile( $filename, $returnSchema = FALSE ) { * * Call this method to parse a string containing an XML schema (see the DTD for the proper format) * and generate the SQL necessary to create the database described by the schema. - * @see ParseSchema() + * @see parseSchema() * * @param string $xmlstring XML schema string. * @param bool $returnSchema Return schema rather than parsing. * @return array Array of SQL queries, ready to execute. */ - function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) { + function parseSchemaString( $xmlstring, $returnSchema = FALSE ) { if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) { logMsg( 'Empty or Invalid Schema' ); return FALSE; @@ -1686,8 +1694,8 @@ function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) { * @param bool $returnSchema Return schema rather than parsing. * @return array Array of SQL queries, ready to execute */ - function RemoveSchema( $filename, $returnSchema = FALSE ) { - return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema ); + function removeSchema( $filename, $returnSchema = FALSE ) { + return $this->removeSchemaString( $this->convertSchemaFile( $filename ), $returnSchema ); } /** @@ -1695,38 +1703,38 @@ function RemoveSchema( $filename, $returnSchema = FALSE ) { * * Call this method to parse a string containing an XML schema (see the DTD for the proper format) * and generate the SQL necessary to uninstall the database described by the schema. - * @see RemoveSchema() + * @see removeSchema() * * @param string $schema XML schema string. * @param bool $returnSchema Return schema rather than parsing. * @return array Array of SQL queries, ready to execute. */ - function RemoveSchemaString( $schema, $returnSchema = FALSE ) { + function removeSchemaString( $schema, $returnSchema = FALSE ) { // grab current version - if( !( $version = $this->SchemaStringVersion( $schema ) ) ) { + if( !( $version = $this->schemaStringVersion( $schema ) ) ) { return FALSE; } - return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema ); + 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, + * parseSchema() or parseSchemaString() ) to the database (creating the tables, indexes, * and executing other SQL specified in the schema) after parsing. - * @see ParseSchema(), ParseSchemaString(), ExecuteInline() + * @see parseSchema(), parseSchemaString(), executeInline() * * @param array $sqlArray Array of SQL statements that will be applied rather than * the current schema. * @param boolean $continueOnErr Continue to apply the schema even if an error occurs. * @returns integer 0 if failure, 1 if errors, 2 if successful. */ - function ExecuteSchema( $sqlArray = NULL, $continueOnErr = NULL ) { + function executeSchema( $sqlArray = NULL, $continueOnErr = NULL ) { if( !is_bool( $continueOnErr ) ) { - $continueOnErr = $this->ContinueOnError(); + $continueOnErr = $this->continueOnError(); } if( !isset( $sqlArray ) ) { @@ -1736,7 +1744,7 @@ function ExecuteSchema( $sqlArray = NULL, $continueOnErr = NULL ) { if( !is_array( $sqlArray ) ) { $this->success = 0; } else { - $this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr ); + $this->success = $this->dict->executeSQLArray( $sqlArray, $continueOnErr ); } return $this->success; @@ -1746,12 +1754,12 @@ function ExecuteSchema( $sqlArray = NULL, $continueOnErr = NULL ) { * Returns the current SQL array. * * Call this method to fetch the array of SQL queries resulting from - * ParseSchema() or ParseSchemaString(). + * parseSchema() or parseSchemaString(). * * @param string $format Format: HTML, TEXT, or NONE (PHP array) * @return array Array of SQL statements or FALSE if an error occurs */ - function PrintSQL( $format = 'NONE' ) { + function printSQL( $format = 'NONE' ) { $sqlArray = null; return $this->getSQL( $format, $sqlArray ); } @@ -1765,7 +1773,7 @@ function PrintSQL( $format = 'NONE' ) { * @param string $filename Path and name where the file should be saved. * @return boolean TRUE if save is successful, else FALSE. */ - function SaveSQL( $filename = './schema.sql' ) { + function saveSQL( $filename = './schema.sql' ) { if( !isset( $sqlArray ) ) { $sqlArray = $this->sqlArray; @@ -1806,7 +1814,7 @@ function create_parser() { * * @access private */ - function _tag_open( &$parser, $tag, $attributes ) { + function _tag_open( $parser, $tag, $attributes ) { switch( strtoupper( $tag ) ) { case 'TABLE': if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) { @@ -1831,7 +1839,7 @@ function _tag_open( &$parser, $tag, $attributes ) { * * @access private */ - function _tag_cdata( &$parser, $cdata ) { + function _tag_cdata( $parser, $cdata ) { } /** @@ -1840,7 +1848,7 @@ function _tag_cdata( &$parser, $cdata ) { * @access private * @internal */ - function _tag_close( &$parser, $tag ) { + function _tag_close( $parser, $tag ) { } @@ -1853,17 +1861,17 @@ function _tag_close( &$parser, $tag ) { * 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() + * @see convertSchemaFile() * * @param string $schema String containing XML schema that will be converted. * @param string $newVersion DTD version to convert to. * @param string $newFile File name of (converted) output file. * @return string Converted XML schema or FALSE if an error occurs. */ - function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) { + function convertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) { // grab current version - if( !( $version = $this->SchemaStringVersion( $schema ) ) ) { + if( !( $version = $this->schemaStringVersion( $schema ) ) ) { return FALSE; } @@ -1874,7 +1882,7 @@ function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) { if( $version == $newVersion ) { $result = $schema; } else { - $result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion); + $result = $this->transformSchema( $schema, 'convert-' . $version . '-' . $newVersion); } if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) { @@ -1902,17 +1910,17 @@ function _file_get_contents($path) * 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() + * @see convertSchemaString() * * @param string $filename Name of XML schema file that will be converted. * @param string $newVersion DTD version to convert to. * @param string $newFile File name of (converted) output file. * @return string Converted XML schema or FALSE if an error occurs. */ - function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) { + function convertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) { // grab current version - if( !( $version = $this->SchemaFileVersion( $filename ) ) ) { + if( !( $version = $this->schemaFileVersion( $filename ) ) ) { return FALSE; } @@ -1928,7 +1936,7 @@ function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) { $result = substr( $result, 3 ); } } else { - $result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' ); + $result = $this->transformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' ); } if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) { @@ -1939,7 +1947,7 @@ function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) { return $result; } - function TransformSchema( $schema, $xsl, $schematype='string' ) + function transformSchema( $schema, $xsl, $schematype='string' ) { // Fail if XSLT extension is not available if( ! function_exists( 'xslt_create' ) ) { @@ -2050,7 +2058,7 @@ function xslt_error_handler( $parser, $errno, $level, $fields ) { * @param string $filename AXMLS schema file * @return string Schema version number or FALSE on error */ - function SchemaFileVersion( $filename ) { + function schemaFileVersion( $filename ) { // Open the file if( !($fp = fopen( $filename, 'r' )) ) { // die( 'Unable to open file' ); @@ -2076,7 +2084,7 @@ function SchemaFileVersion( $filename ) { * @param string $xmlstring XML schema string * @return string Schema version number or FALSE on error */ - function SchemaStringVersion( $xmlstring ) { + function schemaStringVersion( $xmlstring ) { if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) { return FALSE; } @@ -2093,20 +2101,20 @@ function SchemaStringVersion( $xmlstring ) { * * 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. + * tables in the schema. * - * @param boolean $data Include data in schema dump - * @indent string indentation to use - * @prefix string extract only tables with given prefix - * @stripprefix strip prefix string when storing in XML schema + * @param boolean $data include data in schema dump + * @param string $indent indentation to use + * @param string $prefix extract only tables with given prefix + * @param boolean $stripprefix strip prefix string when storing in XML schema * @return string Generated XML schema */ - function ExtractSchema( $data = FALSE, $indent = ' ', $prefix = '' , $stripprefix=false) { - $old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM ); + 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' ,false ,($prefix) ? str_replace('_','\_',$prefix).'%' : '') ) ) { + if( is_array( $tables = $this->db->metaTables( 'TABLES' ,false ,($prefix) ? str_replace('_','\_',$prefix).'%' : '') ) ) { foreach( $tables as $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 ); + $rs = $this->db->execute('SELECT * FROM ' . $table . ' WHERE 0=1'); + $fields = $this->db->metaColumns( $table ); + $indexes = $this->db->metaIndexes( $table ); if( is_array( $fields ) ) { foreach( $fields as $details ) { @@ -2148,7 +2156,7 @@ function ExtractSchema( $data = FALSE, $indent = ' ', $prefix = '' , $strippref // this stops the creation of 'R' columns, // AUTOINCREMENT is used to create auto columns $details->primary_key = 0; - $type = $rs->MetaType( $details ); + $type = $rs->metaType( $details ); $schema .= str_repeat( $indent, 2 ) . 'db->Execute( 'SELECT * FROM ' . $table ); + $rs = $this->db->execute( 'SELECT * FROM ' . $table ); if( is_object( $rs ) && !$rs->EOF ) { $schema .= str_repeat( $indent, 2 ) . "\n"; - while( $row = $rs->FetchRow() ) { + while( $row = $rs->fetchRow() ) { foreach( $row as $key => $val ) { if ( $val != htmlentities( $val ) ) { $row[$key] = ''; @@ -2202,7 +2210,7 @@ function ExtractSchema( $data = FALSE, $indent = ' ', $prefix = '' , $strippref } } - $this->db->SetFetchMode( $old_mode ); + $this->db->setFetchMode( $old_mode ); $schema .= ''; return $schema; @@ -2218,7 +2226,7 @@ function ExtractSchema( $data = FALSE, $indent = ' ', $prefix = '' , $strippref * @param boolean $underscore If TRUE, automatically append an underscore character to the prefix. * @return boolean TRUE if successful, else FALSE */ - function SetPrefix( $prefix = '', $underscore = TRUE ) { + function setPrefix( $prefix = '', $underscore = TRUE ) { switch( TRUE ) { // clear prefix case empty( $prefix ): @@ -2377,10 +2385,7 @@ function getSQL( $format = NULL, $sqlArray = NULL ) { * Call this method to clean up after an adoSchema object that is no longer in use. * @deprecated adoSchema now cleans up automatically. */ - function Destroy() { - if ($this->mgq !== false) { - ini_set('magic_quotes_runtime', $this->mgq ); - } + function destroy() { } } diff --git a/vendor/adodb/adodb-php/adodb.inc.php b/vendor/adodb/adodb-php/adodb.inc.php index 159bd3d7c2..703c2f9fcd 100644 --- a/vendor/adodb/adodb-php/adodb.inc.php +++ b/vendor/adodb/adodb-php/adodb.inc.php @@ -1,34 +1,22 @@ fields is available on EOF $ADODB_FETCH_MODE, // DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default... $ADODB_GETONE_EOF, @@ -82,35 +69,52 @@ class library to hide the differences between the different database API's (enca // 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. - + /********************************************************* + * Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3). + * Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi + * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:adodb_force_type + * + * 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. + * 4 = force value. Like 1 but numeric empty fields are set to zero. + */ define('ADODB_FORCE_IGNORE',0); define('ADODB_FORCE_NULL',1); define('ADODB_FORCE_EMPTY',2); define('ADODB_FORCE_VALUE',3); + define('ADODB_FORCE_NULL_AND_ZERO',4); // ******************************************************** - if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) { + /** + * Constants for returned values from the charMax and textMax methods. + * If not specifically defined in the driver, methods return the NOTSET value. + */ + define ('ADODB_STRINGMAX_NOTSET', -1); + define ('ADODB_STRINGMAX_NOLIMIT',-2); - define('ADODB_BAD_RS','

Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;

'); + /* + * Defines the the default meta type returned + * when ADOdb encounters a type that it is not + * defined in the metaTypes. + */ + if (!defined('ADODB_DEFAULT_METATYPE')) + define ('ADODB_DEFAULT_METATYPE','N'); + + 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_\:\"\`\.\@\[-]*)'); + define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)'); // prefetching used by oracle - if (!defined('ADODB_PREFETCH_ROWS')) { - define('ADODB_PREFETCH_ROWS',10); - } + if (!defined('ADODB_PREFETCH_ROWS')) { + define('ADODB_PREFETCH_ROWS',10); + } /** @@ -125,10 +129,10 @@ class library to hide the differences between the different database API's (enca * - BOTH: array(0 => 456, 'id' => 456, 1 => 'john', 'name' => 'john') * - DEFAULT: driver-dependent */ - define('ADODB_FETCH_DEFAULT', 0); - define('ADODB_FETCH_NUM', 1); - define('ADODB_FETCH_ASSOC', 2); - define('ADODB_FETCH_BOTH', 3); + define('ADODB_FETCH_DEFAULT', 0); + define('ADODB_FETCH_NUM', 1); + define('ADODB_FETCH_ASSOC', 2); + define('ADODB_FETCH_BOTH', 3); /** * Associative array case constants @@ -145,53 +149,23 @@ class library to hide the differences between the different database API's (enca * NOTE: This functionality is not implemented everywhere, it currently * works only with: mssql, odbc, oci8 and ibase derived drivers */ - define('ADODB_ASSOC_CASE_LOWER', 0); - define('ADODB_ASSOC_CASE_UPPER', 1); - define('ADODB_ASSOC_CASE_NATIVE', 2); - - - if (!defined('TIMESTAMP_FIRST_YEAR')) { - define('TIMESTAMP_FIRST_YEAR',100); - } - - /** - * AutoExecute constants - * (moved from adodb-pear.inc.php since they are only used in here) - */ - define('DB_AUTOQUERY_INSERT', 1); - define('DB_AUTOQUERY_UPDATE', 2); + define('ADODB_ASSOC_CASE_LOWER', 0); + define('ADODB_ASSOC_CASE_UPPER', 1); + define('ADODB_ASSOC_CASE_NATIVE', 2); - // 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 { - die("PHP5 or later required. You are running ".PHP_VERSION); - } - unset($_adodb_ver); + if (!defined('TIMESTAMP_FIRST_YEAR')) { + define('TIMESTAMP_FIRST_YEAR',100); } - /** - 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); - } + * AutoExecute constants + * (moved from adodb-pear.inc.php since they are only used in here) + */ + define('DB_AUTOQUERY_INSERT', 1); + define('DB_AUTOQUERY_UPDATE', 2); + - $s = reset($src); - $d = reset($dest); - while ($s !== false) { - $data = str_replace($s,$d,$data); - $s = next($src); - $d = next($dest); - } - return $data; - } function ADODB_Setup() { GLOBAL @@ -224,7 +198,7 @@ function ADODB_Setup() { /** * ADODB version as a string. */ - $ADODB_vers = 'v5.20.17 31-Mar-2020'; + $ADODB_vers = 'v5.21.3 2021-10-31'; /** * Determines whether recordset->RecordCount() is used. @@ -439,6 +413,8 @@ abstract class ADOConnection { var $false = '0'; /// string that represents FALSE for a database var $replaceQuote = "\\'"; /// string to use to replace quotes var $nameQuote = '"'; /// string to use to quote identifiers and names + var $leftBracket = '['; /// left square bracked for t-sql styled column names + var $rightBracket = ']'; /// right square bracked for t-sql styled column names var $charSet=false; /// character set to use - only for interbase, postgres and oci8 var $metaDatabasesSQL = ''; var $metaTablesSQL = ''; @@ -457,7 +433,10 @@ abstract class ADOConnection { var $hasTransactions = true; /// has transactions //-- var $genID = 0; /// sequence id used by GenID(); - var $raiseErrorFn = false; /// error function to call + + /** @var bool|callable Error function to call */ + var $raiseErrorFn = false; + var $isoDates = false; /// accepts dates in ISO format var $cacheSecs = 3600; /// cache for 1 hour @@ -465,7 +444,7 @@ abstract class ADOConnection { var $memCache = false; /// should we use memCache instead of caching in files var $memCacheHost; /// memCache host var $memCachePort = 11211; /// memCache port - var $memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib) + var $memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib, not supported w/memcached library) var $sysDate = false; /// name of function that returns the current date var $sysTimeStamp = false; /// name of function that returns the current timestamp @@ -483,8 +462,12 @@ abstract class ADOConnection { var $autoRollback = false; // autoRollback on PConnect(). var $poorAffectedRows = false; // affectedRows not working or unreliable + /** @var bool|callable Execute function to call */ var $fnExecute = false; + + /** @var bool|callable Cache execution function to call */ var $fnCacheExecute = false; + var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char var $rsPrefix = "ADORecordSet_"; @@ -501,7 +484,8 @@ abstract class ADOConnection { // var $_oldRaiseFn = false; var $_transOK = null; - var $_connectionID = false; /// The returned link identifier whenever a successful database connection is made. + /** @var resource Identifier for the native database connection */ + var $_connectionID = false; 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 @@ -514,32 +498,60 @@ abstract class ADOConnection { var $_logsql = false; var $_transmode = ''; // transaction mode - /* - * Additional parameters that may be passed to drivers in the connect string - * Driver must be coded to accept the parameters + /** + * Additional parameters that may be passed to drivers in the connect string. + * + * Data is stored as an array of arrays and not a simple associative array, + * because some drivers (e.g. mysql) allow multiple parameters with the same + * key to be set. + * @link https://github.com/ADOdb/ADOdb/issues/187 + * + * @see setConnectionParameter() + * + * @var array $connectionParameters Set of ParameterName => Value pairs */ protected $connectionParameters = array(); /** - * Adds a parameter to the connection string. - * - * These parameters are added to the connection string when connecting, - * if the driver is coded to use it. - * - * @param string $parameter The name of the parameter to set - * @param string $value The value of the parameter - * - * @return null - * - * @example, for mssqlnative driver ('CharacterSet','UTF-8') - */ - final public function setConnectionParameter($parameter,$value) + * Default Constructor. + * We define it even though it does not actually do anything. This avoids + * getting a PHP Fatal error: Cannot call constructor if a subclass tries + * to call its parent constructor. + */ + public function __construct() { + } - $this->connectionParameters[$parameter] = $value; - + /** + * Adds a parameter to the connection string. + * + * Parameters must be added before the connection is established; + * they are then passed on to the connect statement, which will. + * process them if the driver supports this feature. + * + * Example usage: + * - mssqlnative: setConnectionParameter('CharacterSet','UTF-8'); + * - mysqli: setConnectionParameter(MYSQLI_SET_CHARSET_NAME,'utf8mb4'); + * + * If used in a portable environment, parameters set in this manner should + * be predicated on the database provider, as unexpected results may occur + * if applied to the wrong database. + * + * @param string $parameter The name of the parameter to set + * @param string $value The value of the parameter + * + * @return bool True if success, false otherwise (e.g. parameter is not valid) + */ + public function setConnectionParameter($parameter, $value) { + $this->connectionParameters[] = array($parameter=>$value); + return true; } + /** + * ADOdb version. + * + * @return string + */ static function Version() { global $ADODB_vers; @@ -561,15 +573,20 @@ static function Version() { } /** - Get server version info... - - @returns An array with 2 elements: $arr['string'] is the description string, - and $arr[version] is the version (also a string). - */ + * Get server version info. + * + * @return string[] 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' => ''); } + /** + * Return true if connected to the database. + * + * @return bool + */ function IsConnected() { return !empty($this->_connectionID); } @@ -583,9 +600,13 @@ function _findvers($str) { } /** - * All error messages go through this bottleneck function. - * You can define your own handler by defining the function name in ADODB_OUTP. - */ + * All error messages go through this bottleneck function. + * + * You can define your own handler by defining the function name in ADODB_OUTP. + * + * @param string $msg Message to print + * @param bool $newline True to add a newline after printing $msg + */ static function outp($msg,$newline=true) { global $ADODB_FLUSH,$ADODB_OUTP; @@ -594,8 +615,7 @@ static function outp($msg,$newline=true) { $fn($msg,$newline); return; } else if (isset($ADODB_OUTP)) { - $fn = $ADODB_OUTP; - $fn($msg,$newline); + call_user_func($ADODB_OUTP,$msg,$newline); return; } @@ -616,6 +636,10 @@ static function outp($msg,$newline=true) { } + /** + * Return the database server's current date and time. + * @return int|false + */ function Time() { $rs = $this->_Execute("select $this->sysTimeStamp"); if ($rs && !$rs->EOF) { @@ -646,15 +670,15 @@ protected function parseHostNameAndPort() { } /** - * Connect to database + * Connect to database. * - * @param [argHostname] Host to connect to - * @param [argUsername] Userid to login - * @param [argPassword] Associated password - * @param [argDatabaseName] database - * @param [forceNew] force new connection + * @param string $argHostname Host to connect to + * @param string $argUsername Userid to login + * @param string $argPassword Associated password + * @param string $argDatabaseName Database name + * @param bool $forceNew Force new connection * - * @return true or false + * @return bool */ function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) { if ($argHostname != "") { @@ -709,30 +733,31 @@ 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 + * Always force a new connection to database. + * + * Currently this only works with Oracle. * - * @param [argHostname] Host to connect to - * @param [argUsername] Userid to login - * @param [argPassword] Associated password - * @param [argDatabaseName] database + * @param string $argHostname Host to connect to + * @param string $argUsername Userid to login + * @param string $argPassword Associated password + * @param string $argDatabaseName Database name * - * @return true or false + * @return bool */ function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") { return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true); } /** - * Establish persistent connect to database + * Establish persistent connection to database. * - * @param [argHostname] Host to connect to - * @param [argUsername] Userid to login - * @param [argPassword] Associated password - * @param [argDatabaseName] database + * @param string $argHostname Host to connect to + * @param string $argUsername Userid to login + * @param string $argPassword Associated password + * @param string $argDatabaseName Database name * - * @return return true or false + * @return bool */ function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") { @@ -769,7 +794,7 @@ function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argD $ret = false; } else { $err = "Missing extension for ".$this->dataProvider; - $ret = 0; + $ret = false; } if ($fn = $this->raiseErrorFn) { $fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this); @@ -790,7 +815,11 @@ function outp_throw($msg,$src='WARN',$sql='') { ADOConnection::outp($msg); } - // create cache class. Code is backward compat with old memcache implementation + /** + * Create cache class. + * + * Code is backwards-compatible with old memcache implementation. + */ function _CreateCache() { global $ADODB_CACHE, $ADODB_CACHE_CLASS; @@ -806,8 +835,16 @@ function _CreateCache() { } } - // Format date column in sql string given an input format that understands Y M D - function SQLDate($fmt, $col=false) { + /** + * Format date column in sql string. + * + * See https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:sqldate + * for documentation on supported formats. + * + * @param string $fmt Format string + * @param string $col Date column; use system date if not specified. + */ + function SQLDate($fmt, $col = '') { if (!$col) { $col = $this->sysDate; } @@ -815,7 +852,8 @@ function SQLDate($fmt, $col=false) { } /** - * Should prepare the sql statement and return the stmt resource. + * Prepare an sql statement and return the statement resource. + * * For databases that do not support this, we return the $sql. To ensure * compatibility with databases that do not support prepare: * @@ -823,53 +861,47 @@ function SQLDate($fmt, $col=false) { * $db->Execute($stmt,array(1,'Jill')) or die('insert failed'); * $db->Execute($stmt,array(2,'Joe')) or die('insert failed'); * - * @param sql SQL to send to database - * - * @return return FALSE, or the prepared statement, or the original sql if - * if the database does not support prepare. + * @param string $sql SQL to send to database * + * @return mixed|false The prepared statement, or the original sql if the + * database does not support prepare. */ function Prepare($sql) { return $sql; } /** + * Prepare a Stored Procedure and return the statement resource. + * * Some databases, eg. mssql require a different function for preparing * stored procedures. So we cannot use Prepare(). * - * Should prepare the stored procedure and return the stmt resource. - * For databases that do not support this, we return the $sql. To ensure - * compatibility with databases that do not support prepare: - * - * @param sql SQL to send to database + * For databases that do not support this, we return the $sql. * - * @return return FALSE, or the prepared statement, or the original sql if - * if the database does not support prepare. + * @param string $sql SQL to send to database + * @param bool $param * + * @return mixed|false The prepared statement, or the original sql if the + * database does not support prepare. */ function PrepareSP($sql,$param=true) { return $this->Prepare($sql,$param); } /** - * PEAR DB Compat - */ - function Quote($s) { - return $this->qstr($s,false); - } - - /** - * Requested by "Karsten Dambekalns" + * PEAR DB Compat - alias for qStr. + * @param $s + * @return string */ - function QMagic($s) { - return $this->qstr($s,get_magic_quotes_gpc()); + function Quote($s) { + return $this->qstr($s); } function q(&$s) { //if (!empty($this->qNull && $s == 'null') { // return $s; //} - $s = $this->qstr($s,false); + $s = $this->qstr($s); } /** @@ -891,17 +923,26 @@ function nextId($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 + * @param string $table name of table to lock + * @param string $where where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock + * @param string $col */ function RowLock($table,$where,$col='1 as adodbignore') { return false; } + /** + * @param string $table + * @return true + */ function CommitLock($table) { return $this->CommitTrans(); } + /** + * @param string $table + * @return true + */ function RollbackLock($table) { return $this->RollbackTrans(); } @@ -912,8 +953,9 @@ function RollbackLock($table) { * The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical * for easy porting :-) * - * @param mode The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM - * @returns The previous fetch mode + * @param int $mode The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM + * + * @return int Previous fetch mode */ function SetFetchMode($mode) { $old = $this->fetchMode; @@ -929,6 +971,11 @@ function SetFetchMode($mode) { /** * PEAR DB Compat - do not use internally. + * + * @param string $sql + * @param array|bool $inputarr + * + * @return ADORecordSet|bool */ function Query($sql, $inputarr=false) { $rs = $this->Execute($sql, $inputarr); @@ -940,8 +987,8 @@ function Query($sql, $inputarr=false) { /** - * PEAR DB Compat - do not use internally - */ + * PEAR DB Compat - do not use internally + */ function LimitQuery($sql, $offset, $count, $params=false) { $rs = $this->SelectLimit($sql, $count, $offset, $params); if (!$rs && defined('ADODB_PEAR')) { @@ -952,22 +999,26 @@ function LimitQuery($sql, $offset, $count, $params=false) { /** - * PEAR DB Compat - do not use internally - */ + * PEAR DB Compat - do not use internally + */ function Disconnect() { return $this->Close(); } /** - * Returns a placeholder for query parameters + * 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 mixed $name parameter's name. + * For databases that require positioned params (e.g. PostgreSQL), + * a "falsy" value can be used to force resetting the placeholder + * count; using boolean 'false' will reset it without actually + * returning a placeholder. ADOdb will also automatically reset + * the count when executing a query. * @param string $type (unused) * @return string query parameter placeholder */ @@ -1115,11 +1166,14 @@ function HasFailedTrans() { /** * 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 + * @param string $sql SQL statement to execute, or possibly an array + * holding prepared statement ($sql[0] will hold sql text) + * @param array|bool $inputarr holds the input data to bind to. + * Null elements will be set to null. + * + * @return ADORecordSet|bool */ - function Execute($sql,$inputarr=false) { + public function Execute($sql, $inputarr = false) { if ($this->fnExecute) { $fn = $this->fnExecute; $ret = $fn($this,$sql,$inputarr); @@ -1250,13 +1304,14 @@ function _Execute($sql,$inputarr=false) { if( is_string($sql) ) { // Strips keyword used to help generate SELECT COUNT(*) queries // from SQL if it exists. - $sql = ADODB_str_replace( '_ADODB_COUNT', '', $sql ); + // TODO: obsoleted by #715 - kept for backwards-compatibility + $sql = str_replace( '_ADODB_COUNT', '', $sql ); } if ($this->debug) { global $ADODB_INCLUDED_LIB; if (empty($ADODB_INCLUDED_LIB)) { - include(ADODB_DIR.'/adodb-lib.inc.php'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } $this->_queryID = _adodb_debug_execute($this, $sql,$inputarr); } else { @@ -1287,8 +1342,17 @@ function _Execute($sql,$inputarr=false) { return $rs; } + if ($this->dataProvider == 'pdo' && $this->databaseType != 'pdo') { + // PDO uses a slightly different naming convention for the + // recordset class if the database type is changed, so we must + // treat it specifically. The mysql driver leaves the + // databaseType as pdo + $rsclass = $this->rsPrefix . 'pdo_' . $this->databaseType; + } else { + $rsclass = $this->rsPrefix . $this->databaseType; + } + // return real recordset from select statement - $rsclass = $this->rsPrefix.$this->databaseType; $rs = new $rsclass($this->_queryID,$this->fetchMode); $rs->connection = $this; // Pablo suggestion $rs->Init(); @@ -1325,12 +1389,14 @@ function DropSequence($seqname='adodbseq') { } /** - * Generates a sequence id and stores it in $this->genID; + * Generates a sequence id and stores it in $this->genID. + * * GenID is only available if $this->hasGenID = true; * - * @param seqname name of sequence to use - * @param startID if sequence does not exist, start at this ID - * @return 0 if not supported, otherwise a sequence id + * @param string $seqname Name of sequence to use + * @param int $startID If sequence does not exist, start at this ID + * + * @return int Sequence id, 0 if not supported */ function GenID($seqname='adodbseq',$startID=1) { if (!$this->hasGenID) { @@ -1365,16 +1431,22 @@ function GenID($seqname='adodbseq',$startID=1) { } /** - * @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. + * Returns the last inserted ID. + * + * Not all databases support this feature. Some do not require to specify + * table or column name (e.g. MySQL). + * + * @param string $table Table name, default '' + * @param string $column Column name, default '' + * + * @return int The last inserted ID. */ function Insert_ID($table='',$column='') { if ($this->_logsql && $this->lastInsID) { return $this->lastInsID; } if ($this->hasInsertID) { - return $this->_insertid($table,$column); + return $this->_insertID($table,$column); } if ($this->debug) { ADOConnection::outp( '

Insert_ID error

'); @@ -1383,12 +1455,37 @@ function Insert_ID($table='',$column='') { return false; } + /** + * Enable or disable the Last Insert Id functionality. + * + * If the Driver supports it, this function allows setting {@see $hasInsertID}. + * + * @param bool $enable False to disable + */ + public function enableLastInsertID($enable = true) {} + + /** + * Return the id of the last row that has been inserted in a table. + * + * @param string $table + * @param string $column + * + * @return int|false + */ + protected function _insertID($table = '', $column = '') + { + return false; + } /** * Portable Insert ID. Pablo Roca * - * @return the last inserted ID. All databases support this. But aware possible - * problems in multiuser environments. Heavy test this before deploying. + * @param string $table + * @param string $id + + * @return mixed The last inserted ID. All databases support this, but be + * aware of possible problems in multiuser environments. + * Heavily test this before deploying. */ function PO_Insert_ID($table="", $id="") { if ($this->hasInsertID){ @@ -1420,7 +1517,7 @@ function Affected_Rows() { /** - * @return the last error message + * @return string the last error message */ function ErrorMsg() { if ($this->_errorMsg) { @@ -1432,7 +1529,7 @@ function ErrorMsg() { /** - * @return the last error number. Normally 0 means no error. + * @return int the last error number. Normally 0 means no error. */ function ErrorNo() { return ($this->_errorMsg) ? -1 : 0; @@ -1483,13 +1580,15 @@ function MetaForeignKeys($table, $owner=false, $upper=false) { /** * Choose a database to connect to. Many databases do not support this. * - * @param dbName is the name of the database to select - * @return true or false + * @param string $dbName the name of the database to select + * @return bool */ function SelectDB($dbName) {return false;} /** + * Select a limited number of rows. + * * 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 @@ -1501,12 +1600,13 @@ function SelectDB($dbName) {return false;} * 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') + * @param string $sql + * @param int $offset Row to start calculations from (1-based) + * @param int $nrows Number of rows to get + * @param array|bool $inputarr Array of bind variables + * @param int $secs2cache Private parameter only used by jlim + * + * @return ADORecordSet The recordset ($rs->databaseType == 'array') */ function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) { $nrows = (int)$nrows; @@ -1523,32 +1623,47 @@ function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) { } if ($offset <= 0) { - // access includes ties in result - if ($isaccess) { - $sql = preg_replace( - '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql); + // access includes ties in result + if ($isaccess) { + $sql = preg_replace( + '/(^\s*select\s+(distinctrow|distinct)?)/i', + '\\1 '.$this->hasTop.' '.$nrows.' ', + $sql + ); - if ($secs2cache != 0) { - $ret = $this->CacheExecute($secs2cache, $sql,$inputarr); - } else { - $ret = $this->Execute($sql,$inputarr); - } - return $ret; // PHP5 fix - } else if ($ismssql){ - $sql = preg_replace( - '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql); + if ($secs2cache != 0) { + $ret = $this->CacheExecute($secs2cache, $sql,$inputarr); } else { - $sql = preg_replace( - '/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql); + $ret = $this->Execute($sql,$inputarr); } + return $ret; // PHP5 fix + } else if ($ismssql){ + $sql = preg_replace( + '/(^\s*select\s+(distinctrow|distinct)?)/i', + '\\1 '.$this->hasTop.' '.$nrows.' ', + $sql + ); + } else { + $sql = preg_replace( + '/(^\s*select\s)/i', + '\\1 '.$this->hasTop.' '.$nrows.' ', + $sql + ); + } } else { $nn = $nrows + $offset; if ($isaccess || $ismssql) { $sql = preg_replace( - '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql); + '/(^\s*select\s+(distinctrow|distinct)?)/i', + '\\1 '.$this->hasTop.' '.$nn.' ', + $sql + ); } else { $sql = preg_replace( - '/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql); + '/(^\s*select\s)/i', + '\\1 '.$this->hasTop.' '.$nn.' ', + $sql + ); } } } @@ -1557,17 +1672,19 @@ function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) { // 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS. global $ADODB_COUNTRECS; - $savec = $ADODB_COUNTRECS; - $ADODB_COUNTRECS = false; - + try { + $savec = $ADODB_COUNTRECS; + $ADODB_COUNTRECS = false; - if ($secs2cache != 0) { - $rs = $this->CacheExecute($secs2cache,$sql,$inputarr); - } else { - $rs = $this->Execute($sql,$inputarr); + if ($secs2cache != 0) { + $rs = $this->CacheExecute($secs2cache, $sql, $inputarr); + } else { + $rs = $this->Execute($sql, $inputarr); + } + } finally { + $ADODB_COUNTRECS = $savec; } - $ADODB_COUNTRECS = $savec; if ($rs && !$rs->EOF) { $rs = $this->_rs2rs($rs,$nrows,$offset); } @@ -1578,7 +1695,9 @@ function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) { /** * Create serializable recordset. Breaks rs link to connection. * - * @param rs the recordset to serialize + * @param ADORecordSet $rs the recordset to serialize + * + * @return ADORecordSet_array|bool the new recordset */ function SerializableRS(&$rs) { $rs2 = $this->_rs2rs($rs); @@ -1589,18 +1708,21 @@ function SerializableRS(&$rs) { } /** - * Convert database recordset to an array recordset - * input recordset's cursor should be at beginning, and - * old $rs will be closed. + * Convert a database recordset to an array recordset. + * + * Input recordset's cursor should be at beginning, and old $rs will be closed. * - * @param rs the recordset to copy - * @param [nrows] number of rows to retrieve (optional) - * @param [offset] offset by number of rows (optional) - * @return the new recordset + * @param ADORecordSet $rs the recordset to copy + * @param int $nrows number of rows to retrieve (optional) + * @param int $offset offset by number of rows (optional) + * @param bool $close + * + * @return ADORecordSet_array|ADORecordSet|bool the new recordset */ function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true) { if (! $rs) { - return false; + $ret = false; + return $ret; } $dbtype = $rs->databaseType; if (!$dbtype) { @@ -1635,23 +1757,58 @@ function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true) { } /* - * Return all rows. Compat with PEAR DB + * Return all rows. + * + * Compat with PEAR DB. + * + * @param string $sql SQL statement + * @param array|bool $inputarr Input bind array + * + * @return array|false */ function GetAll($sql, $inputarr=false) { - $arr = $this->GetArray($sql,$inputarr); - return $arr; + return $this->GetArray($sql,$inputarr); } - function GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false) { + /** + * Execute statement and return rows in an array. + * + * The function executes a statement and returns all of the returned rows in + * an array, or false if the statement execution fails or if only 1 column + * is requested in the SQL statement. + * If no records match the provided SQL statement, an empty array is returned. + * + * @param string $sql SQL statement + * @param array|bool $inputarr input bind array + * @param bool $force_array + * @param bool $first2cols + * + * @return array|bool + */ + public function GetAssoc($sql, $inputarr = false, $force_array = false, $first2cols = false) { $rs = $this->Execute($sql, $inputarr); + if (!$rs) { + /* + * Execution failure + */ return false; } - $arr = $rs->GetAssoc($force_array,$first2cols); - return $arr; + return $rs->GetAssoc($force_array, $first2cols); } - function CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false) { + /** + * Search for the results of an executed query in the cache. + * + * @param int $secs2cache + * @param string|bool $sql SQL statement + * @param array|bool $inputarr input bind array + * @param bool $force_array + * @param bool $first2cols + * + * @return false|array + */ + public function CacheGetAssoc($secs2cache, $sql = false, $inputarr = false,$force_array = false, $first2cols = false) { if (!is_numeric($secs2cache)) { $first2cols = $force_array; $force_array = $inputarr; @@ -1660,25 +1817,29 @@ function CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = f if (!$rs) { return false; } - $arr = $rs->GetAssoc($force_array,$first2cols); - return $arr; + return $rs->GetAssoc($force_array, $first2cols); } /** - * Return first element of first row of sql statement. Recordset is disposed - * for you. - * - * @param sql SQL statement - * @param [inputarr] input bind array - */ - function GetOne($sql,$inputarr=false) { + * Return first element of first row of sql statement. Recordset is disposed + * for you. + * + * @param string $sql SQL statement + * @param array|bool $inputarr input bind array + * @return mixed + */ + public function GetOne($sql, $inputarr=false) { global $ADODB_COUNTRECS,$ADODB_GETONE_EOF; - $crecs = $ADODB_COUNTRECS; - $ADODB_COUNTRECS = false; + try { + $crecs = $ADODB_COUNTRECS; + $ADODB_COUNTRECS = false; + $rs = $this->Execute($sql, $inputarr); + } finally { + $ADODB_COUNTRECS = $crecs; + } $ret = false; - $rs = $this->Execute($sql,$inputarr); if ($rs) { if ($rs->EOF) { $ret = $ADODB_GETONE_EOF; @@ -1688,7 +1849,6 @@ function GetOne($sql,$inputarr=false) { $rs->Close(); } - $ADODB_COUNTRECS = $crecs; return $ret; } @@ -1725,6 +1885,17 @@ function CacheGetOne($secs2cache,$sql=false,$inputarr=false) { return $ret; } + /** + * Executes a statement and returns each row's first column in an array. + * + * @param string $sql SQL statement + * @param array|bool $inputarr input bind array + * @param bool $trim enables space trimming of the returned value. + * This is only relevant if the returned string + * is coming from a CHAR type field. + * + * @return array|bool 1D array containning the first row of the query + */ function GetCol($sql, $inputarr = false, $trim = false) { $rs = $this->Execute($sql, $inputarr); @@ -1796,21 +1967,27 @@ function OffsetDate($dayFraction,$date=false) { /** - * - * @param sql SQL statement - * @param [inputarr] input bind array - */ + * Executes a statement and returns a the entire recordset in an array. + * + * @param string $sql SQL statement + * @param array|bool $inputarr input bind array + * + * @return array|false + */ function GetArray($sql,$inputarr=false) { global $ADODB_COUNTRECS; - $savec = $ADODB_COUNTRECS; - $ADODB_COUNTRECS = false; - $rs = $this->Execute($sql,$inputarr); - $ADODB_COUNTRECS = $savec; + try { + $savec = $ADODB_COUNTRECS; + $ADODB_COUNTRECS = false; + $rs = $this->Execute($sql, $inputarr); + } finally { + $ADODB_COUNTRECS = $savec; + } + if (!$rs) if (defined('ADODB_PEAR')) { - $cls = ADODB_PEAR_Error(); - return $cls; + return ADODB_PEAR_Error(); } else { return false; } @@ -1820,22 +1997,23 @@ function GetArray($sql,$inputarr=false) { } function CacheGetAll($secs2cache,$sql=false,$inputarr=false) { - $arr = $this->CacheGetArray($secs2cache,$sql,$inputarr); - return $arr; + return $this->CacheGetArray($secs2cache,$sql,$inputarr); } 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; + try { + $savec = $ADODB_COUNTRECS; + $ADODB_COUNTRECS = false; + $rs = $this->CacheExecute($secs2cache, $sql, $inputarr); + } finally { + $ADODB_COUNTRECS = $savec; + } if (!$rs) if (defined('ADODB_PEAR')) { - $cls = ADODB_PEAR_Error(); - return $cls; + return ADODB_PEAR_Error(); } else { return false; } @@ -1854,18 +2032,22 @@ function GetRandRow($sql, $arr= false) { * Return one row of sql statement. Recordset is disposed for you. * Note that SelectLimit should not be called. * - * @param sql SQL statement - * @param [inputarr] input bind array + * @param string $sql SQL statement + * @param array|bool $inputarr input bind array + * + * @return array|false Array containing the first row of the query */ function GetRow($sql,$inputarr=false) { global $ADODB_COUNTRECS; - $crecs = $ADODB_COUNTRECS; - $ADODB_COUNTRECS = false; - - $rs = $this->Execute($sql,$inputarr); + try { + $crecs = $ADODB_COUNTRECS; + $ADODB_COUNTRECS = false; + $rs = $this->Execute($sql, $inputarr); + } finally { + $ADODB_COUNTRECS = $crecs; + } - $ADODB_COUNTRECS = $crecs; if ($rs) { if (!$rs->EOF) { $arr = $rs->fields; @@ -1879,6 +2061,12 @@ function GetRow($sql,$inputarr=false) { return false; } + /** + * @param int $secs2cache + * @param string|false $sql + * @param mixed[]|bool $inputarr + * @return mixed[]|bool + */ function CacheGetRow($secs2cache,$sql=false,$inputarr=false) { $rs = $this->CacheExecute($secs2cache,$sql,$inputarr); if ($rs) { @@ -1905,7 +2093,7 @@ function CacheGetRow($secs2cache,$sql=false,$inputarr=false) { * $table table name * $fieldArray associative array of data (you must quote strings yourself). * $keyCol the primary key field name or if compound key, array of field names - * autoQuote set to true to use a hueristic to quote strings. Works with nulls and numbers + * autoQuote set to true to use a heuristic to quote strings. Works with nulls and numbers * but does not work with dates nor SQL functions. * has_autoinc the primary key is an auto-inc field, so skip in insert. * @@ -1917,7 +2105,7 @@ function CacheGetRow($secs2cache,$sql=false,$inputarr=false) { 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'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc); @@ -1935,12 +2123,13 @@ function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=fa * * 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') + * @param int $secs2cache Seconds to cache data, set to 0 to force query. This is optional + * @param string $sql + * @param int $offset Row to start calculations from (1-based) + * @param int $nrows Number of rows to get + * @param array $inputarr Array of bind variables + * + * @return ADORecordSet The recordset ($rs->databaseType == 'array') */ function CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false) { if (!is_numeric($secs2cache)) { @@ -2023,11 +2212,12 @@ function _gencachename($sql,$createdir) { /** * Execute SQL, caching recordsets. * - * @param [secs2cache] seconds to cache data, set to 0 to force query. - * This is an optional parameter. - * @param sql SQL statement to execute - * @param [inputarr] holds the input data to bind to - * @return RecordSet or false + * @param int $secs2cache Seconds to cache data, set to 0 to force query. + * This is an optional parameter. + * @param string|bool $sql SQL statement to execute + * @param array|bool $inputarr Holds the input data to bind + * + * @return ADORecordSet RecordSet or false */ function CacheExecute($secs2cache,$sql=false,$inputarr=false) { global $ADODB_CACHE; @@ -2062,11 +2252,8 @@ function CacheExecute($secs2cache,$sql=false,$inputarr=false) { } if (!$rs) { - // no cached rs found + // no cached rs found if ($this->debug) { - if (get_magic_quotes_runtime() && !$this->memCache) { - ADOConnection::outp("Please disable magic_quotes_runtime - it corrupts cache files :("); - } if ($this->debug !== -1) { ADOConnection::outp( " $md5file cache failure: $err (this is a notice and not an error)"); } @@ -2137,13 +2324,32 @@ function CacheExecute($secs2cache,$sql=false,$inputarr=false) { /* - 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. + + $forceUpdate . */ - function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = false, $forceUpdate = true, $magicq = false) { + /** + * 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. + * + * @param $table + * @param $fields_values + * @param string $mode + * @param false $where + * @param bool $forceUpdate If true, perform update even if the data has not changed. + * @param bool $magic_quotes This param is not used since 5.21.0. + * It remains for backwards compatibility. + * + * @return bool + * + * @noinspection PhpUnusedParameterInspection + */ + function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = false, $forceUpdate = true, $magic_quotes = false) { + if (empty($fields_values)) { + $this->outp_throw('AutoExecute: Empty fields array', 'AutoExecute'); + return false; + } if ($where === false && ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) ) { $this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause', 'AutoExecute'); return false; @@ -2164,11 +2370,11 @@ function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = false, $ switch($mode) { case 'UPDATE': case DB_AUTOQUERY_UPDATE: - $sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq); + $sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate); break; case 'INSERT': case DB_AUTOQUERY_INSERT: - $sql = $this->GetInsertSQL($rs, $fields_values, $magicq); + $sql = $this->GetInsertSQL($rs, $fields_values); break; default: $this->outp_throw("AutoExecute: Unknown mode=$mode", 'AutoExecute'); @@ -2180,16 +2386,27 @@ function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = false, $ /** * Generates an Update Query based on an existing recordset. + * * $arrFields is an associative array of fields with the value * that should be assigned. * * Note: This function should only be used on a recordset - * that is run against a single table and sql should only - * be a simple select stmt with no groupby/orderby/limit + * that is run against a single table and sql should only + * be a simple select stmt with no groupby/orderby/limit + * @author "Jonathan Younger" + * + * @param $rs + * @param $arrFields + * @param bool $forceUpdate + * @param bool $magic_quotes This param is not used since 5.21.0. + * It remains for backwards compatibility. + * @param null $force + * + * @return false|string * - * "Jonathan Younger" + * @noinspection PhpUnusedParameterInspection */ - function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null) { + function GetUpdateSQL(&$rs, $arrFields, $forceUpdate=false, $magic_quotes=false, $force=null) { global $ADODB_INCLUDED_LIB; // ******************************************************** @@ -2202,29 +2419,40 @@ function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=n // ******************************************************** if (empty($ADODB_INCLUDED_LIB)) { - include(ADODB_DIR.'/adodb-lib.inc.php'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } - return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force); + return _adodb_getupdatesql($this, $rs, $arrFields, $forceUpdate, $force); } /** * Generates an Insert Query based on an existing recordset. + * * $arrFields is an associative array of fields with the value * that should be assigned. * * Note: This function should only be used on a recordset * that is run against a single table. + * + * @param $rs + * @param $arrFields + * @param bool $magic_quotes This param is not used since 5.21.0. + * It remains for backwards compatibility. + * @param null $force + * + * @return false|string + * + * @noinspection PhpUnusedParameterInspection */ - function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null) { + function GetInsertSQL(&$rs, $arrFields, $magic_quotes=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'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } - return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force); + return _adodb_getinsertsql($this, $rs, $arrFields, $force); } @@ -2277,11 +2505,26 @@ function BlobEncode($blob) { return $blob; } - function GetCharSet() { + /** + * Retrieve the client connection's current character set. + * + * @return string|false The character set, or false if it can't be determined. + */ + function getCharSet() { return $this->charSet; } - function SetCharSet($charset) { + /** + * Sets the client-side character set. + * + * This is only supported for some databases. + * @see https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:setcharset + * + * @param string $charset The character set to switch to. + * + * @return bool True if the character set was changed successfully, false otherwise. + */ + function setCharSet($charset) { $this->charSet = $charset; return true; } @@ -2415,7 +2658,7 @@ function Close() { /** * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans(). * - * @return true if succeeded or false if database does not support transactions + * @return bool true if succeeded or false if database does not support transactions */ function BeginTrans() { if ($this->debug) { @@ -2475,9 +2718,9 @@ function MetaTransaction($mode,$db) { } /** - * If database does not support transactions, always return true as data always commited + * If database does not support transactions, always return true as data always committed * - * @param $ok set to false to rollback transaction, true to commit + * @param bool $ok set to false to rollback transaction, true to commit * * @return true/false. */ @@ -2489,7 +2732,7 @@ function CommitTrans($ok=true) { /** * If database does not support transactions, rollbacks always fail, so return false * - * @return true/false. + * @return bool */ function RollbackTrans() { return false; @@ -2500,7 +2743,7 @@ function RollbackTrans() { * return the databases that the driver can connect to. * Some databases will return an empty array. * - * @return an array of database names. + * @return array|bool an array of database names. */ function MetaDatabases() { global $ADODB_FETCH_MODE; @@ -2724,14 +2967,16 @@ function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for } /** + * Concatenate strings. + * * Different SQL databases used different methods to combine strings together. * This function provides a wrapper. * - * param s variable number of string parameters - * * Usage: $db->Concat($str1,$str2); * - * @return concatenated string + * @param string $s Variable number of string parameters + * + * @return string concatenated string */ function Concat() { $arr = func_get_args(); @@ -2742,9 +2987,9 @@ function Concat() { /** * Converts a date "d" to a string that the database can understand. * - * @param d a date in Unix date time format. + * @param mixed $d a date in Unix date time format. * - * @return date string in database date format + * @return string date string in database date format */ function DBDate($d, $isfld=false) { if (empty($d) && $d !== 0) { @@ -2796,9 +3041,9 @@ function BindTimeStamp($d) { /** * Converts a timestamp "ts" to a string that the database can understand. * - * @param ts a timestamp in Unix date time format. + * @param int|object $ts A timestamp in Unix date time format. * - * @return timestamp string in database timestamp format + * @return string $timestamp string in database timestamp format */ function DBTimeStamp($ts,$isfld=false) { if (empty($ts) && $ts !== 0) { @@ -2829,9 +3074,9 @@ function DBTimeStamp($ts,$isfld=false) { /** * Also in ADORecordSet. - * @param $v is a date string in YYYY-MM-DD format + * @param mixed $v is a date string in YYYY-MM-DD format * - * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format + * @return int|false Date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format */ static function UnixDate($v) { if (is_object($v)) { @@ -2858,9 +3103,9 @@ static function UnixDate($v) { /** * Also in ADORecordSet. - * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format + * @param string|object $v is a timestamp string in YYYY-MM-DD HH-NN-SS format * - * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format + * @return int|false Date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format */ static function UnixTimeStamp($v) { if (is_object($v)) { @@ -2885,14 +3130,15 @@ static function UnixTimeStamp($v) { } /** - * Also in ADORecordSet. - * * Format database date based on user defined format. * - * @param v is the character date in YYYY-MM-DD format, returned by database - * @param fmt is the format to apply to it, using date() + * Also in ADORecordSet. + * + * @param mixed $v Date in YYYY-MM-DD format, returned by database + * @param string $fmt Format to apply, using date() + * @param bool $gmt * - * @return a date formated as user desires + * @return string Formatted date */ function UserDate($v,$fmt='Y-m-d',$gmt=false) { $tt = $this->UnixDate($v); @@ -2911,11 +3157,13 @@ function UserDate($v,$fmt='Y-m-d',$gmt=false) { } /** + * Format timestamp based on user defined format. * - * @param v is the character timestamp in YYYY-MM-DD hh:mm:ss format - * @param fmt is the format to apply to it, using date() + * @param mixed $v Date in YYYY-MM-DD hh:mm:ss format + * @param string $fmt Format to apply, using date() + * @param bool $gmt * - * @return a timestamp formated as user desires + * @return string Formatted timestamp */ function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false) { if (!isset($v)) { @@ -2936,92 +3184,80 @@ function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false) { return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt); } + /** + * Alias for addQ() + * @param string $s + * @param bool [$magic_quotes] + * @return mixed + * + * @deprecated 5.21.0 + * @noinspection PhpUnusedParameterInspection + */ function escape($s,$magic_quotes=false) { - return $this->addq($s,$magic_quotes); + return $this->addQ($s); } /** - * 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); - //$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s)); - } - return str_replace("'",$this->replaceQuote,$s); - } - - // undo magic quotes for " - $s = str_replace('\\"','"',$s); - - if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase')) { - // ' already quoted, no need to change anything - return $s; - } else { - // change \' to '' for sybase/mssql - $s = str_replace('\\\\','\\',$s); - return str_replace("\\'",$this->replaceQuote,$s); + * Quotes a string, without prefixing nor appending quotes. + * + * @param string $s The string to quote + * @param bool $magic_quotes This param is not used since 5.21.0. + * It remains for backwards compatibility. + * + * @return string Quoted string + * + * @noinspection PhpUnusedParameterInspection + */ + function addQ($s, $magic_quotes=false) { + if ($this->replaceQuote[0] == '\\') { + $s = str_replace( + array('\\', "\0"), + array('\\\\', "\\\0"), + $s + ); } + return str_replace("'", $this->replaceQuote, $s); } /** - * Correctly quotes a string so that all strings are escaped. We prefix and append - * to the string single-quotes. - * An example is $db->qstr("Don't bother",magic_quotes_runtime()); + * 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"); + * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:qstr * - * @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. + * @param string $s The string to quote + * @param bool $magic_quotes This param is not used since 5.21.0. + * It remains for backwards compatibility. * - * @return quoted string to be sent back to database + * @return string Quoted string to be sent back to database + * + * @noinspection PhpUnusedParameterInspection */ - function qstr($s,$magic_quotes=false) { - if (!$magic_quotes) { - if ($this->replaceQuote[0] == '\\'){ - // only since php 4.0.5 - $s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s); - //$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s)); - } - return "'".str_replace("'",$this->replaceQuote,$s)."'"; - } - - // undo magic quotes for " - $s = str_replace('\\"','"',$s); - - if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase')) { - // ' already quoted, no need to change anything - return "'$s'"; - } else { - // change \' to '' for sybase/mssql - $s = str_replace('\\\\','\\',$s); - return "'".str_replace("\\'",$this->replaceQuote,$s)."'"; - } + function qStr($s, $magic_quotes=false) { + return "'" . $this->addQ($s) . "'"; } /** - * Will select the supplied $page number from a recordset, given that it is paginated in pages of - * $nrows rows per page. It also saves two boolean values saying if the given page is the first - * and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination. - * - * See docs-adodb.htm#ex8 for an example of usage. - * - * @param sql - * @param nrows is the number of rows per page to get - * @param page is the page number to get (1-based) - * @param [inputarr] array of bind variables - * @param [secs2cache] is a private parameter only used by jlim - * @return the recordset ($rs->databaseType == 'array') - * - * NOTE: phpLens uses a different algorithm and does not use PageExecute(). - * - */ + * 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 docs-adodb.htm#ex8 for an example of usage. + * NOTE: phpLens uses a different algorithm and does not use PageExecute(). + * + * @param string $sql + * @param int $nrows Number of rows per page to get + * @param int $page Page number to get (1-based) + * @param mixed[]|bool $inputarr Array of bind variables + * @param int $secs2cache Private parameter only used by jlim + * + * @return mixed the recordset ($rs->databaseType == 'array') + */ 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'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } if ($this->pageExecuteCountRows) { $rs = _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache); @@ -3037,12 +3273,12 @@ function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) { * $nrows rows per page. It also saves two boolean values saying if the given page is the first * and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination. * - * @param secs2cache seconds to cache data, set to 0 to force query - * @param sql - * @param nrows is the number of rows per page to get - * @param page is the page number to get (1-based) - * @param [inputarr] array of bind variables - * @return the recordset ($rs->databaseType == 'array') + * @param int $secs2cache seconds to cache data, set to 0 to force query + * @param string $sql + * @param int $nrows is the number of rows per page to get + * @param int $page is the page number to get (1-based) + * @param mixed[]|bool $inputarr array of bind variables + * @return mixed the recordset ($rs->databaseType == 'array') */ function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) { /*switch($this->dataProvider) { @@ -3051,8 +3287,79 @@ function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) { break; default: $secs2cache = 0; break; }*/ - $rs = $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache); - return $rs; + return $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache); + } + + /** + * Returns the maximum size of a MetaType C field. If the method + * is not defined in the driver returns ADODB_STRINGMAX_NOTSET + * + * @return int + */ + function charMax() { + return ADODB_STRINGMAX_NOTSET; + } + + /** + * Returns the maximum size of a MetaType X field. If the method + * is not defined in the driver returns ADODB_STRINGMAX_NOTSET + * + * @return int + */ + function textMax() { + return ADODB_STRINGMAX_NOTSET; + } + + /** + * Returns a substring of a varchar type field + * + * Some databases have variations of the parameters, which is why + * we have an ADOdb function for it + * + * @param string $fld The field to sub-string + * @param int $start The start point + * @param int $length An optional length + * + * @return string The SQL text + */ + function substr($fld,$start,$length=0) { + $text = "{$this->substr}($fld,$start"; + if ($length > 0) + $text .= ",$length"; + $text .= ')'; + return $text; + } + + /* + * Formats the date into Month only format MM with leading zeroes + * + * @param string $fld The name of the date to format + * + * @return string The SQL text + */ + function month($fld) { + return $this->sqlDate('m',$fld); + } + + /* + * Formats the date into Day only format DD with leading zeroes + * + * @param string $fld The name of the date to format + * @return string The SQL text + */ + function day($fld) { + return $this->sqlDate('d',$fld); + } + + /* + * Formats the date into year only format YYYY + * + * @param string $fld The name of the date to format + * + * @return string The SQL text + */ + function year($fld) { + return $this->sqlDate('Y',$fld); } /** @@ -3061,7 +3368,7 @@ function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) { * By clearing the message, it becomes possible to detect whether a new error * has occurred, even when it is the same error as before being repeated. * - * @return array|null Array if an error has previously occurred. Null otherwise. + * @return mixed[]|null Array if an error has previously occurred. Null otherwise. */ protected function resetLastError() { $error = error_get_last(); @@ -3075,18 +3382,18 @@ protected function resetLastError() { /** * Compare a previously stored error message with the last error recorded by PHP - * to determine whether a new error has occured. + * to determine whether a new error has occurred. * - * @param array|null $old Optional. Previously stored return value of error_get_last(). + * @param mixed[]|null $old Optional. Previously stored return value of error_get_last(). * - * @return string The error message if a new error has occured - * or an empty string if no (new) errors have occured.. + * @return string The error message if a new error has occurred + * or an empty string if no (new) errors have occurred.. */ protected function getChangedErrorMsg($old = null) { $new = error_get_last(); if (is_null($new)) { - // No error has occured yet at all. + // No error has occurred yet at all. return ''; } @@ -3172,6 +3479,7 @@ class ADORecordSet_empty implements IteratorAggregate var $databaseType = false; var $EOF = true; var $_numOfRows = 0; + /** @var bool|array */ var $fields = false; var $connection = false; @@ -3246,7 +3554,7 @@ function NumCols() { // DATE AND TIME FUNCTIONS //============================================================================================== if (!defined('ADODB_DATE_VERSION')) { - include(ADODB_DIR.'/adodb-time.inc.php'); + include_once(ADODB_DIR.'/adodb-time.inc.php'); } //============================================================================================== @@ -3304,6 +3612,7 @@ class ADORecordSet implements IteratorAggregate { * public variables */ var $dataProvider = "native"; + /** @var bool|array */ var $fields = false; /// holds the current row data var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob /// in other words, we use a text area for editing. @@ -3325,7 +3634,8 @@ class ADORecordSet implements IteratorAggregate { */ var $_numOfRows = -1; /** number of rows, or -1 */ var $_numOfFields = -1; /** number of fields in recordset */ - var $_queryID = -1; /** This variable keeps the result link identifier. */ + /** @var resource result link identifier */ + var $_queryID = -1; var $_currentRow = -1; /** This variable keeps the current row in the Recordset. */ var $_closed = false; /** has recordset been closed */ var $_inited = false; /** Init() should only be called once */ @@ -3339,10 +3649,16 @@ class ADORecordSet implements IteratorAggregate { var $_maxRecordCount = 0; var $datetime = false; + /** + * @var ADOFieldObject[] Field metadata cache + * @see fieldTypesArray() + */ + protected $fieldObjectsCache; + /** * Constructor * - * @param queryID this is the queryID returned by ADOConnection->_query() + * @param resource|int queryID this is the queryID returned by ADOConnection->_query() * */ function __construct($queryID) { @@ -3410,7 +3726,7 @@ function getMenu($name, $defstr = '', $blank1stItem = true, $multiple = false, { global $ADODB_INCLUDED_LIB; if (empty($ADODB_INCLUDED_LIB)) { - include(ADODB_DIR.'/adodb-lib.inc.php'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } return _adodb_getmenu($this, $name, $defstr, $blank1stItem, $multiple, $size, $selectAttr, $compareFirstCol); @@ -3442,7 +3758,7 @@ function getMenuGrouped($name, $defstr = '', $blank1stItem = true, $multiple = f { global $ADODB_INCLUDED_LIB; if (empty($ADODB_INCLUDED_LIB)) { - include(ADODB_DIR.'/adodb-lib.inc.php'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } return _adodb_getmenu_gp($this, $name, $defstr, $blank1stItem, $multiple, $size, $selectAttr, $compareFirstCol); @@ -3503,15 +3819,11 @@ function getMenu3($name, $defstr = '', $blank1stItem = true, $multiple = false, /** * return recordset as a 2-dimensional array. * - * @param [nRows] is the number of rows to return. -1 means every row. + * @param int $nRows Number of rows to return. -1 means every row. * - * @return an array indexed by the rows (0-based) from the recordset + * @return array indexed by the rows (0-based) from the recordset */ function GetArray($nRows = -1) { - global $ADODB_EXTENSION; if ($ADODB_EXTENSION) { - $results = adodb_getall($this,$nRows); - return $results; - } $results = array(); $cnt = 0; while (!$this->EOF && $nRows != $cnt) { @@ -3523,8 +3835,7 @@ function GetArray($nRows = -1) { } function GetAll($nRows = -1) { - $arr = $this->GetArray($nRows); - return $arr; + return $this->GetArray($nRows); } /* @@ -3542,12 +3853,11 @@ function NextRecordSet() { * @param offset is the row to start calculations from (1-based) * @param [nrows] is the number of rows to return * - * @return an array indexed by the rows (0-based) from the recordset + * @return array an array indexed by the rows (0-based) from the recordset */ function GetArrayLimit($nrows,$offset=-1) { if ($offset <= 0) { - $arr = $this->GetArray($nrows); - return $arr; + return $this->GetArray($nrows); } $this->Move($offset); @@ -3568,137 +3878,163 @@ function GetArrayLimit($nrows,$offset=-1) { * * @param [nRows] is the number of rows to return. -1 means every row. * - * @return an array indexed by the rows (0-based) from the recordset + * @return array an array indexed by the rows (0-based) from the recordset */ function GetRows($nRows = -1) { - $arr = $this->GetArray($nRows); - return $arr; + return $this->GetArray($nRows); } /** - * 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. + * 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. This recordset method is currently part of + * the API, but may not be in later versions of ADOdb. By preference, use + * ADOconnnection::getAssoc() + * + * @param bool $force_array (optional) Has only meaning if we have 2 data + * columns. If false, a 1 dimensional + * array is returned, otherwise a 2 dimensional + * array is returned. If this sounds confusing, + * read the source. * - * @param [force_array] has only meaning if we have 2 data columns. If false, a 1 dimensional - * array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing, - * read the source. + * @param bool $first2cols (optional) 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 * - * @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 mixed[]|false * - * @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) { - global $ADODB_EXTENSION; - - $cols = $this->_numOfFields; - if ($cols < 2) { - return false; - } + function getAssoc($force_array = false, $first2cols = false) + { + /* + * Insufficient rows to show data + */ + if ($this->_numOfFields < 2) + return; - // Empty recordset + /* + * Empty recordset + */ if (!$this->fields) { return array(); } - // Determine whether the array is associative or 0-based numeric - $numIndex = array_keys($this->fields) == range(0, count($this->fields) - 1); + /* + * The number of fields is half the actual returned in BOTH mode + */ + $numberOfFields = $this->_numOfFields; - $results = array(); + /* + * Get the fetch mode when the call was executed, this may be + * different than ADODB_FETCH_MODE + */ + $fetchMode = $this->connection->fetchMode; + if ($fetchMode == ADODB_FETCH_BOTH) { + /* + * If we are using BOTH, we present the data as if it + * was in ASSOC mode. This could be enhanced by adding + * a BOTH_ASSOC_MODE class property + * We build a template of numeric keys. you could improve the + * speed by caching this, indexed by number of keys + */ + $testKeys = array_fill(0,$numberOfFields,0); + } - if (!$first2cols && ($cols > 2 || $force_array)) { - if ($ADODB_EXTENSION) { - if ($numIndex) { - while (!$this->EOF) { - $results[trim($this->fields[0])] = array_slice($this->fields, 1); - adodb_movenext($this); - } - } else { - while (!$this->EOF) { - // Fix for array_slice re-numbering numeric associative keys - $keys = array_slice(array_keys($this->fields), 1); - $sliced_array = array(); + $showArrayMethod = 0; - foreach($keys as $key) { - $sliced_array[$key] = $this->fields[$key]; - } + if ($numberOfFields == 2) + /* + * Key is always value of first element + * Value is always value of second element + */ + $showArrayMethod = 1; - $results[trim(reset($this->fields))] = $sliced_array; - adodb_movenext($this); - } - } - } else { - if ($numIndex) { - while (!$this->EOF) { - $results[trim($this->fields[0])] = array_slice($this->fields, 1); - $this->MoveNext(); - } - } else { - while (!$this->EOF) { - // Fix for array_slice re-numbering numeric associative keys - $keys = array_slice(array_keys($this->fields), 1); - $sliced_array = array(); + if ($force_array) + $showArrayMethod = 0; - foreach($keys as $key) { - $sliced_array[$key] = $this->fields[$key]; - } + if ($first2cols) + $showArrayMethod = 1; - $results[trim(reset($this->fields))] = $sliced_array; - $this->MoveNext(); - } - } + $results = array(); + + while (!$this->EOF){ + + $myFields = $this->fields; + + if ($fetchMode == ADODB_FETCH_BOTH) { + /* + * extract the associative keys + */ + $myFields = array_diff_key($myFields,$testKeys); } - } else { - if ($ADODB_EXTENSION) { - // return scalar values - if ($numIndex) { - while (!$this->EOF) { - // some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string - $results[trim(($this->fields[0]))] = $this->fields[1]; - adodb_movenext($this); - } - } else { - while (!$this->EOF) { - // some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string - $v1 = trim(reset($this->fields)); - $v2 = ''.next($this->fields); - $results[$v1] = $v2; - adodb_movenext($this); - } - } - } else { - if ($numIndex) { - while (!$this->EOF) { - // some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string - $results[trim(($this->fields[0]))] = $this->fields[1]; - $this->MoveNext(); - } - } else { - while (!$this->EOF) { - // some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string - $v1 = trim(reset($this->fields)); - $v2 = ''.next($this->fields); - $results[$v1] = $v2; - $this->MoveNext(); - } + + /* + * key is value of first element, rest is data, + * The key is not case processed + */ + $key = array_shift($myFields); + + switch ($showArrayMethod) { + case 0: + + if ($fetchMode == ADODB_FETCH_ASSOC + || $fetchMode == ADODB_FETCH_BOTH) + { + /* + * The driver should have already handled the key + * casing, but in case it did not. We will check and force + * this in later versions of ADOdb + */ + if (ADODB_ASSOC_CASE == ADODB_ASSOC_CASE_UPPER) + $myFields = array_change_key_case($myFields,CASE_UPPER); + + elseif (ADODB_ASSOC_CASE == ADODB_ASSOC_CASE_LOWER) + $myFields = array_change_key_case($myFields,CASE_LOWER); + + /* + * We have already shifted the key off + * the front, so the rest is the value + */ + $results[$key] = $myFields; + } + else + /* + * I want the values in a numeric array, + * nicely re-indexed from zero + */ + $results[$key] = array_values($myFields); + break; + + case 1: + + /* + * Don't care how long the array is, + * I just want value of second column, and it doesn't + * matter whether the array is associative or numeric + */ + $results[$key] = array_shift($myFields); + break; } - } - $ref = $results; # workaround accelerator incompat with PHP 4.4 :( - return $ref; + $this->MoveNext(); + } + /* + * Done + */ + return $results; } - /** * - * @param v is the character timestamp in YYYY-MM-DD hh:mm:ss format - * @param fmt is the format to apply to it, using date() + * @param mixed $v is the character timestamp in YYYY-MM-DD hh:mm:ss format + * @param string [$fmt] is the format to apply to it, using date() * - * @return a timestamp formated as user desires + * @return string a timestamp formated as user desires */ function UserTimeStamp($v,$fmt='Y-m-d H:i:s') { if (is_numeric($v) && strlen($v)<14) { @@ -3717,10 +4053,10 @@ function UserTimeStamp($v,$fmt='Y-m-d H:i:s') { /** - * @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() + * @param mixed $v is the character date in YYYY-MM-DD format, returned by database + * @param string $fmt is the format to apply to it, using date() * - * @return a date formated as user desires + * @return string a date formatted as user desires */ function UserDate($v,$fmt='Y-m-d') { $tt = $this->UnixDate($v); @@ -3737,9 +4073,9 @@ function UserDate($v,$fmt='Y-m-d') { /** - * @param $v is a date string in YYYY-MM-DD format + * @param mixed $v is a date string in YYYY-MM-DD format * - * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format + * @return string date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format */ static function UnixDate($v) { return ADOConnection::UnixDate($v); @@ -3747,9 +4083,9 @@ static function UnixDate($v) { /** - * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format + * @param string|object $v is a timestamp string in YYYY-MM-DD HH-NN-SS format * - * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format + * @return mixed date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format */ static function UnixTimeStamp($v) { return ADOConnection::UnixTimeStamp($v); @@ -3765,26 +4101,30 @@ function Free() { /** - * PEAR DB compat, number of rows - */ + * PEAR DB compat, number of rows + * + * @return int + */ function NumRows() { return $this->_numOfRows; } /** - * PEAR DB compat, number of cols - */ + * PEAR DB compat, number of cols + * + * @return int + */ function NumCols() { return $this->_numOfFields; } /** - * Fetch a row, returning false if no more rows. - * This is PEAR DB compat mode. - * - * @return false or array containing the current record - */ + * Fetch a row, returning false if no more rows. + * This is PEAR DB compat mode. + * + * @return mixed[]|false false or array containing the current record + */ function FetchRow() { if ($this->EOF) { return false; @@ -3802,7 +4142,9 @@ function FetchRow() { * Fetch a row, returning PEAR_Error if no more rows. * This is PEAR DB compat mode. * - * @return DB_OK or error object + * @param mixed[]|false $arr + * + * @return mixed DB_OK or error object */ function FetchInto(&$arr) { if ($this->EOF) { @@ -3817,7 +4159,7 @@ function FetchInto(&$arr) { /** * Move to the first row in the recordset. Many databases do NOT support this. * - * @return true or false + * @return bool true or false */ function MoveFirst() { if ($this->_currentRow == 0) { @@ -3830,7 +4172,7 @@ function MoveFirst() { /** * Move to the last row in the recordset. * - * @return true or false + * @return bool true or false */ function MoveLast() { if ($this->_numOfRows >= 0) { @@ -3852,7 +4194,7 @@ function MoveLast() { /** * Move to next record in the recordset. * - * @return true if there still rows available, or false if there are no more rows (EOF). + * @return bool true if there still rows available, or false if there are no more rows (EOF). */ function MoveNext() { if (!$this->EOF) { @@ -3877,9 +4219,9 @@ function MoveNext() { * Random access to a specific row in the recordset. Some databases do not support * access to previous rows in the databases (no scrolling backwards). * - * @param rowNumber is the row to move to (0-based) + * @param int $rowNumber is the row to move to (0-based) * - * @return true if there still rows available, or false if there are no more rows (EOF). + * @return bool true if there still rows available, or false if there are no more rows (EOF). */ function Move($rowNumber = 0) { $this->EOF = false; @@ -3911,18 +4253,11 @@ function Move($rowNumber = 0) { if ($rowNumber < $this->_currentRow) { return false; } - global $ADODB_EXTENSION; - if ($ADODB_EXTENSION) { - while (!$this->EOF && $this->_currentRow < $rowNumber) { - adodb_movenext($this); - } - } else { - while (! $this->EOF && $this->_currentRow < $rowNumber) { - $this->_currentRow++; + while (! $this->EOF && $this->_currentRow < $rowNumber) { + $this->_currentRow++; - if (!$this->_fetch()) { - $this->EOF = true; - } + if (!$this->_fetch()) { + $this->EOF = true; } } return !($this->EOF); @@ -3938,9 +4273,9 @@ function Move($rowNumber = 0) { * 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 + * @param string $colname is the field to access * - * @return the value of $colname column + * @return mixed the value of $colname column */ function Fields($colname) { return $this->fields[$colname]; @@ -3949,6 +4284,9 @@ function Fields($colname) { /** * Defines the function to use for table fields case conversion * depending on ADODB_ASSOC_CASE + * + * @param int [$case] + * * @return string strtolower/strtoupper or false if no conversion needed */ protected function AssocCaseConvertFunction($case = ADODB_ASSOC_CASE) { @@ -3966,7 +4304,7 @@ protected function AssocCaseConvertFunction($case = ADODB_ASSOC_CASE) { /** * Builds the bind array associating keys to recordset fields * - * @param int $upper Case for the array keys, defaults to uppercase + * @param int [$upper] Case for the array keys, defaults to uppercase * (see ADODB_ASSOC_CASE_xxx constants) */ function GetAssocKeys($upper = ADODB_ASSOC_CASE) { @@ -4003,7 +4341,7 @@ function GetAssocKeys($upper = ADODB_ASSOC_CASE) { * 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 + * @param int [$upper] Case for the array keys, defaults to uppercase * (see ADODB_ASSOC_CASE_xxx constants) */ function GetRowAssoc($upper = ADODB_ASSOC_CASE) { @@ -4026,7 +4364,7 @@ function GetRowAssoc($upper = ADODB_ASSOC_CASE) { /** * Clean up recordset * - * @return true or false + * @return bool */ function Close() { // free connection object - this seems to globally free the object @@ -4040,19 +4378,21 @@ function Close() { } /** - * synonyms RecordCount and RowCount + * Synonyms RecordCount and RowCount * - * @return the number of rows or -1 if this is not supported + * @return int 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. - */ + /** + * If we are using PageExecute(), this will return the maximum possible rows + * that can be returned when paging a recordset. + * + * @return int + */ function MaxRecordCount() { return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount(); } @@ -4118,29 +4458,32 @@ function FieldCount() { return $this->_numOfFields; } - /** - * Get the ADOFieldObject of a specific column. + * Get a Field's metadata from database. + * + * Must be defined by child class. * - * @param fieldoffset is the column position to access(0-based). + * @param int $fieldOffset * - * @return the ADOFieldObject for that column, or false. + * @return ADOFieldObject|false */ - function FetchField($fieldoffset = -1) { - // must be defined by child class - + function fetchField($fieldOffset) + { return false; } /** - * Get the ADOFieldObjects of all columns in an array. + * Get Field metadata for all the recordset's columns in an array. * + * @return ADOFieldObject[] */ - function FieldTypesArray() { - $arr = array(); - for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) - $arr[] = $this->FetchField($i); - return $arr; + function fieldTypesArray() { + if (empty($this->fieldObjectsCache)) { + for ($i = 0; $i < $this->_numOfFields; $i++) { + $this->fieldObjectsCache[] = $this->fetchField($i); + } + } + return $this->fieldObjectsCache; } /** @@ -4150,8 +4493,7 @@ function FieldTypesArray() { * @return the object with the properties set to the fields of the current row */ function FetchObj() { - $o = $this->FetchObject(false); - return $o; + return $this->FetchObject(false); } /** @@ -4172,11 +4514,7 @@ function FetchObject($isupper=true) { } } $i = 0; - if (PHP_VERSION >= 5) { - $o = clone($this->_obj); - } else { - $o = $this->_obj; - } + $o = clone($this->_obj); for ($i=0; $i <$this->_numOfFields; $i++) { $name = $this->_names[$i]; @@ -4201,8 +4539,7 @@ function FetchObject($isupper=true) { * Fixed bug reported by tim@orotech.net */ function FetchNextObj() { - $o = $this->FetchNextObject(false); - return $o; + return $this->FetchNextObject(false); } @@ -4261,6 +4598,7 @@ function MetaType($t,$len=-1,$fieldobj=false) { $len = $fieldobj->max_length; } + // changed in 2.32 to hashing instead of switch stmt for speed... static $typeMap = array( 'VARCHAR' => 'C', @@ -4367,9 +4705,10 @@ function MetaType($t,$len=-1,$fieldobj=false) { "SQLBOOL" => 'L' ); + $tmap = false; $t = strtoupper($t); - $tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N'; + $tmap = (isset($typeMap[$t])) ? $typeMap[$t] : ADODB_DEFAULT_METATYPE; switch ($tmap) { case 'C': // is the char field is too long, return as text field... @@ -4522,7 +4861,7 @@ function _transpose($addfieldnames=true) { global $ADODB_INCLUDED_LIB; if (empty($ADODB_INCLUDED_LIB)) { - include(ADODB_DIR.'/adodb-lib.inc.php'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } $hdr = true; @@ -4556,10 +4895,10 @@ function _transpose($addfieldnames=true) { * * @param array is a 2-dimensional array holding the data. * The first row should hold the column names - * unless paramter $colnames is used. + * unless parameter $colnames is used. * @param typearr holds an array of types. These are the same types * used in MetaTypes (C,B,L,I,N). - * @param [colnames] array of column names. If set, then the first row of + * @param string[]|false [$colnames] array of column names. If set, then the first row of * $array should not hold the column names. */ function InitArray($array,$typearr,$colnames=false) { @@ -4577,10 +4916,10 @@ function InitArray($array,$typearr,$colnames=false) { /** * Setup the Array and datatype file objects * - * @param array is a 2-dimensional array holding the data. + * @param array $array 2-dimensional array holding the data * The first row should hold the column names - * unless paramter $colnames is used. - * @param fieldarr holds an array of ADOFieldObject's. + * unless parameter $colnames is used. + * @param array $fieldarr Array of ADOFieldObject's. */ function InitArrayFields(&$array,&$fieldarr) { $this->_array = $array; @@ -4591,12 +4930,15 @@ function InitArrayFields(&$array,&$fieldarr) { $this->Init(); } + /** + * @param int [$nRows] + * @return array + */ function GetArray($nRows=-1) { if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) { return $this->_array; } else { - $arr = ADORecordSet::GetArray($nRows); - return $arr; + return ADORecordSet::GetArray($nRows); } } @@ -4611,7 +4953,12 @@ function _initrs() { : sizeof($this->_types); } - /* Use associative array to get fields array */ + /** + * Use associative array to get fields array + * + * @param string $colname + * @return mixed + */ function Fields($colname) { $mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode; @@ -4631,6 +4978,11 @@ function Fields($colname) { return $this->fields[$this->bind[strtoupper($colname)]]; } + /** + * @param int [$fieldOffset] + * + * @return \ADOFieldObject + */ function FetchField($fieldOffset = -1) { if (isset($this->_fieldobjects)) { return $this->_fieldobjects[$fieldOffset]; @@ -4643,6 +4995,10 @@ function FetchField($fieldOffset = -1) { return $o; } + /** + * @param int $row + * @return bool + */ function _seek($row) { if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) { $this->_currentRow = $row; @@ -4655,6 +5011,9 @@ function _seek($row) { return false; } + /** + * @return bool + */ function MoveNext() { if (!$this->EOF) { $this->_currentRow++; @@ -4678,6 +5037,9 @@ function MoveNext() { return false; } + /** + * @return bool + */ function _fetch() { $pos = $this->_currentRow; @@ -4725,9 +5087,7 @@ function ADOLoadCode($dbType) { $db = strtolower($dbType); switch ($db) { case 'ado': - if (PHP_VERSION >= 5) { - $db = 'ado5'; - } + $db = 'ado5'; $class = 'ado'; break; @@ -4738,11 +5098,26 @@ function ADOLoadCode($dbType) { case 'pgsql': case 'postgres': - $class = $db = 'postgres8'; + $class = $db = 'postgres9'; + break; + + case 'mysql': + // mysql driver deprecated since 5.5, removed in 7.0 + // automatically switch to mysqli + if(version_compare(PHP_VERSION, '7.0.0', '>=')) { + $db = 'mysqli'; + } + $class = $db; break; default: - $class = $db; break; + if (substr($db, 0, 4) === 'pdo_') { + ADOConnection::outp("Invalid database type: $db"); + return false; + } + + $class = $db; + break; } $file = "drivers/adodb-$db.inc.php"; @@ -4762,20 +5137,24 @@ function ADOLoadCode($dbType) { } /** - * synonym for ADONewConnection for people like me who cannot remember the correct name + * Synonym for ADONewConnection for people like me who cannot remember the correct name + * + * @param string [$db] + * + * @return ADOConnection|false */ function NewADOConnection($db='') { - $tmp = ADONewConnection($db); - return $tmp; + return ADONewConnection($db); } /** * Instantiate a new Connection class for a specific database driver. * - * @param [db] is the database Connection object to create. If undefined, + * @param string $db Database Connection object to create. If undefined, * use the last database driver that was loaded by ADOLoadCode(). * - * @return the freshly created instance of the Connection class. + * @return ADOConnection|false The freshly created instance of the Connection class + * or false in case of error. */ function ADONewConnection($db='') { global $ADODB_NEWCONNECTION, $ADODB_LASTDB; @@ -4783,6 +5162,13 @@ function ADONewConnection($db='') { if (!defined('ADODB_ASSOC_CASE')) { define('ADODB_ASSOC_CASE', ADODB_ASSOC_CASE_NATIVE); } + + /* + * Are there special characters in the dsn password + * that disrupt parse_url + */ + $needsSpecialCharacterHandling = false; + $errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false; if (($at = strpos($db,'://')) !== FALSE) { $origdsn = $db; @@ -4804,8 +5190,27 @@ function ADONewConnection($db='') { $path = substr($path,0,$qmark); } $dsna['path'] = '/' . urlencode($path); - } else - $dsna = @parse_url($fakedsn); + } else { + /* + * Stop # character breaking parse_url + */ + $cFakedsn = str_replace('#','\035',$fakedsn); + if (strcmp($fakedsn,$cFakedsn) != 0) + { + /* + * There is a # in the string + */ + $needsSpecialCharacterHandling = true; + + /* + * This allows us to successfully parse the url + */ + $fakedsn = $cFakedsn; + + } + + $dsna = parse_url($fakedsn); + } if (!$dsna) { return false; @@ -4832,11 +5237,20 @@ function ADONewConnection($db='') { 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 ($needsSpecialCharacterHandling) + { + /* + * Revert back to the original string + */ + $dsna = str_replace('\035','#',$dsna); + } + if (isset($dsna['query'])) { $opt1 = explode('&',$dsna['query']); foreach($opt1 as $k => $v) { @@ -4846,6 +5260,7 @@ function ADONewConnection($db='') { } else { $opt = array(); } + } /* * phptype: Database backend used in PHP (mysql, odbc etc.) @@ -5030,12 +5445,19 @@ function NewPerfMonitor(&$conn) { if (!class_exists($class)) { return false; } - $perf = new $class($conn); - return $perf; + return new $class($conn); } - function NewDataDictionary(&$conn,$drivername=false) { + /** + * Get a new Data Dictionary object for the connection. + * + * @param ADOConnection $conn + * @param string $drivername + * + * @return ADODB_DataDict|false + */ + function newDataDictionary(&$conn, $drivername='') { if (!$drivername) { $drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType); } @@ -5062,8 +5484,6 @@ function NewDataDictionary(&$conn,$drivername=false) { return $dict; } - - /* Perform a print_r, with pre tags for better formatting. */ @@ -5094,7 +5514,7 @@ function adodb_pr($var,$as_string=false) { function adodb_backtrace($printOrArr=true,$levels=9999,$ishtml=null) { global $ADODB_INCLUDED_LIB; if (empty($ADODB_INCLUDED_LIB)) { - include(ADODB_DIR.'/adodb-lib.inc.php'); + include_once(ADODB_DIR.'/adodb-lib.inc.php'); } return _adodb_backtrace($printOrArr,$levels,0,$ishtml); } diff --git a/vendor/adodb/adodb-php/composer.json b/vendor/adodb/adodb-php/composer.json index 30fcc358eb..807866b67a 100644 --- a/vendor/adodb/adodb-php/composer.json +++ b/vendor/adodb/adodb-php/composer.json @@ -20,14 +20,18 @@ "keywords" : [ "database", "abstraction", "layer", "library", "php" ], - "homepage": "http://adodb.org/", + "homepage": "https://adodb.org/", "support" : { "issues" : "https://github.com/ADOdb/ADOdb/issues", "source" : "https://github.com/ADOdb/ADOdb" }, "require" : { - "php" : ">=5.3.2" + "php" : "^5.5.9 || ^7.0 || ^8.0" + }, + + "require-dev" : { + "phpunit/phpunit": "^8.5" }, "autoload" : { diff --git a/vendor/adodb/adodb-php/contrib/toxmlrpc.inc.php b/vendor/adodb/adodb-php/contrib/toxmlrpc.inc.php deleted file mode 100644 index f769cc5fd2..0000000000 --- a/vendor/adodb/adodb-php/contrib/toxmlrpc.inc.php +++ /dev/null @@ -1,181 +0,0 @@ -GetArray()) would work with: - * - ADODB_FETCH_BOTH - * - null values - */ - - /** - * 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 - */ - function rs2xmlrpcval(&$adodbrs) { - - $header = rs2xmlrpcval_header($adodbrs); - $body = rs2xmlrpcval_body($adodbrs); - - // put it all together and build final xmlrpc struct - $xmlrpcrs = new xmlrpcval ( array( - "header" => $header, - "body" => $body, - ), "struct"); - - return $xmlrpcrs; - - } - - /** - * Builds an xmlrpc struct value describing an AdoDB recordset - */ - function rs2xmlrpcval_header($adodbrs) - { - $numfields = $adodbrs->FieldCount(); - $numrecords = $adodbrs->RecordCount(); - - // build structure holding recordset information - $fieldstruct = array(); - for ($i = 0; $i < $numfields; $i++) { - $fld = $adodbrs->FetchField($i); - $fieldarray = array(); - if (isset($fld->name)) - $fieldarray["name"] = new xmlrpcval ($fld->name); - if (isset($fld->type)) - $fieldarray["type"] = new xmlrpcval ($fld->type); - if (isset($fld->max_length)) - $fieldarray["max_length"] = new xmlrpcval ($fld->max_length, "int"); - if (isset($fld->not_null)) - $fieldarray["not_null"] = new xmlrpcval ($fld->not_null, "boolean"); - if (isset($fld->has_default)) - $fieldarray["has_default"] = new xmlrpcval ($fld->has_default, "boolean"); - if (isset($fld->default_value)) - $fieldarray["default_value"] = new xmlrpcval ($fld->default_value); - $fieldstruct[$i] = new xmlrpcval ($fieldarray, "struct"); - } - $fieldcount = new xmlrpcval ($numfields, "int"); - $recordcount = new xmlrpcval ($numrecords, "int"); - $sql = new xmlrpcval ($adodbrs->sql); - $fieldinfo = new xmlrpcval ($fieldstruct, "array"); - - $header = new xmlrpcval ( array( - "fieldcount" => $fieldcount, - "recordcount" => $recordcount, - "sql" => $sql, - "fieldinfo" => $fieldinfo - ), "struct"); - - return $header; - } - - /** - * Builds an xmlrpc struct value out of an AdoDB recordset - * (data values only, no data definition) - */ - function rs2xmlrpcval_body($adodbrs) - { - $numfields = $adodbrs->FieldCount(); - - // build structure containing recordset data - $adodbrs->MoveFirst(); - $rows = array(); - while (!$adodbrs->EOF) { - $columns = array(); - // This should work on all cases of fetch mode: assoc, num, both or default - if ($adodbrs->fetchMode == 'ADODB_FETCH_BOTH' || count($adodbrs->fields) == 2 * $adodbrs->FieldCount()) - for ($i = 0; $i < $numfields; $i++) - if ($adodbrs->fields[$i] === null) - $columns[$i] = new xmlrpcval (''); - else - $columns[$i] = xmlrpc_encode ($adodbrs->fields[$i]); - else - foreach ($adodbrs->fields as $val) - if ($val === null) - $columns[] = new xmlrpcval (''); - else - $columns[] = xmlrpc_encode ($val); - - $rows[] = new xmlrpcval ($columns, "array"); - - $adodbrs->MoveNext(); - } - $body = new xmlrpcval ($rows, "array"); - - return $body; - } - - /** - * Returns an xmlrpc struct value as string out of an AdoDB recordset - */ - function rs2xmlrpcstring (&$adodbrs) { - $xmlrpc = rs2xmlrpcval ($adodbrs); - if ($xmlrpc) - return $xmlrpc->serialize(); - else - return null; - } - - /** - * 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 - $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); - $fld = new ADOFieldObject(); - while (list($key,$value) = $temp->structeach()) { - if ($key == "name") $fld->name = $value->scalarval(); - if ($key == "type") $fld->type = $value->scalarval(); - if ($key == "max_length") $fld->max_length = $value->scalarval(); - if ($key == "not_null") $fld->not_null = $value->scalarval(); - if ($key == "has_default") $fld->has_default = $value->scalarval(); - if ($key == "default_value") $fld->default_value = $value->scalarval(); - } // while - $fields_array[] = $fld; - } // for - - // fetch recordset information into php array - $body = $xmlrpcval->structmem('body'); - for ($i = 0; $i < $numrecords; $i++) { - $data_array[$i]= array(); - $xmlrpcrs_row = $body->arraymem($i); - for ($j = 0; $j < $numfields; $j++) { - $temp = $xmlrpcrs_row->arraymem($j); - $data_array[$i][$j] = $temp->scalarval(); - } // for j - } // for i - - // finally build in-memory recordset object and return it - $rs = new ADORecordSet_array(); - $rs->InitArrayFields($data_array,$fields_array); - return $rs; - - } diff --git a/vendor/adodb/adodb-php/cute_icons_for_site/adodb.gif b/vendor/adodb/adodb-php/cute_icons_for_site/adodb.gif deleted file mode 100644 index c5e8dfc6db..0000000000 Binary files a/vendor/adodb/adodb-php/cute_icons_for_site/adodb.gif and /dev/null differ diff --git a/vendor/adodb/adodb-php/cute_icons_for_site/adodb2.gif b/vendor/adodb/adodb-php/cute_icons_for_site/adodb2.gif deleted file mode 100644 index f12ae2037e..0000000000 Binary files a/vendor/adodb/adodb-php/cute_icons_for_site/adodb2.gif and /dev/null differ diff --git a/vendor/adodb/adodb-php/datadict/datadict-access.inc.php b/vendor/adodb/adodb-php/datadict/datadict-access.inc.php index 2da8ad199a..7a7d4cbbdc 100644 --- a/vendor/adodb/adodb-php/datadict/datadict-access.inc.php +++ b/vendor/adodb/adodb-php/datadict/datadict-access.inc.php @@ -1,16 +1,23 @@ debug) ADOConnection::outp("AlterColumnSQL not supported"); - return array(); + $tabname = $this->TableName ($tabname); + $sql = array(); + list($lines,$pkey,$idxs) = $this->_GenFields($flds); + // genfields can return FALSE at times + if ($lines == null) $lines = array(); + $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; + + $dataTypeWords = array('SET','DATA','TYPE'); + + foreach($lines as $v) + { + /* + * We must now post-process the line to insert the 'SET DATA TYPE' + * text into the alter statement + */ + $e = explode(' ',$v); + + array_splice($e,1,0,$dataTypeWords); + + $v = implode(' ',$e); + + $sql[] = $alter . $v; + } + if (is_array($idxs)) + { + foreach($idxs as $idx => $idxdef) { + $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql = array_merge($sql, $sql_idxs); + } + + } + return $sql; } - function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') + + function dropColumnSql($tabname, $flds, $tableflds='',$tableoptions='') { - if ($this->debug) ADOConnection::outp("DropColumnSQL not supported"); - return array(); - } + + + $tabname = $this->connection->getMetaCasedValue($tabname); + $flds = $this->connection->getMetaCasedValue($flds); + + if (ADODB_ASSOC_CASE == ADODB_ASSOC_CASE_NATIVE ) + { + /* + * METACASE_NATIVE + */ + $tabname = $this->connection->nameQuote . $tabname . $this->connection->nameQuote; + $flds = $this->connection->nameQuote . $flds . $this->connection->nameQuote; + } + $sql = sprintf($this->dropCol,$tabname,$flds); + return (array)$sql; + } + - function ChangeTableSQL($tablename, $flds, $tableoptions = false) + function changeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFields=false) { /** @@ -86,17 +144,25 @@ function ChangeTableSQL($tablename, $flds, $tableoptions = false) $validTypes = array("CHAR","VARC"); $invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME"); // check table exists - $cols = $this->MetaColumns($tablename); + + + $cols = $this->metaColumns($tablename); if ( empty($cols)) { - return $this->CreateTableSQL($tablename, $flds, $tableoptions); + return $this->createTableSQL($tablename, $flds, $tableoptions); } // already exists, alter table instead list($lines,$pkey) = $this->_GenFields($flds); - $alter = 'ALTER TABLE ' . $this->TableName($tablename); + $alter = 'ALTER TABLE ' . $this->tableName($tablename); $sql = array(); foreach ( $lines as $id => $v ) { + /* + * If the metaCasing was NATIVE the col returned with nameQuotes + * around the field. We need to remove this for the metaColumn + * match + */ + $id = str_replace($this->connection->nameQuote,'',$id); if ( isset($cols[$id]) && is_object($cols[$id]) ) { /** If the first field of $v is the fieldname, and diff --git a/vendor/adodb/adodb-php/datadict/datadict-firebird.inc.php b/vendor/adodb/adodb-php/datadict/datadict-firebird.inc.php index 62d52adba7..0020a0ae0b 100644 --- a/vendor/adodb/adodb-php/datadict/datadict-firebird.inc.php +++ b/vendor/adodb/adodb-php/datadict/datadict-firebird.inc.php @@ -1,33 +1,49 @@ seqField = $fname; + $fconstraint = preg_replace("/``/", "\"", $fconstraint); if ($fconstraint) $suffix .= ' '.$fconstraint; return $suffix; } + /** + Generate the SQL to create table. Returns an array of sql strings. + */ + function CreateTableSQL($tabname, $flds, $tableoptions=array()) + { + 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); + + if ($this->autoIncrement && !isset($taboptions['DROP'])) + { $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']); + $sql = array_merge($sql, $sql_idxs); + } + } + + return $sql; + } + + /* CREATE or replace TRIGGER jaddress_insert before insert on jaddress @@ -128,24 +174,60 @@ function _Triggers($tabname,$tableoptions) else $tab = $tab1; $seqField = $this->seqField; $seqname = $this->schema.'.'.$this->seqPrefix.$tab; - $trigname = $this->schema.'.trig_'.$this->seqPrefix.$tab; + $trigname = $this->schema.'.t_'.$this->seqPrefix.$tab; } else { $seqField = $this->seqField; $seqname = $this->seqPrefix.$tab1; - $trigname = 'trig_'.$seqname; + $trigname = 't_'.$seqname; } - if (isset($tableoptions['REPLACE'])) + + if (isset($tableoptions['DROP'])) + { $sql[] = "DROP GENERATOR $seqname"; + } + elseif (isset($tableoptions['REPLACE'])) { $sql[] = "DROP GENERATOR \"$seqname\""; $sql[] = "CREATE GENERATOR \"$seqname\""; $sql[] = "ALTER TRIGGER \"$trigname\" BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END"; } else - { $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"; + { $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; } + /** + * Change the definition of one column + * + * As some DBM's can't do that on there own, you need to supply the complete definition of the new table, + * to allow, recreating the table and copying the content over to the new table + * @param string $tabname table-name + * @param string $flds column-name and type for the changed column + * @param string $tableflds='' complete definition of the new table, eg. for postgres, default '' + * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' + * @return array with SQL strings + */ + function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') + { + $tabname = $this->TableName ($tabname); + $sql = array(); + list($lines,$pkey,$idxs) = $this->_GenFields($flds); + // genfields can return FALSE at times + if ($lines == null) $lines = array(); + $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; + foreach($lines as $v) { + $sql[] = $alter . $v; + } + if (is_array($idxs)) { + foreach($idxs as $idx => $idxdef) { + $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql = array_merge($sql, $sql_idxs); + } + + } + return $sql; + } + } diff --git a/vendor/adodb/adodb-php/datadict/datadict-generic.inc.php b/vendor/adodb/adodb-php/datadict/datadict-generic.inc.php index 51e438b307..c9c8dee871 100644 --- a/vendor/adodb/adodb-php/datadict/datadict-generic.inc.php +++ b/vendor/adodb/adodb-php/datadict/datadict-generic.inc.php @@ -1,16 +1,23 @@ type; - $len = $fieldobj->max_length; } $_typeConversion = array( @@ -94,8 +105,11 @@ function MetaType($t,$len=-1,$fieldobj=false) -3 => 'X' ); - return $_typeConversion($t); + if (isset($_typeConversion[$t])) { + return $_typeConversion[$t]; + } + return ADODB_DEFAULT_METATYPE; } function ActualType($meta) @@ -126,7 +140,6 @@ function ActualType($meta) case 'F': return 'REAL'; case 'N': return 'NUMERIC'; default: - print "RETURN $meta"; return $meta; } } @@ -136,7 +149,7 @@ function AddColumnSQL($tabname, $flds) { $tabname = $this->TableName ($tabname); $f = array(); - list($lines,$pkey) = $this->_GenFields($flds); + list($lines,) = $this->_GenFields($flds); $s = "ALTER TABLE $tabname $this->addCol"; foreach($lines as $v) { $f[] = "\n $v"; @@ -146,30 +159,29 @@ function AddColumnSQL($tabname, $flds) return $sql; } - function DefaultConstraintname($tabname, $colname) + /** + * Get a column's default constraint. + * + * @param string $tabname + * @param string $colname + * @return string|null The Constraint's name, or null if there is none. + */ + function defaultConstraintName($tabname, $colname) { - $constraintname = false; - $rs = $this->connection->Execute( - "SELECT name FROM sys.default_constraints - WHERE object_name(parent_object_id) = '$tabname' - AND col_name(parent_object_id, parent_column_id) = '$colname'" - ); - if ( is_object($rs) ) { - $row = $rs->FetchRow(); - $constraintname = $row['name']; - } - return $constraintname; + $sql = "SELECT name FROM sys.default_constraints + WHERE object_name(parent_object_id) = ? + AND col_name(parent_object_id, parent_column_id) = ?"; + return $this->connection->getOne($sql, [$tabname, $colname]); } - + function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') { $tabname = $this->TableName ($tabname); $sql = array(); - list($lines,$pkey,$idxs) = $this->_GenFields($flds); + list($lines,,$idxs) = $this->_GenFields($flds); $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; foreach($lines as $v) { - $not_null = false; if ($not_null = preg_match('/NOT NULL/i',$v)) { $v = preg_replace('/NOT NULL/i','',$v); } @@ -177,7 +189,7 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') list(,$colname,$default) = $matches; $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v); $t = trim(str_replace('DEFAULT '.$default,'',$v)); - if ( $constraintname = $this->DefaultConstraintname($tabname,$colname) ) { + if ( $constraintname = $this->defaultConstraintName($tabname,$colname) ) { $sql[] = 'ALTER TABLE '.$tabname.' DROP CONSTRAINT '. $constraintname; } if ($not_null) { @@ -190,7 +202,7 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') . ' DEFAULT ' . $default . ' FOR ' . $colname; } else { $colname = strtok($v," "); - if ( $constraintname = $this->DefaultConstraintname($tabname,$colname) ) { + if ( $constraintname = $this->defaultConstraintName($tabname,$colname) ) { $sql[] = 'ALTER TABLE '.$tabname.' DROP CONSTRAINT '. $constraintname; } if ($not_null) { @@ -218,17 +230,19 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') * @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 + * @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); + if (!is_array($flds)) { + /** @noinspection PhpParamsInspection */ + $flds = explode(',', $flds); + } $f = array(); $s = 'ALTER TABLE ' . $tabname; foreach($flds as $v) { - if ( $constraintname = $this->DefaultConstraintname($tabname,$v) ) { + if ( $constraintname = $this->defaultConstraintName($tabname,$v) ) { $sql[] = 'ALTER TABLE ' . $tabname . ' DROP CONSTRAINT ' . $constraintname; } $f[] = ' DROP COLUMN ' . $this->NameQuote($v); @@ -239,6 +253,8 @@ function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') } // return string must begin with space + + /** @noinspection DuplicatedCode */ function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned) { $suffix = ''; @@ -250,78 +266,7 @@ function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint return $suffix; } - /* -CREATE TABLE - [ database_name.[ owner ] . | owner. ] table_name - ( { < column_definition > - | column_name AS computed_column_expression - | < table_constraint > ::= [ CONSTRAINT constraint_name ] } - - | [ { PRIMARY KEY | UNIQUE } [ ,...n ] - ) - -[ ON { filegroup | DEFAULT } ] -[ TEXTIMAGE_ON { filegroup | DEFAULT } ] - -< column_definition > ::= { column_name data_type } - [ COLLATE < collation_name > ] - [ [ DEFAULT constant_expression ] - | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ] - ] - [ ROWGUIDCOL] - [ < column_constraint > ] [ ...n ] - -< column_constraint > ::= [ CONSTRAINT constraint_name ] - { [ NULL | NOT NULL ] - | [ { PRIMARY KEY | UNIQUE } - [ CLUSTERED | NONCLUSTERED ] - [ WITH FILLFACTOR = fillfactor ] - [ON {filegroup | DEFAULT} ] ] - ] - | [ [ FOREIGN KEY ] - REFERENCES ref_table [ ( ref_column ) ] - [ ON DELETE { CASCADE | NO ACTION } ] - [ ON UPDATE { CASCADE | NO ACTION } ] - [ NOT FOR REPLICATION ] - ] - | CHECK [ NOT FOR REPLICATION ] - ( logical_expression ) - } - -< table_constraint > ::= [ CONSTRAINT constraint_name ] - { [ { PRIMARY KEY | UNIQUE } - [ CLUSTERED | NONCLUSTERED ] - { ( column [ ASC | DESC ] [ ,...n ] ) } - [ WITH FILLFACTOR = fillfactor ] - [ ON { filegroup | DEFAULT } ] - ] - | FOREIGN KEY - [ ( column [ ,...n ] ) ] - REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] - [ ON DELETE { CASCADE | NO ACTION } ] - [ ON UPDATE { CASCADE | NO ACTION } ] - [ NOT FOR REPLICATION ] - | CHECK [ NOT FOR REPLICATION ] - ( search_conditions ) - } - - - */ - - /* - CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name - ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) - [ WITH < index_option > [ ,...n] ] - [ ON filegroup ] - < index_option > :: = - { PAD_INDEX | - FILLFACTOR = fillfactor | - IGNORE_DUP_KEY | - DROP_EXISTING | - STATISTICS_NORECOMPUTE | - SORT_IN_TEMPDB - } -*/ + /** @noinspection DuplicatedCode */ function _IndexSQL($idxname, $tabname, $flds, $idxoptions) { $sql = array(); @@ -353,17 +298,18 @@ function _IndexSQL($idxname, $tabname, $flds, $idxoptions) } - function _GetSize($ftype, $ty, $fsize, $fprec) + function _GetSize($ftype, $ty, $fsize, $fprec, $options=false) { switch ($ftype) { - case 'INT': - case 'SMALLINT': - case 'TINYINT': - case 'BIGINT': + case 'INT': + case 'SMALLINT': + case 'TINYINT': + case 'BIGINT': + return $ftype; + } + if ($ty == 'T') { return $ftype; } - if ($ty == 'T') return $ftype; - return parent::_GetSize($ftype, $ty, $fsize, $fprec); - + return parent::_GetSize($ftype, $ty, $fsize, $fprec, $options); } } diff --git a/vendor/adodb/adodb-php/datadict/datadict-mysql.inc.php b/vendor/adodb/adodb-php/datadict/datadict-mysql.inc.php index 22f0b04951..a1ee950a6b 100644 --- a/vendor/adodb/adodb-php/datadict/datadict-mysql.inc.php +++ b/vendor/adodb/adodb-php/datadict/datadict-mysql.inc.php @@ -1,16 +1,23 @@ type; @@ -74,7 +84,7 @@ function MetaType($t,$len=-1,$fieldobj=false) case 'SMALLINT': return $is_serial ? 'R' : 'I2'; case 'MEDIUMINT': return $is_serial ? 'R' : 'I4'; case 'BIGINT': return $is_serial ? 'R' : 'I8'; - default: return 'N'; + default: return ADODB_DEFAULT_METATYPE; } } diff --git a/vendor/adodb/adodb-php/datadict/datadict-oci8.inc.php b/vendor/adodb/adodb-php/datadict/datadict-oci8.inc.php index 77a87ca64e..9a239095cd 100644 --- a/vendor/adodb/adodb-php/datadict/datadict-oci8.inc.php +++ b/vendor/adodb/adodb-php/datadict/datadict-oci8.inc.php @@ -1,16 +1,23 @@ seqField) return array(); - if ($this->schema) { + if ($this->schema) + { $t = strpos($tabname,'.'); - if ($t !== false) $tab = substr($tabname,$t+1); - else $tab = $tabname; + if ($t !== false) + $tab = substr($tabname,$t+1); + else + $tab = $tabname; + + if ($this->connection->useCompactAutoIncrements) + $id = sprintf('%u',crc32(strtolower($tab))); + else + $id = $tab; + $seqname = $this->schema.'.'.$this->seqPrefix.$tab; $trigname = $this->schema.'.'.$this->trigPrefix.$this->seqPrefix.$tab; - } else { - $seqname = $this->seqPrefix.$tabname; - $trigname = $this->trigPrefix.$seqname; + + } + else + { + if ($this->connection->useCompactAutoIncrements) + $id = sprintf('%u',crc32(strtolower($tabname))); + else + $id = $tabname; + + $seqname = $this->seqPrefix.$id; + $trigname = $this->trigPrefix.$id; } if (strlen($seqname) > 30) { $seqname = $this->seqPrefix.uniqid(''); } // end if + if (strlen($trigname) > 30) { $trigname = $this->trigPrefix.uniqid(''); } // end if @@ -221,8 +258,8 @@ function _Triggers($tabname,$tableoptions) $seqIncr = ''; if (isset($tableoptions['SEQUENCE_INCREMENT'])){$seqIncr = ' INCREMENT BY '.$tableoptions['SEQUENCE_INCREMENT'];} $seqStart = ''; - if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];} - $sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache"; + if (isset($tableoptions['SEQUENCE_START'])){$seqStart = ' START WITH '.$tableoptions['SEQUENCE_START'];} + $sql[] = "CREATE SEQUENCE $seqname MINVALUE 1 $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;"; $this->seqField = false; diff --git a/vendor/adodb/adodb-php/datadict/datadict-postgres.inc.php b/vendor/adodb/adodb-php/datadict/datadict-postgres.inc.php index 81a936a4a3..17627c44c1 100644 --- a/vendor/adodb/adodb-php/datadict/datadict-postgres.inc.php +++ b/vendor/adodb/adodb-php/datadict/datadict-postgres.inc.php @@ -1,22 +1,29 @@ TableName ($tabname); + $tabname = $this->tableName($tabname); $sql = array(); $not_null = false; - list($lines,$pkey) = $this->_GenFields($flds); + list($lines,$pkey) = $this->_genFields($flds); $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' '; foreach($lines as $v) { if (($not_null = preg_match('/NOT NULL/i',$v))) { @@ -156,41 +166,31 @@ function AddColumnSQL($tabname, $flds) } - function DropIndexSQL ($idxname, $tabname = NULL) + function dropIndexSQL($idxname, $tabname = NULL) { - return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname))); + return array(sprintf($this->dropIndex, $this->tableName($idxname), $this->tableName($tabname))); } /** * Change the definition of one column * - * Postgres can't do that on it's own, you need to supply the complete defintion of the new table, + * Postgres can't do that on it's own, you need to supply the complete definition of the new table, * to allow, recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds complete defintion of the new table, eg. for postgres, default '' + * @param string $tableflds complete definition of the new table, eg. for postgres, default '' * @param array/ $tableoptions options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ - /* - function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') - { - 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); - }*/ - - function AlterColumnSQL($tabname, $flds, $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); + $tabname = $this->tableName($tabname); $sql = array(); - list($lines,$pkey) = $this->_GenFields($flds); + list($lines,$pkey) = $this->_genFields($flds); $set_null = false; foreach($lines as $v) { $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; @@ -200,7 +200,7 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') // 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 + // if they didn't specify not null, see if they explicitly 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 @@ -208,13 +208,12 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') } if (preg_match('/^([^ ]+) .*DEFAULT (\'[^\']+\'|\"[^\"]+\"|[^ ]+)/',$v,$matches)) { - $existing = $this->MetaColumns($tabname); + $existing = $this->metaColumns($tabname); list(,$colname,$default) = $matches; $alter .= $colname; if ($this->connection) { - $old_coltype = $this->connection->MetaType($existing[strtoupper($colname)]); - } - else { + $old_coltype = $this->connection->metaType($existing[strtoupper($colname)]); + } else { $old_coltype = $t; } $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v); @@ -250,7 +249,7 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') $sql[] = $alter . ' TYPE ' . $rest; } -# list($colname) = explode(' ',$v); + #list($colname) = explode(' ',$v); if ($not_null) { // this does not error out if the column is already not null $sql[] = $alter . ' SET NOT NULL'; @@ -268,31 +267,33 @@ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') 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 $this->_recreate_copy_table($tabname, false, $tableflds,$tableoptions); } /** * Drop one column * - * Postgres < 7.3 can't do that on it's own, you need to supply the complete defintion of the new table, + * Postgres < 7.3 can't do that on it's own, you need to supply the complete definition of the new table, * to allow, recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds complete defintion of the new table, eg. for postgres, default '' + * @param string $tableflds complete definition of the new table, eg. for postgres, default '' * @param array/ $tableoptions options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ - function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') + function dropColumnSQL($tabname, $flds, $tableflds='', $tableoptions='') { $has_drop_column = 7.3 <= (float) @$this->serverInfo['version']; if (!$has_drop_column && !$tableflds) { - if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3"); - return array(); - } + if ($this->debug) { + ADOConnection::outp("dropColumnSQL needs complete table-definiton for PostgreSQL < 7.3"); + } + return array(); + } if ($has_drop_column) { - return ADODB_DataDict::DropColumnSQL($tabname, $flds); + return ADODB_DataDict::dropColumnSQL($tabname, $flds); } - return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions); + return $this->_recreate_copy_table($tabname, $flds, $tableflds, $tableoptions); } /** @@ -303,68 +304,82 @@ function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') * @internal * @param string $tabname table-name * @param string $dropflds column-names to drop - * @param string $tableflds complete defintion of the new table, eg. for postgres + * @param string $tableflds complete definition of the new table, eg. for postgres * @param array/string $tableoptions options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ - function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='') + function _recreate_copy_table($tabname, $dropflds, $tableflds, $tableoptions='') { if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds); $copyflds = array(); - 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) && - in_array($fld->type,array('varchar','char','text','bytea'))) { + foreach($this->metaColumns($tabname) as $fld) { + if (preg_match('/'.$fld->name.' (\w+)/i', $tableflds, $matches)) { + $new_type = strtoupper($matches[1]); + // AlterColumn of a char column to a nummeric one needs an explicit conversation + if (in_array($new_type, array('I', 'I2', 'I4', 'I8', 'N', 'F')) && + 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 && - preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) { - $seq_name = $matches[1]; - $seq_fld = $fld->name; + // other column-type changes needs explicit decode, encode for bytea or cast otherwise + $new_actual_type = $this->actualType($new_type); + if (strtoupper($fld->type) != $new_actual_type) { + if ($new_actual_type == 'BYTEA' && $fld->type == 'text') { + $copyflds[] = "DECODE($fld->name, 'escape')"; + } elseif ($fld->type == 'bytea' && $new_actual_type == 'TEXT') { + $copyflds[] = "ENCODE($fld->name, 'escape')"; + } else { + $copyflds[] = "CAST($fld->name AS $new_actual_type)"; + } + } } + } else { + $copyflds[] = $fld->name; + } + // identify the sequence name and the fld its on + if ($fld->primary_key && $fld->has_default && + preg_match("/nextval\('([^']+)'::(text|regclass)\)/", $fld->default_value, $matches)) { + $seq_name = $matches[1]; + $seq_fld = $fld->name; } } - $copyflds = implode(', ',$copyflds); + $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"; - $aSql = array_merge($aSql,$this->DropTableSQL($tabname)); - $aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions)); + $aSql = array_merge($aSql,$this->dropTableSQL($tabname)); + $aSql = array_merge($aSql,$this->createTableSQL($tabname, $tableflds, $tableoptions)); $aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname"; if ($seq_name && $seq_fld) { // if we have a sequence we need to set it again $seq_name = $tabname.'_'.$seq_fld.'_seq'; // has to be the name of the new implicit sequence - $aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname"; + $aSql[] = "SELECT setval('$seq_name', MAX($seq_fld)) FROM $tabname"; } $aSql[] = "DROP TABLE $tempname"; - // recreate the indexes, if they not contain one of the droped columns - foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data) - { + // recreate the indexes, if they not contain one of the dropped columns + foreach($this->metaIndexes($tabname) as $idx_name => $idx_data) { if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) { - $aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'], - $idx_data['unique'] ? array('UNIQUE') : False)); + $aSql = array_merge($aSql,$this->createIndexSQL($idx_name, $tabname, $idx_data['columns'], + $idx_data['unique'] ? array('UNIQUE') : false)); } } $aSql[] = 'COMMIT'; return $aSql; } - function DropTableSQL($tabname) + function dropTableSQL($tabname) { - $sql = ADODB_DataDict::DropTableSQL($tabname); - - $drop_seq = $this->_DropAutoIncrement($tabname); - if ($drop_seq) $sql[] = $drop_seq; + $sql = ADODB_DataDict::dropTableSQL($tabname); + $drop_seq = $this->_dropAutoIncrement($tabname); + if ($drop_seq) { + $sql[] = $drop_seq; + } return $sql; } // return string must begin with space - function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned) + function _createSuffix($fname, &$ftype, $fnotnull, $fdefault, $fautoinc, $fconstraint, $funsigned) { if ($fautoinc) { $ftype = 'SERIAL'; @@ -377,34 +392,34 @@ function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstrai return $suffix; } - // search for a sequece for the given table (asumes the seqence-name contains the table-name!) + // search for a sequence 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!!! - function _DropAutoIncrement($tabname) + function _dropAutoIncrement($tabname) { $tabname = $this->connection->quote('%'.$tabname.'%'); - $seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'"); + $seq = $this->connection->getOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'"); - // check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly - if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) { - return False; + // check if a tables depends on the sequence and it therefore can't and don't need to be dropped separately + if (!$seq || $this->connection->getOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) { + return false; } return "DROP SEQUENCE ".$seq; } - function RenameTableSQL($tabname,$newname) + function renameTableSQL($tabname, $newname) { if (!empty($this->schema)) { - $rename_from = $this->TableName($tabname); + $rename_from = $this->tableName($tabname); $schema_save = $this->schema; $this->schema = false; - $rename_to = $this->TableName($newname); + $rename_to = $this->tableName($newname); $this->schema = $schema_save; return array (sprintf($this->renameTable, $rename_from, $rename_to)); } - return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname))); + return array (sprintf($this->renameTable, $this->tableName($tabname), $this->tableName($newname))); } /* @@ -440,17 +455,18 @@ function RenameTableSQL($tabname,$newname) [ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] ) [ WHERE predicate ] */ - function _IndexSQL($idxname, $tabname, $flds, $idxoptions) + 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']) ) + if ( isset($idxoptions['DROP']) ) { return $sql; + } } - if ( empty ($flds) ) { + if (empty($flds)) { return $sql; } @@ -458,27 +474,92 @@ function _IndexSQL($idxname, $tabname, $flds, $idxoptions) $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' '; - if (isset($idxoptions['HASH'])) + if (isset($idxoptions['HASH'])) { $s .= 'USING HASH '; - - if ( isset($idxoptions[$this->upperName]) ) + } + + if (isset($idxoptions[$this->upperName])) { $s .= $idxoptions[$this->upperName]; - - if ( is_array($flds) ) - $flds = implode(', ',$flds); + } + + if (is_array($flds)) { + $flds = implode(', ', $flds); + } $s .= '(' . $flds . ')'; $sql[] = $s; return $sql; } - function _GetSize($ftype, $ty, $fsize, $fprec) + function _getSize($ftype, $ty, $fsize, $fprec, $options=false) { if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty != 'I' && strpos($ftype,'(') === false) { $ftype .= "(".$fsize; if (strlen($fprec)) $ftype .= ",".$fprec; $ftype .= ')'; } + + /* + * Handle additional options + */ + if (is_array($options)) { + foreach($options as $type=>$value) { + switch ($type) { + case 'ENUM': + $ftype .= '(' . $value . ')'; + break; + default: + } + } + } return $ftype; } -} + + function changeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFlds=false) + { + global $ADODB_FETCH_MODE; + parent::changeTableSQL($tablename, $flds); + $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; + + $sqlResult=array(); + if ( empty($cols)) { + $sqlResult=$this->createTableSQL($tablename, $flds, $tableoptions); + } else { + $sqlResultAdd = $this->addColumnSQL($tablename, $flds); + $sqlResultAlter = $this->alterColumnSQL($tablename, $flds, '', $tableoptions); + $sqlResult = array_merge((array)$sqlResultAdd, (array)$sqlResultAlter); + + if ($dropOldFlds) { + // already exists, alter table instead + list($lines,$pkey,$idxs) = $this->_genFields($flds); + // genfields can return FALSE at times + if ($lines == null) { + $lines = array(); + } + $alter = 'ALTER TABLE ' . $this->tableName($tablename); + foreach ( $cols as $id => $v ) { + if ( !isset($lines[$id]) ) { + $sqlResult[] = $alter . $this->dropCol . ' ' . $v->name; + } + } + } + + } + return $sqlResult; + } +} // end class diff --git a/vendor/adodb/adodb-php/datadict/datadict-sapdb.inc.php b/vendor/adodb/adodb-php/datadict/datadict-sapdb.inc.php index b5bcab3311..20c16aa6c5 100644 --- a/vendor/adodb/adodb-php/datadict/datadict-sapdb.inc.php +++ b/vendor/adodb/adodb-php/datadict/datadict-sapdb.inc.php @@ -1,17 +1,23 @@ 'F', 'FIXED' => 'N', ); - $type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : 'C'; + $type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : ADODB_DEFAULT_METATYPE; // convert integer-types simulated with fixed back to integer if ($t == 'FIXED' && !$fieldobj->scale && ($len == 20 || $len == 3)) { diff --git a/vendor/adodb/adodb-php/datadict/datadict-sqlite.inc.php b/vendor/adodb/adodb-php/datadict/datadict-sqlite.inc.php index d7d46064f2..942927f8a6 100644 --- a/vendor/adodb/adodb-php/datadict/datadict-sqlite.inc.php +++ b/vendor/adodb/adodb-php/datadict/datadict-sqlite.inc.php @@ -1,18 +1,23 @@ = 7.0 + [#310](https://github.com/ADOdb/ADOdb/issues/310) +- mysqli: return fields as ADOFieldObject objects + [#175](https://github.com/ADOdb/ADOdb/issues/175) +- mysqli (perf): tables() method definition inconsistent with parent + [#435](https://github.com/ADOdb/ADOdb/issues/435) +- mysql: genId() not returning next sequence value + [#493](https://github.com/ADOdb/ADOdb/issues/493) +- oci8: fix syntax error preventing sequence creation + [#540](https://github.com/ADOdb/ADOdb/issues/540) +- oci8: remove use of curly braces in string offsets (deprecated in PHP 7.4) + [#570](https://github.com/ADOdb/ADOdb/issues/570) +- odbc: MetaColumns() can optionally be set to return MetaType for backwards compatibility + [#184](https://github.com/ADOdb/ADOdb/issues/184) +- pdo: allow loading of subclassed recordset + [#245](https://github.com/ADOdb/ADOdb/issues/245) +- pdo: fix PHP notice + [#248](https://github.com/ADOdb/ADOdb/issues/248) +- pdo: fix ADORecordSet class loading + [#250](https://github.com/ADOdb/ADOdb/issues/250) +- pdo/sqlsrv: fix fetchField() method + [#251](https://github.com/ADOdb/ADOdb/issues/251) + [#234](https://github.com/ADOdb/ADOdb/issues/234) +- pgsql: add CIDR data type to MetaType() + [#281](https://github.com/ADOdb/ADOdb/issues/281) +- pgsql: fix param number reset with param(false) + [#380](https://github.com/ADOdb/ADOdb/issues/380) +- pgsql: specialized casts for _recreate_copy_table() + [#207](https://github.com/ADOdb/ADOdb/issues/207) +- sqlite: _createSuffix is now compatible with parent + [#178](https://github.com/ADOdb/ADOdb/issues/178) +- sqlite: metaIndexes could not locate indexes on uppercase table name + [#176](https://github.com/ADOdb/ADOdb/issues/176) +- sqlite: metaIndexes() returns column as array instead of CSV + [#567](https://github.com/ADOdb/ADOdb/issues/567) +- session: string parameters for `assert` are deprecated in PHP 7.2 + [#438](https://github.com/ADOdb/ADOdb/issues/438) +- xml: fix invalid xmlschema03.dtd and descr tag in session schema XML + [#595](https://github.com/ADOdb/ADOdb/issues/595) + +### Security + +- adodb: prevent SQL injection in SelectLimit() + [#311](https://github.com/ADOdb/ADOdb/issues/311) +- session: add 'httponly' flag to cookie + [#190](https://github.com/ADOdb/ADOdb/issues/190) + + +## [5.20.19] - 2020-12-13 + +### Changed + +- PDO: support persistent connections + [#650](https://github.com/ADOdb/ADOdb/issues/650) +- mssql: connect to SQL Server database on a specified port + [#624](https://github.com/ADOdb/ADOdb/issues/624) + +### Fixed + +- DSN database connection with password containing a `#` fails + [#651](https://github.com/ADOdb/ADOdb/issues/651) +- Metacolumns returns wrong type for integer fields in MySQL 8 + [#642](https://github.com/ADOdb/ADOdb/issues/642) +- Uninitialized Variable access in mssqlnative ErrorNo() method + [#637](https://github.com/ADOdb/ADOdb/issues/637) + + +## [5.20.18] - 2020-06-28 + +### Fixed + +- mssql: Retrieve error messages early before connection closed + [#614](https://github.com/ADOdb/ADOdb/issues/614) + + +## [5.20.17] - 2020-03-31 + +### Fixed + +- core: fix PHP notice in ADOdb_Exception constructor when using transactions + [#601](https://github.com/ADOdb/ADOdb/issues/601) +- mssql: fix PHP notice due to uninitialized array with PHP 7.4 + [#608](https://github.com/ADOdb/ADOdb/issues/608) +- active record: Fix UpdateActiveTable failing with mixed case column names + [#610](https://github.com/ADOdb/ADOdb/issues/610) + + +## [5.20.16] - 2020-01-12 + +-### Fixed + + mssql: queries are not correctly closed + [#590](https://github.com/ADOdb/ADOdb/issues/590) + + +## [5.20.15] - 2019-11-24 + +### Fixed + +- core: remove unnecessary srand() calls + [#532](https://github.com/ADOdb/ADOdb/issues/532) +- core: Fix getMenu with ADODB_FETCH_BOTH + [#482](https://github.com/ADOdb/ADOdb/issues/482) +- core: code cleanup for getMenu and related functions + [#563](https://github.com/ADOdb/ADOdb/issues/563) +- pgsql: stop using obsolete pg_attrdef.adsrc column + [#562](https://github.com/ADOdb/ADOdb/issues/562) +- pdo/mysql: remove extraneous comma in $fmtTimeStamp + [#531](https://github.com/ADOdb/ADOdb/issues/531) +- active record: Use ADODB_ASSOC_CASE constant + [#536](https://github.com/ADOdb/ADOdb/issues/536) +- session: Remove session_module_name('user') calls (PHP 7.2 compatibility) + [#449](https://github.com/ADOdb/ADOdb/issues/449) +- PHP 7.4 compatibility: fix deprecated usage of join() + [#547](https://github.com/ADOdb/ADOdb/issues/547) + + +## [5.20.14] - 2019-01-06 + +### Fixed + +- core: Fix support for getMenu with ADODB_FETCH_ASSOC + [#460](https://github.com/ADOdb/ADOdb/issues/460) +- perf/mysql: fix tables() function incompatible with parent + [#435](https://github.com/ADOdb/ADOdb/issues/435) +- perf/mysql: fix error when logging slow queries + [#463](https://github.com/ADOdb/ADOdb/issues/463) + +### Security + +- security: Denial of service in adodb_date() + [#467](https://github.com/ADOdb/ADOdb/issues/467) -- adodb: PHP 7.2 compatibility - - Replace each() with foreach. #373 - - Replace deprecated create_function() calls. #404 - - Replace $php_errormsg with error_get_last(). #405 -- adodb: Don't call `dl()` when the function is disabled #406 -- adodb: Don't bother with magic quotes when not available #407 -- adodb: fix potential SQL injection vector in SelectLimit(). #190 #311 #401 -## 5.20.11 - Withdrawn +## [5.20.13] - 2018-08-06 + +### Fixed + +- core: Fix query execution failures with mismatched quotes + [#420](https://github.com/ADOdb/ADOdb/issues/420) +- ldap: Fix connections using URIs + [#340](https://github.com/ADOdb/ADOdb/issues/340) +- mssql: Fix Time field format, allowing autoExecute() to inserting time + [#432](https://github.com/ADOdb/ADOdb/issues/432) +- mssql: Fix Insert_ID returning null with table name in brackets + [#313](https://github.com/ADOdb/ADOdb/issues/313) +- mssql: Fix count wrapper + [#423](https://github.com/ADOdb/ADOdb/issues/423) +- oci8: Fix prepared statements failure + [#318](https://github.com/ADOdb/ADOdb/issues/318) +- oci8po: Fix incorrect query parameter replacements + [#370](https://github.com/ADOdb/ADOdb/issues/370) +- pdo: fix PHP notice due to uninitialized variable + [#437](https://github.com/ADOdb/ADOdb/issues/437) + + +## [5.20.12] - 2018-03-30 + +### Fixed + +- adodb: PHP 7.2 compatibility + - Replace each() with foreach + [#373](https://github.com/ADOdb/ADOdb/issues/373) + - Replace deprecated create_function() calls + [#404](https://github.com/ADOdb/ADOdb/issues/404) + - Replace $php_errormsg with error_get_last() + [#405](https://github.com/ADOdb/ADOdb/issues/405) +- adodb: Don't call `dl()` when the function is disabled + [#406](https://github.com/ADOdb/ADOdb/issues/406) +- adodb: Don't bother with magic quotes when not available + [#407](https://github.com/ADOdb/ADOdb/issues/407) +- adodb: fix potential SQL injection vector in SelectLimit() + [#190](https://github.com/ADOdb/ADOdb/issues/190) + [#311](https://github.com/ADOdb/ADOdb/issues/311) + [#401](https://github.com/ADOdb/ADOdb/issues/401) + + +## [5.20.11] - Withdrawn This release has been withdrawn as it introduced a regression on PHP 5.x. Please use version 5.20.12 or later. -## 5.20.10 - 08-Mar-2018 -- Fix year validation in adodb_validdate() #375 -- Release db resource when closing connection #379 -- Avoid full file path disclosure in ADOLoadCode() #389 -- mssql: fix PHP warning in _adodb_getcount() #359 -- mssql: string keys are not allowed in parameters arrays #316 -- mysqli: fix PHP warning on DB connect #348 -- pdo: fix auto-commit error in sqlsrv #347 -- sybase: fix PHP Warning in _connect()/_pconnect #371 +## [5.20.10] - 2018-03-08 + +### Fixed + +- Fix year validation in adodb_validdate() + [#375](https://github.com/ADOdb/ADOdb/issues/375) +- Release db resource when closing connection + [#379](https://github.com/ADOdb/ADOdb/issues/379) +- Avoid full file path disclosure in ADOLoadCode() + [#389](https://github.com/ADOdb/ADOdb/issues/389) +- mssql: fix PHP warning in _adodb_getcount() + [#359](https://github.com/ADOdb/ADOdb/issues/359) +- mssql: string keys are not allowed in parameters arrays + [#316](https://github.com/ADOdb/ADOdb/issues/316) +- mysqli: fix PHP warning on DB connect + [#348](https://github.com/ADOdb/ADOdb/issues/348) +- pdo: fix auto-commit error in sqlsrv + [#347](https://github.com/ADOdb/ADOdb/issues/347) +- sybase: fix PHP Warning in _connect()/_pconnect + [#371](https://github.com/ADOdb/ADOdb/issues/371) + + +## [5.20.9] - 2016-12-21 + +### Fixed -## 5.20.9 - 21-Dec-2016 +- mssql: fix syntax error in version matching regex + [#305](https://github.com/ADOdb/ADOdb/issues/305) -- mssql: fix syntax error in version matching regex #305 -## 5.20.8 - 17-Dec-2016 +## [5.20.8] - 2016-12-17 -- mssql: support MSSQL Server 2016 and later #294 -- mssql: fix Find() returning no results. #298 -- mssql: fix Sequence name forced to 'adodbseq'. #295, #300 -- mssql: fix GenId() not returning next sequence value with SQL Server 2005/2008. #302 -- mssql: fix drop/alter column with existing default constraint. #290 -- mssql: fix PHP notice in MetaColumns(). #289 -- oci8po: fix inconsistent variable binding in SelectLimit() #288 -- oci8po: fix SelectLimit() with prepared statements #282 +### Fixed -## 5.20.7 - 20-Sep-2016 +- mssql: support MSSQL Server 2016 and later + [#294](https://github.com/ADOdb/ADOdb/issues/294) +- mssql: fix Find() returning no results + [#298](https://github.com/ADOdb/ADOdb/issues/298) +- mssql: fix Sequence name forced to 'adodbseq' + [#295](https://github.com/ADOdb/ADOdb/issues/295), + [#300](https://github.com/ADOdb/ADOdb/issues/300) +- mssql: fix GenId() not returning next sequence value with SQL Server 2005/2008 + [#302](https://github.com/ADOdb/ADOdb/issues/302) +- mssql: fix drop/alter column with existing default constraint + [#290](https://github.com/ADOdb/ADOdb/issues/290) +- mssql: fix PHP notice in MetaColumns() + [#289](https://github.com/ADOdb/ADOdb/issues/289) +- oci8po: fix inconsistent variable binding in SelectLimit() + [#288](https://github.com/ADOdb/ADOdb/issues/288) +- oci8po: fix SelectLimit() with prepared statements + [#282](https://github.com/ADOdb/ADOdb/issues/282) -- security: Fix SQL injection in PDO drivers qstr() method (CVE-2016-7405). #226 -- oci8po: prevent segfault on PHP 7. #259 -- pdo/mysql: Fix MetaTables() method. #275 -## 5.20.6 - 31-Aug-2016 +## [5.20.7] - 2016-09-20 -- security: Fix XSS vulnerability in old test script (CVE-2016-4855). #274 -- adodb: Exit with error/exception when the ADOdb Extension is loaded. #269 -- adodb: Fix truncated exception messages. #273 +### Fixed -## 5.20.5 - 10-Aug-2016 +- oci8po: prevent segfault on PHP 7 + [#259](https://github.com/ADOdb/ADOdb/issues/259) +- pdo/mysql: Fix MetaTables() method + [#275](https://github.com/ADOdb/ADOdb/issues/275) -- adodb: Fix fatal error when connecting with missing extension. #254 -- adodb: Fix _adodb_getcount(). #236 -- mssql: Destructor fails if recordset already closed. #268 -- mssql: Use SQL server native data types if available. #234 -- mysqli: Fix PHP notice in _close() method. #240 -- pdo: Let driver handle SelectDB() and SQLDate() calls. #242 -- xml: Fix PHP strict warning. #260 -- xml: remove calls to 'unset($this)' (PHP 7.1 compatibility). #257 +### Security -## 5.20.4 - 31-Mar-2016 +- security: Fix SQL injection in PDO drivers qstr() method (CVE-2016-7405) + [#226](https://github.com/ADOdb/ADOdb/issues/226) -- adodb: Fix BulkBind() param count validation. #199 -- mysqli: fix PHP warning in recordset destructor. #217 -- mysqli: cast port number to int when connecting (PHP7 compatibility). #218 -## 5.20.3 - 01-Jan-2016 +## [5.20.6] - 2016-08-31 -- mssql: PHP warning when closing recordset from destructor not fixed in v5.20.2. #180 +### Fixed -## 5.20.2 - 27-Dec-2015 +- adodb: Exit with error/exception when the ADOdb Extension is loaded + [#269](https://github.com/ADOdb/ADOdb/issues/269) +- adodb: Fix truncated exception messages + [#273](https://github.com/ADOdb/ADOdb/issues/273) -- adodb: Remove a couple leftover PHP 4.x constructors (PHP7 compatibility). #139 -- db2ora: Remove deprecated preg_replace '/e' flag (PHP7 compatibility). #168 -- mysql: MoveNext() now respects ADODB_ASSOC_CASE. #167 -- mssql, mysql, informix: Avoid PHP warning when closing recordset from destructor. #170 +### Security -## 5.20.1 - 06-Dec-2015 +- security: Fix XSS vulnerability in old test script (CVE-2016-4855) + [#274](https://github.com/ADOdb/ADOdb/issues/274) + +## [5.20.5] - 2016-08-10 + +### Fixed + +- adodb: Fix fatal error when connecting with missing extension + [#254](https://github.com/ADOdb/ADOdb/issues/254) +- adodb: Fix _adodb_getcount() + [#236](https://github.com/ADOdb/ADOdb/issues/236) +- mssql: Destructor fails if recordset already closed + [#268](https://github.com/ADOdb/ADOdb/issues/268) +- mssql: Use SQL server native data types if available + [#234](https://github.com/ADOdb/ADOdb/issues/234) +- mysqli: Fix PHP notice in _close() method + [#240](https://github.com/ADOdb/ADOdb/issues/240) +- pdo: Let driver handle SelectDB() and SQLDate() calls + [#242](https://github.com/ADOdb/ADOdb/issues/242) +- xml: Fix PHP strict warning + [#260](https://github.com/ADOdb/ADOdb/issues/260) +- xml: remove calls to 'unset($this)' (PHP 7.1 compatibility) + [#257](https://github.com/ADOdb/ADOdb/issues/257) + + +## [5.20.4] - 2016-03-31 + +### Fixed + +- adodb: Fix BulkBind() param count validation + [#199](https://github.com/ADOdb/ADOdb/issues/199) +- mysqli: fix PHP warning in recordset destructor + [#217](https://github.com/ADOdb/ADOdb/issues/217) +- mysqli: cast port number to int when connecting (PHP7 compatibility) + [#218](https://github.com/ADOdb/ADOdb/issues/218) + + +## [5.20.3] - 2016-01-01 + +### Fixed + +- mssql: PHP warning when closing recordset from destructor not fixed in v5.20.2 + [#180](https://github.com/ADOdb/ADOdb/issues/180) + + +## [5.20.2] - 2015-12-27 + +### Fixed + +- adodb: Remove a couple leftover PHP 4.x constructors (PHP7 compatibility) + [#139](https://github.com/ADOdb/ADOdb/issues/139) +- db2ora: Remove deprecated preg_replace '/e' flag (PHP7 compatibility) + [#168](https://github.com/ADOdb/ADOdb/issues/168) +- mysql: MoveNext() now respects ADODB_ASSOC_CASE + [#167](https://github.com/ADOdb/ADOdb/issues/167) +- mssql, mysql, informix: Avoid PHP warning when closing recordset from destructor + [#170](https://github.com/ADOdb/ADOdb/issues/170) + + +## [5.20.1] - 2015-12-06 + +### Fixed - adodb: Fix regression introduced in 5.20.0, causing a PHP Warning when - calling GetAssoc() on an empty recordset. See Github #162 -- ADOConnection::Version() now handles SemVer. See Github #164 - -## 5.20.0 - 28-Nov-2015 - -- adodb: Fix regression introduced in v5.19, causing queries to return empty rows. See Github #20, #93, #95 -- adodb: Fix regression introduced in v5.19 in GetAssoc() with ADODB_FETCH_ASSOC mode and '0' as data. See Github #102 -- adodb: AutoExecute correctly handles empty result set in case of updates. See Github #13 -- adodb: Fix regex in Version(). See Github #16 -- adodb: Align method signatures to definition in parent class ADODB_DataDict. See Github #31 -- adodb: Improve compatibility of ADORecordSet_empty, thanks to Sjan Evardsson. See Github #43 -- adodb: fix ADODB_Session::open() failing after successful ADONewConnection() call, thanks to Sjan Evardsson. See Github #44 -- adodb: Only include memcache library once for PHPUnit 4.x, thanks to Alan Farquharson. See Github #74 + calling GetAssoc() on an empty recordset + [#162](https://github.com/ADOdb/ADOdb/issues/162) +- ADOConnection::Version() now handles SemVer + [#164](https://github.com/ADOdb/ADOdb/issues/164) + + +## [5.20.0] - 2015-11-28 + +### Added + +- adodb: new setConnectionParameter() method, + previously implemented in mssqlnative driver only + [#158](https://github.com/ADOdb/ADOdb/issues/158). +- pdo: new sqlsrv driver, thanks to MarcelTO + [#81](https://github.com/ADOdb/ADOdb/issues/81) +- adodb: support for pagination with complex queries, thanks to Mike Benoit + [#88](https://github.com/ADOdb/ADOdb/issues/88) +- pdo/mysql: New methods to make the driver behave more like mysql/mysqli, thanks to Andy Theuninck + [#40](https://github.com/ADOdb/ADOdb/issues/40) + +### Changed + +- adodb: Define DB_AUTOQUERY_* constants in main include file + [#49](https://github.com/ADOdb/ADOdb/issues/49) +- adodb: Add mssql's DATETIME2 type to ADOConnection::MetaType(), thanks to MarcelTO + [#80](https://github.com/ADOdb/ADOdb/issues/80) +- adodb: Initialize charset in ADOConnection::SetCharSet + [#39](https://github.com/ADOdb/ADOdb/issues/39) +- adodb: Parse port out of hostname if specified in connection parameters, thanks to Andy Theuninck + [#63](https://github.com/ADOdb/ADOdb/issues/63) +- adodb: Improve compatibility of ADORecordSet_empty, thanks to Sjan Evardsson + [#43](https://github.com/ADOdb/ADOdb/issues/43) +- mssqlnative: Use ADOConnection::outp instead of error_log + [#12](https://github.com/ADOdb/ADOdb/issues/12) + +### Fixed + +- adodb: Fix regression introduced in v5.19, causing queries to return empty rows + [#20](https://github.com/ADOdb/ADOdb/issues/20) + [#93](https://github.com/ADOdb/ADOdb/issues/93) + [#95](https://github.com/ADOdb/ADOdb/issues/95) +- adodb: Fix regression introduced in v5.19 in GetAssoc() with ADODB_FETCH_ASSOC mode and '0' as data + [#102](https://github.com/ADOdb/ADOdb/issues/102) +- adodb: AutoExecute correctly handles empty result set in case of updates + [#13](https://github.com/ADOdb/ADOdb/issues/13) +- adodb: Fix regex in Version() + [#16](https://github.com/ADOdb/ADOdb/issues/16) +- adodb: Align method signatures to definition in parent class ADODB_DataDict + [#31](https://github.com/ADOdb/ADOdb/issues/31) +- adodb: fix ADODB_Session::open() failing after successful ADONewConnection() call, thanks to Sjan Evardsson + [#44](https://github.com/ADOdb/ADOdb/issues/44) +- adodb: Only include memcache library once for PHPUnit 4.x, thanks to Alan Farquharson + [#74](https://github.com/ADOdb/ADOdb/issues/74) - adodb: Move() returns false when given row is < 0, thanks to Mike Benoit. -- adodb: Add support for pagination with complex queries, thanks to Mike Benoit. See Github #88 -- adodb: Parse port out of hostname if specified in connection parameters, thanks to Andy Theuninck. See Github #63 -- adodb: Fix inability to set values from 0 to null (and vice versa) with Active Record, thanks to Louis Johnson. See Github #71 -- adodb: Fix PHP strict warning in ADODB_Active_Record::Reload(), thanks to Boštjan Žokš. See Github #75 -- adodb: Add mssql's DATETIME2 type to ADOConnection::MetaType(), thanks to MarcelTO. See Github #80 -- adodb: When flushing cache, initialize it if it is not set, thanks to Paul Haggart. See Github #57 -- adodb: Define DB_AUTOQUERY_* constants in main include file. See Github #49 +- adodb: Fix inability to set values from 0 to null (and vice versa) with Active Record, thanks to Louis Johnson + [#71](https://github.com/ADOdb/ADOdb/issues/71) +- adodb: Fix PHP strict warning in ADODB_Active_Record::Reload(), thanks to Boštjan Žokš + [#75](https://github.com/ADOdb/ADOdb/issues/75) +- adodb: When flushing cache, initialize it if it is not set, thanks to Paul Haggart + [#57](https://github.com/ADOdb/ADOdb/issues/57) - adodb: Improve documentation of fetch mode and assoc case - adodb: Improve logic to build the assoc case bind array -- adodb: Strict-standards compliance for function names. See Github #18, #142 -- adodb: Remove old PHP 4.x constructors for compatibility with PHP 7. See Github #139 -- adodb: Initialize charset in ADOConnection::SetCharSet. See Github #39 -- adodb: Fix incorrect handling of input array in Execute(). See Github #146 -- adodb: Release Recordset when raising exception. See Github #143 -- adodb: Added new setConnectionParameter() method, currently implemented in mssqlnative driver only. See Github #158. -- adodb-lib: Optimize query pagination, thanks to Mike Benoit. See Github #110 -- memcache: use include_once() to avoid issues with PHPUnit. See http://phplens.com/lens/lensforum/msgs.php?id=19489 -- mssql_n: Allow use of prepared statements with driver. See Github #22 -- mssqlnative: Use ADOConnection::outp instead of error_log. See Github #12 -- mssqlnative: fix failure on Insert_ID() if the insert statement contains a semicolon in a value string, thanks to sketule. See Github #96 -- mssqlnative: Fix "invalid parameter was passed to sqlsrv_configure" error, thanks to Ray Morris. See Github #103 -- mssqlnative: Fix insert_ID() failing if server returns more than 1 row, thanks to gitjti. See Github #41 -- mysql: prevent race conditions when creating/dropping sequences, thanks to MikeB. See Github #28 +- adodb: Strict-standards compliance for function names + [#18](https://github.com/ADOdb/ADOdb/issues/18) + [#142](https://github.com/ADOdb/ADOdb/issues/142) +- adodb: Remove old PHP 4.x constructors for compatibility with PHP 7 + [#139](https://github.com/ADOdb/ADOdb/issues/139) +- adodb: Fix incorrect handling of input array in Execute() + [#146](https://github.com/ADOdb/ADOdb/issues/146) +- adodb: Release Recordset when raising exception + [#143](https://github.com/ADOdb/ADOdb/issues/143) +- adodb-lib: Optimize query pagination, thanks to Mike Benoit + [#110](https://github.com/ADOdb/ADOdb/issues/110) +- memcache: use include_once() to avoid issues with PHPUnit. See PHPLens Issue No: 19489 +- mssql_n: Allow use of prepared statements with driver + [#22](https://github.com/ADOdb/ADOdb/issues/22) +- mssqlnative: fix failure on Insert_ID() if the insert statement contains a semicolon in a value string, thanks to sketule + [#96](https://github.com/ADOdb/ADOdb/issues/96) +- mssqlnative: Fix "invalid parameter was passed to sqlsrv_configure" error, thanks to Ray Morris + [#103](https://github.com/ADOdb/ADOdb/issues/103) +- mssqlnative: Fix insert_ID() failing if server returns more than 1 row, thanks to gitjti + [#41](https://github.com/ADOdb/ADOdb/issues/41) +- mysql: prevent race conditions when creating/dropping sequences, thanks to MikeB + [#28](https://github.com/ADOdb/ADOdb/issues/28) - mysql: Fix adodb_strip_order_by() bug causing SQL error for subqueries with order/limit clause, thanks to MikeB. - mysql: workaround for HHVM behavior, thanks to Mike Benoit. -- mysqli: Fix qstr() when called without an active connection. See Github #11 -- oci8: Fix broken quoting of table name in AddColumnSQL and AlterColumnSQL, thanks to Andreas Fernandez. see Github #67 -- oci8: Allow oci8 driver to use lowercase field names in assoc mode. See Github #21 -- oci8po: Prevent replacement of '?' within strings, thanks to Mark Newnham. See Github #132 -- pdo: Added missing property (fixes PHP notices). see Github #56 -- pdo: Align method signatures with parent class, thanks to Andy Theuninck. see Github #62 -- pdo: new sqlsrv driver, thanks to MarcelTO. See Github #81 -- pdo/mysql: New methods to make the driver behave more like mysql/mysqli, thanks to Andy Theuninck. see Github #40 +- mysqli: Fix qstr() when called without an active connection + [#11](https://github.com/ADOdb/ADOdb/issues/11) +- oci8: Fix broken quoting of table name in AddColumnSQL and AlterColumnSQL, thanks to Andreas Fernandez + [#67](https://github.com/ADOdb/ADOdb/issues/67) +- oci8: Allow oci8 driver to use lowercase field names in assoc mode + [#21](https://github.com/ADOdb/ADOdb/issues/21) +- oci8po: Prevent replacement of '?' within strings, thanks to Mark Newnham + [#132](https://github.com/ADOdb/ADOdb/issues/132) +- pdo: Added missing property (fixes PHP notices) + [#56](https://github.com/ADOdb/ADOdb/issues/56) +- pdo: Align method signatures with parent class, thanks to Andy Theuninck + [#62](https://github.com/ADOdb/ADOdb/issues/62) - postgres: Stop using legacy function aliases -- postgres: Fix AlterColumnSQL when updating multiple columns, thanks to Jouni Ahto. See Github #72 -- postgres: Fix support for HHVM 3.6, thanks to Mike Benoit. See Github #87 -- postgres: Noblob optimization, thanks to Mike Benoit. See Github #112 -- postgres7: fix system warning in MetaColumns() with schema. See http://phplens.com/lens/lensforum/msgs.php?id=19481 +- postgres: Fix AlterColumnSQL when updating multiple columns, thanks to Jouni Ahto + [#72](https://github.com/ADOdb/ADOdb/issues/72) +- postgres: Fix support for HHVM 3.6, thanks to Mike Benoit + [#87](https://github.com/ADOdb/ADOdb/issues/87) +- postgres: Noblob optimization, thanks to Mike Benoit + [#112](https://github.com/ADOdb/ADOdb/issues/112) +- postgres7: fix system warning in MetaColumns() with schema. See PHPLens Issue No: 19481 - sqlite3: ServerInfo() now returns driver's version -- sqlite3: Fix wrong connection parameter in _connect(), thanks to diogotoscano. See Github #51 -- sqlite3: Fix FetchField, thanks to diogotoscano. See Github #53 -- sqlite3: Fix result-less SQL statements executed twice. See Github #99 -- sqlite3: use -1 for _numOfRows. See Github #151 -- xmlschema: Fix ExtractSchema() when given $prefix and $stripprefix parameters, thanks to peterdd. See Github #92 -- Convert languages files to UTF-8, thanks to Marc-Etienne Vargenau. See Github #32. - -## 5.19 - 23-Apr-2014 +- sqlite3: Fix wrong connection parameter in _connect(), thanks to diogotoscano + [#51](https://github.com/ADOdb/ADOdb/issues/51) +- sqlite3: Fix FetchField, thanks to diogotoscano + [#53](https://github.com/ADOdb/ADOdb/issues/53) +- sqlite3: Fix result-less SQL statements executed twice + [#99](https://github.com/ADOdb/ADOdb/issues/99) +- sqlite3: use -1 for _numOfRows + [#151](https://github.com/ADOdb/ADOdb/issues/151) +- xmlschema: Fix ExtractSchema() when given $prefix and $stripprefix parameters, thanks to peterdd + [#92](https://github.com/ADOdb/ADOdb/issues/92) +- Convert languages files to UTF-8, thanks to Marc-Etienne Vargenau + [#32](https://github.com/ADOdb/ADOdb/issues/32) + + +## 5.19 - 2014-04-23 **NOTE:** This release suffers from a [known issue with Associative Fetch Mode](https://github.com/ADOdb/ADOdb/issues/20) @@ -197,16 +765,16 @@ It causes recordsets to return empty strings (no data) when using some database The problem has been reported on MSSQL, Interbase and Foxpro, but possibly affects other database types as well; all drivers derived from the above are also impacted. -- 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: GetRowAssoc will return null as required. See PHPLens Issue No: 19289 +- adodb: Fix GetRowAssoc bug introduced in 5.17, causing function to return data from previous fetch for NULL fields. See PHPLens Issue No: 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: Fix LIMIT 1 clause in subquery gets stripped off. See PHPLens Issue No: 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. +- ads: clear fields before fetching. See PHPLens Issue No: 17539 +- mssqlnative: fixed many FetchField compat issues. See PHPLens Issue No: 18464. Also date format changed to remove timezone. - mssqlnative: Numerous fixes and improvements by Mark Newnham - Driver supports SQL Server 2005, 2008 and 2012 - Bigint data types mapped to I8 instead of I @@ -214,37 +782,42 @@ other database types as well; all drivers derived from the above are also impact - On SQL Server 2012, makes use of new CREATE SEQUENCE statement - FetchField caches metadata at initialization to improve performance - etc. -- mssqlnative: Fix Insert ID on prepared statement, thanks to Mike Parks. See http://phplens.com/lens/lensforum/msgs.php?id=19079 +- mssqlnative: Fix Insert ID on prepared statement, thanks to Mike Parks. See PHPLens Issue No: 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](http://technet.microsoft.com/en-us/library/ms180878%28v=sql.105%29.aspx#StringLiteralDateandTimeFormats). -- 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 +- mysql/mysqli: Fix ability for MetaTables to filter by table name, broken since 5.15. See PHPLens Issue No: 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 +- odbc: clear fields before fetching. See PHPLens Issue No: 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 +- pdo: Fixed concat recursion bug in 5.3. See PHPLens Issue No: 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. +- postgres8: New class/type with correct behavior for _insertid() + [#8](https://github.com/ADOdb/ADOdb/issues/8) +- postgres9: Fixed assoc problem. See PHPLens Issue No: 19296 +- sybase: Removed redundant sybase_connect() call in _connect() + [#3](https://github.com/ADOdb/ADOdb/issues/3) +- sybase: Allow connection on custom port + [#9](https://github.com/ADOdb/ADOdb/issues/9) +- sybase: Fix null values returned with ASSOC fetch mode + [#10](https://github.com/ADOdb/ADOdb/issues/10) +- Added Composer support + [#7](https://github.com/ADOdb/ADOdb/issues/7) + +## 5.18 - 2012-09-03 + +- datadict-postgres: Fixes bug in ALTER COL. See PHPLens Issue No: 19202. - datadict-postgres: fixed bugs in MetaType() checking $fieldobj properties. - GetRowAssoc did not work with null values. Bug in 5.17. - postgres9: New driver to better support PostgreSQL 9. Thx Glenn Herteg and Cacti team. - sqlite3: Modified to support php 5.4. Thx Günter Weber [built.development#googlemail.com] -- adodb: When fetch mode is ADODB_FETCH_ASSOC, and we execute `$db->GetAssoc("select 'a','0'");` we get an error. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=19190 +- adodb: When fetch mode is ADODB_FETCH_ASSOC, and we execute `$db->GetAssoc("select 'a','0'");` we get an error. Fixed. See PHPLens Issue No: 19190 - adodb: Caching directory permissions now configurable using global variable $ADODB_CACHE_PERMS. Default value is 0771. - mysqli: SetCharSet() did not return true (success) or false (fail) correctly. Fixed. - mysqli: changed dataProvider to 'mysql' so that MetaError and other shared functions will work. @@ -252,7 +825,7 @@ other database types as well; all drivers derived from the above are also impact - 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 +## 5.17 - 2012-05-18 - 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). @@ -261,26 +834,26 @@ other database types as well; all drivers derived from the above are also impact - oci8: Changed to use newer oci API to support PHP 5.4. - adodb.inc.php: Changed GetRowAssoc to more generic code that will work in all scenarios. -## 5.16 - 26 March 2012 +## 5.16 - 2012-03-26 -- mysqli: extra mysqli_next_result() in close() removed. See http://phplens.com/lens/lensforum/msgs.php?id=19100 -- datadict-oci8: minor typo in create sequence trigger fixed. See http://phplens.com/lens/lensforum/msgs.php?id=18879. +- mysqli: extra mysqli_next_result() in close() removed. See PHPLens Issue No: 19100 +- datadict-oci8: minor typo in create sequence trigger fixed. See PHPLens Issue No: 18879. - security: safe date parsing changes. Does not impact security, these are code optimisations. Thx Saithis. - postgres, oci8, oci8po, db2oci: Param() function parameters inconsistent with base class. $type='C' missing. Fixed. -- active-record: locked bug fixed. http://phplens.com/lens/lensforum/msgs.php?phplens_forummsg=new&id=19073 -- mysql, mysqli and informix: added MetaProcedures. Metaprocedures allows to retrieve an array list of all procedures in database. http://phplens.com/lens/lensforum/msgs.php?id=18414 +- active-record: locked bug fixed. PHPLens Issue:19073 +- mysql, mysqli and informix: added MetaProcedures. Metaprocedures allows to retrieve an array list of all procedures in database. PHPLens Issue No: 18414 - Postgres7: added support for serial data type in MetaColumns(). -## 5.15 - 19 Jan 2012 +## 5.15 - 2012-01-19 - pdo: fix ErrorMsg() to detect errors correctly. Thx Jens. - mssqlnative: added another check for $this->fields array exists. -- mssqlnative: bugs in FetchField() fixed. See http://phplens.com/lens/lensforum/msgs.php?id=19024 +- mssqlnative: bugs in FetchField() fixed. See PHPLens Issue No: 19024 - DBDate and DBTimeStamp had sql injection bug. Fixed. Thx Saithis - 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 +## 5.14 - 2011-09-08 - mysqli: fix php compilation bug. - postgres: bind variables did not work properly. Fixed. @@ -289,27 +862,27 @@ other database types as well; all drivers derived from the above are also impact - ActiveRecord: 1 char length string never quoted. Fixed. - LDAP: Connection string ldap:// and ldaps:// did not work. Fixed. -## 5.13 - 15 Aug 2011 +## 5.13 - 2011-08-15 - Postgres: Fix in 5.12 was wrong. Uses pg_unescape_bytea() correctly now in _decode. - GetInsertSQL/GetUpdateSQL: Now $ADODB_QUOTE_FIELDNAMES allows you to define 'NATIVE', 'UPPER', 'LOWER'. If set to true, will default to 'UPPER'. - mysqli: added support for persistent connections 'p:'. - mssqlnative: ADODB_FETCH_BOTH did not work properly. Fixed. -- mssqlnative: return values for stored procedures where not returned! Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=18919 -- mssqlnative: timestamp and fetchfield bugs fixed. http ://phplens.com/lens/lensforum/msgs.php?id=18453 +- mssqlnative: return values for stored procedures where not returned! Fixed. See PHPLens Issue No: 18919 +- mssqlnative: timestamp and fetchfield bugs fixed. PHPLens Issue: 18453 -## 5.12 - 30 June 2011 +## 5.12 - 2011-06-30 - Postgres: Added information_schema support for postgresql. - Postgres: Use pg_unescape_bytea() in _decode. -- Fix bulk binding with oci8. http://phplens.com/lens/lensforum/msgs.php?id=18786 +- Fix bulk binding with oci8. PHPLens Issue No: 18786 - oci8 perf: added wait evt monitoring. Also db cache advice now handles multiple buffer pools properly. - sessions2: Fixed setFetchMode problem. - sqlite: Some DSN connection settings were not parsed correctly. - mysqli: now GetOne obeys $ADODB_GETONE_EOF; -- memcache: compress option did not work. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=18899 +- memcache: compress option did not work. Fixed. See PHPLens Issue No: 18899 -## 5.11 - 5 May 2010 +## 5.11 - 2010-05-05 - mysql: Fixed GetOne() to return null if no records returned. - oci8 perf: added stats on sga, rman, memory usage, and flash in performance tab. @@ -324,21 +897,21 @@ other database types as well; all drivers derived from the above are also impact - ado5: Fixed ado5 exceptions to only display errors when $this->debug=true; - Added DSN support to sessions2.inc.php. - adodb-lib.inc.php. Fixed issue with _adodb_getcount() not using $secs2cache parameter. -- adodb active record. Fixed caching bug. See http://phplens.com/lens/lensforum/msgs.php?id=18288. +- adodb active record. Fixed caching bug. See PHPLens Issue No: 18288. - db2: fixed ServerInfo(). - adodb_date: Added support for format 'e' for TZ as in adodb_date('e') - Active Record: If you have a field which is a string field (with numbers in) and you add preceding 0's to it the adodb library does not pick up the fact that the field has changed because of the way php's == works (dodgily). The end result is that it never gets updated into the database - fix by Matthew Forrester (MediaEquals). [matthew.forrester#mediaequals.com] -- Fixes RowLock() and MetaIndexes() inconsistencies. See http://phplens.com/lens/lensforum/msgs.php?id=18236 -- Active record support for postgrseql boolean. See http://phplens.com/lens/lensforum/msgs.php?id=18246 -- By default, Execute 2D array is disabled for security reasons. Set $conn->bulkBind = true to enable. See http://phplens.com/lens/lensforum/msgs.php?id=18270. Note this breaks backward compat. -- MSSQL: fixes for 5.2 compat. http://phplens.com/lens/lensforum/msgs.php?id=18325 +- Fixes RowLock() and MetaIndexes() inconsistencies. See PHPLens Issue No: 18236 +- Active record support for postgrseql boolean. See PHPLens Issue No: 18246 +- By default, Execute 2D array is disabled for security reasons. Set $conn->bulkBind = true to enable. See PHPLens Issue No: 18270. Note this breaks backward compat. +- MSSQL: fixes for 5.2 compat. PHPLens Issue No: 18325 - Changed Version() to return a string instead of a float so it correctly returns 5.10 instead of 5.1. -## 5.10 - 10 Nov 2009 +## 5.10 - 2009-11-10 - Fixed memcache to properly support $rs->timeCreated. - adodb-ado.inc.php: Added BigInt support for PHP5. Will return float instead to support large numbers. Thx nasb#mail.goo.ne.jp. -- adodb-mysqli.inc.php: mysqli_multi_query is now turned off by default. To turn it on, use $conn->multiQuery = true; This is because of the risks of sql injection. See http://phplens.com/lens/lensforum/msgs.php?id=18144 +- adodb-mysqli.inc.php: mysqli_multi_query is now turned off by default. To turn it on, use $conn->multiQuery = true; This is because of the risks of sql injection. See PHPLens Issue No: 18144 - New db2oci driver for db2 9.7 when using PL/SQL mode. Allows oracle style :0, :1, :2 bind parameters which are remapped to ? ? ?. - adodb-db2.inc.php: fixed bugs in MetaTables. SYS owner field not checked properly. Also in $conn->Connect($dsn, null, null, $schema) and PConnect($dsn, null, null, $schema), we do a SET SCHEMA=$schema if successful connection. - adodb-mysqli.inc.php: Now $rs->Close() closes all pending next resultsets. Thx Clifton mesmackgod#gmail.com @@ -347,7 +920,7 @@ other database types as well; all drivers derived from the above are also impact - Removed usage of split (deprecated in php 5.3). Thx david#horizon-nigh.org. - Fixed RowLock() parameters to comply with PHP5 strict mode in multiple drivers. -## 5.09 - 25 June 2009 +## 5.09 - 2009-06-25 - Active Record: You can force column names to be quoted in INSERT and UPDATE statements, typically because you are using reserved words as column names by setting ADODB_Active_Record::$_quoteNames = true; - Added memcache and cachesecs to DSN. e.g. @@ -360,22 +933,22 @@ other database types as well; all drivers derived from the above are also impact - Fixed up MetaColumns and MetaPrimaryIndexes() for php 5.3 compat. Thx http://adodb.pastebin.com/m52082b16 - The postgresql driver's OffsetDate() apparently does not work with postgres 8.3. Fixed. - Added support for magic_quotes_sybase in qstr() and addq(). Thanks Eloy and Sam Moffat. -- The oci8 driver did not handle LOBs properly when binding. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=17991. +- The oci8 driver did not handle LOBs properly when binding. Fixed. See PHPLens Issue No: 17991. - Datadict: In order to support TIMESTAMP with subsecond accuracy, added to datadict the new TS type. Supported by mssql, postgresql and oci8 (oracle). Also changed oci8 $conn->sysTimeStamp to use 'SYSTIMESTAMP' instead of 'SYSDATE'. Should be backwards compat. - Added support for PHP 5.1+ DateTime objects in DBDate and DBTimeStamp. This means that dates and timestamps will be managed by DateTime objects if you are running PHP 5.1+. -- Added new property to postgres64 driver to support returning I if type is unique int called $db->uniqueIisR, defaulting to true. See http://phplens.com/lens/lensforum/msgs.php?id=17963 +- Added new property to postgres64 driver to support returning I if type is unique int called $db->uniqueIisR, defaulting to true. See PHPLens Issue No: 17963 - Added support for bindarray in adodb_GetActiveRecordsClass with SelectLimit in adodb-active-record.inc.php. - Transactions now allowed in ado_access driver. Thx to petar.petrov.georgiev#gmail.com. - Sessions2 garbage collection is now much more robust. We perform ORDER BY to prevent deadlock in adodb-sessions2.inc.php. - Fixed typo in pdo_sqlite driver. -## 5.08a - 17 Apr 2009 +## 5.08a - 2009-04-17 - Fixes wrong version number string. - Incorrect + in adodb-datadict.inc.php removed. - Fixes missing OffsetDate() function in pdo. Thx paul#mantisforge.org. -## 5.08 - 17 Apr 2009 +## 5.08 - 2009-04-17 - 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. @@ -395,7 +968,7 @@ other database types as well; all drivers derived from the above are also impact - MetaForeignKeys for postgres7 driver changed from adodb_movenext to $rs->MoveNext (also in 4.99) - Added support for ldap and ldaps url format in ldap driver. E.g. ldap://host:port/dn?attributes?scope?filter?extensions -## 5.07 - 26 Dec 2008 +## 5.07 - 2008-12-26 - BeginTrans/CommitTrans/RollbackTrans return true/false correctly on success/failure now for mssql, odbc, oci8, mysqlt, mysqli, postgres, pdo. - Replace() now quotes all non-null values including numeric ones. @@ -414,7 +987,7 @@ other database types as well; all drivers derived from the above are also impact - The rs2html function did not display hours in timestamps correctly. Now 24hr clock used. - Changed ereg* functions to use preg* functions as ereg* is deprecated in PHP 5.3. Modified sybase and postgresql drivers. -## 5.06 - 16 Oct 2008 +## 5.06 - 2008-10-16 - Added driver adodb-pdo_sqlite.inc.php. Thanks Diogo Toscano (diogo#scriptcase.net) for the code. - Added support for [one-to-many relationships](https://adodb.org/dokuwiki/doku.php?id=v5:userguide:active_record#one_to_many_relations) with BelongsTo() and HasMany() in adodb_active_record. @@ -442,12 +1015,12 @@ other database types as well; all drivers derived from the above are also impact - You can now change the return value of GetOne if no records are found using the global variable $ADODB_GETONE_EOF. The default is null. To change it back to the pre-4.99/5.00 behaviour of false, set $ADODB_GETONE_EOF = false; - In Postgresql 8.2/8.3 MetaForeignkeys did not work. Fixed William Kolodny William.Kolodny#gt-t.net -## 5.05 - 11 Jul 2008 +## 5.05 - 2008-07-11 Released together with [v4.990](changelog_v4.x.md#4990---11-jul-2008) -- Added support for multiple recordsets in mysqli , thanks to Geisel Sierote geisel#4up.com.br. See http://phplens.com/lens/lensforum/msgs.php?id=15917 -- Malcolm Cook added new Reload() function to Active Record. See http://phplens.com/lens/lensforum/msgs.php?id=17474 +- Added support for multiple recordsets in mysqli , thanks to Geisel Sierote geisel#4up.com.br. See PHPLens Issue No: 15917 +- Malcolm Cook added new Reload() function to Active Record. See PHPLens Issue No: 17474 - Thanks Zoltan Monori (monzol#fotoprizma.hu) for bug fixes in iterator, SelectLimit, GetRandRow, etc. - Under heavy loads, the performance monitor for oci8 disables Ixora views. - Fixed sybase driver SQLDate to use str_replace(). Also for adodb5, changed sybase driver UnixDate and UnixTimeStamp calls to static. @@ -485,7 +1058,7 @@ Released together with [v4.990](changelog_v4.x.md#4990---11-jul-2008) $db->CacheExecute($sql); ``` -## 5.04 - 13 Feb 2008 +## 5.04 - 2008-02-13 Released together with [v4.98](changelog_v4.x.md#498---13-feb-2008) @@ -493,14 +1066,14 @@ Released together with [v4.98](changelog_v4.x.md#498---13-feb-2008) - Added mysqli support to adodb_getcount(). - Removed MYSQLI_TYPE_CHAR from MetaType(). -## 5.03 - 22 Jan 2008 +## 5.03 - 2008-01-22 Released together with [v4.97](changelog_v4.x.md#497---22-jan-2008) - Active Record: $ADODB_ASSOC_CASE=1 did not work properly. Fixed. - Modified Fields() in recordset class to support display null fields in FetchNextObject(). -- In ADOdb5, active record implementation, we now support column names with spaces in them - we autoconvert the spaces to _ using __set(). Thx Daniel Cook. http://phplens.com/lens/lensforum/msgs.php?id=17200 -- Removed $arg3 from mysqli SelectLimit. See http://phplens.com/lens/lensforum/msgs.php?id=16243. Thx Zsolt Szeberenyi. +- In ADOdb5, active record implementation, we now support column names with spaces in them - we autoconvert the spaces to _ using __set(). Thx Daniel Cook. PHPLens Issue No: 17200 +- Removed $arg3 from mysqli SelectLimit. See PHPLens Issue No: 16243. Thx Zsolt Szeberenyi. - Changed oci8 FetchField, which returns the max_length of BLOB/CLOB/NCLOB as 4000 (incorrectly) to -1. - CacheExecute would sometimes return an error on Windows if it was unable to lock the cache file. This is harmless and has been changed to a warning that can be ignored. Also adodb_write_file() code revised. - ADOdb perf code changed to only log sql if execution time >= 0.05 seconds. New $ADODB_PERF_MIN variable holds min sql timing. Any SQL with timing value below this and is not causing an error is not logged. @@ -509,7 +1082,7 @@ Released together with [v4.97](changelog_v4.x.md#497---22-jan-2008) - Changed mssql driver Parameter() from SQLCHAR to SQLVARCHAR: case 'string': $type = SQLVARCHAR; break. - Problem with mssql driver in php5 (for adodb 5.03) because some functions are not static. Fixed. -## 5.02 - 24 Sept 2007 +## 5.02 - 2007-09-24 Released together with [v4.96](changelog_v4.x.md#496---24-sept-2007) @@ -537,7 +1110,7 @@ Released together with [v4.96](changelog_v4.x.md#496---24-sept-2007) - Added better support for MetaType() in mysqli when using an array recordset. - Changed parser for pgsql error messages in adodb-error.inc.php to case-insensitive regex. -## 5.01 - 17 May 2007 +## 5.01 - 2007-05-17 Released together with [v4.95](changelog_v4.x.md#495---17-may-2007) @@ -554,3 +1127,35 @@ Released together with [v4.95](changelog_v4.x.md#495---17-may-2007) - The $argHostname was wiped out in adodb-ado5.inc.php. Fixed. - Adodb5 version, added iterator support for adodb_recordset_empty. - Adodb5 version,more error checking code now will use exceptions if available. + + +[Unreleased]: https://github.com/adodb/adodb/compare/v5.21.3...master + +[5.21.3]: https://github.com/adodb/adodb/compare/v5.21.2...v5.21.3 +[5.21.2]: https://github.com/adodb/adodb/compare/v5.21.1...v5.21.2 +[5.21.1]: https://github.com/adodb/adodb/compare/v5.21.0...v5.21.1 +[5.21.0]: https://github.com/adodb/adodb/compare/v5.21.0-rc.1...v5.21.0 +[5.21.0-rc.1]: https://github.com/adodb/adodb/compare/v5.21.0-beta.1...v5.21.0-rc.1 +[5.21.0-beta.1]: https://github.com/adodb/adodb/compare/v5.20.20...v5.21.0-beta.1 + +[5.20.20]: https://github.com/adodb/adodb/compare/v5.20.19...v5.20.20 +[5.20.19]: https://github.com/adodb/adodb/compare/v5.20.18...v5.20.19 +[5.20.18]: https://github.com/adodb/adodb/compare/v5.20.17...v5.20.18 +[5.20.17]: https://github.com/adodb/adodb/compare/v5.20.16...v5.20.17 +[5.20.16]: https://github.com/adodb/adodb/compare/v5.20.15...v5.20.16 +[5.20.15]: https://github.com/adodb/adodb/compare/v5.20.14...v5.20.15 +[5.20.14]: https://github.com/adodb/adodb/compare/v5.20.13...v5.20.14 +[5.20.13]: https://github.com/adodb/adodb/compare/v5.20.12...v5.20.13 +[5.20.12]: https://github.com/adodb/adodb/compare/v5.20.11...v5.20.12 +[5.20.11]: https://github.com/adodb/adodb/compare/v5.20.10...v5.20.11 +[5.20.10]: https://github.com/adodb/adodb/compare/v5.20.9...v5.20.10 +[5.20.9]: https://github.com/adodb/adodb/compare/v5.20.8...v5.20.9 +[5.20.8]: https://github.com/adodb/adodb/compare/v5.20.7...v5.20.8 +[5.20.7]: https://github.com/adodb/adodb/compare/v5.20.6...v5.20.7 +[5.20.6]: https://github.com/adodb/adodb/compare/v5.20.5...v5.20.6 +[5.20.5]: https://github.com/adodb/adodb/compare/v5.20.4...v5.20.5 +[5.20.4]: https://github.com/adodb/adodb/compare/v5.20.3...v5.20.4 +[5.20.3]: https://github.com/adodb/adodb/compare/v5.20.2...v5.20.3 +[5.20.2]: https://github.com/adodb/adodb/compare/v5.20.1...v5.20.2 +[5.20.1]: https://github.com/adodb/adodb/compare/v5.20.0...v5.20.1 +[5.20.0]: https://github.com/adodb/adodb/compare/v5.19...v5.20.0 diff --git a/vendor/adodb/adodb-php/docs/changelog_v2.x.md b/vendor/adodb/adodb-php/docs/changelog_v2.x.md index 21db47b34a..af718b73c7 100644 --- a/vendor/adodb/adodb-php/docs/changelog_v2.x.md +++ b/vendor/adodb/adodb-php/docs/changelog_v2.x.md @@ -31,7 +31,7 @@ $conn->Connect($dsn); - 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. +- Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. Each connection has independent 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 \ @@ -209,7 +209,7 @@ $conn->Connect($dsn); - 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. +- Now if you are running php from the command line, debugging messages do not output html formatting. Not 100% complete, but getting there. ## 1.81 - 22 March 2002 @@ -234,7 +234,7 @@ $conn->Connect($dsn); - 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](http://phplens.com/lens/lensforum/msgs.php?id=1262) for an example of usage. +- 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](PHPLens Issue No: 1262) 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. @@ -471,7 +471,7 @@ $conn->Connect($dsn); ## 0.71 - 22 Nov 2000 -- Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier. +- Switched from using require_once to include/include_once for backward compatibility with PHP 4.02 and earlier. ## 0.70 - 15 Nov 2000 diff --git a/vendor/adodb/adodb-php/docs/changelog_v3.x.md b/vendor/adodb/adodb-php/docs/changelog_v3.x.md index ee2bded406..500c8669c1 100644 --- a/vendor/adodb/adodb-php/docs/changelog_v3.x.md +++ b/vendor/adodb/adodb-php/docs/changelog_v3.x.md @@ -65,7 +65,7 @@ Older changelogs: - 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". +- Added portuguese (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. @@ -77,7 +77,7 @@ Older changelogs: - 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 +- adodb_time bug fixed with dates after 2038 fixed by Jason Pell. PHPLens Issue No: 6980 ## 3.71 - 4 Aug 2003 @@ -85,7 +85,7 @@ Older changelogs: - 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(). +- 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 every time before CacheExecute() and Execute(). ## 3.70 - 29 July 2003 @@ -239,4 +239,4 @@ Older changelogs: - 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. +- Added sql to retrieve table and column info for odbc_mssql. diff --git a/vendor/adodb/adodb-php/docs/changelog_v4+5.md b/vendor/adodb/adodb-php/docs/changelog_v4+5.md index c6a9c10dee..c102ac6a7d 100644 --- a/vendor/adodb/adodb-php/docs/changelog_v4+5.md +++ b/vendor/adodb/adodb-php/docs/changelog_v4+5.md @@ -1,7 +1,7 @@ ## 4.990/5.05 - 11 Jul 2008 -- Added support for multiple recordsets in mysqli Geisel Sierote . See http://phplens.com/lens/lensforum/msgs.php?id=15917 -- Malcolm Cook added new Reload() function to Active Record. See http://phplens.com/lens/lensforum/msgs.php?id=17474 +- Added support for multiple recordsets in mysqli Geisel Sierote . See PHPLens Issue No: 15917 +- Malcolm Cook added new Reload() function to Active Record. See PHPLens Issue No: 17474 - Thanks Zoltan Monori [monzol#fotoprizma.hu] for bug fixes in iterator, SelectLimit, GetRandRow, etc. - Under heavy loads, the performance monitor for oci8 disables Ixora views. - Fixed sybase driver SQLDate to use str_replace(). Also for adodb5, changed sybase driver UnixDate and UnixTimeStamp calls to static. @@ -49,8 +49,8 @@ $db->CacheExecute($sql); - Active Record: $ADODB_ASSOC_CASE=1 did not work properly. Fixed. - Modified Fields() in recordset class to support display null fields in FetchNextObject(). -- In ADOdb5, active record implementation, we now support column names with spaces in them - we autoconvert the spaces to _ using __set(). Thx Daniel Cook. http://phplens.com/lens/lensforum/msgs.php?id=17200 -- Removed $arg3 from mysqli SelectLimit. See http://phplens.com/lens/lensforum/msgs.php?id=16243. Thx Zsolt Szeberenyi. +- In ADOdb5, active record implementation, we now support column names with spaces in them - we autoconvert the spaces to _ using __set(). Thx Daniel Cook. PHPLens Issue No: 17200 +- Removed $arg3 from mysqli SelectLimit. See PHPLens Issue No: 16243. Thx Zsolt Szeberenyi. - Changed oci8 FetchField, which returns the max_length of BLOB/CLOB/NCLOB as 4000 (incorrectly) to -1. - CacheExecute would sometimes return an error on Windows if it was unable to lock the cache file. This is harmless and has been changed to a warning that can be ignored. Also adodb_write_file() code revised. - ADOdb perf code changed to only log sql if execution time >= 0.05 seconds. New $ADODB_PERF_MIN variable holds min sql timing. Any SQL with timing value below this and is not causing an error is not logged. diff --git a/vendor/adodb/adodb-php/docs/changelog_v4.x.md b/vendor/adodb/adodb-php/docs/changelog_v4.x.md index aedd4b646e..8b0644402f 100644 --- a/vendor/adodb/adodb-php/docs/changelog_v4.x.md +++ b/vendor/adodb/adodb-php/docs/changelog_v4.x.md @@ -8,8 +8,8 @@ Older changelogs: ## 4.990 - 11 Jul 2008 -- Added support for multiple recordsets in mysqli Geisel Sierote . See http://phplens.com/lens/lensforum/msgs.php?id=15917 -- Malcolm Cook added new Reload() function to Active Record. See http://phplens.com/lens/lensforum/msgs.php?id=17474 +- Added support for multiple recordsets in mysqli Geisel Sierote . See PHPLens Issue No: 15917 +- Malcolm Cook added new Reload() function to Active Record. See PHPLens Issue No: 17474 - Thanks Zoltan Monori [monzol#fotoprizma.hu] for bug fixes in iterator, SelectLimit, GetRandRow, etc. - Under heavy loads, the performance monitor for oci8 disables Ixora views. - Fixed sybase driver SQLDate to use str_replace(). Also for adodb5, changed sybase driver UnixDate and UnixTimeStamp calls to static. @@ -57,8 +57,8 @@ Older changelogs: - Active Record: $ADODB_ASSOC_CASE=1 did not work properly. Fixed. - Modified Fields() in recordset class to support display null fields in FetchNextObject(). -- In ADOdb5, active record implementation, we now support column names with spaces in them - we autoconvert the spaces to `_` using `__set()`. Thx Daniel Cook. http://phplens.com/lens/lensforum/msgs.php?id=17200 -- Removed $arg3 from mysqli SelectLimit. See http://phplens.com/lens/lensforum/msgs.php?id=16243. Thx Zsolt Szeberenyi. +- In ADOdb5, active record implementation, we now support column names with spaces in them - we autoconvert the spaces to `_` using `__set()`. Thx Daniel Cook. PHPLens Issue No: 17200 +- Removed $arg3 from mysqli SelectLimit. See PHPLens Issue No: 16243. Thx Zsolt Szeberenyi. - Changed oci8 FetchField, which returns the max_length of BLOB/CLOB/NCLOB as 4000 (incorrectly) to -1. - CacheExecute would sometimes return an error on Windows if it was unable to lock the cache file. This is harmless and has been changed to a warning that can be ignored. Also adodb_write_file() code revised. - ADOdb perf code changed to only log sql if execution time >= 0.05 seconds. New $ADODB_PERF_MIN variable holds min sql timing. Any SQL with timing value below this and is not causing an error is not logged. @@ -114,13 +114,13 @@ Older changelogs: - Active Record: $ADODB_ASSOC_CASE=2 did not work properly. Fixed. Thx gmane#auxbuss.com. - mysqli had bugs in BeginTrans() and EndTrans(). Fixed. - Improved error handling when no database is connected for oci8. Thx Andy Hassall. -- Names longer than 30 chars in oci8 datadict will be changed to random name. Thx Eugenio. http://phplens.com/lens/lensforum/msgs.php?id=16182 +- Names longer than 30 chars in oci8 datadict will be changed to random name. Thx Eugenio. PHPLens Issue No: 16182 - Added var $upperCase = 'ucase' to access and ado_access drivers. Thx Renato De Giovanni renato#cria.org.br -- Postgres64 driver, if preparing plan failed in _query, did not handle error properly. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=16131. -- Fixed GetActiveRecordsClass() reference bug. See http://phplens.com/lens/lensforum/msgs.php?id=16120 +- Postgres64 driver, if preparing plan failed in _query, did not handle error properly. Fixed. See PHPLens Issue No: 16131. +- Fixed GetActiveRecordsClass() reference bug. See PHPLens Issue No: 16120 - Added handling of nulls in adodb-ado_mssql.inc.php for qstr(). Thx to Felix Rabinovich. - Adodb-dict contributions by Gaetano - - Support for INDEX in data-dict. Example: idx_ev1. The ability to define indexes using the INDEX keyword was added in ADOdb 4.94. The following example features mutiple indexes, including a compound index idx_ev1. + - Support for INDEX in data-dict. Example: idx_ev1. The ability to define indexes using the INDEX keyword was added in ADOdb 4.94. The following example features multiple indexes, including a compound index idx_ev1. ``` event_id I(11) NOTNULL AUTOINCREMENT PRIMARY, @@ -139,7 +139,7 @@ Older changelogs: - makes any date defined as DEFAULT value for D and T columns work cross-database, not just the "sysdate" value (as long as it is specified using adodb standard format). See above example. - Fixed pdo's GetInsertID() support. Thx Ricky Su. - oci8 Prepare() now sets error messages if an error occurs. -- Added 'PT_BR' to SetDateLocale() -- brazilian portugese. +- Added 'PT_BR' to SetDateLocale() -- brazilian portuguese. - charset in oci8 was not set correctly on `*Connect()` - ADOConnection::Transpose() now appends as first column the field names. - Added $ADODB_QUOTE_FIELDNAMES. If set to true, will autoquote field names in AutoExecute(),GetInsertSQL(), GetUpdateSQL(). @@ -151,12 +151,12 @@ Older changelogs: - Added support for multiple database connections in performance monitoring code (adodb-perf.inc.php). Now all sql in multiple database connections can be saved into one database ($ADODB_LOG_CONN). - Added MetaIndexes() to odbc_mssql. -- Added connection property $db->null2null = 'null'. In autoexecute/getinsertsql/getupdatesql, this value will be converted to a null. Set this to a funny invalid value if you do not want null conversion. See http://phplens.com/lens/lensforum/msgs.php?id=15902. +- Added connection property $db->null2null = 'null'. In autoexecute/getinsertsql/getupdatesql, this value will be converted to a null. Set this to a funny invalid value if you do not want null conversion. See PHPLens Issue No: 15902. - Path disclosure problem in mysqli fixed. Thx Andy. - Fixed typo in session_schema2.xml. - Changed INT in oci8 to return correct precision in $fld->max_length, MetaColumns(). Thx Eloy Lafuente Plaza. -- Patched postgres64 _connect to handle serverinfo(). see http://phplens.com/lens/lensforum/msgs.php?id=15887. -- Added pdo fix for null columns. See http://phplens.com/lens/lensforum/msgs.php?id=15889 +- Patched postgres64 _connect to handle serverinfo(). see PHPLens Issue No: 15887. +- Added pdo fix for null columns. See PHPLens Issue No: 15889 - For stored procedures, missing connection id now passed into mssql_query(). Thx Ecsy (ecsy#freemail.hu). ## 4.92a - 30 Aug 2006 @@ -170,7 +170,7 @@ Older changelogs: - Added IgnoreErrors() to bypass default error handling. - The _adodb_getcount() function in adodb-lib.inc.php, some ORDER BY bug fixes. - For ibase and firebird, set $sysTimeStamp = "CURRENT_TIMESTAMP". -- Fixed postgres connection bug: http://phplens.com/lens/lensforum/msgs.php?id=11057. +- Fixed postgres connection bug: PHPLens Issue No: 11057. - Changed CacheSelectLimit() to flush cache when $secs2cache==-1 due to complaints from other users. - Added support for using memcached with CacheExecute/CacheSelectLimit. Requires memcache module PECL extension. Usage: ``` @@ -201,9 +201,9 @@ Older changelogs: - Added to quotes to mysql and mysqli: "SHOW COLUMNS FROM \`%s\`"; - Removed accidental optgroup handling in GetMenu(). Fixed ibase _BlobDecode for php5 compat, and also mem alloc issues for small blobs, thx salvatori#interia.pl - Mysql driver OffsetDate() speedup, useful for adodb-sessions. -- Fix for GetAssoc() PHP5 compat. See http://phplens.com/lens/lensforum/msgs.php?id=15425 +- Fix for GetAssoc() PHP5 compat. See PHPLens Issue No: 15425 - Active Record - 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. -- Changed postgres7 MetaForeignKeys() see http://phplens.com/lens/lensforum/msgs.php?id=15531 +- Changed postgres7 MetaForeignKeys() see PHPLens Issue No: 15531 - DB2 will now return db2_conn_errormsg() when it is a connection error. ## 4.90 - 8 June 2006 @@ -230,7 +230,7 @@ Older changelogs: - Fixed variable ref errors in adodb-ado5.inc.php in _query(). - Mysqli setcharset fix using method_exists(). - The adodb-perf.inc.php CreateLogTable() code now works for user-defined table names. -- Error in ibase_blob_open() fixed. See http://phplens.com/lens/lensforum/msgs.php?id=14997 +- Error in ibase_blob_open() fixed. See PHPLens Issue No: 14997 ## 4.80 - 8 Mar 2006 @@ -260,14 +260,14 @@ Older changelogs: - Fixed GetInsertSQL() to support oci8po. - Fixed qstr() issue with postgresql with \0 in strings. - Fixed some datadict driver loading issues in _adodb_getdriver(). -- Added register shutdown function session_write_close in adodb-session.inc.php for PHP 5 compat. See http://phplens.com/lens/lensforum/msgs.php?id=14200. +- Added register shutdown function session_write_close in adodb-session.inc.php for PHP 5 compat. See PHPLens Issue No: 14200. ## 4.70 - 6 Jan 2006 - Many fixes from Danila Ulyanov to ibase, oci8, postgres, mssql, odbc_oracle, odbtp, etc drivers. -- Changed usage of binary hint in adodb-session.inc.php for mysql. See http://phplens.com/lens/lensforum/msgs.php?id=14160 +- Changed usage of binary hint in adodb-session.inc.php for mysql. See PHPLens Issue No: 14160 - Fixed invalid variable reference problem in undomq(), adodb-perf.inc.php. -- Fixed http://phplens.com/lens/lensforum/msgs.php?id=14254 in adodb-perf.inc.php, `_DBParameter()` settings of fetchmode was wrong. +- Fixed PHPLens Issue No: 14254 in adodb-perf.inc.php, `_DBParameter()` settings of fetchmode was wrong. - Fixed security issues in server.php and tmssql.php discussed by Andreas Sandblad in a Secunia security advisory. Added `$ACCEPTIP = 127.0.0.1` and changed suggested root password to something more secure. - Changed pager to close recordset after RenderLayout(). @@ -445,7 +445,7 @@ Older changelogs: - MaxDB was padding the defaults of none-string types with spaces - MySql now correctly converts enum columns to varchar - Ralf also changed Postgresql datadict: - - you cant add NOT NULL columns in postgres in one go, they need to be added as NULL and then altered to NOT NULL + - you can't add NOT NULL columns in postgres in one go, they need to be added as NULL and then altered to NOT NULL - AlterColumnSQL could not change a varchar column with numbers into an integer column, postgres need an explicit conversation - a re-created sequence was not set to the correct value, if the name was the old name (no implicit sequence), now always the new name of the implicit sequence is used - Sergio Strampelli added extra $intoken check to Lens_ParseArgs() in datadict code. @@ -498,7 +498,7 @@ Older changelogs: - Fixed out of page bounds bug in _adodb_pageexecute_all_rows() Thx to "Sergio Strampelli" sergio#rir.it - Speedup of movenext for mysql and oci8 drivers. - Moved debugging code _adodb_debug_execute() to adodb-lib.inc.php. -- Fixed postgresql bytea detection bug. See http://phplens.com/lens/lensforum/msgs.php?id=9849. +- Fixed postgresql bytea detection bug. See PHPLens Issue No: 9849. - Fixed ibase datetimestamp typo in PHP5. Thx stefan. - Removed whitespace at end of odbtp drivers. - Added db2 metaprimarykeys fix. @@ -514,13 +514,13 @@ Older changelogs: - MetaTables() for mysql, $showschema parameter was not backward compatible with older versions of adodb. Fixed. - Changed mysql GetOne() to work with mysql 3.23 when using with non-select stmts (e.g. SHOW TABLES). - Changed TRIG_ prefix to a variable in datadict-oci8.inc.php. Thx to Luca.Gioppo#csi.it. -- New to adodb-time code. We allow you to define your own daylights savings function, adodb_daylight_sv for pre-1970 dates. If the function is defined (somewhere in an include), then you can correct for daylights savings. See http://phplens.com/phpeverywhere/node/view/16#daylightsavings for more info. +- New to adodb-time code. We allow you to define your own daylights savings function, adodb_daylight_sv for pre-1970 dates. If the function is defined (somewhere in an include), then you can correct for daylights savings. - New sqlitepo driver. This is because assoc mode does not work like other drivers in sqlite. Namely, when selecting (joining) multiple tables, in assoc mode the table names are included in the assoc keys in the "sqlite" driver. In "sqlitepo" driver, the table names are stripped from the returned column names. When this results in a conflict, the first field get preference. Contributed by Herman Kuiper herman#ozuzo.net - Added $forcenull parameter to GetInsertSQL/GetUpdateSQL. Idea by Marco Aurelio Silva. - More XHTML changes for GetMenu. By Jeremy Evans. - Fixes some ibase date issues. Thx to stefan bogdan. - Improvements to mysqli driver to support $ADODB_COUNTRECS. -- Fixed adodb-csvlib.inc.php problem when reading stream from socket. We need to poll stream continiously. +- Fixed adodb-csvlib.inc.php problem when reading stream from socket. We need to poll stream continuously. ## 4.23 - 16 June 2004 @@ -650,7 +650,7 @@ Older changelogs: - CacheSelectLimit internal parameters to SelectLimit were wrong. Thx to Nio. - Modified adodb_pr() and adodb_backtrace() to support command-line usage (eg. no html). - Fixed some fr and it lang errors. Thx to Gaetano G. -- Added contrib directory, with adodb rs to xmlrpc convertor by Gaetano G. +- Added contrib directory, with adodb rs to xmlrpc converter by Gaetano G. - Fixed array recordset bugs when `_skiprow1` is true. Thx to Gaetano G. - Fixed pivot table code when count is false. diff --git a/vendor/adodb/adodb-php/drivers/adodb-access.inc.php b/vendor/adodb/adodb-php/drivers/adodb-access.inc.php index d0816e10b6..13461a35b7 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-access.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-access.inc.php @@ -1,24 +1,34 @@ _has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change; - $arr = $rs->GetArray(); //print_pre($arr); $arr2 = array(); @@ -80,9 +80,6 @@ class ADORecordSet_access extends ADORecordSet_odbc { var $databaseType = "access"; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } -}// class +} // class + } diff --git a/vendor/adodb/adodb-php/drivers/adodb-ado.inc.php b/vendor/adodb/adodb-php/drivers/adodb-ado.inc.php index 0390ae3afb..67a032d722 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-ado.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-ado.inc.php @@ -1,17 +1,25 @@ = 5) return $this->_affectedRows; - - return $this->_affectedRows->value; + return $this->_affectedRows; } // you can also pass a connection string like this: @@ -81,7 +87,7 @@ function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDAS // not yet //if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename"; - //use trusted conection for SQL if username not specified + //use trusted connection 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 @@ -350,7 +356,7 @@ function __construct($id,$mode=false) $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - return parent::__construct($id,$mode); + parent::__construct($id); } @@ -538,7 +544,7 @@ function MetaType($t,$len=-1,$fieldobj=false) case 19://adUnsignedInt = 19, case 20://adUnsignedBigInt = 21, return 'I'; - default: return 'N'; + default: return ADODB_DEFAULT_METATYPE; } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-ado5.inc.php b/vendor/adodb/adodb-php/drivers/adodb-ado5.inc.php index 5e96023b6f..f673d09298 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-ado5.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-ado5.inc.php @@ -1,17 +1,25 @@ = 5) return $this->_affectedRows; - - return $this->_affectedRows->value; + return $this->_affectedRows; } // you can also pass a connection string like this: @@ -97,7 +103,7 @@ function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $ar // not yet //if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename"; - //use trusted conection for SQL if username not specified + //use trusted connection 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 @@ -384,7 +390,7 @@ function __construct($id,$mode=false) $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - return parent::__construct($id,$mode); + parent::__construct($id); } @@ -579,7 +585,7 @@ function MetaType($t,$len=-1,$fieldobj=false) case 19://adUnsignedInt = 19, case 20://adUnsignedBigInt = 21, return 'I'; - default: return 'N'; + default: return ADODB_DEFAULT_METATYPE; } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-ado_access.inc.php b/vendor/adodb/adodb-php/drivers/adodb-ado_access.inc.php index b27f8e0fa9..ad7ab38c59 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-ado_access.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-ado_access.inc.php @@ -1,24 +1,31 @@ = 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php"); - else include(ADODB_DIR."/drivers/adodb-ado.inc.php"); + include_once(ADODB_DIR . "/drivers/adodb-ado5.inc.php"); } class ADODB_ado_access extends ADODB_ado { @@ -43,8 +50,4 @@ class ADORecordSet_ado_access extends ADORecordSet_ado { var $databaseType = "ado_access"; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-ado_mssql.inc.php b/vendor/adodb/adodb-php/drivers/adodb-ado_mssql.inc.php index e01fcb14c0..d0e9c1963b 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-ado_mssql.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-ado_mssql.inc.php @@ -1,28 +1,31 @@ = 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php"); - else include(ADODB_DIR."/drivers/adodb-ado.inc.php"); + include_once(ADODB_DIR . "/drivers/adodb-ado5.inc.php"); } @@ -41,14 +44,14 @@ class ADODB_ado_mssql extends ADODB_ado { //var $_inTransaction = 1; // always open recordsets, so no transaction problems. - function _insertid() + protected function _insertID($table = '', $column = '') { - return $this->GetOne('select SCOPE_IDENTITY()'); + return $this->GetOne('select SCOPE_IDENTITY()'); } function _affectedrows() { - return $this->GetOne('select @@rowcount'); + return $this->GetOne('select @@rowcount'); } function SetTransactionMode( $transaction_mode ) @@ -62,40 +65,40 @@ function SetTransactionMode( $transaction_mode ) $this->Execute("SET TRANSACTION ".$transaction_mode); } - function qstr($s,$magic_quotes=false) + function qStr($s, $magic_quotes=false) { - $s = ADOConnection::qstr($s, $magic_quotes); + $s = ADOConnection::qStr($s); 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){ - while (!$adors->EOF){ - $fld = new ADOFieldObject(); - $c = $adors->Fields(3); - $fld->name = $c->Value; - $fld->type = 'CHAR'; // cannot discover type in ADO! - $fld->max_length = -1; - $arr[strtoupper($fld->name)]=$fld; - - $adors->MoveNext(); - } - $adors->Close(); - } - $false = false; + $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){ + while (!$adors->EOF){ + $fld = new ADOFieldObject(); + $c = $adors->Fields(3); + $fld->name = $c->Value; + $fld->type = 'CHAR'; // cannot discover type in ADO! + $fld->max_length = -1; + $arr[strtoupper($fld->name)]=$fld; + + $adors->MoveNext(); + } + $adors->Close(); + } + $false = false; return empty($arr) ? $false : $arr; } @@ -137,14 +140,10 @@ function GenID($seq='adodbseq',$start=1) //return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'"); } - } // end class +} // end class - class ADORecordSet_ado_mssql extends ADORecordSet_ado { +class ADORecordSet_ado_mssql extends ADORecordSet_ado { var $databaseType = 'ado_mssql'; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-ads.inc.php b/vendor/adodb/adodb-php/drivers/adodb-ads.inc.php index 8d31b2192b..b9d4adb522 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-ads.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-ads.inc.php @@ -1,20 +1,29 @@ _haserrorfunctions = ADODB_PHPVER >= 0x4050; - $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200; - } - - // returns true or false - function _connect($argDSN, $argUsername, $argPassword, $argDatabasename) - { - if (!function_exists('ads_connect')) return null; - - if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') { - ADOConnection::outp("For Advantage Connect(), $argDatabasename is not used. Place dsn in 1st parameter."); - } - $last_php_error = $this->resetLastError(); - if ($this->curmode === false) $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword); - else $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword,$this->curmode); - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); - if (isset($this->connectStmt)) $this->Execute($this->connectStmt); - - return $this->_connectionID != false; - } - - // returns true or false - function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename) - { - if (!function_exists('ads_connect')) return null; - - $last_php_error = $this->resetLastError(); - $this->_errorMsg = ''; - if ($this->debug && $argDatabasename) { - ADOConnection::outp("For PConnect(), $argDatabasename is not used. Place dsn in 1st parameter."); - } - // print "dsn=$argDSN u=$argUsername p=$argPassword
"; flush(); - if ($this->curmode === false) $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword); - else $this->_connectionID = ads_pconnect($argDSN,$argUsername,$argPassword,$this->curmode); - - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); - if ($this->_connectionID && $this->autoRollback) @ads_rollback($this->_connectionID); - if (isset($this->connectStmt)) $this->Execute($this->connectStmt); - - return $this->_connectionID != false; - } - - // returns the Server version and Description - function ServerInfo() - { - - if (!empty($this->host) && ADODB_PHPVER >= 0x4300) { - $stmt = $this->Prepare('EXECUTE PROCEDURE sp_mgGetInstallInfo()'); - $res = $this->Execute($stmt); - if(!$res) - print $this->ErrorMsg(); - else{ - $ret["version"]= $res->fields[3]; - $ret["description"]="Advantage Database Server"; - return $ret; - } - } - else { - return ADOConnection::ServerInfo(); - } - } - - - // returns true or false - function CreateSequence($seqname = 'adodbseq', $start = 1) - { - $res = $this->Execute("CREATE TABLE $seqname ( ID autoinc( 1 ) ) IN DATABASE"); - if(!$res){ - print $this->ErrorMsg(); - return false; - } - else - return true; - - } - - // returns true or false - function DropSequence($seqname = 'adodbseq') - { - $res = $this->Execute("DROP TABLE $seqname"); - if(!$res){ - print $this->ErrorMsg(); - return false; - } - else - return true; - } - - - // returns the generated ID or false - // checks if the table already exists, else creates the table and inserts a record into the table - // and gets the ID number of the last inserted record. - function GenID($seqname = 'adodbseq', $start = 1) - { - $go = $this->Execute("select * from $seqname"); - if (!$go){ - $res = $this->Execute("CREATE TABLE $seqname ( ID autoinc( 1 ) ) IN DATABASE"); - if(!res){ - print $this->ErrorMsg(); - return false; - } - } - $res = $this->Execute("INSERT INTO $seqname VALUES( DEFAULT )"); - if(!$res){ - print $this->ErrorMsg(); - return false; - } - else{ - $gen = $this->Execute("SELECT LastAutoInc( STATEMENT ) FROM system.iota"); - $ret = $gen->fields[0]; - return $ret; - } - - } - - - - - function ErrorMsg() - { - if ($this->_haserrorfunctions) { - if ($this->_errorMsg !== false) return $this->_errorMsg; - if (empty($this->_connectionID)) return @ads_errormsg(); - return @ads_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 = @ads_error(); - else $e = @ads_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; - $this->transCnt += 1; - $this->_autocommit = false; - return ads_autocommit($this->_connectionID,false); - } - - function CommitTrans($ok=true) - { - if ($this->transOff) return true; - if (!$ok) return $this->RollbackTrans(); - if ($this->transCnt) $this->transCnt -= 1; - $this->_autocommit = true; - $ret = ads_commit($this->_connectionID); - ads_autocommit($this->_connectionID,true); - return $ret; - } - - function RollbackTrans() - { - if ($this->transOff) return true; - if ($this->transCnt) $this->transCnt -= 1; - $this->_autocommit = true; - $ret = ads_rollback($this->_connectionID); - ads_autocommit($this->_connectionID,true); - return $ret; - } - - - // Returns tables,Views or both on succesfull execution. Returns - // tables by default on succesfull execustion. - function &MetaTables($ttype = false, $showSchema = false, $mask = false) - { - $recordSet1 = $this->Execute("select * from system.tables"); - if(!$recordSet1){ - print $this->ErrorMsg(); - return false; - } - $recordSet2 = $this->Execute("select * from system.views"); - if(!$recordSet2){ - print $this->ErrorMsg(); - return false; - } - $i=0; - while (!$recordSet1->EOF){ - $arr["$i"] = $recordSet1->fields[0]; - $recordSet1->MoveNext(); - $i=$i+1; - } - if($ttype=='FALSE'){ - while (!$recordSet2->EOF){ - $arr["$i"] = $recordSet2->fields[0]; - $recordSet2->MoveNext(); - $i=$i+1; - } - return $arr; - } - elseif($ttype=='VIEWS'){ - while (!$recordSet2->EOF){ - $arrV["$i"] = $recordSet2->fields[0]; - $recordSet2->MoveNext(); - $i=$i+1; - } - return $arrV; - } - else{ - return $arr; - } - - } - - function &MetaPrimaryKeys($table, $owner = false) - { - $recordSet = $this->Execute("select table_primary_key from system.tables where name='$table'"); - if(!$recordSet){ - print $this->ErrorMsg(); - return false; - } - $i=0; - while (!$recordSet->EOF){ - $arr["$i"] = $recordSet->fields[0]; - $recordSet->MoveNext(); - $i=$i+1; - } - return $arr; - } - -/* -See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp -/ SQL data type codes / -#define SQL_UNKNOWN_TYPE 0 -#define SQL_CHAR 1 -#define SQL_NUMERIC 2 -#define SQL_DECIMAL 3 -#define SQL_INTEGER 4 -#define SQL_SMALLINT 5 -#define SQL_FLOAT 6 -#define SQL_REAL 7 -#define SQL_DOUBLE 8 -#if (ODBCVER >= 0x0300) -#define SQL_DATETIME 9 -#endif -#define SQL_VARCHAR 12 - - -/ One-parameter shortcuts for date/time data types / -#if (ODBCVER >= 0x0300) -#define SQL_TYPE_DATE 91 -#define SQL_TYPE_TIME 92 -#define SQL_TYPE_TIMESTAMP 93 - -#define SQL_UNICODE (-95) -#define SQL_UNICODE_VARCHAR (-96) -#define SQL_UNICODE_LONGVARCHAR (-97) -*/ - function ODBCTypes($t) - { - switch ((integer)$t) { - case 1: - case 12: - case 0: - case -95: - case -96: - return 'C'; - case -97: - case -1: //text - return 'X'; - case -4: //image - return 'B'; - - case 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 = ads_tables($this->_connectionID); - $rs = new ADORecordSet_ads($qid2); - $ADODB_FETCH_MODE = $savem; - if (!$rs) return false; - $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change; - $rs->_fetch(); - - while (!$rs->EOF) { - if ($table == strtoupper($rs->fields[2])) { - $q = $rs->fields[0]; - $o = $rs->fields[1]; - break; - } - $rs->MoveNext(); - } - $rs->Close(); - - $qid = ads_columns($this->_connectionID,$q,$o,strtoupper($table),'%'); - } */ - - switch ($this->databaseType) { - case 'access': - case 'vfp': - $qid = ads_columns($this->_connectionID);#,'%','',strtoupper($table),'%'); - break; - - - case 'db2': - $colname = "%"; - $qid = ads_columns($this->_connectionID, "", $schema, $table, $colname); - break; - - default: - $qid = @ads_columns($this->_connectionID,'%','%',strtoupper($table),'%'); - if (empty($qid)) $qid = ads_columns($this->_connectionID); - break; - } - if (empty($qid)) return $false; - - $rs = new ADORecordSet_ads($qid); - $ADODB_FETCH_MODE = $savem; - - if (!$rs) return $false; - $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change; - $rs->_fetch(); - - $retarr = array(); - - /* - $rs->fields indices - 0 TABLE_QUALIFIER - 1 TABLE_SCHEM - 2 TABLE_NAME - 3 COLUMN_NAME - 4 DATA_TYPE - 5 TYPE_NAME - 6 PRECISION - 7 LENGTH - 8 SCALE - 9 RADIX - 10 NULLABLE - 11 REMARKS - */ - while (!$rs->EOF) { - // adodb_pr($rs->fields); - if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) { - $fld = new ADOFieldObject(); - $fld->name = $rs->fields[3]; - $fld->type = $this->ODBCTypes($rs->fields[4]); - - // ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp - // access uses precision to store length for char/varchar - if ($fld->type == 'C' or $fld->type == 'X') { - if ($this->databaseType == 'access') - $fld->max_length = $rs->fields[6]; - else if ($rs->fields[4] <= -95) // UNICODE - $fld->max_length = $rs->fields[7]/2; - else - $fld->max_length = $rs->fields[7]; - } else - $fld->max_length = $rs->fields[7]; - $fld->not_null = !empty($rs->fields[10]); - $fld->scale = $rs->fields[8]; - $retarr[strtoupper($fld->name)] = $fld; - } else if (sizeof($retarr)>0) - break; - $rs->MoveNext(); - } - $rs->Close(); //-- crashes 4.03pl1 -- why? - - if (empty($retarr)) $retarr = false; - return $retarr; - } - - // Returns an array of columns names for a given table - function &MetaColumnNames($table, $numIndexes = false, $useattnum = false) - { - $recordSet = $this->Execute("select name from system.columns where parent='$table'"); - if(!$recordSet){ - print $this->ErrorMsg(); - return false; - } - else{ - $i=0; - while (!$recordSet->EOF){ - $arr["FIELD$i"] = $recordSet->fields[0]; - $recordSet->MoveNext(); - $i=$i+1; - } - return $arr; - } - } - - - function Prepare($sql) - { - if (! $this->_bindInputArray) return $sql; // no binding - $stmt = ads_prepare($this->_connectionID,$sql); - if (!$stmt) { - // we don't know whether odbc driver is parsing prepared stmts, so just return sql - return $sql; - } - return array($sql,$stmt,false); - } - - /* returns queryID or false */ - function _query($sql,$inputarr=false) - { - $last_php_error = $this->resetLastError(); - $this->_errorMsg = ''; - - if ($inputarr) { - if (is_array($sql)) { - $stmtid = $sql[1]; - } else { - $stmtid = ads_prepare($this->_connectionID,$sql); - - if ($stmtid == false) { - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); - return false; - } - } - - if (! ads_execute($stmtid,$inputarr)) { - //@ads_free_result($stmtid); - if ($this->_haserrorfunctions) { - $this->_errorMsg = ads_errormsg(); - $this->_errorCode = ads_error(); - } - return false; - } - - } else if (is_array($sql)) { - $stmtid = $sql[1]; - if (!ads_execute($stmtid)) { - //@ads_free_result($stmtid); - if ($this->_haserrorfunctions) { - $this->_errorMsg = ads_errormsg(); - $this->_errorCode = ads_error(); - } - return false; - } - } else - { - - $stmtid = ads_exec($this->_connectionID,$sql); - - } - - $this->_lastAffectedRows = 0; - - if ($stmtid) { - - if (@ads_num_fields($stmtid) == 0) { - $this->_lastAffectedRows = ads_num_rows($stmtid); - $stmtid = true; - - } else { - - $this->_lastAffectedRows = 0; - ads_binmode($stmtid,$this->binmode); - ads_longreadlen($stmtid,$this->maxblobsize); - - } - - if ($this->_haserrorfunctions) { - $this->_errorMsg = ''; - $this->_errorCode = 0; - } else { - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); - } - } else { - if ($this->_haserrorfunctions) { - $this->_errorMsg = ads_errormsg(); - $this->_errorCode = ads_error(); - } else { - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); - } - } - - return $stmtid; - - } - - /* - Insert a null into the blob field of the table first. - Then use UpdateBlob to store the blob. - - Usage: - - $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); - $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1'); - */ - function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') - { - $last_php_error = $this->resetLastError(); - $sql = "UPDATE $table SET $column=? WHERE $where"; - $stmtid = ads_prepare($this->_connectionID,$sql); - if ($stmtid == false){ - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); - return false; - } - if (! ads_execute($stmtid,array($val),array(SQL_BINARY) )){ - if ($this->_haserrorfunctions){ - $this->_errorMsg = ads_errormsg(); - $this->_errorCode = ads_error(); - } - return false; - } - return TRUE; - } - - // returns true or false - function _close() - { - $ret = @ads_close($this->_connectionID); - $this->_connectionID = false; - return $ret; - } - - function _affectedrows() - { - return $this->_lastAffectedRows; - } +class ADODB_ads extends ADOConnection +{ + var $databaseType = "ads"; + var $fmt = "'m-d-Y'"; + var $fmtTimeStamp = "'Y-m-d H:i:s'"; + var $concat_operator = ''; + var $replaceQuote = "''"; // string to use to replace quotes + var $dataProvider = "ads"; + var $hasAffectedRows = true; + var $binmode = ODBC_BINMODE_RETURN; + var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive + // breaking backward-compat + //var $longreadlen = 8000; // default number of chars to return for a Blob/Long field + var $_bindInputArray = false; + var $curmode = SQL_CUR_USE_DRIVER; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L + var $_genSeqSQL = "create table %s (id integer)"; + var $_autocommit = true; + var $_lastAffectedRows = 0; + var $uCaseTables = true; // for meta* functions, uppercase table names + + function __construct() + { + } + + // returns true or false + function _connect($argDSN, $argUsername, $argPassword, $argDatabasename) + { + if (!function_exists('ads_connect')) { + return null; + } + + if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') { + ADOConnection::outp("For Advantage Connect(), $argDatabasename is not used. Place dsn in 1st parameter."); + } + $last_php_error = $this->resetLastError(); + if ($this->curmode === false) { + $this->_connectionID = ads_connect($argDSN, $argUsername, $argPassword); + } else { + $this->_connectionID = ads_connect($argDSN, $argUsername, $argPassword, $this->curmode); + } + $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); + if (isset($this->connectStmt)) { + $this->Execute($this->connectStmt); + } + + return $this->_connectionID != false; + } + + // returns true or false + function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename) + { + if (!function_exists('ads_connect')) { + return null; + } + + $last_php_error = $this->resetLastError(); + $this->_errorMsg = ''; + if ($this->debug && $argDatabasename) { + ADOConnection::outp("For PConnect(), $argDatabasename is not used. Place dsn in 1st parameter."); + } + // print "dsn=$argDSN u=$argUsername p=$argPassword
"; flush(); + if ($this->curmode === false) { + $this->_connectionID = ads_connect($argDSN, $argUsername, $argPassword); + } else { + $this->_connectionID = ads_pconnect($argDSN, $argUsername, $argPassword, $this->curmode); + } + + $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); + if ($this->_connectionID && $this->autoRollback) { + @ads_rollback($this->_connectionID); + } + if (isset($this->connectStmt)) { + $this->Execute($this->connectStmt); + } + + return $this->_connectionID != false; + } + + // returns the Server version and Description + function ServerInfo() + { + + if (!empty($this->host)) { + $stmt = $this->Prepare('EXECUTE PROCEDURE sp_mgGetInstallInfo()'); + $res = $this->Execute($stmt); + if (!$res) { + print $this->ErrorMsg(); + } else { + $ret["version"] = $res->fields[3]; + $ret["description"] = "Advantage Database Server"; + return $ret; + } + } else { + return ADOConnection::ServerInfo(); + } + } + + + // returns true or false + function CreateSequence($seqname = 'adodbseq', $start = 1) + { + $res = $this->Execute("CREATE TABLE $seqname ( ID autoinc( 1 ) ) IN DATABASE"); + if (!$res) { + print $this->ErrorMsg(); + return false; + } else { + return true; + } + + } + + // returns true or false + function DropSequence($seqname = 'adodbseq') + { + $res = $this->Execute("DROP TABLE $seqname"); + if (!$res) { + print $this->ErrorMsg(); + return false; + } else { + return true; + } + } + + + // returns the generated ID or false + // checks if the table already exists, else creates the table and inserts a record into the table + // and gets the ID number of the last inserted record. + function GenID($seqname = 'adodbseq', $start = 1) + { + $go = $this->Execute("select * from $seqname"); + if (!$go) { + $res = $this->Execute("CREATE TABLE $seqname ( ID autoinc( 1 ) ) IN DATABASE"); + if (!$res) { + print $this->ErrorMsg(); + return false; + } + } + $res = $this->Execute("INSERT INTO $seqname VALUES( DEFAULT )"); + if (!$res) { + print $this->ErrorMsg(); + return false; + } else { + $gen = $this->Execute("SELECT LastAutoInc( STATEMENT ) FROM system.iota"); + $ret = $gen->fields[0]; + return $ret; + } + + } + + + function ErrorMsg() + { + if ($this->_errorMsg !== false) { + return $this->_errorMsg; + } + if (empty($this->_connectionID)) { + return @ads_errormsg(); + } + return @ads_errormsg($this->_connectionID); + } + + + function ErrorNo() + { + 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 = @ads_error(); + } else { + $e = @ads_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; + } + + + function BeginTrans() + { + if (!$this->hasTransactions) { + return false; + } + if ($this->transOff) { + return true; + } + $this->transCnt += 1; + $this->_autocommit = false; + return ads_autocommit($this->_connectionID, false); + } + + function CommitTrans($ok = true) + { + if ($this->transOff) { + return true; + } + if (!$ok) { + return $this->RollbackTrans(); + } + if ($this->transCnt) { + $this->transCnt -= 1; + } + $this->_autocommit = true; + $ret = ads_commit($this->_connectionID); + ads_autocommit($this->_connectionID, true); + return $ret; + } + + function RollbackTrans() + { + if ($this->transOff) { + return true; + } + if ($this->transCnt) { + $this->transCnt -= 1; + } + $this->_autocommit = true; + $ret = ads_rollback($this->_connectionID); + ads_autocommit($this->_connectionID, true); + return $ret; + } + + + // Returns tables,Views or both on successful execution. Returns + // tables by default on successful execution. + function &MetaTables($ttype = false, $showSchema = false, $mask = false) + { + $recordSet1 = $this->Execute("select * from system.tables"); + if (!$recordSet1) { + print $this->ErrorMsg(); + return false; + } + $recordSet2 = $this->Execute("select * from system.views"); + if (!$recordSet2) { + print $this->ErrorMsg(); + return false; + } + $i = 0; + while (!$recordSet1->EOF) { + $arr["$i"] = $recordSet1->fields[0]; + $recordSet1->MoveNext(); + $i = $i + 1; + } + if ($ttype == 'FALSE') { + while (!$recordSet2->EOF) { + $arr["$i"] = $recordSet2->fields[0]; + $recordSet2->MoveNext(); + $i = $i + 1; + } + return $arr; + } elseif ($ttype == 'VIEWS') { + while (!$recordSet2->EOF) { + $arrV["$i"] = $recordSet2->fields[0]; + $recordSet2->MoveNext(); + $i = $i + 1; + } + return $arrV; + } else { + return $arr; + } + + } + + function &MetaPrimaryKeys($table, $owner = false) + { + $recordSet = $this->Execute("select table_primary_key from system.tables where name='$table'"); + if (!$recordSet) { + print $this->ErrorMsg(); + return false; + } + $i = 0; + while (!$recordSet->EOF) { + $arr["$i"] = $recordSet->fields[0]; + $recordSet->MoveNext(); + $i = $i + 1; + } + return $arr; + } + + /* + See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp + / SQL data type codes / + #define SQL_UNKNOWN_TYPE 0 + #define SQL_CHAR 1 + #define SQL_NUMERIC 2 + #define SQL_DECIMAL 3 + #define SQL_INTEGER 4 + #define SQL_SMALLINT 5 + #define SQL_FLOAT 6 + #define SQL_REAL 7 + #define SQL_DOUBLE 8 + #if (ODBCVER >= 0x0300) + #define SQL_DATETIME 9 + #endif + #define SQL_VARCHAR 12 + + + / One-parameter shortcuts for date/time data types / + #if (ODBCVER >= 0x0300) + #define SQL_TYPE_DATE 91 + #define SQL_TYPE_TIME 92 + #define SQL_TYPE_TIMESTAMP 93 + + #define SQL_UNICODE (-95) + #define SQL_UNICODE_VARCHAR (-96) + #define SQL_UNICODE_LONGVARCHAR (-97) + */ + function ODBCTypes($t) + { + switch ((integer)$t) { + case 1: + case 12: + case 0: + case -95: + case -96: + return 'C'; + case -97: + case -1: //text + return 'X'; + case -4: //image + return 'B'; + + case 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 because of a bug + $qid2 = ads_tables($this->_connectionID); + $rs = new ADORecordSet_ads($qid2); + $ADODB_FETCH_MODE = $savem; + if (!$rs) return false; + $rs->_fetch(); + + while (!$rs->EOF) { + if ($table == strtoupper($rs->fields[2])) { + $q = $rs->fields[0]; + $o = $rs->fields[1]; + break; + } + $rs->MoveNext(); + } + $rs->Close(); + + $qid = ads_columns($this->_connectionID,$q,$o,strtoupper($table),'%'); + } */ + + switch ($this->databaseType) { + case 'access': + case 'vfp': + $qid = ads_columns($this->_connectionID);#,'%','',strtoupper($table),'%'); + break; + + + case 'db2': + $colname = "%"; + $qid = ads_columns($this->_connectionID, "", $schema, $table, $colname); + break; + + default: + $qid = @ads_columns($this->_connectionID, '%', '%', strtoupper($table), '%'); + if (empty($qid)) { + $qid = ads_columns($this->_connectionID); + } + break; + } + if (empty($qid)) { + return $false; + } + + $rs = new ADORecordSet_ads($qid); + $ADODB_FETCH_MODE = $savem; + + if (!$rs) { + return $false; + } + $rs->_fetch(); + + $retarr = array(); + + /* + $rs->fields indices + 0 TABLE_QUALIFIER + 1 TABLE_SCHEM + 2 TABLE_NAME + 3 COLUMN_NAME + 4 DATA_TYPE + 5 TYPE_NAME + 6 PRECISION + 7 LENGTH + 8 SCALE + 9 RADIX + 10 NULLABLE + 11 REMARKS + */ + while (!$rs->EOF) { + // adodb_pr($rs->fields); + if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) { + $fld = new ADOFieldObject(); + $fld->name = $rs->fields[3]; + $fld->type = $this->ODBCTypes($rs->fields[4]); + + // ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp + // access uses precision to store length for char/varchar + if ($fld->type == 'C' or $fld->type == 'X') { + if ($this->databaseType == 'access') { + $fld->max_length = $rs->fields[6]; + } else { + if ($rs->fields[4] <= -95) // UNICODE + { + $fld->max_length = $rs->fields[7] / 2; + } else { + $fld->max_length = $rs->fields[7]; + } + } + } else { + $fld->max_length = $rs->fields[7]; + } + $fld->not_null = !empty($rs->fields[10]); + $fld->scale = $rs->fields[8]; + $retarr[strtoupper($fld->name)] = $fld; + } else { + if (sizeof($retarr) > 0) { + break; + } + } + $rs->MoveNext(); + } + $rs->Close(); //-- crashes 4.03pl1 -- why? + + if (empty($retarr)) { + $retarr = false; + } + return $retarr; + } + + // Returns an array of columns names for a given table + function &MetaColumnNames($table, $numIndexes = false, $useattnum = false) + { + $recordSet = $this->Execute("select name from system.columns where parent='$table'"); + if (!$recordSet) { + print $this->ErrorMsg(); + return false; + } else { + $i = 0; + while (!$recordSet->EOF) { + $arr["FIELD$i"] = $recordSet->fields[0]; + $recordSet->MoveNext(); + $i = $i + 1; + } + return $arr; + } + } + + + function Prepare($sql) + { + if (!$this->_bindInputArray) { + return $sql; + } // no binding + $stmt = ads_prepare($this->_connectionID, $sql); + if (!$stmt) { + // we don't know whether odbc driver is parsing prepared stmts, so just return sql + return $sql; + } + return array($sql, $stmt, false); + } + + /* returns queryID or false */ + function _query($sql, $inputarr = false) + { + $last_php_error = $this->resetLastError(); + $this->_errorMsg = ''; + + if ($inputarr) { + if (is_array($sql)) { + $stmtid = $sql[1]; + } else { + $stmtid = ads_prepare($this->_connectionID, $sql); + + if ($stmtid == false) { + $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); + return false; + } + } + + if (!ads_execute($stmtid, $inputarr)) { + //@ads_free_result($stmtid); + $this->_errorMsg = ads_errormsg(); + $this->_errorCode = ads_error(); + return false; + } + + } else { + if (is_array($sql)) { + $stmtid = $sql[1]; + if (!ads_execute($stmtid)) { + //@ads_free_result($stmtid); + $this->_errorMsg = ads_errormsg(); + $this->_errorCode = ads_error(); + return false; + } + } else { + + $stmtid = ads_exec($this->_connectionID, $sql); + + } + } + + $this->_lastAffectedRows = 0; + + if ($stmtid) { + + if (@ads_num_fields($stmtid) == 0) { + $this->_lastAffectedRows = ads_num_rows($stmtid); + $stmtid = true; + + } else { + + $this->_lastAffectedRows = 0; + ads_binmode($stmtid, $this->binmode); + ads_longreadlen($stmtid, $this->maxblobsize); + + } + + $this->_errorMsg = ''; + $this->_errorCode = 0; + } else { + $this->_errorMsg = ads_errormsg(); + $this->_errorCode = ads_error(); + } + + return $stmtid; + + } + + /* + Insert a null into the blob field of the table first. + Then use UpdateBlob to store the blob. + + Usage: + + $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); + $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1'); + */ + function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB') + { + $last_php_error = $this->resetLastError(); + $sql = "UPDATE $table SET $column=? WHERE $where"; + $stmtid = ads_prepare($this->_connectionID, $sql); + if ($stmtid == false) { + $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); + return false; + } + if (!ads_execute($stmtid, array($val), array(SQL_BINARY))) { + $this->_errorMsg = ads_errormsg(); + $this->_errorCode = ads_error(); + return false; + } + return true; + } + + // returns true or false + function _close() + { + $ret = @ads_close($this->_connectionID); + $this->_connectionID = false; + return $ret; + } + + function _affectedrows() + { + return $this->_lastAffectedRows; + } } @@ -638,139 +677,142 @@ function _affectedrows() Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_ads extends ADORecordSet { - - var $bind = false; - var $databaseType = "ads"; - var $dataProvider = "ads"; - var $useFetchArray; - var $_has_stupid_odbc_fetch_api_change; - - function __construct($id,$mode=false) - { - if ($mode === false) { - global $ADODB_FETCH_MODE; - $mode = $ADODB_FETCH_MODE; - } - $this->fetchMode = $mode; - - $this->_queryID = $id; - - // the following is required for mysql odbc driver in 4.3.1 -- why? - $this->EOF = false; - $this->_currentRow = -1; - //parent::__construct($id); - } - - - // returns the field object - function &FetchField($fieldOffset = -1) - { - - $off=$fieldOffset+1; // offsets begin at 1 - - $o= new ADOFieldObject(); - $o->name = @ads_field_name($this->_queryID,$off); - $o->type = @ads_field_type($this->_queryID,$off); - $o->max_length = @ads_field_len($this->_queryID,$off); - if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name); - else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name); - return $o; - } - - /* Use associative array to get fields array */ - function Fields($colname) - { - if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname]; - if (!$this->bind) { - $this->bind = array(); - for ($i=0; $i < $this->_numOfFields; $i++) { - $o = $this->FetchField($i); - $this->bind[strtoupper($o->name)] = $i; - } - } - - return $this->fields[$this->bind[strtoupper($colname)]]; - } - - - function _initrs() - { - global $ADODB_COUNTRECS; - $this->_numOfRows = ($ADODB_COUNTRECS) ? @ads_num_rows($this->_queryID) : -1; - $this->_numOfFields = @ads_num_fields($this->_queryID); - // some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0 - if ($this->_numOfRows == 0) $this->_numOfRows = -1; - //$this->useFetchArray = $this->connection->useFetchArray; - $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200; - } - - function _seek($row) - { - return false; - } - - // speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated - function &GetArrayLimit($nrows,$offset=-1) - { - if ($offset <= 0) { - $rs =& $this->GetArray($nrows); - return $rs; - } - $savem = $this->fetchMode; - $this->fetchMode = ADODB_FETCH_NUM; - $this->Move($offset); - $this->fetchMode = $savem; - - if ($this->fetchMode & ADODB_FETCH_ASSOC) { - $this->fields =& $this->GetRowAssoc(); - } - - $results = array(); - $cnt = 0; - while (!$this->EOF && $nrows != $cnt) { - $results[$cnt++] = $this->fields; - $this->MoveNext(); - } - - return $results; - } - - - function MoveNext() - { - if ($this->_numOfRows != 0 && !$this->EOF) { - $this->_currentRow++; - 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 = @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(); - } - return true; - } - return false; - } - - function _close() - { - return @ads_free_result($this->_queryID); - } +class ADORecordSet_ads extends ADORecordSet +{ + + var $bind = false; + var $databaseType = "ads"; + var $dataProvider = "ads"; + var $useFetchArray; + + function __construct($id, $mode = false) + { + if ($mode === false) { + global $ADODB_FETCH_MODE; + $mode = $ADODB_FETCH_MODE; + } + $this->fetchMode = $mode; + + $this->_queryID = $id; + + // the following is required for mysql odbc driver in 4.3.1 -- why? + $this->EOF = false; + $this->_currentRow = -1; + //parent::__construct($id); + } + + + // returns the field object + function &FetchField($fieldOffset = -1) + { + + $off = $fieldOffset + 1; // offsets begin at 1 + + $o = new ADOFieldObject(); + $o->name = @ads_field_name($this->_queryID, $off); + $o->type = @ads_field_type($this->_queryID, $off); + $o->max_length = @ads_field_len($this->_queryID, $off); + if (ADODB_ASSOC_CASE == 0) { + $o->name = strtolower($o->name); + } else { + if (ADODB_ASSOC_CASE == 1) { + $o->name = strtoupper($o->name); + } + } + return $o; + } + + /* Use associative array to get fields array */ + function Fields($colname) + { + if ($this->fetchMode & ADODB_FETCH_ASSOC) { + return $this->fields[$colname]; + } + if (!$this->bind) { + $this->bind = array(); + for ($i = 0; $i < $this->_numOfFields; $i++) { + $o = $this->FetchField($i); + $this->bind[strtoupper($o->name)] = $i; + } + } + + return $this->fields[$this->bind[strtoupper($colname)]]; + } + + + function _initrs() + { + global $ADODB_COUNTRECS; + $this->_numOfRows = ($ADODB_COUNTRECS) ? @ads_num_rows($this->_queryID) : -1; + $this->_numOfFields = @ads_num_fields($this->_queryID); + // some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0 + if ($this->_numOfRows == 0) { + $this->_numOfRows = -1; + } + //$this->useFetchArray = $this->connection->useFetchArray; + } + + function _seek($row) + { + return false; + } + + // speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated + function &GetArrayLimit($nrows, $offset = -1) + { + if ($offset <= 0) { + $rs =& $this->GetArray($nrows); + return $rs; + } + $savem = $this->fetchMode; + $this->fetchMode = ADODB_FETCH_NUM; + $this->Move($offset); + $this->fetchMode = $savem; + + if ($this->fetchMode & ADODB_FETCH_ASSOC) { + $this->fields =& $this->GetRowAssoc(); + } + + $results = array(); + $cnt = 0; + while (!$this->EOF && $nrows != $cnt) { + $results[$cnt++] = $this->fields; + $this->MoveNext(); + } + + return $results; + } + + + function MoveNext() + { + if ($this->_numOfRows != 0 && !$this->EOF) { + $this->_currentRow++; + if ($this->_fetch()) { + return true; + } + } + $this->fields = false; + $this->EOF = true; + return false; + } + + function _fetch() + { + $this->fields = false; + $rez = @ads_fetch_into($this->_queryID, $this->fields); + if ($rez) { + if ($this->fetchMode & ADODB_FETCH_ASSOC) { + $this->fields =& $this->GetRowAssoc(); + } + return true; + } + return false; + } + + function _close() + { + return @ads_free_result($this->_queryID); + } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-borland_ibase.inc.php b/vendor/adodb/adodb-php/drivers/adodb-borland_ibase.inc.php index 6731e2817d..da2c76186a 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-borland_ibase.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-borland_ibase.inc.php @@ -1,18 +1,25 @@ _insertid; + return $this->_insertid; } function _affectedrows() { - return $this->_affectedrows; + return $this->_affectedrows; } function MetaDatabases() @@ -178,7 +183,7 @@ function _Execute($sql,$inputarr=false) /* Returns: the last error message from previous database operation */ function ErrorMsg() { - return $this->_errorMsg; + return $this->_errorMsg; } /* Returns: the last error number from previous database operation */ @@ -195,10 +200,6 @@ function _close() } // class class ADORecordset_csv extends ADORecordset { - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } function _close() { diff --git a/vendor/adodb/adodb-php/drivers/adodb-db2.inc.php b/vendor/adodb/adodb-php/drivers/adodb-db2.inc.php index 2ede0497a6..8f616fa6f8 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-db2.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-db2.inc.php @@ -1,32 +1,40 @@ _haserrorfunctions = ADODB_PHPVER >= 0x4050; + return $this->doDB2Connect($argDSN, $argUsername, $argPassword, $argDatabasename); } - // returns true or false - function _connect($argDSN, $argUsername, $argPassword, $argDatabasename) + public function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename) { + return $this->doDB2Connect($argDSN, $argUsername, $argPassword, $argDatabasename,true); + } + + private function doDB2Connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persistent=false) + { + 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."); + ADOConnection::outp("DB2 extension not installed."); + return null; + } + + $connectionParameters = $this->unpackParameters($argDSN, + $argUsername, + $argPassword, + $argDatabasename); + + if ($connectionParameters == null) + { + /* + * Error thrown + */ return null; } - // This needs to be set before the connect(). - // Replaces the odbc_binmode() call that was in Execute() + + $argDSN = $connectionParameters['dsn']; + $argUsername = $connectionParameters['uid']; + $argPassword = $connectionParameters['pwd']; + $argDatabasename = $connectionParameters['database']; + $useCataloguedConnection = $connectionParameters['catalogue']; + + if ($this->debug){ + if ($useCataloguedConnection){ + $connectMessage = "Catalogued connection using parameters: "; + $connectMessage .= "DB=$argDatabasename / "; + $connectMessage .= "UID=$argUsername / "; + $connectMessage .= "PWD=$argPassword"; + } + else + { + $connectMessage = "Uncatalogued connection using DSN: $argDSN"; + } + ADOConnection::outp($connectMessage); + } + /* + * This needs to be set before the connect(). + */ ini_set('ibm_db2.binmode', $this->binmode); - if ($argDatabasename && empty($argDSN)) { + if ($persistent) + $db2Function = 'db2_pconnect'; + else + $db2Function = 'db2_connect'; - if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_connect($argDatabasename,null,null); - else $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword); - } else { - if ($argDatabasename) $schema = $argDatabasename; - if (stripos($argDSN,'UID=') && stripos($argDSN,'PWD=')) $this->_connectionID = db2_connect($argDSN,null,null); - else $this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword); + /* + * We need to flatten out the connectionParameters + */ + + $db2Options = array(); + if ($this->connectionParameters) + { + foreach($this->connectionParameters as $p) + foreach($p as $k=>$v) + $db2Options[$k] = $v; } - // For db2_connect(), there is an optional 4th arg. If present, it must be - // an array of valid options. So far, we don't use them. + if ($useCataloguedConnection) + $this->_connectionID = $db2Function($argDatabasename, + $argUsername, + $argPassword, + $db2Options); + else + $this->_connectionID = $db2Function($argDSN, + null, + null, + $db2Options); + + $php_errormsg = ''; $this->_errorMsg = @db2_conn_errormsg(); - if (isset($this->connectStmt)) $this->Execute($this->connectStmt); - if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema"); + if ($this->_connectionID && $this->connectStmt) + $this->execute($this->connectStmt); + return $this->_connectionID != false; + } - // returns true or false - function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename) + /** + * Validates and preprocesses the passed parameters for consistency + * + * @param string $argDSN Either DSN or database + * @param string $argUsername User name or null + * @param string $argPassword Password or null + * @param string $argDatabasename Either DSN or database + * + * @return mixed array if correct, null if not + */ + private function unpackParameters($argDSN, $argUsername, $argPassword, $argDatabasename) { - 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); + global $php_errormsg; - $this->_errorMsg = ''; + $connectionParameters = array('dsn'=>'', + 'uid'=>'', + 'pwd'=>'', + 'database'=>'', + 'catalogue'=>true + ); - if ($argDatabasename && empty($argDSN)) { + /* + * Uou can either connect to a catalogued connection + * with a database name e.g. 'SAMPLE' + * or an uncatalogued connection with a DSN like connection + * DATABASE=database;HOSTNAME=hostname;PORT=port;PROTOCOL=TCPIP;UID=username;PWD=password; + */ + + if (!$argDSN && !$argDatabasename) + { + $errorMessage = 'Supply either catalogued or uncatalogued connection parameters'; + $this->_errorMsg = $errorMessage; + if ($this->debug) + ADOConnection::outp($errorMessage); + return null; + } - if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_pconnect($argDatabasename,null,null); - else $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword); - } else { - if ($argDatabasename) $schema = $argDatabasename; - if (stripos($argDSN,'UID=') && stripos($argDSN,'PWD=')) $this->_connectionID = db2_pconnect($argDSN,null,null); - else $this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword); + $useCataloguedConnection = true; + $schemaName = ''; + + if ($argDSN && $argDatabasename) + { + /* + * If a catalogued connection if provided, + * as well as user and password + * that will take priority + */ + if ($argUsername && $argPassword && !$this->isDsn($argDatabasename)) + { + if ($this->debug){ + $errorMessage = 'Warning: Because you provided user,'; + $errorMessage.= 'password and database, DSN connection '; + $errorMessage.= 'parameters were discarded'; + ADOConnection::outp($errorMessage); + + } + $argDSN = ''; + } + else if ($this->isDsn($argDSN) && $this->isDsn($argDatabasename)) + { + $errorMessage = 'Supply uncatalogued connection parameters '; + $errorMessage.= 'in either the database or DSN arguments, '; + $errorMessage.= 'but not both'; + $php_errormsg = $errorMessage; + if ($this->debug) + ADOConnection::outp($errorMessage); + return null; + } } - $this->_errorMsg = @db2_conn_errormsg(); - if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID); - if (isset($this->connectStmt)) $this->Execute($this->connectStmt); + if (!$this->isDsn($argDSN) && $this->isDsn($argDatabasename)) + { + /* + * Switch them around for next test + */ + $temp = $argDSN; + $argDsn = $argDatabasename; + $argDatabasenME = $temp; + } - if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema"); - return $this->_connectionID != false; + if ($this->isDsn($argDSN)) + { + + if (!preg_match('/uid=/i',$argDSN) + || !preg_match('/pwd=/i',$argDSN)) + { + $errorMessage = 'For uncatalogued connections, provide '; + $errorMessage.= 'both UID and PWD in the connection string'; + $php_errormsg = $errorMessage; + if ($this->debug) + ADOConnection::outp($errorMessage); + return null; + } + + if (preg_match('/database=/i',$argDSN)) + { + if ($argDatabasename) + { + $argDatabasename = ''; + if ($this->debug) + { + $errorMessage = 'Warning: Because you provided '; + $errorMessage.= 'database information in the DSN '; + $errorMessage.= 'parameters, the supplied database '; + $errorMessage.= 'name was discarded'; + ADOConnection::outp($errorMessage); + } + } + $useCataloguedConnection = false; + + } + elseif ($argDatabasename) + { + $this->databaseName = $argDatabasename; + $argDSN .= ';database=' . $argDatabasename; + $argDatabasename = ''; + $useCataloguedConnection = false; + + } + else + { + $errorMessage = 'Uncatalogued connection parameters '; + $errorMessage.= 'must contain a database= argument'; + $php_errormsg = $errorMessage; + if ($this->debug) + ADOConnection::outp($errorMessage); + return null; + } + } + + if ($argDSN && !$argDatabasename && $useCataloguedConnection) + { + $argDatabasename = $argDSN; + $argDSN = ''; + } + + + if ($useCataloguedConnection + && (!$argDatabasename + || !$argUsername + || !$argPassword)) + { + + $errorMessage = 'For catalogued connections, provide '; + $errorMessage.= 'database, username and password'; + $this->_errorMsg = $errorMessage; + if ($this->debug) + ADOConnection::outp($errorMessage); + return null; + + } + + if ($argDatabasename) + $this->databaseName = $argDatabasename; + elseif (!$this->databaseName) + $this->databaseName = $this->getDatabasenameFromDsn($argDSN); + + + $connectionParameters = array('dsn'=>$argDSN, + 'uid'=>$argUsername, + 'pwd'=>$argPassword, + 'database'=>$argDatabasename, + 'catalogue'=>$useCataloguedConnection + ); + + return $connectionParameters; + + } + + /** + * Does the provided string look like a DSN + * + * @param string $dsnString + * + * @return bool + */ + private function isDsn($dsnString){ + $dsnArray = preg_split('/[;=]+/',$dsnString); + if (count($dsnArray) > 2) + return true; + return false; + } + + + /** + * Gets the database name from the DSN + * + * @param string $dsnString + * + * @return string + */ + private function getDatabasenameFromDsn($dsnString){ + + $dsnArray = preg_split('/[;=]+/',$dsnString); + $dbIndex = array_search('database',$dsnArray); + + return $dsnArray[$dbIndex + 1]; } - // format and return date string in database timestamp format - function DBTimeStamp($ts, $isfld = false) + + /** + * format and return date string in database timestamp format + * + * @param mixed $ts either a string or a unixtime + * @param bool $isField discarded + * + * @return string + */ + function dbTimeStamp($ts,$isField=false) { if (empty($ts) && $ts !== 0) return 'null'; - if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts); + 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) + /** + * Format date column in sql string given an input format that understands Y M D + * + * @param string $fmt + * @param bool $col + * + * @return string + */ + function sqlDate($fmt, $col=false) { - // use right() and replace() ? if (!$col) $col = $this->sysDate; /* use TO_CHAR() if $fmt is TO_CHAR() allowed fmt */ @@ -203,10 +485,12 @@ function SQLDate($fmt, $col=false) } - function ServerInfo() + function serverInfo() { - $row = $this->GetRow("SELECT service_level, fixpack_num FROM TABLE(sysproc.env_get_inst_info()) - as INSTANCEINFO"); + $sql = "SELECT service_level, fixpack_num + FROM TABLE(sysproc.env_get_inst_info()) + AS INSTANCEINFO"; + $row = $this->GetRow($sql); if ($row) { @@ -214,108 +498,119 @@ function ServerInfo() $info['fixpack'] = $row[1]; $info['description'] = ''; } else { - return ADOConnection::ServerInfo(); + return ADOConnection::serverInfo(); } return $info; } - function CreateSequence($seqname='adodbseq',$start=1) + function createSequence($seqname='adodbseq',$start=1) { - if (empty($this->_genSeqSQL)) return false; - $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$start)); - if (!$ok) return false; + if (empty($this->_genSeqSQL)) + return false; + + $ok = $this->execute(sprintf($this->_genSeqSQL,$seqname,$start)); + if (!$ok) + return false; return true; } - function DropSequence($seqname = 'adodbseq') + function dropSequence($seqname='adodbseq') { if (empty($this->_dropSeqSQL)) return false; - return $this->Execute(sprintf($this->_dropSeqSQL,$seqname)); + return $this->execute(sprintf($this->_dropSeqSQL,$seqname)); } - function SelectLimit($sql, $nrows = -1, $offset = -1, $inputArr = false, $secs2cache = 0) + function selectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false,$secs2cache=0) { - $nrows = (int) $nrows; - $offset = (int) $offset; - if ($offset <= 0) { - // could also use " OPTIMIZE FOR $nrows ROWS " - if ($nrows >= 0) $sql .= " FETCH FIRST $nrows ROWS ONLY "; - $rs = $this->Execute($sql,$inputArr); - } else { + $nrows = (integer) $nrows; + + if ($offset <= 0) + { + if ($nrows >= 0) + $sql .= " FETCH FIRST $nrows ROWS ONLY "; + + $rs = $this->execute($sql,$inputArr); + + } + else + { if ($offset > 0 && $nrows < 0); - else { + + else + { $nrows += $offset; $sql .= " FETCH FIRST $nrows ROWS ONLY "; } - $rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr); + + /* + * DB2 has no native support for mid table offset + */ + $rs = ADOConnection::selectLimit($sql,$nrows,$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) + function errorMsg() { - // 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"); - return $num; - } + if ($this->_errorMsg !== false) + return $this->_errorMsg; + if (empty($this->_connectionID)) + return @db2_conn_errormsg(); - function ErrorMsg() - { - if ($this->_haserrorfunctions) { - if ($this->_errorMsg !== false) return $this->_errorMsg; - if (empty($this->_connectionID)) return @db2_conn_errormsg(); - return @db2_conn_errormsg($this->_connectionID); - } else return ADOConnection::ErrorMsg(); + return @db2_conn_errormsg($this->_connectionID); } - function ErrorNo() + 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 ($this->_errorCode !== false) + return $this->_errorCode; + - if (empty($this->_connectionID)) $e = @db2_conn_error(); - else $e = @db2_conn_error($this->_connectionID); + if (empty($this->_connectionID)) + $e = @db2_conn_error(); - // 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(); + else + $e = @db2_conn_error($this->_connectionID); + + return $e; } - function BeginTrans() + function beginTrans() { - if (!$this->hasTransactions) return false; - if ($this->transOff) return true; + if (!$this->hasTransactions) + return false; + 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; - if (!$ok) return $this->RollbackTrans(); - if ($this->transCnt) $this->transCnt -= 1; + if ($this->transOff) + return true; + + if (!$ok) + return $this->RollbackTrans(); + + if ($this->transCnt) + $this->transCnt -= 1; + $this->_autocommit = true; - $ret = db2_commit($this->_connectionID); - db2_autocommit($this->_connectionID,true); + $ret = @db2_commit($this->_connectionID); + @db2_autocommit($this->_connectionID,true); return $ret; } @@ -324,124 +619,401 @@ function RollbackTrans() if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; $this->_autocommit = true; - $ret = db2_rollback($this->_connectionID); - db2_autocommit($this->_connectionID,true); + $ret = @db2_rollback($this->_connectionID); + @db2_autocommit($this->_connectionID,true); return $ret; } - function MetaPrimaryKeys($table, $owner = false) + /** + * Return a list of Primary Keys for a specified table + * + * We don't use db2_statistics as the function does not seem to play + * well with mixed case table names + * + * @param string $table + * @param bool $primary (optional) only return primary keys + * @param bool $owner (optional) not used in this driver + * + * @return string[] Array of indexes + */ + public function metaPrimaryKeys($table,$owner=false) { - global $ADODB_FETCH_MODE; - if ($this->uCaseTables) $table = strtoupper($table); + $primaryKeys = array(); + + global $ADODB_FETCH_MODE; + $schema = ''; $this->_findschema($table,$schema); - $savem = $ADODB_FETCH_MODE; + $table = $this->getTableCasedValue($table); + + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - $qid = @db2_primarykeys($this->_connectionID,'',$schema,$table); + $this->setFetchMode(ADODB_FETCH_NUM); - if (!$qid) { - $ADODB_FETCH_MODE = $savem; - return false; - } - $rs = new ADORecordSet_db2($qid); + + $sql = "SELECT * + FROM syscat.indexes + WHERE tabname='$table'"; + + $rows = $this->getAll($sql); + + $this->setFetchMode($savem); $ADODB_FETCH_MODE = $savem; - if (!$rs) return false; + if (empty($rows)) + return false; - $arr = $rs->GetArray(); - $rs->Close(); - $arr2 = array(); - for ($i=0; $i < sizeof($arr); $i++) { - if ($arr[$i][3]) $arr2[] = $arr[$i][3]; + foreach ($rows as $r) + { + if ($r[7] != 'P') + continue; + + $cols = explode('+',$r[6]); + foreach ($cols as $colIndex=>$col) + { + if ($colIndex == 0) + continue; + $columnName = $this->getMetaCasedValue($col); + $primaryKeys[] = $columnName; + } + break; } - return $arr2; + return $primaryKeys; } - function MetaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE ) + /** + * returns assoc array where keys are tables, and values are foreign keys + * + * @param string $table + * @param string $owner [optional][discarded] + * @param bool $upper [optional][discarded] + * @param bool $associative[optional][discarded] + * + * @return mixed[] Array of foreign key information + */ + public function metaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE ) { - global $ADODB_FETCH_MODE; - if ($this->uCaseTables) $table = strtoupper($table); + global $ADODB_FETCH_MODE; + $schema = ''; $this->_findschema($table,$schema); $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - $qid = @db2_foreign_keys($this->_connectionID,'',$schema,$table); - if (!$qid) { - $ADODB_FETCH_MODE = $savem; + + $this->setFetchMode(ADODB_FETCH_NUM); + + $sql = "SELECT SUBSTR(tabname,1,20) table_name, + SUBSTR(constname,1,20) fk_name, + SUBSTR(REFTABNAME,1,12) parent_table, + SUBSTR(refkeyname,1,20) pk_orig_table, + fk_colnames + FROM syscat.references + WHERE tabname = '$table'"; + + $results = $this->getAll($sql); + + $ADODB_FETCH_MODE = $savem; + $this->setFetchMode($savem); + + if (empty($results)) return false; + + $foreignKeys = array(); + + foreach ($results as $r) + { + $parentTable = trim($this->getMetaCasedValue($r[2])); + $keyName = trim($this->getMetaCasedValue($r[1])); + $foreignKeys[$parentTable] = $keyName; + } + + return $foreignKeys; + } + + /** + * Returns a list of tables + * + * @param string $ttype (optional) + * @param string $schema (optional) + * @param string $mask (optional) + * + * @return array + */ + public function metaTables($ttype=false,$schema=false,$mask=false) + { + + global $ADODB_FETCH_MODE; + + $savem = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + + /* + * Values for TABLE_TYPE + * --------------------------- + * ALIAS, HIERARCHY TABLE, INOPERATIVE VIEW, NICKNAME, + * MATERIALIZED QUERY TABLE, SYSTEM TABLE, TABLE, + * TYPED TABLE, TYPED VIEW, and VIEW + * + * If $ttype passed as '', match 'TABLE' and 'VIEW' + * If $ttype passed as 'T' it is assumed to be 'TABLE' + * if $ttype passed as 'V' it is assumed to be 'VIEW' + */ + $ttype = strtoupper($ttype); + if ($ttype) { + /* + * @todo We could do valid type checking or array type + */ + if ($ttype == 'V') + $ttype = 'VIEW'; + if ($ttype == 'T') + $ttype = 'TABLE'; } + + if (!$schema) + $schema = '%'; + + if (!$mask) + $mask = '%'; + + $qid = @db2_tables($this->_connectionID,NULL,$schema,$mask,$ttype); + $rs = new ADORecordSet_db2($qid); $ADODB_FETCH_MODE = $savem; + + if (!$rs) + return false; + + $arr = $rs->getArray(); + + $rs->Close(); + + $tableList = array(); + /* - $rs->fields indices - 0 PKTABLE_CAT - 1 PKTABLE_SCHEM - 2 PKTABLE_NAME - 3 PKCOLUMN_NAME - 4 FKTABLE_CAT - 5 FKTABLE_SCHEM - 6 FKTABLE_NAME - 7 FKCOLUMN_NAME + * Array items + * --------------------------------- + * 0 TABLE_CAT The catalog that contains the table. + * The value is NULL if this table does not have catalogs. + * 1 TABLE_SCHEM Name of the schema that contains the table. + * 2 TABLE_NAME Name of the table. + * 3 TABLE_TYPE Table type identifier for the table. + * 4 REMARKS Description of the table. */ - if (!$rs) return false; - $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]])) - $foreign_keys[$rs->fields[5].'.'.$rs->fields[6]] = array(); - $foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3]; + for ($i=0; $i < sizeof($arr); $i++) + { + + $tableRow = $arr[$i]; + $tableName = $tableRow[2]; + $tableType = $tableRow[3]; + + if (!$tableName) + continue; + + if ($ttype == '' && (strcmp($tableType,'TABLE') <> 0 && strcmp($tableType,'VIEW') <> 0)) + continue; + + /* + * Set metacasing if required + */ + $tableName = $this->getMetaCasedValue($tableName); + + /* + * If we requested a schema, we prepend the schema + name to the table name + */ + if (strcmp($schema,'%') <> 0) + $tableName = $schema . '.' . $tableName; + + $tableList[] = $tableName; + + } + return $tableList; + } + + /** + * Return a list of indexes for a specified table + * + * We don't use db2_statistics as the function does not seem to play + * well with mixed case table names + * + * @param string $table + * @param bool $primary (optional) only return primary keys + * @param bool $owner (optional) not used in this driver + * + * @return string[] Array of indexes + */ + public function metaIndexes($table, $primary = false, $owner = false) { + + global $ADODB_FETCH_MODE; + + /* Array( + * [name_of_index] => Array( + * [unique] => true or false + * [columns] => Array( + * [0] => firstcol + * [1] => nextcol + * [2] => etc........ + * ) + * ) + * ) + */ + $indices = array(); + $primaryKeyName = ''; + + $table = $this->getTableCasedValue($table); + + + $savem = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + $this->setFetchMode(ADODB_FETCH_NUM); + + $sql = "SELECT * + FROM syscat.indexes + WHERE tabname='$table'"; + + $rows = $this->getAll($sql); + + $this->setFetchMode($savem); + $ADODB_FETCH_MODE = $savem; + + if (empty($rows)) + return false; + + foreach ($rows as $r) + { + + $primaryIndex = $r[7] == 'P'?1:0; + if (!$primary) + /* + * Primary key not requested, ignore that one + */ + if ($r[7] == 'P') + continue; + + $indexName = $this->getMetaCasedValue($r[1]); + if (!isset($indices[$indexName])) + { + $unique = ($r[7] == 'U')?1:0; + $indices[$indexName] = array('unique'=>$unique, + 'primary'=>$primaryIndex, + 'columns'=>array() + ); } - $rs->MoveNext(); + $cols = explode('+',$r[6]); + foreach ($cols as $colIndex=>$col) + { + if ($colIndex == 0) + continue; + $columnName = $this->getMetaCasedValue($col); + $indices[$indexName]['columns'][] = $columnName; + } + } - $rs->Close(); - return $foreign_key; + return $indices; + } + /** + * List procedures or functions in an array. + * + * We interrogate syscat.routines instead of calling the PHP + * function procedures because ADOdb requires the type of procedure + * this is not available in the php function + * + * @param string $procedureNamePattern (optional) + * @param string $catalog (optional) + * @param string $schemaPattern (optional) - function MetaTables($ttype = false, $schema = false, $mask = false) - { - global $ADODB_FETCH_MODE; + * @return array of procedures on current database. + * + */ + public function metaProcedures($procedureNamePattern = null, $catalog = null, $schemaPattern = null) { - $savem = $ADODB_FETCH_MODE; + + global $ADODB_FETCH_MODE; + + $metaProcedures = array(); + $procedureSQL = ''; + $catalogSQL = ''; + $schemaSQL = ''; + + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - $qid = db2_tables($this->_connectionID); - $rs = new ADORecordSet_db2($qid); + if ($procedureNamePattern) + $procedureSQL = "AND ROUTINENAME LIKE " . strtoupper($this->qstr($procedureNamePattern)); + + if ($catalog) + $catalogSQL = "AND OWNER=" . strtoupper($this->qstr($catalog)); + + if ($schemaPattern) + $schemaSQL = "AND ROUTINESCHEMA LIKE {$this->qstr($schemaPattern)}"; + + + $fields = " + ROUTINENAME, + CASE ROUTINETYPE + WHEN 'P' THEN 'PROCEDURE' + WHEN 'F' THEN 'FUNCTION' + ELSE 'METHOD' + END AS ROUTINETYPE_NAME, + ROUTINESCHEMA, + REMARKS"; + + $SQL = "SELECT $fields + FROM syscat.routines + WHERE OWNER IS NOT NULL + $procedureSQL + $catalogSQL + $schemaSQL + ORDER BY ROUTINENAME + "; + + $result = $this->execute($SQL); $ADODB_FETCH_MODE = $savem; - if (!$rs) { - $false = false; - return $false; - } - $arr = $rs->GetArray(); - $rs->Close(); - $arr2 = array(); + if (!$result) + return false; - if ($ttype) { - $isview = strncmp($ttype,'V',1) === 0; + while ($r = $result->fetchRow()){ + $procedureName = $this->getMetaCasedValue($r[0]); + $schemaName = $this->getMetaCasedValue($r[2]); + $metaProcedures[$procedureName] = array('type'=> $r[1], + 'catalog' => '', + 'schema' => $schemaName, + 'remarks' => $r[3] + ); } - for ($i=0; $i < sizeof($arr); $i++) { - if (!$arr[$i][2]) continue; - $type = $arr[$i][3]; - $owner = $arr[$i][1]; - $schemaval = ($schema) ? $arr[$i][1].'.' : ''; - 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]; - } else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2]; - } - return $arr2; + + return $metaProcedures; + } + /** + * Lists databases. Because instances are independent, we only know about + * the current database name + * + * @return string[] + */ + public function metaDatabases(){ + + $dbName = $this->getMetaCasedValue($this->databaseName); + + return (array)$dbName; + + } + + + + /* See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp / SQL data type codes / @@ -510,26 +1082,32 @@ function DB2Types($t) } } - function MetaColumns($table, $normalize=true) + public function metaColumns($table, $normalize=true) { - global $ADODB_FETCH_MODE; - - $false = false; - if ($this->uCaseTables) $table = strtoupper($table); - $schema = ''; - $this->_findschema($table,$schema); + global $ADODB_FETCH_MODE; $savem = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - $colname = "%"; - $qid = db2_columns($this->_connectionID, "", $schema, $table, $colname); - if (empty($qid)) return $false; + $schema = '%'; + $this->_findschema($table,$schema); + $table = $this->getTableCasedValue($table); + $colname = "%"; + $qid = db2_columns($this->_connectionID, null, $schema, $table, $colname); + if (empty($qid)) + { + if ($this->debug) + { + $errorMessage = @db2_conn_errormsg($this->_connectionID); + ADOConnection::outp($errorMessage); + } + return false; + } $rs = new ADORecordSet_db2($qid); - $ADODB_FETCH_MODE = $savem; - if (!$rs) return $false; + if (!$rs) + return false; + $rs->_fetch(); $retarr = array(); @@ -548,15 +1126,25 @@ function MetaColumns($table, $normalize=true) 9 RADIX 10 NULLABLE 11 REMARKS + 12 Column Default + 13 SQL Data Type + 14 SQL DateTime SubType + 15 Max length in Octets + 16 Ordinal Position + 17 Is NULLABLE */ - while (!$rs->EOF) { - if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) { - $fld = new ADOFieldObject(); + while (!$rs->EOF) + { + if ($rs->fields[2] == $table) + { + + $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') { if ($rs->fields[4] <= -95) // UNICODE $fld->max_length = $rs->fields[7]/2; @@ -564,24 +1152,42 @@ function MetaColumns($table, $normalize=true) $fld->max_length = $rs->fields[7]; } else $fld->max_length = $rs->fields[7]; - $fld->not_null = !empty($rs->fields[10]); - $fld->scale = $rs->fields[8]; - $fld->primary_key = false; - $retarr[strtoupper($fld->name)] = $fld; - } else if (sizeof($retarr)>0) + + $fld->not_null = !empty($rs->fields[10]); + $fld->scale = $rs->fields[8]; + $fld->primary_key = false; + + //$columnName = $this->getMetaCasedValue($fld->name); + $columnName = strtoupper($fld->name); + $retarr[$columnName] = $fld; + + } + else if (sizeof($retarr)>0) break; + $rs->MoveNext(); + } + $rs->Close(); - if (empty($retarr)) $retarr = false; + if (empty($retarr)) + $retarr = false; + + /* + * Now we find out if the column is part of a primary key + */ - $qid = db2_primary_keys($this->_connectionID, "", $schema, $table); - if (empty($qid)) return $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; + if (!$rs) + { + $ADODB_FETCH_MODE = $savem; + return $retarr; + } $rs->_fetch(); /* @@ -594,23 +1200,371 @@ function MetaColumns($table, $normalize=true) 5 PK_NAME */ while (!$rs->EOF) { - if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) { + if (strtoupper(trim($rs->fields[2])) == $table + && (!$schema || strtoupper($rs->fields[1]) == $schema)) + { $retarr[strtoupper($rs->fields[3])]->primary_key = true; - } else if (sizeof($retarr)>0) + } + else if (sizeof($retarr)>0) break; + $rs->MoveNext(); } $rs->Close(); - if (empty($retarr)) $retarr = false; + $ADODB_FETCH_MODE = $savem; + + if (empty($retarr)) + return false; + + /* + * If the fetch mode is numeric, return as numeric array + */ + if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) + $retarr = array_values($retarr); + return $retarr; } + /** + * In this version if prepareSp, we just check to make sure + * that the name of the stored procedure is correct + * If true, we returns an array + * else false + * + * @param string $procedureName + * @param mixed $parameters (not used in db2 connections) + * @return mixed[] + */ + function prepareSp($procedureName,$parameters=false) { + + global $ADODB_FETCH_MODE; + + $this->storedProcedureParameters = array('name'=>'', + 'resource'=>false, + 'in'=>array(), + 'out'=>array(), + 'index'=>array(), + 'parameters'=>array(), + 'keyvalue' => array()); + + //$procedureName = strtoupper($procedureName); + //$procedureName = $this->getTableCasedValue($procedureName); + + $savem = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + + $qid = db2_procedures($this->_connectionID, NULL , '%' , $procedureName ); + + $ADODB_FETCH_MODE = $savem; + + if (!$qid) + { + if ($this->debug) + ADOConnection::outp(sprintf('No Procedure of name %s available',$procedureName)); + return false; + } + + + + $this->storedProcedureParameters['name'] = $procedureName; + /* + * Now we know we have a valid procedure name, lets see if it requires + * parameters + */ + $savem = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + + $qid = db2_procedure_columns($this->_connectionID, NULL , '%' , $procedureName , NULL ); + + $ADODB_FETCH_MODE = $savem; + + if (!$qid) + { + if ($this->debug) + ADOConnection::outp(sprintf('No columns of name %s available',$procedureName)); + return false; + } + $rs = new ADORecordSet_db2($qid); + if (!$rs) + return false; + + $preparedStatement = 'CALL %s(%s)'; + $parameterMarkers = array(); + while (!$rs->EOF) + { + $parameterName = $rs->fields[3]; + if ($parameterName == '') + { + $rs->moveNext(); + continue; + } + $parameterType = $rs->fields[4]; + $ordinalPosition = $rs->fields[17]; + switch($parameterType) + { + case DB2_PARAM_IN: + case DB2_PARAM_INOUT: + $this->storedProcedureParameters['in'][$parameterName] = ''; + break; + case DB2_PARAM_INOUT: + case DB2_PARAM_OUT: + $this->storedProcedureParameters['out'][$parameterName] = ''; + break; + } + $this->storedProcedureParameters['index'][$parameterName] = $ordinalPosition; + $this->storedProcedureParameters['parameters'][$ordinalPosition] = $rs->fields; + $rs->moveNext(); + + } + $parameterCount = count($this->storedProcedureParameters['index']); + $parameterMarkers = array_fill(0,$parameterCount,'?'); + + /* + * We now know how many parameters to bind to the stored procedure + */ + $parameterList = implode(',',$parameterMarkers); + + $sql = sprintf($preparedStatement,$procedureName,$parameterList); + + $spResource = @db2_prepare($this->_connectionID,$sql); + + if (!$spResource) + { + $errorMessage = @db2_conn_errormsg($this->_connectionID); + $this->_errorMsg = $errorMessage; + + if ($this->debug) + ADOConnection::outp($errorMessage); + + return false; + } + + $this->storedProcedureParameters['resource'] = $spResource; + + if ($this->debug) + { + + ADOConnection::outp('The following parameters will be used in the SP call'); + ADOConnection::outp(print_r($this->storedProcedureParameters)); + } + /* + * We now have a stored parameter resource + * to bind to. The spResource and sql that is returned are + * not usable, its for dummy compatibility. Everything + * will be handled by the storedProcedureParameters + * array + */ + return array($sql,$spResource); + + } + + private function storedProcedureParameter(&$stmt, + &$var, + $name, + $isOutput=false, + $maxLen=4000, + $type=false) + { + + + $name = strtoupper($name); + + /* + * Must exist in the list of parameter names for the type + */ + if ($isOutput + && !isset( $this->storedProcedureParameters['out'][$name])) + { + $errorMessage = sprintf('%s is not a valid OUT parameter name',$name); + + $this->_errorMsg = $errorMessage; + if ($this->debug) + ADOConnection::outp($errorMessage); + return false; + } + + if (!$isOutput + && !isset( $this->storedProcedureParameters['in'][$name])) + { + $errorMessage = sprintf('%s is not a valid IN parameter name',$name); + + $this->_errorMsg = $errorMessage; + if ($this->debug) + ADOConnection::outp($errorMessage); + return false; + } + + /* + * We will use these values to bind to when we execute + * the query + */ + $this->storedProcedureParameters['keyvalue'][$name] = &$var; + + return true; + + } + + /** + * Executes a prepared stored procedure. + * + * The function uses the previously accumulated information and + * resources in the $storedProcedureParameters array + * + * @return mixed The statement id if successful, or false + */ + private function executeStoredProcedure() + { + + /* + * Get the previously built resource + */ + $stmtid = $this->storedProcedureParameters['resource']; + + /* + * Bind our variables to the DB2 procedure + */ + foreach ($this->storedProcedureParameters['keyvalue'] as $spName=>$spValue){ + + /* + * Get the ordinal position, required for binding + */ + $ordinalPosition = $this->storedProcedureParameters['index'][$spName]; + + /* + * Get the db2 column dictionary for the parameter + */ + $columnDictionary = $this->storedProcedureParameters['parameters'][$ordinalPosition]; + $parameterType = $columnDictionary[4]; + $dataType = $columnDictionary[5]; + $precision = $columnDictionary[10]; + $scale = $columnDictionary[9]; + + $ok = @db2_bind_param ($this->storedProcedureParameters['resource'], + $ordinalPosition , + $spName, + $parameterType, + $dataType, + $precision, + $scale + ); + + if (!$ok) + { + $this->_errorMsg = @db2_stmt_errormsg(); + $this->_errorCode = @db2_stmt_error(); + + if ($this->debug) + ADOConnection::outp($this->_errorMsg); + return false; + } + + if ($this->debug) + ADOConnection::outp("Correctly Bound parameter $spName to procedure"); + + /* + * Build a variable in the current environment that matches + * the parameter name + */ + ${$spName} = $spValue; + + } + + /* + * All bound, execute + */ + + if (!@db2_execute($stmtid)) + { + $this->_errorMsg = @db2_stmt_errormsg(); + $this->_errorCode = @db2_stmt_error(); + + if ($this->debug) + ADOConnection::outp($this->_errorMsg); + return false; + } + + /* + * We now take the changed parameters back into the + * stored procedures array where we can query them later + * Remember that $spValue was passed in by reference, so we + * can access the value in the variable that was originally + * passed to inParameter or outParameter + */ + foreach ($this->storedProcedureParameters['keyvalue'] as $spName=>$spValue) + { + /* + * We make it available to the environment + */ + $spValue = ${$spName}; + $this->storedProcedureParameters['keyvalue'][$spName] = $spValue; + } + + return $stmtid; + } + + /** + * + * Accepts an input or output parameter to bind to either a stored + * or prepared statements. For DB2, this should not be called as an + * API. always wrap with inParameter and outParameter + * + * @param mixed[] $stmt Statement returned by Prepare() or PrepareSP(). + * @param mixed $var PHP variable to bind to. Can set to null (for isNull support). + * @param string $name Name of stored procedure variable name to bind to. + * @param int $isOutput optional) Indicates direction of parameter + * 0/false=IN 1=OUT 2= IN/OUT + * This is ignored for Stored Procedures + * @param int $maxLen (optional)Holds an maximum length of the variable. + * This is ignored for Stored Procedures + * @param int $type (optional) The data type of $var. + * This is ignored for Stored Procedures + * + * @return bool Success of the operation + */ + public function parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false) + { + + /* + * If the $stmt is the name of a stored procedure we are + * setting up, we will process it one way, otherwise + * we assume we are setting up a prepared statement + */ + if (is_array($stmt)) + { + if ($this->debug) + ADOConnection::outp("Adding parameter to stored procedure"); + if ($stmt[1] == $this->storedProcedureParameters['resource']) + return $this->storedProcedureParameter($stmt[1], + $var, + $name, + $isOutput, + $maxLen, + $type); + + } + + /* + * We are going to add a parameter to a prepared statement + */ + if ($this->debug) + ADOConnection::outp("Adding parameter to prepared statement"); + } + - function Prepare($sql) + /** + * Prepares a prepared SQL statement, not used for stored procedures + * + * @param string $sql + * + * @return mixed + */ + function prepare($sql) { + if (! $this->_bindInputArray) return $sql; // no binding - $stmt = db2_prepare($this->_connectionID,$sql); + + $stmt = @db2_prepare($this->_connectionID,$sql); if (!$stmt) { // we don't know whether db2 driver is parsing prepared stmts, so just return sql return $sql; @@ -618,66 +1572,155 @@ function Prepare($sql) return array($sql,$stmt,false); } - /* returns queryID or false */ - function _query($sql,$inputarr=false) + /** + * Executes a query + * + * @param mixed $sql + * @param mixed $inputarr An optional array of parameters + * + * @return mixed either the queryID or false + */ + function _query(&$sql,$inputarr=false) { - $last_php_error = $this->resetLastError(); - $this->_errorMsg = ''; - if ($inputarr) { - if (is_array($sql)) { + GLOBAL $php_errormsg; + + if (isset($php_errormsg)) + $php_errormsg = ''; + $this->_error = ''; + + $db2Options = array(); + /* + * Use DB2 Internal case handling for best speed + */ + switch(ADODB_ASSOC_CASE) + { + case ADODB_ASSOC_CASE_UPPER: + $db2Options = array('db2_attr_case'=>DB2_CASE_UPPER); + $setOption = @db2_set_option($this->_connectionID,$db2Options,1); + break; + + case ADODB_ASSOC_CASE_LOWER: + $db2Options = array('db2_attr_case'=>DB2_CASE_LOWER); + $setOption = @db2_set_option($this->_connectionID,$db2Options,1); + break; + + default: + $db2Options = array('db2_attr_case'=>DB2_CASE_NATURAL); + $setOption = @db2_set_option($this->_connectionID,$db2Options,1); + } + + if ($inputarr) + { + if (is_array($sql)) + { $stmtid = $sql[1]; - } else { - $stmtid = db2_prepare($this->_connectionID,$sql); + } + else + { + $stmtid = @db2_prepare($this->_connectionID,$sql); - if ($stmtid == false) { - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); + 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(); - $this->_errorCode = db2_stmt_error(); - } + if (! @db2_execute($stmtid,$inputarr)) + { + $this->_errorMsg = @db2_stmt_errormsg(); + $this->_errorCode = @db2_stmt_error(); + if ($this->debug) + ADOConnection::outp($this->_errorMsg); return false; } - } else if (is_array($sql)) { - $stmtid = $sql[1]; - if (!db2_execute($stmtid)) { - if ($this->_haserrorfunctions) { - $this->_errorMsg = db2_stmt_errormsg(); - $this->_errorCode = db2_stmt_error(); + } + else if (is_array($sql)) + { + + /* + * Either a prepared statement or a stored procedure + */ + + if (is_array($this->storedProcedureParameters) + && is_resource($this->storedProcedureParameters['resource'] + )) + /* + * This is all handled in the separate method for + * readability + */ + return $this->executeStoredProcedure(); + + /* + * First, we prepare the statement + */ + $stmtid = @db2_prepare($this->_connectionID,$sql[0]); + if (!$stmtid){ + $this->_errorMsg = @db2_stmt_errormsg(); + $this->_errorCode = @db2_stmt_error(); + if ($this->debug) + ADOConnection::outp("Prepare failed: " . $this->_errorMsg); + + return false; + } + /* + * We next bind some input parameters + */ + $ordinal = 1; + foreach ($sql[1] as $psVar=>$psVal){ + ${$psVar} = $psVal; + $ok = @db2_bind_param($stmtid, $ordinal, $psVar, DB2_PARAM_IN); + if (!$ok) + { + $this->_errorMsg = @db2_stmt_errormsg(); + $this->_errorCode = @db2_stmt_error(); + if ($this->debug) + ADOConnection::outp("Bind failed: " . $this->_errorMsg); + return false; } + } + + if (!@db2_execute($stmtid)) + { + $this->_errorMsg = @db2_stmt_errormsg(); + $this->_errorCode = @db2_stmt_error(); + if ($this->debug) + ADOConnection::outp($this->_errorMsg); return false; } - } else - $stmtid = @db2_exec($this->_connectionID,$sql); + return $stmtid; + } + else + { + + $stmtid = @db2_exec($this->_connectionID,$sql); + } $this->_lastAffectedRows = 0; - if ($stmtid) { - if (@db2_num_fields($stmtid) == 0) { + if ($stmtid) + { + if (@db2_num_fields($stmtid) == 0) + { $this->_lastAffectedRows = db2_num_rows($stmtid); $stmtid = true; - } else { + } + else + { $this->_lastAffectedRows = 0; } - if ($this->_haserrorfunctions) { - $this->_errorMsg = ''; - $this->_errorCode = 0; - } else { - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); - } - } else { - if ($this->_haserrorfunctions) { - $this->_errorMsg = db2_stmt_errormsg(); - $this->_errorCode = db2_stmt_error(); - } else { - $this->_errorMsg = $this->getChangedErrorMsg($last_php_error); - } + $this->_errorMsg = ''; + $this->_errorCode = 0; + + } + else + { + + $this->_errorMsg = @db2_stmt_errormsg(); + $this->_errorCode = @db2_stmt_error(); + } return $stmtid; } @@ -688,12 +1731,12 @@ function _query($sql,$inputarr=false) Usage: - $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); + $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') + function updateBlob($table,$column,$val,$where,$blobtype='BLOB') { - return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false; + return $this->execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false; } // returns true or false @@ -709,6 +1752,87 @@ function _affectedrows() return $this->_lastAffectedRows; } + /** + * Gets a meta cased parameter + * + * Receives an input variable to be processed per the metaCasing + * rule, and returns the same value, processed + * + * @param string $value + * + * @return string + */ + final public function getMetaCasedValue($value) + { + global $ADODB_ASSOC_CASE; + + switch($ADODB_ASSOC_CASE) + { + case ADODB_ASSOC_CASE_LOWER: + $value = strtolower($value); + break; + case ADODB_ASSOC_CASE_UPPER: + $value = strtoupper($value); + break; + } + return $value; + } + + + const TABLECASE_LOWER = 0; + const TABLECASE_UPPER = 1; + const TABLECASE_DEFAULT = 2; + + /** + * Controls the casing of the table provided to the meta functions + */ + private $tableCase = 2; + + /** + * Sets the table case parameter + * + * @param int $caseOption + * @return null + */ + final public function setTableCasing($caseOption) + { + $this->tableCase = $caseOption; + } + + /** + * Gets the table casing parameter + * + * @return int $caseOption + */ + final public function getTableCasing() + { + return $this->tableCase; + } + + /** + * Gets a table cased parameter + * + * Receives an input variable to be processed per the tableCasing + * rule, and returns the same value, processed + * + * @param string $value + * + * @return string + */ + final public function getTableCasedValue($value) + { + switch($this->tableCase) + { + case self::TABLECASE_LOWER: + $value = strtolower($value); + break; + case self::TABLECASE_UPPER: + $value = strtoupper($value); + break; + } + return $value; + } + } /*-------------------------------------------------------------------------------------- @@ -735,21 +1859,30 @@ function __construct($id,$mode=false) // returns the field object - function FetchField($offset = -1) - { - $o= new ADOFieldObject(); - $o->name = @db2_field_name($this->_queryID,$offset); - $o->type = @db2_field_type($this->_queryID,$offset); - $o->max_length = db2_field_width($this->_queryID,$offset); - if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name); - else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name); + function fetchField($offset = 0) + { + $o = new ADOFieldObject(); + $o->name = @db2_field_name($this->_queryID,$offset); + $o->type = @db2_field_type($this->_queryID,$offset); + $o->max_length = @db2_field_width($this->_queryID,$offset); + + /* + if (ADODB_ASSOC_CASE == 0) + $o->name = strtolower($o->name); + else if (ADODB_ASSOC_CASE == 1) + $o->name = strtoupper($o->name); + */ return $o; } /* Use associative array to get fields array */ - function Fields($colname) + function fields($colname) { - if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname]; + + if ($this->fetchMode & ADODB_FETCH_ASSOC) { + return $this->fields[$colname]; + } + if (!$this->bind) { $this->bind = array(); for ($i=0; $i < $this->_numOfFields; $i++) { @@ -764,11 +1897,15 @@ function Fields($colname) function _initrs() { - global $ADODB_COUNTRECS; + global $ADODB_COUNTRECS; $this->_numOfRows = ($ADODB_COUNTRECS) ? @db2_num_rows($this->_queryID) : -1; + $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; + + if ($this->_numOfRows == 0) + $this->_numOfRows = -1; } function _seek($row) @@ -776,21 +1913,15 @@ 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=0) { if ($offset <= 0) { $rs = $this->GetArray($nrows); return $rs; } - $savem = $this->fetchMode; - $this->fetchMode = ADODB_FETCH_NUM; + $this->Move($offset); - $this->fetchMode = $savem; - if ($this->fetchMode & ADODB_FETCH_ASSOC) { - $this->fields = $this->GetRowAssoc(); - } $results = array(); $cnt = 0; @@ -802,42 +1933,77 @@ function GetArrayLimit($nrows,$offset=-1) return $results; } - - function MoveNext() + function moveNext() { - if ($this->_numOfRows != 0 && !$this->EOF) { - $this->_currentRow++; + if ($this->EOF || $this->_numOfRows == 0) + return false; + + $this->_currentRow++; + + $this->processCoreFetch(); + return $this->processMoveRecord(); + + } + private function processCoreFetch() + { + switch ($this->fetchMode){ + case ADODB_FETCH_ASSOC: + + /* + * Associative array + */ + $this->fields = @db2_fetch_assoc($this->_queryID); + break; + + case ADODB_FETCH_BOTH: + /* + * Fetch both numeric and Associative array + */ + $this->fields = @db2_fetch_both($this->_queryID); + break; + default: + /* + * Numeric array + */ $this->fields = @db2_fetch_array($this->_queryID); - if ($this->fields) { - if ($this->fetchMode & ADODB_FETCH_ASSOC) { - $this->fields = $this->GetRowAssoc(); - } - return true; - } + break; } - $this->fields = false; - $this->EOF = true; - return false; } - function _fetch() + private function processMoveRecord() { + if (!$this->fields){ + $this->EOF = true; + return false; + } - $this->fields = db2_fetch_array($this->_queryID); - if ($this->fields) { - if ($this->fetchMode & ADODB_FETCH_ASSOC) { - $this->fields = $this->GetRowAssoc(); - } + return true; + } + + function _fetch() + { + $this->processCoreFetch(); + if ($this->fields) return true; - } + $this->fields = false; return false; } function _close() { - return @db2_free_result($this->_queryID); + $ok = @db2_free_result($this->_queryID); + if (!$ok) + { + $this->_errorMsg = @db2_stmt_errormsg($this->_queryId); + $this->_errorCode = @db2_stmt_error(); + + if ($this->debug) + ADOConnection::outp($this->_errorMsg); + return false; + } + } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-db2oci.inc.php b/vendor/adodb/adodb-php/drivers/adodb-db2oci.inc.php index 4146fc05df..eea63d94c6 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-db2oci.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-db2oci.inc.php @@ -1,63 +1,43 @@ $_COLONSZ) return $p; - $_COLONARR[] = $v; - return '?'; -} - -// smart remapping of :0, :1 bind vars to ? ? -function _colonscope($sql,$arr) -{ -global $_COLONARR,$_COLONSZ; - - $_COLONARR = array(); - $_COLONSZ = sizeof($arr); - - $sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql); - - if (empty($_COLONARR)) return array($sql,$arr); - - foreach($_COLONARR as $k => $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. -*/ - +/** + * Smart remapping of :0, :1 bind vars to ? ? + * Handles colons in comments -- and / * * / and in quoted strings. + * @param string $sql SQL statement + * @param array $arr parameters + * @return array + */ function _colonparser($sql,$arr) { $lensql = strlen($sql); @@ -217,10 +197,6 @@ class ADORecordSet_db2oci extends ADORecordSet_db2 { var $databaseType = "db2oci"; - function __construct($id,$mode=false) - { - return parent::__construct($id,$mode); - } } } //define diff --git a/vendor/adodb/adodb-php/drivers/adodb-db2ora.inc.php b/vendor/adodb/adodb-php/drivers/adodb-db2ora.inc.php index 10b951aa7a..d343a8ae16 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-db2ora.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-db2ora.inc.php @@ -1,21 +1,32 @@ . - Set tabs to 8. -*/ +/** + * Frontbase driver. + * + * This file is part of ADOdb, a Database Abstraction Layer library for PHP. + * + * @package ADOdb + * @link https://adodb.org Project's web site and documentation + * @link https://github.com/ADOdb/ADOdb Source code and issue tracker + * + * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause + * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option, + * any later version. This means you can use it in proprietary products. + * See the LICENSE.md file distributed with this source code for details. + * @license BSD-3-Clause + * @license LGPL-2.1-or-later + * + * @copyright 2000-2013 John Lim + * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community + * @author Frank M. Kromann + */ // security - hide paths if (!defined('ADODB_DIR')) die(); @@ -25,11 +35,7 @@ class ADODB_fbsql extends ADOConnection { var $fmtTimeStamp = "'Y-m-d H:i:s'"; var $hasLimit = false; - function __construct() - { - } - - function _insertid() + protected function _insertID($table = '', $column = '') { return fbsql_insert_id($this->_connectionID); } @@ -177,7 +183,7 @@ function __construct($queryID,$mode=false) default: $this->fetchMode = FBSQL_BOTH; break; } - return parent::__construct($queryID); + parent::__construct($queryID); } function _initrs() @@ -259,7 +265,7 @@ function MetaType($t,$len=-1,$fieldobj=false) if (!empty($fieldobj->primary_key)) return 'R'; else return 'I'; - default: return 'N'; + default: return ADODB_DEFAULT_METATYPE; } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-firebird.inc.php b/vendor/adodb/adodb-php/drivers/adodb-firebird.inc.php index e0045e903e..2fafbe4fce 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-firebird.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-firebird.inc.php @@ -1,27 +1,130 @@ ibasetrans = IBASE_DEFAULT; + // else + $this->ibasetrans = IBASE_WAIT | IBASE_REC_VERSION | IBASE_COMMITTED; + } + + + // returns true or false + function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false) + { + if (!function_exists('fbird_pconnect')) return null; + if ($argDatabasename) $argHostname .= ':'.$argDatabasename; + $fn = ($persist) ? 'fbird_pconnect':'fbird_connect'; + if ($this->role) + $this->_connectionID = $fn($argHostname,$argUsername,$argPassword, + $this->charSet,$this->buffers,$this->dialect,$this->role); + 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 = "''"; + } + if ($this->_connectionID === false) { + $this->_handleerror(); + return false; + } + + // PHP5 change. + if (function_exists('fbird_timefmt')) { + fbird_timefmt($this->fbird_datefmt,fbird_DATE ); + if ($this->dialect == 1) { + fbird_timefmt($this->fbird_datefmt,fbird_TIMESTAMP ); + } else { + fbird_timefmt($this->fbird_timestampfmt,fbird_TIMESTAMP ); + } + fbird_timefmt($this->fbird_timefmt,fbird_TIME ); + + } else { + ini_set("ibase.timestampformat", $this->fbird_timestampfmt); + ini_set("ibase.dateformat", $this->fbird_datefmt); + ini_set("ibase.timeformat", $this->fbird_timefmt); + } + return true; + } + + // returns true or false + function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) + { + return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true); + } + + + function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false) + { + if ($internalKey) { + return array('RDB$DB_KEY'); + } + + $table = strtoupper($table); + + $sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME + FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME + WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\' + ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION'; + + $a = $this->GetCol($sql,false,true); + if ($a && sizeof($a)>0) return $a; + return false; + } function ServerInfo() { @@ -38,10 +141,597 @@ function ServerInfo() return $arr; } + function BeginTrans() + { + if ($this->transOff) return true; + $this->transCnt += 1; + $this->autoCommit = false; + $this->_transactionID = fbird_trans( $this->ibasetrans, $this->_connectionID ); + return $this->_transactionID; + } + + function CommitTrans($ok=true) + { + if (!$ok) { + return $this->RollbackTrans(); + } + if ($this->transOff) { + return true; + } + if ($this->transCnt) { + $this->transCnt -= 1; + } + $ret = false; + $this->autoCommit = true; + if ($this->_transactionID) { + //print ' commit '; + $ret = fbird_commit($this->_transactionID); + } + $this->_transactionID = false; + return $ret; + } + + function _affectedrows() + { + return fbird_affected_rows( $this->_transactionID ? $this->_transactionID : $this->_connectionID ); + } + + // 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) { + global $ADODB_COUNTRECS; + + if ($this->_logsql) { + $savecrecs = $ADODB_COUNTRECS; + $ADODB_COUNTRECS = true; // force countrecs + $ret =& ADOConnection::_Execute($sql,$inputarr); + $ADODB_COUNTRECS = $savecrecs; + } else { + $ret = ADOConnection::_Execute($sql,$inputarr); + } + return $ret; + } + + function RollbackTrans() + { + if ($this->transOff) return true; + if ($this->transCnt) $this->transCnt -= 1; + $ret = false; + $this->autoCommit = true; + if ($this->_transactionID) { + $ret = fbird_rollback($this->_transactionID); + } + $this->_transactionID = false; + + 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); + } + $table = strtoupper($table); + $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'"; + if (!$primary) { + $sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'"; + } else { + $sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'"; + } + // get index details + $rs = $this->Execute($sql); + if (!is_object($rs)) { + // restore fetchmode + if (isset($savem)) { + $this->SetFetchMode($savem); + } + $ADODB_FETCH_MODE = $save; + return $false; + } + + $indexes = array(); + while ($row = $rs->FetchRow()) { + $index = $row[0]; + if (!isset($indexes[$index])) { + if (is_null($row[3])) { + $row[3] = 0; + } + $indexes[$index] = array( + 'unique' => ($row[3] == 1), + 'columns' => array() + ); + } + $sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '".$index."' ORDER BY RDB\$FIELD_POSITION ASC"; + $rs1 = $this->Execute($sql); + while ($row1 = $rs1->FetchRow()) { + $indexes[$index]['columns'][$row1[2]] = $row1[1]; + } + } + // restore fetchmode + if (isset($savem)) { + $this->SetFetchMode($savem); + } + $ADODB_FETCH_MODE = $save; + + return $indexes; + } + + + // See http://community.borland.com/article/0,1410,25844,00.html + function RowLock($tables,$where,$col=false) + { + if ($this->autoCommit) { + $this->BeginTrans(); + } + $this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim? + return 1; + } + + + function CreateSequence($seqname = 'adodbseq', $startID = 1) + { + $ok = $this->Execute(("CREATE GENERATOR $seqname" )); + if (!$ok) return false; + return $this->Execute("SET GENERATOR $seqname TO ".($startID-1)); + } + + function DropSequence($seqname = 'adodbseq') + { + $seqname = strtoupper($seqname); + return $this->Execute("DROP GENERATOR $seqname"); + } + + function GenID($seqname='adodbseq',$startID=1) + { + $getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE"); + $rs = @$this->Execute($getnext); + if (!$rs) { + $this->Execute(("CREATE GENERATOR $seqname" )); + $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';'); + $rs = $this->Execute($getnext); + } + if ($rs && !$rs->EOF) { + $this->genID = (integer) reset($rs->fields); + } + else { + $this->genID = 0; // false + } + + if ($rs) { + $rs->Close(); + } + + return $this->genID; + } + + function SelectDB($dbName) + { + return false; + } + + function _handleerror() + { + $this->_errorMsg = fbird_errmsg(); + } + + function ErrorNo() + { + if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1]; + else return 0; + } + + function ErrorMsg() + { + return $this->_errorMsg; + } + + function Prepare($sql) + { + $stmt = fbird_prepare($this->_connectionID,$sql); + if (!$stmt) return false; + return array($sql,$stmt); + } + + // returns query ID if successful, otherwise false + // there have been reports of problems with nested queries - the code is probably not re-entrant? + function _query($sql,$iarr=false) + { + if ( !$this->isConnected() ) return false; + if (!$this->autoCommit && $this->_transactionID) { + $conn = $this->_transactionID; + $docommit = false; + } else { + $conn = $this->_connectionID; + $docommit = true; + } + if (is_array($sql)) { + $fn = 'fbird_execute'; + $sql = $sql[1]; + if (is_array($iarr)) { + if ( !isset($iarr[0]) ) + $iarr[0] = ''; // PHP5 compat hack + $fnarr = array_merge( array($sql) , $iarr); + $ret = call_user_func_array($fn,$fnarr); + } + else { + $ret = $fn($sql); + } + } else { + $fn = 'fbird_query'; + if (is_array($iarr)) + { + if (sizeof($iarr) == 0) + $iarr[0] = ''; // PHP5 compat hack + $fnarr = array_merge( array($conn,$sql) , $iarr); + $ret = call_user_func_array($fn,$fnarr); + } + else { + $ret = $fn($conn, $sql); + } + } + if ($docommit && $ret === true) { + fbird_commit($this->_connectionID); + } + + $this->_handleerror(); + return $ret; + } + + // returns true or false + function _close() + { + if (!$this->autoCommit) { + @fbird_rollback($this->_connectionID); + } + return @fbird_close($this->_connectionID); + } + + //OPN STUFF start + function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3) + { + $fscale = abs($fscale); + $fld->max_length = $flen; + $fld->scale = null; + switch($ftype){ + case 7: + case 8: + if ($dialect3) { + switch($fsubtype){ + case 0: + $fld->type = ($ftype == 7 ? 'smallint' : 'integer'); + break; + case 1: + $fld->type = 'numeric'; + $fld->max_length = $fprecision; + $fld->scale = $fscale; + break; + case 2: + $fld->type = 'decimal'; + $fld->max_length = $fprecision; + $fld->scale = $fscale; + break; + } // switch + } else { + if ($fscale !=0) { + $fld->type = 'decimal'; + $fld->scale = $fscale; + $fld->max_length = ($ftype == 7 ? 4 : 9); + } else { + $fld->type = ($ftype == 7 ? 'smallint' : 'integer'); + } + } + break; + case 16: + if ($dialect3) { + switch($fsubtype){ + case 0: + $fld->type = 'decimal'; + $fld->max_length = 18; + $fld->scale = 0; + break; + case 1: + $fld->type = 'numeric'; + $fld->max_length = $fprecision; + $fld->scale = $fscale; + break; + case 2: + $fld->type = 'decimal'; + $fld->max_length = $fprecision; + $fld->scale = $fscale; + break; + } // switch + } + break; + case 10: + $fld->type = 'float'; + break; + case 14: + $fld->type = 'char'; + break; + case 27: + if ($fscale !=0) { + $fld->type = 'decimal'; + $fld->max_length = 15; + $fld->scale = 5; + } else { + $fld->type = 'double'; + } + break; + case 35: + if ($dialect3) { + $fld->type = 'timestamp'; + } else { + $fld->type = 'date'; + } + break; + case 12: + $fld->type = 'date'; + break; + case 13: + $fld->type = 'time'; + break; + case 37: + $fld->type = 'varchar'; + break; + case 40: + $fld->type = 'cstring'; + break; + case 261: + $fld->type = 'blob'; + $fld->max_length = -1; + break; + } // switch + } + //OPN STUFF end + + // returns array of ADOFieldObjects for current table + function MetaColumns($table, $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); + //OPN STUFF end + while (!$rs->EOF) { //print_r($rs->fields); + $fld = new ADOFieldObject(); + $fld->name = trim($rs->fields[0]); + //OPN STUFF start + $this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $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 'blob': + case 'text': + case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break; + case 'double': + case 'float': $fld->default_value = (float) $d; break; + default: $fld->default_value = $d; break; + } + // case 35:$tt = 'TIMESTAMP'; break; + } + if ((isset($rs->fields[5])) && ($fld->type == 'blob')) { + $fld->sub_type = $rs->fields[5]; + } else { + $fld->sub_type = null; + } + //OPN STUFF end + if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld; + else $retarr[strtoupper($fld->name)] = $fld; + + $rs->MoveNext(); + } + $rs->Close(); + if ( empty($retarr)) return $false; + else return $retarr; + } + + function BlobEncode( $blob ) + { + $blobid = fbird_blob_create( $this->_connectionID); + fbird_blob_add( $blobid, $blob ); + return fbird_blob_close( $blobid ); + } + + // since we auto-decode all blob's since 2.42, + // BlobDecode should not do any transforms + function BlobDecode($blob) + { + return $blob; + } + + // old blobdecode function + // still used to auto-decode all blob's + function _BlobDecode_old( $blob ) + { + $blobid = fbird_blob_open($this->_connectionID, $blob ); + $realblob = fbird_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet + while($string = fbird_blob_get($blobid, 8192)){ + $realblob .= $string; + } + fbird_blob_close( $blobid ); + + return( $realblob ); + } + + function _BlobDecode( $blob ) + { + $blob_data = fbird_blob_info($this->_connectionID, $blob ); + $blobid = fbird_blob_open($this->_connectionID, $blob ); + + if( $blob_data[0] > $this->maxblobsize ) { + $realblob = fbird_blob_get($blobid, $this->maxblobsize); + + while($string = fbird_blob_get($blobid, 8192)) { + $realblob .= $string; + } + } else { + $realblob = fbird_blob_get($blobid, $blob_data[0]); + } + + fbird_blob_close( $blobid ); + return( $realblob ); + } + + function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') + { + $fd = fopen($path,'rb'); + if ($fd === false) return false; + $blob_id = fbird_blob_create($this->_connectionID); + + /* fill with data */ + + while ($val = fread($fd,32768)){ + fbird_blob_add($blob_id, $val); + } + + /* close and get $blob_id_str for inserting into table */ + $blob_id_str = fbird_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 = fbird_blob_create($this->_connectionID); + + // fbird_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); + fbird_blob_add($blob_id, $data); + } + + if ($tail_size) { + $start = $n_chunks * $chunk_size; + $data = substr($val, $start, $tail_size); + fbird_blob_add($blob_id, $data); + } + // end replacement ///////////////////////////////////////////////////////// + + $blob_id_str = fbird_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 = fbird_blob_create($this->_connectionID); + fbird_blob_add($blob_id, $val); + $blob_id_str = fbird_blob_close($blob_id); + return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; + } + + // Format date column in sql string given an input format that understands Y M D + // Only since Interbase 6.0 - uses EXTRACT + // problem - does not zero-fill the day and month yet + function SQLDate($fmt, $col=false) + { + if (!$col) $col = $this->sysDate; + $s = ''; + + $len = strlen($fmt); + for ($i=0; $i < $len; $i++) { + if ($s) $s .= '||'; + $ch = $fmt[$i]; + switch($ch) { + case 'Y': + case 'y': + $s .= "extract(year from $col)"; + break; + case 'M': + case 'm': + $s .= "extract(month from $col)"; + break; + case 'W': + case 'w': + // The more accurate way of doing this is with a stored procedure + // See http://wiki.firebirdsql.org/wiki/index.php?page=DATE+Handling+Functions for details + $s .= "((extract(yearday from $col) - extract(weekday from $col - 1) + 7) / 7)"; + break; + case 'Q': + case 'q': + $s .= "cast(((extract(month from $col)+2) / 3) as integer)"; + break; + case 'D': + case 'd': + $s .= "(extract(day from $col))"; + break; + case 'H': + case 'h': + $s .= "(extract(hour from $col))"; + break; + case 'I': + case 'i': + $s .= "(extract(minute from $col))"; + break; + case 'S': + case 's': + $s .= "CAST((extract(second from $col)) AS INTEGER)"; + break; + + default: + if ($ch == '\\') { + $i++; + $ch = substr($fmt,$i,1); + } + $s .= $this->qstr($ch); + break; + } + } + return $s; + } + // Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars! // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows // SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2 - function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0) + function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0) { $nrows = (integer) $nrows; $offset = (integer) $offset; @@ -58,16 +748,173 @@ function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0) return $rs; } +} -}; - +/*-------------------------------------------------------------------------------------- + Class Name: Recordset +--------------------------------------------------------------------------------------*/ -class ADORecordSet_firebird extends ADORecordSet_ibase { +class ADORecordset_firebird extends ADORecordSet +{ var $databaseType = "firebird"; + var $bind=false; + var $_cacheType; function __construct($id,$mode=false) { - parent::__construct($id,$mode); + global $ADODB_FETCH_MODE; + + $this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode; + parent::__construct($id); + } + + /** + * 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; + $ibf = fbird_field_info($this->_queryID,$fieldOffset); + + $name = empty($ibf['alias']) ? $ibf['name'] : $ibf['alias']; + + switch (ADODB_ASSOC_CASE) { + case ADODB_ASSOC_CASE_UPPER: + $fld->name = strtoupper($name); + break; + case ADODB_ASSOC_CASE_LOWER: + $fld->name = strtolower($name); + break; + case ADODB_ASSOC_CASE_NATIVE: + default: + $fld->name = $name; + break; + } + + $fld->type = $ibf['type']; + $fld->max_length = $ibf['length']; + + /* This needs to be populated from the metadata */ + $fld->not_null = false; + $fld->has_default = false; + $fld->default_value = 'null'; + return $fld; + } + + function _initrs() + { + $this->_numOfRows = -1; + $this->_numOfFields = @fbird_num_fields($this->_queryID); + + // cache types for blob decode check + for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { + $f1 = $this->FetchField($i); + $this->_cacheType[] = $f1->type; + } + } + + function _seek($row) + { + return false; + } + + function _fetch() + { + $f = @fbird_fetch_row($this->_queryID); + if ($f === false) { + $this->fields = false; + return false; + } + // OPN stuff start - optimized + // fix missing nulls and decode blobs automatically + + global $ADODB_ANSI_PADDING_OFF; + //$ADODB_ANSI_PADDING_OFF=1; + $rtrim = !empty($ADODB_ANSI_PADDING_OFF); + + for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { + if ($this->_cacheType[$i]=="BLOB") { + if (isset($f[$i])) { + $f[$i] = $this->connection->_BlobDecode($f[$i]); + } else { + $f[$i] = null; + } + } else { + if (!isset($f[$i])) { + $f[$i] = null; + } else if ($rtrim && is_string($f[$i])) { + $f[$i] = rtrim($f[$i]); + } + } + } + // OPN stuff end + + $this->fields = $f; + if ($this->fetchMode == ADODB_FETCH_ASSOC) { + $this->fields = $this->GetRowAssoc(); + } else if ($this->fetchMode == ADODB_FETCH_BOTH) { + $this->fields = array_merge($this->fields,$this->GetRowAssoc()); + } + return true; + } + + /* Use associative array to get fields array */ + function Fields($colname) + { + if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname]; + if (!$this->bind) { + $this->bind = array(); + for ($i=0; $i < $this->_numOfFields; $i++) { + $o = $this->FetchField($i); + $this->bind[strtoupper($o->name)] = $i; + } + } + + return $this->fields[$this->bind[strtoupper($colname)]]; + } + + + function _close() + { + return @fbird_free_result($this->_queryID); + } + + function MetaType($t,$len=-1,$fieldobj=false) + { + if (is_object($t)) { + $fieldobj = $t; + $t = $fieldobj->type; + $len = $fieldobj->max_length; + } + switch (strtoupper($t)) { + case 'CHAR': + return 'C'; + + case 'TEXT': + case 'VARCHAR': + case 'VARYING': + if ($len <= $this->blobSize) return 'C'; + return 'X'; + case 'BLOB': + return 'B'; + + case 'TIMESTAMP': + case 'DATE': return 'D'; + case 'TIME': return 'T'; + //case 'T': return 'T'; + + //case 'L': return 'L'; + case 'INT': + case 'SHORT': + case 'INTEGER': return 'I'; + default: return ADODB_DEFAULT_METATYPE; + } + } + } diff --git a/vendor/adodb/adodb-php/drivers/adodb-ibase.inc.php b/vendor/adodb/adodb-php/drivers/adodb-ibase.inc.php index 2b61e02124..69de30dcca 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-ibase.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-ibase.inc.php @@ -1,29 +1,25 @@ - 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,...)"); -*/ +/** + * Interbase driver. + * + * Requires interbase client. Works on Windows and Unix. + * + * This file is part of ADOdb, a Database Abstraction Layer library for PHP. + * + * @package ADOdb + * @link https://adodb.org Project's web site and documentation + * @link https://github.com/ADOdb/ADOdb Source code and issue tracker + * + * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause + * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option, + * any later version. This means you can use it in proprietary products. + * See the LICENSE.md file distributed with this source code for details. + * @license BSD-3-Clause + * @license LGPL-2.1-or-later + * + * @copyright 2000-2013 John Lim + * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community + */ // security - hide paths if (!defined('ADODB_DIR')) die(); @@ -350,46 +346,26 @@ function _query($sql,$iarr=false) $fn = 'ibase_execute'; $sql = $sql[1]; if (is_array($iarr)) { - if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4 - if ( !isset($iarr[0]) ) $iarr[0] = ''; // PHP5 compat hack - $fnarr = array_merge( array($sql) , $iarr); - $ret = call_user_func_array($fn,$fnarr); - } else { - switch(sizeof($iarr)) { - case 1: $ret = $fn($sql,$iarr[0]); break; - case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break; - case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break; - case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break; - case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break; - case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break; - case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break; - default: ADOConnection::outp( "Too many parameters to ibase query $sql"); - case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break; - } - } - } else $ret = $fn($sql); + if ( !isset($iarr[0]) ) + $iarr[0] = ''; // PHP5 compat hack + $fnarr = array_merge( array($sql) , $iarr); + $ret = call_user_func_array($fn,$fnarr); + } + else { + $ret = $fn($sql); + } } else { $fn = 'ibase_query'; 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); - $ret = call_user_func_array($fn,$fnarr); - } else { - switch(sizeof($iarr)) { - case 1: $ret = $fn($conn,$sql,$iarr[0]); break; - case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break; - case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break; - case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break; - case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break; - case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break; - case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break; - default: ADOConnection::outp( "Too many parameters to ibase query $sql"); - case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break; - } - } - } else $ret = $fn($conn,$sql); + if (sizeof($iarr) == 0) + $iarr[0] = ''; // PHP5 compat hack + $fnarr = array_merge( array($conn,$sql) , $iarr); + $ret = call_user_func_array($fn,$fnarr); + } + else { + $ret = $fn($conn, $sql); + } } if ($docommit && $ret === true) { ibase_commit($this->_connectionID); @@ -601,14 +577,8 @@ function _BlobDecode_old( $blob ) function _BlobDecode( $blob ) { - if (ADODB_PHPVER >= 0x5000) { - $blob_data = ibase_blob_info($this->_connectionID, $blob ); - $blobid = ibase_blob_open($this->_connectionID, $blob ); - } else { - - $blob_data = ibase_blob_info( $blob ); - $blobid = ibase_blob_open( $blob ); - } + $blob_data = ibase_blob_info($this->_connectionID, $blob ); + $blobid = ibase_blob_open($this->_connectionID, $blob ); if( $blob_data[0] > $this->maxblobsize ) { @@ -911,7 +881,7 @@ function MetaType($t,$len=-1,$fieldobj=false) case 'INT': case 'SHORT': case 'INTEGER': return 'I'; - default: return 'N'; + default: return ADODB_DEFAULT_METATYPE; } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-informix.inc.php b/vendor/adodb/adodb-php/drivers/adodb-informix.inc.php index 4e03fac5af..8e99137cb2 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-informix.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-informix.inc.php @@ -1,19 +1,27 @@ - -*/ +/** + * Informix driver. + * + * @deprecated + * + * This file is part of ADOdb, a Database Abstraction Layer library for PHP. + * + * @package ADOdb + * @link https://adodb.org Project's web site and documentation + * @link https://github.com/ADOdb/ADOdb Source code and issue tracker + * + * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause + * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option, + * any later version. This means you can use it in proprietary products. + * See the LICENSE.md file distributed with this source code for details. + * @license BSD-3-Clause + * @license LGPL-2.1-or-later + * + * @copyright 2000-2013 John Lim + * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community + * @author Mitchell T. Young + * @author Samuel Carriere + */ // security - hide paths if (!defined('ADODB_DIR')) die(); @@ -83,7 +90,7 @@ function ServerInfo() - function _insertid() + protected function _insertID($table = '', $column = '') { $sqlca =ifx_getsqlca($this->lastQuery); return @$sqlca["sqlerrd1"]; @@ -403,7 +410,7 @@ function __construct($id,$mode=false) $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - return parent::__construct($id); + parent::__construct($id); } @@ -501,7 +508,7 @@ function _close() } /** !Eos -* Auxiliar function to Parse coltype,collength. Used by Metacolumns +* Auxiliary function to Parse coltype,collength. Used by Metacolumns * return: array ($mtype,$length,$precision,$nullable) (similar to ifx_fieldpropierties) */ function ifx_props($coltype,$collength){ diff --git a/vendor/adodb/adodb-php/drivers/adodb-ldap.inc.php b/vendor/adodb/adodb-php/drivers/adodb-ldap.inc.php index 993f6a2d1c..323b35856b 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-ldap.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-ldap.inc.php @@ -1,20 +1,26 @@ + */ // security - hide paths if (!defined('ADODB_DIR')) die(); @@ -45,10 +51,6 @@ class ADODB_ldap extends ADOConnection { # error on binding, eg. "Binding: invalid credentials" var $_bind_errmsg = "Binding: %s"; - function __construct() - { - } - // returns true or false function _connect( $host, $username, $password, $ldapbase) @@ -331,7 +333,7 @@ function _initrs() /* Return whole recordset as a multi-dimensional associative array */ - function GetAssoc($force_array = false, $first2cols = false) + function GetAssoc($force_array = false, $first2cols = false, $fetchMode = -1) { $records = $this->_numOfRows; $results = array(); diff --git a/vendor/adodb/adodb-php/drivers/adodb-mssql.inc.php b/vendor/adodb/adodb-php/drivers/adodb-mssql.inc.php index 276ebbc240..3de3f8d33c 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-mssql.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-mssql.inc.php @@ -1,21 +1,25 @@ = 0x4300) { -// docs say 4.2.0, but testing shows only since 4.3.0 does it work! - ini_set('mssql.datetimeconvert',0); -} else { -global $ADODB_mssql_mths; // array, months must be upper-case - - - $ADODB_mssql_date_order = 'mdy'; - $ADODB_mssql_mths = array( - 'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6, - 'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12); -} - -//--------------------------------------------------------------------------- -// Call this to autoset $ADODB_mssql_date_order at the beginning of your code, -// just after you connect to the database. Supports mdy and dmy only. -// Not required for PHP 4.2.0 and above. -function AutoDetect_MSSQL_Date_Order($conn) -{ -global $ADODB_mssql_date_order; - $adate = $conn->GetOne('select getdate()'); - if ($adate) { - $anum = (int) $adate; - if ($anum > 0) { - if ($anum > 31) { - //ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently"); - } else - $ADODB_mssql_date_order = 'dmy'; - } else - $ADODB_mssql_date_order = 'mdy'; - } -} +ini_set('mssql.datetimeconvert',0); class ADODB_mssql extends ADOConnection { var $databaseType = "mssql"; @@ -94,7 +66,6 @@ class ADODB_mssql extends ADOConnection { var $hasGenID = true; var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)'; var $sysTimeStamp = 'GetDate()'; - var $_has_mssql_init; var $maxParameterLen = 4000; var $arrayClass = 'ADORecordSet_array_mssql'; var $uniqueSort = true; @@ -107,11 +78,6 @@ class ADODB_mssql extends ADOConnection { var $_bindInputArray = true; var $forceNewConnect = false; - function __construct() - { - $this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0); - } - function ServerInfo() { global $ADODB_FETCH_MODE; @@ -148,16 +114,16 @@ function IfNull( $field, $ifNull ) return " ISNULL($field, $ifNull) "; // if MS SQL Server } - function _insertid() + protected function _insertID($table = '', $column = '') { // SCOPE_IDENTITY() // Returns the last IDENTITY value inserted into an IDENTITY column in // the same scope. A scope is a module -- a stored procedure, trigger, // function, or batch. Thus, two statements are in the same scope if // they are in the same stored procedure, function, or batch. - if ($this->lastInsID !== false) { - return $this->lastInsID; // InsID from sp_executesql call - } else { + if ($this->lastInsID !== false) { + return $this->lastInsID; // InsID from sp_executesql call + } else { return $this->GetOne($this->identitySQL); } } @@ -165,37 +131,22 @@ function _insertid() /** - * Correctly quotes a string so that all strings are escaped. We prefix and append - * to the string single-quotes. - * An example is $db->qstr("Don't bother",magic_quotes_runtime()); - * - * @param s the string to quote - * @param [magic_quotes] if $s is GET/POST var, set to get_magic_quotes_gpc(). - * This undoes the stupidity of magic quotes for GPC. - * - * @return quoted string to be sent back to database - */ - function qstr($s,$magic_quotes=false) + * 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"); + * + * @param string $s The string to quote + * @param bool $magic_quotes This param is not used since 5.21.0. + * It remains for backwards compatibility. + * + * @return string Quoted string to be sent back to database + * + * @noinspection PhpUnusedParameterInspection + */ + function qStr($s, $magic_quotes=false) { - if (!$magic_quotes) { - return "'".str_replace("'",$this->replaceQuote,$s)."'"; - } - - // undo magic quotes for " unless sybase is on - $sybase = ini_get('magic_quotes_sybase'); - if (!$sybase) { - $s = str_replace('\\"','"',$s); - if ($this->replaceQuote == "\\'") // ' already quoted, no need to change anything - return "'$s'"; - else {// change \' to '' for sybase/mssql - $s = str_replace('\\\\','\\',$s); - return "'".str_replace("\\'",$this->replaceQuote,$s)."'"; - } - } else { - return "'".$s."'"; - } + return "'" . str_replace("'", $this->replaceQuote, $s) . "'"; } -// moodle change end - see readme_moodle.txt function _affectedrows() { @@ -309,7 +260,9 @@ function SQLDate($fmt, $col=false) case 'A': $s .= "substring(convert(char(19),$col,0),18,2)"; break; - + case 'l': + $s .= "datename(dw,$col)"; + break; default: if ($ch == '\\') { $i++; @@ -327,8 +280,8 @@ function BeginTrans() { if ($this->transOff) return true; $this->transCnt += 1; - $ok = $this->Execute('BEGIN TRAN'); - return $ok; + $ok = $this->Execute('BEGIN TRAN'); + return $ok; } function CommitTrans($ok=true) @@ -451,29 +404,29 @@ function MetaIndexes($table,$primary=false, $owner=false) global $ADODB_FETCH_MODE; $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - if ($this->fetchMode !== FALSE) { - $savem = $this->SetFetchMode(FALSE); - } + $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; + $rs = $this->Execute($sql); + if (isset($savem)) { + $this->SetFetchMode($savem); + } + $ADODB_FETCH_MODE = $save; - if (!is_object($rs)) { - return FALSE; - } + 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) @@ -488,7 +441,7 @@ function MetaForeignKeys($table, $owner=false, $upper=false) "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 + col_name(rkeyid, rkey) as referenced_column_name from sysforeignkeys where upper(object_name(fkeyid)) = $table order by constraint_name, referenced_table_name, keyno"; @@ -509,7 +462,11 @@ function MetaForeignKeys($table, $owner=false, $upper=false) foreach($arr as $k => $v) { foreach($v as $a => $b) { if ($upper) $a = strtoupper($a); - $arr2[$a] = $b; + if (is_array($arr2[$a])) { // a previous foreign key was define for this reference table, we merge the new one + $arr2[$a] = array_merge($arr2[$a], $b); + } else { + $arr2[$a] = $b; + } } } return $arr2; @@ -519,22 +476,24 @@ function MetaForeignKeys($table, $owner=false, $upper=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); + $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" @@ -607,14 +566,18 @@ function ErrorNo() if (!$id) return false; $arr = mssql_fetch_array($id); @mssql_free_result($id); - if (is_array($arr)) return $arr[0]; - else return -1; + 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) { if (!function_exists('mssql_pconnect')) return null; + if (!empty($this->port)) $argHostname .= ":".$this->port; $this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword,$newconnect); if ($this->_connectionID === false) return false; if ($argDatabasename) return $this->SelectDB($argDatabasename); @@ -626,6 +589,7 @@ function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$ne function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { if (!function_exists('mssql_pconnect')) return null; + if (!empty($this->port)) $argHostname .= ":".$this->port; $this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword); if ($this->_connectionID === false) return false; @@ -639,9 +603,9 @@ function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) } function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename) - { + { return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true); - } + } function Prepare($sql) { @@ -656,31 +620,27 @@ function Prepare($sql) function PrepareSP($sql,$param=true) { - if (!$this->_has_mssql_init) { - ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0"); - return $sql; - } $stmt = mssql_init($sql,$this->_connectionID); if (!$stmt) return $sql; return array($sql,$stmt); } // 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, @@ -688,11 +648,11 @@ function(&$value, $key) { $value = "CAST(" . $value . " AS VARCHAR(255))"; } ); - $s = implode('+',$arr); - if (sizeof($arr) > 0) return "$s"; + $s = implode('+',$arr); + if (sizeof($arr) > 0) return "$s"; return ''; - } + } /* Usage: @@ -714,11 +674,6 @@ function(&$value, $key) { */ function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false) { - if (!$this->_has_mssql_init) { - ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0"); - return false; - } - $isNull = is_null($var); // php 4.0.4 and above... if ($type === false) @@ -728,7 +683,7 @@ function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=fa case 'double': $type = SQLFLT8; break; case 'integer': $type = SQLINT4; break; case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0 - } + } if ($this->debug) { $prefix = ($isOutput) ? 'Out' : 'In'; @@ -736,7 +691,7 @@ function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=fa ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);"); } /* - See http://phplens.com/lens/lensforum/msgs.php?id=7231 + See PHPLens Issue No: 7231 RETVAL is HARD CODED into php_mssql extension: The return value (a long integer value) is treated like a special OUTPUT parameter, @@ -780,11 +735,11 @@ function _query($sql,$inputarr=false) # 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; - if (!is_array($sql) && preg_match('/^\\s*insert/i', $sql)) { - $getIdentity = true; - $sql .= (preg_match('/;\\s*$/i', $sql) ? ' ' : '; ') . $this->identitySQL; - } + $getIdentity = false; + if (!is_array($sql) && preg_match('/^\\s*insert/i', $sql)) { + $getIdentity = true; + $sql .= (preg_match('/;\\s*$/i', $sql) ? ' ' : '; ') . $this->identitySQL; + } if (!is_array($sql)) $sql = $this->Prepare($sql); $params = ''; $decl = ''; @@ -805,16 +760,16 @@ function _query($sql,$inputarr=false) $decl .= "@P$i NVARCHAR($len)"; } - - if (substr($v,0,1) == "'" && substr($v,-1,1) == "'") + if(substr($v,0,1) == "'" && substr($v,-1,1) == "'") /* * String is already fully quoted */ $inputVar = $v; else - $inputVar = $this->qstr($v); + $inputVar = $db->this($v); + + $params .= "@P$i=N" . $inputVar; - $params .= "@P$i=N" . $inputVar; } else if (is_integer($v)) { $decl .= "@P$i INT"; $params .= "@P$i=".$v; @@ -833,20 +788,20 @@ function _query($sql,$inputarr=false) $decl = $this->qstr($decl); if ($this->debug) ADOConnection::outp("sp_executesql N{$sql[1]},N$decl,$params"); $rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params", $this->_connectionID); - if ($getIdentity) { - $arr = @mssql_fetch_row($rez); - $this->lastInsID = isset($arr[0]) ? $arr[0] : false; - @mssql_data_seek($rez, 0); - } + if ($getIdentity) { + $arr = @mssql_fetch_row($rez); + $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; + $this->lastInsID = false; } else { $rez = mssql_query($sql,$this->_connectionID); - $this->lastInsID = false; + $this->lastInsID = false; } return $rez; } @@ -854,33 +809,54 @@ function _query($sql,$inputarr=false) // returns true or false function _close() { - if ($this->transCnt) $this->RollbackTrans(); - $rez = @mssql_close($this->_connectionID); + if ($this->transCnt) { + $this->RollbackTrans(); + } + if($this->_connectionID) { + $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) + + /** + * Returns a substring of a varchar type field + * + * The SQL server version varies because the length is mandatory, so + * we append a reasonable string length + * + * @param string $fld The field to sub-string + * @param int $start The start point + * @param int $length An optional length + * + * @return The SQL text + */ + function substr($fld,$start,$length=0) { - return ADORecordSet_array_mssql::UnixTimeStamp($v); + if ($length == 0) + /* + * The length available to varchar is 2GB, but that makes no + * sense in a substring, so I'm going to arbitrarily limit + * the length to 1K, but you could change it if you want + */ + $length = 1024; + + $text = "SUBSTRING($fld,$start,$length)"; + return $text; } } /*-------------------------------------------------------------------------------------- - Class Name: Recordset + Class Name: Recordset --------------------------------------------------------------------------------------*/ class ADORecordset_mssql extends ADORecordSet { var $databaseType = "mssql"; var $canSeek = true; - var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083 + var $hasFetchAssoc; // see PHPLens Issue No: 6083 // _mths works only in non-localised system function __construct($id,$mode=false) @@ -894,7 +870,7 @@ function __construct($id,$mode=false) } $this->fetchMode = $mode; - return parent::__construct($id,$mode); + return parent::__construct($id); } @@ -930,7 +906,7 @@ function Fields($colname) } } - return $this->fields[$this->bind[strtoupper($colname)]]; + return $this->fields[$this->bind[strtoupper($colname)]]; } /* Returns: an object containing field information. @@ -970,7 +946,7 @@ function MoveNext() } else { if ($this->hasFetchAssoc) {// only for PHP 4.2.0 or later - $this->fields = @mssql_fetch_assoc($this->_queryID); + $this->fields = @mssql_fetch_assoc($this->_queryID); } else { $flds = @mssql_fetch_array($this->_queryID); if (is_array($flds)) { @@ -1027,9 +1003,9 @@ function _fetch($ignore_fields=false) $this->fields = @mssql_fetch_assoc($this->_queryID); else { $this->fields = @mssql_fetch_array($this->_queryID); - if (@is_array($$this->fields)) { + if (@is_array($this->fields)) { $fassoc = array(); - foreach($$this->fields as $k => $v) { + foreach($this->fields as $k => $v) { if (is_integer($k)) continue; $fassoc[$k] = $v; } @@ -1075,108 +1051,43 @@ function _close() return true; } - // mssql uses a default date like Dec 30 2000 12:00AM - static function UnixDate($v) + /** + * Returns the maximum size of a MetaType C field. Because of the + * database design, SQL Server places no limits on the size of data inserted + * Although the actual limit is 2^31-1 bytes. + * + * @return int + */ + function charMax() { - return ADORecordSet_array_mssql::UnixDate($v); + return ADODB_STRINGMAX_NOLIMIT; } - static function UnixTimeStamp($v) + /** + * Returns the maximum size of a MetaType X field. Because of the + * database design, SQL Server places no limits on the size of data inserted + * Although the actual limit is 2^31-1 bytes. + * + * @return int + */ + function textMax() { - return ADORecordSet_array_mssql::UnixTimeStamp($v); + return ADODB_STRINGMAX_NOLIMIT; } } -class ADORecordSet_array_mssql extends ADORecordSet_array { - function __construct($id=-1,$mode=false) - { - parent::__construct($id,$mode); - } - - // mssql uses a default date like Dec 30 2000 12:00AM - 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 - if ($ADODB_mssql_date_order == 'dmy') { - if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) { - return parent::UnixDate($v); - } - if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - - $theday = $rr[1]; - $themth = substr(strtoupper($rr[2]),0,3); - } else { - if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) { - return parent::UnixDate($v); - } - if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - - $theday = $rr[2]; - $themth = substr(strtoupper($rr[1]),0,3); - } - $themth = $ADODB_mssql_mths[$themth]; - if ($themth <= 0) return false; - // h-m-s-MM-DD-YY - return mktime(0,0,0,$themth,$theday,$rr[3]); - } - - 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; - break; - case 'A': - if ($rr[4]==12) $rr[4] = 0; - break; - default: - break; - } - // h-m-s-MM-DD-YY - return mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]); - } -} +class ADORecordSet_array_mssql 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 diff --git a/vendor/adodb/adodb-php/drivers/adodb-mssql_n.inc.php b/vendor/adodb/adodb-php/drivers/adodb-mssql_n.inc.php index 28b29bb2af..236c1546af 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-mssql_n.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-mssql_n.inc.php @@ -1,47 +1,27 @@ $inboundValue) { - + if (is_resource($inboundValue)) { /* @@ -106,7 +86,7 @@ function _appendN($inboundData) { continue; } - + if (strpos($inboundValue, SINGLEQUOTE) === false) { /* @@ -121,11 +101,11 @@ function _appendN($inboundData) { * Check we haven't an odd number of single quotes (this can cause problems below * and should be considered one wrong SQL). Exit with debug info. */ - if ((substr_count($inboundValue, SINGLEQUOTE) & 1)) + if ((substr_count($inboundValue, SINGLEQUOTE) & 1)) { if ($this->debug) ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Wrong number of quotes (odd)"); - + break; } @@ -136,9 +116,9 @@ function _appendN($inboundData) { $regexp = '/(\\\\' . SINGLEQUOTE . '[^' . SINGLEQUOTE . '])/'; if (preg_match($regexp, $inboundValue)) { - if ($this->debug) + if ($this->debug) ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Found bad use of backslash + single quote"); - + break; } @@ -148,16 +128,16 @@ function _appendN($inboundData) { $pairs = array(); $regexp = '/(' . SINGLEQUOTE . SINGLEQUOTE . ')/'; preg_match_all($regexp, $inboundValue, $list_of_pairs); - + if ($list_of_pairs) { foreach (array_unique($list_of_pairs[0]) as $key=>$value) $pairs['<@#@#@PAIR-'.$key.'@#@#@>'] = $value; - - + + if (!empty($pairs)) $inboundValue = str_replace($pairs, array_keys($pairs), $inboundValue); - + } /* @@ -166,13 +146,13 @@ function _appendN($inboundData) { $literals = array(); $regexp = '/(N?' . SINGLEQUOTE . '.*?' . SINGLEQUOTE . ')/is'; preg_match_all($regexp, $inboundValue, $list_of_literals); - + if ($list_of_literals) { foreach (array_unique($list_of_literals[0]) as $key=>$value) $literals['<#@#@#LITERAL-'.$key.'#@#@#>'] = $value; - - + + if (!empty($literals)) $inboundValue = str_replace($literals, array_keys($literals), $inboundValue); } @@ -185,11 +165,11 @@ function _appendN($inboundData) { foreach ($literals as $key=>$value) { if (!is_numeric(trim($value, SINGLEQUOTE))) /* - * Non numeric string, prepend our dear N, whilst + * Non numeric string, prepend our dear N, whilst * Trimming potentially existing previous "N" */ - $literals[$key] = 'N' . trim($value, 'N'); - + $literals[$key] = 'N' . trim($value, 'N'); + } } @@ -198,7 +178,7 @@ function _appendN($inboundData) { */ if (!empty($literals)) $inboundValue = str_replace(array_keys($literals), $literals, $inboundValue); - + /* * Any pairs followed by N' must be switched to N' followed by those pairs @@ -211,40 +191,36 @@ function _appendN($inboundData) { */ if (!empty($pairs)) $inboundValue = str_replace(array_keys($pairs), $pairs, $inboundValue); - + /* * Print transformation if debug = on */ if (strcmp($inboundValue,$inboundArray[$inboundKey]) <> 0 && $this->debug) ADOConnection::outp("{$this->databaseType} internal transformation: {$inboundArray[$inboundKey]} to {$inboundValue}"); - + if (strcmp($inboundValue,$inboundArray[$inboundKey]) <> 0) /* * Place the transformed value into the outbound array */ $outboundArray[$inboundKey] = $inboundValue; } - + /* * Any transformations are in the $outboundArray */ if ($inboundIsArray) return $outboundArray; - + /* * We passed a string in originally */ return $outboundArray[0]; - + } } class ADORecordset_mssql_n extends ADORecordset_mssql { var $databaseType = "mssql_n"; - function __construct($id,$mode=false) - { - parent::__construct($id,$mode); - } } diff --git a/vendor/adodb/adodb-php/drivers/adodb-mssqlnative.inc.php b/vendor/adodb/adodb-php/drivers/adodb-mssqlnative.inc.php index 53be16ce95..36dc543396 100644 --- a/vendor/adodb/adodb-php/drivers/adodb-mssqlnative.inc.php +++ b/vendor/adodb/adodb-php/drivers/adodb-mssqlnative.inc.php @@ -1,24 +1,26 @@ = 0x4300) { -// docs say 4.2.0, but testing shows only since 4.3.0 does it work! - ini_set('mssql.datetimeconvert',0); -} else { - global $ADODB_mssql_mths; // array, months must be upper-case - $ADODB_mssql_date_order = 'mdy'; - $ADODB_mssql_mths = array( - 'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6, - 'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12); -} - class ADODB_mssqlnative extends ADOConnection { var $databaseType = "mssqlnative"; var $dataProvider = "mssqlnative"; var $replaceQuote = "''"; // string to use to replace quotes var $fmtDate = "'Y-m-d'"; var $fmtTimeStamp = "'Y-m-d\TH:i:s'"; + /** + * Enabling InsertID capability will cause execution of an extra query + * {@see $identitySQL} after each INSERT statement. To improve performance + * when inserting a large number of records, you should switch this off by + * calling {@see enableLastInsertID enableLastInsertID(false)}. + * @var bool $hasInsertID + */ var $hasInsertID = true; var $substr = "substring"; var $length = 'len'; @@ -124,8 +96,10 @@ class ADODB_mssqlnative extends ADOConnection { var $uniqueOrderBy = true; var $_bindInputArray = true; var $_dropSeqSQL = "drop table %s"; - var $connectionInfo = array(); + + var $connectionInfo = array('ReturnDatesAsStrings'=>true); var $cachedSchemaFlush = false; + var $sequences = false; var $mssql_version = ''; @@ -163,7 +137,7 @@ function ServerVersion() { } function ServerInfo() { - global $ADODB_FETCH_MODE; + global $ADODB_FETCH_MODE; static $arr = false; if (is_array($arr)) return $arr; @@ -187,14 +161,23 @@ function IfNull( $field, $ifNull ) return " ISNULL($field, $ifNull) "; // if MS SQL Server } - function _insertid() + public function enableLastInsertID($enable = true) { + $this->hasInsertID = $enable; + $this->lastInsID = false; + } + + /** + * Get the last value inserted into an IDENTITY column. + * + * The value will actually be set in {@see _query()} when executing an + * INSERT statement, but only if the connection's $hasInsertId property + * is true; this can be set with {@see enableLastInsertId()}. + * + * @inheritDoc + */ + protected function _insertID($table = '', $column = '') { - // SCOPE_IDENTITY() - // Returns the last IDENTITY value inserted into an IDENTITY column in - // the same scope. A scope is a module -- a stored procedure, trigger, - // function, or batch. Thus, two statements are in the same scope if - // they are in the same stored procedure, function, or batch. - return $this->lastInsertID; + return $this->lastInsID; } function _affectedrows() @@ -204,8 +187,6 @@ function _affectedrows() } function GenID($seq='adodbseq',$start=1) { - if (!$this->mssql_version) - $this->ServerVersion(); switch($this->mssql_version){ case 9: case 10: @@ -219,9 +200,6 @@ function GenID($seq='adodbseq',$start=1) { function CreateSequence($seq='adodbseq',$start=1) { - if (!$this->mssql_version) - $this->ServerVersion(); - switch($this->mssql_version){ case 9: case 10: @@ -231,7 +209,6 @@ function CreateSequence($seq='adodbseq',$start=1) return $this->CreateSequence2012($seq, $start); break; } - } /** @@ -321,9 +298,26 @@ function GenID2012($seq='adodbseq',$start=1) // 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; + if (!$col) { + $col = $this->sysTimeStamp; + } $s = ''; + $ConvertableFmt=array( + "m/d/Y"=>101, "m/d/y"=>101 // US + ,"Y.m.d"=>102, "y.m.d"=>102 // ANSI + ,"d/m/Y"=>103, "d/m/y"=>103 // French /english + ,"d.m.Y"=>104, "d.m.y"=>104 // German + ,"d-m-Y"=>105, "d-m-y"=>105 // Italian + ,"m-d-Y"=>110, "m-d-y"=>110 // US Dash + ,"Y/m/d"=>111, "y/m/d"=>111 // Japan + ,"Ymd"=>112, "ymd"=>112 // ISO + ,"H:i:s"=>108 // Time + ); + if (key_exists($fmt,$ConvertableFmt)) { + return "convert (varchar ,$col," . $ConvertableFmt[$fmt] . ")"; + } + $len = strlen($fmt); for ($i=0; $i < $len; $i++) { if ($s) $s .= '+'; @@ -365,7 +359,9 @@ function SQLDate($fmt, $col=false) case 'A': $s .= "substring(convert(char(19),$col,0),18,2)"; break; - + case 'l': + $s .= "datename(dw,$col)"; + break; default: if ($ch == '\\') { $i++; @@ -397,6 +393,7 @@ function CommitTrans($ok=true) sqlsrv_commit($this->_connectionID); return true; } + function RollbackTrans() { if ($this->transOff) return true; @@ -465,30 +462,75 @@ function ErrorMsg() function ErrorNo() { $err = sqlsrv_errors(SQLSRV_ERR_ALL); - if($err[0]) return $err[0]['code']; - else return 0; + if ($err && $err[0]) + return $err[0]['code']; + else + return 0; } // returns true or false function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) { - if (!function_exists('sqlsrv_connect')) return null; - $connectionInfo = $this->connectionInfo; - $connectionInfo["Database"]=$argDatabasename; - $connectionInfo["UID"]=$argUsername; - $connectionInfo["PWD"]=$argPassword; - - foreach ($this->connectionParameters as $parameter=>$value) - $connectionInfo[$parameter] = $value; - - if ($this->debug) ADOConnection::outp("
connecting... hostname: $argHostname params: ".var_export($connectionInfo,true)); - //if ($this->debug) ADOConnection::outp("
_connectionID before: ".serialize($this->_connectionID)); - if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) { - if ($this->debug) ADOConnection::outp( "
errors: ".print_r( sqlsrv_errors(), true)); + if (!function_exists('sqlsrv_connect')) + { + if ($this->debug) + ADOConnection::outp('Microsoft SQL Server native driver (mssqlnative) not installed'); + return null; + } + + if (!empty($this->port)) + /* + * Port uses a comma + */ + $argHostname .= ",".$this->port; + + $connectionInfo = $this->connectionInfo; + $connectionInfo["Database"] = $argDatabasename; + if ((string)$argUsername != '' || (string)$argPassword != '') + { + /* + * If they pass either a userid or password, we assume + * SQL Server authentication + */ + $connectionInfo["UID"] = $argUsername; + $connectionInfo["PWD"] = $argPassword; + + if ($this->debug) + ADOConnection::outp('userid or password supplied, attempting connection with SQL Server Authentication'); + + } + else + { + /* + * If they don't pass either value, we won't add them to the + * connection parameters. This will then force an attempt + * to use windows authentication + */ + if ($this->debug) + + ADOConnection::outp('No userid or password supplied, attempting connection with Windows Authentication'); + } + + + /* + * Now merge in the passed connection parameters setting + */ + foreach ($this->connectionParameters as $options) + { + foreach($options as $parameter=>$value) + $connectionInfo[$parameter] = $value; + } + + if ($this->debug) ADOConnection::outp("connecting to host: $argHostname params: ".var_export($connectionInfo,true)); + if(!($this->_connectionID = @sqlsrv_connect($argHostname,$connectionInfo))) + { + if ($this->debug) + ADOConnection::outp( 'Connection Failed: '.print_r( sqlsrv_errors(), true)); return false; } - //if ($this->debug) ADOConnection::outp(" _connectionID after: ".serialize($this->_connectionID)); - //if ($this->debug) ADOConnection::outp("
defined functions: 
".var_export(get_defined_functions(),true)."
"); + + $this->ServerVersion(); + return true; } @@ -499,13 +541,10 @@ function _pconnect($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 @@ -560,34 +599,67 @@ function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') return $this->Execute($sql) != false; } - // returns query ID if successful, otherwise false - function _query($sql,$inputarr=false) + /** + * Execute a query. + * + * If executing an INSERT statement and $hasInsertId is true, will set + * $lastInsId. + * + * @param string $sql + * @param array $inputarr + * @return resource|false Query Id if successful, otherwise false + */ + function _query($sql, $inputarr = false) { $this->_errorMsg = false; - if (is_array($sql)) $sql = $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[\s\w()[\]",.]+values\s*\((?:[^;\']|\'\'|(?:(?:\'\')*\'[^\']+\'(?:\'\')*))*;?$/i', $sql)) { - $insert = true; - $sql .= '; '.$this->identitySQL; // select scope_identity() + // Handle native driver flaw for retrieving the last insert ID + if ($this->hasInsertID) { + // Check if it's an INSERT statement + $retrieveLastInsertID = preg_match( + '/^\W*insert[\s\w()[\]",.]+values\s*\((?:[^;\']|\'\'|(?:(?:\'\')*\'[^\']+\'(?:\'\')*))*;?$/i', + $sql + ); + if ($retrieveLastInsertID) { + // Append the identity SQL, so it is executed in the same + // scope as the insert query. + $sql .= '; ' . $this->identitySQL; + } + } else { + $retrieveLastInsertID = false; } - if($inputarr) { + + if ($inputarr) { + // Ensure that the input array is indexed numerically, as required + // by sqlsrv_query(). If param() was used to create portable binds + // then the array might be associative. + $inputarr = array_values($inputarr); $rez = sqlsrv_query($this->_connectionID, $sql, $inputarr); } else { - $rez = sqlsrv_query($this->_connectionID,$sql); + $rez = sqlsrv_query($this->_connectionID, $sql); } - if ($this->debug) ADOConnection::outp("
running query: ".var_export($sql,true)."
input array: ".var_export($inputarr,true)."
result: ".var_export($rez,true)); + if ($this->debug) { + ADOConnection::outp("
running query: " . var_export($sql, true) + . "
input array: " . var_export($inputarr, true) + . "
result: " . var_export($rez, true) + ); + } - if(!$rez) { + $this->lastInsID = false; + if (!$rez) { $rez = false; - } else if ($insert) { - // retrieve the last insert ID (where applicable) - while ( sqlsrv_next_result($rez) ) { + } elseif ($retrieveLastInsertID) { + // Get the inserted id from the last result + // Note: loop is required as server may return more than one row, + // e.g. if triggers are involved (see #41) + while (sqlsrv_next_result($rez)) { sqlsrv_fetch($rez); - $this->lastInsertID = sqlsrv_get_field($rez, 0); + $this->lastInsID = sqlsrv_get_field($rez, 0, SQLSRV_PHPTYPE_INT); } } return $rez; @@ -596,22 +668,16 @@ function _query($sql,$inputarr=false) // returns true or false function _close() { - if ($this->transCnt) $this->RollbackTrans(); - $rez = @sqlsrv_close($this->_connectionID); + if ($this->transCnt) { + $this->RollbackTrans(); + } + if($this->_connectionID) { + $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) { @@ -670,7 +736,7 @@ function MetaForeignKeys($table, $owner=false, $upper=false) where upper(object_name(fkeyid)) = $table order by constraint_name, referenced_table_name, keyno"; - $constraints =& $this->GetArray($sql); + $constraints = $this->GetArray($sql); $ADODB_FETCH_MODE = $save; @@ -686,7 +752,11 @@ function MetaForeignKeys($table, $owner=false, $upper=false) foreach($arr as $k => $v) { foreach($v as $a => $b) { if ($upper) $a = strtoupper($a); - $arr2[$a] = $b; + if (is_array($arr2[$a])) { // a previous foreign key was define for this reference table, we merge the new one + $arr2[$a] = array_merge($arr2[$a], $b); + } else { + $arr2[$a] = $b; + } } } return $arr2; @@ -696,7 +766,7 @@ function MetaForeignKeys($table, $owner=false, $upper=false) function MetaDatabases() { $this->SelectDB("master"); - $rs =& $this->Execute($this->metaDatabasesSQL); + $rs = $this->Execute($this->metaDatabasesSQL); $rows = $rs->GetRows(); $ret = array(); for($i=0;$icachedSchemaFlush) $cached_columns = array(); @@ -760,10 +832,7 @@ function MetaColumns($table, $upper=true, $schema=false){ 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) { @@ -797,7 +866,7 @@ function MetaColumns($table, $upper=true, $schema=false){ $fld->type = $rs->fields[1]; $fld->max_length = $rs->fields[2]; $fld->precision = $rs->fields[3]; - $fld->scale = $rs->fields[4]; + $fld->scale = $rs->fields[4]; $fld->not_null =!$rs->fields[5]; $fld->has_default = $rs->fields[6]; $fld->xtype = $rs->fields[7]; @@ -808,7 +877,7 @@ function MetaColumns($table, $upper=true, $schema=false){ $fld->type = $rs->fields['type']; $fld->max_length = $rs->fields['length']; $fld->precision = $rs->fields['precision']; - $fld->scale = $rs->fields['scale']; + $fld->scale = $rs->fields['scale']; $fld->not_null =!$rs->fields['nullable']; $fld->has_default = $rs->fields['default_value']; $fld->xtype = $rs->fields['xtype']; @@ -825,16 +894,125 @@ function MetaColumns($table, $upper=true, $schema=false){ } $rs->Close(); - # start adg $cached_columns[$table] = $retarr; - # end adg + return $retarr; } + /** + * Returns a substring of a varchar type field + * + * The SQL server version varies because the length is mandatory, so + * we append a reasonable string length + * + * @param string $fld The field to sub-string + * @param int $start The start point + * @param int $length An optional length + * + * @return The SQL text + */ + function substr($fld,$start,$length=0) + { + if ($length == 0) + /* + * The length available to varchar is 2GB, but that makes no + * sense in a substring, so I'm going to arbitrarily limit + * the length to 1K, but you could change it if you want + */ + $length = 1024; + + $text = "SUBSTRING($fld,$start,$length)"; + return $text; + } + + /** + * Returns the maximum size of a MetaType C field. Because of the + * database design, SQL Server places no limits on the size of data inserted + * Although the actual limit is 2^31-1 bytes. + * + * @return int + */ + function charMax() + { + return ADODB_STRINGMAX_NOLIMIT; + } + + /** + * Returns the maximum size of a MetaType X field. Because of the + * database design, SQL Server places no limits on the size of data inserted + * Although the actual limit is 2^31-1 bytes. + * + * @return int + */ + function textMax() + { + return ADODB_STRINGMAX_NOLIMIT; + } + /** + * Lists procedures, functions and methods in an array. + * + * @param string $procedureNamePattern (optional) + * @param string $catalog (optional) + * @param string $schemaPattern (optional) + + * @return array of stored objects in current database. + * + */ + public function metaProcedures($procedureNamePattern = null, $catalog = null, $schemaPattern = null) + { + $metaProcedures = array(); + $procedureSQL = ''; + $catalogSQL = ''; + $schemaSQL = ''; + + if ($procedureNamePattern) + $procedureSQL = "AND ROUTINE_NAME LIKE " . strtoupper($this->qstr($procedureNamePattern)); + + if ($catalog) + $catalogSQL = "AND SPECIFIC_SCHEMA=" . strtoupper($this->qstr($catalog)); + + if ($schemaPattern) + $schemaSQL = "AND ROUTINE_SCHEMA LIKE {$this->qstr($schemaPattern)}"; + + $fields = " ROUTINE_NAME,ROUTINE_TYPE,ROUTINE_SCHEMA,ROUTINE_CATALOG"; + + $SQL = "SELECT $fields + FROM {$this->database}.information_schema.routines + WHERE 1=1 + $procedureSQL + $catalogSQL + $schemaSQL + ORDER BY ROUTINE_NAME + "; + + $result = $this->execute($SQL); + + if (!$result) + return false; + while ($r = $result->fetchRow()){ + if (!isset($r[0])) + /* + * Convert to numeric + */ + $r = array_values($r); + + $procedureName = $r[0]; + $schemaName = $r[2]; + $routineCatalog= $r[3]; + $metaProcedures[$procedureName] = array('type'=> $r[1], + 'catalog' => $routineCatalog, + 'schema' => $schemaName, + 'remarks' => '', + ); + } + + return $metaProcedures; + } + } /*-------------------------------------------------------------------------------------- - Class Name: Recordset + Class Name: Recordset --------------------------------------------------------------------------------------*/ class ADORecordset_mssqlnative extends ADORecordSet { @@ -844,6 +1022,62 @@ class ADORecordset_mssqlnative extends ADORecordSet { var $fieldOffset = 0; // _mths works only in non-localised system + /** + * @var bool True if we have retrieved the fields metadata + */ + private $fieldObjectsRetrieved = false; + + /* + * Cross-reference the objects by name for easy access + */ + private $fieldObjectsIndex = array(); + + /* + * Cross references the dateTime objects for faster decoding + */ + private $dateTimeObjects = array(); + + /* + * flags that we have dateTimeObjects to handle + */ + private $hasDateTimeObjects = false; + + /* + * This is cross reference between how the types are stored + * in SQL Server and their english-language description + * -154 is a time field, see #432 + */ + private $_typeConversion = array( + -155 => 'datetimeoffset', + -154 => 'char', + -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' + ); + + + + function __construct($id,$mode=false) { if ($mode === false) { @@ -852,29 +1086,15 @@ function __construct($id,$mode=false) } $this->fetchMode = $mode; - return parent::__construct($id,$mode); + parent::__construct($id); } function _initrs() { - global $ADODB_COUNTRECS; - # KMN # if ($this->connection->debug) ADOConnection::outp("(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." - ADOConnection::outp("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; - # KMN # if ($this->connection->debug) ADOConnection::outp("(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); - } + // Cache the metadata right now + $this->_fetchField(); } @@ -899,8 +1119,9 @@ function Fields($colname) * Too early */ return; - if ($this->fetchMode != ADODB_FETCH_NUM) + if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname]; + if (!$this->bind) { $this->bind = array(); for ($i=0; $i < $this->_numOfFields; $i++) { @@ -912,79 +1133,63 @@ function Fields($colname) return $this->fields[$this->bind[strtoupper($colname)]]; } - /* Returns: an object containing field information. - Get column information in the Recordset object. fetchField() can be used in order to obtain information about - fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by - fetchField() is retrieved. - Designed By jcortinap#jc.com.mx + /** + * 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. + * + * @param int $fieldOffset (optional default=-1 for all + * @return mixed an ADOFieldObject, or array of objects */ - function _FetchField($fieldOffset = -1) + private function _fetchField($fieldOffset = -1) { - $_typeConversion = array( - -155 => 'datetimeoffset', - -154 => 'char', - -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' - ); + if ($this->fieldObjectsRetrieved) { + if ($this->fieldObjectsCache) { + // Already got the information + if ($fieldOffset == -1) { + return $this->fieldObjectsCache; + } else { + return $this->fieldObjectsCache[$fieldOffset]; + } + } else { + // No metadata available + return false; + } + } - $fa = @sqlsrv_field_metadata($this->_queryID); - if ($fieldOffset != -1) { - $fa = $fa[$fieldOffset]; + $this->fieldObjectsRetrieved = true; + /* + * Retrieve all metadata in one go. This is always returned as a + * numeric array. + */ + $fieldMetaData = sqlsrv_field_metadata($this->_queryID); + + if (!$fieldMetaData) { + // Not a statement that gives us metaData + return false; } - $false = false; - if (empty($fa)) { - $f = false;//PHP Notice: Only variable references should be returned by reference + + $this->_numOfFields = count($fieldMetaData); + foreach ($fieldMetaData as $key=>$value) { + $fld = new ADOFieldObject; + // Caution - keys are case-sensitive, must respect casing of values + $fld->name = $value['Name']; + $fld->max_length = $value['Size']; + $fld->column_source = $value['Name']; + $fld->type = $this->_typeConversion[$value['Type']]; + + $this->fieldObjectsCache[$key] = $fld; + $this->fieldObjectsIndex[$fld->name] = $key; } - 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; + if ($fieldOffset == -1) { + return $this->fieldObjectsCache; } - return $f; + + return $this->fieldObjectsCache[$fieldOffset]; } /* @@ -992,12 +1197,16 @@ function _FetchField($fieldOffset = -1) * into the _fieldobjs array once, to save multiple calls to the * sqlsrv_field_metadata function * + * @param int $fieldOffset (optional) + * + * @return adoFieldObject + * * @author KM Newnham * @date 02/20/2013 */ - function FetchField($fieldOffset = -1) + function fetchField($fieldOffset = -1) { - return $this->_fieldobjs[$fieldOffset]; + return $this->fieldObjectsCache[$fieldOffset]; } function _seek($row) @@ -1008,178 +1217,73 @@ function _seek($row) // speedup function MoveNext() { - //# KMN # if ($this->connection->debug) ADOConnection::outp("movenext()"); - //# KMN # if ($this->connection->debug) ADOConnection::outp("eof (beginning): ".$this->EOF); - if ($this->EOF) return false; + if ($this->EOF) + return false; $this->_currentRow++; - // # KMN # if ($this->connection->debug) ADOConnection::outp("_currentRow: ".$this->_currentRow); - if ($this->_fetch()) return true; + if ($this->_fetch()) + return true; $this->EOF = true; - //# KMN # if ($this->connection->debug) ADOConnection::outp("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) { - # KMN # if ($this->connection->debug) ADOConnection::outp("_fetch()"); if ($this->fetchMode & ADODB_FETCH_ASSOC) { - if ($this->fetchMode & ADODB_FETCH_NUM) { - //# KMN # if ($this->connection->debug) ADOConnection::outp("fetch mode: both"); + if ($this->fetchMode & ADODB_FETCH_NUM) $this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_BOTH); - } else { - //# KMN # if ($this->connection->debug) ADOConnection::outp("fetch mode: assoc"); + else $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) { - $this->fields[strtolower($k)] = $v; - } - } else if (ADODB_ASSOC_CASE == 1) { - foreach($this->fields as $k=>$v) { - $this->fields[strtoupper($k)] = $v; - } - } - } - } else { - //# KMN # if ($this->connection->debug) ADOConnection::outp("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) ADOConnection::outp("
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 - $this->fields[$key] = $value->format("Y-m-d\TH:i:s\Z"); - } + if (is_array($this->fields)) + { + + if (ADODB_ASSOC_CASE == ADODB_ASSOC_CASE_LOWER) + $this->fields = array_change_key_case($this->fields,CASE_LOWER); + else if (ADODB_ASSOC_CASE == ADODB_ASSOC_CASE_UPPER) + $this->fields = array_change_key_case($this->fields,CASE_UPPER); + } } - if($this->fields === null) $this->fields = false; - # KMN # if ($this->connection->debug) ADOConnection::outp("
after _fetch, fields: 
".print_r($this->fields,true)." backtrace: ".adodb_backtrace(false));
+		else
+			$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_NUMERIC);
+
+		if (!$this->fields)
+			return false;
+
 		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.	*/
+	/**
+	 * 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.
+	 *
+	 * @return bool tru if we succeeded in closing down
+	 */
 	function _close()
 	{
+		/*
+		* If we are closing down a failed query, collect any
+		* error messages. This is a hack fix to the "close too early"
+		* problem so this might go away later
+		*/
+		$this->connection->errorMsg();
 		if(is_resource($this->_queryID)) {
 			$rez = sqlsrv_free_stmt($this->_queryID);
 			$this->_queryID = false;
 			return $rez;
 		}
-		return true;
-	}
 
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	static function UnixDate($v)
-	{
-		return ADORecordSet_array_mssqlnative::UnixDate($v);
+		return true;
 	}
 
-	static function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
-	}
 }
 
 
-class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
-	function __construct($id=-1,$mode=false)
-	{
-		parent::__construct($id,$mode);
-	}
-
-		// mssql uses a default date like Dec 30 2000 12:00AM
-	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
-		if ($ADODB_mssql_date_order == 'dmy') {
-			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		// h-m-s-MM-DD-YY
-		return  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;
-
-		//Dec 30 2000 12:00AM
-		 if ($ADODB_mssql_date_order == 'dmy') {
-			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-
-		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
-		}
-		// h-m-s-MM-DD-YY
-		return  adodb_mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
-	}
-}
+class ADORecordSet_array_mssqlnative extends ADORecordSet_array {}
 
 /*
 Code Example 1:
diff --git a/vendor/adodb/adodb-php/drivers/adodb-mssqlpo.inc.php b/vendor/adodb/adodb-php/drivers/adodb-mssqlpo.inc.php
index ee4aecdf15..f2d2f6fbd4 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-mssqlpo.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-mssqlpo.inc.php
@@ -1,29 +1,27 @@
 _has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
-			return $sql;
-		}
 		if (is_string($sql)) $sql = str_replace('||','+',$sql);
 		$stmt = mssql_init($sql,$this->_connectionID);
 		if (!$stmt)  return $sql;
@@ -51,8 +45,4 @@ function _query($sql,$inputarr=false)
 
 class ADORecordset_mssqlpo extends ADORecordset_mssql {
 	var $databaseType = "mssqlpo";
-	function __construct($id,$mode=false)
-	{
-		parent::__construct($id,$mode);
-	}
 }
diff --git a/vendor/adodb/adodb-php/drivers/adodb-mysql.inc.php b/vendor/adodb/adodb-php/drivers/adodb-mysql.inc.php
index 317e50084c..f07c081b52 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-mysql.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-mysql.inc.php
@@ -1,22 +1,30 @@
 rsPrefix .= 'ext_';
+	/**
+	 * ADODB_mysql constructor.
+	 */
+	public function __construct() {
+		if(version_compare(PHP_VERSION, '7.0.0', '>=')) {
+			$this->outp_throw(
+				'mysql extension is not supported since PHP 7.0.0, use mysqli instead',
+				__METHOD__
+			);
+			die(1); // Stop execution even if not using Exceptions
+		} elseif(version_compare(PHP_VERSION, '5.5.0', '>=')) {
+			// If mysql extension is available just print a warning,
+			// otherwise die with an error message
+			if(function_exists('mysql_connect')) {
+				$this->outp('mysql extension is deprecated since PHP 5.5.0, consider using mysqli');
+			} else {
+				$this->outp_throw(
+					'mysql extension is not available, use mysqli instead',
+					__METHOD__
+				);
+				die(1); // Stop execution even if not using Exceptions
+			}
+		}
 	}
 
-
-	// SetCharSet - switch the client encoding
-	function SetCharSet($charset_name)
+	function setCharSet($charset)
 	{
 		if (!function_exists('mysql_set_charset')) {
 			return false;
 		}
 
-		if ($this->charSet !== $charset_name) {
-			$ok = @mysql_set_charset($charset_name,$this->_connectionID);
+		if ($this->charSet !== $charset) {
+			$ok = @mysql_set_charset($charset,$this->_connectionID);
 			if ($ok) {
-				$this->charSet = $charset_name;
+				$this->charSet = $charset;
 				return true;
 			}
 			return false;
@@ -75,19 +101,19 @@ function SetCharSet($charset_name)
 		return true;
 	}
 
-	function ServerInfo()
+	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)
+	function metaProcedures($NamePattern = false, $catalog = null, $schemaPattern = null)
 	{
 		// save old fetch mode
 		global $ADODB_FETCH_MODE;
@@ -153,7 +179,7 @@ function MetaProcedures($NamePattern = false, $catalog = null, $schemaPattern =
 	 *
 	 * @return array list of tables
 	 */
-	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	function metaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
@@ -173,7 +199,7 @@ function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	}
 
 
-	function MetaIndexes ($table, $primary = FALSE, $owner=false)
+	function metaIndexes ($table, $primary = FALSE, $owner=false)
 	{
 		// save old fetch mode
 		global $ADODB_FETCH_MODE;
@@ -226,34 +252,41 @@ function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	}
 
 
-	// if magic quotes disabled, use mysql_real_escape_string()
-	function qstr($s,$magic_quotes=false)
+	/**
+	 * Appropriately quotes strings with ' characters for insertion into the database.
+	 *
+	 * Relies on mysql_real_escape_string()
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:qstr
+	 *
+	 * @param string $s            The string to quote
+	 * @param bool   $magic_quotes This param is not used since 5.21.0.
+	 *                             It remains for backwards compatibility.
+	 *
+	 * @return string Quoted string
+	 */
+	function qStr($s, $magic_quotes=false)
 	{
-		if (is_null($s)) return 'NULL';
-		if (!$magic_quotes) {
+		if (is_null($s)) {
+			return 'NULL';
+		}
 
-			if (ADODB_PHPVER >= 0x4300) {
-				if (is_resource($this->_connectionID))
-					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
-			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-			}
-			return "'".str_replace("'",$this->replaceQuote,$s)."'";
+		if (is_resource($this->_connectionID)) {
+			return "'" . mysql_real_escape_string($s, $this->_connectionID) . "'";
 		}
 
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
+		if ($this->replaceQuote[0] == '\\') {
+			$s = str_replace(array('\\', "\0"), array('\\\\', "\\\0"), $s);
+		}
+		return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
 	}
 
-	function _insertid()
+	protected function _insertID($table = '', $column = '')
 	{
 		return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
 		//return mysql_insert_id($this->_connectionID);
 	}
 
-	function GetOne($sql,$inputarr=false)
+	function getOne($sql,$inputarr=false)
 	{
 	global $ADODB_GETONE_EOF;
 		if ($this->compat323 == false && strncasecmp($sql,'sele',4) == 0) {
@@ -269,7 +302,7 @@ function GetOne($sql,$inputarr=false)
 		return false;
 	}
 
-	function BeginTrans()
+	function beginTrans()
 	{
 		if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
 	}
@@ -287,7 +320,7 @@ function _affectedrows()
 	var $_genSeq2SQL = "insert into %s values (%s)";
 	var $_dropSeqSQL = "drop table if exists %s";
 
-	function CreateSequence($seqname='adodbseq',$startID=1)
+	function createSequence($seqname='adodbseq',$startID=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
 		$u = strtoupper($seqname);
@@ -298,7 +331,7 @@ function CreateSequence($seqname='adodbseq',$startID=1)
 	}
 
 
-	function GenID($seqname='adodbseq',$startID=1)
+	function genID($seqname='adodbseq',$startID=1)
 	{
 		// post-nuke sets hasGenID to false
 		if (!$this->hasGenID) return false;
@@ -327,7 +360,7 @@ function GenID($seqname='adodbseq',$startID=1)
 		return $this->genID;
 	}
 
-	function MetaDatabases()
+	function metaDatabases()
 	{
 		$qid = mysql_list_dbs($this->_connectionID);
 		$arr = array();
@@ -343,7 +376,7 @@ function MetaDatabases()
 
 
 	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
+	function sqlDate($fmt, $col=false)
 	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'DATE_FORMAT('.$col.",'";
@@ -431,7 +464,7 @@ function SQLDate($fmt, $col=false)
 
 	// returns concatenated string
 	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
-	function Concat()
+	function concat()
 	{
 		$s = "";
 		$arr = func_get_args();
@@ -442,7 +475,7 @@ function Concat()
 		else return '';
 	}
 
-	function OffsetDate($dayFraction,$date=false)
+	function offsetDate($dayFraction,$date=false)
 	{
 		if (!$date) $date = $this->sysDate;
 
@@ -455,19 +488,23 @@ function OffsetDate($dayFraction,$date=false)
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		if (!empty($this->port)) $argHostname .= ":".$this->port;
+		if (!empty($this->port))
+			$argHostname .= ":".$this->port;
 
-		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect,$this->clientFlags);
-		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect);
-		else
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
+		$this->_connectionID =
+			mysql_connect($argHostname,
+						  $argUsername,
+						  $argPassword,
+						  $this->forceNewConnect,
+						  $this->clientFlags
+						  );
+
+
+		if ($this->_connectionID === false)
+			return false;
+		if ($argDatabasename)
+			return $this->SelectDB($argDatabasename);
 
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
 		return true;
 	}
 
@@ -476,13 +513,18 @@ 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
-			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($this->autoRollback) $this->RollbackTrans();
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		$this->_connectionID =
+			mysql_pconnect($argHostname,
+						   $argUsername,
+						   $argPassword,
+						   $this->clientFlags);
+
+		if ($this->_connectionID === false)
+			return false;
+		if ($this->autoRollback)
+			$this->RollbackTrans();
+		if ($argDatabasename)
+			return $this->SelectDB($argDatabasename);
 		return true;
 	}
 
@@ -492,7 +534,7 @@ function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
 
-	function MetaColumns($table, $normalize=true)
+	function metaColumns($table, $normalize=true)
 	{
 		$this->_findschema($table,$schema);
 		if ($schema) {
@@ -572,7 +614,7 @@ function MetaColumns($table, $normalize=true)
 	}
 
 	// returns true or false
-	function SelectDB($dbName)
+	function selectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
@@ -583,12 +625,12 @@ function SelectDB($dbName)
 	}
 
 	// parameters use PostgreSQL convention, not MySQL
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
+	function selectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
 	{
 		$nrows = (int) $nrows;
 		$offset = (int) $offset;
 		$offsetStr =($offset>=0) ? ((integer)$offset)."," : '';
-		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
+		// jason judge, see PHPLens Issue No: 9220
 		if ($nrows < 0) $nrows = '18446744073709551615';
 
 		if ($secs)
@@ -613,7 +655,7 @@ function _query($sql,$inputarr=false)
 	}
 
 	/*	Returns: the last error message from previous database operation	*/
-	function ErrorMsg()
+	function errorMsg()
 	{
 
 		if ($this->_logsql) return $this->_errorMsg;
@@ -623,7 +665,7 @@ function ErrorMsg()
 	}
 
 	/*	Returns: the last error number from previous database operation	*/
-	function ErrorNo()
+	function errorNo()
 	{
 		if ($this->_logsql) return $this->_errorCode;
 		if (empty($this->_connectionID)) return @mysql_errno();
@@ -643,7 +685,7 @@ function _close()
 	/*
 	* Maximum size of C field
 	*/
-	function CharMax()
+	function charMax()
 	{
 		return 255;
 	}
@@ -651,13 +693,13 @@ function CharMax()
 	/*
 	* Maximum size of X field
 	*/
-	function TextMax()
+	function textMax()
 	{
 		return 4294967295;
 	}
 
 	// "Innox - Juan Carlos Gonzalez" 
-	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
+	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;
@@ -743,7 +785,7 @@ function _initrs()
 		$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);
@@ -761,7 +803,7 @@ function FetchField($fieldOffset = -1)
 		return $o;
 	}
 
-	function GetRowAssoc($upper = ADODB_ASSOC_CASE)
+	function getRowAssoc($upper = ADODB_ASSOC_CASE)
 	{
 		if ($this->fetchMode == MYSQL_ASSOC && $upper == ADODB_ASSOC_CASE_LOWER) {
 			$row = $this->fields;
@@ -773,7 +815,7 @@ function GetRowAssoc($upper = ADODB_ASSOC_CASE)
 	}
 
 	/* Use associative array to get fields array */
-	function Fields($colname)
+	function fields($colname)
 	{
 		// added @ by "Michael William Miller" 
 		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
@@ -794,10 +836,8 @@ function _seek($row)
 		return @mysql_data_seek($this->_queryID,$row);
 	}
 
-	function MoveNext()
+	function moveNext()
 	{
-		//return adodb_movenext($this);
-		//if (defined('ADODB_EXTENSION')) return adodb_movenext($this);
 		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
 			$this->_updatefields();
 			$this->_currentRow += 1;
@@ -822,7 +862,7 @@ function _close() {
 		$this->_queryID = false;
 	}
 
-	function MetaType($t,$len=-1,$fieldobj=false)
+	function metaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
@@ -872,19 +912,18 @@ function MetaType($t,$len=-1,$fieldobj=false)
 			if (!empty($fieldobj->primary_key)) return 'R';
 			else return 'I';
 
-		default: return 'N';
+		default: return ADODB_DEFAULT_METATYPE;
 		}
 	}
 
 }
 
+/**
+ * Class ADORecordSet_ext_mysql
+ */
 class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
-	function __construct($queryID,$mode=false)
-	{
-		parent::__construct($queryID,$mode);
-	}
 
-	function MoveNext()
+	function moveNext()
 	{
 		return @adodb_movenext($this);
 	}
diff --git a/vendor/adodb/adodb-php/drivers/adodb-mysqli.inc.php b/vendor/adodb/adodb-php/drivers/adodb-mysqli.inc.php
index 05acec40b6..160f5fa340 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-mysqli.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-mysqli.inc.php
@@ -1,37 +1,44 @@
 _transmode = $transaction_mode;
 		if (empty($transaction_mode)) {
-			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			$this->execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
 			return;
 		}
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+		$this->execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 
-	// returns true or false
-	// To add: parameter int $port,
-	//         parameter string $socket
-	function _connect($argHostname = NULL,
-				$argUsername = NULL,
-				$argPassword = NULL,
-				$argDatabasename = NULL, $persist=false)
+	/**
+	 * Adds a parameter to the connection string.
+	 *
+	 * Parameter must be one of the the constants listed in mysqli_options().
+	 * @see https://www.php.net/manual/en/mysqli.options.php
+	 *
+	 * @param int $parameter The parameter to set
+	 * @param string $value The value of the parameter
+	 *
+	 * @example, for mssqlnative driver ('CharacterSet','UTF-8')
+	 * @return bool
+	 */
+	public function setConnectionParameter($parameter, $value) {
+		if(!is_numeric($parameter)) {
+			$this->outp_throw("Invalid connection parameter '$parameter'", __METHOD__);
+			return false;
+		}
+		$this->connectionParameters[$parameter] = $value;
+		return true;
+	}
+
+	/**
+	 * Connect to a database.
+	 *
+	 * @todo add: parameter int $port, parameter string $socket
+	 *
+	 * @param string|null $argHostname (Optional) The host to connect to.
+	 * @param string|null $argUsername (Optional) The username to connect as.
+	 * @param string|null $argPassword (Optional) The password to connect with.
+	 * @param string|null $argDatabasename (Optional) The name of the database to start in when connected.
+	 * @param bool $persist (Optional) Whether or not to use a persistent connection.
+	 *
+	 * @return bool|null True if connected successfully, false if connection failed, or null if the mysqli extension
+	 * isn't currently loaded.
+	 */
+	function _connect($argHostname = null,
+					  $argUsername = null,
+					  $argPassword = null,
+					  $argDatabasename = null,
+					  $persist = false)
 	{
 		if(!extension_loaded("mysqli")) {
 			return null;
@@ -96,7 +169,7 @@ function _connect($argHostname = NULL,
 		if (is_null($this->_connectionID)) {
 			// mysqli_init only fails if insufficient memory
 			if ($this->debug) {
-				ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
+				ADOConnection::outp("mysqli_init() failed : "  . $this->errorMsg());
 			}
 			return false;
 		}
@@ -105,12 +178,31 @@ function _connect($argHostname = NULL,
 		read connection options from the standard mysql configuration file
 		/etc/my.cnf - "Bastien Duclaux" 
 		*/
+		$this->optionFlags = array();
 		foreach($this->optionFlags as $arr) {
 			mysqli_options($this->_connectionID,$arr[0],$arr[1]);
 		}
 
-		//http ://php.net/manual/en/mysqli.persistconns.php
-		if ($persist && PHP_VERSION > 5.2 && strncmp($argHostname,'p:',2) != 0) $argHostname = 'p:'.$argHostname;
+		// Now merge in the standard connection parameters setting
+		foreach ($this->connectionParameters as $parameter => $value) {
+			// Make sure parameter is numeric before calling mysqli_options()
+			// that to avoid Warning (or TypeError exception on PHP 8).
+			if (!is_numeric($parameter)
+				|| !mysqli_options($this->_connectionID, $parameter, $value)
+			) {
+				$this->outp_throw("Invalid connection parameter '$parameter'", __METHOD__);
+			}
+		}
+
+		//https://php.net/manual/en/mysqli.persistconns.php
+		if ($persist && strncmp($argHostname,'p:',2) != 0) {
+			$argHostname = 'p:' . $argHostname;
+		}
+
+		// SSL Connections for MySQLI
+		if ($this->ssl_key || $this->ssl_cert || $this->ssl_ca || $this->ssl_capath || $this->ssl_cipher) {
+			mysqli_ssl_set($this->_connectionID, $this->ssl_key, $this->ssl_cert, $this->ssl_ca, $this->ssl_capath, $this->ssl_cipher);
+		}
 
 		#if (!empty($this->port)) $argHostname .= ":".$this->port;
 		$ok = @mysqli_real_connect($this->_connectionID,
@@ -124,154 +216,255 @@ function _connect($argHostname = NULL,
 					$this->clientFlags);
 
 		if ($ok) {
-			if ($argDatabasename)  return $this->SelectDB($argDatabasename);
+			if ($argDatabasename)  return $this->selectDB($argDatabasename);
 			return true;
 		} else {
 			if ($this->debug) {
-				ADOConnection::outp("Could not connect : "  . $this->ErrorMsg());
+				ADOConnection::outp("Could not connect : "  . $this->errorMsg());
 			}
 			$this->_connectionID = null;
 			return false;
 		}
 	}
 
-	// returns true or false
-	// How to force a persistent connection
+	/**
+	 * Connect to a database with a persistent connection.
+	 *
+	 * @param string|null $argHostname The host to connect to.
+	 * @param string|null $argUsername The username to connect as.
+	 * @param string|null $argPassword The password to connect with.
+	 * @param string|null $argDatabasename The name of the database to start in when connected.
+	 *
+	 * @return bool|null True if connected successfully, false if connection failed, or null if the mysqli extension
+	 * isn't currently loaded.
+	 */
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
 	}
 
-	// When is this used? Close old connection first?
-	// In _connect(), check $this->forceNewConnect?
+	/**
+	 * Connect to a database, whilst setting $this->forceNewConnect to true.
+	 *
+	 * When is this used? Close old connection first?
+	 * In _connect(), check $this->forceNewConnect?
+	 *
+	 * @param string|null $argHostname The host to connect to.
+	 * @param string|null $argUsername The username to connect as.
+	 * @param string|null $argPassword The password to connect with.
+	 * @param string|null $argDatabasename The name of the database to start in when connected.
+	 *
+	 * @return bool|null True if connected successfully, false if connection failed, or null if the mysqli extension
+	 * isn't currently loaded.
+	 */
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->forceNewConnect = true;
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
 
-	function IfNull( $field, $ifNull )
+	/**
+	 * Replaces a null value with a specified replacement.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:ifnull
+	 *
+	 * @param mixed $field The field in the table to check.
+	 * @param mixed $ifNull The value to replace the null value with if it is found.
+	 *
+	 * @return string
+	 */
+	function IfNull($field, $ifNull)
 	{
-		return " IFNULL($field, $ifNull) "; // if MySQL
+		return " IFNULL($field, $ifNull) ";
 	}
 
-	// do not use $ADODB_COUNTRECS
-	function GetOne($sql,$inputarr=false)
+	/**
+	 * Retrieves the first column of the first matching row of an executed SQL statement.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:getone
+	 *
+	 * @param string $sql The SQL to execute.
+	 * @param bool|array $inputarr (Optional) An array containing any required SQL parameters, or false if none needed.
+	 *
+	 * @return bool|array|null
+	 */
+	function GetOne($sql, $inputarr = false)
 	{
 		global $ADODB_GETONE_EOF;
 
 		$ret = false;
-		$rs = $this->Execute($sql,$inputarr);
+		$rs = $this->execute($sql,$inputarr);
 		if ($rs) {
 			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
 			else $ret = reset($rs->fields);
-			$rs->Close();
+			$rs->close();
 		}
 		return $ret;
 	}
 
+	/**
+	 * Get information about the current MySQL server.
+	 *
+	 * @return array
+	 */
 	function ServerInfo()
 	{
-		$arr['description'] = $this->GetOne("select version()");
+		$arr['description'] = $this->getOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
 
-
+	/**
+	 * Begins a granular transaction.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:begintrans
+	 *
+	 * @return bool Always returns true.
+	 */
 	function BeginTrans()
 	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 
-		//$this->Execute('SET AUTOCOMMIT=0');
+		//$this->execute('SET AUTOCOMMIT=0');
 		mysqli_autocommit($this->_connectionID, false);
-		$this->Execute('BEGIN');
+		$this->execute('BEGIN');
 		return true;
 	}
 
-	function CommitTrans($ok=true)
+	/**
+	 * Commits a granular transaction.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:committrans
+	 *
+	 * @param bool $ok (Optional) If false, will rollback the transaction instead.
+	 *
+	 * @return bool Always returns true.
+	 */
+	function CommitTrans($ok = true)
 	{
 		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
+		if (!$ok) return $this->rollbackTrans();
 
 		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
+		$this->execute('COMMIT');
 
-		//$this->Execute('SET AUTOCOMMIT=1');
+		//$this->execute('SET AUTOCOMMIT=1');
 		mysqli_autocommit($this->_connectionID, true);
 		return true;
 	}
 
+	/**
+	 * Rollback a smart transaction.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:rollbacktrans
+	 *
+	 * @return bool Always returns true.
+	 */
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		//$this->Execute('SET AUTOCOMMIT=1');
+		$this->execute('ROLLBACK');
+		//$this->execute('SET AUTOCOMMIT=1');
 		mysqli_autocommit($this->_connectionID, true);
 		return true;
 	}
 
-	function RowLock($tables,$where='',$col='1 as adodbignore')
+	/**
+	 * Lock a table row for a duration of a transaction.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:rowlock
+	 *
+	 * @param string $tables The table(s) to lock rows for.
+	 * @param string $where (Optional) The WHERE clause to use to determine which rows to lock.
+	 * @param string $col (Optional) The columns to select.
+	 *
+	 * @return bool True if the locking SQL statement executed successfully, otherwise false.
+	 */
+	function RowLock($tables, $where = '', $col = '1 as adodbignore')
 	{
-		if ($this->transCnt==0) $this->BeginTrans();
+		if ($this->transCnt==0) $this->beginTrans();
 		if ($where) $where = ' where '.$where;
-		$rs = $this->Execute("select $col from $tables $where for update");
+		$rs = $this->execute("select $col from $tables $where for update");
 		return !empty($rs);
 	}
 
 	/**
-	 * Quotes a string to be sent to the database
-	 * When there is no active connection,
-	 * @param string $s The string to quote
-	 * @param boolean $magic_quotes If false, use mysqli_real_escape_string()
-	 *     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());
+	 * Appropriately quotes strings with ' characters for insertion into the database.
+	 *
+	 * Relies on mysqli_real_escape_string()
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:qstr
+	 *
+	 * @param string $s            The string to quote
+	 * @param bool   $magic_quotes This param is not used since 5.21.0.
+	 *                             It remains for backwards compatibility.
+	 *
 	 * @return string Quoted string
 	 */
-	function qstr($s, $magic_quotes = false)
+	function qStr($s, $magic_quotes=false)
 	{
-		if (is_null($s)) return 'NULL';
-		if (!$magic_quotes) {
-			// mysqli_real_escape_string() throws a warning when the given
-			// connection is invalid
-			if (PHP_VERSION >= 5 && $this->_connectionID) {
-				return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";
-			}
+		if (is_null($s)) {
+			return 'NULL';
+		}
 
-			if ($this->replaceQuote[0] == '\\') {
-				$s = adodb_str_replace(array('\\',"\0"), array('\\\\',"\\\0") ,$s);
-			}
-			return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
+		// mysqli_real_escape_string() throws a warning when the given
+		// connection is invalid
+		if ($this->_connectionID) {
+			return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";
 		}
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
+
+		if ($this->replaceQuote[0] == '\\') {
+			$s = str_replace(array('\\', "\0"), array('\\\\', "\\\0") ,$s);
+		}
+		return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
 	}
 
-	function _insertid()
+	/**
+	 * Return the AUTO_INCREMENT id of the last row that has been inserted or updated in a table.
+	 *
+	 * @inheritDoc
+	 */
+	protected function _insertID($table = '', $column = '')
 	{
-		$result = @mysqli_insert_id($this->_connectionID);
+		// mysqli_insert_id does not return the last_insert_id if called after
+		// execution of a stored procedure so we execute this instead.
+		if ($this->useLastInsertStatement)
+			$result = ADOConnection::getOne('SELECT LAST_INSERT_ID()');
+		else
+			$result = @mysqli_insert_id($this->_connectionID);
+
 		if ($result == -1) {
-			if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : "  . $this->ErrorMsg());
+			if ($this->debug)
+				ADOConnection::outp("mysqli_insert_id() failed : "  . $this->errorMsg());
 		}
+		// reset prepared statement flags
+		$this->usePreparedStatement   = false;
+		$this->useLastInsertStatement = false;
 		return $result;
 	}
 
-	// Only works for INSERT, UPDATE and DELETE query's
+	/**
+	 * Returns how many rows were effected by the most recently executed SQL statement.
+	 * Only works for INSERT, UPDATE and DELETE queries.
+	 *
+	 * @return int The number of rows affected.
+	 */
 	function _affectedrows()
 	{
+		if ($this->isSelectStatement) {
+			// Affected rows works fine against selects, returning
+			// the rowcount, but ADOdb does not do that.
+			return false;
+		}
+
 		$result =  @mysqli_affected_rows($this->_connectionID);
 		if ($result == -1) {
-			if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : "  . $this->ErrorMsg());
+			if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : "  . $this->errorMsg());
 		}
 		return $result;
 	}
 
-	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
 	// Reference on Last_Insert_ID on the recommended way to simulate sequences
 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
 	var $_genSeqSQL = "create table if not exists %s (id int not null)";
@@ -279,60 +472,96 @@ function _affectedrows()
 	var $_genSeq2SQL = "insert into %s values (%s)";
 	var $_dropSeqSQL = "drop table if exists %s";
 
-	function CreateSequence($seqname='adodbseq',$startID=1)
+	/**
+	 * Creates a sequence in the database.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:createsequence
+	 *
+	 * @param string $seqname The sequence name.
+	 * @param int $startID The start id.
+	 *
+	 * @return ADORecordSet|bool A record set if executed successfully, otherwise false.
+	 */
+	function CreateSequence($seqname = 'adodbseq', $startID = 1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
-		$u = strtoupper($seqname);
 
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		$ok = $this->execute(sprintf($this->_genSeqSQL,$seqname));
 		if (!$ok) return false;
-		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+		return $this->execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 	}
 
-	function GenID($seqname='adodbseq',$startID=1)
+	/**
+	 * A portable method of creating sequence numbers.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:genid
+	 *
+	 * @param string $seqname (Optional) The name of the sequence to use.
+	 * @param int $startID (Optional) The point to start at in the sequence.
+	 *
+	 * @return bool|int|string
+	 */
+	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);
+		$rs = @$this->execute($getnext);
 		if (!$rs) {
 			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
-			$u = strtoupper($seqname);
-			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
-			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
-			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-			$rs = $this->Execute($getnext);
+			$this->execute(sprintf($this->_genSeqSQL,$seqname));
+			$cnt = $this->getOne(sprintf($this->_genSeqCountSQL,$seqname));
+			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();
+			if ($this->genID == 0) {
+				$getnext = "select LAST_INSERT_ID() from " . $seqname;
+				$rs = $this->execute($getnext);
+				$this->genID = (int)$rs->fields[0];
+			}
+			$rs->close();
 		} else
 			$this->genID = 0;
 
 		return $this->genID;
 	}
 
+	/**
+	 * Return a list of all visible databases except the 'mysql' database.
+	 *
+	 * @return array|false An array of database names, or false if the query failed.
+	 */
 	function MetaDatabases()
 	{
 		$query = "SHOW DATABASES";
-		$ret = $this->Execute($query);
+		$ret = $this->execute($query);
 		if ($ret && is_object($ret)){
 			$arr = array();
 			while (!$ret->EOF){
-				$db = $ret->Fields('Database');
+				$db = $ret->fields('Database');
 				if ($db != 'mysql') $arr[] = $db;
-				$ret->MoveNext();
+				$ret->moveNext();
 			}
 			return $arr;
 		}
 		return $ret;
 	}
 
-
-	function MetaIndexes ($table, $primary = FALSE, $owner = false)
+	/**
+	 * Get a list of indexes on the specified table.
+	 *
+	 * @param string $table The name of the table to get indexes for.
+	 * @param bool $primary (Optional) Whether or not to include the primary key.
+	 * @param bool $owner (Optional) Unused.
+	 *
+	 * @return array|bool An array of the indexes, or false if the query to get the indexes failed.
+	 */
+	function MetaIndexes($table, $primary = false, $owner = false)
 	{
 		// save old fetch mode
 		global $ADODB_FETCH_MODE;
@@ -341,15 +570,15 @@ function MetaIndexes ($table, $primary = FALSE, $owner = false)
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== FALSE) {
-			$savem = $this->SetFetchMode(FALSE);
+			$savem = $this->setFetchMode(FALSE);
 		}
 
 		// get index details
-		$rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
+		$rs = $this->execute(sprintf('SHOW INDEXES FROM %s',$table));
 
 		// restore fetchmode
 		if (isset($savem)) {
-			$this->SetFetchMode($savem);
+			$this->setFetchMode($savem);
 		}
 		$ADODB_FETCH_MODE = $save;
 
@@ -360,7 +589,7 @@ function MetaIndexes ($table, $primary = FALSE, $owner = false)
 		$indexes = array ();
 
 		// parse index data into array
-		while ($row = $rs->FetchRow()) {
+		while ($row = $rs->fetchRow()) {
 			if ($primary == FALSE AND $row[2] == 'PRIMARY') {
 				continue;
 			}
@@ -384,9 +613,17 @@ function MetaIndexes ($table, $primary = FALSE, $owner = false)
 		return $indexes;
 	}
 
-
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
+	/**
+	 * Returns a portably-formatted date string from a timestamp database column.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:sqldate
+	 *
+	 * @param string $fmt The date format to use.
+	 * @param string|bool $col (Optional) The table column to date format, or if false, use NOW().
+	 *
+	 * @return bool|string The SQL DATE_FORMAT() string, or false if the provided date format was empty.
+	 */
+	function SQLDate($fmt, $col = false)
 	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'DATE_FORMAT('.$col.",'";
@@ -463,11 +700,15 @@ function SQLDate($fmt, $col=false)
 		return $s;
 	}
 
-	// returns concatenated string
-	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
+	/**
+	 * Returns a database-specific concatenation of strings.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:concat
+	 *
+	 * @return string
+	 */
 	function Concat()
 	{
-		$s = "";
 		$arr = func_get_args();
 
 		// suggestion by andrew005@mnogo.ru
@@ -476,8 +717,17 @@ function Concat()
 		else return '';
 	}
 
-	// dayFraction is a day in floating point
-	function OffsetDate($dayFraction,$date=false)
+	/**
+	 * Creates a portable date offset field, for use in SQL statements.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:offsetdate
+	 *
+	 * @param float $dayFraction A day in floating point
+	 * @param string|bool $date (Optional) The date to offset. If false, uses CURDATE()
+	 *
+	 * @return string
+	 */
+	function OffsetDate($dayFraction, $date = false)
 	{
 		if (!$date) $date = $this->sysDate;
 
@@ -487,17 +737,25 @@ function OffsetDate($dayFraction,$date=false)
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
 
+	/**
+	 * Returns information about stored procedures and stored functions.
+	 *
+	 * @param string|bool $NamePattern (Optional) Only look for procedures/functions with a name matching this pattern.
+	 * @param null $catalog (Optional) Unused.
+	 * @param null $schemaPattern (Optional) Unused.
+	 *
+	 * @return array
+	 */
 	function MetaProcedures($NamePattern = false, $catalog  = null, $schemaPattern  = null)
 	{
 		// 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);
+			$savem = $this->setFetchMode(FALSE);
 		}
 
 		$procedures = array ();
@@ -508,11 +766,11 @@ function MetaProcedures($NamePattern = false, $catalog  = null, $schemaPattern
 		if ($NamePattern) {
 			$likepattern = " LIKE '".$NamePattern."'";
 		}
-		$rs = $this->Execute('SHOW PROCEDURE STATUS'.$likepattern);
+		$rs = $this->execute('SHOW PROCEDURE STATUS'.$likepattern);
 		if (is_object($rs)) {
 
 			// parse index data into array
-			while ($row = $rs->FetchRow()) {
+			while ($row = $rs->fetchRow()) {
 				$procedures[$row[1]] = array(
 					'type' => 'PROCEDURE',
 					'catalog' => '',
@@ -522,10 +780,10 @@ function MetaProcedures($NamePattern = false, $catalog  = null, $schemaPattern
 			}
 		}
 
-		$rs = $this->Execute('SHOW FUNCTION STATUS'.$likepattern);
+		$rs = $this->execute('SHOW FUNCTION STATUS'.$likepattern);
 		if (is_object($rs)) {
 			// parse index data into array
-			while ($row = $rs->FetchRow()) {
+			while ($row = $rs->fetchRow()) {
 				$procedures[$row[1]] = array(
 					'type' => 'FUNCTION',
 					'catalog' => '',
@@ -537,7 +795,7 @@ function MetaProcedures($NamePattern = false, $catalog  = null, $schemaPattern
 
 		// restore fetchmode
 		if (isset($savem)) {
-				$this->SetFetchMode($savem);
+				$this->setFetchMode($savem);
 		}
 		$ADODB_FETCH_MODE = $save;
 
@@ -547,13 +805,13 @@ function MetaProcedures($NamePattern = false, $catalog  = null, $schemaPattern
 	/**
 	 * 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
+	 * @param string|bool $ttype (Optional) Table type = 'TABLE', 'VIEW' or false=both (default)
+	 * @param string|bool $showSchema (Optional) schema name, false = current schema (default)
+	 * @param string|bool $mask (Optional) filters the table by name
 	 *
 	 * @return array list of tables
 	 */
-	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	function MetaTables($ttype = false, $showSchema = false, $mask = false)
 	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
@@ -566,26 +824,43 @@ function MetaTables($ttype=false,$showSchema=false,$mask=false)
 			$mask = $this->qstr($mask);
 			$this->metaTablesSQL .= " AND table_name LIKE $mask";
 		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		$ret = ADOConnection::metaTables($ttype,$showSchema);
 
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
 
-	// "Innox - Juan Carlos Gonzalez" 
-	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
+	/**
+	 * Return information about a table's foreign keys.
+	 *
+	 * @param string $table The name of the table to get the foreign keys for.
+	 * @param string|bool $owner (Optional) The database the table belongs to, or false to assume the current db.
+	 * @param string|bool $upper (Optional) Force uppercase table name on returned array keys.
+	 * @param bool $associative (Optional) Whether to return an associate or numeric array.
+	 *
+	 * @return array|bool An array of foreign keys, or false no foreign keys could be found.
+	 */
+	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;
+		global $ADODB_FETCH_MODE;
+
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC
+		|| $this->fetchMode == ADODB_FETCH_ASSOC)
+			$associative = true;
+
+		$savem = $ADODB_FETCH_MODE;
+		$this->setFetchMode(ADODB_FETCH_ASSOC);
 
 		if ( !empty($owner) ) {
 			$table = "$owner.$table";
 		}
+
 		$a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
-		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];
+
+		$this->setFetchMode($savem);
+
+		$create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
 
 		$matches = array();
 
@@ -618,7 +893,15 @@ function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative =
 		return $foreign_keys;
 	}
 
-	function MetaColumns($table, $normalize=true)
+	/**
+	 * Return an array of information about a table's columns.
+	 *
+	 * @param string $table The name of the table to get the column info for.
+	 * @param bool $normalize (Optional) Unused.
+	 *
+	 * @return ADOFieldObject[]|bool An array of info for each column, or false if it could not determine the info.
+	 */
+	function MetaColumns($table, $normalize = true)
 	{
 		$false = false;
 		if (!$this->metaColumnsSQL)
@@ -629,6 +912,19 @@ function MetaColumns($table, $normalize=true)
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false)
 			$savem = $this->SetFetchMode(false);
+		/*
+		* Return assoc array where key is column name, value is column type
+		*    [1] => int unsigned
+		*/
+
+		$SQL = "SELECT column_name, column_type
+				  FROM information_schema.columns
+				 WHERE table_schema='{$this->databaseName}'
+				   AND table_name='$table'";
+
+		$schemaArray = $this->getAssoc($SQL);
+		$schemaArray = array_change_key_case($schemaArray,CASE_LOWER);
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
@@ -641,6 +937,12 @@ function MetaColumns($table, $normalize=true)
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
 
+			/*
+			* Type from information_schema returns
+			* the same format in V8 mysql as V5
+			*/
+			$type = $schemaArray[strtolower($fld->name)];
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -660,6 +962,7 @@ function MetaColumns($table, $normalize=true)
 				$fld->type = $type;
 				$fld->max_length = -1;
 			}
+
 			$fld->not_null = ($rs->fields[2] != 'YES');
 			$fld->primary_key = ($rs->fields[3] == 'PRI');
 			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
@@ -682,14 +985,22 @@ function MetaColumns($table, $normalize=true)
 			} else {
 				$retarr[strtoupper($fld->name)] = $fld;
 			}
-			$rs->MoveNext();
+			$rs->moveNext();
 		}
 
-		$rs->Close();
+		$rs->close();
 		return $retarr;
 	}
 
-	// returns true or false
+	/**
+	 * Select which database to connect to.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:selectdb
+	 *
+	 * @param string $dbName The name of the database to select.
+	 *
+	 * @return bool True if the database was selected successfully, otherwise false.
+	 */
 	function SelectDB($dbName)
 	{
 //		$this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
@@ -699,19 +1010,32 @@ function SelectDB($dbName)
 		if ($this->_connectionID) {
 			$result = @mysqli_select_db($this->_connectionID, $dbName);
 			if (!$result) {
-				ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->ErrorMsg());
+				ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->errorMsg());
 			}
 			return $result;
 		}
 		return false;
 	}
 
-	// parameters use PostgreSQL convention, not MySQL
+	/**
+	 * Executes a provided SQL statement and returns a handle to the result, with the ability to supply a starting
+	 * offset and record count.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:selectlimit
+	 *
+	 * @param string $sql The SQL to execute.
+	 * @param int $nrows (Optional) The limit for the number of records you want returned. By default, all results.
+	 * @param int $offset (Optional) The offset to use when selecting the results. By default, no offset.
+	 * @param array|bool $inputarr (Optional) Any parameter values required by the SQL statement, or false if none.
+	 * @param int $secs (Optional) If greater than 0, perform a cached execute. By default, normal execution.
+	 *
+	 * @return ADORecordSet|false The query results, or false if the query failed to execute.
+	 */
 	function SelectLimit($sql,
-				$nrows = -1,
-				$offset = -1,
-				$inputarr = false,
-				$secs = 0)
+						 $nrows = -1,
+						 $offset = -1,
+						 $inputarr = false,
+						 $secs = 0)
 	{
 		$nrows = (int) $nrows;
 		$offset = (int) $offset;
@@ -719,30 +1043,53 @@ function SelectLimit($sql,
 		if ($nrows < 0) $nrows = '18446744073709551615';
 
 		if ($secs)
-			$rs = $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr );
+			$rs = $this->cacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr );
 		else
-			$rs = $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr );
+			$rs = $this->execute($sql . " LIMIT $offsetStr$nrows" , $inputarr );
 
 		return $rs;
 	}
 
-
+	/**
+	 * Prepares an SQL statement and returns a handle to use.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:prepare
+	 * @todo update this function to handle prepared statements correctly
+	 *
+	 * @param string $sql The SQL to prepare.
+	 *
+	 * @return string The original SQL that was provided.
+	 */
 	function Prepare($sql)
 	{
+		/*
+		* Flag the insert_id method to use the correct retrieval method
+		*/
+		$this->usePreparedStatement = true;
+
+		/*
+		* Prepared statements are not yet handled correctly
+		*/
 		return $sql;
 		$stmt = $this->_connectionID->prepare($sql);
 		if (!$stmt) {
-			echo $this->ErrorMsg();
+			echo $this->errorMsg();
 			return $sql;
 		}
 		return array($sql,$stmt);
 	}
 
-
-	// returns queryID or false
+	/**
+	 * Return the query id.
+	 *
+	 * @param string|array $sql
+	 * @param array $inputarr
+	 *
+	 * @return bool|mysqli_result
+	 */
 	function _query($sql, $inputarr)
 	{
-	global $ADODB_COUNTRECS;
+		global $ADODB_COUNTRECS;
 		// Move to the next recordset, or return false if there is none. In a stored proc
 		// call, mysqli_next_result returns true for the last "recordset", but mysqli_store_result
 		// returns false. I think this is because the last "recordset" is actually just the
@@ -763,15 +1110,30 @@ function _query($sql, $inputarr)
 				else $a .= 'd';
 			}
 
+			/*
+			 * set prepared statement flags
+			 */
+			if ($this->usePreparedStatement)
+				$this->useLastInsertStatement = true;
+
 			$fnarr = array_merge( array($stmt,$a) , $inputarr);
-			$ret = call_user_func_array('mysqli_stmt_bind_param',$fnarr);
+			call_user_func_array('mysqli_stmt_bind_param',$fnarr);
 			$ret = mysqli_stmt_execute($stmt);
 			return $ret;
 		}
+		else
+		{
+			/*
+			* reset prepared statement flags, in case we set them
+			* previously and didn't use them
+			*/
+			$this->usePreparedStatement   = false;
+			$this->useLastInsertStatement = false;
+		}
 
 		/*
 		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());
+			if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->errorMsg());
 			return false;
 		}
 
@@ -786,18 +1148,26 @@ function _query($sql, $inputarr)
 			}
 		} else {
 			$rs = mysqli_query($this->_connectionID, $sql, $ADODB_COUNTRECS ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
-
-			if ($rs) return $rs;
+			if ($rs) {
+				$this->isSelectStatement = is_object($rs);
+				return $rs;
+			}
 		}
 
 		if($this->debug)
-			ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
+			ADOConnection::outp("Query: " . $sql . " failed. " . $this->errorMsg());
 
 		return false;
 
 	}
 
-	/*	Returns: the last error message from previous database operation	*/
+	/**
+	 * Returns a database specific error message.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:errormsg
+	 *
+	 * @return string The last error message.
+	 */
 	function ErrorMsg()
 	{
 		if (empty($this->_connectionID))
@@ -807,7 +1177,11 @@ function ErrorMsg()
 		return $this->_errorMsg;
 	}
 
-	/*	Returns: the last error number from previous database operation	*/
+	/**
+	 * Returns the last error number from previous database operation.
+	 *
+	 * @return int The last error number.
+	 */
 	function ErrorNo()
 	{
 		if (empty($this->_connectionID))
@@ -816,72 +1190,73 @@ function ErrorNo()
 			return @mysqli_errno($this->_connectionID);
 	}
 
-	// returns true or false
+	/**
+	 * Close the database connection.
+	 *
+	 * @return void
+	 */
 	function _close()
 	{
-		@mysqli_close($this->_connectionID);
+		if($this->_connectionID) {
+			mysqli_close($this->_connectionID);
+		}
 		$this->_connectionID = false;
 	}
 
-	/*
-	* Maximum size of C field
-	*/
+	/**
+	 * Returns the largest length of data that can be inserted into a character field.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:charmax
+	 *
+	 * @return int
+	 */
 	function CharMax()
 	{
 		return 255;
 	}
 
-	/*
-	* Maximum size of X field
-	*/
+	/**
+	 * Returns the largest length of data that can be inserted into a text field.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:textmax
+	 *
+	 * @return int
+	 */
 	function TextMax()
 	{
 		return 4294967295;
 	}
 
-
-	// 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 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
-
-	function GetCharSet()
+	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) {
+		if (!$this->_connectionID || !method_exists($this->_connectionID,'character_set_name')) {
 			return false;
-		} else {
-			return $this->charSet;
 		}
+
+		$this->charSet = $this->_connectionID->character_set_name();
+		return $this->charSet ?: false;
 	}
 
-	// SetCharSet - switch the client encoding
-	function SetCharSet($charset_name)
+	function setCharSet($charset)
 	{
-		if (!method_exists($this->_connectionID,'set_charset')) {
+		if (!$this->_connectionID || !method_exists($this->_connectionID,'set_charset')) {
 			return false;
 		}
 
-		if ($this->charSet !== $charset_name) {
-			$if = @$this->_connectionID->set_charset($charset_name);
-			return ($if === true & $this->GetCharSet() == $charset_name);
-		} else {
-			return true;
+		if ($this->charSet !== $charset) {
+			if (!$this->_connectionID->set_charset($charset)) {
+				return false;
+			}
+			$this->getCharSet();
 		}
+		return true;
 	}
 
 }
 
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
+/**
+ * Class ADORecordSet_mysqli
+ */
 class ADORecordSet_mysqli extends ADORecordSet{
 
 	var $databaseType = "mysqli";
@@ -939,6 +1314,15 @@ function _initrs()
 131072 = MYSQLI_BINCMP_FLAG
 */
 
+	/**
+	 * Returns raw, database specific information about a field.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:recordset:fetchfield
+	 *
+	 * @param int $fieldOffset (Optional) The field number to get information for.
+	 *
+	 * @return ADOFieldObject|bool
+	 */
 	function FetchField($fieldOffset = -1)
 	{
 		$fieldnr = $fieldOffset;
@@ -960,19 +1344,43 @@ function FetchField($fieldOffset = -1)
 		// $o->blob = $o->flags & MYSQLI_BLOB_FLAG; /* not returned by MetaColumns */
 		$o->unsigned = $o->flags & MYSQLI_UNSIGNED_FLAG;
 
-		return $o;
+		/*
+		* Trivial method to cast class to ADOfieldObject
+		*/
+		$a = new ADOFieldObject;
+		foreach (get_object_vars($o) as $key => $name)
+			$a->$key = $name;
+		return $a;
 	}
 
+	/**
+	 * Reads a row in associative mode if the recordset fetch mode is numeric.
+	 * Using this function when the fetch mode is set to ADODB_FETCH_ASSOC may produce unpredictable results.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:getrowassoc
+	 *
+	 * @param int $upper Indicates whether the keys of the recordset should be upper case or lower case.
+	 *
+	 * @return array|bool
+	 */
 	function GetRowAssoc($upper = ADODB_ASSOC_CASE)
 	{
 		if ($this->fetchMode == MYSQLI_ASSOC && $upper == ADODB_ASSOC_CASE_LOWER) {
 			return $this->fields;
 		}
-		$row = ADORecordSet::GetRowAssoc($upper);
+		$row = ADORecordSet::getRowAssoc($upper);
 		return $row;
 	}
 
-	/* Use associative array to get fields array */
+	/**
+	 * Returns a single field in a single row of the current recordset.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:recordset:fields
+	 *
+	 * @param string $colname The name of the field to retrieve.
+	 *
+	 * @return mixed
+	 */
 	function Fields($colname)
 	{
 		if ($this->fetchMode != MYSQLI_NUM) {
@@ -982,13 +1390,20 @@ function Fields($colname)
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i = 0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
+				$o = $this->fetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
 		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
+	/**
+	 * Adjusts the result pointer to an arbitrary row in the result.
+	 *
+	 * @param int $row The row to seek to.
+	 *
+	 * @return bool False if the recordset contains no rows, otherwise true.
+	 */
 	function _seek($row)
 	{
 		if ($this->_numOfRows == 0 || $row < 0) {
@@ -1000,10 +1415,16 @@ function _seek($row)
 		return true;
 	}
 
-
+	/**
+	 * In databases that allow accessing of recordsets, retrieves the next set.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:recordset:nextrecordset
+	 *
+	 * @return bool
+	 */
 	function NextRecordSet()
 	{
-	global $ADODB_COUNTRECS;
+		global $ADODB_COUNTRECS;
 
 		mysqli_free_result($this->_queryID);
 		$this->_queryID = -1;
@@ -1011,25 +1432,32 @@ function NextRecordSet()
 		// call, mysqli_next_result returns true for the last "recordset", but mysqli_store_result
 		// returns false. I think this is because the last "recordset" is actually just the
 		// return value of the stored proc (ie the number of rows affected).
-		if(!mysqli_next_result($this->connection->_connectionID)) {
-		return false;
+		if (!mysqli_next_result($this->connection->_connectionID)) {
+			return false;
 		}
+
 		// CD: There is no $this->_connectionID variable, at least in the ADO version I'm using
-		$this->_queryID = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->connection->_connectionID )
-						: @mysqli_use_result( $this->connection->_connectionID );
-		if(!$this->_queryID) {
+		$this->_queryID = ($ADODB_COUNTRECS) ? @mysqli_store_result($this->connection->_connectionID)
+			: @mysqli_use_result($this->connection->_connectionID);
+
+		if (!$this->_queryID) {
 			return false;
 		}
-		$this->_inited = false;
-		$this->bind = false;
+
+		$this->_inited     = false;
+		$this->bind        = false;
 		$this->_currentRow = -1;
-		$this->Init();
+		$this->init();
 		return true;
 	}
 
-	// 10% speedup to move MoveNext to child class
-	// This is the only implementation that works now (23-10-2003).
-	// Other functions return no or the wrong results.
+	/**
+	 * Moves the cursor to the next record of the recordset from the current position.
+	 *
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:movenext
+	 *
+	 * @return bool False if there are no more records to move on to, otherwise true.
+	 */
 	function MoveNext()
 	{
 		if ($this->EOF) return false;
@@ -1044,6 +1472,11 @@ function MoveNext()
 		return false;
 	}
 
+	/**
+	 * Attempt to fetch a result row using the current fetch mode and return whether or not this was successful.
+	 *
+	 * @return bool True if row was fetched successfully, otherwise false.
+	 */
 	function _fetch()
 	{
 		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);
@@ -1051,18 +1484,23 @@ function _fetch()
 		return is_array($this->fields);
 	}
 
+	/**
+	 * Frees the memory associated with a result.
+	 *
+	 * @return void
+	 */
 	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
+		//if results are attached to this pointer from Stored Procedure calls, the next standard query will die 2014
+		//only a problem with persistent connections
 
-		if(isset($this->connection->_connectionID) && $this->connection->_connectionID) {
-			while(mysqli_more_results($this->connection->_connectionID)){
+		if (isset($this->connection->_connectionID) && $this->connection->_connectionID) {
+			while (mysqli_more_results($this->connection->_connectionID)) {
 				mysqli_next_result($this->connection->_connectionID);
 			}
 		}
 
-		if($this->_queryID instanceof mysqli_result) {
+		if ($this->_queryID instanceof mysqli_result) {
 			mysqli_free_result($this->_queryID);
 		}
 		$this->_queryID = false;
@@ -1097,6 +1535,15 @@ function _close()
 255 = MYSQLI_TYPE_GEOMETRY
 */
 
+	/**
+	 * Get the MetaType character for a given field type.
+	 *
+	 * @param string|object $t The type to get the MetaType character for.
+	 * @param int $len (Optional) Redundant. Will always be set to -1.
+	 * @param bool|object $fieldobj (Optional)
+	 *
+	 * @return string The MetaType
+	 */
 	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
@@ -1105,99 +1552,107 @@ function MetaType($t, $len = -1, $fieldobj = false)
 			$len = $fieldobj->max_length;
 		}
 
-
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING':
-		case 'CHAR':
-		case 'VARCHAR':
-		case 'TINYBLOB':
-		case 'TINYTEXT':
-		case 'ENUM':
-		case 'SET':
-
-		case MYSQLI_TYPE_TINY_BLOB :
-		#case MYSQLI_TYPE_CHAR :
-		case MYSQLI_TYPE_STRING :
-		case MYSQLI_TYPE_ENUM :
-		case MYSQLI_TYPE_SET :
-		case 253 :
-			if ($len <= $this->blobSize) return 'C';
-
-		case 'TEXT':
-		case 'LONGTEXT':
-		case 'MEDIUMTEXT':
-			return 'X';
-
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB':
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-
-		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 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 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		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':
-		case 'DOUBLE':
-//		case 'DOUBLE PRECISION':
-		case 'DECIMAL':
-		case 'DEC':
-		case 'FIXED':
-		default:
-			//if (!is_numeric($t)) echo "
--- Error in type matching $t -----
";
-			return 'N';
+			case 'STRING':
+			case 'CHAR':
+			case 'VARCHAR':
+			case 'TINYBLOB':
+			case 'TINYTEXT':
+			case 'ENUM':
+			case 'SET':
+
+			case MYSQLI_TYPE_TINY_BLOB :
+//			case MYSQLI_TYPE_CHAR :
+			case MYSQLI_TYPE_STRING :
+			case MYSQLI_TYPE_ENUM :
+			case MYSQLI_TYPE_SET :
+			case 253 :
+				if ($len <= $this->blobSize) {
+					return 'C';
+				}
+
+			case 'TEXT':
+			case 'LONGTEXT':
+			case 'MEDIUMTEXT':
+				return 'X';
+
+			// php_mysql extension always returns 'blob' even if 'text'
+			// so we have to check whether binary...
+			case 'IMAGE':
+			case 'LONGBLOB':
+			case 'BLOB':
+			case 'MEDIUMBLOB':
+
+			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 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 'INTEGER':
+			case 'BIGINT':
+			case 'TINYINT':
+			case 'MEDIUMINT':
+			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 necessary.
+			case 'FLOAT':
+			case 'DOUBLE':
+//			case 'DOUBLE PRECISION':
+			case 'DECIMAL':
+			case 'DEC':
+			case 'FIXED':
+			default:
+				//if (!is_numeric($t)) echo "
--- Error in type matching $t -----
";
+				return 'N';
 		}
-	} // function
+	}
 
 
 } // rs class
 
-}
-
-class ADORecordSet_array_mysqli extends ADORecordSet_array {
-
-	function __construct($id=-1,$mode=false)
-	{
-		parent::__construct($id,$mode);
-	}
-
+/**
+ * Class ADORecordSet_array_mysqli
+ */
+class ADORecordSet_array_mysqli extends ADORecordSet_array
+{
+	/**
+	 * Get the MetaType character for a given field type.
+	 *
+	 * @param string|object $t The type to get the MetaType character for.
+	 * @param int $len (Optional) Redundant. Will always be set to -1.
+	 * @param bool|object $fieldobj (Optional)
+	 *
+	 * @return string The MetaType
+	 */
 	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
@@ -1206,90 +1661,89 @@ function MetaType($t, $len = -1, $fieldobj = false)
 			$len = $fieldobj->max_length;
 		}
 
-
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING':
-		case 'CHAR':
-		case 'VARCHAR':
-		case 'TINYBLOB':
-		case 'TINYTEXT':
-		case 'ENUM':
-		case 'SET':
-
-		case MYSQLI_TYPE_TINY_BLOB :
-		#case MYSQLI_TYPE_CHAR :
-		case MYSQLI_TYPE_STRING :
-		case MYSQLI_TYPE_ENUM :
-		case MYSQLI_TYPE_SET :
-		case 253 :
-			if ($len <= $this->blobSize) return 'C';
-
-		case 'TEXT':
-		case 'LONGTEXT':
-		case 'MEDIUMTEXT':
-			return 'X';
-
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB':
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-
-		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 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 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		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':
-		case 'DOUBLE':
-//		case 'DOUBLE PRECISION':
-		case 'DECIMAL':
-		case 'DEC':
-		case 'FIXED':
-		default:
-			//if (!is_numeric($t)) echo "
--- Error in type matching $t -----
";
-			return 'N';
-		}
-	} // function
+			case 'STRING':
+			case 'CHAR':
+			case 'VARCHAR':
+			case 'TINYBLOB':
+			case 'TINYTEXT':
+			case 'ENUM':
+			case 'SET':
+
+			case MYSQLI_TYPE_TINY_BLOB :
+//			case MYSQLI_TYPE_CHAR :
+			case MYSQLI_TYPE_STRING :
+			case MYSQLI_TYPE_ENUM :
+			case MYSQLI_TYPE_SET :
+			case 253 :
+				if ($len <= $this->blobSize) {
+					return 'C';
+				}
 
+			case 'TEXT':
+			case 'LONGTEXT':
+			case 'MEDIUMTEXT':
+				return 'X';
+
+			// php_mysql extension always returns 'blob' even if 'text'
+			// so we have to check whether binary...
+			case 'IMAGE':
+			case 'LONGBLOB':
+			case 'BLOB':
+			case 'MEDIUMBLOB':
+
+			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 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 'INTEGER':
+			case 'BIGINT':
+			case 'TINYINT':
+			case 'MEDIUMINT':
+			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 necessary.
+			case 'FLOAT':
+			case 'DOUBLE':
+//			case 'DOUBLE PRECISION':
+			case 'DECIMAL':
+			case 'DEC':
+			case 'FIXED':
+			default:
+				//if (!is_numeric($t)) echo "
--- Error in type matching $t -----
";
+				return 'N';
+		}
+	}
 }
+
+} // if defined _ADODB_MYSQLI_LAYER
diff --git a/vendor/adodb/adodb-php/drivers/adodb-mysqlpo.inc.php b/vendor/adodb/adodb-php/drivers/adodb-mysqlpo.inc.php
index 60b9460837..8aa7779ad4 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-mysqlpo.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-mysqlpo.inc.php
@@ -1,24 +1,30 @@
 
-  
-  This driver extends the deprecated mysql driver, and was originally designed to be a 
-  portable driver in the same manner as oci8po and mssqlpo. Its functionality
-  is exactly duplicated in the mysqlt driver, which is itself deprecated.
-  This driver will be removed in ADOdb version 6.0.0.
-
-  Requires mysql client. Works on Windows and Unix.
-*/
+/**
+ * Portable MySQL driver
+ *
+ * @deprecated
+ *
+ * Extends the deprecated mysql driver, and was originally designed to be a
+ * portable driver in the same manner as oci8po and mssqlpo. Its functionality
+ * is exactly duplicated in the mysqlt driver, which is itself deprecated.
+ * This driver will be removed in ADOdb version 6.0.0.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -32,11 +38,6 @@ class ADODB_mysqlt extends ADODB_mysql {
 	var $hasTransactions = true;
 	var $autoRollback = true; // apparently mysql does not autorollback properly
 
-	function __construct()
-	{
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
-	}
-
 	function BeginTrans()
 	{
 		if ($this->transOff) return true;
@@ -116,11 +117,6 @@ function MoveNext()
 
 class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
 
-	function __construct($queryID,$mode=false)
-	{
-		parent::__construct($queryID,$mode);
-	}
-
 	function MoveNext()
 	{
 		return adodb_movenext($this);
diff --git a/vendor/adodb/adodb-php/drivers/adodb-mysqlt.inc.php b/vendor/adodb/adodb-php/drivers/adodb-mysqlt.inc.php
index 3f5d53659d..cccd93f8d3 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-mysqlt.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-mysqlt.inc.php
@@ -1,21 +1,30 @@
 rsPrefix .= 'ext_';
-	}
-
 	/* set transaction mode
 
 	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
diff --git a/vendor/adodb/adodb-php/drivers/adodb-netezza.inc.php b/vendor/adodb/adodb-php/drivers/adodb-netezza.inc.php
index af76139746..dc7c58e428 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-netezza.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-netezza.inc.php
@@ -1,21 +1,35 @@
 
+ */
+
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
@@ -50,11 +64,6 @@ class ADODB_netezza extends ADODB_postgres64 {
 							// http://bugs.php.net/bug.php?id=25404
 
 
-	function __construct()
-	{
-
-	}
-
 	function MetaColumns($table,$upper=true)
 	{
 
@@ -141,11 +150,6 @@ class ADORecordSet_netezza extends ADORecordSet_postgres64
 	var $databaseType = "netezza";
 	var $canSeek = true;
 
-	function __construct($queryID,$mode=false)
-	{
-		parent::__construct($queryID,$mode);
-	}
-
 	// _initrs modified to disable blob handling
 	function _initrs()
 	{
diff --git a/vendor/adodb/adodb-php/drivers/adodb-oci8.inc.php b/vendor/adodb/adodb-php/drivers/adodb-oci8.inc.php
index 75e7c052c4..e541b6b6a0 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-oci8.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-oci8.inc.php
@@ -1,20 +1,25 @@
 
-
-  13 Nov 2000 jlim - removed all ora_* references.
-*/
+/**
+ * FileDescription
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author John Lim
+ * @author George Fourlanos 
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -89,7 +94,6 @@ class ADODB_oci8 extends ADOConnection {
 	var $connectSID = false;
 	var $_bind = false;
 	var $_nestedSQL = true;
-	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
@@ -103,13 +107,20 @@ class ADODB_oci8 extends ADOConnection {
 
 	// var $ansiOuter = true; // if oracle9
 
-	function __construct()
-	{
-		$this->_hasOciFetchStatement = ADODB_PHPVER >= 0x4200;
-		if (defined('ADODB_EXTENSION')) {
-			$this->rsPrefix .= 'ext_';
-		}
-	}
+	/*
+	 * Legacy compatibility for sequence names for emulated auto-increments
+	 */
+	public $useCompactAutoIncrements = false;
+
+	/*
+	 * Defines the schema name for emulated auto-increment columns
+	 */
+	public $schema = false;
+
+	/*
+	 * Defines the prefix for emulated auto-increment columns
+	 */
+	public $seqPrefix = 'SEQ_';
 
 	/*  function MetaColumns($table, $normalize=true) added by smondino@users.sourceforge.net*/
 	function MetaColumns($table, $normalize=true)
@@ -308,6 +319,42 @@ function IfNull( $field, $ifNull )
 		return " NVL($field, $ifNull) "; // if Oracle
 	}
 
+	protected function _insertID($table = '', $column = '')
+	{
+
+		if (!$this->seqField)
+			return false;
+
+		if ($this->schema)
+		{
+			$t = strpos($table,'.');
+			if ($t !== false)
+				$tab = substr($table,$t+1);
+			else
+				$tab = $table;
+
+			if ($this->useCompactAutoIncrements)
+				$tab = sprintf('%u',crc32(strtolower($tab)));
+
+			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
+		}
+		else
+		{
+			if ($this->useCompactAutoIncrements)
+				$table = sprintf('%u',crc32(strtolower($table)));
+
+			$seqname = $this->seqPrefix.$table;
+		}
+
+		if (strlen($seqname) > 30)
+			/*
+			* We cannot successfully identify the sequence
+			*/
+			return false;
+
+		return $this->getOne("SELECT $seqname.currval FROM dual");
+	}
+
 	// format and return date string in database date format
 	function DBDate($d,$isfld=false)
 	{
@@ -947,7 +994,7 @@ function Execute($sql,$inputarr=false)
 			$element0 = reset($inputarr);
 			$array2d =  $this->bulkBind && is_array($element0) && !is_object(reset($element0));
 
-			# see http://phplens.com/lens/lensforum/msgs.php?id=18786
+			# see PHPLens Issue No: 18786
 			if ($array2d || !$this->_bindInputArray) {
 
 				# is_object check because oci8 descriptors can be passed in
@@ -1497,37 +1544,27 @@ function TextMax()
 	}
 
 	/**
-	 * Quotes a string.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
+	 * 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");
+	 *
+	 * @param string $s            The string to quote
+	 * @param bool   $magic_quotes This param is not used since 5.21.0.
+	 *                             It remains for backwards compatibility.
 	 *
-	 * @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
 	 *
-	 * @return string quoted string to be sent back to database
+	 * @noinspection PhpUnusedParameterInspection
 	 */
-	function qstr($s,$magic_quotes=false)
+	function qStr($s, $magic_quotes=false)
 	{
-		//$nofixquotes=false;
-
-		if ($this->noNullStrings && strlen($s)==0) {
+		if ($this->noNullStrings && strlen($s) == 0) {
 			$s = ' ';
 		}
-		if (!$magic_quotes) {
-			if ($this->replaceQuote[0] == '\\'){
-				$s = str_replace('\\','\\\\',$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-
-		// undo magic quotes for " unless sybase is on
-		if (!ini_get('magic_quotes_sybase')) {
-			$s = str_replace('\\"','"',$s);
-			$s = str_replace('\\\\','\\',$s);
-			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		} else {
-			return "'".$s."'";
+		if ($this->replaceQuote[0] == '\\'){
+			$s = str_replace('\\','\\\\',$s);
 		}
+		return  "'" . str_replace("'", $this->replaceQuote, $s) . "'";
 	}
 
 }
@@ -1565,7 +1602,7 @@ function __construct($queryID,$mode=false)
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;
 	}
-	
+
 	/**
 	* Overrides the core destructor method as that causes problems here
 	*
@@ -1591,7 +1628,7 @@ function Init()
 
 			/*
 			// based on idea by Gaetano Giunta to detect unusual oracle errors
-			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
+			// see PHPLens Issue No: 6771
 			$err = oci_error($this->_queryID);
 			if ($err && $this->connection->debug) {
 				ADOConnection::outp($err);
@@ -1751,7 +1788,8 @@ function _close()
 			oci_free_cursor($this->_refcursor);
 			$this->_refcursor = false;
 		}
-		@oci_free_statement($this->_queryID);
+		if (is_resource($this->_queryID))
+		   @oci_free_statement($this->_queryID);
 		$this->_queryID = false;
 	}
 
@@ -1808,16 +1846,12 @@ function MetaType($t, $len=-1, $fieldobj=false)
 			return 'I';
 
 		default:
-			return 'N';
+			return ADODB_DEFAULT_METATYPE;
 		}
 	}
 }
 
 class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {
-	function __construct($queryID,$mode=false)
-	{
-		parent::__construct($queryID, $mode);
-	}
 
 	function MoveNext()
 	{
diff --git a/vendor/adodb/adodb-php/drivers/adodb-oci805.inc.php b/vendor/adodb/adodb-php/drivers/adodb-oci805.inc.php
index 84e86627d0..01958282c8 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-oci805.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-oci805.inc.php
@@ -1,18 +1,27 @@
 
-
-   Should some emulation of RecordCount() be implemented?
-
-*/
+/**
+ * Portable version of Oracle oci8 driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * Portable version of oci8 driver, to make it more similar to other database
+ * drivers. The main differences are
+ * 1. that the OCI_ASSOC names are in lowercase instead of uppercase.
+ * 2. bind variables are mapped using ? instead of :
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -30,12 +35,6 @@ class ADODB_oci8po extends ADODB_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 __construct()
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		# oci8po does not support adodb extension: adodb_movenext()
-	}
-
 	function Param($name,$type='C')
 	{
 		return '?';
@@ -86,6 +85,7 @@ function _query($sql,$inputarr=false)
 		}
 		return ADODB_oci8::_query($sql,$inputarr);
 	}
+	
 	/**
 	* Replaces compatibility bind markers with oracle ones and returns a
 	* valid sql statement
@@ -94,13 +94,13 @@ function _query($sql,$inputarr=false)
 	* to numerous tweaks, as more extreme test cases have appeared. This
 	* is now done this like this to help maintainability and avoid the 
 	* need to rely on regexp experienced maintainers
-        *
+	*
 	* @param	string		$sql		The sql statement
 	* @param	string[]	$inputarr	The bind array
 	*
 	* @return	string	The modified statement
 	*/	
-	final private function extractBinds($sql,$inputarr)
+	private function extractBinds($sql,$inputarr)
 	{
 		$inString  = false;
 		$escaped   = 0;
@@ -120,7 +120,7 @@ final private function extractBinds($sql,$inputarr)
 			/*
 			* find the next character of the string
 			*/
-			$c = $sql{$i};
+			$c = $sql[$i];
 
 			if ($c == "'" && !$inString && $escaped==0)
 				/*
@@ -173,11 +173,6 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
 
 	var $databaseType = 'oci8po';
 
-	function __construct($queryID,$mode=false)
-	{
-		parent::__construct($queryID,$mode);
-	}
-
 	function Fields($colname)
 	{
 		if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname];
diff --git a/vendor/adodb/adodb-php/drivers/adodb-oci8quercus.inc.php b/vendor/adodb/adodb-php/drivers/adodb-oci8quercus.inc.php
index 3ad4dd200b..f9312c9d71 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-oci8quercus.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-oci8quercus.inc.php
@@ -1,23 +1,23 @@
 
-
-   Should some emulation of RecordCount() be implemented?
-
-*/
+/**
+ * Oracle "quercus" driver.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -28,10 +28,6 @@ class ADODB_oci8quercus extends ADODB_oci8 {
 	var $databaseType = 'oci8quercus';
 	var $dataProvider = 'oci8';
 
-	function __construct()
-	{
-	}
-
 }
 
 /*--------------------------------------------------------------------------------------
@@ -42,11 +38,6 @@ class ADORecordset_oci8quercus extends ADORecordset_oci8 {
 
 	var $databaseType = 'oci8quercus';
 
-	function __construct($queryID,$mode=false)
-	{
-		parent::__construct($queryID,$mode);
-	}
-
 	function _FetchField($fieldOffset = -1)
 	{
 	global $QUERCUS;
diff --git a/vendor/adodb/adodb-php/drivers/adodb-odbc.inc.php b/vendor/adodb/adodb-php/drivers/adodb-odbc.inc.php
index a67892f187..a9705e2d80 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-odbc.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-odbc.inc.php
@@ -1,22 +1,41 @@
 _haserrorfunctions = ADODB_PHPVER >= 0x4050;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}
+	function __construct() {}
 
 		// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
@@ -93,7 +111,7 @@ function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	function ServerInfo()
 	{
 
-		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
+		if (!empty($this->host)) {
 			$dsn = strtoupper($this->host);
 			$first = true;
 			$found = false;
@@ -180,30 +198,25 @@ function GenID($seq='adodbseq',$start=1)
 
 	function ErrorMsg()
 	{
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorMsg !== false) return $this->_errorMsg;
-			if (empty($this->_connectionID)) return @odbc_errormsg();
-			return @odbc_errormsg($this->_connectionID);
-		} else return ADOConnection::ErrorMsg();
+		if ($this->_errorMsg !== false) return $this->_errorMsg;
+		if (empty($this->_connectionID)) return @odbc_errormsg();
+		return @odbc_errormsg($this->_connectionID);
 	}
 
 	function ErrorNo()
 	{
+		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 ($this->_haserrorfunctions) {
-			if ($this->_errorCode !== false) {
-				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
-			}
-
-			if (empty($this->_connectionID)) $e = @odbc_error();
-			else $e = @odbc_error($this->_connectionID);
+		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();
+		 // 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;
 	}
 
 
@@ -258,7 +271,6 @@ function MetaPrimaryKeys($table,$owner=false)
 		$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();
@@ -287,7 +299,6 @@ function MetaTables($ttype=false,$showSchema=false,$mask=false)
 			$false = false;
 			return $false;
 		}
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 
 		$arr = $rs->GetArray();
 		//print_r($arr);
@@ -390,12 +401,11 @@ function MetaColumns($table, $normalize=true)
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 
-		/*if (false) { // after testing, confirmed that the following does not work becoz of a bug
+		/*if (false) { // after testing, confirmed that the following does not work because of a bug
 			$qid2 = odbc_tables($this->_connectionID);
 			$rs = new ADORecordSet_odbc($qid2);
 			$ADODB_FETCH_MODE = $savem;
 			if (!$rs) return false;
-			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 			$rs->_fetch();
 
 			while (!$rs->EOF) {
@@ -434,7 +444,6 @@ function MetaColumns($table, $normalize=true)
 		$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();
@@ -459,7 +468,16 @@ function MetaColumns($table, $normalize=true)
 			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
 				$fld = new ADOFieldObject();
 				$fld->name = $rs->fields[3];
-				$fld->type = $this->ODBCTypes($rs->fields[4]);
+				if ($this->metaColumnsReturnType == METACOLUMNS_RETURNS_META)
+					/* 
+				    * This is the broken, original value
+					*/
+					$fld->type = $this->ODBCTypes($rs->fields[4]);
+				else
+					/*
+				    * This is the correct new value
+					*/
+				    $fld->type = $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
@@ -516,10 +534,8 @@ function _query($sql,$inputarr=false)
 
 			if (! odbc_execute($stmtid,$inputarr)) {
 				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
+				$this->_errorMsg = odbc_errormsg();
+				$this->_errorCode = odbc_error();
 				return false;
 			}
 
@@ -527,10 +543,8 @@ function _query($sql,$inputarr=false)
 			$stmtid = $sql[1];
 			if (!odbc_execute($stmtid)) {
 				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
+				$this->_errorMsg = odbc_errormsg();
+				$this->_errorCode = odbc_error();
 				return false;
 			}
 		} else
@@ -547,19 +561,11 @@ function _query($sql,$inputarr=false)
 				odbc_longreadlen($stmtid,$this->maxblobsize);
 			}
 
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = '';
-				$this->_errorCode = 0;
-			} else {
-				$this->_errorMsg = $this->getChangedErrorMsg($last_php_error);
-			}
+			$this->_errorMsg = '';
+			$this->_errorCode = 0;
 		} else {
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = odbc_errormsg();
-				$this->_errorCode = odbc_error();
-			} else {
-				$this->_errorMsg = $this->getChangedErrorMsg($last_php_error);
-			}
+			$this->_errorMsg = odbc_errormsg();
+			$this->_errorCode = odbc_error();
 		}
 		return $stmtid;
 	}
@@ -603,7 +609,6 @@ class ADORecordSet_odbc extends ADORecordSet {
 	var $databaseType = "odbc";
 	var $dataProvider = "odbc";
 	var $useFetchArray;
-	var $_has_stupid_odbc_fetch_api_change;
 
 	function __construct($id,$mode=false)
 	{
@@ -661,7 +666,6 @@ function _initrs()
 		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
 		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
 		//$this->useFetchArray = $this->connection->useFetchArray;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
 	}
 
 	function _seek($row)
@@ -712,12 +716,7 @@ function MoveNext()
 	function _fetch()
 	{
 		$this->fields = false;
-		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);
-		}
+		$rez = @odbc_fetch_into($this->_queryID,$this->fields);
 		if ($rez) {
 			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 				$this->fields = $this->GetRowAssoc();
diff --git a/vendor/adodb/adodb-php/drivers/adodb-odbc_db2.inc.php b/vendor/adodb/adodb-php/drivers/adodb-odbc_db2.inc.php
index df4da9607d..8f0e60cb1a 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-odbc_db2.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-odbc_db2.inc.php
@@ -1,98 +1,29 @@
 curMode = SQL_CUR_USE_ODBC;
-$db->Connect($dsn, $userid, $pwd);
-
-
-
-USING CLI INTERFACE
-===================
-
-I have had reports that the $host and $database params have to be reversed in
-Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
-
-> The symptom is that if I change the database engine from postgres or any other to DB2 then the following
-> connection command becomes wrong despite being described this version to be correct in the docs.
->
-> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
->
-> In case of DB2 I had to swap the first and last arguments in order to connect properly.
-
-
-System Error 5
-==============
-IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
-to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
-*/
+/**
+ * DB2 driver via ODBC
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 if (!defined('_ADODB_ODBC_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+	include_once(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
 if (!defined('ADODB_ODBC_DB2')){
 define('ADODB_ODBC_DB2',1);
@@ -131,7 +62,7 @@ function ServerInfo()
 		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
 	}
 
-	function _insertid()
+	protected function _insertID($table = '', $column = '')
 	{
 		return $this->GetOne($this->identitySQL);
 	}
@@ -157,7 +88,6 @@ function MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
 			$false = false;
 			return $false;
 		}
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 
 		$arr = $rs->GetArray();
 		//print_r($arr);
@@ -306,11 +236,6 @@ class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {
 
 	var $databaseType = "db2";
 
-	function __construct($id,$mode=false)
-	{
-		parent::__construct($id,$mode);
-	}
-
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -361,7 +286,7 @@ function MetaType($t,$len=-1,$fieldobj=false)
 		case 'I':
 			return 'I';
 
-		default: return 'N';
+		default: return ADODB_DEFAULT_METATYPE;
 		}
 	}
 }
diff --git a/vendor/adodb/adodb-php/drivers/adodb-odbc_mssql.inc.php b/vendor/adodb/adodb-php/drivers/adodb-odbc_mssql.inc.php
index 50e48f620b..37185aac32 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-odbc_mssql.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-odbc_mssql.inc.php
@@ -1,24 +1,29 @@
 curmode = SQL_CUR_USE_ODBC;
-	}
-
 	// crashes php...
 	function ServerInfo()
 	{
@@ -72,7 +71,7 @@ function IfNull( $field, $ifNull )
 		return " ISNULL($field, $ifNull) "; // if MS SQL Server
 	}
 
-	function _insertid()
+	protected function _insertID($table = '', $column = '')
 	{
 	// SCOPE_IDENTITY()
 	// Returns the last IDENTITY value inserted into an IDENTITY column in
@@ -352,14 +351,89 @@ function SQLDate($fmt, $col=false)
 		return $s;
 	}
 
+	/**
+	* Returns a substring of a varchar type field
+	*
+	* The SQL server version varies because the length is mandatory, so
+	* we append a reasonable string length
+	*
+	* @param	string	$fld	The field to sub-string
+	* @param	int		$start	The start point
+	* @param	int		$length	An optional length
+	*
+	* @return	The SQL text
+	*/
+	function substr($fld,$start,$length=0)
+	{
+		if ($length == 0)
+			/*
+		     * The length available to varchar is 2GB, but that makes no
+			 * sense in a substring, so I'm going to arbitrarily limit
+			 * the length to 1K, but you could change it if you want
+			 */
+			$length = 1024;
+
+		$text = "SUBSTRING($fld,$start,$length)";
+		return $text;
+	}
+
+	/**
+	* Returns the maximum size of a MetaType C field. Because of the
+	* database design, SQL Server places no limits on the size of data inserted
+	* Although the actual limit is 2^31-1 bytes.
+	*
+	* @return int
+	*/
+	function charMax()
+	{
+		return ADODB_STRINGMAX_NOLIMIT;
+	}
+
+	/**
+	* Returns the maximum size of a MetaType X field. Because of the
+	* database design, SQL Server places no limits on the size of data inserted
+	* Although the actual limit is 2^31-1 bytes.
+	*
+	* @return int
+	*/
+	function textMax()
+	{
+		return ADODB_STRINGMAX_NOLIMIT;
+	}
+
+	// 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;
+		}
+
+		array_walk(
+			$arr,
+			function(&$value, $key) {
+				$value = "CAST(" . $value . " AS VARCHAR(255))";
+			}
+		);
+		$s = implode('+',$arr);
+		if (sizeof($arr) > 0) return "$s";
+
+		return '';
+	}
+
 }
 
 class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {
 
 	var $databaseType = 'odbc_mssql';
 
-	function __construct($id,$mode=false)
-	{
-		return parent::__construct($id,$mode);
-	}
 }
diff --git a/vendor/adodb/adodb-php/drivers/adodb-odbc_mssql2012.inc.php b/vendor/adodb/adodb-php/drivers/adodb-odbc_mssql2012.inc.php
new file mode 100644
index 0000000000..79fa32516f
--- /dev/null
+++ b/vendor/adodb/adodb-php/drivers/adodb-odbc_mssql2012.inc.php
@@ -0,0 +1,37 @@
+
+/**
+ * ODBTP driver
+ *
+ * @deprecated will be removed in ADOdb version 6
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author stefan bogdan 
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -35,10 +46,6 @@ class ADODB_odbtp extends ADOConnection{
 	var $_canPrepareSP = false;
 	var $_dontPoolDBC = true;
 
-	function __construct()
-	{
-	}
-
 	function ServerInfo()
 	{
 		return array('description' => @odbtp_get_attr( ODB_ATTR_DBMSNAME, $this->_connectionID),
@@ -80,7 +87,7 @@ function DBTimeStamp($d,$isfld=false)
 	}
 */
 
-	function _insertid()
+	protected function _insertID($table = '', $column = '')
 	{
 	// SCOPE_IDENTITY()
 	// Returns the last IDENTITY value inserted into an IDENTITY column in
@@ -792,48 +799,28 @@ class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_mssql';
 
-	function __construct($id,$mode=false)
-	{
-		return parent::__construct($id,$mode);
-	}
 }
 
 class ADORecordSet_odbtp_access extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_access';
 
-	function __construct($id,$mode=false)
-	{
-		return parent::__construct($id,$mode);
-	}
 }
 
 class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_vfp';
 
-	function __construct($id,$mode=false)
-	{
-		return parent::__construct($id,$mode);
-	}
 }
 
 class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_oci8';
 
-	function __construct($id,$mode=false)
-	{
-		return parent::__construct($id,$mode);
-	}
 }
 
 class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_sybase';
 
-	function __construct($id,$mode=false)
-	{
-		return parent::__construct($id,$mode);
-	}
 }
diff --git a/vendor/adodb/adodb-php/drivers/adodb-odbtp_unicode.inc.php b/vendor/adodb/adodb-php/drivers/adodb-odbtp_unicode.inc.php
index 7958341756..190c3ab5ea 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-odbtp_unicode.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-odbtp_unicode.inc.php
@@ -1,32 +1,38 @@
 
+/**
+ * ODBTP Unicode driver.
+ *
+ * @deprecated will be removed in ADOdb version 6
+ *
+ * Because the ODBTP server sends and reads UNICODE text data using UTF-8
+ * encoding, the following HTML meta tag must be included within the HTML
+ * head section of every HTML form and script page:
+ * 
+ * Also, all SQL query strings must be submitted as UTF-8 encoded text.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Robert Twitty 
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
-/*
-    Because the ODBTP server sends and reads UNICODE text data using UTF-8
-    encoding, the following HTML meta tag must be included within the HTML
-    head section of every HTML form and script page:
-
-    
-
-    Also, all SQL query strings must be submitted as UTF-8 encoded text.
-*/
-
 if (!defined('_ADODB_ODBTP_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbtp.inc.php");
+	include_once(ADODB_DIR."/drivers/adodb-odbtp.inc.php");
 }
 
 class ADODB_odbtp_unicode extends ADODB_odbtp {
diff --git a/vendor/adodb/adodb-php/drivers/adodb-oracle.inc.php b/vendor/adodb/adodb-php/drivers/adodb-oracle.inc.php
index 2ed9bb677a..1a2735b147 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-oracle.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-oracle.inc.php
@@ -1,18 +1,25 @@
 pdoOptions = [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION];
+	*/
+	public $pdoParameters = array();
 
 	function _UpdatePDO()
 	{
@@ -102,6 +104,7 @@ function _UpdatePDO()
 		$this->random = $d->random;
 		$this->concat_operator = $d->concat_operator;
 		$this->nameQuote = $d->nameQuote;
+		$this->arrayClass = $d->arrayClass;
 
 		$this->hasGenID = $d->hasGenID;
 		$this->_genIDSQL = $d->_genIDSQL;
@@ -144,12 +147,22 @@ function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persis
 				case 'oci':
 				case 'pgsql':
 				case 'sqlite':
+				case 'firebird':
 				default:
 					$argDSN .= ';dbname='.$argDatabasename;
 			}
 		}
+		/*
+		* Configure for persistent connection if required,
+		* by adding the the pdo parameter into any provided
+		* ones
+		*/
+		if ($persist) {
+			$this->pdoParameters[\PDO::ATTR_PERSISTENT] = true;
+		}
+
 		try {
-			$this->_connectionID = new PDO($argDSN, $argUsername, $argPassword);
+			$this->_connectionID = new \PDO($argDSN, $argUsername, $argPassword, $this->pdoParameters);
 		} catch (Exception $e) {
 			$this->_connectionID = false;
 			$this->_errorno = -1;
@@ -175,6 +188,16 @@ function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persis
 			//$this->_connectionID->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_SILENT );
 			$this->_connectionID->setAttribute(PDO::ATTR_CASE,$m);
 
+			// Now merge in any provided attributes for PDO
+			foreach ($this->connectionParameters as $options) {
+				foreach($options as $k=>$v) {
+					if ($this->debug) {
+						ADOconnection::outp('Setting attribute: ' . $k . ' to ' . $v);
+					}
+					$this->_connectionID->setAttribute($k,$v);
+				}
+			}
+
 			$class = 'ADODB_pdo_'.$this->dsnType;
 			//$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
 			switch($this->dsnType) {
@@ -184,6 +207,8 @@ function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persis
 				case 'pgsql':
 				case 'sqlite':
 				case 'sqlsrv':
+				case 'firebird':
+				case 'dblib':
 					include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
 					break;
 			}
@@ -210,10 +235,7 @@ function 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);
+		return call_user_func_array('parent::Concat', $args);
 	}
 
 	// returns true or false
@@ -251,6 +273,64 @@ function MetaColumns($table,$normalize=true)
 		return $this->_driver->MetaColumns($table,$normalize);
 	}
 
+	public function metaIndexes($table,$normalize=true,$owner=false)
+	{
+		if (method_exists($this->_driver,'metaIndexes'))
+			return $this->_driver->metaIndexes($table,$normalize,$owner);
+	}
+
+	/**
+	 * Return a list of Primary Keys for a specified table.
+	 *
+	 * @param string   $table
+	 * @param bool     $owner      (optional) not used in this driver
+	 *
+	 * @return string[]    Array of indexes
+	 */
+	public function metaPrimaryKeys($table,$owner=false)
+	{
+		if (method_exists($this->_driver,'metaPrimaryKeys'))
+			return $this->_driver->metaPrimaryKeys($table,$owner);
+	}
+
+	/**
+	 * Returns a list of Foreign Keys for a specified table.
+	 *
+	 * @param string   $table
+	 * @param bool     $owner      (optional) not used in this driver
+	 * @param bool     $upper
+	 * @param bool     $associative
+	 *
+	 * @return string[] where keys are tables, and values are foreign keys
+	 */
+	public function metaForeignKeys($table, $owner=false, $upper=false,$associative=false) {
+		if (method_exists($this->_driver,'metaForeignKeys'))
+			return $this->_driver->metaForeignKeys($table,$owner,$upper,$associative);
+	}
+
+	/**
+	 * 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 false|array false if not supported, or array of procedures on current database with structure below
+	 *         Array(
+	 *           [name_of_procedure] => Array(
+	 *             [type] => PROCEDURE or FUNCTION
+	 *             [catalog] => Catalog_name
+	 *             [schema] => Schema_name
+	 *             [remarks] => explanatory comment on the procedure
+	 *           )
+	 *         )
+	 */
+	public function metaProcedures($procedureNamePattern = null, $catalog  = null, $schemaPattern  = null) {
+		if (method_exists($this->_driver,'metaProcedures'))
+			return $this->_driver->metaProcedures($procedureNamePattern,$catalog,$schemaPattern);
+		return false;
+	}
+
 	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 	{
 		$obj = $stmt[1];
@@ -335,16 +415,16 @@ function ErrorNo()
 		return $err;
 	}
 
-    /**
-     * @param bool $auto_commit
-     * @return void
-     */
+	/**
+	 * @param bool $auto_commit
+	 * @return void
+	 */
 	function SetAutoCommit($auto_commit)
-    {
-        if(method_exists($this->_driver, 'SetAutoCommit')) {
-            $this->_driver->SetAutoCommit($auto_commit);
-        }
-    }
+	{
+		if(method_exists($this->_driver, 'SetAutoCommit')) {
+			$this->_driver->SetAutoCommit($auto_commit);
+		}
+	}
 
 	function SetTransactionMode($transaction_mode)
 	{
@@ -352,13 +432,13 @@ function SetTransactionMode($transaction_mode)
 			return $this->_driver->SetTransactionMode($transaction_mode);
 		}
 
-		return parent::SetTransactionMode($seqname);
+		return parent::SetTransactionMode($transaction_mode);
 	}
 
-	function BeginTrans()
+	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) {
@@ -374,10 +454,11 @@ function BeginTrans()
 		return $this->_connectionID->beginTransaction();
 	}
 
-	function CommitTrans($ok=true)
+	function commitTrans($ok=true)
 	{
-		if(method_exists($this->_driver, 'CommitTrans')) {
-			return $this->_driver->CommitTrans($ok);
+
+		if(method_exists($this->_driver, 'commitTrans')) {
+			return $this->_driver->commitTrans($ok);
 		}
 
 		if (!$this->hasTransactions) {
@@ -387,7 +468,7 @@ function CommitTrans($ok=true)
 			return true;
 		}
 		if (!$ok) {
-			return $this->RollbackTrans();
+			return $this->rollbackTrans();
 		}
 		if ($this->transCnt) {
 			$this->transCnt -= 1;
@@ -441,10 +522,10 @@ function PrepareStmt($sql)
 		return $obj;
 	}
 
-	function CreateSequence($seqname='adodbseq',$startID=1)
+	public function createSequence($seqname='adodbseq',$startID=1)
 	{
-		if(method_exists($this->_driver, 'CreateSequence')) {
-			return $this->_driver->CreateSequence($seqname, $startID);
+		if(method_exists($this->_driver, 'createSequence')) {
+			return $this->_driver->createSequence($seqname, $startID);
 		}
 
 		return parent::CreateSequence($seqname, $startID);
@@ -478,11 +559,16 @@ function _query($sql,$inputarr=false)
 		} else {
 			$stmt = $this->_connectionID->prepare($sql);
 		}
-		#adodb_backtrace();
-		#var_dump($this->_bindInputArray);
+
 		if ($stmt) {
-			$this->_driver->debug = $this->debug;
+			if ($this->_driver instanceof ADODB_pdo) {
+				$this->_driver->debug = $this->debug;
+			}
 			if ($inputarr) {
+				/*
+				* inputarr must be numeric
+				*/
+				$inputarr = array_values($inputarr);
 				$ok = $stmt->execute($inputarr);
 			}
 			else {
@@ -526,32 +612,30 @@ function _affectedrows()
 		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
 	}
 
-	function _insertid()
+	protected function _insertID($table = '', $column = '')
 	{
 		return ($this->_connectionID) ? $this->_connectionID->lastInsertId() : 0;
 	}
 
 	/**
 	 * Quotes a string to be sent to the database.
+	 *
 	 * If we have an active connection, delegates quoting to the underlying
-	 * PDO object. Otherwise, replace "'" by the value of $replaceQuote (same
-	 * behavior as mysqli driver)
-	 * @param string  $s            The string to quote
-	 * @param boolean $magic_quotes If false, use PDO::quote().
+	 * PDO object PDO::quote(). Otherwise, replace "'" by the value of
+	 * $replaceQuote (same behavior as mysqli driver).
+	 *
+	 * @param string  $s           The string to quote
+	 * @param bool   $magic_quotes This param is not used since 5.21.0.
+	 *                             It remains for backwards compatibility.
+	 *
 	 * @return string Quoted string
 	 */
-	function qstr($s, $magic_quotes = false)
+	function qStr($s, $magic_quotes = false)
 	{
-		if (!$magic_quotes) {
-			if ($this->_connectionID) {
-				return $this->_connectionID->quote($s);
-			}
-			return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
+		if ($this->_connectionID) {
+			return $this->_connectionID->quote($s);
 		}
-
-		// undo magic quotes for "
-		$s = str_replace('\\"', '"', $s);
-		return "'$s'";
+		return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
 	}
 
 }
@@ -746,22 +830,22 @@ function FetchField($fieldOffset = -1)
 		}
 		//adodb_pr($arr);
 		$o->name = $arr['name'];
-		if (isset($arr['sqlsrv:decl_type']) && $arr['sqlsrv:decl_type'] <> "null") 
+		if (isset($arr['sqlsrv:decl_type']) && $arr['sqlsrv:decl_type'] <> "null")
 		{
 		    /*
 		    * If the database is SQL server, use the native built-ins
 		    */
 		    $o->type = $arr['sqlsrv:decl_type'];
 		}
-		elseif (isset($arr['native_type']) && $arr['native_type'] <> "null") 
+		elseif (isset($arr['native_type']) && $arr['native_type'] <> "null")
 		{
 		    $o->type = $arr['native_type'];
 		}
-		else 
+		else
 		{
 		     $o->type = adodb_pdo_type($arr['pdo_type']);
 		}
-		
+
 		$o->max_length = $arr['len'];
 		$o->precision = $arr['precision'];
 
@@ -813,3 +897,5 @@ function Fields($colname)
 	}
 
 }
+
+class ADORecordSet_array_pdo extends ADORecordSet_array {}
diff --git a/vendor/adodb/adodb-php/drivers/adodb-pdo_dblib.inc.php b/vendor/adodb/adodb-php/drivers/adodb-pdo_dblib.inc.php
new file mode 100644
index 0000000000..aae561bf59
--- /dev/null
+++ b/vendor/adodb/adodb-php/drivers/adodb-pdo_dblib.inc.php
@@ -0,0 +1,190 @@
+ '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 = "SELECT c.NAME, OBJECT_NAME(c.id) as tbl_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), ISNULL(i.is_primary_key, 0) as primary_key FROM   syscolumns c INNER JOIN systypes t ON t.xusertype=c.xusertype INNER JOIN sysobjects o ON o.id=c.id LEFT JOIN sys.index_columns ic ON ic.object_id = c.id AND c.colid = ic.column_id LEFT JOIN sys.indexes i ON i.object_id = ic.object_id AND i.index_id = ic.index_id WHERE c.id = OBJECT_ID('%s') ORDER by c.colid";
+
+	function _init(ADODB_pdo $parentDriver)
+	{
+		$parentDriver->hasTransactions = true;
+		$parentDriver->_bindInputArray = true;
+		$parentDriver->hasInsertID = true;
+		$parentDriver->fmtTimeStamp = "'Y-m-d H:i:s'";
+		$parentDriver->fmtDate = "'Y-m-d'";
+	}
+
+	function BeginTrans()
+	{
+		$returnval = parent::BeginTrans();
+		return $returnval;
+	}
+
+	function MetaColumns($table, $normalize=true)
+	{
+		$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();
+			$fld->name = $rs->fields[0];
+			$fld->type = $rs->fields[1];
+			$fld->primary_key = $rs->fields[7];
+
+			$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
+
+			if (isset($rs->fields[5]) && $rs->fields[5]) {
+				if ($rs->fields[5]>0) $fld->max_length = $rs->fields[5];
+				$fld->scale = $rs->fields[6];
+				if ($fld->scale>0) $fld->max_length += 1;
+			} else
+				$fld->max_length = $rs->fields[2];
+
+			if ($save == ADODB_FETCH_NUM) {
+				$retarr[] = $fld;
+			} else {
+				$retarr[strtoupper($fld->name)] = $fld;
+			}
+			$rs->MoveNext();
+		}
+
+		$rs->Close();
+		return $retarr;
+	}
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(($mask));
+			$this->metaTablesSQL .= " AND name like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+
+	function 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;
+	}
+
+	function _query($sql,$inputarr=false)
+	{
+		$this->_connectionID->setAttribute(\PDO::ATTR_EMULATE_PREPARES , true);
+		if (is_array($sql)) {
+			$stmt = $sql[1];
+		} else {
+			$stmt = $this->_connectionID->prepare($sql);
+		}
+
+		if ($stmt) {
+			$this->_driver->debug = $this->debug;
+			if ($inputarr) {
+				foreach ($inputarr as $key => $value) {
+					if(gettype($key) == 'integer') {
+						$key += 1;
+					}
+					$stmt->bindValue($key, $value, $this->GetPDODataType($value));
+				}
+			}
+		}
+
+		$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];
+				$this->_errorno = $arr[1];
+			}
+
+		} else {
+			$this->_errormsg = false;
+			$this->_errorno = false;
+		}
+		return false;
+	}
+
+	private function GetPDODataType($var)
+	{
+		if(gettype($var) == 'integer') {
+			return PDO::PARAM_INT ;
+		}
+		return PDO::PARAM_STR;
+	}
+
+	function ServerInfo()
+	{
+		return ADOConnection::ServerInfo();
+	}
+}
diff --git a/vendor/adodb/adodb-php/drivers/adodb-pdo_firebird.inc.php b/vendor/adodb/adodb-php/drivers/adodb-pdo_firebird.inc.php
new file mode 100644
index 0000000000..0ee5e02b6c
--- /dev/null
+++ b/vendor/adodb/adodb-php/drivers/adodb-pdo_firebird.inc.php
@@ -0,0 +1,452 @@
+pdoDriver = $parentDriver;
+		//$parentDriver->_bindInputArray = true;
+		//$parentDriver->hasTransactions = false; // // should be set to false because of PDO SQLite driver not supporting changing autocommit mode
+		//$parentDriver->hasInsertID = true;
+	}
+
+	/**
+	 * Gets the version iformation from the server
+	 *
+	 * @return string[]
+	 */
+	public function serverInfo()
+	{
+		$arr['dialect'] = $this->dialect;
+		switch ($arr['dialect']) {
+			case '':
+			case '1':
+				$s = 'Firebird Dialect 1';
+				break;
+			case '2':
+				$s = 'Firebird Dialect 2';
+				break;
+			default:
+			case '3':
+				$s = 'Firebird Dialect 3';
+				break;
+		}
+		$arr['version'] = ADOConnection::_findvers($s);
+		$arr['description'] = $s;
+		return $arr;
+	}
+
+	/**
+	 * Returns the tables in the database.
+	 *
+	 * @param mixed $ttype
+	 * @param bool  $showSchema
+	 * @param mixed $mask
+	 *
+	 * @return    string[]
+	 */
+	public function metaTables($ttype = false, $showSchema = false, $mask = false)
+	{
+		$ret = ADOConnection::MetaTables($ttype, $showSchema);
+
+		return $ret;
+	}
+
+	public 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;
+
+		if ($rs === false) {
+			return false;
+		}
+
+		$retarr = array();
+		$dialect3 = $this->dialect == 3;
+		while (!$rs->EOF) { //print_r($rs->fields);
+			$fld = new ADOFieldObject();
+			$fld->name = trim($rs->fields[0]);
+			$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 'blob':
+					case 'text':
+					case 'varchar':
+						$fld->default_value = (string)substr($d, 1, strlen($d) - 2);
+						break;
+					case 'double':
+					case 'float':
+						$fld->default_value = (float)$d;
+						break;
+					default:
+						$fld->default_value = $d;
+						break;
+				}
+			}
+			if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
+				$fld->sub_type = $rs->fields[5];
+			} else {
+				$fld->sub_type = null;
+			}
+			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;
+		}
+	}
+
+	public function metaIndexes($table, $primary = false, $owner = false)
+	{
+		// save old fetch mode
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) {
+			$savem = $this->SetFetchMode(false);
+		}
+		$table = strtoupper($table);
+		$sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '" . $table . "'";
+		if (!$primary) {
+			$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
+		} else {
+			$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
+		}
+
+		// get index details
+		$rs = $this->Execute($sql);
+		if (!is_object($rs)) {
+			// restore fetchmode
+			if (isset($savem)) {
+				$this->SetFetchMode($savem);
+			}
+			$ADODB_FETCH_MODE = $save;
+			return false;
+		}
+
+		$indexes = array();
+		while ($row = $rs->FetchRow()) {
+			$index = $row[0];
+			if (!isset($indexes[$index])) {
+				if (is_null($row[3])) {
+					$row[3] = 0;
+				}
+				$indexes[$index] = array(
+					'unique' => ($row[3] == 1),
+					'columns' => array()
+				);
+			}
+			$sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '" . $index . "' ORDER BY RDB\$FIELD_POSITION ASC";
+			$rs1 = $this->Execute($sql);
+			while ($row1 = $rs1->FetchRow()) {
+				$indexes[$index]['columns'][$row1[2]] = $row1[1];
+			}
+		}
+		// restore fetchmode
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		return $indexes;
+	}
+
+	public function metaPrimaryKeys($table, $owner_notused = false, $internalKey = false)
+	{
+		if ($internalKey) {
+			return array('RDB$DB_KEY');
+		}
+
+		$table = strtoupper($table);
+
+		$sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
+	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME
+	WHERE I.RDB$RELATION_NAME=\'' . $table . '\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
+	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
+
+		$a = $this->GetCol($sql, false, true);
+		if ($a && sizeof($a) > 0) {
+			return $a;
+		}
+		return false;
+	}
+
+	public function createSequence($seqname = 'adodbseq', $startID = 1)
+	{
+		$ok = $this->execute("CREATE SEQUENCE $seqname");
+		if (!$ok) {
+			return false;
+		}
+
+		return $this->execute("ALTER SEQUENCE $seqname RESTART WITH " . ($startID - 1));
+	}
+
+	public function dropSequence($seqname = 'adodbseq')
+	{
+		$seqname = strtoupper($seqname);
+		return $this->Execute("DROP SEQUENCE $seqname");
+	}
+
+
+	public function _affectedrows()
+	{
+		return fbird_affected_rows($this->_transactionID ? $this->_transactionID : $this->_connectionID);
+	}
+
+	public function genId($seqname = 'adodbseq', $startID = 1)
+	{
+		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
+		$rs = @$this->execute($getnext);
+		if (!$rs) {
+			$this->execute(("CREATE SEQUENCE $seqname"));
+			$this->execute("ALTER SEQUENCE $seqname RESTART WITH " . ($startID - 1) . ';');
+			$rs = $this->execute($getnext);
+		}
+		if ($rs && !$rs->EOF) {
+			$this->genID = (integer)reset($rs->fields);
+		} else {
+			$this->genID = 0; // false
+		}
+
+		if ($rs) {
+			$rs->Close();
+		}
+
+		return $this->genID;
+	}
+
+	public 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 ";
+		}
+		$str .= ($offset >= 0) ? "SKIP $offset " : '';
+
+		$sql = preg_replace('/^[ \t]*select/i', $str, $sql);
+		if ($secs) {
+			$rs = $this->cacheExecute($secs, $sql, $inputarr);
+		} else {
+			$rs = $this->execute($sql, $inputarr);
+		}
+
+		return $rs;
+	}
+
+	/**
+	 * Sets the appropriate type into the $fld variable
+	 *
+	 * @param ADOFieldObject $fld By reference
+	 * @param int            $ftype
+	 * @param int            $flen
+	 * @param int            $fscale
+	 * @param int            $fsubtype
+	 * @param int            $fprecision
+	 * @param bool           $dialect3
+	 */
+	private function _convertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
+	{
+		$fscale = abs($fscale);
+		$fld->max_length = $flen;
+		$fld->scale = null;
+		switch ($ftype) {
+			case 7:
+			case 8:
+				if ($dialect3) {
+					switch ($fsubtype) {
+						case 0:
+							$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
+							break;
+						case 1:
+							$fld->type = 'numeric';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+							break;
+						case 2:
+							$fld->type = 'decimal';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+							break;
+					} // switch
+				} else {
+					if ($fscale != 0) {
+						$fld->type = 'decimal';
+						$fld->scale = $fscale;
+						$fld->max_length = ($ftype == 7 ? 4 : 9);
+					} else {
+						$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
+					}
+				}
+				break;
+			case 16:
+				if ($dialect3) {
+					switch ($fsubtype) {
+						case 0:
+							$fld->type = 'decimal';
+							$fld->max_length = 18;
+							$fld->scale = 0;
+							break;
+						case 1:
+							$fld->type = 'numeric';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+							break;
+						case 2:
+							$fld->type = 'decimal';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+							break;
+					} // switch
+				}
+				break;
+			case 10:
+				$fld->type = 'float';
+				break;
+			case 14:
+				$fld->type = 'char';
+				break;
+			case 27:
+				if ($fscale != 0) {
+					$fld->type = 'decimal';
+					$fld->max_length = 15;
+					$fld->scale = 5;
+				} else {
+					$fld->type = 'double';
+				}
+				break;
+			case 35:
+				if ($dialect3) {
+					$fld->type = 'timestamp';
+				} else {
+					$fld->type = 'date';
+				}
+				break;
+			case 12:
+				$fld->type = 'date';
+				break;
+			case 13:
+				$fld->type = 'time';
+				break;
+			case 37:
+				$fld->type = 'varchar';
+				break;
+			case 40:
+				$fld->type = 'cstring';
+				break;
+			case 261:
+				$fld->type = 'blob';
+				$fld->max_length = -1;
+				break;
+		} // switch
+	}
+}
+
+/**
+ * Class ADORecordSet_pdo_firebird
+ */
+class ADORecordSet_pdo_firebird extends ADORecordSet_pdo
+{
+
+	public $databaseType = "pdo_firebird";
+
+	/**
+	 * returns the field object
+	 *
+	 * @param int $fieldOffset Optional field offset
+	 *
+	 * @return object The ADOFieldObject describing the field
+	 */
+	public function fetchField($fieldOffset = 0)
+	{
+	}
+}
+
+/**
+ * Class ADORecordSet_array_pdo_firebird
+ */
+class ADORecordSet_array_pdo_firebird extends ADORecordSet_array_pdo
+{
+	public $databaseType = "pdo_firebird";
+	public $canSeek = true;
+
+	/**
+	 * returns the field object
+	 *
+	 * @param int $fieldOffset Optional field offset
+	 *
+	 * @return object The ADOFieldObject describing the field
+	 */
+	public function fetchField($fieldOffset = 0)
+	{
+
+		$fld = new ADOFieldObject;
+		$fld->name = $fieldOffset;
+		$fld->type = 'C';
+		$fld->max_length = 0;
+
+		// This needs to be populated from the metadata
+		$fld->not_null = false;
+		$fld->has_default = false;
+		$fld->default_value = 'null';
+
+		return $fld;
+	}
+}
diff --git a/vendor/adodb/adodb-php/drivers/adodb-pdo_mssql.inc.php b/vendor/adodb/adodb-php/drivers/adodb-pdo_mssql.inc.php
index b59f79b070..ef63b654ae 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-pdo_mssql.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-pdo_mssql.inc.php
@@ -1,16 +1,23 @@
 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;
+	}
 
 	function Concat()
 	{
@@ -204,7 +277,7 @@ function SelectLimit($sql, $nrows=-1, $offset=-1, $inputarr=false, $secs=0)
 		$nrows = (int) $nrows;
 		$offset = (int) $offset;		
 		$offsetStr =($offset>=0) ? "$offset," : '';
-		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
+		// jason judge, see PHPLens Issue No: 9220
 		if ($nrows < 0) {
 			$nrows = '18446744073709551615';
 		}
@@ -310,4 +383,41 @@ function SQLDate($fmt, $col=false)
 		}
 		return $s;
 	}
+
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		$holdtransOK = $this->_transOK; // save the current status
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
+			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
+			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
+			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+			$rs = $this->Execute($getnext);
+		}
+
+		if ($rs) {
+			$this->genID = $this->_connectionID->lastInsertId($seqname);
+			$rs->Close();
+		} else {
+			$this->genID = 0;
+		}
+
+		return $this->genID;
+	}
+
+
+	function createSequence($seqname='adodbseq',$startID=1)
+	{
+		if (empty($this->_genSeqSQL)) {
+			return false;
+		}
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
+		if (!$ok) {
+			return false;
+		}
+
+		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+	}
 }
diff --git a/vendor/adodb/adodb-php/drivers/adodb-pdo_oci.inc.php b/vendor/adodb/adodb-php/drivers/adodb-pdo_oci.inc.php
index 7fd2a3d3bb..9a05ee6a9c 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-pdo_oci.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-pdo_oci.inc.php
@@ -1,16 +1,23 @@
 hasTransactions) {
+			return false;
+		}
+		if ($this->transOff) {
+			return true;
+		}
+		$this->transCnt += 1;
+
+		return $this->_connectionID->beginTransaction();
+	}
+
+	function CommitTrans($ok = true)
+	{
+		if (!$this->hasTransactions) {
+			return false;
+		}
+		if ($this->transOff) {
+			return true;
+		}
+		if (!$ok) {
+			return $this->RollbackTrans();
+		}
+		if ($this->transCnt) {
+			$this->transCnt -= 1;
+		}
+		$this->_autocommit = true;
+
+		$ret = $this->_connectionID->commit();
+		return $ret;
+	}
+
+	function RollbackTrans()
+	{
+		if (!$this->hasTransactions) {
+			return false;
+		}
+		if ($this->transOff) {
+			return true;
+		}
+		if ($this->transCnt) {
+			$this->transCnt -= 1;
+		}
+		$this->_autocommit = true;
+
+		$ret = $this->_connectionID->rollback();
+		return $ret;
+	}
+
+	function SetTransactionMode( $transaction_mode )
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->_connectionID->query('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->_connectionID->query("SET TRANSACTION ".$transaction_mode);
+	}
 }
diff --git a/vendor/adodb/adodb-php/drivers/adodb-pdo_sqlite.inc.php b/vendor/adodb/adodb-php/drivers/adodb-pdo_sqlite.inc.php
index d45f1f160f..b62ca35ed9 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-pdo_sqlite.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-pdo_sqlite.inc.php
@@ -1,19 +1,25 @@
 
+ * @author Sid Dunayer 
+ */
 
 class ADODB_pdo_sqlite extends ADODB_pdo {
 	var $metaTablesSQL   = "SELECT name FROM sqlite_master WHERE type='table'";
diff --git a/vendor/adodb/adodb-php/drivers/adodb-pdo_sqlsrv.inc.php b/vendor/adodb/adodb-php/drivers/adodb-pdo_sqlsrv.inc.php
index 869e8e1813..ed73f3a247 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-pdo_sqlsrv.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-pdo_sqlsrv.inc.php
@@ -1,14 +1,31 @@
 _queryID->getColumnMeta($fieldOffset);
+
+		if (!$arr) {
+			$o->name = 'bad getColumnMeta()';
+			$o->max_length = -1;
+			$o->type = 'VARCHAR';
+			$o->precision = 0;
+			return $o;
+		}
+		$o->name = $arr['name'];
+		if (isset($arr['sqlsrv:decl_type']) && $arr['sqlsrv:decl_type'] <> "null") {
+			// Use the SQL Server driver specific value
+			$o->type = $arr['sqlsrv:decl_type'];
+		} else {
+			$o->type = adodb_pdo_type($arr['pdo_type']);
+		}
+		$o->max_length = $arr['len'];
+		$o->precision = $arr['precision'];
+
+		switch (ADODB_ASSOC_CASE) {
+			case ADODB_ASSOC_CASE_LOWER:
+				$o->name = strtolower($o->name);
+				break;
+			case ADODB_ASSOC_CASE_UPPER:
+				$o->name = strtoupper($o->name);
+				break;
+		}
+
+		return $o;
+	}
+}
+
+class ADORecordSet_array_pdo_sqlsrv extends ADORecordSet_array_pdo
+{
+
+	/**
+	 * returns the field object
+	 *
+	 * Note that this is a direct copy of the ADORecordSet_pdo_sqlsrv method
+	 *
+	 * @param  int $fieldOffset Optional field offset
+	 *
+	 * @return object The ADOfieldobject describing the field
+	 */
+	public function fetchField($fieldOffset = 0)
+	{
+		// Default behavior allows passing in of -1 offset, which crashes the method
+		if ($fieldOffset == -1) {
+			$fieldOffset++;
+		}
 
+		$o = new ADOFieldObject();
+		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
+
+		if (!$arr) {
+			$o->name = 'bad getColumnMeta()';
+			$o->max_length = -1;
+			$o->type = 'VARCHAR';
+			$o->precision = 0;
+			return $o;
+		}
+		$o->name = $arr['name'];
+		if (isset($arr['sqlsrv:decl_type']) && $arr['sqlsrv:decl_type'] <> "null") {
+			// Use the SQL Server driver specific value
+			$o->type = $arr['sqlsrv:decl_type'];
+		} else {
+			$o->type = adodb_pdo_type($arr['pdo_type']);
+		}
+		$o->max_length = $arr['len'];
+		$o->precision = $arr['precision'];
+
+		switch (ADODB_ASSOC_CASE) {
+			case ADODB_ASSOC_CASE_LOWER:
+				$o->name = strtolower($o->name);
+				break;
+			case ADODB_ASSOC_CASE_UPPER:
+				$o->name = strtoupper($o->name);
+				break;
+		}
+
+		return $o;
+	}
+	
+	function SetTransactionMode( $transaction_mode )
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->_connectionID->query('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->_connectionID->query("SET TRANSACTION ".$transaction_mode);
+	}
 }
diff --git a/vendor/adodb/adodb-php/drivers/adodb-postgres.inc.php b/vendor/adodb/adodb-php/drivers/adodb-postgres.inc.php
index 7c2f562740..070ac1c7c8 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-postgres.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-postgres.inc.php
@@ -1,14 +1,25 @@
 
-			  jlim - changed concat operator to || and data types to MetaType to match documented pgsql types
-					 see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm
-  22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" 
-  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" 
-  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk.
-  31 Jan 2002 jlim - finally installed postgresql. testing
-  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-
-  See http://www.varlena.com/varlena/GeneralBits/47.php
-
-	-- What indexes are on my table?
-	select * from pg_indexes where tablename = 'tablename';
-
-	-- What triggers are on my table?
-	select c.relname as "Table", t.tgname as "Trigger Name",
-	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
-	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
-	   p.proname as "Function Name"
-	from pg_trigger t, pg_class c, pg_class cc, pg_proc p
-	where t.tgfoid = p.oid and t.tgrelid = c.oid
-	   and t.tgconstrrelid = cc.oid
-	   and c.relname = 'tablename';
-
-	-- What constraints are on my table?
-	select r.relname as "Table", c.conname as "Constraint Name",
-	   contype as "Constraint Type", conkey as "Key Columns",
-	   confkey as "Foreign Columns", consrc as "Source"
-	from pg_class r, pg_constraint c
-	where r.oid = c.conrelid
-	   and relname = 'tablename';
-
-*/
+/**
+ * ADOdb PostgreSQL 6.4 driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -114,6 +89,7 @@ class ADODB_postgres64 extends ADOConnection{
 	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 int $_pnum Number of the last assigned query parameter {@see param()} */
 	var $_pnum = 0;
 
 	// The last (fmtTimeStamp is not entirely correct:
@@ -124,19 +100,40 @@ class ADODB_postgres64 extends ADOConnection{
 	// to know what the concequences are. The other values are correct (wheren't in 0.94)
 	// -- Freek Dijkstra
 
-	function __construct()
+	/**
+	 * Retrieve Server information.
+	 * In addition to server version and description, the function also returns
+	 * the client version.
+	 * @param bool $detailed If true, retrieve detailed version string (executes
+	 *                       a SQL query) in addition to the version number
+	 * @return array|bool Server info or false if version could not be retrieved
+	 *                    e.g. if there is no active connection
+	 */
+	function ServerInfo($detailed = true)
 	{
-		// changes the metaColumnsSQL, adds columns: attnum[6]
-	}
+		if (empty($this->version['version'])) {
+			// We don't have a connection, so we can't retrieve server info
+			if (!$this->_connectionID) {
+				return false;
+			}
 
-	function ServerInfo()
-	{
-		if (isset($this->version)) return $this->version;
+			$version = pg_version($this->_connectionID);
+			$this->version = array(
+				// If PHP has been compiled with PostgreSQL 7.3 or lower, then
+				// server version is not set so we use pg_parameter_status()
+				// which includes logic to obtain values server_version
+				'version' => isset($version['server'])
+					? $version['server']
+					: pg_parameter_status($this->_connectionID, 'server_version'),
+				'client' => $version['client'],
+				'description' => null,
+			);
+		}
+		if ($detailed && $this->version['description'] === null) {
+			$this->version['description'] = $this->GetOne('select version()');
+		}
 
-		$arr['description'] = $this->GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		$this->version = $arr;
-		return $arr;
+		return $this->version;
 	}
 
 	function IfNull( $field, $ifNull )
@@ -161,11 +158,13 @@ function pg_insert_id($tablename,$fieldname)
 	 * 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.
+	 *
+	 * @inheritDoc
 	 */
-	function _insertid($table,$column)
+	protected function _insertID($table = '', $column = '')
 	{
 		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-		$oid = pg_getlastoid($this->_resultid);
+		$oid = pg_last_oid($this->_resultid);
 		// to really return the id, we need the table and column-name, else we can only return the oid != id
 		return empty($table) || empty($column) ? $oid : $this->GetOne("SELECT $column FROM $table WHERE oid=".(int)$oid);
 	}
@@ -243,31 +242,32 @@ function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	}
 
 
-	// if magic quotes disabled, use pg_escape_string()
-	function qstr($s,$magic_quotes=false)
+	/**
+	 * Quotes a string to be sent to the database.
+	 *
+	 * Relies on pg_escape_string()
+	 * @link https://adodb.org/dokuwiki/doku.php?id=v5:reference:connection:qstr
+	 *
+	 * @param string $s            The string to quote
+	 * @param bool   $magic_quotes This param is not used since 5.21.0.
+	 *                             It remains for backwards compatibility.
+	 *
+	 * @return string Quoted 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)."'";
+		if (is_bool($s)) {
+			return $s ? 'true' : 'false';
 		}
 
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
+		if ($this->_connectionID) {
+			return "'" . pg_escape_string($this->_connectionID, $s) . "'";
+		} else {
+			return "'" . pg_escape_string($s) . "'";
+		}
 	}
 
 
-
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
 	{
@@ -393,7 +393,7 @@ function BlobDelete( $blob )
 	}
 
 	/*
-		Hueristic - not guaranteed to work.
+		Heuristic - not guaranteed to work.
 	*/
 	function GuessOID($oid)
 	{
@@ -425,29 +425,25 @@ function BlobDecode($blob,$maxsize=false,$hastrans=true)
 		}
 		if (!$maxsize) $maxsize = $this->maxblobsize;
 		$realblob = @pg_lo_read($fd,$maxsize);
-		@pg_loclose($fd);
+		@pg_lo_close($fd);
 		if ($hastrans) pg_query($this->_connectionID,'commit');
 		return $realblob;
 	}
 
-	/*
-		See http://www.postgresql.org/idocs/index.php?datatype-binary.html
-
-		NOTE: SQL string literals (input strings) must be preceded with two backslashes
-		due to the fact that they must pass through two parsers in the PostgreSQL
-		backend.
-	*/
+	/**
+	 * Encode binary value prior to DB storage.
+	 *
+	 * See https://www.postgresql.org/docs/current/static/datatype-binary.html
+	 *
+	 * NOTE: SQL string literals (input strings) must be preceded with two
+	 * backslashes due to the fact that they must pass through two parsers in
+	 * the PostgreSQL backend.
+	 *
+	 * @param string $blob
+	 */
 	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
+		return pg_escape_bytea($this->_connectionID, $blob);
 	}
 
 	// assumes bytea for blob, and varchar for clob
@@ -492,7 +488,7 @@ protected function _generateMetaColumnsSQL($table, $schema)
 
 	// 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
+	// see PHPLens Issue No: 14018 for more info
 	function MetaColumns($table,$normalize=true)
 	{
 		global $ADODB_FETCH_MODE;
@@ -606,15 +602,18 @@ function MetaColumns($table,$normalize=true)
 
 	}
 
-	function Param($name,$type='C')
+	function param($name, $type='C')
 	{
-		if ($name) {
-			$this->_pnum += 1;
-		} else {
-			// Reset param num if $name is false
-			$this->_pnum = 1;
+		if (!$name) {
+			// Reset parameter number if $name is falsy
+			$this->_pnum = 0;
+			if ($name === false) {
+				// and don't return placeholder if false (see #380)
+				return '';
+			}
 		}
-		return '$'.$this->_pnum;
+
+		return '$' . ++$this->_pnum;
 	}
 
 	function MetaIndexes ($table, $primary = FALSE, $owner = false)
@@ -729,9 +728,9 @@ function _connect($str,$user='',$pwd='',$db='',$ctype=0)
 		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
+		$info = $this->ServerInfo(false);
+
+		if (version_compare($info['version'], '7.1', '>=')) {
 			$this->_nestedSQL = true;
 		}
 
@@ -739,7 +738,10 @@ function _connect($str,$user='',$pwd='',$db='',$ctype=0)
 		# 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 ( !empty($this->connection->noBlobs) && version_compare($info['version'], '9.0', '>=')) {
+		if (!empty($this->connection->noBlobs)
+			&& version_compare($info['version'], '9.0', '>=')
+			&& version_compare($info['client'], '9.2', '<')
+		) {
 			$this->Execute('set bytea_output=escape');
 		}
 
@@ -848,20 +850,23 @@ function _errconnect()
 	/*	Returns: the last error message from previous database operation	*/
 	function ErrorMsg()
 	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-		if (ADODB_PHPVER >= 0x4300) {
-			if (!empty($this->_resultid)) {
-				$this->_errorMsg = @pg_result_error($this->_resultid);
-				if ($this->_errorMsg) return $this->_errorMsg;
+		if ($this->_errorMsg !== false) {
+			return $this->_errorMsg;
+		}
+
+		if (!empty($this->_resultid)) {
+			$this->_errorMsg = @pg_result_error($this->_resultid);
+			if ($this->_errorMsg) {
+				return $this->_errorMsg;
 			}
+		}
 
-			if (!empty($this->_connectionID)) {
-				$this->_errorMsg = @pg_last_error($this->_connectionID);
-			} else $this->_errorMsg = $this->_errconnect();
+		if (!empty($this->_connectionID)) {
+			$this->_errorMsg = @pg_last_error($this->_connectionID);
 		} else {
-			if (empty($this->_connectionID)) $this->_errconnect();
-			else $this->_errorMsg = @pg_errormessage($this->_connectionID);
+			$this->_errorMsg = $this->_errconnect();
 		}
+
 		return $this->_errorMsg;
 	}
 
@@ -946,10 +951,9 @@ function GetRowAssoc($upper = ADODB_ASSOC_CASE)
 		return $row;
 	}
 
-
-	function _initrs()
+	function _initRS()
 	{
-	global $ADODB_COUNTRECS;
+		global $ADODB_COUNTRECS;
 		$qid = $this->_queryID;
 		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_num_rows($qid):-1;
 		$this->_numOfFields = @pg_num_fields($qid);
@@ -964,10 +968,11 @@ function _initrs()
 		}
 	}
 
-		/* Use associative array to get fields array */
-	function Fields($colname)
+	function fields($colname)
 	{
-		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
+		if ($this->fetchMode != PGSQL_NUM) {
+			return @$this->fields[$colname];
+		}
 
 		if (!$this->bind) {
 			$this->bind = array();
@@ -979,14 +984,14 @@ function Fields($colname)
 		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
-	function FetchField($off = 0)
+	function fetchField($fieldOffset = 0)
 	{
 		// offsets begin at 0
 
-		$o= new ADOFieldObject();
-		$o->name = @pg_field_name($this->_queryID,$off);
-		$o->type = @pg_field_type($this->_queryID,$off);
-		$o->max_length = @pg_fieldsize($this->_queryID,$off);
+		$o = new ADOFieldObject();
+		$o->name = @pg_field_name($this->_queryID, $fieldOffset);
+		$o->type = @pg_field_type($this->_queryID, $fieldOffset);
+		$o->max_length = @pg_field_size($this->_queryID, $fieldOffset);
 		return $o;
 	}
 
@@ -998,7 +1003,7 @@ function _seek($row)
 	function _decode($blob)
 	{
 		if ($blob === NULL) return NULL;
-//		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
+//		eval('$realblob="'.str_replace(array('"','$'),array('\"','\$'),$blob).'";');
 		return pg_unescape_bytea($blob);
 	}
 
@@ -1049,7 +1054,12 @@ function _fetch()
 
 	function _close()
 	{
-		return @pg_free_result($this->_queryID);
+		if (!is_resource($this->_queryID)
+			|| get_resource_type($this->_queryID) != 'pgsql result'
+		) {
+			return true;
+		}
+		return pg_free_result($this->_queryID);
 	}
 
 	function MetaType($t,$len=-1,$fieldobj=false)
@@ -1068,6 +1078,7 @@ function MetaType($t,$len=-1,$fieldobj=false)
 				case 'NAME':
 				case 'BPCHAR':
 				case '_VARCHAR':
+				case 'CIDR':
 				case 'INET':
 				case 'MACADDR':
 					if ($len <= $this->blobSize) return 'C';
@@ -1111,7 +1122,7 @@ function MetaType($t,$len=-1,$fieldobj=false)
 					return 'R';
 
 				default:
-					return 'N';
+					return ADODB_DEFAULT_METATYPE;
 			}
 	}
 
diff --git a/vendor/adodb/adodb-php/drivers/adodb-postgres7.inc.php b/vendor/adodb/adodb-php/drivers/adodb-postgres7.inc.php
index b7e822e8be..59174f6788 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-postgres7.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-postgres7.inc.php
@@ -1,17 +1,23 @@
 rsPrefix .= 'assoc_';
 		}
-		$this->_bindInputArray = PHP_VERSION >= 5.1;
+		$this->_bindInputArray = true;
 	}
 
 
@@ -269,34 +275,47 @@ function _query($sql,$inputarr=false)
 		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.
-	// GetCharSet - get the name of the character set the client is using now
-	// the functions should work with Postgres 7.0 and above, the set of charsets supported
-	// depends on compile flags of postgres distribution - if no charsets were compiled into the server
-	// it will return 'SQL_ANSI' always
-	function GetCharSet()
+	/**
+	 * Retrieve the client connection's current character set.
+
+	 * If no charsets were compiled into the server, the function will always
+	 * return 'SQL_ASCII'.
+	 * @see https://www.php.net/manual/en/function.pg-client-encoding.php
+	 *
+	 * @return string|false The character set, or false if it can't be determined.
+	 */
+	function getCharSet()
 	{
-		//we will use ADO's builtin property charSet
-		$this->charSet = @pg_client_encoding($this->_connectionID);
-		if (!$this->charSet) {
+		if (!$this->_connectionID) {
 			return false;
-		} else {
-			return $this->charSet;
 		}
+		$this->charSet = pg_client_encoding($this->_connectionID);
+		return $this->charSet ?: false;
 	}
 
-	// SetCharSet - switch the client encoding
-	function SetCharSet($charset_name)
+	/**
+	 * Sets the client-side character set (encoding).
+	 *
+	 * Allows managing client encoding - very important if the database and
+	 * the output target (i.e. HTML) don't match; for instance, you may have a
+	 * UNICODE database and server your pages as WIN1251, etc.
+	 *
+	 * Supported on PostgreSQL 7.0 and above. Available charsets depend on
+	 * PostgreSQL version and the distribution's compile flags.
+	 *
+	 * @param string $charset The character set to switch to.
+	 *
+	 * @return bool True if the character set was changed successfully, false otherwise.
+	 */
+	function setCharSet($charset)
 	{
-		$this->GetCharSet();
-		if ($this->charSet !== $charset_name) {
-			$if = pg_set_client_encoding($this->_connectionID, $charset_name);
-			if ($if == "0" & $this->GetCharSet() == $charset_name) {
-				return true;
-			} else return false;
-		} else return true;
+		if ($this->charSet !== $charset) {
+			if (!$this->_connectionID || pg_set_client_encoding($this->_connectionID, $charset) != 0) {
+				return false;
+			}
+			$this->getCharSet();
+		}
+		return true;
 	}
 
 }
@@ -309,12 +328,6 @@ class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
 
 	var $databaseType = "postgres7";
 
-
-	function __construct($queryID, $mode=false)
-	{
-		parent::__construct($queryID, $mode);
-	}
-
 	// 10% speedup to move MoveNext to child class
 	function MoveNext()
 	{
@@ -341,11 +354,6 @@ class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
 	var $databaseType = "postgres7";
 
 
-	function __construct($queryID, $mode=false)
-	{
-		parent::__construct($queryID, $mode);
-	}
-
 	function _fetch()
 	{
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0) {
diff --git a/vendor/adodb/adodb-php/drivers/adodb-postgres8.inc.php b/vendor/adodb/adodb-php/drivers/adodb-postgres8.inc.php
index d33322cf71..37c2aae141 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-postgres8.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-postgres8.inc.php
@@ -1,15 +1,23 @@
 GetOne("SELECT lastval()")
diff --git a/vendor/adodb/adodb-php/drivers/adodb-postgres9.inc.php b/vendor/adodb/adodb-php/drivers/adodb-postgres9.inc.php
index ad44269b82..fb9c6785e7 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-postgres9.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-postgres9.inc.php
@@ -1,15 +1,23 @@
 curmode = SQL_CUR_USE_ODBC;
-		parent::__construct();
-	}
-
 	function ServerInfo()
 	{
 		$info = ADODB_odbc::ServerInfo();
@@ -55,7 +54,7 @@ function MetaPrimaryKeys($table, $owner = false)
 		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
 	}
 
- 	function MetaIndexes ($table, $primary = FALSE, $owner = false)
+	function MetaIndexes ($table, $primary = FALSE, $owner = false)
 	{
 		$table = $this->Quote(strtoupper($table));
 
@@ -65,43 +64,43 @@ function MetaIndexes ($table, $primary = FALSE, $owner = false)
 
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
+		$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;
+		$rs = $this->Execute($sql);
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
 
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
+		if (!is_object($rs)) {
+			return FALSE;
+		}
 
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
-            $indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
-            $indexes[$row[0]]['columns'][] = $row[2];
-    	}
+			$indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
+			$indexes[$row[0]]['columns'][] = $row[2];
+		}
 		if ($primary) {
 			$indexes['SYSPRIMARYKEYINDEX'] = array(
 					'unique' => True,	// by definition
 					'columns' => $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos"),
 				);
 		}
-        return $indexes;
+		return $indexes;
 	}
 
 	function MetaColumns ($table, $normalize = true)
 	{
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
 		$table = $this->Quote(strtoupper($table));
 
 		$retarr = array();
@@ -134,10 +133,10 @@ function MetaColumns ($table, $normalize = true)
 			}
 			$retarr[$fld->name] = $fld;
 		}
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
 
 		return $retarr;
 	}
@@ -150,7 +149,7 @@ function MetaColumnNames($table, $numIndexes = false, $useattnum = false)
 	}
 
 	// unlike it seems, this depends on the db-session and works in a multiuser environment
-	function _insertid($table,$column)
+	protected function _insertID($table = '', $column = '')
 	{
 		return empty($table) ? False : $this->GetOne("SELECT $table.CURRVAL FROM DUAL");
 	}
@@ -158,13 +157,13 @@ function _insertid($table,$column)
 	/*
 		SelectLimit implementation problems:
 
-	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
-	 	which is not ideal...
+		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
+			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".
+		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
 	 */
@@ -172,14 +171,10 @@ function _insertid($table,$column)
 };
 
 
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {
+class ADORecordSet_sapdb extends ADORecordSet_odbc {
 
 	var $databaseType = "sapdb";
 
-	function __construct($id,$mode=false)
-	{
-		parent::__construct($id,$mode);
-	}
 }
 
 } //define
diff --git a/vendor/adodb/adodb-php/drivers/adodb-sqlanywhere.inc.php b/vendor/adodb/adodb-php/drivers/adodb-sqlanywhere.inc.php
index a8a5024d2e..88897af926 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-sqlanywhere.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-sqlanywhere.inc.php
@@ -1,66 +1,44 @@
 create_blobvar($blobVarName);
-
-	  b) load blob var from file.  $filename must be complete path
-
-	  $dbcon->load_blobvar_from_file($blobVarName, $filename);
-
-	  c) Use the $blobVarName in SQL insert or update statement in the values
-	  clause:
-
-		$recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, blobcol) '
-		.
-	   'VALUES (\'test\', ' . $blobVarName . ')');
-
-	 instead of loading blob from a file, you can also load from
-	  an unformatted (raw) blob variable:
-	  $dbcon->load_blobvar_from_var($blobVarName, $varName);
-
-	  d) drop blob variable on db server to free up resources:
-	  $dbconn->drop_blobvar($blobVarName);
-
-  Sybase_SQLAnywhere data driver. Requires ODBC.
-
-*/
+/**
+ * SAP SQL Anywhere driver (previously Sybase SQL Anywhere)
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 if (!defined('_ADODB_ODBC_LAYER')) {
- include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+ include_once(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
 
 if (!defined('ADODB_SYBASE_SQLANYWHERE')){
 
  define('ADODB_SYBASE_SQLANYWHERE',1);
 
- class ADODB_sqlanywhere extends ADODB_odbc {
-  	var $databaseType = "sqlanywhere";
-	var $hasInsertID = true;
+ class ADODB_sqlanywhere extends ADODB_odbc
+ {
+	 var $databaseType = "sqlanywhere";
+	 var $hasInsertID = true;
 
-	 function _insertid() {
-  	   return $this->GetOne('select @@identity');
-	 }
+	protected function _insertID($table = '', $column = '')
+	{
+		 return $this->GetOne('select @@identity');
+	}
 
   function create_blobvar($blobVarName) {
    $this->Execute("create variable $blobVarName long binary");
@@ -153,11 +131,6 @@ class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {
 
   var $databaseType = "sqlanywhere";
 
- function __construct($id,$mode=false)
- {
-  parent::__construct($id,$mode);
- }
-
 
  }; //class
 
diff --git a/vendor/adodb/adodb-php/drivers/adodb-sqlite.inc.php b/vendor/adodb/adodb-php/drivers/adodb-sqlite.inc.php
index 839f46eb09..0711f1dde1 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-sqlite.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-sqlite.inc.php
@@ -1,27 +1,34 @@
 hasInsertID = true;
 	}
 
-	function _insertid()
+	protected function _insertID($table = '', $column = '')
 	{
 		return sqlite_last_insert_rowid($this->_connectionID);
 	}
@@ -355,6 +358,63 @@ function MetaIndexes($table, $primary = FALSE, $owner = false)
 		return $indexes;
 	}
 
+	/**
+	* Returns the maximum size of a MetaType C field. Because of the
+	* database design, sqlite places no limits on the size of data inserted
+	*
+	* @return int
+	*/
+	function charMax()
+	{
+		return ADODB_STRINGMAX_NOLIMIT;
+	}
+
+	/**
+	* Returns the maximum size of a MetaType X field. Because of the
+	* database design, sqlite places no limits on the size of data inserted
+	*
+	* @return int
+	*/
+	function textMax()
+	{
+		return ADODB_STRINGMAX_NOLIMIT;
+	}
+
+	/*
+	 * Converts a date to a month only field and pads it to 2 characters
+	 *
+	 * @param 	str		$fld	The name of the field to process
+	 * @return	str				The SQL Statement
+	 */
+	function month($fld)
+	{
+		$x = "strftime('%m',$fld)";
+
+		return $x;
+	}
+
+	/*
+	 * Converts a date to a day only field and pads it to 2 characters
+	 *
+	 * @param 	str		$fld	The name of the field to process
+	 * @return	str				The SQL Statement
+	 */
+	function day($fld) {
+		$x = "strftime('%d',$fld)";
+		return $x;
+	}
+
+	/*
+	 * Converts a date to a year only field
+	 *
+	 * @param 	str		$fld	The name of the field to process
+	 * @return	str				The SQL Statement
+	 */
+	function year($fld) {
+		$x = "strftime('%Y',$fld)";
+
+		return $x;
+	}
 }
 
 /*--------------------------------------------------------------------------------------
diff --git a/vendor/adodb/adodb-php/drivers/adodb-sqlite3.inc.php b/vendor/adodb/adodb-php/drivers/adodb-sqlite3.inc.php
index ee4933af99..548727d8bc 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-sqlite3.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-sqlite3.inc.php
@@ -1,27 +1,32 @@
 type;
+			$len = $fieldobj->max_length;
+		}
+
+		$t = strtoupper($t);
+
+		/*
+		* We are using the Sqlite affinity method here
+		* @link https://www.sqlite.org/datatype3.html
+		*/
+		$affinity = array(
+		'INT'=>'INTEGER',
+		'INTEGER'=>'INTEGER',
+		'TINYINT'=>'INTEGER',
+		'SMALLINT'=>'INTEGER',
+		'MEDIUMINT'=>'INTEGER',
+		'BIGINT'=>'INTEGER',
+		'UNSIGNED BIG INT'=>'INTEGER',
+		'INT2'=>'INTEGER',
+		'INT8'=>'INTEGER',
+
+		'CHARACTER'=>'TEXT',
+		'VARCHAR'=>'TEXT',
+		'VARYING CHARACTER'=>'TEXT',
+		'NCHAR'=>'TEXT',
+		'NATIVE CHARACTER'=>'TEXT',
+		'NVARCHAR'=>'TEXT',
+		'TEXT'=>'TEXT',
+		'CLOB'=>'TEXT',
+
+		'BLOB'=>'BLOB',
+
+		'REAL'=>'REAL',
+		'DOUBLE'=>'REAL',
+		'DOUBLE PRECISION'=>'REAL',
+		'FLOAT'=>'REAL',
+
+		'NUMERIC'=>'NUMERIC',
+		'DECIMAL'=>'NUMERIC',
+		'BOOLEAN'=>'NUMERIC',
+		'DATE'=>'NUMERIC',
+		'DATETIME'=>'NUMERIC'
+		);
+
+		if (!isset($affinity[$t]))
+			return ADODB_DEFAULT_METATYPE;
+
+		$subt = $affinity[$t];
+		/*
+		* Now that we have subclassed the provided data down
+		* the sqlite 'affinity', we convert to ADOdb metatype
+		*/
+
+		$subclass = array('INTEGER'=>'I',
+						  'TEXT'=>'X',
+						  'BLOB'=>'B',
+						  'REAL'=>'N',
+						  'NUMERIC'=>'N');
+
+		return $subclass[$subt];
+	}
 	// mark newnham
 	function MetaColumns($table, $normalize=true)
 	{
@@ -129,13 +197,67 @@ function MetaColumns($table, $normalize=true)
 		return $arr;
 	}
 
+	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;
+
+	    /*
+		* Read sqlite master to find foreign keys
+		*/
+		$sql = "SELECT sql
+				 FROM (
+				SELECT sql sql, type type, tbl_name tbl_name, name name
+				  FROM sqlite_master
+			          )
+				WHERE type != 'meta'
+				  AND sql NOTNULL
+		          AND LOWER(name) ='" . strtolower($table) . "'";
+
+		$tableSql = $this->getOne($sql);
+
+		$fkeyList = array();
+		$ylist = preg_split("/,+/",$tableSql);
+		foreach ($ylist as $y)
+		{
+			if (!preg_match('/FOREIGN/',$y))
+				continue;
+
+			$matches = false;
+			preg_match_all('/\((.+?)\)/i',$y,$matches);
+			$tmatches = false;
+			preg_match_all('/REFERENCES (.+?)\(/i',$y,$tmatches);
+
+			if ($associative)
+			{
+				if (!isset($fkeyList[$tmatches[1][0]]))
+					$fkeyList[$tmatches[1][0]]	= array();
+				$fkeyList[$tmatches[1][0]][$matches[1][0]] = $matches[1][1];
+			}
+			else
+				$fkeyList[$tmatches[1][0]][] = $matches[1][0] . '=' . $matches[1][1];
+		}
+
+		if ($associative)
+		{
+			if ($upper)
+				$fkeyList = array_change_key_case($fkeyList,CASE_UPPER);
+			else
+				$fkeyList = array_change_key_case($fkeyList,CASE_LOWER);
+		}
+		return $fkeyList;
+	}
+
+
 	function _init($parentDriver)
 	{
 		$parentDriver->hasTransactions = false;
 		$parentDriver->hasInsertID = true;
 	}
 
-	function _insertid()
+	protected function _insertID($table = '', $column = '')
 	{
 		return $this->_connectionID->lastInsertRowID();
 	}
@@ -160,11 +282,22 @@ function ErrorNo()
 
 	function SQLDate($fmt, $col=false)
 	{
+		/*
+		* In order to map the values correctly, we must ensure the proper
+		* casing for certain fields
+		* Y must be UC, because y is a 2 digit year
+		* d must be LC, because D is 3 char day
+		* A must be UC  because a is non-portable am
+		* Q must be UC  because q means nothing
+		*/
+		$fromChars = array('y','D','a','q');
+		$toChars   = array('Y','d','A','Q');
+		$fmt       = str_replace($fromChars,$toChars,$fmt);
+
 		$fmt = $this->qstr($fmt);
 		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
 	}
 
-
 	function _createFunctions()
 	{
 		$this->_connectionID->createFunction('adodb_date', 'adodb_date', 1);
@@ -289,7 +422,7 @@ function _close()
 		return $this->_connectionID->close();
 	}
 
-	function MetaIndexes($table, $primary = FALSE, $owner = false)
+	function metaIndexes($table, $primary = FALSE, $owner = false)
 	{
 		$false = false;
 		// save old fetch mode
@@ -299,8 +432,36 @@ function MetaIndexes($table, $primary = FALSE, $owner = false)
 		if ($this->fetchMode !== FALSE) {
 			$savem = $this->SetFetchMode(FALSE);
 		}
-		$SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE type='index' AND tbl_name='%s'", strtolower($table));
-		$rs = $this->Execute($SQL);
+
+		$pragmaData = array();
+
+		/*
+		* If we want the primary key, we must extract
+		* it from the table statement, and the pragma
+		*/
+		if ($primary)
+		{
+			$sql = sprintf('PRAGMA table_info([%s]);',
+						   strtolower($table)
+						   );
+			$pragmaData = $this->getAll($sql);
+		}
+
+		/*
+		* Exclude the empty entry for the primary index
+		*/
+		$sqlite = "SELECT name,sql
+					 FROM sqlite_master
+					WHERE type='index'
+					  AND sql IS NOT NULL
+					  AND LOWER(tbl_name)='%s'";
+
+		$SQL = sprintf($sqlite,
+				     strtolower($table)
+					 );
+
+		$rs = $this->execute($SQL);
+
 		if (!is_object($rs)) {
 			if (isset($savem)) {
 				$this->SetFetchMode($savem);
@@ -310,10 +471,10 @@ function MetaIndexes($table, $primary = FALSE, $owner = false)
 		}
 
 		$indexes = array ();
-		while ($row = $rs->FetchRow()) {
-			if ($primary && preg_match("/primary/i",$row[1]) == 0) {
-				continue;
-			}
+
+		while ($row = $rs->FetchRow())
+		{
+
 			if (!isset($indexes[$row[0]])) {
 				$indexes[$row[0]] = array(
 					'unique' => preg_match("/unique/i",$row[1]),
@@ -321,23 +482,122 @@ function MetaIndexes($table, $primary = FALSE, $owner = false)
 				);
 			}
 			/**
-			 * There must be a more elegant way of doing this,
-			 * the index elements appear in the SQL statement
+			 * The index elements appear in the SQL statement
 			 * in cols[1] between parentheses
 			 * e.g CREATE UNIQUE INDEX ware_0 ON warehouse (org,warehouse)
 			 */
-			$cols = explode("(",$row[1]);
-			$cols = explode(")",$cols[1]);
-			array_pop($cols);
-			$indexes[$row[0]]['columns'] = $cols;
+			preg_match_all('/\((.*)\)/',$row[1],$indexExpression);
+			$indexes[$row[0]]['columns'] = array_map('trim',explode(',',$indexExpression[1][0]));
 		}
+
 		if (isset($savem)) {
 			$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
+
+		/*
+		* If we want primary, add it here
+		*/
+		if ($primary){
+
+			/*
+			* Check the previously retrieved pragma to search
+			* with a closure
+			*/
+
+			$pkIndexData = array('unique'=>1,'columns'=>array());
+
+			$pkCallBack = function ($value, $key) use (&$pkIndexData) {
+
+				/*
+				* As we iterate the elements check for pk index and sort
+				*/
+				if ($value[5] > 0)
+				{
+					$pkIndexData['columns'][$value[5]] = strtolower($value[1]);
+					ksort($pkIndexData['columns']);
+				}
+			};
+
+			array_walk($pragmaData,$pkCallBack);
+
+			/*
+			* If we found no columns, there is no
+			* primary index
+			*/
+			if (count($pkIndexData['columns']) > 0)
+				$indexes['PRIMARY'] = $pkIndexData;
+		}
+
 		return $indexes;
 	}
 
+	/**
+	* Returns the maximum size of a MetaType C field. Because of the
+	* database design, sqlite places no limits on the size of data inserted
+	*
+	* @return int
+	*/
+	function charMax()
+	{
+		return ADODB_STRINGMAX_NOLIMIT;
+	}
+
+	/**
+	* Returns the maximum size of a MetaType X field. Because of the
+	* database design, sqlite places no limits on the size of data inserted
+	*
+	* @return int
+	*/
+	function textMax()
+	{
+		return ADODB_STRINGMAX_NOLIMIT;
+	}
+
+	/**
+	 * Converts a date to a month only field and pads it to 2 characters
+	 *
+	 * This uses the more efficient strftime native function to process
+	 *
+	 * @param 	str		$fld	The name of the field to process
+	 *
+	 * @return	str				The SQL Statement
+	 */
+	function month($fld)
+	{
+		$x = "strftime('%m',$fld)";
+		return $x;
+	}
+
+	/**
+	 * Converts a date to a day only field and pads it to 2 characters
+	 *
+	 * This uses the more efficient strftime native function to process
+	 *
+	 * @param 	str		$fld	The name of the field to process
+	 *
+	 * @return	str				The SQL Statement
+	 */
+	function day($fld) {
+		$x = "strftime('%d',$fld)";
+		return $x;
+	}
+
+	/**
+	 * Converts a date to a year only field
+	 *
+	 * This uses the more efficient strftime native function to process
+	 *
+	 * @param 	str		$fld	The name of the field to process
+	 *
+	 * @return	str				The SQL Statement
+	 */
+	function year($fld)
+	{
+		$x = "strftime('%Y',$fld)";
+		return $x;
+	}
+
 }
 
 /*--------------------------------------------------------------------------------------
diff --git a/vendor/adodb/adodb-php/drivers/adodb-sqlitepo.inc.php b/vendor/adodb/adodb-php/drivers/adodb-sqlitepo.inc.php
index a663c9d2b6..cb69ff9e96 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-sqlitepo.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-sqlitepo.inc.php
@@ -1,23 +1,31 @@
 
+ */
 
 if (!defined('ADODB_DIR')) die();
 
@@ -35,11 +43,6 @@ class ADORecordset_sqlitepo extends ADORecordset_sqlite {
 
    var $databaseType = 'sqlitepo';
 
-   function __construct($queryID,$mode=false)
-   {
-      parent::__construct($queryID,$mode);
-   }
-
    // Modified to strip table names from returned fields
    function _fetch($ignore_fields=false)
    {
diff --git a/vendor/adodb/adodb-php/drivers/adodb-sybase.inc.php b/vendor/adodb/adodb-php/drivers/adodb-sybase.inc.php
index 6d1a49d7d4..b8db074797 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-sybase.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-sybase.inc.php
@@ -1,21 +1,24 @@
 
+ */
 
  // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -44,15 +47,15 @@ class ADODB_sybase extends ADOConnection {
 
 	var $port;
 
-	function __construct()
-	{
-	}
-
-	// might require begintrans -- committrans
-	function _insertid()
+	/**
+	 * might require begintrans -- committrans
+	 * @inheritDoc
+	 */
+	protected function _insertID($table = '', $column = '')
 	{
 		return $this->GetOne('select @@identity');
 	}
+
 	  // might require begintrans -- committrans
 	function _affectedrows()
 	{
@@ -171,7 +174,7 @@ function _query($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
 
-		if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
+		if ($ADODB_COUNTRECS == false)
 			return sybase_unbuffered_query($sql,$this->_connectionID);
 		else
 			return sybase_query($sql,$this->_connectionID);
@@ -320,7 +323,7 @@ function __construct($id,$mode=false)
 		}
 		if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
 		else $this->fetchMode = $mode;
-		parent::__construct($id,$mode);
+		parent::__construct($id);
 	}
 
 	/*	Returns: an object containing field information.
@@ -393,12 +396,8 @@ static function UnixTimeStamp($v)
 }
 
 class ADORecordSet_array_sybase extends ADORecordSet_array {
-	function __construct($id=-1)
-	{
-		parent::__construct($id);
-	}
 
-		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
+	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
 	static function UnixDate($v)
 	{
 	global $ADODB_sybase_mths;
diff --git a/vendor/adodb/adodb-php/drivers/adodb-sybase_ase.inc.php b/vendor/adodb/adodb-php/drivers/adodb-sybase_ase.inc.php
index 987ebe9f37..d301ba9961 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-sybase_ase.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-sybase_ase.inc.php
@@ -1,17 +1,24 @@
 
+ */
 
 require_once ADODB_DIR."/drivers/adodb-sybase.inc.php";
 
@@ -22,10 +29,6 @@ class ADODB_sybase_ase extends ADODB_sybase {
 	 var $metaColumnsSQL = "SELECT syscolumns.name AS field_name, systypes.name AS type, systypes.length AS width FROM sysobjects, syscolumns, systypes WHERE sysobjects.name='%s' AND syscolumns.id = sysobjects.id AND systypes.type=syscolumns.type";
 	 var $metaDatabasesSQL ="SELECT a.name FROM master.dbo.sysdatabases a, master.dbo.syslogins b WHERE a.suid = b.suid and a.name like '%' and a.name != 'tempdb' and a.status3 != 256  order by 1";
 
-	function __construct()
-	{
-	}
-
 	// split the Views, Tables and procedures.
 	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
@@ -111,10 +114,5 @@ function ErrorMsg()
 }
 
 class adorecordset_sybase_ase extends ADORecordset_sybase {
-var $databaseType = "sybase_ase";
-function __construct($id,$mode=false)
-	{
-		parent::__construct($id,$mode);
-	}
-
+	var $databaseType = "sybase_ase";
 }
diff --git a/vendor/adodb/adodb-php/drivers/adodb-text.inc.php b/vendor/adodb/adodb-php/drivers/adodb-text.inc.php
index 2eb18242a6..77ad06a0ba 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-text.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-text.inc.php
@@ -1,63 +1,25 @@
 Connect($array,[$types],[$colnames]);
-
-	Parameter $array is the 2 dimensional array of data. The first row can contain the
-	column names. If column names is not defined in first row, you MUST define $colnames,
-	the 3rd parameter.
-
-	Parameter $types is optional. If defined, it should contain an array matching
-	the number of columns in $array, with each element matching the correct type defined
-	by MetaType: (B,C,I,L,N). If undefined, we will probe for $this->_proberows rows
-	to guess the type. Only C,I and N are recognised.
-
-	Parameter $colnames is optional. If defined, it is an array that contains the
-	column names of $array. If undefined, we assume the first row of $array holds the
-	column names.
-
- The Execute() function will return a recordset. The recordset works like a normal recordset.
- We have partial support for SQL parsing. We process the SQL using the following rules:
-
- 1. SQL order by's always work for the first column ordered. Subsequent cols are ignored
-
- 2. All operations take place on the same table. No joins possible. In fact the FROM clause
-	is ignored! You can use any name for the table.
-
- 3. To simplify code, all columns are returned, except when selecting 1 column
-
- 	$rs = $db->Execute('select col1,col2 from table'); // sql ignored, will generate all cols
-
-	We special case handling of 1 column because it is used in filter popups
-
-	$rs = $db->Execute('select col1 from table');
-	// sql accepted and processed -- any table name is accepted
-
-	$rs = $db->Execute('select distinct col1 from table');
-	// sql accepted and processed
-
-4. Where clauses are ignored, but searching with the 3rd parameter of Execute is permitted.
-   This has to use PHP syntax and we will eval() it. You can even use PHP functions.
-
-	 $rs = $db->Execute('select * from table',false,"\$COL1='abc' and $\COL2=3")
- 	// the 3rd param is searched -- make sure that $COL1 is a legal column name
-	// and all column names must be in upper case.
-
-4. Group by, having, other clauses are ignored
-
-5. Expression columns, min(), max() are ignored
-
-6. All data is readonly. Only SELECTs permitted.
-*/
+/**
+ * ADOdb Plain Text driver
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -90,10 +52,6 @@ class ADODB_text extends ADOConnection {
 	var $_reznames;
 	var $_reztypes;
 
-	function __construct()
-	{
-	}
-
 	function RSRecordCount()
 	{
 		if (!empty($this->_rezarray)) return sizeof($this->_rezarray);
@@ -101,11 +59,6 @@ function RSRecordCount()
 		return sizeof($this->_origarray);
 	}
 
-	function _insertid()
-	{
-			return false;
-	}
-
 	function _affectedrows()
 	{
 			return false;
@@ -325,7 +278,7 @@ function _query($sql,$input_arr,$eval=false)
 
 		// check for desc sort
 		$orderby = substr($orderby,strlen($col)+1);
-		$arr == array();
+		$arr = array();
 		preg_match('/([A-Z_0-9]*)/i',$orderby,$arr);
 
 		if (trim($arr[1]) == 'DESC') $sortf = 'adodb_cmpr';
@@ -375,7 +328,7 @@ class ADORecordSet_text extends ADORecordSet_array
 
 	var $databaseType = "text";
 
-	function __construct(&$conn,$mode=false)
+	function __construct( $conn,$mode=false)
 	{
 		parent::__construct();
 		$this->InitArray($conn->_rezarray,$conn->_reztypes,$conn->_reznames);
diff --git a/vendor/adodb/adodb-php/drivers/adodb-vfp.inc.php b/vendor/adodb/adodb-php/drivers/adodb-vfp.inc.php
index 976728682e..bb4351683a 100644
--- a/vendor/adodb/adodb-php/drivers/adodb-vfp.inc.php
+++ b/vendor/adodb/adodb-php/drivers/adodb-vfp.inc.php
@@ -1,23 +1,31 @@
 
+/**
+ * Arabic language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author El-Shamaa, Khaled 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'			    => 'ar',
 	    DB_ERROR			=> 'خطأ غير محدد',
diff --git a/vendor/adodb/adodb-php/lang/adodb-bg.inc.php b/vendor/adodb/adodb-php/lang/adodb-bg.inc.php
index 07069b421f..bbfd92f28c 100644
--- a/vendor/adodb/adodb-php/lang/adodb-bg.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-bg.inc.php
@@ -1,8 +1,24 @@
 
-*/
+/**
+ * Bulgarian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Valentin Sheiretsky 
+ */
 
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'bg',
diff --git a/vendor/adodb/adodb-php/lang/adodb-ca.inc.php b/vendor/adodb/adodb-php/lang/adodb-ca.inc.php
index adbafac982..4b046884f1 100644
--- a/vendor/adodb/adodb-php/lang/adodb-ca.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-ca.inc.php
@@ -1,6 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'ca',
             DB_ERROR                    => 'error desconegut',
diff --git a/vendor/adodb/adodb-php/lang/adodb-cn.inc.php b/vendor/adodb/adodb-php/lang/adodb-cn.inc.php
index 9c97341301..512ffb82e2 100644
--- a/vendor/adodb/adodb-php/lang/adodb-cn.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-cn.inc.php
@@ -1,6 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'cn',
             DB_ERROR                    => '未知错误',
diff --git a/vendor/adodb/adodb-php/lang/adodb-cz.inc.php b/vendor/adodb/adodb-php/lang/adodb-cz.inc.php
index d79d7142f2..eb2fb2e3ae 100644
--- a/vendor/adodb/adodb-php/lang/adodb-cz.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-cz.inc.php
@@ -1,7 +1,24 @@
 
+/**
+ * Czech language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Kamil Jakubovic 
+ */
 
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'cz',
diff --git a/vendor/adodb/adodb-php/lang/adodb-da.inc.php b/vendor/adodb/adodb-php/lang/adodb-da.inc.php
index 14e720b850..e4c655be9a 100644
--- a/vendor/adodb/adodb-php/lang/adodb-da.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-da.inc.php
@@ -1,5 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
   	    'LANG'                      => 'da',
             DB_ERROR                    => 'ukendt fejl',
diff --git a/vendor/adodb/adodb-php/lang/adodb-de.inc.php b/vendor/adodb/adodb-php/lang/adodb-de.inc.php
index dca4ffefe2..a02dd72952 100644
--- a/vendor/adodb/adodb-php/lang/adodb-de.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-de.inc.php
@@ -1,32 +1,52 @@
 
+/**
+ * German language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Heinz Hombergs 
+ */
+
 $ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'de',
-			DB_ERROR                    => 'Unbekannter Fehler',
-            DB_ERROR_ALREADY_EXISTS     => 'existiert bereits',
-            DB_ERROR_CANNOT_CREATE      => 'kann nicht erstellen',
-            DB_ERROR_CANNOT_DELETE      => 'kann nicht löschen',
-            DB_ERROR_CANNOT_DROP        => 'Tabelle oder Index konnte nicht gelöscht werden',
-            DB_ERROR_CONSTRAINT         => 'Constraint Verletzung',
-            DB_ERROR_DIVZERO            => 'Division durch Null',
-            DB_ERROR_INVALID            => 'ungültig',
-            DB_ERROR_INVALID_DATE       => 'ungültiges Datum oder Zeit',
-            DB_ERROR_INVALID_NUMBER     => 'ungültige Zahl',
-            DB_ERROR_MISMATCH           => 'Unverträglichkeit',
-            DB_ERROR_NODBSELECTED       => 'keine Dantebank ausgewählt',
-            DB_ERROR_NOSUCHFIELD        => 'Feld nicht vorhanden',
-            DB_ERROR_NOSUCHTABLE        => 'Tabelle nicht vorhanden',
-            DB_ERROR_NOT_CAPABLE        => 'Funktion nicht installiert',
-            DB_ERROR_NOT_FOUND          => 'nicht gefunden',
-            DB_ERROR_NOT_LOCKED         => 'nicht gesperrt',
-            DB_ERROR_SYNTAX             => 'Syntaxfehler',
-            DB_ERROR_UNSUPPORTED        => 'nicht Unterstützt',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'Anzahl der zurückgelieferten Felder entspricht nicht der Anzahl der Felder in der Abfrage',
-            DB_ERROR_INVALID_DSN        => 'ungültiger DSN',
-            DB_ERROR_CONNECT_FAILED     => 'Verbindung konnte nicht hergestellt werden',
-            0	                       => 'kein Fehler', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'Nicht genügend Daten geliefert',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'erweiterung nicht gefunden',
-            DB_ERROR_NOSUCHDB           => 'keine Datenbank',
-            DB_ERROR_ACCESS_VIOLATION   => 'ungenügende Rechte'
+	'LANG'                      => 'de',
+	DB_ERROR                    => 'unbekannter Fehler',
+	DB_ERROR_ALREADY_EXISTS     => 'existiert bereits',
+	DB_ERROR_CANNOT_CREATE      => 'kann nicht erstellen',
+	DB_ERROR_CANNOT_DELETE      => 'kann nicht löschen',
+	DB_ERROR_CANNOT_DROP        => 'Tabelle oder Index konnte nicht gelöscht werden',
+	DB_ERROR_CONSTRAINT         => 'Randbedingung verletzt',
+	DB_ERROR_DIVZERO            => 'Division durch Null',
+	DB_ERROR_INVALID            => 'ungültig',
+	DB_ERROR_INVALID_DATE       => 'ungültiges Datum oder Zeit',
+	DB_ERROR_INVALID_NUMBER     => 'ungültige Zahl',
+	DB_ERROR_MISMATCH           => 'Unverträglichkeit',
+	DB_ERROR_NODBSELECTED       => 'Keine Datenbank ausgewählt',
+	DB_ERROR_NOSUCHFIELD        => 'Feld nicht vorhanden',
+	DB_ERROR_NOSUCHTABLE        => 'Tabelle nicht vorhanden',
+	DB_ERROR_NOT_CAPABLE        => 'Funktion nicht installiert',
+	DB_ERROR_NOT_FOUND          => 'nicht gefunden',
+	DB_ERROR_NOT_LOCKED         => 'nicht gesperrt',
+	DB_ERROR_SYNTAX             => 'Syntaxfehler',
+	DB_ERROR_UNSUPPORTED        => 'nicht unterstützt',
+	DB_ERROR_VALUE_COUNT_ON_ROW => 'Anzahl der zurückgelieferten Felder entspricht nicht der Anzahl der Felder in der Abfrage',
+	DB_ERROR_INVALID_DSN        => 'ungültiger DSN',
+	DB_ERROR_CONNECT_FAILED     => 'Verbindung konnte nicht hergestellt werden',
+	0 => 'kein Fehler', // DB_OK
+	DB_ERROR_NEED_MORE_DATA     => 'Nicht genügend Daten geliefert',
+	DB_ERROR_EXTENSION_NOT_FOUND=> 'Erweiterung nicht gefunden',
+	DB_ERROR_NOSUCHDB           => 'keine Datenbank',
+	DB_ERROR_ACCESS_VIOLATION   => 'ungenügende Rechte'
 );
diff --git a/vendor/adodb/adodb-php/lang/adodb-en.inc.php b/vendor/adodb/adodb-php/lang/adodb-en.inc.php
index 05828554c3..74c4ea021b 100644
--- a/vendor/adodb/adodb-php/lang/adodb-en.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-en.inc.php
@@ -1,4 +1,23 @@
  'en',
diff --git a/vendor/adodb/adodb-php/lang/adodb-eo.inc.php b/vendor/adodb/adodb-php/lang/adodb-eo.inc.php
index baa589c1c7..107a3b37fd 100644
--- a/vendor/adodb/adodb-php/lang/adodb-eo.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-eo.inc.php
@@ -1,6 +1,24 @@
 
+ */
 
 $ADODB_LANG_ARRAY = array (
              'LANG'                      => 'eo',
diff --git a/vendor/adodb/adodb-php/lang/adodb-es.inc.php b/vendor/adodb/adodb-php/lang/adodb-es.inc.php
index a80a64415b..bcb0cceac9 100644
--- a/vendor/adodb/adodb-php/lang/adodb-es.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-es.inc.php
@@ -1,5 +1,25 @@
 
+/**
+ * Spanish language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Horacio Degiorgi 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'es',
             DB_ERROR                    => 'error desconocido',
diff --git a/vendor/adodb/adodb-php/lang/adodb-fa.inc.php b/vendor/adodb/adodb-php/lang/adodb-fa.inc.php
index 7fa46183ea..84f17bd85a 100644
--- a/vendor/adodb/adodb-php/lang/adodb-fa.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-fa.inc.php
@@ -1,6 +1,24 @@
  */
+/**
+ * Farsi language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Peyman Hooshmandi Raad" 
+ */
 
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'fa',
diff --git a/vendor/adodb/adodb-php/lang/adodb-fr.inc.php b/vendor/adodb/adodb-php/lang/adodb-fr.inc.php
index 620196b433..b010d1e590 100644
--- a/vendor/adodb/adodb-php/lang/adodb-fr.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-fr.inc.php
@@ -1,4 +1,23 @@
  'fr',
diff --git a/vendor/adodb/adodb-php/lang/adodb-hu.inc.php b/vendor/adodb/adodb-php/lang/adodb-hu.inc.php
index 49357ce220..5a73827b35 100644
--- a/vendor/adodb/adodb-php/lang/adodb-hu.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-hu.inc.php
@@ -1,6 +1,25 @@
 
+/**
+ * Hungarian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Halászvári Gábor 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'hu',
             DB_ERROR                    => 'ismeretlen hiba',
diff --git a/vendor/adodb/adodb-php/lang/adodb-id.inc.php b/vendor/adodb/adodb-php/lang/adodb-id.inc.php
new file mode 100644
index 0000000000..abd38eee3b
--- /dev/null
+++ b/vendor/adodb/adodb-php/lang/adodb-id.inc.php
@@ -0,0 +1,55 @@
+
+ */
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'id',
+            DB_ERROR                    => 'kesalahan tidak diketahui',
+            DB_ERROR_ALREADY_EXISTS     => 'sudah ada',
+            DB_ERROR_CANNOT_CREATE      => 'tak dapat membuat',
+            DB_ERROR_CANNOT_DELETE      => 'tak dapat menghapus',
+            DB_ERROR_CANNOT_DROP        => 'tak dapat menghapus',
+            DB_ERROR_CONSTRAINT         => 'pelanggaran kendala',
+            DB_ERROR_DIVZERO            => 'pembagian dengan 0',
+            DB_ERROR_INVALID            => 'tidak sah',
+            DB_ERROR_INVALID_DATE       => 'tanggal atau waktu tidak valid',
+            DB_ERROR_INVALID_NUMBER     => 'nomor tidak sah',
+            DB_ERROR_MISMATCH           => 'tak cocok',
+            DB_ERROR_NODBSELECTED       => 'tak ada database dipilih',
+            DB_ERROR_NOSUCHFIELD        => 'kolom tak ditemukan',
+            DB_ERROR_NOSUCHTABLE        => 'tabel tak ditemukan',
+            DB_ERROR_NOT_CAPABLE        => 'kemampuan DB tak memadai',
+            DB_ERROR_NOT_FOUND          => 'tidak ditemukan',
+            DB_ERROR_NOT_LOCKED         => 'tidak terkunci',
+            DB_ERROR_SYNTAX             => 'kesalahan sintak',
+            DB_ERROR_UNSUPPORTED        => 'tak didukung',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'menghitung isi pada baris',
+            DB_ERROR_INVALID_DSN        => 'DSN tidak sah',
+            DB_ERROR_CONNECT_FAILED     => 'koneksi gagal',
+            0	                       => 'tak ada kesalahan', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'data yang dimasukan tidak memadai',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'ekstensi tak ditemukan',
+            DB_ERROR_NOSUCHDB           => 'database tak ditemukan',
+            DB_ERROR_ACCESS_VIOLATION   => 'izin tidak memadai',
+            DB_ERROR_DEADLOCK           => 'kebuntuan terdeteksi',
+            DB_ERROR_STATEMENT_TIMEOUT  => 'perintah kehabisan waktu',
+            DB_ERROR_SERIALIZATION_FAILURE => 'tak dapat melanjutkan akses'
+);
diff --git a/vendor/adodb/adodb-php/lang/adodb-it.inc.php b/vendor/adodb/adodb-php/lang/adodb-it.inc.php
index 80524e1d3f..a6516308dc 100644
--- a/vendor/adodb/adodb-php/lang/adodb-it.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-it.inc.php
@@ -1,6 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'it',
             DB_ERROR                    => 'errore sconosciuto',
diff --git a/vendor/adodb/adodb-php/lang/adodb-nl.inc.php b/vendor/adodb/adodb-php/lang/adodb-nl.inc.php
index 43e3ee6944..8a898193ff 100644
--- a/vendor/adodb/adodb-php/lang/adodb-nl.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-nl.inc.php
@@ -1,5 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'nl',
             DB_ERROR                    => 'onbekende fout',
diff --git a/vendor/adodb/adodb-php/lang/adodb-oc.inc.php b/vendor/adodb/adodb-php/lang/adodb-oc.inc.php
new file mode 100644
index 0000000000..3481e79a1f
--- /dev/null
+++ b/vendor/adodb/adodb-php/lang/adodb-oc.inc.php
@@ -0,0 +1,51 @@
+ 'oc',
+	DB_ERROR                    => 'error desconeguda',
+	DB_ERROR_ALREADY_EXISTS     => 'existís ja',
+	DB_ERROR_CANNOT_CREATE      => 'creacion impossibla',
+	DB_ERROR_CANNOT_DELETE      => 'escafament impossible',
+	DB_ERROR_CANNOT_DROP        => 'supression impossibla',
+	DB_ERROR_CONSTRAINT         => 'violacion de constrenta',
+	DB_ERROR_DIVZERO            => 'division per zèro',
+	DB_ERROR_INVALID            => 'invalid',
+	DB_ERROR_INVALID_DATE       => 'data o ora invalida',
+	DB_ERROR_INVALID_NUMBER     => 'nombre invalid',
+	DB_ERROR_MISMATCH           => 'error de concordància',
+	DB_ERROR_NODBSELECTED       => 'pas de basa de donadas de seleccionada',
+	DB_ERROR_NOSUCHFIELD        => 'nom de colomna invalid',
+	DB_ERROR_NOSUCHTABLE        => 'taula o vista inexistenta',
+	DB_ERROR_NOT_CAPABLE        => 'foncion opcionala pas installada',
+	DB_ERROR_NOT_FOUND          => 'pas trobat',
+	DB_ERROR_NOT_LOCKED         => 'pas verrolhat',
+	DB_ERROR_SYNTAX             => 'error de sintaxi',
+	DB_ERROR_UNSUPPORTED        => 'pas suportat',
+	DB_ERROR_VALUE_COUNT_ON_ROW => 'valor inserida tròp granda per colomna',
+	DB_ERROR_INVALID_DSN        => 'DSN invalid',
+	DB_ERROR_CONNECT_FAILED     => 'fracàs a la connexion',
+	0                           => "pas d'error", // DB_OK
+	DB_ERROR_NEED_MORE_DATA     => 'donadas provesidas insufisentas',
+	DB_ERROR_EXTENSION_NOT_FOUND=> 'extension pas trobada',
+	DB_ERROR_NOSUCHDB           => 'basa de donadas desconeguda',
+	DB_ERROR_ACCESS_VIOLATION   => 'dreits insufisents'
+);
diff --git a/vendor/adodb/adodb-php/lang/adodb-pl.inc.php b/vendor/adodb/adodb-php/lang/adodb-pl.inc.php
index ffa10e33e2..f855153ebc 100644
--- a/vendor/adodb/adodb-php/lang/adodb-pl.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-pl.inc.php
@@ -1,6 +1,24 @@
 
+/**
+ * Polish language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Grzegorz Pacan 
+ */
 
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'pl',
diff --git a/vendor/adodb/adodb-php/lang/adodb-pt-br.inc.php b/vendor/adodb/adodb-php/lang/adodb-pt-br.inc.php
index 9c687b060e..b6c0d1c95a 100644
--- a/vendor/adodb/adodb-php/lang/adodb-pt-br.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-pt-br.inc.php
@@ -1,6 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'pt-br',
             DB_ERROR                    => 'erro desconhecido',
diff --git a/vendor/adodb/adodb-php/lang/adodb-ro.inc.php b/vendor/adodb/adodb-php/lang/adodb-ro.inc.php
index b6ddd31328..011c016360 100644
--- a/vendor/adodb/adodb-php/lang/adodb-ro.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-ro.inc.php
@@ -1,6 +1,24 @@
  */
+/**
+ * Romanian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Bogdan Stefan 
+ */
 
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'ro',
diff --git a/vendor/adodb/adodb-php/lang/adodb-ru.inc.php b/vendor/adodb/adodb-php/lang/adodb-ru.inc.php
index 67d80f2cca..a311784a5c 100644
--- a/vendor/adodb/adodb-php/lang/adodb-ru.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-ru.inc.php
@@ -1,6 +1,24 @@
 
+ */
 
 $ADODB_LANG_ARRAY = array (
              'LANG'                      => 'ru',
diff --git a/vendor/adodb/adodb-php/lang/adodb-sv.inc.php b/vendor/adodb/adodb-php/lang/adodb-sv.inc.php
index d3be6b0e7f..72e2430112 100644
--- a/vendor/adodb/adodb-php/lang/adodb-sv.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-sv.inc.php
@@ -1,5 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'en',
             DB_ERROR                    => 'Okänt fel',
diff --git a/vendor/adodb/adodb-php/lang/adodb-th.inc.php b/vendor/adodb/adodb-php/lang/adodb-th.inc.php
index a0685645d4..354acca1ed 100644
--- a/vendor/adodb/adodb-php/lang/adodb-th.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-th.inc.php
@@ -1,5 +1,25 @@
 
+/**
+ * Thai language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Trirat Petchsingh 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'						=> 'th',
 			DB_ERROR					=> 'error ไม่รู้สาเหตุ',
diff --git a/vendor/adodb/adodb-php/lang/adodb-uk.inc.php b/vendor/adodb/adodb-php/lang/adodb-uk.inc.php
index 2ace5bc49a..e54a967086 100644
--- a/vendor/adodb/adodb-php/lang/adodb-uk.inc.php
+++ b/vendor/adodb/adodb-php/lang/adodb-uk.inc.php
@@ -1,6 +1,24 @@
 
+ */
 
 $ADODB_LANG_ARRAY = array (
              'LANG'                      => 'uk',
diff --git a/vendor/adodb/adodb-php/pear/Auth/Container/ADOdb.php b/vendor/adodb/adodb-php/pear/Auth/Container/ADOdb.php
index a2f040a7dd..807da9d7bd 100644
--- a/vendor/adodb/adodb-php/pear/Auth/Container/ADOdb.php
+++ b/vendor/adodb/adodb-php/pear/Auth/Container/ADOdb.php
@@ -1,36 +1,36 @@
 
-	Richard Tango-Lowy 
-*/
-
-require_once 'Auth/Container.php';
-require_once 'adodb.inc.php';
-require_once 'adodb-pear.inc.php';
-require_once 'adodb-errorpear.inc.php';
-
 /**
  * Storage driver for fetching login data from a database using ADOdb-PHP.
  *
- * This storage driver can use all databases which are supported
- * by the ADBdb DB abstraction layer to fetch login data.
- * See http://adodb.org/ for information on ADOdb.
+ * This storage driver can use all databases which are supported by the ADBdb
+ * abstraction layer to fetch login data.
  * NOTE: The ADOdb directory MUST be in your PHP include_path!
  *
- * @author   Richard Tango-Lowy 
- * @package  Auth
- * @version  $Revision: 1.3 $
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Martin Jansen 
+ * @author Richard Tango-Lowy 
  */
+
+require_once 'Auth/Container.php';
+require_once 'adodb.inc.php';
+require_once 'adodb-pear.inc.php';
+require_once 'adodb-errorpear.inc.php';
+
+
 class Auth_Container_ADOdb extends Auth_Container
 {
 
@@ -58,7 +58,7 @@ class Auth_Container_ADOdb extends Auth_Container
     /**
      * Constructor of the container class
      *
-     * Initate connection to the database via PEAR::ADOdb
+     * Initiate connection to the database via PEAR::ADOdb
      *
      * @param  string Connection data or DB object
      * @return object Returns an error object if something went wrong
@@ -262,7 +262,7 @@ function fetchData($username, $password)
                     continue;
                 }
                 // Use reference to the auth object if exists
-                // This is because the auth session variable can change so a static call to setAuthData does not make sence
+                // This is because the auth session variable can change so a static call to setAuthData does not make sense
                 if(is_object($this->_auth_obj)){
                     $this->_auth_obj->setAuthData($key, $value);
                 } else {
diff --git a/vendor/adodb/adodb-php/pear/auth_adodb_example.php b/vendor/adodb/adodb-php/pear/auth_adodb_example.php
index 3b7cf5e851..77af93955c 100644
--- a/vendor/adodb/adodb-php/pear/auth_adodb_example.php
+++ b/vendor/adodb/adodb-php/pear/auth_adodb_example.php
@@ -1,5 +1,26 @@
 tablesSQL) return false;
@@ -302,11 +313,9 @@ function optimizeTable( $table, $mode = ADODB_OPT_LOW)
             case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
             case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
             default :
-            {
-                // May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0)
+                // May don't 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));
                 return false;
-            }
         }
         $sql = sprintf( $sql, $table);
 
diff --git a/vendor/adodb/adodb-php/perf/perf-oci8.inc.php b/vendor/adodb/adodb-php/perf/perf-oci8.inc.php
index d60a16eca6..c11b261fd1 100644
--- a/vendor/adodb/adodb-php/perf/perf-oci8.inc.php
+++ b/vendor/adodb/adodb-php/perf/perf-oci8.inc.php
@@ -1,18 +1,23 @@
 optimizeTableLow;  break;
 	        case ADODB_OPT_HIGH: $sql = $this->optimizeTableHigh; break;
 	        default            :
-	        {
 	            ADOConnection::outp(sprintf("
%s: '%s' using of undefined mode '%s'
", __CLASS__, 'optimizeTable', $mode));
 	            return false;
-	        }
 	    }
 	    $sql = sprintf($sql, $table);
 
diff --git a/vendor/adodb/adodb-php/phpdoc b/vendor/adodb/adodb-php/phpdoc
new file mode 100644
index 0000000000..d4cb73a913
--- /dev/null
+++ b/vendor/adodb/adodb-php/phpdoc
@@ -0,0 +1,20 @@
+compat. If compat set to 1.0, then $lastUpdateFld not used during MergeData.
-
-1.0		Apr 2009
-Added support for MFFA
-
-0.9 	? 2008
-First release
-
-
-	Note: this code assumes that comments such as  / *    * / ar`e allowed which works with:
-	Note: this code assumes that comments such as  / *    * / are allowed which works with:
-		 mssql, postgresql, oracle, mssql
-
-	Replication engine to
-	 	- copy table structures and data from different databases (e.g. mysql to oracle)
-		  for replication purposes
-		- generate CREATE TABLE, CREATE INDEX, INSERT ... for installation scripts
-
-	Table Structure copying includes
-		- fields and limited subset of types
-		- optional default values
-		- indexes
-		- but not constraints
-
-
-	Two modes of data copy:
-
-	ReplicateData
-		- Copy from src to dest, with update of status of copy back to src,
-		  with configurable src SELECT where clause
-
-	MergeData
-		- Copy from src to dest based on last mod date field and/or copied flag field
-
-	Default settings are
-		- do not execute, generate sql ($rep->execute = false)
-		- do not delete records in dest table first ($rep->deleteFirst = false).
-			if $rep->deleteFirst is true and primary keys are defined,
-			then no deletion will occur unless *INSERTONLY* is defined in pkey array
-		- only commit once at the end of every ReplicateData ($rep->commitReplicate = true)
-		- do not autocommit every x records processed ($rep->commitRecs = -1)
-		- even if error occurs on one record, continue copying remaining records ($rep->neverAbort = true)
-		- debugging turned off ($rep->debug = false)
-*/
-
-class ADODB_Replicate {
-	var $connSrc;
-	var $connDest;
-
-	var $connSrc2 = false;
-	var $connDest2 = false;
-	var $ddSrc;
-	var $ddDest;
-
-	var $execute = false;
-	var $debug = false;
-	var $deleteFirst = false;
-	var $commitReplicate = true; // commit at end of replicatedata
-	var $commitRecs = -1; // only commit at end of ReplicateData()
-
-	var $selFilter = false;
-	var $fieldFilter = false;
-	var $indexFilter = false;
-	var $updateFilter = false;
-	var $insertFilter = false;
-	var $updateSrcFn = false;
-
-	var $limitRecs = false;
-
-	var $neverAbort = true;
-	var $copyTableDefaults = false; // turn off because functions defined as defaults will not work when copied
-	var $errHandler = false; // name of error handler function, if used.
-	var $htmlSpecialChars = true; 	// if execute false, then output with htmlspecialchars enabled.
-									// Will autoconfigure itself. No need to modify
-
-	var $trgSuffix = '_mrgTr';
-	var $idxSuffix = '_mrgidx';
-	var $trLogic = '1 = 1';
-	var $datesAreTimeStamps = false;
-
-	var $oracleSequence = false;
-	var $readUncommitted = false;  // read without obeying shared locks for fast select (mssql)
-
-	var $compat = false;
-	// connSrc2 and connDest2 are only required if the db driver
-	// does not allow updates back to src db in first connection (the select connection),
-	// so we need 2nd connection
-	function __construct($connSrc, $connDest, $connSrc2=false, $connDest2=false)
-	{
-
-		if (strpos($connSrc->databaseType,'odbtp') !== false) {
-			$connSrc->_bindInputArray = false;  # bug in odbtp, binding fails
-		}
-
-		if (strpos($connDest->databaseType,'odbtp') !== false) {
-			$connDest->_bindInputArray = false;  # bug in odbtp, binding fails
-		}
-
-		$this->connSrc = $connSrc;
-		$this->connDest = $connDest;
-
-		$this->connSrc2 = ($connSrc2) ? $connSrc2 : $connSrc;
-		$this->connDest2 = ($connDest2) ? $connDest2 : $connDest;
-
-		$this->ddSrc = NewDataDictionary($connSrc);
-		$this->ddDest = NewDataDictionary($connDest);
-		$this->htmlSpecialChars = isset($_SERVER['HTTP_HOST']);
-	}
-
-	function ExecSQL($sql)
-	{
-		if (!is_array($sql)) $sql[] = $sql;
-
-		$ret = true;
-		foreach($sql as $s)
-			if (!$this->execute) echo "
",$s.";\n
";
-			else {
-				$ok = $this->connDest->Execute($s);
-				if (!$ok)
-					if ($this->neverAbort) $ret = false;
-					else return false;
-			}
-
-		return $ret;
-	}
-
-	/*
-		We assume replication between $table and $desttable only works if the field names and types match for both tables.
-
-		Also $table and desttable can have different names.
-	*/
-
-	function CopyTableStruct($table,$desttable='')
-	{
-		$sql = $this->CopyTableStructSQL($table,$desttable);
-		if (empty($sql)) return false;
-		return $this->ExecSQL($sql);
-	}
-
-	function RunFieldFilter(&$fld, $mode = '')
-	{
-		if ($this->fieldFilter) {
-			$fn = $this->fieldFilter;
-			return $fn($fld, $mode);
-		} else
-			return $fld;
-	}
-
-	function RunUpdateFilter($table, $fld, $val)
-	{
-		if ($this->updateFilter) {
-			$fn = $this->updateFilter;
-			return $fn($table, $fld, $val);
-		} else
-			return $val;
-	}
-
-	function RunInsertFilter($table, $fld, &$val)
-	{
-		if ($this->insertFilter) {
-			$fn = $this->insertFilter;
-			return $fn($table, $fld, $val);
-		} else
-			return $fld;
-	}
-
-	/*
-		$mode = INS or UPD
-
-		The lastUpdateFld holds the field that counts the number of updates or the date of last mod. This ensures that
-		if the rec was modified after replicatedata retrieves the data but before we update back the src record,
-		we don't set the copiedflag='Y' yet.
-	*/
-	function RunUpdateSrcFn($srcdb, $table, $fldoffsets, $row, $where, $mode, $dest_insertid=null, $lastUpdateFld='')
-	{
-		if (!$this->updateSrcFn) return;
-
-		$bindarr = array();
-		foreach($fldoffsets as $k) {
-			$bindarr[$k] = $row[$k];
-		}
-		$last = sizeof($row);
-
-		if ($lastUpdateFld && $row[$last-1]) {
-			$ds = $row[$last-1];
-			if (strpos($ds,':') !== false) $s = $srcdb->DBTimeStamp($ds);
-			else $s = $srcdb->qstr($ds);
-			$where = "WHERE $lastUpdateFld = $s and $where";
-		} else
-			$where = "WHERE $where";
-		$fn = $this->updateSrcFn;
-		if (is_array($fn)) {
-			if (sizeof($fn) == 1) $set = reset($fn);
-			else $set = @$fn[$mode];
-			if ($set) {
-
-				if (strlen($dest_insertid) == 0) $dest_insertid = 'null';
-				$set = str_replace('$INSERT_ID',$dest_insertid,$set);
-
-				$sql = "UPDATE $table SET $set $where  ";
-				$ok = $srcdb->Execute($sql,$bindarr);
-				if (!$ok) {
-					echo $srcdb->ErrorMsg(),"
\n";
-					die();
-				}
-			}
-		} else $fn($srcdb, $table, $row, $where, $bindarr, $mode, $dest_insertid);
-
-	}
-
-	function CopyTableStructSQL($table, $desttable='',$dropdest =false)
-	{
-		if (!$desttable) {
-			$desttable = $table;
-			$prefixidx = '';
-		} else
-			$prefixidx = $desttable;
-
-		$conn = $this->connSrc;
-		$types = $conn->MetaColumns($table);
-		if (!$types) {
-			echo "$table does not exist in source db
\n";
-			return array();
-		}
-		if (!$dropdest && $this->connDest->MetaColumns($desttable)) {
-			echo "$desttable already exists in dest db
\n";
-			return array();
-		}
-		if ($this->debug) var_dump($types);
-		$sa = array();
-		$idxcols = array();
-
-		foreach($types as $name => $t) {
-			$s = '';
-			$mt = $this->ddSrc->MetaType($t->type);
-			$len = $t->max_length;
-			$fldname = $this->RunFieldFilter($t->name,'TABLE');
-			if (!$fldname) continue;
-
-			$s .= $fldname . ' '.$mt;
-			if (isset($t->scale)) $precision = '.'.$t->scale;
-			else $precision = '';
-			if ($mt == 'C' or $mt == 'X') $s .= "($len)";
-			else if ($mt == 'N' && $precision) $s .= "($len$precision)";
-
-			if ($mt == 'R') $idxcols[] = $fldname;
-
-			if ($this->copyTableDefaults) {
-				if (isset($t->default_value)) {
-					$v = $t->default_value;
-					if ($mt == 'C' or $mt == 'X') $v = $this->connDest->qstr($v); // might not work as this could be function
-					$s .= ' DEFAULT '.$v;
-				}
-			}
-
-			$sa[] = $s;
-		}
-
-		$s = implode(",\n",$sa);
-
-		// dump adodb intermediate data dictionary format
-		if ($this->debug) echo '
'.$s.'
';
-
-		$sqla =  $this->ddDest->CreateTableSQL($desttable,$s);
-
-		/*
-		if ($idxcols) {
-			$idxoptions = array('UNIQUE'=>1);
-			$sqla2 = $this->ddDest->_IndexSQL($table.'_'.$fldname.'_SERIAL', $desttable, $idxcols,$idxoptions);
-			$sqla = array_merge($sqla,$sqla2);
-		}*/
-
-		$idxs = $conn->MetaIndexes($table);
-		if ($idxs)
-		foreach($idxs as $name => $iarr) {
-			$idxoptions = array();
-			$fldnames = array();
-
-			if(!empty($iarr['unique'])) {
-				$idxoptions['UNIQUE'] = 1;
-			}
-
-			foreach($iarr['columns'] as $fld) {
-				$fldnames[] = $this->RunFieldFilter($fld,'TABLE');
-			}
-
-			$idxname = $prefixidx.str_replace($table,$desttable,$name);
-
-			if (!empty($this->indexFilter)) {
-				$fn = $this->indexFilter;
-				$idxname = $fn($desttable,$idxname,$fldnames,$idxoptions);
-			}
-			$sqla2 = $this->ddDest->_IndexSQL($idxname, $desttable, $fldnames,$idxoptions);
-			$sqla = array_merge($sqla,$sqla2);
-		}
-
-		return $sqla;
-	}
-
-	function _clearcache()
-	{
-
-	}
-
-	function _concat($v)
-	{
-		return $this->connDest->concat("' ","chr(".ord($v).")","'");
-	}
-
-	function fixupbinary($v)
-	{
-		return str_replace(
-			array("\r","\n"),
-			array($this->_concat("\r"),$this->_concat("\n")),
-			$v );
-	}
-
-	function SwapDBs()
-	{
-		$o = $this->connSrc;
-		$this->connSrc = $this->connDest;
-		$this->connDest = $o;
-
-
-		$o = $this->connSrc2;
-		$this->connSrc2 = $this->connDest2;
-		$this->connDest2 = $o;
-
-		$o = $this->ddSrc;
-		$this->ddSrc = $this->ddDest;
-		$this->ddDest = $o;
-	}
-
-	/*
-	// if no uniqflds defined, then all desttable recs will be deleted before insert
-	// $where clause must include the WHERE word if used
-	// if $this->commitRecs is set to a +ve value, then it will autocommit every $this->commitRecs records
-	//		-- this should never be done with 7x24 db's
-
-	Returns an array:
-		$arr[0] =  true if no error, false if error
-		$arr[1] =  number of recs processed
-		$arr[2] = number of successful inserts
-		$arr[3] = number of successful updates
-
-	ReplicateData() params:
-
-	$table = src table name
-	$desttable = dest table name, leave blank to use src table name
-	$uniqflds = array() = an array. If set, then inserts and updates will occur. eg. array('PK1', 'PK2');
-		To prevent updates to desttable (allow only to src table), add '*INSERTONLY*' or '*ONLYINSERT*' to array.
-
-		Sometimes you are replicating a src table with an autoinc primary key.
-			You sometimes create recs in the dest table. The dest table has to retrieve the
-			src table's autoinc key (stored in a 2nd field) so you can match the two tables.
-
-		To define this, and the uniqflds contains nested arrays. Copying from autoinc table to other table:
-			array(array($destpkey), array($destfld_holds_src_autoinc_pkey))
-
-		Copying from normal table to autoinc table:
-			array(array($destpkey), array(), array($srcfld_holds_dest_autoinc_pkey))
-
-	$where = where clause for SELECT from $table $where. Include the WHERE reserved word in beginning.
-		You can put ORDER BY at the end also
-	$ignoreflds = array(), list of fields to ignore. e.g. array('FLD1',FLD2');
-	$dstCopyDateFld = date field on $desttable to update with current date
-	$extraflds allows you to add additional flds to insert/update. Format
-		array(fldname => $fldval)
-		$fldval itself can be an array or a string. If an array, then
-		$extraflds = array($fldname => array($insertval, $updateval))
-
-	Thus we have the following behaviours:
-
-	a. Delete all data in $desttable then insert from src $table
-
-		$rep->execute = true;
-		$rep->ReplicateData($table, $desttable)
-
-	b. Update $desttable if record exists (based on $uniqflds), otherwise insert.
-
-		$rep->execute = true;
-		$rep->ReplicateData($table, $desttable, $array($pkey1, $pkey2))
-
-	c. Select from src $table all data modified since a date. Then update $desttable
-		if record exists (based on $uniqflds), otherwise insert
-
-		$rep->execute = true;
-		$rep->ReplicateData($table, $desttable, array($pkey1, $pkey2), "WHERE update_datetime_fld > $LAST_REFRESH")
-
-	d. Insert all records into $desttable modified after a certain id (or time) in src $table:
-
-		$rep->execute = true;
-		$rep->ReplicateData($table, $desttable, false, "WHERE id_fld > $LAST_ID_SAVED", true);
-
-
-	For (a) to (d), returns array: array($boolean_ok_fail, $no_recs_selected_from_src_db, $no_recs_inserted, $no_recs_updated);
-
-	e. Generate sample SQL:
-
-		$rep->execute = false;
-		$rep->ReplicateData(....);
-
-		This returns $array, which contains:
-
-			$array['SEL'] = select stmt from src db
-			$array['UPD'] = update stmt to dest db
-			$array['INS'] = insert stmt to dest db
-
-
-	Error-handling
-	==============
-	Default is never abort if error occurs. You can set $rep->neverAbort = false; to force replication to abort if an error occurs.
-
-
-	Value Filtering
-	========
-	Sometimes you might need to modify/massage the data before the code works. Assume that the value used for True and False is
-	'T' and 'F' in src DB, but is 'Y' and 'N' in dest DB for field[2] in select stmt. You can do this by
-
-		$rep->filterSelect = 'filter';
-		$rep->ReplicateData(...);
-
-		function filter($table,& $fields, $deleteFirst)
-		{
-			if ($table == 'SOMETABLE') {
-				if ($fields[2] == 'T') $fields[2] = 'Y';
-				else if ($fields[2] == 'F') $fields[2] = 'N';
-			}
-		}
-
-	We pass in $deleteFirst as that determines the order of the fields (which are numeric-based):
-		TRUE: the order of fields matches the src table order
-		FALSE: the order of fields is all non-primary key fields first, followed by primary key fields. This is because it needs
-				to match the UPDATE statement, which is UPDATE $table SET f2 = ?, f3 = ? ... WHERE f1 = ?
-
-	Name Filtering
-	=========
-	Sometimes field names that are legal in one RDBMS can be illegal in another.
-	We allow you to handle this using a field filter.
-	Also if you don't want to replicate certain fields, just return false.
-
-		$rep->fieldFilter = 'ffilter';
-
-			function ffilter(&$fld,$mode)
-			{
-				$uf = strtoupper($fld);
-				switch($uf) {
-					case 'GROUP':
-						if ($mode == 'SELECT') $fld = '"Group"';
-						return 'GroupFld';
-
-					case 'PRIVATEFLD':  # do not replicate
-						return false;
-				}
-				return $fld;
-			}
-
-
-	UPDATE FILTERING
-	================
-	Sometimes, when we want to update
-		UPDATE table SET fld = val WHERE ....
-
-	we want to modify val. To do so, define
-
-		$rep->updateFilter = 'ufilter';
-
-		function ufilter($table, $fld, $val)
-		{
-			return "nvl($fld, $val)";
-		}
-
-
-	Sending back audit info back to src Table
-	=========================================
-
-	Use $rep->updateSrcFn. This can be an array of strings, or the name of a php function to call.
-
-	If an array of strings is defined, then it will perform an update statement...
-
-		UPDATE srctable SET $string WHERE ....
-
-	With $string set to the array you define. If a new record was inserted into desttable, then the
-	'INS' string is used ($INSERT_ID will be replaced with the real INSERT_ID, if any),
-	and if an update then use the 'UPD' string.
-
-		array(
-			'INS' => 'insertid = $INSERT_ID, copieddate=getdate(), copied = 1',
-			'UPD' => 'copieddate=getdate(), copied = 1'
-		)
-
-	If a single string array is defined, then it will be used for both insert and update.
-		array('copieddate=getdate(), copied = 1')
-
-	Note that the where clause is automatically defined by the system.
-
-	If $rep->updateSrcFn is a PHP function name, then it will be called with the following params:
-
-		$fn($srcConnection, $tableName, $row, $where, $bindarr, $mode, $dest_insertid)
-
-	$srcConnection - source db connection
-	$tableName	- source tablename
-	$row - array holding records updated into dest
-	$where - where clause to be used (uses bind vars)
-	$bindarr - array holding bind variables for where clause
-	$mode - INS or UPD
-	$dest_insertid - when mode=INS, then the insert_id is stored here.
-
-
-		oracle  mssql
-		        ---> insert
-		mssqlid	<--- insert_id
-		       ----> update with mssqlid
-			   <---- update with mssqlid
-
-
-	TODO: add src pkey and dest pkey for updates. Also sql stmt needs to be tuned, so dest pkey, src pkey
-	*/
-
-
-	function ReplicateData($table, $desttable = '',  $uniqflds = array(), $where = '',$ignore_flds = array(),
-		$dstCopyDateFld='', $extraflds = array(), $lastUpdateFld = '')
-	{
-		if (is_array($where)) {
-			$wheresrc = $where[0];
-			$wheredest = $where[1];
-		} else {
-			$wheresrc = $wheredest = $where;
-		}
-		$dstCopyDateName = $dstCopyDateFld;
-		$dstCopyDateFld = strtoupper($dstCopyDateFld);
-
-		$this->_clearcache();
-		if (is_string($uniqflds) && strlen($uniqflds)) $uniqflds = array($uniqflds);
-		if (!$desttable) $desttable = $table;
-
-		$uniq = array();
-		if ($uniqflds) {
-			if (is_array(reset($uniqflds))) {
-				/*
-					 primary key of src and dest tables differ. This means when we perform the select stmts
-					 we retrieve both keys. Then any insert statement will have to ignore one array element.
-					 Any update statement will need to use a different where clause
-				*/
-				$destuniqflds = $uniqflds[0];
-				if (sizeof($uniqflds)>1 && $uniqflds[1]) // srckey field name in dest table
-					$srcuniqflds = $uniqflds[1];
-				else
-					$srcuniqflds = array();
-
-				if (sizeof($uniqflds)>2)
-					$srcPKDest = reset($uniqflds[2]);
-
-			} else {
-				$destuniqflds = $uniqflds;
-				$srcuniqflds = array();
-			}
-			$onlyInsert = false;
-			foreach($destuniqflds as $k => $u) {
-				if ($u == '*INSERTONLY*' || $u == '*ONLYINSERT*') {
-					$onlyInsert = true;
-					continue;
-				}
-				$uniq[strtoupper($u)] = $k;
-			}
-			$deleteFirst = $this->deleteFirst;
-		} else {
-			$deleteFirst = true;
-		}
-
-		if ($deleteFirst) $onlyInsert = true;
-
-		if ($ignore_flds) {
-			foreach($ignore_flds as $u) {
-				$ignoreflds[strtoupper($u)] = 1;
-			}
-		} else
-			$ignoreflds = array();
-
-		$src = $this->connSrc;
-		$dest = $this->connDest;
-		$src2 = $this->connSrc2;
-
-		$dest->noNullStrings = false;
-		$src->noNullStrings = false;
-		$src2->noNullStrings = false;
-
-		if ($src === $dest) $this->execute = false;
-
-		$types = $src->MetaColumns($table);
-		if (!$types) {
-			echo "Source $table does not exist
\n";
-			return array();
-		}
-		$dtypes = $dest->MetaColumns($desttable);
-		if (!$dtypes) {
-			echo "Destination $desttable does not exist
\n";
-			return array();
-		}
-		$sa = array();
-		$selflds = array();
-		$wheref = array();
-		$wheres = array();
-		$srcwheref = array();
-		$fldoffsets = array();
-		$k = 0;
-		foreach($types as $name => $t) {
-			$name2 = strtoupper($this->RunFieldFilter($name,'SELECT'));
-			// handle quotes
-			if ($name2 && $name2[0] == '"' && $name2[strlen($name2)-1] == '"') $name22 = substr($name2,1,strlen($name2)-2);
-			elseif ($name2 && $name2[0] == '`' && $name2[strlen($name2)-1] == '`') $name22 = substr($name2,1,strlen($name2)-2);
-			else $name22 = $name2;
-
-			//else $name22 = $name2; // this causes problem for quotes strip above
-
-			if (!isset($dtypes[($name22)]) || !$name2) {
-				if ($this->debug) echo " Skipping $name ==> $name2 as not in destination $desttable
";
-				continue;
-			}
-
-			if ($name2 == $dstCopyDateFld) {
-				$dstCopyDateName = $t->name;
-				continue;
-			}
-
-			$fld = $t->name;
-			$fldval = $t->name;
-			$mt = $src->MetaType($t->type);
-			if ($this->datesAreTimeStamps && $mt == 'D') $mt = 'T';
-			if ($mt == 'D') $fldval = $dest->DBDate($fldval);
-			elseif ($mt == 'T') $fldval = $dest->DBTimeStamp($fldval);
-			$ufld = strtoupper($fld);
-
-			if (isset($ignoreflds[($name2)]) && !isset($uniq[$ufld])) {
-				continue;
-			}
-
-			if ($this->debug) echo " field=$fld type=$mt fldval=$fldval
";
-
-			if (!isset($uniq[$ufld])) {
-
-				$selfld = $fld;
-				$fld = $this->RunFieldFilter($selfld,'SELECT');
-				$selflds[] = $selfld;
-
-				$p = $dest->Param($k);
-
-				if ($mt == 'D') $p = $dest->DBDate($p, true);
-				else if ($mt == 'T') $p = $dest->DBTimeStamp($p, true);
-
-				# UPDATES
-				$sets[] = "$fld = ".$this->RunUpdateFilter($desttable, $fld, $p);
-
-				# INSERTS
-				$insflds[] = $this->RunInsertFilter($desttable,$fld, $p); $params[] = $p;
-				$k++;
-			} else {
-				$fld = $this->RunFieldFilter($fld);
-				$wheref[] = $fld;
-				if (!empty($srcuniqflds)) $srcwheref[] = $srcuniqflds[$uniq[$ufld]];
-				if ($mt == 'C') { # normally we don't include the primary key in the insert if it is numeric, but ok if varchar
-					$insertpkey = true;
-				}
-			}
-		}
-
-
-		foreach($extraflds as $fld => $evals) {
-			if (!is_array($evals)) $evals = array($evals, $evals);
-			$insflds[] = $this->RunInsertFilter($desttable,$fld, $p); $params[] = $evals[0];
-			$sets[] = "$fld = ".$evals[1];
-		}
-
-		if ($dstCopyDateFld) {
-			$sets[] = "$dstCopyDateName = ".$dest->sysTimeStamp;
-			$insflds[] = $this->RunInsertFilter($desttable,$dstCopyDateName, $p); $params[] = $dest->sysTimeStamp;
-		}
-
-
-		if (!empty($srcPKDest)) {
-			$selflds[] = $srcPKDest;
-			$fldoffsets = array($k+1);
-		}
-
-		foreach($wheref as $uu => $fld) {
-
-			$p = $dest->Param($k);
-			$sp = $src->Param($k);
-			if (!empty($srcuniqflds)) {
-				if ($uu > 1) die("Only one primary key for srcuniqflds allowed currently");
-				$destsrckey = reset($srcuniqflds);
-				$wheres[] = reset($srcuniqflds).' = '.$p;
-
-				$insflds[] = $this->RunInsertFilter($desttable,$destsrckey, $p);
-				$params[] = $p;
-			} else {
-				$wheres[] = $fld.' = '.$p;
-				if (!isset($ignoreflds[strtoupper($fld)]) || !empty($insertpkey)) {
-					$insflds[] = $this->RunInsertFilter($desttable,$fld, $p);
-					$params[] = $p;
-				}
-			}
-
-			$selflds[] = $fld;
-			$srcwheres[] = $fld.' = '.$sp;
-			$fldoffsets[] = $k;
-
-			$k++;
-		}
-
-		if (!empty($srcPKDest)) {
-			$fldoffsets = array($k);
-			$srcwheres = array($fld.'='.$src->Param($k));
-			$k++;
-		}
-
-		if ($lastUpdateFld) {
-			$selflds[] = $lastUpdateFld;
-		} else
-			$selflds[] = 'null as Z55_DUMMY_LA5TUPD';
-
-		$insfldss = implode(', ', $insflds);
-		$fldss = implode(', ', $selflds);
-		$setss = implode(', ', $sets);
-		$paramss = implode(', ', $params);
-		$wheress = implode(' AND ', $wheres);
-		if (isset($srcwheres))
-			$srcwheress = implode(' AND ',$srcwheres);
-
-
-		$seltable = $table;
-		if ($this->readUncommitted && strpos($src->databaseType,'mssql')) $seltable .= ' with (NOLOCK)';
-
-		$sa['SEL'] = "SELECT $fldss FROM $seltable $wheresrc";
-		$sa['INS'] = "INSERT INTO $desttable ($insfldss) VALUES ($paramss) /**INS**/";
-		$sa['UPD'] = "UPDATE $desttable SET $setss WHERE $wheress /**UPD**/";
-
-
-
-		$DB1 = "/*  Source DB - sample sql in case you need to adapt code\n\n";
-		$DB2 = "/*  Dest DB - sample sql in case you need to adapt code\n\n";
-
-		if (!$this->execute) echo '/*
*/
-';
-		if ($deleteFirst && $this->deleteFirst) {
-			$where = preg_replace('/[ \n\r\t]+order[ \n\r\t]+by.*$/i', '', $where);
-			$sql = "DELETE FROM $desttable $wheredest\n";
-			if (!$this->execute) echo $DB2,'*/',$sql,"\n";
-			else $dest->Execute($sql);
-		}
-
-		global $ADODB_COUNTRECS;
-		$err = false;
-		$savemode = $src->setFetchMode(ADODB_FETCH_NUM);
-		$ADODB_COUNTRECS = false;
-
-		if (!$this->execute) {
-			echo $DB1,$sa['SEL'],"\n*/\n\n";
-			echo $DB2,$sa['INS'],"\n*/\n\n";
-			$suffix = ($onlyInsert) ? ' PRIMKEY=?' : '';
-			echo $DB2,$sa['UPD'],"$suffix\n*/\n\n";
-
-			$rs = $src->Execute($sa['SEL']);
-			$cnt = 1;
-			$upd = 0;
-			$ins = 0;
-
-			$sqlarr = explode('?',$sa['INS']);
-			$nparams = sizeof($sqlarr)-1;
-
-			$useQmark = $dest && ($dest->dataProvider != 'oci8');
-
-			while ($rs && !$rs->EOF) {
-				if ($useQmark) {
-					$sql = ''; $i = 0;
-					$arr = array_reverse($rs->fields);
-					foreach ($arr as $v) {
-						$sql .= $sqlarr[$i];
-						// from Ron Baldwin 
-						// Only quote string types
-						$typ = gettype($v);
-						if ($typ == 'string')
-							//New memory copy of input created here -mikefedyk
-							$sql .= $dest->qstr($v);
-						else if ($typ == 'double')
-							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
-						else if ($typ == 'boolean')
-							$sql .= $v ? $dest->true : $dest->false;
-						else if ($typ == 'object') {
-							if (method_exists($v, '__toString')) $sql .= $dest->qstr($v->__toString());
-							else $sql .= $dest->qstr((string) $v);
-						} else if ($v === null)
-							$sql .= 'NULL';
-						else
-							$sql .= $v;
-						$i += 1;
-
-						if ($i == $nparams) break;
-					} // while
-
-					if (isset($sqlarr[$i])) {
-						$sql .= $sqlarr[$i];
-					}
-					$INS = $sql;
-				} else {
-					$INS = $sa['INS'];
-					$arr = array_reverse($rs->fields);
-					foreach($arr as $k => $v) { // only works on oracle currently
-						$k = sizeof($arr)-$k-1;
-						$v = str_replace(":","%~%COLON%!%",$v);
-						$INS = str_replace(':'.$k,$this->fixupbinary($dest->qstr($v)),$INS);
-					}
-					$INS = str_replace("%~%COLON%!%",":",$INS);
-					if ($this->htmlSpecialChars) $INS = htmlspecialchars($INS);
-				}
-				echo "-- $cnt\n",$INS,";\n\n";
-				$cnt += 1;
-				$ins += 1;
-				$rs->MoveNext();
-			}
-			$src->setFetchMode($savemode);
-			return $sa;
-		} else {
-			$saved = $src->debug;
-			#$src->debug=1;
-			if ($this->limitRecs>100)
-				$rs = $src->SelectLimit($sa['SEL'],$this->limitRecs);
-			else
-				$rs = $src->Execute($sa['SEL']);
-			$src->debug = $saved;
-			if (!$rs) {
-				if ($this->errHandler) $this->_doerr('SEL',array());
-				return array(0,0,0,0);
-			}
-
-
-			if ($this->commitReplicate || $commitRecs > 0) {
-				$dest->BeginTrans();
-				if ($this->updateSrcFn) $src2->BeginTrans();
-			}
-
-			if ($this->updateSrcFn && strpos($src2->databaseType,'mssql') !== false) {
-				# problem is writers interfere with readers in mssql
-				$rs = $src->_rs2rs($rs);
-			}
-			$cnt = 0;
-			$upd = 0;
-			$ins = 0;
-
-			$sizeofrow = sizeof($selflds);
-
-			$fn = $this->selFilter;
-			$commitRecs = $this->commitRecs;
-
-			$saved = $dest->debug;
-
-			if ($this->deleteFirst) $onlyInsert = true;
-			while ($origrow = $rs->FetchRow()) {
-
-				if ($dest->debug) {flush(); @ob_flush();}
-
-				if ($fn) {
-					if (!$fn($desttable, $origrow, $deleteFirst, $this, $selflds)) continue;
-				}
-				$doinsert = true;
-				$row = array_slice($origrow,0,$sizeofrow-1);
-
-				if (!$onlyInsert) {
-					$doinsert = false;
-					$upderr = false;
-
-					if (isset($srcPKDest)) {
-						if (is_null($origrow[$sizeofrow-3])) {
-							$doinsert = true;
-							$upderr = true;
-						}
-					}
-					if (!$upderr && !$dest->Execute($sa['UPD'],$row)) {
-						$err = true;
-						$upderr = true;
-						if ($this->errHandler) $this->_doerr('UPD',$row);
-						if (!$this->neverAbort) break;
-					}
-
-				 	if ($upderr || $dest->Affected_Rows() == 0) {
-						$doinsert = true;
-					} else {
-						if (!empty($uniqflds)) $this->RunUpdateSrcFn($src2, $table, $fldoffsets, $origrow, $srcwheress, 'UPD', null, $lastUpdateFld);
-						$upd += 1;
-					}
-				}
-
-				if ($doinsert) {
-					$inserr = false;
-					if (isset($srcPKDest)) {
-						$row = array_slice($origrow,0,$sizeofrow-2);
-					}
-
-					if (! $dest->Execute($sa['INS'],$row)) {
-						$err = true;
-						$inserr = true;
-						if ($this->errHandler) $this->_doerr('INS',$row);
-						if ($this->neverAbort) continue;
-						else break;
-					} else {
-						if ($dest->dataProvider == 'oci8') {
-							if ($this->oracleSequence) $lastid = $dest->GetOne("select ".$this->oracleSequence.".currVal from dual");
-						 	else $lastid = 'null';
-						} else {
-							$lastid = $dest->Insert_ID();
-						}
-
-						if (!$inserr && !empty($uniqflds)) {
-							$this->RunUpdateSrcFn($src2, $table, $fldoffsets, $origrow, $srcwheress, 'INS', $lastid,$lastUpdateFld);
-						}
-						$ins += 1;
-					}
-				}
-				$cnt += 1;
-
-				if ($commitRecs > 0 && ($cnt % $commitRecs) == 0) {
-					$dest->CommitTrans();
-					$dest->BeginTrans();
-
-					if ($this->updateSrcFn) {
-						$src2->CommitTrans();
-						$src2->BeginTrans();
-					}
-				}
-
-			} // while
-
-
-			if ($this->commitReplicate || $commitRecs > 0) {
-				if (!$this->neverAbort && $err) {
-					$dest->RollbackTrans();
-					if ($this->updateSrcFn) $src2->RollbackTrans();
-				} else {
-					$dest->CommitTrans();
-					if ($this->updateSrcFn) $src2->CommitTrans();
-				}
-			}
-		}
-		if ($cnt != $ins + $upd) echo "
ERROR: $cnt != INS $ins + UPD $upd
";
-		$src->setFetchMode($savemode);
-		return array(!$err, $cnt, $ins, $upd);
-	}
-	// trigger support only for sql server and oracle
-	// need to add
-	function MergeSrcSetup($srcTable,  $pkeys, $srcUpdateDateFld, $srcCopyDateFld, $srcCopyFlagFld,
-		$srcCopyFlagType='C(1)', $srcCopyFlagVals = array('Y','N','P','='))
-	{
-		$sqla = array();
-		$src = $this->connSrc;
-		$idx = $srcTable.'_mrgIdx';
-		$cols = $src->MetaColumns($srcTable);
-		#adodb_pr($cols);
-		if (!isset($cols[strtoupper($srcUpdateDateFld)])) {
-			$sqla = $this->ddSrc->AddColumnSQL($srcTable, "$srcUpdateDateFld TS DEFTIMESTAMP");
-			foreach($sqla as $sql) $src->Execute($sql);
-		}
-
-		if ($srcCopyDateFld && !isset($cols[strtoupper($srcCopyDateFld)])) {
-			$sqla = $this->ddSrc->AddColumnSQL($srcTable, "$srcCopyDateFld TS DEFTIMESTAMP");
-			foreach($sqla as $sql) $src->Execute($sql);
-		}
-
-		$sysdate = $src->sysTimeStamp;
-		$arrv0 = $src->qstr($srcCopyFlagVals[0]);
-		$arrv1 = $src->qstr($srcCopyFlagVals[1]);
-		$arrv2 = $src->qstr($srcCopyFlagVals[2]);
-		$arrv3 = $src->qstr($srcCopyFlagVals[3]);
-
-		if ($srcCopyFlagFld && !isset($cols[strtoupper($srcCopyFlagFld)])) {
-			$sqla = $this->ddSrc->AddColumnSQL($srcTable, "$srcCopyFlagFld  $srcCopyFlagType DEFAULT $arrv1");
-			foreach($sqla as $sql) $src->Execute($sql);
-		}
-
-		$sqla = array();
-
-
-		$name = "{$srcTable}_mrgTr";
-		if (is_array($pkeys) && strpos($src->databaseType,'mssql') !== false) {
-			$pk = reset($pkeys);
-
-			#$sqla[] = "DROP TRIGGER $name";
-			$sqltr = "
-	 TRIGGER $name
-	ON $srcTable /* for data replication and merge */
-	AFTER UPDATE
-	AS
-	  UPDATE $srcTable
-	  SET
-	  	$srcUpdateDateFld = case when I.$srcCopyFlagFld = $arrv2 or I.$srcCopyFlagFld = $arrv3 then I.$srcUpdateDateFld
-						else $sysdate end,
-	  	$srcCopyFlagFld = case
-			when I.$srcCopyFlagFld = $arrv2 then $arrv0
-			when I.$srcCopyFlagFld = $arrv3 then D.$srcCopyFlagFld
-			else $arrv1 end
-	  FROM $srcTable S Join Inserted AS I on I.$pk = S.$pk
-	  JOIN Deleted as D ON I.$pk = D.$pk
-		WHERE I.$srcCopyFlagFld = D.$srcCopyFlagFld or I.$srcCopyFlagFld = $arrv2
-		or I.$srcCopyFlagFld = $arrv3 or I.$srcCopyFlagFld is null
-	";
-			$sqla[] = 'CREATE '.$sqltr; // first if does not exists
-			$sqla[] = 'ALTER '.$sqltr; // second if it already exists
-		} else if (strpos($src->databaseType,'oci') !== false) {
-
-			if (strlen($srcTable)>22) $tableidx = substr($srcTable,0,16).substr(crc32($srcTable),6);
-			else $tableidx = $srcTable;
-
-			$name = $tableidx.$this->trgSuffix;
-			$idx = $tableidx.$this->idxSuffix;
-			$sqla[] = "
-CREATE OR REPLACE TRIGGER $name /* for data replication and merge */
-BEFORE UPDATE ON $srcTable REFERENCING NEW AS NEW OLD AS OLD
-FOR EACH ROW
-BEGIN
-	if :new.$srcCopyFlagFld = $arrv2 then
-		:new.$srcCopyFlagFld := $arrv0;
-	elsif :new.$srcCopyFlagFld = $arrv3 then
-		:new.$srcCopyFlagFld := :old.$srcCopyFlagFld;
-	elsif :old.$srcCopyFlagFld = :new.$srcCopyFlagFld or :new.$srcCopyFlagFld is null then
-		if $this->trLogic then
-			:new.$srcUpdateDateFld := $sysdate;
-	 		:new.$srcCopyFlagFld := $arrv1;
-		end if;
-	end if;
-END;
-";
-		}
-		foreach($sqla as $sql) $src->Execute($sql);
-
-		if ($srcCopyFlagFld) $srcCopyFlagFld .= ', ';
-		$src->Execute("CREATE INDEX {$idx} on $srcTable ($srcCopyFlagFld$srcUpdateDateFld)");
-	}
-
-
-	/*
-		Perform Merge by copying all data modified from src to dest
-			then update src copied flag if present.
-
-		Returns array taken from ReplicateData:
-
-	Returns an array:
-		$arr[0] =  true if no error, false if error
-		$arr[1] =  number of recs processed
-		$arr[2] = number of successful inserts
-		$arr[3] = number of successful updates
-
-		$srcTable = src table
-		$dstTable = dest table
-		$pkeys    = primary keys array. if empty, then only inserts will occur
-		$srcignoreflds = ignore these flds (must be upper cased)
-		$setsrc        = updateSrcFn string
-		$srcUpdateDateFld = field in src with the last update date
-		$srcCopyFlagFld = false = optional field that holds the copied indicator
-		$flagvals=array('Y','N','P','=') = array of values indicating array(copied, not copied).
-			Null is assumed to mean not copied. The 3rd value 'P' indicates that we want to force 'Y', bypassing
-			default trigger behaviour to reset the COPIED='N' when the record is replicated from other side.
-			The last value '=' is don't change copyflag.
-		$srcCopyDateFld = field that holds last copy date in src table, which will be updated on Merge()
-		$dstCopyDateFld = field that holds last copy date in dst table, which will be updated on Merge()
-		$defaultDestRaiseErrorFn = The adodb raiseErrorFn handler. Default is to not raise an error.
-								 	Just output error message to stdout
-
-	*/
-
-
-	function Merge($srcTable, $dstTable, $pkeys, $srcignoreflds, $setsrc,
-		$srcUpdateDateFld,
-		$srcCopyFlagFld,  $flagvals=array('Y','N','P','='),
-		$srcCopyDateFld = false,
-		$dstCopyDateFld = false,
-		$whereClauses = '',
-		$orderBy = '', # MUST INCLUDE THE "ORDER BY" suffix
-		$copyDoneFlagIdx = 3,
-		$defaultDestRaiseErrorFn = '')
-	{
-		$src = $this->connSrc;
-		$dest = $this->connDest;
-
-		$time = $src->Time();
-
-		$delfirst = $this->deleteFirst;
-		$upd = $this->updateSrcFn;
-
-		$this->deleteFirst = false;
-		//$this->updateFirst = true;
-
-		$srcignoreflds[] = $srcUpdateDateFld;
-		$srcignoreflds[] = $srcCopyFlagFld;
-		$srcignoreflds[] = $srcCopyDateFld;
-
-		if (empty($whereClauses)) $whereClauses = '1=1';
-		$where = " WHERE ($whereClauses) and ($srcCopyFlagFld = ".$src->qstr($flagvals[1]).')';
-		if ($orderBy) $where .= ' '.$orderBy;
-		else $where .= ' ORDER BY '.$srcUpdateDateFld;
-
-		if ($setsrc) $set[] = $setsrc;
-		else $set = array();
-
-		if ($srcCopyFlagFld) $set[] = "$srcCopyFlagFld = ".$src->qstr($flagvals[2]);
-		if ($srcCopyDateFld) $set[]= "$srcCopyDateFld = ".$src->sysTimeStamp;
-		if ($set) $this->updateSrcFn = array(implode(', ',$set));
-		else $this->updateSrcFn = '';
-
-
-		$extra[$srcCopyFlagFld] = array($dest->qstr($flagvals[0]),$dest->qstr($flagvals[$copyDoneFlagIdx]));
-
-		$saveraise = $dest->raiseErrorFn;
-		$dest->raiseErrorFn = '';
-
-		if ($this->compat && $this->compat == 1.0) $srcUpdateDateFld = '';
-		$arr = $this->ReplicateData($srcTable, $dstTable, $pkeys, $where, $srcignoreflds,
-			 $dstCopyDateFld,$extra,$srcUpdateDateFld);
-
-		$dest->raiseErrorFn = $saveraise;
-
-		$this->updateSrcFn = $upd;
-		$this->deleteFirst = $delfirst;
-
-		return $arr;
-	}
-	/*
-		If doing a 2 way merge, then call
-			$rep->Merge()
-		to save without modifying the COPIEDFLAG ('=').
-
-		Then can the following to set the COPIEDFLAG to 'P' which forces the COPIEDFLAG = 'Y'
-			$rep->MergeDone()
-	*/
-
-	function MergeDone($srcTable, $dstTable, $pkeys, $srcignoreflds, $setsrc,
-		$srcUpdateDateFld,
-		$srcCopyFlagFld,  $flagvals=array('Y','N','P','='),
-		$srcCopyDateFld = false,
-		$dstCopyDateFld = false,
-		$whereClauses = '',
-		$orderBy = '', # MUST INCLUDE THE "ORDER BY" suffix
-		$copyDoneFlagIdx = 2,
-		$defaultDestRaiseErrorFn = '')
-	{
-		return  $this->Merge($srcTable, $dstTable, $pkeys, $srcignoreflds, $setsrc,
-		$srcUpdateDateFld,
-		$srcCopyFlagFld,  $flagvals,
-		$srcCopyDateFld,
-		$dstCopyDateFld,
-		$whereClauses,
-		$orderBy, # MUST INCLUDE THE "ORDER BY" suffix
-		$copyDoneFlagIdx,
-		$defaultDestRaiseErrorFn);
-	}
-
-	function _doerr($reason, $selflds)
-	{
-		$fn = $this->errHandler;
-		if ($fn) $fn($this, $reason, $selflds); // set $this->neverAbort to true or false as required inside $fn
-	}
-}
diff --git a/vendor/adodb/adodb-php/replicate/replicate-steps.php b/vendor/adodb/adodb-php/replicate/replicate-steps.php
deleted file mode 100644
index 5b696568d4..0000000000
--- a/vendor/adodb/adodb-php/replicate/replicate-steps.php
+++ /dev/null
@@ -1,137 +0,0 @@
-Connect($HOST,$USER,$PWD,$DBASE);
-if (!$ok) return;
-
-
-#$DB->debug=1;
-
-$bkup = 'tmp'.date('ymd_His');
-
-
-if ($BA) {
-	$QTY_BA = " and qu_bacode='$BA'";
-	if (1) $STP_BA = " and s_stagecat in (select stg_stagecat from kbstage where stg_bacode='$BA')"; # OLDER KBSTEP
-	else $STP_BA = " and s_bacode='$BA'";  # LATEST KBSTEP format
-	$STG_BA = " and stg_bacode='$BA'";
-} else {
-	$QTY_BA = "";
-	$STP_BA = "";
-	$STG_BA = "";
-}
-
-if ($STAGES) {
-
-	$STAGES = explode(',',$STAGES);
-	$STAGES = "'".implode("','",$STAGES)."'";
-	$QTY_STG = " and qu_stagecat in ($STAGES)";
-	$STP_STG = " and s_stagecat in ($STAGES)";
-	$STG_STG = " and stg_stagecat in ($STAGES)";
-} else {
-	$QTY_STG = "";
-	$STP_STG = "";
-	$STG_STG = "";
-}
-
-echo "
-
-/******************************************************************************
-
- Migrate stages, steps and qtypes for the following
-
-  business area: $BA
-     and stages: $STAGES
-
-
- WARNING: DO NOT 'Ignore All Errors'.
- If any error occurs, make sure you stop and check the reason and fix it.
- Otherwise you could corrupt everything!!!
-
- Connected to $USER@$DBASE $HOST;
-
-*******************************************************************************/
-
--- BACKUP
-create table kbstage_$bkup as select * from kbstage;
-create table kbstep_$bkup as select * from kbstep;
-create table kbqtype_$bkup as select * from kbqtype;
-
-
--- IF CODE FAILS, REMEMBER TO RENABLE ALL TRIGGERS and following CONSTRAINT
-ALTER TABLE kbstage DISABLE all triggers;
-ALTER TABLE kbstep DISABLE all triggers;
-ALTER TABLE kbqtype DISABLE all triggers;
-ALTER TABLE jqueue DISABLE CONSTRAINT QUEUE_MUST_HAVE_TYPE;
-
-
--- NOW DELETE OLD STEPS/STAGES/QUEUES
-delete from kbqtype where qu_mode in ('STAGE','STEP') $QTY_BA $QTY_STG;
-delete from kbstep where (1=1) $STP_BA$STP_STG;
-delete from kbstage where (1=1)$STG_BA$STG_STG;
-
-
-
-SET DEFINE OFF; -- disable  variable handling by sqlplus
-/
-/* Assume kbstrategy and business areas are compatible for steps and stages to be copied */
-

-
-";
-
-
-$rep = new ADODB_Replicate($DB,$DB);
-$rep->execute = false;
-$rep->deleteFirst = false;
-
-				// src table name, dst table name, primary key, where condition
-$rep->ReplicateData('KBSTAGE', 'KBSTAGE', array(), " where (1=1)$STG_BA$STG_STG");
-$rep->ReplicateData('KBSTEP', 'KBSTEP', array(), " where (1=1)$STP_BA$STP_STG");
-$rep->ReplicateData('KBQTYPE','KBQTYPE',array()," where qu_mode in ('STAGE','STEP')$QTY_BA$QTY_STG");
-
-echo "
-
--- Check for QUEUES not in KBQTYPE and FIX by copying from kbqtype_$bkup
-begin
-for rec in (select distinct q_type from jqueue where q_type not in (select qu_code from kbqtype)) loop
-	insert into kbqtype select * from kbqtype_$bkup where qu_code = rec.q_type;
-	update kbqtype set qu_name=substr('MISSING.'||qu_name,1,64) where qu_code=rec.q_type;
-end loop;
-end;
-/
-
-commit;
-
-
-ALTER TABLE kbstage ENABLE all triggers;
-ALTER TABLE kbstep ENABLE all triggers;
-ALTER TABLE kbqtype ENABLE all triggers;
-ALTER TABLE jqueue ENABLE CONSTRAINT QUEUE_MUST_HAVE_TYPE;
-
-/*
--- REMEMBER TO COMMIT
-	commit;
-	begin Juris.UpdateQCounts; end;
-
--- To check for bad queues after conversion, run this
-	select * from kbqtype where qu_name like 'MISSING%'
-*/
-/
-";
diff --git a/vendor/adodb/adodb-php/replicate/test-tnb.php b/vendor/adodb/adodb-php/replicate/test-tnb.php
deleted file mode 100644
index f163ff4f55..0000000000
--- a/vendor/adodb/adodb-php/replicate/test-tnb.php
+++ /dev/null
@@ -1,421 +0,0 @@
- 28) $idxname = substr($idxname,0,24).rand(1000,9999);
-	return $idxname;
-}
-
-function SelFilter($table, &$arr, $delfirst)
-{
-	return true;
-}
-
-function updatefilter($table, $fld, $val)
-{
-	return "nvl($fld, $val)";
-}
-
-
-function FieldFilter(&$fld,$mode)
-{
-	$uf = strtoupper($fld);
-	switch($uf) {
-		case 'SIZEFLD':
-			return 'Size';
-
-		case 'GROUPFLD':
-			return 'Group';
-
-		case 'GROUP':
-			if ($mode == 'SELECT') $fld = '"Group"';
-			return 'GroupFld';
-		case 'SIZE':
-			if ($mode == 'SELECT') $fld = '"Size"';
-			return 'SizeFld';
-	}
-	return $fld;
-}
-
-function ParseTable(&$table, &$pkey)
-{
-	$table = trim($table);
-	if (strlen($table) == 0) return false;
-	if (strpos($table, '#') !== false) {
-		$at = strpos($table, '#');
-		$table = trim(substr($table,0,$at));
-		if (strlen($table) == 0) return false;
-	}
-
-	$tabarr = explode(',',$table);
-	if (sizeof($tabarr) == 1) {
-		$table = $tabarr[0];
-		$pkey = '';
-		echo "No primary key for $table ****  **** 
";
-	} else {
-		$table = trim($tabarr[0]);
-		$pkey = trim($tabarr[1]);
-		if (strpos($pkey,' ') !== false) echo "Bad PKEY for $table $pkey
";
-	}
-
-	return true;
-}
-
-global $TARR;
-
-function TableStats($rep, $table, $pkey)
-{
-global $TARR;
-
-	if (empty($TARR)) $TARR = array();
-	$cnt = $rep->connSrc->GetOne("select count(*) from $table");
-	if (isset($TARR[$table])) echo "
Table $table repeated twice
";
-	$TARR[$table] = $cnt;
-
-	if ($pkey) {
-		$ok = $rep->connSrc->SelectLimit("select $pkey from $table",1);
-		if (!$ok) echo "
$table: $pkey does not exist
";
-	} else
-		echo "
$table: no primary key
";
-}
-
-function CreateTable($rep, $table)
-{
-## CREATE TABLE
-	#$DB2->Execute("drop table $table");
-
-	$rep->execute = true;
-	$ok = $rep->CopyTableStruct($table);
-	if ($ok) echo "Table Created
\n";
-	else {
-		echo "
Error: Cannot Create Table
\n";
-	}
-	flush();@ob_flush();
-}
-
-function CopyData($rep, $table, $pkey)
-{
-	$dtable = $table;
-
-	$rep->execute = true;
-	$rep->deleteFirst = true;
-
-	$secs = time();
-	$rows = $rep->ReplicateData($table,$dtable,array($pkey));
-	$secs = time() - $secs;
-	if (!$rows || !$rows[0] || !$rows[1] || $rows[1] != $rows[2]+$rows[3]) {
-		echo "
Error: "; var_dump($rows);  echo " (secs=$secs) 
\n";
-	} else
-		echo date('H:i:s'),': ',$rows[1]," record(s) copied, ",$rows[2]," inserted, ",$rows[3]," updated (secs=$secs)
\n";
-	flush();@ob_flush();
-}
-
-function MergeDataJohnTest($rep, $table, $pkey)
-{
-	$rep->SwapDBs();
-
-	$dtable = $table;
-	$rep->oracleSequence = 'LGBSEQUENCE';
-
-#	$rep->MergeSrcSetup($table, array($pkey),'UpdatedOn','CopiedFlag');
-	if (strpos($rep->connDest->databaseType,'mssql') !== false)  {  # oracle ==> mssql
-		$ignoreflds = array($pkey);
-		$ignoreflds[] = 'MSSQL_ID';
-		$set = 'MSSQL_ID=nvl($INSERT_ID,MSSQL_ID)';
-		$pkeyarr = array(array($pkey),false,array('MSSQL_ID'));# array('MSSQL_ID', 'ORA_ID'));
-	} else {  # mssql ==> oracle
-		$ignoreflds = array($pkey);
-		$ignoreflds[] = 'ORA_ID';
-		$set = '';
-		#$set = 'ORA_ID=isnull($INSERT_ID,ORA_ID)';
-		$pkeyarr = array(array($pkey),array('MSSQL_ID'));
-	}
-	$rep->execute = true;
-	#$rep->updateFirst = false;
-	$ok = $rep->Merge($table, $dtable, $pkeyarr, $ignoreflds, $set, 'UpdatedOn','CopiedFlag',array('Y','N','P','='), 'CopyDate');
-	var_dump($ok);
-
-	#$rep->connSrc->Execute("update JohnTest set name='Apple' where id=4");
-}
-
-$DB = ADONewConnection('odbtp');
-#$ok = $DB->Connect('localhost','root','','northwind');
-$ok = $DB->Connect('192.168.0.1','DRIVER={SQL Server};SERVER=(local);UID=sa;PWD=natsoft;DATABASE=OIR;','','');
-$DB->_bindInputArray = false;
-
-$DB2 = ADONewConnection('oci8');
-$ok2 = $DB2->Connect('192.168.0.2','tnb','natsoft','RAPTOR','');
-
-if (!$ok || !$ok2) die("Failed connection DB=$ok DB2=$ok2
");
-
-$tables =
-"
-JohnTest,id
-";
-
-# net* are ERMS, need last updated field from LGBnet
-# tblRep* are tables insert or update from Juris, need last updated field also
-# The rest are lookup tables, can copy all from LGBnet
-
-$tablesOrig =
-"
-SysVoltSubLevel,id
-# Lookup table for Restoration Details screen
-sysefi,ID # (not identity)
-sysgenkva,ID #(not identity)
-sysrestoredby,ID  #(not identity)
-# Sel* table added on 24 Oct
-SELSGManufacturer,ID
-SelABCCondSizeLV,ID
-SelABCCondSizeMV,ID
-SelArchingHornSize,ID
-SelBallastSize,ID
-SelBallastType,ID
-SelBatteryType,ID #(not identity)
-SelBreakerCapacity,ID
-SelBreakerType,ID #(not identity)
-SelCBreakerManuf,ID
-SelCTRatio,ID #(not identity)
-SelCableBrand,ID
-SelCableSize,ID
-SelCableSizeLV,ID # (not identity)
-SelCapacitorSize,ID
-SelCapacitorType,ID
-SelColourCode,ID
-SelCombineSealingChamberSize,ID
-SelConductorBrand,ID
-SelConductorSize4,ID
-SelConductorSizeLV,ID
-SelConductorSizeMV,ID
-SelContactorSize,ID
-SelContractor,ID
-SelCoverType,ID
-SelCraddleSize,ID
-SelDeadEndClampBrand,ID
-SelDeadEndClampSize,ID
-SelDevTermination,ID
-SelFPManuf,ID
-SelFPillarRating,ID
-SelFalseTrue,ID
-SelFuseManuf,ID
-SelFuseType,ID
-SelIPCBrand,ID
-SelIPCSize,ID
-SelIgnitorSize,ID
-SelIgnitorType,ID
-SelInsulatorBrand,ID
-SelJoint,ID
-SelJointBrand,ID
-SelJunctionBoxBrand,ID
-SelLVBoardBrand,ID
-SelLVBoardSize,ID
-SelLVOHManuf,ID
-SelLVVoltage,ID
-SelLightningArresterBrand,ID
-SelLightningShieldwireSize,ID
-SelLineTapSize,ID
-SelLocation,ID
-SelMVVoltage,ID
-SelMidSpanConnectorsSize,ID
-SelMidSpanJointSize,ID
-SelNERManuf,ID
-SelNERType,ID
-SelNLinkSize,ID
-SelPVCCondSizeLV,ID
-SelPoleBrand,ID
-SelPoleConcreteSize,ID
-SelPoleSize,ID
-SelPoleSpunConcreteSize,ID
-SelPoleSteelSize,ID
-SelPoleType,ID
-SelPoleWoodSize,ID
-SelPorcelainFuseSize,ID
-SelRatedFaultCurrentBreaker,ID
-SelRatedVoltageSG,ID #(not identity)
-SelRelayType,ID # (not identity)
-SelResistanceValue,ID
-SelSGEquipmentType,ID  # (not identity)
-SelSGInsulationType,ID # (not identity)
-SelSGManufacturer,ID
-SelStayInsulatorSize,ID
-SelSuspensionClampBrand,ID
-SelSuspensionClampSize,ID
-SelTSwitchType,ID
-SelTowerType,ID
-SelTransformerCapacity,ID
-SelTransformerManuf,ID
-SelTransformerType,ID #(not identity)
-SelTypeOfArchingHorn,ID
-SelTypeOfCable,ID     #(not identity)
-SelTypeOfConductor,ID # (not identity)
-SelTypeOfInsulationCB,ID # (not identity)
-SelTypeOfMidSpanJoint,ID
-SelTypeOfSTJoint,ID
-SelTypeSTCable,ID
-SelUGVoltage,ID # (not identity)
-SelVoltageInOut,ID
-SelWireSize,ID
-SelWireType,ID
-SelWonpieceBrand,ID
-#
-# Net* tables added on 24 Oct
-NetArchingHorn,Idx
-NetBatteryBank,Idx # identity, FunctLocation Pri
-NetBiMetal,Idx
-NetBoxFuse,Idx
-NetCable,Idx # identity, FunctLocation Pri
-NetCapacitorBank,Idx # identity, FunctLocation Pri
-NetCircuitBreaker,Idx # identity, FunctLocation Pri
-NetCombineSealingChamber,Idx
-NetCommunication,Idx
-NetCompInfras,Idx
-NetControl,Idx
-NetCraddle,Idx
-NetDeadEndClamp,Idx
-NetEarthing,Idx
-NetFaultIndicator,Idx
-NetFeederPillar,Idx # identity, FunctLocation Pri
-NetGenCable,Idx # identity , FunctLocation Not Null
-NetGenerator,Idx
-NetGrid,Idx
-NetHVOverhead,Idx #identity, FunctLocation Pri
-NetHVUnderground,Idx #identity, FunctLocation Pri
-NetIPC,Idx
-NetInductorBank,Idx
-NetInsulator,Idx
-NetJoint,Idx
-NetJunctionBox,Idx
-NetLVDB,Idx #identity, FunctLocation Pri
-NetLVOverhead,Idx
-NetLVUnderground,Idx # identity, FunctLocation Not Null
-NetLightningArrester,Idx
-NetLineTap,Idx
-NetMidSpanConnectors,Idx
-NetMidSpanJoint,Idx
-NetNER,Idx # identity , FunctLocation Pri
-NetOilPump,Idx
-NetOtherComponent,Idx
-NetPole,Idx
-NetRMU,Idx # identity, FunctLocation Pri
-NetStreetLight,Idx
-NetStrucSupp,Idx
-NetSuspensionClamp,Idx
-NetSwitchGear,Idx # identity, FunctLocation Pri
-NetTermination,Idx
-NetTransition,Idx
-NetWonpiece,Idx
-#
-# comment1
-SelMVFuseType,ID
-selFuseSize,ID
-netRelay,Idx # identity, FunctLocation Pri
-SysListVolt,ID
-sysVoltLevel,ID_SVL
-sysRestoration,ID_SRE
-sysRepairMethod,ID_SRM # (not identity)
-
-sysInterruptionType,ID_SIN
-netTransformer,Idx # identity, FunctLocation Pri
-#
-#
-sysComponent,ID_SC
-sysCodecibs #-- no idea, UpdatedOn(the only column is unique),Ermscode,Cibscode is unique but got null value
-sysCodeno,id
-sysProtection,ID_SP
-sysEquipment,ID_SEQ
-sysAddress #-- no idea, ID_SAD(might be auto gen No)
-sysWeather,ID_SW
-sysEnvironment,ID_SE
-sysPhase,ID_SPH
-sysFailureCause,ID_SFC
-sysFailureMode,ID_SFM
-SysSchOutageMode,ID_SSM
-SysOutageType,ID_SOT
-SysInstallation,ID_SI
-SysInstallationCat,ID_SIC
-SysInstallationType,ID_SIT
-SysFaultCategory,ID_SF #(not identity)
-SysResponsible,ID_SR
-SysProtectionOperation,ID_SPO #(not identity)
-netCodename,CodeNo #(not identity)
-netSubstation,Idx #identity, FunctLocation Pri
-netLvFeeder,Idx # identity, FunctLocation Pri
-#
-#
-tblReport,ReportNo
-tblRepRestoration,ID_RR
-tblRepResdetail,ID_RRD
-tblRepFailureMode,ID_RFM
-tblRepFailureCause,ID_RFC
-tblRepRepairMethod,ReportNo # (not identity)
-tblInterruptionType,ID_TIN
-tblProtType,ID_PT #--capital letter
-tblRepProtection,ID_RP
-tblRepComponent,ID_RC
-tblRepWeather,ID_RW
-tblRepEnvironment,ID_RE
-tblRepSubstation,ID_RSS
-tblInstallationType,ID_TIT
-tblInstallationCat,ID_TIC
-tblFailureCause,ID_TFC
-tblFailureMode,ID_TFM
-tblProtection,ID_TP
-tblComponent,ID_TC
-tblProtdetail,Id # (Id)--capital letter for I
-tblInstallation,ID_TI
-#
-";
-
-
-$tables = explode("\n",$tables);
-
-$rep = new ADODB_Replicate($DB,$DB2);
-$rep->fieldFilter = 'FieldFilter';
-$rep->selFilter = 'SELFILTER';
-$rep->indexFilter = 'IndexFilter';
-
-if (1) {
-	$rep->debug = 1;
-	$DB->debug=1;
-	$DB2->debug=1;
-}
-
-#	$rep->SwapDBs();
-
-$cnt = sizeof($tables);
-foreach($tables as $k => $table) {
-	$pkey = '';
-	if (!ParseTable($table, $pkey)) continue;
-
-	#######################
-
-	$kcnt = $k+1;
-	echo "
($kcnt/$cnt) $table -- $pkey
\n";
-	flush();@ob_flush();
-
-	CreateTable($rep,$table);
-
-
-	# COPY DATA
-
-
-	TableStats($rep, $table, $pkey);
-
-	if ($table == 'JohnTest') MergeDataJohnTest($rep, $table, $pkey);
-	else CopyData($rep, $table, $pkey);
-
-}
-
-
-if (!empty($TARR)) {
-	ksort($TARR);
-	adodb_pr($TARR);
-	asort($TARR);
-	adodb_pr($TARR);
-}
-
-echo "
",date('H:i:s'),": Done";
diff --git a/vendor/adodb/adodb-php/rsfilter.inc.php b/vendor/adodb/adodb-php/rsfilter.inc.php
index 87636323fe..34c5311cf6 100644
--- a/vendor/adodb/adodb-php/rsfilter.inc.php
+++ b/vendor/adodb/adodb-php/rsfilter.inc.php
@@ -1,18 +1,23 @@
   Use specified branch (defaults to '%s' for '.0'
-                                releases, or 'hotfix/' for patches)
-        -d | --debug            Debug mode (ignores upstream: no fetch, allows
-                                build even if local branch is not in sync)
-        -f | --fresh            Create a fresh clone of the repository
-        -k | --keep             Keep build directories after completion
-                                (useful for debugging)
-''' % (
-        path.basename(__file__),
-        release_branch
-    )
-#end usage()
-
-
-def set_version_and_tag(version):
-    '''
-    '''
-    global release_branch, debug_mode, fresh_clone, cleanup
-
-    # Delete existing tag to force creation in debug mode
-    if debug_mode:
-        try:
-            updateversion.tag_delete(version)
-        except:
-            pass
-
-    # Checkout release branch
-    subprocess.call("git checkout %s" % release_branch, shell=True)
-
-    if not debug_mode:
-        # Make sure we're up-to-date, ignore untracked files
-        ret = subprocess.check_output(
-            "git status --branch --porcelain --untracked-files=no",
-            shell=True
-        )
-        if not re.search(release_branch + "$", ret):
-            print "\nERROR: branch must be aligned with upstream"
-            sys.exit(4)
-
-    # Update the code, create commit and tag
-    updateversion.version_set(version)
-
-    # Make sure we don't delete the modified repo
-    if fresh_clone:
-        cleanup = False
-
-
-def main():
-    global release_branch, debug_mode, fresh_clone, cleanup
-
-   # Get command-line options
-    try:
-        opts, args = getopt.gnu_getopt(sys.argv[1:], options, long_options)
-    except getopt.GetoptError, err:
-        print str(err)
-        usage()
-        sys.exit(2)
-
-    if len(args) < 2:
-        usage()
-        print "ERROR: please specify the version and release_path"
-        sys.exit(1)
-
-    for opt, val in opts:
-        if opt in ("-h", "--help"):
-            usage()
-            sys.exit(0)
-
-        elif opt in ("-b", "--branch"):
-            release_branch = val
-
-        elif opt in ("-d", "--debug"):
-            debug_mode = True
-
-        elif opt in ("-f", "--fresh"):
-            fresh_clone = True
-
-        elif opt in ("-k", "--keep"):
-            cleanup = False
-
-    # Mandatory parameters
-    version = updateversion.version_check(args[0])
-    release_path = args[1]
-
-    # Default release branch
-    if updateversion.version_is_patch(version):
-        release_branch = 'hotfix/' + version
-
-    # -------------------------------------------------------------------------
-    # Start the build
-    #
-    global release_prefix
-
-    print "Building ADOdb release %s into '%s'\n" % (
-        version,
-        release_path
-    )
-
-    if debug_mode:
-        print "DEBUG MODE: ignoring upstream repository status"
-
-    if fresh_clone:
-        # Create a new repo clone
-        print "Cloning a new repository"
-        repo_path = tempfile.mkdtemp(prefix=release_prefix + "-",
-                                     suffix=".git")
-        subprocess.call(
-            "git clone %s %s" % (origin_repo, repo_path),
-            shell=True
-        )
-        os.chdir(repo_path)
-    else:
-        repo_path = subprocess.check_output('git root', shell=True).rstrip()
-        os.chdir(repo_path)
-
-        # Check for any uncommitted changes
-        try:
-            subprocess.check_output(
-                "git diff --exit-code && "
-                "git diff --cached --exit-code",
-                shell=True
-                )
-        except:
-            print "ERROR: there are uncommitted changes in the repository"
-            sys.exit(3)
-
-        # Update the repository
-        if not debug_mode:
-            print "Updating repository in '%s'" % os.getcwd()
-            try:
-                subprocess.check_output("git fetch", shell=True)
-            except:
-                print "ERROR: unable to fetch\n"
-                sys.exit(3)
-
-    # Check existence of Tag for version in repo, create if not found
-    try:
-        updateversion.tag_check(version)
-        if debug_mode:
-            set_version_and_tag(version)
-    except:
-        set_version_and_tag(version)
-
-    # Copy files to release dir
-    release_files = release_prefix + version.split(".")[0]
-    release_tmp_dir = path.join(release_path, release_files)
-    print "Copying release files to '%s'" % release_tmp_dir
-    retry = True
-    while True:
-        try:
-            shutil.copytree(
-                repo_path,
-                release_tmp_dir,
-                ignore=shutil.ignore_patterns(*exclude_list)
-            )
-            break
-        except OSError, err:
-            # First try and file exists, try to delete dir
-            if retry and err.errno == errno.EEXIST:
-                print "WARNING: Directory '%s' exists, delete it and retry" % (
-                    release_tmp_dir
-                )
-                shutil.rmtree(release_tmp_dir)
-                retry = False
-                continue
-            else:
-                # We already tried to delete or some other error occured
-                raise
-
-    # Create tarballs
-    print "Creating release tarballs..."
-    release_name = release_prefix + '-' + version
-    print release_prefix, version, release_name
-
-    os.chdir(release_path)
-    print "- tar"
-    subprocess.call(
-        "tar -czf %s.tar.gz %s" % (release_name, release_files),
-        shell=True
-    )
-    print "- zip"
-    subprocess.call(
-        "zip -rq %s.zip %s" % (release_name, release_files),
-        shell=True
-    )
-
-    if cleanup:
-        print "Deleting working directories"
-        shutil.rmtree(release_tmp_dir)
-        if fresh_clone:
-            shutil.rmtree(repo_path)
-    else:
-        print "\nThe following working directories were kept:"
-        if fresh_clone:
-            print "- '%s' (repo clone)" % repo_path
-        print "- '%s' (release temp dir)" % release_tmp_dir
-        print "Delete them manually when they are no longer needed."
-
-    # Done
-    print "\nADOdb release %s build complete, files saved in '%s'." % (
-        version,
-        release_path
-    )
-    print "Don't forget to generate a README file with the changelog"
-
-#end main()
-
-if __name__ == "__main__":
-    main()
diff --git a/vendor/adodb/adodb-php/scripts/updateversion.py b/vendor/adodb/adodb-php/scripts/updateversion.py
deleted file mode 100755
index 0c39fd53bd..0000000000
--- a/vendor/adodb/adodb-php/scripts/updateversion.py
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/usr/bin/python -u
-'''
-    ADOdb version update script
-
-    Updates the version number, and release date in all php and html files
-'''
-
-from datetime import date
-import getopt
-import os
-from os import path
-import re
-import subprocess
-import sys
-
-
-# ADOdb version validation regex
-# These are used by sed - they are not PCRE !
-_version_dev = "dev"
-_version_regex = "[Vv]?([0-9]\.[0-9]+)(\.([0-9]+))?(-?%s)?" % _version_dev
-_release_date_regex = "[0-9?]+-.*-[0-9]+"
-_changelog_file = "docs/changelog.md"
-
-_tag_prefix = "v"
-
-
-# Command-line options
-options = "hct"
-long_options = ["help", "commit", "tag"]
-
-
-def usage():
-    print '''Usage: %s version
-
-    Parameters:
-        version                 ADOdb version, format: [v]X.YY[a-z|dev]
-
-    Options:
-        -c | --commit           Automatically commit the changes
-        -t | --tag              Create a tag for the new release
-        -h | --help             Show this usage message
-''' % (
-        path.basename(__file__)
-    )
-#end usage()
-
-
-def version_is_dev(version):
-    ''' Returns true if version is a development release
-    '''
-    return version.endswith(_version_dev)
-
-
-def version_is_patch(version):
-    ''' Returns true if version is a patch release (i.e. X.Y.Z with Z > 0)
-    '''
-    return not version.endswith('.0')
-
-
-def version_parse(version):
-    ''' Breakdown the version into groups (Z and -dev are optional)
-        1:(X.Y), 2:(.Z), 3:(Z), 4:(-dev)
-    '''
-    return re.match(r'^%s$' % _version_regex, version)
-
-
-def version_check(version):
-    ''' Checks that the given version is valid, exits with error if not.
-        Returns the SemVer-normalized version without the "v" prefix
-        - add '.0' if missing patch bit
-        - add '-' before dev release suffix if needed
-    '''
-    vparse = version_parse(version)
-    if not vparse:
-        usage()
-        print "ERROR: invalid version ! \n"
-        sys.exit(1)
-
-    vnorm = vparse.group(1)
-
-    # Add .patch version component
-    if vparse.group(2):
-        vnorm += vparse.group(2)
-    else:
-        # None was specified, assume a .0 release
-        vnorm += '.0'
-
-    # Normalize version number
-    if version_is_dev(version):
-        vnorm += '-' + _version_dev
-
-    return vnorm
-
-
-def get_release_date(version):
-    ''' Returns the release date in DD-MMM-YYYY format
-        For development releases, DD-MMM will be ??-???
-    '''
-    # Development release
-    if version_is_dev(version):
-        date_format = "??-???-%Y"
-    else:
-        date_format = "%d-%b-%Y"
-
-    # Define release date
-    return date.today().strftime(date_format)
-
-
-def sed_script(version):
-    ''' Builds sed script to update version information in source files
-    '''
-
-    # Version number and release date
-    script = r"s/{}\s+(-?)\s+{}/v{} \5 {}/".format(
-        _version_regex,
-        _release_date_regex,
-        version,
-        get_release_date(version)
-    )
-
-    return script
-
-
-def sed_filelist():
-    ''' Build list of files to update
-    '''
-    dirlist = []
-    for root, dirs, files in os.walk(".", topdown=True):
-        # Filter files by extensions
-        files = [
-            f for f in files
-            if re.search(r'\.(php|html?)$', f, re.IGNORECASE)
-            ]
-        for fname in files:
-            dirlist.append(path.join(root, fname))
-
-    return dirlist
-
-
-def tag_name(version):
-    return _tag_prefix + version
-
-
-def tag_check(version):
-    ''' Checks if the tag for the specified version exists in the repository
-        by attempting to check it out
-        Throws exception if not
-    '''
-    subprocess.check_call(
-        "git checkout --quiet " + tag_name(version),
-        stderr=subprocess.PIPE,
-        shell=True)
-    print "Tag '%s' already exists" % tag_name(version)
-
-
-def tag_delete(version):
-    ''' Deletes the specified tag
-    '''
-    subprocess.check_call(
-        "git tag --delete " + tag_name(version),
-        stderr=subprocess.PIPE,
-        shell=True)
-
-
-def tag_create(version):
-    ''' Creates the tag for the specified version
-        Returns True if tag created
-    '''
-    print "Creating release tag '%s'" % tag_name(version)
-    result = subprocess.call(
-        "git tag --sign --message '%s' %s" % (
-            "ADOdb version %s released %s" % (
-                version,
-                get_release_date(version)
-            ),
-            tag_name(version)
-        ),
-        shell=True
-    )
-    return result == 0
-
-
-def section_exists(filename, version, print_message=True):
-    ''' Checks given file for existing section with specified version
-    '''
-    script = True
-    for i, line in enumerate(open(filename)):
-        if re.search(r'^## ' + version, line):
-            if print_message:
-                print "  Existing section for v%s found," % version,
-            return True
-    return False
-
-
-def version_get_previous(version):
-    ''' Returns the previous version number
-        Don't decrease major versions (raises exception)
-    '''
-    vprev = version.split('.')
-    item = len(vprev) - 1
-
-    while item > 0:
-        val = int(vprev[item])
-        if val > 0:
-            vprev[item] = str(val - 1)
-            break
-        else:
-            item -= 1
-
-    if item == 0:
-        raise ValueError('Refusing to decrease major version number')
-
-    return '.'.join(vprev)
-
-
-def update_changelog(version):
-    ''' Updates the release date in the Change Log
-    '''
-    print "Updating Changelog"
-
-    vparse = version_parse(version)
-
-    # Version number without '-dev' suffix
-    version_release = vparse.group(1) + vparse.group(2)
-    version_previous = version_get_previous(version_release)
-
-    if not section_exists(_changelog_file, version_previous, False):
-        raise ValueError(
-            "ERROR: previous version %s does not exist in changelog" %
-            version_previous
-            )
-
-    # Check if version already exists in changelog
-    version_exists = section_exists(_changelog_file, version_release)
-    if (not version_exists
-            and not version_is_patch(version)
-            and not version_is_dev(version)):
-        version += '-' + _version_dev
-
-    release_date = get_release_date(version)
-
-    # Development release
-    # Insert a new section for next release before the most recent one
-    if version_is_dev(version):
-        # Check changelog file for existing section
-        if version_exists:
-            print "nothing to do"
-            return
-
-        # No existing section found, insert new one
-        if version_is_patch(version_release):
-            print "  Inserting new section for hotfix release v%s" % version
-        else:
-            print "  Inserting new section for v%s" % version_release
-            # Adjust previous version number (remove patch component)
-            version_previous = version_parse(version_previous).group(1)
-        script = "1,/^## {0}/s/^## {0}.*$/## {1} - {2}\\n\\n\\0/".format(
-            version_previous,
-            version_release,
-            release_date
-            )
-
-    # Stable release (X.Y.0)
-    # Replace the 1st occurence of markdown level 2 header matching version
-    # and release date patterns
-    elif not version_is_patch(version):
-        print "  Updating release date for v%s" % version
-        script = r"s/^(## ){0}(\.0)? - {1}.*$/\1{2} - {3}/".format(
-            vparse.group(1),
-            _release_date_regex,
-            version,
-            release_date
-            )
-
-    # Hotfix release (X.Y.[0-9])
-    # Insert a new section for the hotfix release before the most recent
-    # section for version X.Y and display a warning message
-    else:
-        if version_exists:
-            print 'updating release date'
-            script = "s/^## {0}.*$/## {1} - {2}/".format(
-                version.replace('.', '\.'),
-                version,
-                release_date
-                )
-        else:
-            print "  Inserting new section for hotfix release v%s" % version
-            script = "1,/^## {0}/s/^## {0}.*$/## {1} - {2}\\n\\n\\0/".format(
-                version_previous,
-                version,
-                release_date
-                )
-
-        print "  WARNING: review '%s' to ensure added section is correct" % (
-            _changelog_file
-            )
-
-    subprocess.call(
-        "sed -r -i '%s' %s " % (
-            script,
-            _changelog_file
-        ),
-        shell=True
-    )
-#end update_changelog
-
-
-def version_set(version, do_commit=True, do_tag=True):
-    ''' Bump version number and set release date in source files
-    '''
-    print "Preparing version bump commit"
-
-    update_changelog(version)
-
-    print "Updating version and date in source files"
-    subprocess.call(
-        "sed -r -i '%s' %s " % (
-            sed_script(version),
-            " ".join(sed_filelist())
-        ),
-        shell=True
-    )
-    print "Version set to %s" % version
-
-    if do_commit:
-        # Commit changes
-        print "Committing"
-        commit_ok = subprocess.call(
-            "git commit --all --message '%s'" % (
-                "Bump version to %s" % version
-            ),
-            shell=True
-        )
-
-        if do_tag:
-            tag_ok = tag_create(version)
-        else:
-            tag_ok = False
-
-        if commit_ok == 0:
-            print '''
-NOTE: you should carefully review the new commit, making sure updates
-to the files are correct and no additional changes are required.
-If everything is fine, then the commit can be pushed upstream;
-otherwise:
- - Make the required corrections
- - Amend the commit ('git commit --all --amend' ) or create a new one'''
-
-            if tag_ok:
-                print ''' - Drop the tag ('git tag --delete %s')
- - run this script again
-''' % (
-                    tag_name(version)
-                )
-
-    else:
-        print "Note: changes have been staged but not committed."
-#end version_set()
-
-
-def main():
-    # Get command-line options
-    try:
-        opts, args = getopt.gnu_getopt(sys.argv[1:], options, long_options)
-    except getopt.GetoptError, err:
-        print str(err)
-        usage()
-        sys.exit(2)
-
-    if len(args) < 1:
-        usage()
-        print "ERROR: please specify the version"
-        sys.exit(1)
-
-    do_commit = False
-    do_tag = False
-
-    for opt, val in opts:
-        if opt in ("-h", "--help"):
-            usage()
-            sys.exit(0)
-
-        elif opt in ("-c", "--commit"):
-            do_commit = True
-
-        elif opt in ("-t", "--tag"):
-            do_tag = True
-
-    # Mandatory parameters
-    version = version_check(args[0])
-
-    # Let's do it
-    os.chdir(subprocess.check_output('git root', shell=True).rstrip())
-    version_set(version, do_commit, do_tag)
-#end main()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/vendor/adodb/adodb-php/scripts/uploadrelease.py b/vendor/adodb/adodb-php/scripts/uploadrelease.py
deleted file mode 100755
index 5b295cbbb7..0000000000
--- a/vendor/adodb/adodb-php/scripts/uploadrelease.py
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/python -u
-'''
-    ADOdb release upload script
-'''
-
-from distutils.version import LooseVersion
-import getopt
-import glob
-import os
-from os import path
-import re
-import subprocess
-import sys
-
-
-# Directories and files to exclude from release tarballs
-sf_files = "frs.sourceforge.net:/home/frs/project/adodb/"
-rsync_cmd = "rsync -vP --rsh ssh {opt} {src} {usr}@{dst}"
-
-# Command-line options
-options = "hn"
-long_options = ["help", "dry-run"]
-
-
-def usage():
-    print '''Usage: %s [options] username [release_path]
-
-    This script will upload the files in the given directory (or the
-    current one if unspecified) to Sourceforge.
-
-    Parameters:
-        username                Sourceforge user account
-        release_path            Location of the release files to upload
-                                (see buildrelease.py)
-
-    Options:
-        -h | --help             Show this usage message
-        -n | --dry-run          Do not upload the files
-''' % (
-        path.basename(__file__)
-    )
-#end usage()
-
-
-def call_rsync(usr, opt, src, dst):
-    ''' Calls rsync to upload files with given parameters
-        usr = ssh username
-        opt = options
-        src = source directory
-        dst = target directory
-    '''
-    global dry_run
-
-    command = rsync_cmd.format(usr=usr, opt=opt, src=src, dst=dst)
-
-    if dry_run:
-        print command
-    else:
-        subprocess.call(command, shell=True)
-
-
-def get_release_version():
-    ''' Get the version number from the zip file to upload
-    '''
-    try:
-        zipfile = glob.glob('adodb-*.zip')[0]
-    except IndexError:
-        print "ERROR: release zip file not found in '%s'" % release_path
-        sys.exit(1)
-
-    try:
-        version = re.search(
-            "^adodb-([\d]+\.[\d]+\.[\d]+)\.zip$",
-            zipfile
-            ).group(1)
-    except AttributeError:
-        print "ERROR: unable to extract version number from '%s'" % zipfile
-        print "       Only 3 groups of digits separated by periods are allowed"
-        sys.exit(1)
-
-    return version
-
-
-def sourceforge_target_dir(version):
-    ''' Returns the sourceforge target directory
-        Base directory as defined in sf_files global variable, plus
-        - if version >= 5.21: adodb-X.Y
-        - for older versions: adodb-XYZ-for-php5
-    '''
-    # Keep only X.Y (discard patch number)
-    short_version = version.rsplit('.', 1)[0]
-
-    directory = 'adodb-php5-only/'
-    if LooseVersion(version) >= LooseVersion('5.21'):
-        directory += "adodb-" + short_version
-    else:
-        directory += "adodb-{}-for-php5".format(short_version.replace('.', ''))
-
-    return directory
-
-
-def process_command_line():
-    ''' Retrieve command-line options and set global variables accordingly
-    '''
-    global upload_files, upload_doc, dry_run, username, release_path
-
-    # Get command-line options
-    try:
-        opts, args = getopt.gnu_getopt(sys.argv[1:], options, long_options)
-    except getopt.GetoptError, err:
-        print str(err)
-        usage()
-        sys.exit(2)
-
-    if len(args) < 1:
-        usage()
-        print "ERROR: please specify the Sourceforge user and release_path"
-        sys.exit(1)
-
-    # Default values for flags
-    dry_run = False
-
-    for opt, val in opts:
-        if opt in ("-h", "--help"):
-            usage()
-            sys.exit(0)
-
-        elif opt in ("-n", "--dry-run"):
-            dry_run = True
-
-    # Mandatory parameters
-    username = args[0]
-
-    # Change to release directory, current if not specified
-    try:
-        release_path = args[1]
-        os.chdir(release_path)
-    except IndexError:
-        release_path = os.getcwd()
-
-
-def upload_release_files():
-    ''' Upload release files from source directory to SourceForge
-    '''
-    version = get_release_version()
-    target = sf_files + sourceforge_target_dir(version)
-
-    print
-    print "Uploading release files..."
-    print "  Source:", release_path
-    print "  Target: " + target
-    print
-    call_rsync(
-        username,
-        "",
-        path.join(release_path, "*"),
-        target
-    )
-
-
-def main():
-    process_command_line()
-
-    # Start upload process
-    print "ADOdb release upload script"
-
-    upload_release_files()
-
-#end main()
-
-if __name__ == "__main__":
-    main()
diff --git a/vendor/adodb/adodb-php/server.php b/vendor/adodb/adodb-php/server.php
index 921baddf35..76e757fd93 100644
--- a/vendor/adodb/adodb-php/server.php
+++ b/vendor/adodb/adodb-php/server.php
@@ -1,15 +1,31 @@
 Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($_REQUEST['sql']);
+if (!$conn->connect($host,$uid,$pwd,$database)) err($conn->errorNo(). $sep . $conn->errorMsg());
+$sql = $_REQUEST['sql'];
 
 if (isset($_REQUEST['fetch']))
 	$ADODB_FETCH_MODE = $_REQUEST['fetch'];
@@ -89,12 +92,12 @@ function undomq(&$m)
 if (isset($_REQUEST['nrows'])) {
 	$nrows = $_REQUEST['nrows'];
 	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
+	$rs = $conn->selectLimit($sql,$nrows,$offset);
 } else
-	$rs = $conn->Execute($sql);
+	$rs = $conn->execute($sql);
 if ($rs){
 	//$rs->timeToLive = 1;
 	echo _rs2serialize($rs,$conn,$sql);
-	$rs->Close();
+	$rs->close();
 } else
-	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+	err($conn->errorNo(). $sep .$conn->errorMsg());
diff --git a/vendor/adodb/adodb-php/session/adodb-compress-bzip2.php b/vendor/adodb/adodb-php/session/adodb-compress-bzip2.php
index 5ba2583354..17ad99fb7d 100644
--- a/vendor/adodb/adodb-php/session/adodb-compress-bzip2.php
+++ b/vendor/adodb/adodb-php/session/adodb-compress-bzip2.php
@@ -1,24 +1,32 @@
 
+ */
 
 if (!function_exists('bzcompress')) {
 	trigger_error('bzip2 functions are not available', E_USER_ERROR);
 	return 0;
 }
 
-/*
-*/
+/**
+ */
 class ADODB_Compress_Bzip2 {
 	/**
 	 */
@@ -41,8 +49,8 @@ function getBlockSize() {
 	/**
 	 */
 	function setBlockSize($block_size) {
-		assert('$block_size >= 1');
-		assert('$block_size <= 9');
+		assert($block_size >= 1);
+		assert($block_size <= 9);
 		$this->_block_size = (int) $block_size;
 	}
 
@@ -55,8 +63,8 @@ function getWorkLevel() {
 	/**
 	 */
 	function setWorkLevel($work_level) {
-		assert('$work_level >= 0');
-		assert('$work_level <= 250');
+		assert($work_level >= 0);
+		assert($work_level <= 250);
 		$this->_work_level = (int) $work_level;
 	}
 
@@ -69,7 +77,7 @@ function getMinLength() {
 	/**
 	 */
 	function setMinLength($min_length) {
-		assert('$min_length >= 0');
+		assert($min_length >= 0);
 		$this->_min_length = (int) $min_length;
 	}
 
diff --git a/vendor/adodb/adodb-php/session/adodb-compress-gzip.php b/vendor/adodb/adodb-php/session/adodb-compress-gzip.php
index a202653938..bbaf6c6373 100644
--- a/vendor/adodb/adodb-php/session/adodb-compress-gzip.php
+++ b/vendor/adodb/adodb-php/session/adodb-compress-gzip.php
@@ -1,17 +1,23 @@
 = 0');
-		assert('$level <= 9');
+		assert($level >= 0);
+		assert($level <= 9);
 		$this->_level = (int) $level;
 	}
 
@@ -52,7 +58,7 @@ function getMinLength() {
 	/**
 	 */
 	function setMinLength($min_length) {
-		assert('$min_length >= 0');
+		assert($min_length >= 0);
 		$this->_min_length = (int) $min_length;
 	}
 
diff --git a/vendor/adodb/adodb-php/session/adodb-cryptsession.php b/vendor/adodb/adodb-php/session/adodb-cryptsession.php
index f0cd975e35..088053217b 100644
--- a/vendor/adodb/adodb-php/session/adodb-cryptsession.php
+++ b/vendor/adodb/adodb-php/session/adodb-cryptsession.php
@@ -1,22 +1,25 @@
 
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session2.php';
diff --git a/vendor/adodb/adodb-php/session/adodb-session.php b/vendor/adodb/adodb-php/session/adodb-session.php
index cdd6703493..9e716232cc 100644
--- a/vendor/adodb/adodb-php/session/adodb-session.php
+++ b/vendor/adodb/adodb-php/session/adodb-session.php
@@ -1,16 +1,24 @@
 
+ */
 
 /*
 	You may want to rename the 'data' field to 'session_data' as
@@ -37,7 +45,7 @@
 
 
 /*
-	Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821
+	Unserialize session data manually. See PHPLens Issue No: 9821
 
 	From Kerr Schere, to unserialize session data stored via ADOdb.
 	1. Pull the session data from the db and loop through it.
@@ -56,7 +64,7 @@ function adodb_unserialize( $serialized_string )
 }
 
 /*
-	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
+	Thanks Joe Li. See PHPLens Issue No: 11487&x=1
 	Since adodb 4.61.
 */
 function adodb_session_regenerate_id()
@@ -70,7 +78,7 @@ function adodb_session_regenerate_id()
 	} else {
 		session_id(md5(uniqid(rand(), true)));
 		$ck = session_get_cookie_params();
-		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
+		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure'], $ck['httponly']);
 		//@session_start();
 	}
 	$new_id = session_id();
@@ -80,7 +88,7 @@ function adodb_session_regenerate_id()
 	if (!$ok) {
 		session_id($old_id);
 		if (empty($ck)) $ck = session_get_cookie_params();
-		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
+		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure'], $ck['httponly']);
 		return false;
 	}
 
@@ -89,7 +97,7 @@ function adodb_session_regenerate_id()
 
 /*
     Generate database table for session data
-    @see http://phplens.com/lens/lensforum/msgs.php?id=12280
+    @see PHPLens Issue No: 12280
     @return 0 if failure, 1 if errors, 2 if successful.
 	@author Markus Staab http://www.public-4u.de
 */
@@ -599,7 +607,7 @@ function read($key)
 
 		$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
-		  developer has commited elsewhere... :(
+		  developer has committed elsewhere... :(
 		 */
 		#if (ADODB_Session::Lock())
 		#	$rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
@@ -921,12 +929,12 @@ function gc($maxlifetime)
 if (empty($ADODB_SESSION_READONLY))
 	register_shutdown_function('session_write_close');
 
-// for backwards compatability only
+// for backwards compatibility only
 function adodb_sess_open($save_path, $session_name, $persist = true) {
 	return ADODB_Session::open($save_path, $session_name, $persist);
 }
 
-// for backwards compatability only
+// for backwards compatibility only
 function adodb_sess_gc($t)
 {
 	return ADODB_Session::gc($t);
diff --git a/vendor/adodb/adodb-php/session/adodb-session2.php b/vendor/adodb/adodb-php/session/adodb-session2.php
index 3036a190fd..bf64b4166e 100644
--- a/vendor/adodb/adodb-php/session/adodb-session2.php
+++ b/vendor/adodb/adodb-php/session/adodb-session2.php
@@ -1,61 +1,23 @@
 debug = true;
-			ADOConnection::outp( " driver=$driver user=$user db=$database ");
-		}
-
-		if (empty($conn->_connectionID)) { // not dsn
+		if (strpos($driver, 'pdo_') === 0){
+			$conn = ADONewConnection('pdo');
+			$driver = str_replace('pdo_', '', $driver);
+			$dsn = $driver.':'.'hostname='.$host.';dbname='.$database.';';
 			if ($persist) {
 				switch($persist) {
 				default:
-				case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
-				case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
-				case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
+				case 'P': $ok = $conn->PConnect($dsn,$user,$password); break;
+				case 'C': $ok = $conn->Connect($dsn,$user,$password); break;
+				case 'N': $ok = $conn->NConnect($dsn,$user,$password); break;
 				}
 			} else {
-				$ok = $conn->Connect($host, $user, $password, $database);
+				$ok = $conn->Connect($dsn,$user,$password);
+			}
+		}else{
+			$conn = ADONewConnection($driver);
+			if ($debug) {
+				$conn->debug = true;
+				ADOConnection::outp( " driver=$driver user=$user db=$database ");
+			}
+
+			if (empty($conn->_connectionID)) { // not dsn
+				if ($persist) {
+					switch($persist) {
+					default:
+					case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
+					case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
+					case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
+					}
+				} else {
+					$ok = $conn->Connect($host, $user, $password, $database);
+				}
+			} else {
+				$ok = true; // $conn->_connectionID is set after call to ADONewConnection
 			}
-		} else {
-			$ok = true; // $conn->_connectionID is set after call to ADONewConnection
 		}
 
+
 		if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
 		else
 			ADOConnection::outp('
Session: connection failed
', false);
@@ -628,7 +605,7 @@ static function read($key)
 		$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... :(
+		  developer has committed elsewhere... :(
 		 */
 		#if (ADODB_Session::Lock())
 		#	$rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), sessdata);
@@ -806,7 +783,7 @@ static function destroy($key) {
 		//assert('$table');
 
 		$qkey = $conn->quote($key);
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+		$binary = $conn->dataProvider === 'mysql' || $conn->dataProvider === 'pdo' ? '/*! BINARY */' : '';
 
 		if ($expire_notify) {
 			reset($expire_notify);
@@ -926,12 +903,12 @@ static function gc($maxlifetime)
 if (empty($ADODB_SESSION_READONLY))
 	register_shutdown_function('session_write_close');
 
-// for backwards compatability only
+// for backwards compatibility only
 function adodb_sess_open($save_path, $session_name, $persist = true) {
 	return ADODB_Session::open($save_path, $session_name, $persist);
 }
 
-// for backwards compatability only
+// for backwards compatibility only
 function adodb_sess_gc($t)
 {
 	return ADODB_Session::gc($t);
diff --git a/vendor/adodb/adodb-php/session/crypt.inc.php b/vendor/adodb/adodb-php/session/crypt.inc.php
index 94aa2831a6..82121e3978 100644
--- a/vendor/adodb/adodb-php/session/crypt.inc.php
+++ b/vendor/adodb/adodb-php/session/crypt.inc.php
@@ -1,5 +1,25 @@
 
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ari Kuorikoski 
+ */
+
 class MD5Crypt{
 		function keyED($txt,$encrypt_key)
 		{
diff --git a/vendor/adodb/adodb-php/session/old/adodb-cryptsession.php b/vendor/adodb/adodb-php/session/old/adodb-cryptsession.php
index 617e12e90f..6616de3d33 100644
--- a/vendor/adodb/adodb-php/session/old/adodb-cryptsession.php
+++ b/vendor/adodb/adodb-php/session/old/adodb-cryptsession.php
@@ -1,22 +1,29 @@
 
-
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at http://adodb.org/
-  ======================================================================
-
- This file provides PHP4 session management using the ADODB database
-wrapper library.
-
  Example
  =======
 
@@ -197,7 +204,7 @@ function adodb_sess_write($key, $val)
 		ADOConnection::outp( '
 -- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'
',false);
 	} else {
-		// bug in access driver (could be odbc?) means that info is not commited
+		// bug in access driver (could be odbc?) means that info is not committed
 		// 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'");
diff --git a/vendor/adodb/adodb-php/session/old/adodb-session-clob.php b/vendor/adodb/adodb-php/session/old/adodb-session-clob.php
index f767b8db9e..864fdfd736 100644
--- a/vendor/adodb/adodb-php/session/old/adodb-session-clob.php
+++ b/vendor/adodb/adodb-php/session/old/adodb-session-clob.php
@@ -1,19 +1,29 @@
 ',false);
 	}  else {
-		// bug in access driver (could be odbc?) means that info is not commited
+		// bug in access driver (could be odbc?) means that info is not committed
 		// 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'");
diff --git a/vendor/adodb/adodb-php/session/old/adodb-session.php b/vendor/adodb/adodb-php/session/old/adodb-session.php
index 03a6eb74b7..5fd43abc01 100644
--- a/vendor/adodb/adodb-php/session/old/adodb-session.php
+++ b/vendor/adodb/adodb-php/session/old/adodb-session.php
@@ -1,19 +1,30 @@
 ErrorMsg().'
',false);
 	}  else {
-		// bug in access driver (could be odbc?) means that info is not commited
+		// bug in access driver (could be odbc?) means that info is not committed
 		// 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'");
diff --git a/vendor/adodb/adodb-php/session/old/crypt.inc.php b/vendor/adodb/adodb-php/session/old/crypt.inc.php
index 1ce75feb71..089e24a0a0 100644
--- a/vendor/adodb/adodb-php/session/old/crypt.inc.php
+++ b/vendor/adodb/adodb-php/session/old/crypt.inc.php
@@ -1,5 +1,27 @@
 
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ari Kuorikoski 
+ */
+
 class MD5Crypt{
 		function keyED($txt,$encrypt_key)
 		{
diff --git a/vendor/adodb/adodb-php/session/session_schema.xml b/vendor/adodb/adodb-php/session/session_schema.xml
index 27e47bfee7..c1f75316db 100644
--- a/vendor/adodb/adodb-php/session/session_schema.xml
+++ b/vendor/adodb/adodb-php/session/session_schema.xml
@@ -1,7 +1,7 @@
- table for ADOdb session-management + table for ADOdb session-management session key diff --git a/vendor/adodb/adodb-php/session/session_schema2.xml b/vendor/adodb/adodb-php/session/session_schema2.xml index f0d3ec94a5..89cb4f283e 100644 --- a/vendor/adodb/adodb-php/session/session_schema2.xml +++ b/vendor/adodb/adodb-php/session/session_schema2.xml @@ -1,7 +1,7 @@
- table for ADOdb session-management + table for ADOdb session-management session key diff --git a/vendor/adodb/adodb-php/tests/benchmark.php b/vendor/adodb/adodb-php/tests/benchmark.php deleted file mode 100644 index 4b7ee53320..0000000000 --- a/vendor/adodb/adodb-php/tests/benchmark.php +++ /dev/null @@ -1,86 +0,0 @@ - - - - - ADODB Benchmarks - - - -ADODB Version: $ADODB_version Host: $db->host   Database: $db->database"; - - // perform query once to cache results so we are only testing throughput - $rs = $db->Execute($sql); - if (!$rs){ - print "Error in recordset

"; - return; - } - $arr = $rs->GetArray(); - //$db->debug = true; - global $ADODB_COUNTRECS; - $ADODB_COUNTRECS = false; - $start = microtime(); - for ($i=0; $i < $max; $i++) { - $rs = $db->Execute($sql); - $arr = $rs->GetArray(); - // print $arr[0][1]; - } - $end = microtime(); - $start = explode(' ',$start); - $end = explode(' ',$end); - - //print_r($start); - //print_r($end); - - // print_r($arr); - $total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]); - printf ("

seconds = %8.2f for %d iterations each with %d records

",$total,$max, sizeof($arr)); - flush(); - - - //$db->Close(); -} -include("testdatabases.inc.php"); - -?> - - - - diff --git a/vendor/adodb/adodb-php/tests/client.php b/vendor/adodb/adodb-php/tests/client.php deleted file mode 100644 index 1733774a75..0000000000 --- a/vendor/adodb/adodb-php/tests/client.php +++ /dev/null @@ -1,199 +0,0 @@ - - -'; - var_dump(parse_url('odbc_mssql://userserver/')); - die(); - -include('../adodb.inc.php'); -include('../tohtml.inc.php'); - - function send2server($url,$sql) - { - $url .= '?sql='.urlencode($sql); - print "

$url

"; - $rs = csv2rs($url,$err); - if ($err) print $err; - return $rs; - } - - function print_pre($s) - { - print "
";print_r($s);print "
"; - } - - -$serverURL = 'http://localhost/php/phplens/adodb/server.php'; -$testhttp = false; - -$sql1 = "insertz into products (productname) values ('testprod 1')"; -$sql2 = "insert into products (productname) values ('testprod 1')"; -$sql3 = "insert into products (productname) values ('testprod 2')"; -$sql4 = "delete from products where productid>80"; -$sql5 = 'select * from products'; - -if ($testhttp) { - print "Client Driver Tests

"; - print "

Test Error

"; - $rs = send2server($serverURL,$sql1); - print_pre($rs); - print "
"; - - print "

Test Insert

"; - - $rs = send2server($serverURL,$sql2); - print_pre($rs); - print "
"; - - print "

Test Insert2

"; - - $rs = send2server($serverURL,$sql3); - print_pre($rs); - print "
"; - - print "

Test Delete

"; - - $rs = send2server($serverURL,$sql4); - print_pre($rs); - print "
"; - - - print "

Test Select

"; - $rs = send2server($serverURL,$sql5); - if ($rs) rs2html($rs); - - print "
"; -} - - -print "

CLIENT Driver Tests

"; -$conn = ADONewConnection('csv'); -$conn->Connect($serverURL); -$conn->debug = true; - -print "

Bad SQL

"; - -$rs = $conn->Execute($sql1); - -print "

Insert SQL 1

"; -$rs = $conn->Execute($sql2); - -print "

Insert SQL 2

"; -$rs = $conn->Execute($sql3); - -print "

Select SQL

"; -$rs = $conn->Execute($sql5); -if ($rs) rs2html($rs); - -print "

Delete SQL

"; -$rs = $conn->Execute($sql4); - -print "

Select SQL

"; -$rs = $conn->Execute($sql5); -if ($rs) rs2html($rs); - - -/* EXPECTED RESULTS FOR HTTP TEST: - -Test Insert -http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29 - -adorecordset Object -( - [dataProvider] => native - [fields] => - [blobSize] => 64 - [canSeek] => - [EOF] => 1 - [emptyTimeStamp] => - [emptyDate] => - [debug] => - [timeToLive] => 0 - [bind] => - [_numOfRows] => -1 - [_numOfFields] => 0 - [_queryID] => 1 - [_currentRow] => -1 - [_closed] => - [_inited] => - [sql] => insert into products (productname) values ('testprod') - [affectedrows] => 1 - [insertid] => 81 -) - - --------------------------------------------------------------------------------- - -Test Insert2 -http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29 - -adorecordset Object -( - [dataProvider] => native - [fields] => - [blobSize] => 64 - [canSeek] => - [EOF] => 1 - [emptyTimeStamp] => - [emptyDate] => - [debug] => - [timeToLive] => 0 - [bind] => - [_numOfRows] => -1 - [_numOfFields] => 0 - [_queryID] => 1 - [_currentRow] => -1 - [_closed] => - [_inited] => - [sql] => insert into products (productname) values ('testprod') - [affectedrows] => 1 - [insertid] => 82 -) - - --------------------------------------------------------------------------------- - -Test Delete -http://localhost/php/adodb/server.php?sql=delete+from+products+where+productid%3E80 - -adorecordset Object -( - [dataProvider] => native - [fields] => - [blobSize] => 64 - [canSeek] => - [EOF] => 1 - [emptyTimeStamp] => - [emptyDate] => - [debug] => - [timeToLive] => 0 - [bind] => - [_numOfRows] => -1 - [_numOfFields] => 0 - [_queryID] => 1 - [_currentRow] => -1 - [_closed] => - [_inited] => - [sql] => delete from products where productid>80 - [affectedrows] => 2 - [insertid] => 0 -) - -[more stuff deleted] - . - . - . -*/ diff --git a/vendor/adodb/adodb-php/tests/pdo.php b/vendor/adodb/adodb-php/tests/pdo.php deleted file mode 100644 index 31ca59697d..0000000000 --- a/vendor/adodb/adodb-php/tests/pdo.php +++ /dev/null @@ -1,92 +0,0 @@ -"; -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); - $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); - } - die("DONE\n"); - -} catch (exception $e) { - echo "
";
-	echo $e;
-	echo "
"; -} diff --git a/vendor/adodb/adodb-php/tests/test-active-record.php b/vendor/adodb/adodb-php/tests/test-active-record.php deleted file mode 100644 index 59471620ce..0000000000 --- a/vendor/adodb/adodb-php/tests/test-active-record.php +++ /dev/null @@ -1,140 +0,0 @@ -= 5) { - include('../adodb-exceptions.inc.php'); - echo "

Exceptions included

"; - } - } - - $db = NewADOConnection('mysql://root@localhost/northwind?persist'); - $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 '', - `name_last` varchar(100) NOT NULL default '', - `favorite_color` varchar(100) NOT NULL default '', - 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, - `name_first` varchar(100) NOT NULL default '', - `name_last` varchar(100) NOT NULL default '', - `favorite_pet` varchar(100) NOT NULL default '', - 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) { - * [0]=> - * string(2) "id" - * [1]=> - * string(9) "name_first" - * [2]=> - * string(8) "name_last" - * [3]=> - * 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),"
"; - - $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'); - $person2->name_last='green'; - $c = $person2->children; - $person2->save(); - - 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
"; - else { - 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
"; - - $p->hasMany('children','person_id'); - $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 '', - `name_last` varchar(100) NOT NULL default '', - `favorite_color` varchar(100) default '', - 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(); diff --git a/vendor/adodb/adodb-php/tests/test-active-recs2.php b/vendor/adodb/adodb-php/tests/test-active-recs2.php deleted file mode 100644 index f5898fcdab..0000000000 --- a/vendor/adodb/adodb-php/tests/test-active-recs2.php +++ /dev/null @@ -1,76 +0,0 @@ -Connect("localhost","tester","test","test"); -} else - $db = NewADOConnection('oci8://scott:natsoft@/'); - - -$arr = $db->ServerInfo(); -echo "

$db->dataProvider: {$arr['description']}

"; - -$arr = $db->GetActiveRecords('products',' productid<10'); -adodb_pr($arr); - -ADOdb_Active_Record::SetDatabaseAdapter($db); -if (!$db) die('failed'); - - - - -$rec = new ADODB_Active_Record('photos'); - -$rec = new ADODB_Active_Record('products'); - - -adodb_pr($rec->getAttributeNames()); - -echo "
"; - - -$rec->load('productid=2'); -adodb_pr($rec); - -$db->debug=1; - - -$rec->productname = 'Changie Chan'.rand(); - -$rec->insert(); -$rec->update(); - -$rec->productname = 'Changie Chan 99'; -$rec->replace(); - - -$rec2 = new ADODB_Active_Record('products'); -$rec->load('productid=3'); -$rec->save(); - -$rec = new ADODB_Active_record('products'); -$rec->productname = 'John ActiveRec'; -$rec->notes = 22; -#$rec->productid=0; -$rec->discontinued=1; -$rec->Save(); -$rec->supplierid=33; -$rec->Save(); -$rec->discontinued=0; -$rec->Save(); -$rec->Delete(); - -echo "

Affected Rows after delete=".$db->Affected_Rows()."

"; diff --git a/vendor/adodb/adodb-php/tests/test-active-relations.php b/vendor/adodb/adodb-php/tests/test-active-relations.php deleted file mode 100644 index 7a98d479ff..0000000000 --- a/vendor/adodb/adodb-php/tests/test-active-relations.php +++ /dev/null @@ -1,85 +0,0 @@ -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 '', - `name_last` varchar(100) NOT NULL default '', - `favorite_color` varchar(100) NOT NULL default '', - 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, - `name_first` varchar(100) NOT NULL default '', - `name_last` varchar(100) NOT NULL default '', - `favorite_pet` varchar(100) NOT NULL default '', - 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
"; - else { - 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
"; - - if ($p) { - #$p->HasMany('children','person_id'); ## this is affects all other instances of Person - $p->LoadRelations('children', 'order by id',1,2); - if (sizeof($p->children) == 2 && $p->children[1]->name_first == 'JAMIE') echo "OK LoadRelations
"; - else { - var_dump($p->children); - echo "error LoadRelations
"; - } - - unset($p->children); - $p->LoadRelations('children', " name_first like 'J%' order by id",1,2); - } - if ($p) - foreach($p->children as $c) { - echo " Saving $c->name_first
"; - $c->name_first .= ' K.'; - $c->Save(); - } diff --git a/vendor/adodb/adodb-php/tests/test-active-relationsx.php b/vendor/adodb/adodb-php/tests/test-active-relationsx.php deleted file mode 100644 index 0f28f728c4..0000000000 --- a/vendor/adodb/adodb-php/tests/test-active-relationsx.php +++ /dev/null @@ -1,418 +0,0 @@ -\n", $txt); - echo $txt; - } - - include_once('../adodb.inc.php'); - include_once('../adodb-active-recordx.inc.php'); - - - $db = NewADOConnection('mysql://root@localhost/test'); - $db->debug=0; - ADOdb_Active_Record::SetDatabaseAdapter($db); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("Preparing database using SQL queries (creating 'people', 'children')\n"); - - $db->Execute("DROP TABLE `people`"); - $db->Execute("DROP TABLE `children`"); - $db->Execute("DROP TABLE `artists`"); - $db->Execute("DROP TABLE `songs`"); - - $db->Execute("CREATE TABLE `people` ( - `id` int(10) unsigned NOT NULL auto_increment, - `name_first` varchar(100) NOT NULL default '', - `name_last` varchar(100) NOT NULL default '', - `favorite_color` varchar(100) NOT NULL default '', - PRIMARY KEY (`id`) - ) ENGINE=MyISAM; - "); - $db->Execute("CREATE TABLE `children` ( - `person_id` int(10) unsigned NOT NULL, - `name_first` varchar(100) NOT NULL default '', - `name_last` varchar(100) NOT NULL default '', - `favorite_pet` varchar(100) NOT NULL default '', - `id` int(10) unsigned NOT NULL auto_increment, - PRIMARY KEY (`id`) - ) ENGINE=MyISAM; - "); - - $db->Execute("CREATE TABLE `artists` ( - `name` varchar(100) NOT NULL default '', - `artistuniqueid` int(10) unsigned NOT NULL auto_increment, - PRIMARY KEY (`artistuniqueid`) - ) ENGINE=MyISAM; - "); - - $db->Execute("CREATE TABLE `songs` ( - `name` varchar(100) NOT NULL default '', - `artistid` int(10) NOT NULL, - `recordid` int(10) unsigned NOT NULL auto_increment, - PRIMARY KEY (`recordid`) - ) 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')"); - - $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)"); - - // This class _implicitely_ relies on the 'people' table (pluralized form of 'person') - class Person extends ADOdb_Active_Record - { - function __construct() - { - parent::__construct(); - $this->hasMany('children'); - } - } - // This class _implicitely_ relies on the 'children' table - class Child extends ADOdb_Active_Record - { - function __construct() - { - parent::__construct(); - $this->belongsTo('person'); - } - } - // This class _explicitely_ relies on the 'children' table and shares its metadata with Child - class Kid extends ADOdb_Active_Record - { - function __construct() - { - parent::__construct('children'); - $this->belongsTo('person'); - } - } - // This class _explicitely_ relies on the 'children' table but does not share its metadata - class Rugrat extends ADOdb_Active_Record - { - function __construct() - { - parent::__construct('children', false, false, array('new' => true)); - } - } - - class Artist extends ADOdb_Active_Record - { - function __construct() - { - parent::__construct('artists', array('artistuniqueid')); - $this->hasMany('songs', 'artistid'); - } - } - class Song extends ADOdb_Active_Record - { - function __construct() - { - parent::__construct('songs', array('recordid')); - $this->belongsTo('artist', 'artistid'); - } - } - - ar_echo("Inserting person in 'people' table ('John Lim, he likes lavender')\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $person = new Person(); - $person->name_first = 'John'; - $person->name_last = 'Lim'; - $person->favorite_color = 'lavender'; - $person->save(); // this save will perform an INSERT successfully - - $person = new Person(); - $person->name_first = 'Lady'; - $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"); - ar_echo("person->Find('id=1') [Lazy Method]\n"); - ar_echo("person is loaded but its children will be loaded on-demand later on\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $person = new Person(); - $people = $person->Find('id=1'); - ar_echo((ar_assert(found($people, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(notfound($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n"); - ar_echo("\n-- Lazily Loading Children:\n\n"); - foreach($people as $aperson) - { - foreach($aperson->children as $achild) - { - if($achild->name_first); - } - } - 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->Find('id=1' ... ADODB_WORK_AR) [Worker Method]\n"); - ar_echo("person is loaded, and so are its children\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $person = new Person(); - $people = $person->Find('id=1', false, false, array('loading' => ADODB_WORK_AR)); - ar_echo((ar_assert(found($people, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n"); - 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->Find('id=1' ... ADODB_JOIN_AR) [Join Method]\n"); - ar_echo("person and its children are loaded using a single query\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $person = new Person(); - // When I specifically ask for a join, I have to specify which table id I am looking up - // otherwise the SQL parser will wonder which table's id that would be. - $people = $person->Find('people.id=1', false, false, array('loading' => ADODB_JOIN_AR)); - ar_echo((ar_assert(found($people, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n"); - 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"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $person = new Person(); - // Under the hood, Load(), since it returns only one row, always perform a join - // Therefore we need to clarify which id we are talking about. - $person->Load('people.id=1'); - ar_echo((ar_assert(found($person, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n"); - 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"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $child = new Child(); - $child->Load('children.id=1'); - ar_echo((ar_assert(found($child, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(found($child, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("child->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $child = new Child(); - $children = $child->Find('id=1', false, false, array('loading' => ADODB_WORK_AR)); - ar_echo((ar_assert(found($children, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(found($children, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n"); - ar_echo((ar_assert(notfound($children, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(notfound($children, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Find failed\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("kid->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n"); - ar_echo("Where we see that kid shares relationships with child because they are stored\n"); - ar_echo("in the common table's metadata structure.\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $kid = new Kid('children'); - $kids = $kid->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR)); - ar_echo((ar_assert(found($kids, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n"); - 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" : "[!!] Find failed\n"); - ar_echo((ar_assert(notfound($kids, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Find failed\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("kid->Find('children.id=1' ... ADODB_LAZY_AR) [Lazy Method]\n"); - ar_echo("Of course, lazy loading also retrieve medata information...\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $kid = new Kid('children'); - $kids = $kid->Find('children.id=1', false, false, array('loading' => ADODB_LAZY_AR)); - ar_echo((ar_assert(found($kids, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(notfound($kids, "'favorite_color' => 'lavender'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n"); - ar_echo("\n-- Lazily Loading People:\n\n"); - foreach($kids as $akid) - { - if($akid->person); - } - 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"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $rugrat = new Rugrat('children'); - $rugrats = $rugrat->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR)); - ar_echo((ar_assert(found($rugrats, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n"); - 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"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $kid = new Kid('children'); - $kids = $kid->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR)); - ar_echo((ar_assert(found($kids, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n"); - 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"); - $rugrat = new Rugrat('children'); - $rugrats = $rugrat->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR)); - $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); - ar_echo((ar_assert(found($arugrat, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n"); - ar_echo((ar_assert(found($arugrat, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(notfound($arugrat, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n"); - ar_echo((ar_assert(notfound($arugrat, "'name_first' => 'JAMIE'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("person->Find('1=1') [Lazy Method]\n"); - ar_echo("And now for our finale...\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $person = new Person(); - $people = $person->Find('1=1', false, false, array('loading' => ADODB_LAZY_AR)); - ar_echo((ar_assert(found($people, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(notfound($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n"); - ar_echo((ar_assert(notfound($people, "'name_first' => 'Fluffy'"))) ? "[OK] No Fluffy yet\n" : "[!!] Found Fluffy relation when I shouldn't\n"); - ar_echo("\n-- Lazily Loading Everybody:\n\n"); - foreach($people as $aperson) - { - foreach($aperson->children as $achild) - { - if($achild->name_first); - } - } - 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((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"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $artist = new Artist(); - $artist->Load('artistuniqueid=1'); - ar_echo((ar_assert(found($artist, "'name' => 'Elvis Costello'"))) ? "[OK] Found Elvis Costello\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(found($artist, "'name' => 'No Hiding Place'"))) ? "[OK] Found relation: song\n" : "[!!] Missing relation: song\n"); - - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("song->Load('recordid=1') [Join Method]\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $song = new Song(); - $song->Load('recordid=1'); - ar_echo((ar_assert(found($song, "'name' => 'No Hiding Place'"))) ? "[OK] Found song\n" : "[!!] Find failed\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("artist->Find('artistuniqueid=1' ... ADODB_JOIN_AR) [Join Method]\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $artist = new Artist(); - $artists = $artist->Find('artistuniqueid=1', false, false, array('loading' => ADODB_JOIN_AR)); - ar_echo((ar_assert(found($artists, "'name' => 'Elvis Costello'"))) ? "[OK] Found Elvis Costello\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(found($artists, "'name' => 'No Hiding Place'"))) ? "[OK] Found relation: song\n" : "[!!] Missing relation: song\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("song->Find('recordid=1' ... ADODB_JOIN_AR) [Join Method]\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $song = new Song(); - $songs = $song->Find('recordid=1', false, false, array('loading' => ADODB_JOIN_AR)); - ar_echo((ar_assert(found($songs, "'name' => 'No Hiding Place'"))) ? "[OK] Found song\n" : "[!!] Find failed\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("artist->Find('artistuniqueid=1' ... ADODB_WORK_AR) [Work Method]\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $artist = new Artist(); - $artists = $artist->Find('artistuniqueid=1', false, false, array('loading' => ADODB_WORK_AR)); - ar_echo((ar_assert(found($artists, "'name' => 'Elvis Costello'"))) ? "[OK] Found Elvis Costello\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(found($artists, "'name' => 'No Hiding Place'"))) ? "[OK] Found relation: song\n" : "[!!] Missing relation: song\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("song->Find('recordid=1' ... ADODB_JOIN_AR) [Join Method]\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $song = new Song(); - $songs = $song->Find('recordid=1', false, false, array('loading' => ADODB_WORK_AR)); - ar_echo((ar_assert(found($songs, "'name' => 'No Hiding Place'"))) ? "[OK] Found song\n" : "[!!] Find failed\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("artist->Find('artistuniqueid=1' ... ADODB_LAZY_AR) [Lazy Method]\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $artist = new Artist(); - $artists = $artist->Find('artistuniqueid=1', false, false, array('loading' => ADODB_LAZY_AR)); - ar_echo((ar_assert(found($artists, "'name' => 'Elvis Costello'"))) ? "[OK] Found Elvis Costello\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(notfound($artists, "'name' => 'No Hiding Place'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n"); - foreach($artists as $anartist) - { - foreach($anartist->songs as $asong) - { - if($asong->name); - } - } - ar_echo((ar_assert(found($artists, "'name' => 'No Hiding Place'"))) ? "[OK] Found relation: song\n" : "[!!] Missing relation: song\n"); - - ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n"); - ar_echo("song->Find('recordid=1' ... ADODB_LAZY_AR) [Lazy Method]\n"); - ar_echo("-------------------------------------------------------------------------------------------------------------------\n"); - $song = new Song(); - $songs = $song->Find('recordid=1', false, false, array('loading' => ADODB_LAZY_AR)); - ar_echo((ar_assert(found($songs, "'name' => 'No Hiding Place'"))) ? "[OK] Found song\n" : "[!!] Find failed\n"); - ar_echo((ar_assert(notfound($songs, "'name' => 'Elvis Costello'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n"); - foreach($songs as $asong) - { - if($asong->artist); - } - ar_echo((ar_assert(found($songs, "'name' => 'Elvis Costello'"))) ? "[OK] Found relation: artist\n" : "[!!] Missing relation: artist\n"); - - 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/vendor/adodb/adodb-php/tests/test-datadict.php b/vendor/adodb/adodb-php/tests/test-datadict.php deleted file mode 100644 index 55caeae493..0000000000 --- a/vendor/adodb/adodb-php/tests/test-datadict.php +++ /dev/null @@ -1,251 +0,0 @@ -$dbType

"; - $db = NewADOConnection($dbType); - $dict = NewDataDictionary($db); - - if (!$dict) continue; - $dict->debug = 1; - - $opts = array('REPLACE','mysql' => 'ENGINE=INNODB', 'oci8' => 'TABLESPACE USERS'); - -/* $flds = array( - array('id', 'I', - 'AUTO','KEY'), - - array('name' => 'firstname', 'type' => 'varchar','size' => 30, - 'DEFAULT'=>'Joan'), - - array('lastname','varchar',28, - 'DEFAULT'=>'Chen','key'), - - array('averylonglongfieldname','X',1024, - 'NOTNULL','default' => 'test'), - - array('price','N','7.2', - 'NOTNULL','default' => '0.00'), - - array('MYDATE', 'D', - 'DEFDATE'), - array('TS','T', - 'DEFTIMESTAMP') - );*/ - - $flds = " -ID I AUTO KEY, -FIRSTNAME VARCHAR(30) DEFAULT 'Joan' INDEX idx_name, -LASTNAME VARCHAR(28) DEFAULT 'Chen' key INDEX idx_name INDEX idx_lastname, -averylonglongfieldname X(1024) DEFAULT 'test', -price N(7.2) DEFAULT '0.00', -MYDATE D DEFDATE INDEX idx_date, -BIGFELLOW X NOTNULL, -TS_SECS T DEFTIMESTAMP, -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"); - $dict->SetSchema(''); - $sqla2 = $dict->ChangeTableSQL('adoxyz',$flds); - if ($sqla2) printsqla($dbType,$sqla2); - } - if ($dbType == 'postgres') { - if (@$db->Connect('localhost', "tester", "test", "test")); - $dict->SetSchema(''); - $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")); - $dict->SetSchema(''); - $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) -{ - print "

";
-	//print_r($dict->MetaTables());
-	foreach($sqla as $s) {
-		$s = htmlspecialchars($s);
-		print "$s;\n";
-		if ($dbType == 'oci8') print "/\n";
-	}
-	print "
"; -} - -/*** - -Generated SQL: - -mysql - -CREATE DATABASE KUTU; -DROP TABLE KUTU.testtable; -CREATE TABLE KUTU.testtable ( -id INTEGER NOT NULL AUTO_INCREMENT, -firstname VARCHAR(30) DEFAULT 'Joan', -lastname VARCHAR(28) NOT NULL DEFAULT 'Chen', -averylonglongfieldname LONGTEXT NOT NULL, -price NUMERIC(7,2) NOT NULL DEFAULT 0.00, -MYDATE DATE DEFAULT CURDATE(), - PRIMARY KEY (id, lastname) -)TYPE=ISAM; -CREATE FULLTEXT INDEX idx ON KUTU.testtable (firstname,lastname); -CREATE INDEX idx2 ON KUTU.testtable (price,lastname); -ALTER TABLE KUTU.testtable ADD height DOUBLE; -ALTER TABLE KUTU.testtable ADD weight DOUBLE; -ALTER TABLE KUTU.testtable MODIFY COLUMN height DOUBLE NOT NULL; -ALTER TABLE KUTU.testtable MODIFY COLUMN weight DOUBLE NOT NULL; - - --------------------------------------------------------------------------------- - -oci8 - -CREATE USER KUTU IDENTIFIED BY tiger; -/ -GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO KUTU; -/ -DROP TABLE KUTU.testtable CASCADE CONSTRAINTS; -/ -CREATE TABLE KUTU.testtable ( -id NUMBER(16) NOT NULL, -firstname VARCHAR(30) DEFAULT 'Joan', -lastname VARCHAR(28) DEFAULT 'Chen' NOT NULL, -averylonglongfieldname CLOB NOT NULL, -price NUMBER(7,2) DEFAULT 0.00 NOT NULL, -MYDATE DATE DEFAULT TRUNC(SYSDATE), - PRIMARY KEY (id, lastname) -)TABLESPACE USERS; -/ -DROP SEQUENCE KUTU.SEQ_testtable; -/ -CREATE SEQUENCE KUTU.SEQ_testtable; -/ -CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON KUTU.testtable - FOR EACH ROW - BEGIN - select KUTU.SEQ_testtable.nextval into :new.id from dual; - END; -/ -CREATE BITMAP INDEX idx ON KUTU.testtable (firstname,lastname); -/ -CREATE INDEX idx2 ON KUTU.testtable (price,lastname); -/ -ALTER TABLE testtable ADD ( - height NUMBER, - weight NUMBER); -/ -ALTER TABLE testtable MODIFY( - height NUMBER NOT NULL, - weight NUMBER NOT NULL); -/ - - --------------------------------------------------------------------------------- - -postgres -AlterColumnSQL not supported for PostgreSQL - - -CREATE DATABASE KUTU LOCATION='/u01/postdata'; -DROP TABLE KUTU.testtable; -CREATE TABLE KUTU.testtable ( -id SERIAL, -firstname VARCHAR(30) DEFAULT 'Joan', -lastname VARCHAR(28) DEFAULT 'Chen' NOT NULL, -averylonglongfieldname TEXT NOT NULL, -price NUMERIC(7,2) DEFAULT 0.00 NOT NULL, -MYDATE DATE DEFAULT CURRENT_DATE, - PRIMARY KEY (id, lastname) -); -CREATE INDEX idx ON KUTU.testtable USING HASH (firstname,lastname); -CREATE INDEX idx2 ON KUTU.testtable (price,lastname); -ALTER TABLE KUTU.testtable ADD height FLOAT8; -ALTER TABLE KUTU.testtable ADD weight FLOAT8; - - --------------------------------------------------------------------------------- - -odbc_mssql - -CREATE DATABASE KUTU; -DROP TABLE KUTU.testtable; -CREATE TABLE KUTU.testtable ( -id INT IDENTITY(1,1) NOT NULL, -firstname VARCHAR(30) DEFAULT 'Joan', -lastname VARCHAR(28) DEFAULT 'Chen' NOT NULL, -averylonglongfieldname TEXT NOT NULL, -price NUMERIC(7,2) DEFAULT 0.00 NOT NULL, -MYDATE DATETIME DEFAULT GetDate(), - PRIMARY KEY (id, lastname) -); -CREATE CLUSTERED INDEX idx ON KUTU.testtable (firstname,lastname); -CREATE INDEX idx2 ON KUTU.testtable (price,lastname); -ALTER TABLE KUTU.testtable ADD - height REAL, - weight REAL; -ALTER TABLE KUTU.testtable ALTER COLUMN height REAL NOT NULL; -ALTER TABLE KUTU.testtable ALTER COLUMN weight REAL NOT NULL; - - --------------------------------------------------------------------------------- -*/ - - -echo "

Test XML Schema

"; -$ff = file('xmlschema.xml'); -echo "
";
-foreach($ff as $xml) echo htmlspecialchars($xml);
-echo "
"; -include_once('test-xmlschema.php'); diff --git a/vendor/adodb/adodb-php/tests/test-perf.php b/vendor/adodb/adodb-php/tests/test-perf.php deleted file mode 100644 index 62465bef6c..0000000000 --- a/vendor/adodb/adodb-php/tests/test-perf.php +++ /dev/null @@ -1,48 +0,0 @@ - $v) { - if (strncmp($k,'test',4) == 0) $_SESSION['_db'] = $k; - } -} - -if (isset($_SESSION['_db'])) { - $_db = $_SESSION['_db']; - $_GET[$_db] = 1; - $$_db = 1; -} - -echo "

Performance Monitoring

"; -include_once('testdatabases.inc.php'); - - -function testdb($db) -{ - if (!$db) return; - echo "";print_r($db->ServerInfo()); echo " user=".$db->user.""; - - $perf = NewPerfMonitor($db); - - # unit tests - if (0) { - //$DB->debug=1; - echo "Data Cache Size=".$perf->DBParameter('data cache size').'

'; - echo $perf->HealthCheck(); - echo($perf->SuspiciousSQL()); - 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/vendor/adodb/adodb-php/tests/test-pgblob.php b/vendor/adodb/adodb-php/tests/test-pgblob.php
deleted file mode 100644
index 3add99e647..0000000000
--- a/vendor/adodb/adodb-php/tests/test-pgblob.php
+++ /dev/null
@@ -1,86 +0,0 @@
-Param(false);
-		$x = (rand() % 10) + 1;
-		$db->debug= ($i==1);
-		$id = $db->GetOne($sql,
-			array('Z%','Z%',$x));
-		if($id != $offset+$x) {
-			print "
Error at $x";
-			break;
-		}
-	}
-}
-
-include_once('../adodb.inc.php');
-$db = NewADOConnection('postgres7');
-$db->PConnect('localhost','tester','test','test') || die("failed connection");
-
-$enc = "GIF89a%01%00%01%00%80%FF%00%C0%C0%C0%00%00%00%21%F9%04%01%00%00%00%00%2C%00%00%00%00%01%00%01%00%00%01%012%00%3Bt_clear.gif%0D";
-$val = rawurldecode($enc);
-
-$MAX = 1000;
-
-adodb_pr($db->ServerInfo());
-
-echo "
Testing PREPARE/EXECUTE PLAN
";
-
-
-$db->_bindInputArray = true; // requires postgresql 7.3+ and ability to modify database
-$t = getmicrotime();
-doloop();
-echo '
',$MAX,' times, with plan=',getmicrotime() - $t,'
';
-
-
-$db->_bindInputArray = false;
-$t = getmicrotime();
-doloop();
-echo '
',$MAX,' times, no plan=',getmicrotime() - $t,'
';
-
-
-
-echo "
Testing UPDATEBLOB
";
-$db->debug=1;
-
-### TEST BEGINS
-
-$db->Execute("insert into photos (id,name) values(9999,'dot.gif')");
-$db->UpdateBlob('photos','photo',$val,'id=9999');
-$v = $db->GetOne('select photo from photos where id=9999');
-
-
-### CLEANUP
-
-$db->Execute("delete from photos where id=9999");
-
-### VALIDATION
-
-if ($v !== $val) echo "*** ERROR: Inserted value does not match downloaded val";
-else echo "*** OK: Passed";
-
-echo "
";
-echo "INSERTED: ", $enc;
-echo "
";
-echo"RETURNED: ", rawurlencode($v);
-echo "
";
-echo "INSERTED: ", $val;
-echo "
";
-echo "RETURNED: ", $v;
diff --git a/vendor/adodb/adodb-php/tests/test-php5.php b/vendor/adodb/adodb-php/tests/test-php5.php
deleted file mode 100644
index a0a2d4adc0..0000000000
--- a/vendor/adodb/adodb-php/tests/test-php5.php
+++ /dev/null
@@ -1,116 +0,0 @@
-PHP ".PHP_VERSION."\n";
-try {
-
-$dbt = 'oci8po';
-
-try {
-switch($dbt) {
-case 'oci8po':
-	$db = NewADOConnection("oci8po");
-
-	$db->Connect('localhost','scott','natsoft','sherkhan');
-	break;
-default:
-case 'mysql':
-	$db = NewADOConnection("mysql");
-	$db->Connect('localhost','root','','northwind');
-	break;
-
-case 'mysqli':
-	$db = NewADOConnection("mysqli://root:@localhost/northwind");
-	//$db->Connect('localhost','root','','test');
-	break;
-}
-} catch (exception $e){
-	echo "Connect Failed";
-	adodb_pr($e);
-	die();
-}
-
-$db->debug=1;
-
-$cnt = $db->GetOne("select count(*) from adoxyz where ?Prepare("select * from adoxyz where ?ErrorMsg(),"\n";
-$rs = $db->Execute($stmt,array(10,20));
-
-echo  "
 Foreach Iterator Test (rand=".rand().")
";
-$i = 0;
-foreach($rs as $v) {
-	$i += 1;
-	echo "rec $i: "; $s1 = adodb_pr($v,true); $s2 = adodb_pr($rs->fields,true);
-	if ($s1 != $s2 && !empty($v)) {adodb_pr($s1); adodb_pr($s2);}
-	else echo "passed
";
-	flush();
-}
-
-$rs = new ADORecordSet_empty();
-foreach($rs as $v) {
-	echo "
empty ";var_dump($v);
-}
-
-
-if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
-else echo "Count $i is correct
";
-
-$rs = $db->Execute("select bad from badder");
-
-} catch (exception $e) {
-	adodb_pr($e);
-	echo "
adodb_backtrace:
\n";
-	$e = adodb_backtrace($e->gettrace());
-}
-
-$rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order by id");
-echo "Result=\n",$rs,"
";
-
-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();
-
-} catch(exception $e){
-	echo $e->getMessage();
-}
-
-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->country = "M'sia";
-	$a->save();
-	$a->Delete();
-} catch(exception $e){
-	echo $e->getMessage();
-}
-
-//include_once("test-active-record.php");
diff --git a/vendor/adodb/adodb-php/tests/test-xmlschema.php b/vendor/adodb/adodb-php/tests/test-xmlschema.php
deleted file mode 100644
index c56cfec8ee..0000000000
--- a/vendor/adodb/adodb-php/tests/test-xmlschema.php
+++ /dev/null
@@ -1,53 +0,0 @@
-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 database to the provided schema,
-// uncomment the following line:
-#$schema->upgradeSchema();
-
-print "SQL to build xmlschema.xml:\n
";
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-var_dump( $sql );
-print "
\n";
-
-// Execute the SQL on the database
-//$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-//$schema->Destroy();
-
-
-
-print "SQL to build xmlschema-mssql.xml:\n
";
-
-$db2 = ADONewConnection('mssql');
-$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
-
-$db2->Execute("drop table simple_table");
-
-$schema = new adoSchema( $db2 );
-$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
-
-print_r( $sql );
-print "
\n";
-
-$db2->debug=1;
-
-foreach ($sql as $s)
-$db2->Execute($s);
diff --git a/vendor/adodb/adodb-php/tests/test.php b/vendor/adodb/adodb-php/tests/test.php
deleted file mode 100644
index 341dbf9e9c..0000000000
--- a/vendor/adodb/adodb-php/tests/test.php
+++ /dev/null
@@ -1,1781 +0,0 @@
-$msg
";
-	flush();
-}
-
-function CheckWS($conn)
-{
-global $ADODB_EXTENSION;
-
-	include_once('../session/adodb-session.php');
-	if (defined('CHECKWSFAIL')){ echo " TESTING $conn ";flush();}
-	$saved = $ADODB_EXTENSION;
-	$db = ADONewConnection($conn);
-	$ADODB_EXTENSION = $saved;
-	if (headers_sent()) {
-		print "
White space detected in adodb-$conn.inc.php or include file...
";
-		//die();
-	}
-}
-
-function do_strtolower(&$arr)
-{
-	foreach($arr as $k => $v) {
-		if (is_object($v)) $arr[$k] = adodb_pr($v,true);
-		else $arr[$k] = strtolower($v);
-	}
-}
-
-
-function CountExecs($db, $sql, $inputarray)
-{
-global $EXECS;  $EXECS++;
-}
-
-function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
-{
-global $CACHED; $CACHED++;
-}
-
-// the table creation code is specific to the database, so we allow the user
-// to define their own table creation stuff
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-GLOBAL $ADODB_vers,$ADODB_CACHE_DIR,$ADODB_FETCH_MODE,$ADODB_COUNTRECS;
-
-	//adodb_pr($db);
-
-?>	

-	

-
 
-

-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'))
-	ORDER BY t1.time DESC";
-		$db->SelectLimit($sql);
-		echo $db->ErrorMsg();*/
-	}
-	$ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
-	$db->debug = false;
-	//print $db->UnixTimeStamp('2003-7-22 23:00:00');
-
-	$phpv = phpversion();
-	if (defined('ADODB_EXTENSION')) $ext = '   Extension '.ADODB_EXTENSION.' installed';
-	else $ext = '';
-	print "
ADODB Version: $ADODB_vers";
-	print "
Host: $db->host";
-	print "
Database: $db->database";
-	print "
PHP: $phpv $ext
";
-
-	flush();
-
-	print "Current timezone: " . date_default_timezone_get() . "
";
-
-	$arr = $db->ServerInfo();
-	print_r($arr);
-	echo E_ALL,' ',E_STRICT, "
";
-	$e = error_reporting(E_ALL | E_STRICT);
-	echo error_reporting(),'
';
-	flush();
-	#$db->debug=1;
-	$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');
-	print "
date1.1 1999 injection attack= ".$db->DBDate("'1999', ' injection attack '");
-	print "
date2 (1970-1-2) = ".$db->DBDate(24*3600)."
";
-	print "ts1 (1999-02-20 13:40:50) = ".$db->DBTimeStamp('1999-2-20 1:40:50 pm');
-	print "
ts1.1 (1999-02-20 13:40:00) = ".$db->DBTimeStamp('1999-2-20 13:40');
-	print "
ts2 (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
-	print "
ts2 (1999-02-20) = ".$db->DBTimeStamp("'1999-2-20', 'injection attack'");
-	print "
ts3 (1970-1-2 +/- timezone) = ".$db->DBTimeStamp(24*3600);
-	print "
 Fractional TS (1999-2-20 13:40:50.91): ".$db->DBTimeStamp($db->UnixTimeStamp('1999-2-20 13:40:50.91+1'));
-	 $dd = $db->UnixDate('1999-02-20');
-	print "
unixdate 1999-02-20 = ".date('Y-m-d',$dd)."
";
-	print "
ts4 =".($db->UnixTimeStamp("19700101000101")+8*3600);
-	print "
ts5 =".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
-	print "
ts6 =".$db->UserTimeStamp("20040110092123");
-	print "
ts7 =".$db->DBTimeStamp("20040110092123");
-	flush();
-	// mssql too slow in failing bad connection
-	if (false && $db->databaseType != 'mssql') {
-		print "
Testing bad connection. Ignore following error msgs:
";
-		$db2 = ADONewConnection();
-		$rez = $db2->Connect("bad connection");
-		$err = $db2->ErrorMsg();
-		print "Error='$err'
";
-		if ($rez) print "Cannot check if connection failed. The Connect() function returned true.
";
-	}
-	#error_reporting($e);
-	flush();
-
-	//$ADODB_COUNTRECS=false;
-	$rs=$db->Execute('select * from ADOXYZ order by id');
-	if($rs === false) $create = true;
-	else $rs->Close();
-
-	//if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
-
-	if ($create) {
-		if (false && $db->databaseType == 'ibase') {
-			print "Please create the following table for testing:
$createtab
";
-			return;
-		} else {
-			$db->debug = 99;
-		#	$e = error_reporting(E_ALL-E_WARNING);
-			$db->Execute($createtab);
-		#	error_reporting($e);
-		}
-	}
-	#error_reporting(E_ALL);
-	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
";
-		$rs->Close();
-	} else print "err=".$db->ErrorMsg();
-
-	print "
Test select on empty table, FetchField when EOF, and GetInsertSQL
";
-	$rs = $db->Execute("select id,firstname from ADOXYZ where id=9999");
-	if ($rs && !$rs->EOF) print "Error: RecordSet returned by Execute(select...') on empty table should show EOF
";
-	if ($rs->EOF && (($ox = $rs->FetchField(0)) && !empty($ox->name))) {
-		$record['id'] = 99;
-		$record['firstname'] = 'John';
-		$sql =  $db->GetInsertSQL($rs, $record);
-		if (strtoupper($sql) != strtoupper("INSERT INTO ADOXYZ ( id, firstname ) VALUES ( 99, 'John' )")) Err("GetInsertSQL does not work on empty table: $sql");
-	} else {
-		Err("FetchField does not work on empty recordset, meaning GetInsertSQL will fail...");
-	}
-	if ($rs) $rs->Close();
-	flush();
-	//$db->debug=true;
-	print "
Testing Commit: ";
-	$time = $db->DBDate(time());
-	if (!$db->BeginTrans()) {
-		print 'Transactions not supported
';
-		if ($db->hasTransactions) Err("hasTransactions should be false");
-	} else { /* COMMIT */
-		if (!$db->hasTransactions) Err("hasTransactions should be true");
-		if ($db->transCnt != 1) Err("Invalid transCnt = $db->transCnt (should be 1)");
-		$rs = $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (99,'Should Not','Exist (Commit)',$time)");
-		if ($rs && $db->CommitTrans()) {
-			$rs->Close();
-			$rs = $db->Execute("select * from ADOXYZ where id=99");
-			if ($rs === false || $rs->EOF) {
-				print 'Data not saved
';
-				$rs = $db->Execute("select * from ADOXYZ where id=99");
-				print_r($rs);
-				die();
-			} else print 'OK
';
-			if ($rs) $rs->Close();
-		} else {
-			if (!$rs) {
-				print "Insert failed
";
-				$db->RollbackTrans();
-			} else print "Commit failed
";
-		}
-		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
-
-		/* ROLLBACK */
-		if (!$db->BeginTrans()) print "
Error in BeginTrans()
";
-		print "
Testing Rollback: ";
-		$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (100,'Should Not','Exist (Rollback)',$time)");
-		if ($db->RollbackTrans()) {
-			$rs = $db->Execute("select * from ADOXYZ where id=100");
-			if ($rs && !$rs->EOF) print 'Fail: Data should rollback
';
-			else print 'OK
';
-			if ($rs) $rs->Close();
-		} else
-			print "Commit failed
";
-
-		$rs = $db->Execute('delete from ADOXYZ where id>50');
-		if ($rs) $rs->Close();
-
-		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
-	}
-
-	if (1) {
-		print "
Testing MetaDatabases()
";
-		print_r( $db->MetaDatabases());
-
-		print "
Testing MetaTables() and MetaColumns()
";
-		$a = $db->MetaTables();
-		if ($a===false) print "MetaTables not supported
";
-		else {
-			print "Array of tables and views: ";
-			foreach($a as $v) print " ($v) ";
-			print '
';
-		}
-
-		$a = $db->MetaTables('VIEW');
-		if ($a===false) print "MetaTables not supported (views)
";
-		else {
-			print "Array of views: ";
-			foreach($a as $v) print " ($v) ";
-			print '
';
-		}
-
-		$a = $db->MetaTables(false,false,'aDo%');
-		if ($a===false) print "MetaTables not supported (mask)
";
-		else {
-			print "Array of ado%: ";
-			foreach($a as $v) print " ($v) ";
-			print '
';
-		}
-
-		$a = $db->MetaTables('TABLE');
-		if ($a===false) print "MetaTables not supported
";
-		else {
-			print "Array of tables: ";
-			foreach($a as $v) print " ($v) ";
-			print '
';
-		}
-
-		$db->debug=0;
-		$rez = $db->MetaColumns("NOSUCHTABLEHERE");
-		if ($rez !== false) {
-			Err("MetaColumns error handling failed");
-			var_dump($rez);
-		}
-		$db->debug=1;
-		$a = $db->MetaColumns('ADOXYZ');
-		if ($a===false) print "MetaColumns not supported
";
-		else {
-			print "
Columns of ADOXYZ: 
";
-			foreach($a as $v) {print_r($v); echo "
";}
-			echo "";
-		}
-
-		print "
Testing MetaIndexes
";
-
-		$a = $db->MetaIndexes(('ADOXYZ'),true);
-		if ($a===false) print "MetaIndexes not supported
";
-		else {
-			print "
Indexes of ADOXYZ: 
";
-			adodb_pr($a);
-			echo "";
-		}
-		print "
Testing MetaPrimaryKeys
";
-		$a = $db->MetaPrimaryKeys('ADOXYZ');
-		var_dump($a);
-	}
-	$rs = $db->Execute('delete from ADOXYZ');
-	if ($rs) $rs->Close();
-
-	$db->debug = false;
-
-
-	switch ($db->databaseType) {
-	case 'vfp':
-
-		if (0) {
-			// memo test
-			$rs = $db->Execute("select data from memo");
-			rs2html($rs);
-		}
-		break;
-
-	case 'postgres7':
-	case 'postgres64':
-	case 'postgres':
-	case 'ibase':
-		print "
Encode=".$db->BlobEncode("abc\0d\"'
-ef")."
";//'
-
-		print "
Testing Foreign Keys
";
-		$arr = $db->MetaForeignKeys('ADOXYZ',false,true);
-		print_r($arr);
-		if (!$arr) Err("No MetaForeignKeys");
-		break;
-
-	case 'odbc_mssql':
-	case 'mssqlpo':
-		print "
Testing Foreign Keys
";
-		$arr = $db->MetaForeignKeys('Orders',false,true);
-		print_r($arr);
-		if (!$arr) Err("Bad MetaForeignKeys");
-		if ($db->databaseType == 'odbc_mssql') break;
-
-	case 'mssql':
-
-
-/*
-ASSUME Northwind available...
-
-CREATE PROCEDURE SalesByCategory
-	@CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
-AS
-IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998'
-BEGIN
-	SELECT @OrdYear = '1998'
-END
-
-SELECT ProductName,
-	TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * (1-OD.Discount) * OD.UnitPrice)), 0)
-FROM [Order Details] OD, Orders O, Products P, Categories C
-WHERE OD.OrderID = O.OrderID
-	AND OD.ProductID = P.ProductID
-	AND P.CategoryID = C.CategoryID
-	AND C.CategoryName = @CategoryName
-	AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
-GROUP BY ProductName
-ORDER BY ProductName
-GO
-
-
-CREATE PROCEDURE ADODBTestSP
-@a nvarchar(25)
-AS
-SELECT GETDATE() AS T, @a AS A
-GO
-*/
-		print "
Testing Stored Procedures for mssql
";
-		$saved = $db->debug;
-		$db->debug=true;
-		$assoc = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		$cmd = $db->PrepareSP('ADODBTestSP');
-		$ss = "You should see me in the output.";
-		$db->InParameter($cmd,$ss,'a');
-		$rs = $db->Execute($cmd);
-		#var_dump($rs->fields);
-		echo $rs->fields['T']." --- ".$rs->fields['A']."---
";
-
-		$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 )
-			END
-			GO
-		*/
-		$db->debug=1;
-		$stmt = $db->PrepareSP('at_date_interval');
-		$days = 10;
-		$begin_date = '';
-		$end_date = '';
-		$db->InParameter($stmt,$days,'days', 4, SQLINT4);
-		$db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR );
-		$db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR );
-		$db->Execute($stmt);
-		if (empty($begin_date) or empty($end_date) 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 'oci8po':
-
-		if (0) {
-		$t = getmicrotime();
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$arr = $db->GetArray('select * from abalone_tree');
-		$arr = $db->GetArray('select * from abalone_tree');
-		$arr = $db->GetArray('select * from abalone_tree');
-		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
-		(
-		  ID           NUMBER(16) primary key,
-		  PHOTO        BLOB,
-		  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");
-
-		print "
Testing Blob: size=".strlen($s)."
";
-		$ok = $db->Updateblob('photos','photo',$s,'id=1');
-		if (!$ok) Err("Blob failed 1");
-		else {
-			$s2= $db->GetOne("select photo from photos where id=1");
-			if ($s !== $s2) Err("updateblob does not match");
-		}
-
-		print "
Testing Clob: size=".strlen($s)."
";
-		$ok = $db->UpdateClob('photos','descclob',$s,'id=1');
-		if (!$ok) Err("Clob failed 1");
-		else {
-			$s2= $db->GetOne("select descclob from photos where id=1");
-			if ($s !== $s2) Err("updateclob does not match");
-		}
-
-
-		$s = '';
-		$s2 = '';
-		print "
Testing Foreign Keys
";
-		$arr = $db->MetaForeignKeys('emp','scott');
-		print_r($arr);
-		if (!$arr) Err("Bad MetaForeignKeys");
-/*
--- TEST PACKAGE
--- "Set scan off" turns off substitution variables.
-Set scan off;
-
-CREATE OR REPLACE PACKAGE Adodb AS
-TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR);
-PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) ;
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR);
-PROCEDURE data_in(input IN VARCHAR);
-PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER);
-END Adodb;
-/
-
-
-CREATE OR REPLACE PACKAGE BODY Adodb AS
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
-	END open_tab;
-
-	PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
-		tablenames := 'TEST';
-	END open_tab2;
-
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
-	BEGIN
-		output := 'Cinta Hati '||input;
-	END;
-
-PROCEDURE data_in(input IN VARCHAR) IS
-	ignore varchar(1000);
-	BEGIN
-		ignore := input;
-	END;
-
-PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER) AS
-BEGIN
-p2 := p1;
-END;
-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
";
-			else Err("Test 1 RowCount ".$rs->RecordCount().", actual = $v");
-		} else {
-			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!
-		$db->InParameter($stmt,$a1,'a1');
-		$db->OutParameter($stmt,$a2,'a2');
-		$rs = $db->Execute($stmt);
-		if ($rs) {
-			if ($a2 !== 'Cinta Hati Malaysia') print "Stored Procedure Error: a2 = $a2
";
-			else echo  "OK: a2=$a2
";
-		} else {
-			print "Error in using Stored Procedure IN/Out Variables
";
-		}
-
-		$tname = 'A%';
-
-		$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
-		$db->Parameter($stmt,$tname,'tablename');
-		$rs = $db->Execute($stmt);
-		rs2html($rs);
-
-		$stmt = $db->PrepareSP("begin adodb.data_in(:a1); end;");
-		$db->InParameter($stmt,$a1,'a1');
-		$db->Execute($stmt);
-
-		$db->debug = $saved;
-		break;
-
-	default:
-		break;
-	}
-	$arr = array(
-		array(1,'Caroline','Miranda'),
-		array(2,'John','Lim'),
-		array(3,'Wai Hun','See')
-	);
-	//$db->debug=1;
-	print "
Testing Bulk Insert of 3 rows
";
-
-//	$db->debug=1;
-//	$db->Execute('select * from table where val=? AND value=?', array('val'=>'http ://www.whatever.com/test?=21', 'value'=>'blabl'));
-
-
-	$sql = "insert into ADOXYZ (id,firstname,lastname) values (".$db->Param('0').",".$db->Param('1').",".$db->Param('2').")";
-	$db->bulkBind = true;
-	$db->StartTrans();
-	$db->debug=99;
-	$db->Execute($sql,$arr);
-	$db->CompleteTrans();
-	$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++) {
-
-	$time = $db->DBDate(time());
-	if (empty($_GET['hide'])) $db->debug = true;
-	switch($db->databaseType){
-	case 'mssqlpo':
-	case 'mssql':
-		$sqlt = "CREATE TABLE mytable (
-  row1 INT  IDENTITY(1,1) NOT NULL,
-  row2 varchar(16),
-  PRIMARY KEY  (row1))";
-  		//$db->debug=1;
-  		if (!$db->Execute("delete from mytable"))
-			$db->Execute($sqlt);
-
-		$ok = $db->Execute("insert into mytable (row2) values ('test')");
-		$ins_id=$db->Insert_ID();
-		echo "Insert ID=";var_dump($ins_id);
-		if ($ins_id == 0) Err("Bad Insert_ID()");
-		$ins_id2 = $db->GetOne("select row1 from mytable");
-		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-
-		$arr = array(0=>'Caroline',1=>'Miranda');
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
-		break;
-	case 'mysqli':
-	case 'mysqlt':
-	case 'mysql':
-		$sqlt = "CREATE TABLE `mytable` (
-  `row1` int(11) NOT NULL auto_increment,
-  `row2` varchar(16) NOT NULL default '',
-  PRIMARY KEY  (`row1`),
-  KEY `myindex` (`row1`,`row2`)
-) ";
-		if (!$db->Execute("delete from mytable"))
-			$db->Execute($sqlt);
-
-		$ok = $db->Execute("insert into mytable (row2) values ('test')");
-		$ins_id=$db->Insert_ID();
-		echo "Insert ID=";var_dump($ins_id);
-		if ($ins_id == 0) Err("Bad Insert_ID()");
-		$ins_id2 = $db->GetOne("select row1 from mytable");
-		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-
-	default:
-		$arr = array(0=>'Caroline',1=>'Miranda');
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
-		break;
-
-	case 'oci8':
-	case 'oci805':
-		$arr = array('first'=>'Caroline','last'=>'Miranda');
-		$amt = rand() % 100;
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,:first,:last,$time)";
-		break;
-	}
-	if ($i & 1) {
-		$sql = $db->Prepare($sql);
-	}
-	$rs = $db->Execute($sql,$arr);
-
-	if ($rs === false) Err( 'Error inserting with parameters');
-	else $rs->Close();
-	$db->debug = false;
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+1,'John','Lim',$time)");
-	/*$ins_id=$db->Insert_ID();
-	echo "Insert ID=";var_dump($ins_id);*/
-	if ($db->databaseType == 'mysql') if ($ins_id == 0) Err('Bad Insert_ID');
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+2,'Mary','Lamb',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+3,'George','Washington',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+4,'Mr. Alan','Tam',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+5,'Alan',".$db->quote("Turing'ton").",$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created)values ($i*10+6,'Serena','Williams',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+7,'Yat Sun','Sun',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+8,'Wai Hun','See',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+9,'Steven','Oey',$time )");
-	} // for
-	if (1) {
-	$db->debug=1;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$cnt = $db->GetOne("select count(*) from ADOXYZ");
-	$rs = $db->Execute('update ADOXYZ set id=id+1');
-	if (!is_object($rs)) {
-		print_r($rs);
-		err("Update should return object");
-	}
-	if (!$rs) err("Update generated error");
-
-	$nrows = $db->Affected_Rows();
-	if ($nrows === false) print "
Affected_Rows() not supported
";
-	else if ($nrows != $cnt)  print "
Affected_Rows() Error: $nrows returned (should be 50) 
";
-	else print "
Affected_Rows() passed
";
-	}
-
-	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
-		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
-		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_r($rs->fields);
-	}
-	if ($db->databaseType !== 'odbc') {
-		$rs = $db->Execute("select id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
-		if ($rs) {
-			if ($rs->RecordCount() != 50) {
-				print "
RecordCount returns ".$rs->RecordCount().", should be 50
";
-				adodb_pr($rs->GetArray());
-				$poc = $rs->PO_RecordCount('ADOXYZ');
-				if ($poc == 50) print "
     PO_RecordCount passed
";
-				else print "
PO_RecordCount returns wrong value: $poc
";
-			} else print "
RecordCount() passed
";
-			if (isset($rs->fields['firstname'])) print '
The fields columns can be indexed by column name.
';
-			else {
-				Err( '
The fields columns cannot be indexed by column name.
');
-				print_r($rs->fields);
-			}
-			if (empty($_GET['hide'])) rs2html($rs);
-		}
-		else print "
Error in Execute of SELECT with random
";
-	}
-	$val = $db->GetOne("select count(*) from ADOXYZ");
-	 if ($val == 50) print "
GetOne returns ok
";
-	 else print "
Fail: GetOne returns $val
";
-
-	 echo "GetRow Test";
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$val1 = $db->GetRow("select count(*) from ADOXYZ");
-	$val2 = $db->GetRow("select count(*) from ADOXYZ");
-	 if ($val1[0] == 50 and sizeof($val1) == 1 and $val2[0] == 50 and sizeof($val2) == 1) print "
GetRow returns ok
";
-	 else {
-	 	print_r($val);
-	 	print "
Fail: GetRow returns {$val2[0]}
";
-	}
-
-	print "
FetchObject/FetchNextObject Test
";
-	$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);
-				print "
Firstname is not string
";
-				break;
-			}
-		}
-	} else {
-		print "
Failed rs
";
-		die("
ADOXYZ table cannot be read - die()");
-	}
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	print "
FetchObject/FetchNextObject Test 2
";
-	#$db->debug=99;
-	$rs = $db->Execute('select * from ADOXYZ');
-	if (empty($rs->connection)) print "Connection object missing from recordset
";
-	print_r($rs->fields);
-	while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
-		if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
-			print_r($o);
-			print "
Firstname is not string
";
-			break;
-		}
-	}
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-
-	$savefetch = $ADODB_FETCH_MODE;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-
-	print "
CacheSelectLimit  Test...
";
-	$rs = $db->CacheSelectLimit('select  id, firstname from  ADOXYZ order by id',2);
-
-	if (ADODB_ASSOC_CASE == 2 || $db->dataProvider == 'oci8') {
-		$id = 'ID';
-		$fname = 'FIRSTNAME';
-	}else {
-		$id = 'id';
-		$fname = 'firstname';
-	}
-
-
-	if ($rs && !$rs->EOF) {
-		if (isset($rs->fields[0])) {
-			Err("ASSOC has numeric fields");
-			print_r($rs->fields);
-		}
-		if ($rs->fields[$id] != 1)  {Err("Error"); print_r($rs->fields);};
-		if (trim($rs->fields[$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();
-		if (!$rs->EOF) {
-			Err("Error EOF");
-			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) {
-
-		if ($rs->fields[$id] != 1)  {Err("Error 1"); print_r($rs->fields);};
-		if (trim($rs->fields[$fname]) != 'Caroline')  {Err("Error 2"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if ($rs->fields[$id] != 2)  {Err("Error 3"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if (!$rs->EOF) Err("Error EOF");
-		else if (is_array($rs->fields) || $rs->fields) {
-			Err("Error: ## fields should be set to false on EOF");
-			print_r($rs->fields);
-		}
-	}
-
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	print "
FETCH_MODE = NUM: Should get 1, Caroline
";
-	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		if (isset($rs->fields[$id])) Err("FETCH_NUM has ASSOC fields");
-		if ($rs->fields[0] != 1)  {Err("Error 1"); print_r($rs->fields);};
-		if (trim($rs->fields[1]) != 'Caroline')  {Err("Error 2");print_r($rs->fields);};
-		$rs->MoveNext();
-		if (!$rs->EOF) Err("Error EOF");
-
-	}
-	$ADODB_FETCH_MODE = $savefetch;
-
-	$db->debug = false;
-	print "
GetRowAssoc Upper: Should get 1, Caroline
";
-	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		$arr = $rs->GetRowAssoc(ADODB_ASSOC_CASE_UPPER);
-
-		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();
-		if (!$rs->EOF) Err("Error EOF");
-
-	}
-	print "
GetRowAssoc Lower: Should get 1, Caroline
";
-	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		$arr = $rs->GetRowAssoc(ADODB_ASSOC_CASE_LOWER);
-		if ($arr['id'] != 1) {Err("Error 1"); print_r($arr);};
-		if (trim($arr['firstname']) != 'Caroline') {Err("Error 2"); print_r($arr);};
-
-	}
-
-	print "
GetCol Test
";
-	$col = $db->GetCol('select distinct firstname from ADOXYZ order by 1');
-	if (!is_array($col)) Err("Col size is wrong");
-	if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col elements wrong");
-
-
-	$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]);
-		$rs->MoveNext();
-		if (! $rs->EOF) Err("Error EOF");
-		//rs2html($rs);
-	} else Err("Failed SelectLimit Test 1");
-
-	print "
SelectLimit Test 2: Should see Mary, George and Mr. Alan
";
-	$rs = $db->SelectLimit('select * from ADOXYZ order by id',3,2);
-	if ($rs && !$rs->EOF) {
-		if (trim($rs->fields[1]) != 'Mary') Err("Error 1 - No Mary, instead: ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'George')Err("Error 2 - No George, instead: ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3 - No Mr. Alan, instead: ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (! $rs->EOF) Err("Error EOF");
-	//	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;
-	$rs = $db->SelectLimit('select * from ADOXYZ order by id',-1,48);
-	$A=0;
-	if ($rs && !$rs->EOF) {
-		if (empty($rs->connection)) print "Connection object missing from recordset
";
-		if (trim($rs->fields[1]) != 'Wai Hun') Err("Error 1 ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'Steven') Err("Error 2 ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (! $rs->EOF) {
-			Err("Error EOF");
-		}
-		//rs2html($rs);
-	}
-	 else Err("Failed SelectLimit Test 3");
-		$db->debug = false;
-
-
-	$rs = $db->Execute("select * from ADOXYZ order by id");
-	print "
Testing Move()
";
-	if (!$rs)Err( "Failed Move SELECT");
-	else {
-		if (!$rs->Move(2)) {
-			if (!$rs->canSeek) print "
$db->databaseType: Move(), MoveFirst() nor MoveLast() not supported.
";
-			else print '
RecordSet->canSeek property should be set to false
';
-		} else {
-			$rs->MoveFirst();
-			if (trim($rs->Fields("firstname")) != 'Caroline') {
-				print "
$db->databaseType: MoveFirst failed -- probably cannot scroll backwards
";
-			}
-			else print "MoveFirst() OK
";
-
-						// Move(3) tests error handling -- MoveFirst should not move cursor
-			$rs->Move(3);
-			if (trim($rs->Fields("firstname")) != 'George') {
-				print '
'.$rs->Fields("id")."$db->databaseType: Move(3) failed
";
-			} else print "Move(3) OK
";
-
-			$rs->Move(7);
-			if (trim($rs->Fields("firstname")) != 'Yat Sun') {
-				print '
'.$rs->Fields("id")."$db->databaseType: Move(7) failed
";
-				print_r($rs);
-			} else print "Move(7) OK
";
-			if ($rs->EOF) Err("Move(7) is EOF already");
-			$rs->MoveLast();
-			if (trim($rs->Fields("firstname")) != 'Steven'){
-				 print '
'.$rs->Fields("id")."$db->databaseType: MoveLast() failed
";
-				 print_r($rs);
-			}else print "MoveLast() OK
";
-			$rs->MoveNext();
-			if (!$rs->EOF) err("Bad MoveNext");
-			if ($rs->canSeek) {
-				$rs->Move(3);
-				if (trim($rs->Fields("firstname")) != 'George') {
-					print '
'.$rs->Fields("id")."$db->databaseType: Move(3) after MoveLast failed
";
-
-				} else print "Move(3) after MoveLast() OK
";
-			}
-
-			print "
Empty Move Test";
-			$rs = $db->Execute("select * from ADOXYZ where id > 0 and id < 0");
-			$rs->MoveFirst();
-			if (!$rs->EOF || $rs->fields) Err("Error in empty move first");
-		}
-	}
-
-	$rs = $db->Execute('select * from ADOXYZ where id = 2');
-	if ($rs->EOF || !is_array($rs->fields)) Err("Error in select");
-	$rs->MoveNext();
-	if (!$rs->EOF) Err("Error in EOF (xx) ");
- //	$db->debug=true;
-	print "
Testing ADODB_FETCH_ASSOC and concat: concat firstname and lastname
";
-
-	$save = $ADODB_FETCH_MODE;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	if ($db->dataProvider == 'postgres') {
-		$sql = "select ".$db->Concat('cast(firstname as varchar)',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
-		$rs = $db->Execute($sql);
-	} else {
-		$sql = "select distinct ".$db->Concat('firstname',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
-		$rs = $db->Execute($sql);
-	}
-	if ($rs) {
-		if (empty($_GET['hide'])) rs2html($rs);
-	} else {
-		Err( "Failed Concat:".$sql);
-	}
-	$ADODB_FETCH_MODE = $save;
-	print "
Testing GetArray() ";
-	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-
-	$rs = $db->Execute("select * from ADOXYZ order by id");
-	if ($rs) {
-		$arr = $rs->GetArray(10);
-		if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' || trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]."   ERROR
";
-		else print " OK
";
-	}
-
-	$arr = $db->GetArray("select x from ADOXYZ");
-	$e = $db->ErrorMsg(); $e2 = $db->ErrorNo();
-	echo "Testing error handling, should see illegal column 'x' error=$e ($e2) 
";
-	if (!$e || !$e2) Err("Error handling did not work");
-	print "Testing FetchNextObject for 1 object ";
-	$rs = $db->Execute("select distinct lastname,firstname from ADOXYZ where firstname='Caroline'");
-	$fcnt = 0;
-	if ($rs)
-	while ($o = $rs->FetchNextObject()) {
-		$fcnt += 1;
-	}
-	if ($fcnt == 1) print " OK
";
-	else print "FAILED
";
-
-	$stmt = $db->Prepare("select * from ADOXYZ where id < 3");
-	$rs = $db->Execute($stmt);
-	if (!$rs) Err("Prepare failed");
-	else {
-		$arr = $rs->GetArray();
-		if (!$arr) Err("Prepare failed 2");
-		if (sizeof($arr) != 2) Err("Prepare failed 3");
-	}
-	print "Testing GetAssoc() ";
-
-
-	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);
-		if (empty($arr['See']) || trim($arr['See']) != 'Wai Hun') print $arr['See']."   ERROR
";
-		else print " OK 2
";
-	}
-	// Comment this out to test countrecs = false
-	$ADODB_COUNTRECS = $savecrecs;
-	$db->debug=1;
-	$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').'
';
-	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');
-	else Err('Grouped Menu GetMenu3()');
-	print "
";
-
-	print "Testing GetMenu2() 
";
-	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu2('menu',('Oey')).'
';
-	else print " Fail
";
-	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu2('menu',('Oey'),false).'
';
-	else print " Fail
";
-	}
-	echo "
CacheExecute
";
-
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$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++)
-		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');
-		$val = $db->GenID('abc_seq2');
-		$db->DropSequence('abc_seq2');
-		$db->CreateSequence('abc_seq2');
-		$val = $db->GenID('abc_seq2');
-		if ($val != 1) Err("Drop and Create Sequence not supported ($val)");
-	}
-	echo "
";
-
-	if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
-		$sql = "select firstnames from ADOXYZ";
-		print "
Testing execution of illegal statement: $sql
";
-		if ($db->Execute($sql) === false) {
-			print "
This returns the following ErrorMsg(): ".$db->ErrorMsg()." and ErrorNo(): ".$db->ErrorNo().'
';
-		} else
-			print "
Error in error handling -- Execute() should return false
";
-	} else
-		print "
ADO skipped error handling of bad select statement
";
-
-	print "
ASSOC TEST 2
";
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->query('select * from ADOXYZ order by id');
-	if ($ee = $db->ErrorMsg()) {
-		Err("Error message=$ee");
-	}
-	if ($ee = $db->ErrorNo()) {
-		Err("Error No = $ee");
-	}
-	print_r($rs->fields);
-	for($i=0;$i<$rs->FieldCount();$i++)
-	{
-		$fld=$rs->FetchField($i);
-		print "
 Field name is ".$fld->name;
-		print " ".$rs->Fields($fld->name);
-	}
-
-
-	print "
BOTH TEST 2
";
-	if ($db->dataProvider == 'ado') {
-		print "ADODB_FETCH_BOTH not supported for dataProvider=".$db->dataProvider."
";
-	} else {
-		$ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
-		$rs = $db->query('select * from ADOXYZ order by id');
-		for($i=0;$i<$rs->FieldCount();$i++)
-		{
-			$fld=$rs->FetchField($i);
-			print "
 Field name is ".$fld->name;
-			print " ".$rs->Fields($fld->name);
-		}
-	}
-
-	print "
NUM TEST 2
";
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$rs = $db->query('select * from ADOXYZ order by id');
-	for($i=0;$i<$rs->FieldCount();$i++)
-	{
-		$fld=$rs->FetchField($i);
-		print "
 Field name is ".$fld->name;
-		print " ".$rs->Fields($fld->name);
-	}
-
-	print "
ASSOC Test of SelectLimit
";
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->selectlimit('select * from ADOXYZ order by id',3,4);
-	$cnt = 0;
-	while ($rs && !$rs->EOF) {
-		$cnt += 1;
-		if (!isset($rs->fields['firstname'])) {
-			print "
ASSOC returned numeric field
";
-			break;
-		}
-		$rs->MoveNext();
-	}
-	if ($cnt != 3) print "
Count should be 3, instead it was $cnt
";
-
-
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	if ($db->sysDate) {
-		$saved = $db->debug;
-		$db->debug = 1;
-		$rs = $db->Execute("select {$db->sysDate} from ADOXYZ where id=1");
-		if (ADORecordSet::UnixDate(date('Y-m-d')) != $rs->UnixDate($rs->fields[0])) {
-			print "
Invalid date {$rs->fields[0]}
";
-		} else
-			print "
Passed \$sysDate test ({$rs->fields[0]})
";
-
-		print_r($rs->FetchField(0));
-		print time();
-		$db->debug=$saved;
-	} else {
-		print "
\$db->sysDate not defined
";
-	}
-
-	print "
Test CSV
";
-	include_once('../toexport.inc.php');
-	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' he,\'"\' q  from ADOXYZ',10);
-
-	print "
";
-	print rs2csv($rs);
-	print "
";
-
-	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'The	"young man", he said\' from ADOXYZ',10);
-
-	if (PHP_VERSION < 5) {
-		print "
";
-		rs2tabout($rs);
-		print "
";
-	}
-	#print " CacheFlush ";
-	#$db->CacheFlush();
-
-	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A');
-	$sql = "SELECT $date from ADOXYZ";
-	print "
Test SQLDate: ".htmlspecialchars($sql)."
";
-	$rs = $db->SelectLimit($sql,1);
-	$d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
-	if (!$rs) Err("SQLDate query returned no recordset");
-	else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: 
act:$d 
sql:".$rs->fields[0]);
-
-	$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;
-	$rs = $db->SelectLimit($sql,1);
-	$ts = ADOConnection::UnixDate('1974-02-25');
-	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
-	if (!$rs) {
-		Err("SQLDate query returned no recordset");
-		echo $db->ErrorMsg(),'
';
-	} 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',
-		array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
-		array('id'),
-		$autoq = true);
-	if (!$ret) echo "
Error in replacing existing record
";
-	else {
-		$saved = $db->debug;
-		$db->debug = 0;
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = true;
-		$rs = $db->Execute('select * FROM ADOXYZ where id=1');
-		$db->debug = $saved;
-		if ($rs->RecordCount() != 1) {
-			$cnt = $rs->RecordCount();
-			rs2html($rs);
-			print "Error - Replace failed, count=$cnt
";
-		}
-		$ADODB_COUNTRECS = $savec;
-	}
-	$ret = $db->Replace('ADOXYZ',
-		array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
-		array('id','firstname'),
-		$autoq = true);
-	if ($ret != 2) print "Replace failed: ";
-	print "test A return value=$ret (2 expected) 
";
-
-	$ret = $db->Replace('ADOXYZ',
-		array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
-		'id',
-		$autoq = true);
-	if ($ret != 1)
-		if ($db->dataProvider == 'ibase' && $ret == 2);
-		else print "Replace failed: ";
-	print "test B return value=$ret (1 or if ibase then 2 expected) 
";
-
-	print "
rs2rs Test
";
-
-	$rs = $db->Execute('select * from ADOXYZ where id>= 1 order by id');
-	$rs = $db->_rs2rs($rs);
-	$rs->valueX = 'X';
-	$rs->MoveNext();
-	$rs = $db->_rs2rs($rs);
-	if (!isset($rs->valueX)) err("rs2rs does not preserve array recordsets");
-	if (reset($rs->fields) != 1) err("rs2rs does not move to first row: id=".reset($rs->fields));
-
-	/////////////////////////////////////////////////////////////
-	include_once('../pivottable.inc.php');
-	print "
Pivot Test
";
-	$db->debug=true;
- 	$sql = PivotTableSQL(
- 		$db,  			# adodb connection
- 		'ADOXYZ',  		# tables
-		'firstname',	# row fields
-		'lastname',		# column fields
-		false,			# join
-		'ID', 			# sum
-		'Sum ',			# label for sum
-		'sum',			# aggregate function
-		true
-	);
-	$rs = $db->Execute($sql);
-	if ($rs) rs2html($rs);
-	else Err("Pivot sql error");
-
-	$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()) {
-			$i++;
-			//print "$i ";
-			if ($arr[0] != $i) {
-				print_r($arr);
-				print "
PEAR DB emulation error 1.
";
-				$pear = false;
-				break;
-			}
-		}
-		$rs->Close();
-	}
-
-
-	if ($i != $db->GetOne('select count(*) from ADOXYZ where id>0 and id<10')) {
-		print "
PEAR DB emulation error 1.1 EOF ($i)
";
-		$pear = false;
-	}
-
-	$rs = $db->limitQuery('select * from ADOXYZ where id>0 order by id',$i=3,$top=3);
-	$i2 = $i;
-	if ($rs && !$rs->EOF) {
-
-		while (!is_object($rs->fetchInto($arr))) {
-			$i2++;
-
-	//			print_r($arr);
-	//		print "$i ";print_r($arr);
-			if ($arr[0] != $i2) {
-				print "
PEAR DB emulation error 2.
";
-				$pear = false;
-				break;
-			}
-		}
-		$rs->Close();
-	}
-	if ($i2 != $i+$top) {
-		print "
PEAR DB emulation error 2.1 EOF (correct=$i+$top, actual=$i2)
";
-		$pear = false;
-	}
-	}
-	if ($pear) print "
PEAR DB emulation passed.
";
-	flush();
-
-
-	$rs = $db->SelectLimit("select ".$db->sysDate." from ADOXYZ",1);
-	$date = $rs->fields[0];
-	if (!$date) Err("Bad sysDate");
-	else {
-		$ds = $db->UserDate($date,"d m Y");
-		if ($ds != date("d m Y")) Err("Bad UserDate: ".$ds.' expected='.date("d m Y"));
-		else echo "Passed UserDate: $ds
";
-	}
-	$db->debug=1;
-	if ($db->dataProvider == 'oci8')
-		$rs = $db->SelectLimit("select to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from ADOXYZ",1);
-	else
-		$rs = $db->SelectLimit("select ".$db->sysTimeStamp." from ADOXYZ",1);
-	$date = $rs->fields[0];
-	if (!$date) Err("Bad sysTimeStamp");
-	else {
-		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
-		if ($ds != date("H \\h\\r\\s-d m Y")) Err("Bad UserTimeStamp: ".$ds.", correct is ".date("H \\h\\r\\s-d m Y"));
-		else echo "Passed UserTimeStamp: $ds
";
-
-		$date = 100;
-		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
-		$ds2 = date("H \\h\\r\\s-d m Y",$date);
-		if ($ds != $ds2) Err("Bad UserTimeStamp 2: $ds: $ds2");
-		else echo "Passed UserTimeStamp 2: $ds
";
-	}
-	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');
-			$db->StartTrans();
-				$db->BeginTrans();
-			$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
-				$db->CommitTrans();
-			$db->CompleteTrans();
-		$rez = $db->CompleteTrans();
-		$db->SetTransactionMode('');
-		$db->debug=0;
-		if ($rez !== false) {
-			if (is_null($rez)) Err("Error: _transOK not modified");
-			else Err("Error: CompleteTrans (1) should have failed");
-		} else {
-			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
-			if ($name == "Carolx") Err("Error: CompleteTrans (2) should have failed");
-			else echo "
 -- Passed StartTrans test1 - rolling back
";
-		}
-
-		$db->StartTrans();
-			$db->BeginTrans();
-		$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
-			$db->RollbackTrans();
-		$rez = $db->CompleteTrans();
-		if ($rez !== true) Err("Error: CompleteTrans (1) should have succeeded");
-		else {
-			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
-			if (trim($name) != "Carolx") Err("Error: CompleteTrans (2) should have succeeded, returned name=$name");
-			else echo "
 -- Passed StartTrans test2 - commiting
";
-		}
-	}
-	flush();
-	$saved = $db->debug;
-	$db->debug=1;
-	$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;
-	$db->raiseErrorFn = 'adodb_test_err';
-	global $ERRNO; // from adodb_test_err
-	$db->Execute('select * from nowhere');
-	$metae = $db->MetaError($ERRNO);
-	if ($metae !== DB_ERROR_NOSUCHTABLE) print "
MetaError=".$metae." wrong, should be ".DB_ERROR_NOSUCHTABLE."
";
-	else print "
MetaError ok (".DB_ERROR_NOSUCHTABLE."): ".$db->MetaErrorMsg($metae)."
";
-	if ($TESTERRS != 1) print "raiseErrorFn select nowhere failed
";
-	$rs = $db->Execute('select * from ADOXYZ');
-	if ($debugerr) print " Move";
-	$rs->Move(100);
-	$rs->_queryID = false;
-	if ($debugerr) print " MoveNext";
-	$rs->MoveNext();
-	if ($debugerr) print " $rs=false";
-	$rs = false;
-
-	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;
-	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
-	//var_dump($rs->fields);
-	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$db->SetFetchMode(ADODB_FETCH_NUM);
-	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
-	if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
-
-	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);
-		$conn->raiseErrorFn = 'adodb_test_err';
-		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");
-
-	flush();
-?>
-	

-	
 

-	

-Close();
-	if ($rs2) $rs2->Close();
-	if ($rs) $rs->Close();
-	$db->Close();
-
-	if ($db->transCnt != 0) Err("Error in transCnt=$db->transCnt (should be 0)");
-
-
-	printf("
Total queries=%d; total cached=%d
",$EXECS+$CACHED, $CACHED);
-	flush();
-}
-
-function adodb_test_err($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
-{
-global $TESTERRS,$ERRNO;
-
-	$ERRNO = $errno;
-	$TESTERRS += 1;
-	print "** $dbms ($fn): errno=$errno   errmsg=$errmsg ($p1,$p2)
";
-}
-
-//--------------------------------------------------------------------------------------
-
-
-@set_time_limit(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-include("../rsfilter.inc.php");
-
-/* White Space Check */
-
-if (isset($_SERVER['argv'][1])) {
-	//print_r($_SERVER['argv']);
-	$_GET[$_SERVER['argv'][1]] = 1;
-}
-
-if (@$_SERVER['COMPUTERNAME'] == 'TIGRESS') {
-	CheckWS('mysqlt');
-	CheckWS('postgres');
-	CheckWS('oci8po');
-
-	CheckWS('firebird');
-	CheckWS('sybase');
-	if (!ini_get('safe_mode')) CheckWS('informix');
-
-	CheckWS('ado_mssql');
-	CheckWS('ado_access');
-	CheckWS('mssql');
-
-	CheckWS('vfp');
-	CheckWS('sqlanywhere');
-	CheckWS('db2');
-	CheckWS('access');
-	CheckWS('odbc_mssql');
-	CheckWS('firebird15');
-	//
-	CheckWS('oracle');
-	CheckWS('proxy');
-	CheckWS('fbsql');
-	print "White Space Check complete
";
-}
-if (sizeof($_GET) == 0) $testmysql = true;
-
-
-foreach($_GET as $k=>$v)  {
-	// XSS protection (see Github issue #274) - only set variables for
-	// expected get parameters used in testdatabases.inc.php
-	if(preg_match('/^(test|no)\w+$/', $k)) {
-		$$k = $v;
-	}
-}
-
-?>
-
-ADODB Testing
-
-
ADODB Test

-
-This script tests the following databases: Interbase, Oracle, Visual FoxPro, Microsoft Access (ODBC and ADO), MySQL, MSSQL (ODBC, native, ADO).
-There is also support for Sybase, PostgreSQL.

-For the latest version of ADODB, visit adodb.org.

-
-Test GetInsertSQL/GetUpdateSQL  
-	Sessions  
-	Paging  
-	Perf Monitor

-vers=",ADOConnection::Version();
-
-
-
-?>
-
ADODB Database Library  (c) 2000-2014 John Lim. All rights reserved. Released under BSD and LGPL, PHP .

-
-
diff --git a/vendor/adodb/adodb-php/tests/test2.php b/vendor/adodb/adodb-php/tests/test2.php
deleted file mode 100644
index eb3b025822..0000000000
--- a/vendor/adodb/adodb-php/tests/test2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-debug=1;
-	$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);
-	} catch(exception $e) {
-	print_r($e);
-	echo "
 Date m/d/Y =",$db->UserDate($rs->fields[4],'m/d/Y');
-	}
diff --git a/vendor/adodb/adodb-php/tests/test3.php b/vendor/adodb/adodb-php/tests/test3.php
deleted file mode 100644
index 009a534b43..0000000000
--- a/vendor/adodb/adodb-php/tests/test3.php
+++ /dev/null
@@ -1,44 +0,0 @@
-Connect('','scott','natsoft');
-$db->debug=1;
-
-$cnt = $db->GetOne("select count(*) from adoxyz");
-$rs = $db->Execute("select * from adoxyz order by id");
-
-$i = 0;
-foreach($rs as $k => $v) {
-	$i += 1;
-	echo $k; adodb_pr($v);
-	flush();
-}
-
-if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
-
-
-
-$rs = $db->Execute("select bad from badder");
-
-} catch (exception $e) {
-	adodb_pr($e);
-	$e = adodb_backtrace($e->trace);
-}
diff --git a/vendor/adodb/adodb-php/tests/test4.php b/vendor/adodb/adodb-php/tests/test4.php
deleted file mode 100644
index 647a35e68c..0000000000
--- a/vendor/adodb/adodb-php/tests/test4.php
+++ /dev/null
@@ -1,144 +0,0 @@
-PConnect("", "sa", "natsoft", "northwind"); // connect to MySQL, testdb
-
-$conn = ADONewConnection("mysql");  // create a connection
-$conn->PConnect("localhost", "root", "", "test"); // connect to MySQL, testdb
-
-
-#$conn = ADONewConnection('oci8po');
-#$conn->Connect('','scott','natsoft');
-
-if (PHP_VERSION  >= 5) {
-	$connstr = "mysql:dbname=northwind";
-	$u = 'root';$p='';
-	$conn = ADONewConnection('pdo');
-	$conn->Connect($connstr, $u, $p);
-}
-//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-
-
-$conn->debug=1;
-$conn->Execute("delete from adoxyz where lastname like 'Smi%'");
-
-$rs = $conn->Execute($sql); // Execute the query and get the empty recordset
-$record = array(); // Initialize an array to hold the record data to insert
-
-if (strpos($conn->databaseType,'mysql')===false) $record['id'] = 751;
-$record["firstname"] = 'Jann';
-$record["lastname"] = "Smitts";
-$record["created"] = time();
-
-$insertSQL = $conn->GetInsertSQL($rs, $record);
-$conn->Execute($insertSQL); // Insert the record into the database
-
-if (strpos($conn->databaseType,'mysql')===false) $record['id'] = 752;
-// Set the values for the fields in the record
-$record["firstname"] = 'anull';
-$record["lastname"] = "Smith\$@//";
-$record["created"] = time();
-
-if (isset($_GET['f'])) $ADODB_FORCE_TYPE = $_GET['f'];
-
-//$record["id"] = -1;
-
-// Pass the empty recordset and the array containing the data to insert
-// into the GetInsertSQL function. The function will process the data and return
-// a fully formatted insert sql statement.
-$insertSQL = $conn->GetInsertSQL($rs, $record);
-$conn->Execute($insertSQL); // Insert the record into the database
-
-
-
-$insertSQL2 = $conn->GetInsertSQL($table='ADOXYZ', $record);
-if ($insertSQL != $insertSQL2) echo "
Walt's new stuff failed: $insertSQL2
";
-//==========================
-// This code tests an update
-
-$sql = "
-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
-if (!$rs || $rs->EOF) print "
No record found!
";
-
-$record = array(); // Initialize an array to hold the record data to update
-
-
-// Set the values for the fields in the record
-$record["firstName"] = "Caroline".rand();
-//$record["lasTname"] = ""; // Update Caroline's lastname from Miranda to Smith
-$record["creAted"] = '2002-12-'.(rand()%30+1);
-$record['num'] = '';
-// Pass the single record recordset and the array containing the data to update
-// into the GetUpdateSQL function. The function will process the data and return
-// a fully formatted update sql statement.
-// If the data has not changed, no recordset is returned
-
-$updateSQL = $conn->GetUpdateSQL($rs, $record);
-$conn->Execute($updateSQL,$varr); // Update the record in the database
-if ($conn->Affected_Rows() != 1)print "
Error1 : Rows Affected=".$conn->Affected_Rows().", should be 1
";
-
-$record["firstName"] = "Caroline".rand();
-$record["lasTname"] = "Smithy Jones"; // Update Caroline's lastname from Miranda to Smith
-$record["creAted"] = '2002-12-'.(rand()%30+1);
-$record['num'] = 331;
-$updateSQL = $conn->GetUpdateSQL($rs, $record);
-$conn->Execute($updateSQL,$varr); // Update the record in the database
-if ($conn->Affected_Rows() != 1)print "
Error 2: Rows Affected=".$conn->Affected_Rows().", should be 1
";
-
-$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
-//adodb_pr($rs);
-rs2html($rs);
-
-$record["firstName"] = "Carol-new-".rand();
-$record["lasTname"] = "Smithy"; // Update Caroline's lastname from Miranda to Smith
-$record["creAted"] = '2002-12-'.(rand()%30+1);
-$record['num'] = 331;
-
-$conn->AutoExecute('ADOXYZ',$record,'UPDATE', "lastname like 'Sm%'");
-$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
-//adodb_pr($rs);
-rs2html($rs);
-}
-
-
-testsql();
diff --git a/vendor/adodb/adodb-php/tests/test5.php b/vendor/adodb/adodb-php/tests/test5.php
deleted file mode 100644
index 3241930c18..0000000000
--- a/vendor/adodb/adodb-php/tests/test5.php
+++ /dev/null
@@ -1,48 +0,0 @@
-debug=1;
-	$conn->PConnect("localhost","root","","xphplens");
-	print $conn->databaseType.':'.$conn->GenID().'
';
-}
-
-if (0) {
-	$conn = ADONewConnection("oci8");  // create a connection
-	$conn->debug=1;
-	$conn->PConnect("falcon", "scott", "tiger", "juris8.ecosystem.natsoft.com.my"); // connect to MySQL, testdb
-	print $conn->databaseType.':'.$conn->GenID();
-}
-
-if (0) {
-	$conn = ADONewConnection("ibase");  // create a connection
-	$conn->debug=1;
-	$conn->Connect("localhost:c:\\Interbase\\Examples\\Database\\employee.gdb", "sysdba", "masterkey", ""); // connect to MySQL, testdb
-	print $conn->databaseType.':'.$conn->GenID().'
';
-}
-
-if (0) {
-	$conn = ADONewConnection('postgres');
-	$conn->debug=1;
-	@$conn->PConnect("susetikus","tester","test","test");
-	print $conn->databaseType.':'.$conn->GenID().'
';
-}
diff --git a/vendor/adodb/adodb-php/tests/test_rs_array.php b/vendor/adodb/adodb-php/tests/test_rs_array.php
deleted file mode 100644
index 547b20ad6b..0000000000
--- a/vendor/adodb/adodb-php/tests/test_rs_array.php
+++ /dev/null
@@ -1,46 +0,0 @@
-InitArray($array,$typearr);
-
-while (!$rs->EOF) {
-	print_r($rs->fields);echo "
";
-	$rs->MoveNext();
-}
-
-echo "
 1 Seek
";
-$rs->Move(1);
-while (!$rs->EOF) {
-	print_r($rs->fields);echo "
";
-	$rs->MoveNext();
-}
-
-echo "
 2 Seek
";
-$rs->Move(2);
-while (!$rs->EOF) {
-	print_r($rs->fields);echo "
";
-	$rs->MoveNext();
-}
-
-echo "
 3 Seek
";
-$rs->Move(3);
-while (!$rs->EOF) {
-	print_r($rs->fields);echo "
";
-	$rs->MoveNext();
-}
-
-
-
-die();
diff --git a/vendor/adodb/adodb-php/tests/testcache.php b/vendor/adodb/adodb-php/tests/testcache.php
deleted file mode 100644
index 1e98ab12e6..0000000000
--- a/vendor/adodb/adodb-php/tests/testcache.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-PConnect('nwind');
-} else {
-	$db = ADONewConnection('mysql');
-	$db->PConnect('mangrove','root','','xphplens');
-}
-if (isset($cache)) $rs = $db->CacheExecute(120,'select * from products');
-else $rs = $db->Execute('select * from products');
-
-$arr = $rs->GetArray();
-print sizeof($arr);
diff --git a/vendor/adodb/adodb-php/tests/testdatabases.inc.php b/vendor/adodb/adodb-php/tests/testdatabases.inc.php
deleted file mode 100644
index 0b2188b507..0000000000
--- a/vendor/adodb/adodb-php/tests/testdatabases.inc.php
+++ /dev/null
@@ -1,478 +0,0 @@
-
-
-

-

-> Access

-> Interbase

-> MSSQL

-> MySQL

-> MySQL ODBC

-> MySQLi
-

-
> SQLite

-> MySQL Proxy

-> Oracle (oci8) 

-> PostgreSQL

-> PostgreSQL 9

-> PostgreSQL ODBC

-		
-> PgSQL PDO

-> MySQL PDO

-> SQLite PDO

-> Access PDO

-> MSSQL PDO

-
-> OCI PDO

-
-		> DB2

-> VFP+ODBTP

-> ADO (for mssql and access)

-> $ADODB_COUNTRECS=false

-> No SQL Logging

-> ADOdb time test
-

-
-
-
-FETCH MODE IS NOT ADODB_FETCH_DEFAULT";
-
-if (isset($nocountrecs)) $ADODB_COUNTRECS = false;
-
-// cannot test databases below, but we include them anyway to check
-// if they parse ok...
-
-if (sizeof($_GET) || !isset($_SERVER['HTTP_HOST'])) {
-	echo "
";
-	ADOLoadCode2("sybase");
-	ADOLoadCode2("postgres");
-	ADOLoadCode2("postgres7");
-	ADOLoadCode2("firebird");
-	ADOLoadCode2("borland_ibase");
-	ADOLoadCode2("informix");
-	ADOLoadCode2('mysqli');
-	if (defined('ODBC_BINMODE_RETURN')) {
-		ADOLoadCode2("sqlanywhere");
-		ADOLoadCode2("access");
-	}
-	ADOLoadCode2("mysql");
-	ADOLoadCode2("oci8");
-}
-
-function ADOLoadCode2($d)
-{
-	ADOLoadCode($d);
-	$c = ADONewConnection($d);
-	echo "Loaded $d ",($c ? 'ok' : 'extension not installed'),"
";
-}
-
-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($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)) {
-
-	$db = ADONewConnection('odbc');
-	$db->hasTransactions = false;
-	print "
Connecting $db->databaseType...
";
-
-	if ($db->PConnect('Postgresql')) {
-		$db->hasTransactions = true;
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	} else print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.
".$db->ErrorMsg();
-}
-
-if (!empty($testibase)) {
-	//$_GET['nolog'] = true;
-	$db = ADONewConnection('firebird');
-	print "
Connecting $db->databaseType...
";
-	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();
-
-}
-
-
-if (!empty($testsqlite)) {
-	$path =urlencode('d:\inetpub\adodb\sqlite.db');
-	$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
-		print "ERROR: SQLite";
-
-}
-
-if (!empty($testpdopgsql)) {
-	$connstr = "pgsql:dbname=test";
-	$u = 'tester';$p='test';
-	$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)");
-}
-
-if (!empty($testpdomysql)) {
-	$connstr = "mysql:dbname=northwind";
-	$u = 'root';$p='';
-	$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)");
-}
-
-if (!empty($testpdomssql)) {
-	$connstr = "mssql:dbname=northwind";
-	$u = 'sa';$p='natsoft';
-	$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)");
-}
-
-if (!empty($testpdosqlite)) {
-	$connstr = "sqlite:d:/inetpub/adodb/sqlite-pdo.db3";
-	$u = '';$p='';
-	$db = ADONewConnection('pdo');
-	$db->hasTransactions = false;
-	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)");
-}
-
-if (!empty($testpdoaccess)) {
-	$connstr = 'odbc:nwind';
-	$u = '';$p='';
-	$db = ADONewConnection('pdo');
-	$db->hasTransactions = false;
-	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)");
-}
-
-if (!empty($testpdoora)) {
-	$connstr = 'oci:';
-	$u = 'scott';$p='natsoft';
-	$db = ADONewConnection('pdo');
-	#$db->hasTransactions = false;
-	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)");
-}
-
-// REQUIRES ODBC DSN CALLED nwind
-if (!empty($testaccess)) {
-	$db = ADONewConnection('access');
-	print "
Connecting $db->databaseType...
";
-	$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 . ';';
-		//. 'USER ID=;PASSWORD=;';
-	$_GET['nolog'] = 1;
-	if ($db->PConnect($myDSN, "", "", "")) {
-		print "ADO version=".$db->_connectionID->version."
";
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	} else print "ERROR: Access test requires a Access database $access".'
'.$db->ErrorMsg();
-
-}
-
-if (!empty($testvfp)) { // ODBC
-	$db = ADONewConnection('vfp');
-	print "
Connecting $db->databaseType...
";flush();
-
-	if ( $db->PConnect("vfp-adoxyz")) {
-		testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
-	 } else print "ERROR: Visual FoxPro test requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
-
-	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";
-
-}
-
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysql)) { // MYSQL
-
-
-	if (PHP_VERSION >= 5 || $_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
-	else $server = "mangrove";
-	$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');
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) Type=InnoDB");
-	} else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
'.$db->ErrorMsg();
-}
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysqli)) { // MYSQL
-
-	$db = ADONewConnection('mysqli');
-	print "
Connecting $db->databaseType...
";
-	if (PHP_VERSION >= 5 || $_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
-	else $server = "mangrove";
-	if ($db->PConnect($server, "root", "", "northwind")) {
-		//$db->debug=1;$db->Execute('drop table ADOXYZ');
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-	} else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
'.$db->ErrorMsg();
-}
-
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysqlodbc)) { // MYSQL
-
-	$db = ADONewConnection('odbc');
-	$db->hasTransactions = false;
-	print "
Connecting $db->databaseType...
";
-	if ($_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
-	else $server = "mangrove";
-	if ($db->PConnect('mysql', "root", ""))
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
'.$db->ErrorMsg();
-}
-
-if (!empty($testproxy)){
-	$db = ADONewConnection('proxy');
-	print "
Connecting $db->databaseType...
";
-	if ($_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
-
-	if ($db->PConnect('http://localhost/php/phplens/adodb/server.php'))
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
'.$db->ErrorMsg();
-
-}
-
-ADOLoadCode('oci805');
-ADOLoadCode("oci8po");
-
-if (!empty($testoracle)) {
-	$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
-		print "ERROR: Oracle test requires an Oracle server setup with scott/natsoft".'
'.$db->ErrorMsg();
-
-}
-ADOLoadCode("oracle"); // no longer supported
-if (false && !empty($testoracle)) {
-
-	$db = ADONewConnection();
-	print "
Connecting $db->databaseType...
";
-	if ($db->PConnect("", "scott", "tiger", "natsoft.domain"))
-		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	else print "ERROR: Oracle test requires an Oracle server setup with scott/tiger".'
'.$db->ErrorMsg();
-
-}
-
-ADOLoadCode("odbc_db2"); // no longer supported
-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 {
-		$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";
-		if ($db->Connect($dsn)) {
-			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();
-	}
-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();
-}
-
-
-$server = 'localhost';
-
-
-
-ADOLoadCode("mssqlpo");
-if (false && !empty($testmssql)) { // MS SQL Server -- the extension is buggy -- probably better to use ODBC
-	$db = ADONewConnection("mssqlpo");
-	//$db->debug=1;
-	print "
Connecting $db->databaseType...
";
-
-	$ok = $db->Connect('','sa','natsoft','northwind');
-	echo $db->ErrorMsg();
-	if ($ok /*or $db->PConnect("mangrove", "sa", "natsoft", "ai")*/) {
-		AutoDetect_MSSQL_Date_Order($db);
-	//	$db->Execute('drop table adoxyz');
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='$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", ""))  {
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	}
-	else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with DSN setup";
-
-}
-
-ADOLoadCode("ado_mssql");
-if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC -- DSN-less
-
-	$db = ADONewConnection("ado_mssql");
-	//$db->debug=1;
-	print "
Connecting DSN-less $db->databaseType...
";
-
-	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
-		. "SERVER=$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
-
-	$db = ADONewConnection("ado_mssql");
-	print "
Connecting DSN-less OLEDB Provider $db->databaseType...
";
-	//$db->debug=1;
-	$myDSN="SERVER=localhost;DATABASE=northwind;Trusted_Connection=yes";
-	if ($db->PConnect($myDSN, "adodb", "natsoft", 'SQLOLEDB')) {
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='mangrove', userid='sa', password='', database='ai'";
-
-}
-
-
-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...
";
-		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";
-
-}
-
-
-print "
Tests Completed
";
diff --git a/vendor/adodb/adodb-php/tests/testgenid.php b/vendor/adodb/adodb-php/tests/testgenid.php
deleted file mode 100644
index 3310734a5e..0000000000
--- a/vendor/adodb/adodb-php/tests/testgenid.php
+++ /dev/null
@@ -1,35 +0,0 @@
-Execute("drop table $table");
-	//$db->debug=true;
-
-	$ctr = 5000;
-	$lastnum = 0;
-
-	while (--$ctr >= 0) {
-		$num = $db->GenID($table);
-		if ($num === false) {
-			print "GenID returned false";
-			break;
-		}
-		if ($lastnum + 1 == $num) print " $num ";
-		else {
-			print " $num ";
-			flush();
-		}
-		$lastnum = $num;
-	}
-}
diff --git a/vendor/adodb/adodb-php/tests/testmssql.php b/vendor/adodb/adodb-php/tests/testmssql.php
deleted file mode 100644
index 076cc0c04a..0000000000
--- a/vendor/adodb/adodb-php/tests/testmssql.php
+++ /dev/null
@@ -1,77 +0,0 @@
-Connect('127.0.0.1','adodb','natsoft','northwind') or die('Fail');
-
-$conn->debug =1;
-$query = 'select * from products';
-$conn->SetFetchMode(ADODB_FETCH_ASSOC);
-$rs = $conn->Execute($query);
-echo "
";
-while( !$rs->EOF ) {
-	$output[] = $rs->fields;
-	var_dump($rs->fields);
-	$rs->MoveNext();
-	print "
";
-}
-die();
-
-
-$p = $conn->Prepare('insert into products (productname,unitprice,dcreated) values (?,?,?)');
-echo "
";
-print_r($p);
-
-$conn->debug=1;
-$conn->Execute($p,array('John'.rand(),33.3,$conn->DBDate(time())));
-
-$p = $conn->Prepare('select * from products where productname like ?');
-$arr = $conn->getarray($p,array('V%'));
-print_r($arr);
-die();
-
-//$conn = ADONewConnection("mssql");
-//$conn->Connect('mangrove','sa','natsoft','ai');
-
-//$conn->Connect('mangrove','sa','natsoft','ai');
-$conn->debug=1;
-$conn->Execute('delete from blobtest');
-
-$conn->Execute('insert into blobtest (id) values(1)');
-$conn->UpdateBlobFile('blobtest','b1','../cute_icons_for_site/adodb.gif','id=1');
-$rs = $conn->Execute('select b1 from blobtest where id=1');
-
-$output = "c:\\temp\\test_out-".date('H-i-s').".gif";
-print "Saving file $output, size=".strlen($rs->fields[0])."
";
-$fd = fopen($output, "wb");
-fwrite($fd, $rs->fields[0]);
-fclose($fd);
-
-print " View Image";
-//$rs = $conn->Execute('SELECT id,SUBSTRING(b1, 1, 10) FROM blobtest');
-//rs2html($rs);
diff --git a/vendor/adodb/adodb-php/tests/testoci8.php b/vendor/adodb/adodb-php/tests/testoci8.php
deleted file mode 100644
index e9174726bc..0000000000
--- a/vendor/adodb/adodb-php/tests/testoci8.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-PConnect('','scott','natsoft');
-	if (!empty($testblob)) {
-		$varHoldingBlob = 'ABC DEF GEF John TEST';
-		$num = time()%10240;
-		// create table atable (id integer, ablob blob);
-		$db->Execute('insert into ATABLE (id,ablob) values('.$num.',empty_blob())');
-		$db->UpdateBlob('ATABLE', 'ablob', $varHoldingBlob, 'id='.$num, 'BLOB');
-
-		$rs = $db->Execute('select * from atable');
-
-		if (!$rs) die("Empty RS");
-		if ($rs->EOF) die("EOF RS");
-		rs2html($rs);
-	}
-	$stmt = $db->Prepare('select * from adoxyz where id=?');
-	for ($i = 1; $i <= 10; $i++) {
-	$rs = $db->Execute(
-		$stmt,
-		array($i));
-
-		if (!$rs) die("Empty RS");
-		if ($rs->EOF) die("EOF RS");
-		rs2html($rs);
-	}
-}
-if (1) {
-	$db = ADONewConnection('oci8');
-	$db->PConnect('','scott','natsoft');
-	$db->debug = true;
-	$db->Execute("delete from emp where ename='John'");
-	print $db->Affected_Rows().'
';
-	$stmt = $db->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
-	$rs = $db->Execute($stmt,array('empno'=>4321,'ename'=>'John'));
-	// prepare not quite ready for prime time
-	//$rs = $db->Execute($stmt,array('empno'=>3775,'ename'=>'John'));
-	if (!$rs) die("Empty RS");
-
-	$db->setfetchmode(ADODB_FETCH_NUM);
-
-	$vv = 'A%';
-	$stmt = $db->PrepareSP("BEGIN adodb.open_tab2(:rs,:tt); END;",true);
-	$db->OutParameter($stmt, $cur, 'rs', -1, OCI_B_CURSOR);
-	$db->OutParameter($stmt, $vv, 'tt');
-	$rs = $db->Execute($stmt);
-	while (!$rs->EOF) {
-		adodb_pr($rs->fields);
-		$rs->MoveNext();
-	}
-	echo " val = $vv";
-
-}
-
-if (0) {
-	$db = ADONewConnection('odbc_oracle');
-	if (!$db->PConnect('local_oracle','scott','tiger')) die('fail connect');
-	$db->debug = true;
-	$rs = $db->Execute(
-		'select * from adoxyz where firstname=? and trim(lastname)=?',
-		array('first'=>'Caroline','last'=>'Miranda'));
-	if (!$rs) die("Empty RS");
-	if ($rs->EOF) die("EOF RS");
-	rs2html($rs);
-}
diff --git a/vendor/adodb/adodb-php/tests/testoci8cursor.php b/vendor/adodb/adodb-php/tests/testoci8cursor.php
deleted file mode 100644
index 992c3f8973..0000000000
--- a/vendor/adodb/adodb-php/tests/testoci8cursor.php
+++ /dev/null
@@ -1,110 +0,0 @@
-PConnect('','scott','natsoft');
-	$db->debug = 99;
-
-
-/*
-*/
-
-	define('MYNUM',5);
-
-
-	$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS,'A%'); END;");
-
-	if ($rs && !$rs->EOF) {
-		print "Test 1 RowCount: ".$rs->RecordCount()."
";
-	} else {
-		print "Error in using Cursor Variables 1
";
-	}
-
-	print "
Testing Stored Procedures for oci8
";
-
-	$stid = $db->PrepareSP('BEGIN adodb.myproc('.MYNUM.', :myov); END;');
-	$db->OutParameter($stid, $myov, 'myov');
-	$db->Execute($stid);
-	if ($myov != MYNUM) print "
Error with myproc
";
-
-
-	$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;",true);
-	$a1 = 'Malaysia';
-	//$a2 = ''; # a2 doesn't even need to be defined!
-	$db->InParameter($stmt,$a1,'a1');
-	$db->OutParameter($stmt,$a2,'a2');
-	$rs = $db->Execute($stmt);
-	if ($rs) {
-		if ($a2 !== 'Cinta Hati Malaysia') print "Stored Procedure Error: a2 = $a2
";
-		else echo  "OK: a2=$a2
";
-	} else {
-		print "Error in using Stored Procedure IN/Out Variables
";
-	}
-
-
-	$tname = 'A%';
-
-	$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
-	$db->Parameter($stmt,$tname,'tablename');
-	$rs = $db->Execute($stmt);
-	rs2html($rs);
diff --git a/vendor/adodb/adodb-php/tests/testpaging.php b/vendor/adodb/adodb-php/tests/testpaging.php
deleted file mode 100644
index d0b4e5e5cf..0000000000
--- a/vendor/adodb/adodb-php/tests/testpaging.php
+++ /dev/null
@@ -1,87 +0,0 @@
-PConnect('localhost','tester','test','test');
-}
-
-if ($driver == 'access') {
-	$db = NewADOConnection('access');
-	$db->PConnect("nwind", "", "", "");
-}
-
-if ($driver == 'ibase') {
-	$db = NewADOConnection('ibase');
-	$db->PConnect("localhost:e:\\firebird\\examples\\employee.gdb", "sysdba", "masterkey", "");
-	$sql = 'select distinct firstname, lastname  from adoxyz  order  by  firstname';
-
-}
-if ($driver == 'mssql') {
-	$db = NewADOConnection('mssql');
-	$db->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-}
-if ($driver == 'oci8') {
-	$db = NewADOConnection('oci8');
-	$db->Connect('','scott','natsoft');
-
-$sql = "select * from (select  ID, firstname as \"First Name\", lastname as \"Last Name\" from adoxyz
-	 order  by  1)";
-}
-
-if ($driver == 'access') {
-	$db = NewADOConnection('access');
-	$db->Connect('nwind');
-}
-
-if (empty($driver) or $driver == 'mysql') {
-	$db = NewADOConnection('mysql');
-	$db->Connect('localhost','root','','test');
-}
-
-//$db->pageExecuteCountRows = false;
-
-$db->debug = true;
-
-if (0) {
-$rs = $db->Execute($sql);
-include_once('../toexport.inc.php');
-print "
";
-print rs2csv($rs); # return a string
-
-print '
';
-$rs->MoveFirst(); # note, some databases do not support MoveFirst
-print rs2tab($rs); # return a string
-
-print '
';
-$rs->MoveFirst();
-rs2tabout($rs); # send to stdout directly
-print "
";
-}
-
-$pager = new ADODB_Pager($db,$sql);
-$pager->showPageLinks = true;
-$pager->linksPerPage = 10;
-$pager->cache = 60;
-$pager->Render($rows=7);
diff --git a/vendor/adodb/adodb-php/tests/testpear.php b/vendor/adodb/adodb-php/tests/testpear.php
deleted file mode 100644
index ecbbaa9b71..0000000000
--- a/vendor/adodb/adodb-php/tests/testpear.php
+++ /dev/null
@@ -1,35 +0,0 @@
-setFetchMode(ADODB_FETCH_ASSOC);
-$rs = $db->Query('select firstname,lastname from adoxyz');
-$cnt = 0;
-while ($arr = $rs->FetchRow()) {
-	print_r($arr);
-	print "
";
-	$cnt += 1;
-}
-
-if ($cnt != 50) print "Error in \$cnt = $cnt";
diff --git a/vendor/adodb/adodb-php/tests/testsessions.php b/vendor/adodb/adodb-php/tests/testsessions.php
deleted file mode 100644
index 9655f6e48b..0000000000
--- a/vendor/adodb/adodb-php/tests/testsessions.php
+++ /dev/null
@@ -1,100 +0,0 @@
-Notify Expiring=$ref, sessionkey=$key
";
-}
-
-//-------------------------------------------------------------------
-
-error_reporting(E_ALL);
-
-
-ob_start();
-include('../session/adodb-cryptsession2.php');
-
-
-$options['debug'] = 1;
-$db = 'postgres';
-
-#### CONNECTION
-switch($db) {
-case 'oci8':
-	$options['table'] = 'adodb_sessions2';
-	ADOdb_Session::config('oci8', 'mobydick', 'jdev', 'natsoft', 'mobydick',$options);
-	break;
-
-case 'postgres':
-	$options['table'] = 'sessions2';
-	ADOdb_Session::config('postgres', 'localhost', 'postgres', 'natsoft', 'northwind',$options);
-	break;
-
-case 'mysql':
-default:
-	$options['table'] = 'sessions2';
-	ADOdb_Session::config('mysql', 'localhost', 'root', '', 'xphplens_2',$options);
-	break;
-
-
-}
-
-
-
-#### SETUP NOTIFICATION
-	$USER = 'JLIM'.rand();
-	$ADODB_SESSION_EXPIRE_NOTIFY = array('USER','NotifyExpire');
-
-	adodb_session_create_table();
-	session_start();
-
-	adodb_session_regenerate_id();
-
-### SETUP SESSION VARIABLES
-	if (empty($_SESSION['MONKEY'])) $_SESSION['MONKEY'] = array(1,'abc',44.41);
-	else $_SESSION['MONKEY'][0] += 1;
-	if (!isset($_GET['nochange'])) @$_SESSION['AVAR'] += 1;
-
-
-### START DISPLAY
-	print "
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()
-### automatically for you. See php.ini's
-### 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();
-		}
-	} else {
-		$DB = ADODB_Session::_conn();
-		$sessk = $DB->qstr('%AZ'.rand().time());
-		$olddate = $DB->DBTimeStamp(time()-30*24*3600);
-		$rr = $DB->qstr(rand());
-		$DB->Execute("insert into {$options['table']} (sesskey,expiry,expireref,sessdata,created,modified) values ($sessk,$olddate, $rr,'',$olddate,$olddate)");
-	}
diff --git a/vendor/adodb/adodb-php/tests/time.php b/vendor/adodb/adodb-php/tests/time.php
deleted file mode 100644
index 8261e1e92c..0000000000
--- a/vendor/adodb/adodb-php/tests/time.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
-" );
-echo( "Converted: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
diff --git a/vendor/adodb/adodb-php/tests/tmssql.php b/vendor/adodb/adodb-php/tests/tmssql.php
deleted file mode 100644
index 0f81311aac..0000000000
--- a/vendor/adodb/adodb-php/tests/tmssql.php
+++ /dev/null
@@ -1,79 +0,0 @@
-mssql";
-	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
-	mssql_select_db('northwind',$db);
-
-	$rs = mssql_query('select getdate() as date',$db);
-	$o = mssql_fetch_row($rs);
-	print_r($o);
-	mssql_free_result($rs);
-
-	print "
Delete
"; flush();
-	$rs2 = mssql_query('delete from adoxyz',$db);
-	$p = mssql_num_rows($rs2);
-	mssql_free_result($rs2);
-
-}
-
-function tpear()
-{
-include_once('DB.php');
-
-	print "
PEAR
";
-	$username = 'adodb';
-	$password = 'natsoft';
-	$hostname = 'JAGUAR\vsdotnet';
-	$databasename = 'northwind';
-
-	$dsn = "mssql://$username:$password@$hostname/$databasename";
-	$conn = DB::connect($dsn);
-	print "date=".$conn->GetOne('select getdate()')."
";
-	@$conn->query('create table tester (id integer)');
-	print "
Delete
"; flush();
-	$rs = $conn->query('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."
";
-}
-
-function tadodb()
-{
-include_once('../adodb.inc.php');
-
-	print "
ADOdb
";
-	$conn = NewADOConnection('mssql');
-	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-//	$conn->debug=1;
-	print "date=".$conn->GetOne('select getdate()')."
";
-	$conn->Execute('create table tester (id integer)');
-	print "
Delete
"; flush();
-	$rs = $conn->Execute('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."
";
-}
-
-
-$ACCEPTIP = '127.0.0.1';
-
-$remote = $_SERVER["REMOTE_ADDR"];
-
-if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP)
- 	die("Unauthorised client: '$remote'");
-
-?>
-mssql
-pear
-adodb
-
-
-
-
-
-
-
-
-
-
-
-
-
-id
-
-
-id
-
-
-
-

-  
-    SQL to be executed only on specific platforms
-    
-      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
-    
-    
-      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
-    
-	
-      INSERT into simple_table ( name, description ) values ( '12', 'Microsoft stuff' )
-    
-  
-
\ No newline at end of file
diff --git a/vendor/adodb/adodb-php/tests/xmlschema.xml b/vendor/adodb/adodb-php/tests/xmlschema.xml
deleted file mode 100644
index ea48ae2bbf..0000000000
--- a/vendor/adodb/adodb-php/tests/xmlschema.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-  
-    
-      An integer row that's a primary key and autoincrements
-      
-      
-    
-    
-      A 16 character varchar row that can't be null
-      
-    
-    
-      row1
-      row2
-    
-  

-  
-    SQL to be executed only on specific platforms
-    
-      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
-    
-    
-      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
-    
-	
-      insert into mytable ( row1, row2 ) values ( 12, 'Microsoft stuff' )
-    
-  
-  
-    
-  

-
\ No newline at end of file
diff --git a/vendor/adodb/adodb-php/toexport.inc.php b/vendor/adodb/adodb-php/toexport.inc.php
index 77a78fbf6e..66bbf54240 100644
--- a/vendor/adodb/adodb-php/toexport.inc.php
+++ b/vendor/adodb/adodb-php/toexport.inc.php
@@ -1,14 +1,6 @@
 
-*/
+/**
+ * RecordSet to HTML Table
+ *
+ * Convert a recordset to a html table. Multiple tables are generated
+ * if the number of rows is > $gSQLBlockRows. This is because
+ * web browsers normally require the whole table to be downloaded
+ * before it can be rendered, so we break the output into several
+ * smaller, faster rendering tables.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // specific code for tohtml
 GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
@@ -17,14 +32,6 @@
 $gSQLMaxRows = 1000; // max no of rows to download
 $gSQLBlockRows=20; // max no of rows per table block
 
-// RecordSet to HTML Table
-//------------------------------------------------------------
-// Convert a recordset to a html table. Multiple tables are generated
-// if the number of rows is > $gSQLBlockRows. This is because
-// web browsers normally require the whole table to be downloaded
-// before it can be rendered, so we break the output into several
-// smaller faster rendering tables.
-//
 // $rs: the recordset
 // $ztabhtml: the table tag attributes (optional)
 // $zheaderarray: contains the replacement strings for the headers (optional)
diff --git a/vendor/adodb/adodb-php/xmlschema03.dtd b/vendor/adodb/adodb-php/xmlschema03.dtd
index 97850bc7f6..351ea44b16 100644
--- a/vendor/adodb/adodb-php/xmlschema03.dtd
+++ b/vendor/adodb/adodb-php/xmlschema03.dtd
@@ -1,17 +1,22 @@
-
-
 
 
-
+
 
-
+
 
 
 
-
+
 
-
+
 
 
 
@@ -24,20 +29,25 @@
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
 
 
 
-
-
+
+
 
-]>
\ No newline at end of file
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index dc02dfb114..0cd6055d1b 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -37,57 +37,130 @@
  *
  * @author Fabien Potencier 
  * @author Jordi Boggiano 
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+    /** @var ?string */
+    private $vendorDir;
+
     // PSR-4
+    /**
+     * @var array[]
+     * @psalm-var array>
+     */
     private $prefixLengthsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array>
+     */
     private $prefixDirsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array
+     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
+    /**
+     * @var array[]
+     * @psalm-var array>
+     */
     private $prefixesPsr0 = array();
+    /**
+     * @var array[]
+     * @psalm-var array
+     */
     private $fallbackDirsPsr0 = array();
 
+    /** @var bool */
     private $useIncludePath = false;
+
+    /**
+     * @var string[]
+     * @psalm-var array
+     */
     private $classMap = array();
+
+    /** @var bool */
     private $classMapAuthoritative = false;
+
+    /**
+     * @var bool[]
+     * @psalm-var array
+     */
     private $missingClasses = array();
+
+    /** @var ?string */
     private $apcuPrefix;
 
+    /**
+     * @var self[]
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param ?string $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
+    /**
+     * @return string[]
+     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array>
+     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array
+     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array
+     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
+    /**
+     * @return string[] Array of classname => path
+     * @psalm-var array
+     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array $classMap Class to filename map
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array $classMap
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -102,9 +175,11 @@ public function addClassMap(array $classMap)
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix
+     * @param string[]|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
+     *
+     * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
@@ -147,11 +222,13 @@ public function add($prefix, $paths, $prepend = false)
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
@@ -195,8 +272,10 @@ public function addPsr4($prefix, $paths, $prepend = false)
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -211,10 +290,12 @@ public function set($prefix, $paths)
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -234,6 +315,8 @@ public function setPsr4($prefix, $paths)
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -256,6 +339,8 @@ public function getUseIncludePath()
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -276,10 +361,12 @@ public function isClassMapAuthoritative()
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
+     *
+     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
     }
 
     /**
@@ -296,25 +383,44 @@ public function getApcuPrefix()
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
      */
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
      * Unregisters this instance as an autoloader.
+     *
+     * @return void
      */
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
@@ -323,6 +429,8 @@ public function loadClass($class)
 
             return true;
         }
+
+        return null;
     }
 
     /**
@@ -367,6 +475,21 @@ public function findFile($class)
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self[]
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -377,7 +500,7 @@ private function findFileWithExtension($class, $ext)
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath.'\\';
+                $search = $subPath . '\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
                     $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
@@ -438,6 +561,10 @@ private function findFileWithExtension($class, $ext)
  * Scope isolated include.
  *
  * Prevents access to $this/self from included files.
+ *
+ * @param  string $file
+ * @return void
+ * @private
  */
 function includeFile($file)
 {
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
new file mode 100644
index 0000000000..d50e0c9fcc
--- /dev/null
+++ b/vendor/composer/InstalledVersions.php
@@ -0,0 +1,350 @@
+
+ *     Jordi Boggiano 
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer;
+
+use Composer\Autoload\ClassLoader;
+use Composer\Semver\VersionParser;
+
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ */
+class InstalledVersions
+{
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array}>
+     */
+    private static $installedByVendor = array();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string[]
+     * @psalm-return list
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages[] = array_keys($installed['versions']);
+        }
+
+        if (1 === \count($packages)) {
+            return $packages[0];
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param  string        $packageName
+     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints($constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed['versions'][$packageName]['pretty_version'])) {
+                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            }
+            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            }
+            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            }
+            if (array_key_exists('provided', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['pretty_version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['reference'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['reference'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array[]
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array[]
+     * @psalm-return list}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array[] $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return list}>
+     */
+    private static function getInstalled()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor[$vendorDir])) {
+                    $installed[] = self::$installedByVendor[$vendorDir];
+                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = require __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+        $installed[] = self::$installed;
+
+        return $installed;
+    }
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index df1b4ab9f4..24001e88de 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,6 +6,7 @@
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'Smarty' => $vendorDir . '/smarty/smarty/libs/Smarty.class.php',
     'SmartyBC' => $vendorDir . '/smarty/smarty/libs/SmartyBC.class.php',
     'SmartyCompilerException' => $vendorDir . '/smarty/smarty/libs/sysplugins/smartycompilerexception.php',
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index e7378af1bc..094d3a1107 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -13,19 +13,24 @@ public static function loadClassLoader($class)
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
             return self::$loader;
         }
 
+        require __DIR__ . '/platform_check.php';
+
         spl_autoload_register(array('ComposerAutoloaderInit056ad17c9fe5d65b7d3c5047fc89f77e', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
         spl_autoload_unregister(array('ComposerAutoloaderInit056ad17c9fe5d65b7d3c5047fc89f77e', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInit056ad17c9fe5d65b7d3c5047fc89f77e::getInitializer($loader));
         } else {
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 5daff09076..4bec168863 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -200,6 +200,7 @@ class ComposerStaticInit056ad17c9fe5d65b7d3c5047fc89f77e
     );
 
     public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'Smarty' => __DIR__ . '/..' . '/smarty/smarty/libs/Smarty.class.php',
         'SmartyBC' => __DIR__ . '/..' . '/smarty/smarty/libs/SmartyBC.class.php',
         'SmartyCompilerException' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smartycompilerexception.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 09fa567cd9..46cf732a70 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,2014 +1,2059 @@
-[
-    {
-        "name": "adodb/adodb-php",
-        "version": "v5.20.17",
-        "version_normalized": "5.20.17.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/ADOdb/ADOdb.git",
-            "reference": "c47e5c272e98a06e1c92248b5d9d1ae0afe71c97"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/c47e5c272e98a06e1c92248b5d9d1ae0afe71c97",
-            "reference": "c47e5c272e98a06e1c92248b5d9d1ae0afe71c97",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "time": "2020-03-31T17:32:58+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "adodb.inc.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause",
-            "LGPL-2.1-or-later"
-        ],
-        "authors": [
-            {
-                "name": "John Lim",
-                "email": "jlim@natsoft.com",
-                "role": "Author"
-            },
-            {
-                "name": "Damien Regad",
-                "role": "Current maintainer"
-            },
-            {
-                "name": "Mark Newnham",
-                "role": "Developer"
-            }
-        ],
-        "description": "ADOdb is a PHP database abstraction layer library",
-        "homepage": "http://adodb.org/",
-        "keywords": [
-            "abstraction",
-            "database",
-            "layer",
-            "library",
-            "php"
-        ]
-    },
-    {
-        "name": "fig/http-message-util",
-        "version": "1.1.4",
-        "version_normalized": "1.1.4.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-message-util.git",
-            "reference": "3242caa9da7221a304b8f84eb9eaddae0a7cf422"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message-util/zipball/3242caa9da7221a304b8f84eb9eaddae0a7cf422",
-            "reference": "3242caa9da7221a304b8f84eb9eaddae0a7cf422",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^5.3 || ^7.0"
-        },
-        "suggest": {
-            "psr/http-message": "The package containing the PSR-7 interfaces"
-        },
-        "time": "2020-02-05T20:36:27+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Fig\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Utility classes and constants for use with PSR-7 (psr/http-message)",
-        "keywords": [
-            "http",
-            "http-message",
-            "psr",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "guzzlehttp/guzzle",
-        "version": "6.5.3",
-        "version_normalized": "6.5.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/guzzle.git",
-            "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
-            "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
-            "shasum": ""
-        },
-        "require": {
-            "ext-json": "*",
-            "guzzlehttp/promises": "^1.0",
-            "guzzlehttp/psr7": "^1.6.1",
-            "php": ">=5.5",
-            "symfony/polyfill-intl-idn": "^1.11"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-            "psr/log": "^1.1"
-        },
-        "suggest": {
-            "psr/log": "Required for using the Log middleware"
-        },
-        "time": "2020-04-18T10:38:46+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "6.5-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle is a PHP HTTP client library",
-        "homepage": "http://guzzlephp.org/",
-        "keywords": [
-            "client",
-            "curl",
-            "framework",
-            "http",
-            "http client",
-            "rest",
-            "web service"
-        ]
-    },
-    {
-        "name": "guzzlehttp/promises",
-        "version": "v1.3.1",
-        "version_normalized": "1.3.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/promises.git",
-            "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-            "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^4.0"
-        },
-        "time": "2016-12-20T10:07:11+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.4-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Promise\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle promises library",
-        "keywords": [
-            "promise"
-        ]
-    },
-    {
-        "name": "guzzlehttp/psr7",
-        "version": "1.6.1",
-        "version_normalized": "1.6.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/psr7.git",
-            "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
-            "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0",
-            "psr/http-message": "~1.0",
-            "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
-        },
-        "provide": {
-            "psr/http-message-implementation": "1.0"
-        },
-        "require-dev": {
-            "ext-zlib": "*",
-            "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
-        },
-        "suggest": {
-            "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
-        },
-        "time": "2019-07-01T23:21:34+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.6-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Psr7\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            },
-            {
-                "name": "Tobias Schultze",
-                "homepage": "https://github.com/Tobion"
-            }
-        ],
-        "description": "PSR-7 message implementation that also provides common utility methods",
-        "keywords": [
-            "http",
-            "message",
-            "psr-7",
-            "request",
-            "response",
-            "stream",
-            "uri",
-            "url"
-        ]
-    },
-    {
-        "name": "http-interop/http-factory-guzzle",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/http-interop/http-factory-guzzle.git",
-            "reference": "34861658efb9899a6618cef03de46e2a52c80fc0"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/http-interop/http-factory-guzzle/zipball/34861658efb9899a6618cef03de46e2a52c80fc0",
-            "reference": "34861658efb9899a6618cef03de46e2a52c80fc0",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/psr7": "^1.4.2",
-            "psr/http-factory": "^1.0"
-        },
-        "provide": {
-            "psr/http-factory-implementation": "^1.0"
-        },
-        "require-dev": {
-            "http-interop/http-factory-tests": "^0.5",
-            "phpunit/phpunit": "^6.5"
-        },
-        "time": "2018-07-31T19:32:56+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Http\\Factory\\Guzzle\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "An HTTP Factory using Guzzle PSR7",
-        "keywords": [
-            "factory",
-            "http",
-            "psr-17",
-            "psr-7"
-        ]
-    },
-    {
-        "name": "laminas/laminas-diactoros",
-        "version": "2.2.3",
-        "version_normalized": "2.2.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/laminas/laminas-diactoros.git",
-            "reference": "b596c7141f5093aefec94cb5e8745212299e290f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/b596c7141f5093aefec94cb5e8745212299e290f",
-            "reference": "b596c7141f5093aefec94cb5e8745212299e290f",
-            "shasum": ""
-        },
-        "require": {
-            "laminas/laminas-zendframework-bridge": "^1.0",
-            "php": "^7.1",
-            "psr/http-factory": "^1.0",
-            "psr/http-message": "^1.0"
-        },
-        "conflict": {
-            "phpspec/prophecy": "<1.9.0"
-        },
-        "provide": {
-            "psr/http-factory-implementation": "1.0",
-            "psr/http-message-implementation": "1.0"
-        },
-        "replace": {
-            "zendframework/zend-diactoros": "^2.2.1"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "ext-dom": "*",
-            "ext-libxml": "*",
-            "http-interop/http-factory-tests": "^0.5.0",
-            "laminas/laminas-coding-standard": "~1.0.0",
-            "php-http/psr7-integration-tests": "^1.0",
-            "phpunit/phpunit": "^7.5.18"
-        },
-        "time": "2020-03-29T12:30:54+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.1.x-dev",
-                "dev-develop": "2.2.x-dev",
-                "dev-release-1.8": "1.8.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "src/functions/create_uploaded_file.php",
-                "src/functions/marshal_headers_from_sapi.php",
-                "src/functions/marshal_method_from_sapi.php",
-                "src/functions/marshal_protocol_version_from_sapi.php",
-                "src/functions/marshal_uri_from_sapi.php",
-                "src/functions/normalize_server.php",
-                "src/functions/normalize_uploaded_files.php",
-                "src/functions/parse_cookie_header.php",
-                "src/functions/create_uploaded_file.legacy.php",
-                "src/functions/marshal_headers_from_sapi.legacy.php",
-                "src/functions/marshal_method_from_sapi.legacy.php",
-                "src/functions/marshal_protocol_version_from_sapi.legacy.php",
-                "src/functions/marshal_uri_from_sapi.legacy.php",
-                "src/functions/normalize_server.legacy.php",
-                "src/functions/normalize_uploaded_files.legacy.php",
-                "src/functions/parse_cookie_header.legacy.php"
-            ],
-            "psr-4": {
-                "Laminas\\Diactoros\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "description": "PSR HTTP Message implementations",
-        "homepage": "https://laminas.dev",
-        "keywords": [
-            "http",
-            "laminas",
-            "psr",
-            "psr-7"
-        ]
-    },
-    {
-        "name": "laminas/laminas-zendframework-bridge",
-        "version": "1.0.3",
-        "version_normalized": "1.0.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-            "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
-            "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^5.6 || ^7.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
-            "squizlabs/php_codesniffer": "^3.5"
-        },
-        "time": "2020-04-03T16:01:00+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev",
-                "dev-develop": "1.1.x-dev"
-            },
-            "laminas": {
-                "module": "Laminas\\ZendFrameworkBridge"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "src/autoload.php"
-            ],
-            "psr-4": {
-                "Laminas\\ZendFrameworkBridge\\": "src//"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "description": "Alias legacy ZF class names to Laminas Project equivalents.",
-        "keywords": [
-            "ZendFramework",
-            "autoloading",
-            "laminas",
-            "zf"
-        ]
-    },
-    {
-        "name": "league/oauth2-client",
-        "version": "2.4.1",
-        "version_normalized": "2.4.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/thephpleague/oauth2-client.git",
-            "reference": "cc114abc622a53af969e8664722e84ca36257530"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/cc114abc622a53af969e8664722e84ca36257530",
-            "reference": "cc114abc622a53af969e8664722e84ca36257530",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/guzzle": "^6.0",
-            "paragonie/random_compat": "^1|^2|^9.99",
-            "php": "^5.6|^7.0"
-        },
-        "require-dev": {
-            "eloquent/liberator": "^2.0",
-            "eloquent/phony-phpunit": "^1.0|^3.0",
-            "jakub-onderka/php-parallel-lint": "^0.9.2",
-            "phpunit/phpunit": "^5.7|^6.0",
-            "squizlabs/php_codesniffer": "^2.3|^3.0"
-        },
-        "time": "2018-11-22T18:33:57+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-2.x": "2.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "League\\OAuth2\\Client\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Alex Bilbie",
-                "email": "hello@alexbilbie.com",
-                "homepage": "http://www.alexbilbie.com",
-                "role": "Developer"
-            },
-            {
-                "name": "Woody Gilk",
-                "homepage": "https://github.com/shadowhand",
-                "role": "Contributor"
-            }
-        ],
-        "description": "OAuth 2.0 Client Library",
-        "keywords": [
-            "Authentication",
-            "SSO",
-            "authorization",
-            "identity",
-            "idp",
-            "oauth",
-            "oauth2",
-            "single sign on"
-        ]
-    },
-    {
-        "name": "league/oauth2-github",
-        "version": "2.0.0",
-        "version_normalized": "2.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/thephpleague/oauth2-github.git",
-            "reference": "e63d64f3ec167c09232d189c6b0c397458a99357"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/thephpleague/oauth2-github/zipball/e63d64f3ec167c09232d189c6b0c397458a99357",
-            "reference": "e63d64f3ec167c09232d189c6b0c397458a99357",
-            "shasum": ""
-        },
-        "require": {
-            "league/oauth2-client": "^2.0"
-        },
-        "require-dev": {
-            "mockery/mockery": "~0.9",
-            "phpunit/phpunit": "~4.0",
-            "squizlabs/php_codesniffer": "~2.0"
-        },
-        "time": "2017-01-26T01:14:51+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "League\\OAuth2\\Client\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Steven Maguire",
-                "email": "stevenmaguire@gmail.com",
-                "homepage": "https://github.com/stevenmaguire"
-            }
-        ],
-        "description": "Github OAuth 2.0 Client Provider for The PHP League OAuth2-Client",
-        "keywords": [
-            "authorisation",
-            "authorization",
-            "client",
-            "github",
-            "oauth",
-            "oauth2"
-        ]
-    },
-    {
-        "name": "league/oauth2-google",
-        "version": "3.0.2",
-        "version_normalized": "3.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/thephpleague/oauth2-google.git",
-            "reference": "cfe9b0ae69eb5dbac64a282f04410b731f6b9c04"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/thephpleague/oauth2-google/zipball/cfe9b0ae69eb5dbac64a282f04410b731f6b9c04",
-            "reference": "cfe9b0ae69eb5dbac64a282f04410b731f6b9c04",
-            "shasum": ""
-        },
-        "require": {
-            "league/oauth2-client": "^2.0"
-        },
-        "require-dev": {
-            "eloquent/phony-phpunit": "^2.0",
-            "php-coveralls/php-coveralls": "^2.1",
-            "phpunit/phpunit": "^6.0",
-            "squizlabs/php_codesniffer": "^2.0"
-        },
-        "time": "2019-11-16T14:11:06+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "League\\OAuth2\\Client\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Woody Gilk",
-                "email": "woody.gilk@gmail.com",
-                "homepage": "http://shadowhand.me"
-            }
-        ],
-        "description": "Google OAuth 2.0 Client Provider for The PHP League OAuth2-Client",
-        "keywords": [
-            "Authentication",
-            "authorization",
-            "client",
-            "google",
-            "oauth",
-            "oauth2"
-        ]
-    },
-    {
-        "name": "nikic/fast-route",
-        "version": "v1.3.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/nikic/FastRoute.git",
-            "reference": "181d480e08d9476e61381e04a71b34dc0432e812"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812",
-            "reference": "181d480e08d9476e61381e04a71b34dc0432e812",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^4.8.35|~5.7"
-        },
-        "time": "2018-02-13T20:26:39+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "FastRoute\\": "src/"
-            },
-            "files": [
-                "src/functions.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Nikita Popov",
-                "email": "nikic@php.net"
-            }
-        ],
-        "description": "Fast request router for PHP",
-        "keywords": [
-            "router",
-            "routing"
-        ]
-    },
-    {
-        "name": "nyholm/psr7",
-        "version": "1.2.1",
-        "version_normalized": "1.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/Nyholm/psr7.git",
-            "reference": "55ff6b76573f5b242554c9775792bd59fb52e11c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/Nyholm/psr7/zipball/55ff6b76573f5b242554c9775792bd59fb52e11c",
-            "reference": "55ff6b76573f5b242554c9775792bd59fb52e11c",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^7.1",
-            "php-http/message-factory": "^1.0",
-            "psr/http-factory": "^1.0",
-            "psr/http-message": "^1.0"
-        },
-        "provide": {
-            "psr/http-factory-implementation": "1.0",
-            "psr/http-message-implementation": "1.0"
-        },
-        "require-dev": {
-            "http-interop/http-factory-tests": "dev-master",
-            "php-http/psr7-integration-tests": "dev-master",
-            "phpunit/phpunit": "^7.5"
-        },
-        "time": "2019-09-05T13:24:16+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Nyholm\\Psr7\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Tobias Nyholm",
-                "email": "tobias.nyholm@gmail.com"
-            },
-            {
-                "name": "Martijn van der Ven",
-                "email": "martijn@vanderven.se"
-            }
-        ],
-        "description": "A fast PHP7 implementation of PSR-7",
-        "homepage": "http://tnyholm.se",
-        "keywords": [
-            "psr-17",
-            "psr-7"
-        ]
-    },
-    {
-        "name": "nyholm/psr7-server",
-        "version": "0.4.1",
-        "version_normalized": "0.4.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/Nyholm/psr7-server.git",
-            "reference": "e6a526e9170e6e33a13efc2b61703ca476b7ea68"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/Nyholm/psr7-server/zipball/e6a526e9170e6e33a13efc2b61703ca476b7ea68",
-            "reference": "e6a526e9170e6e33a13efc2b61703ca476b7ea68",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^7.1",
-            "psr/http-factory": "^1.0",
-            "psr/http-message": "^1.0"
-        },
-        "require-dev": {
-            "nyholm/nsa": "^1.1",
-            "nyholm/psr7": "^1.0",
-            "phpunit/phpunit": "^7.0"
-        },
-        "time": "2019-11-05T20:36:33+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Nyholm\\Psr7Server\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Tobias Nyholm",
-                "email": "tobias.nyholm@gmail.com"
-            },
-            {
-                "name": "Martijn van der Ven",
-                "email": "martijn@vanderven.se"
-            }
-        ],
-        "description": "Helper classes to handle PSR-7 server requests",
-        "homepage": "http://tnyholm.se",
-        "keywords": [
-            "psr-17",
-            "psr-7"
-        ]
-    },
-    {
-        "name": "omines/oauth2-gitlab",
-        "version": "3.2.0",
-        "version_normalized": "3.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/omines/oauth2-gitlab.git",
-            "reference": "2d2d0d055735b5cda3af2ba2eba9ecaa6c0e8a2a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/omines/oauth2-gitlab/zipball/2d2d0d055735b5cda3af2ba2eba9ecaa6c0e8a2a",
-            "reference": "2d2d0d055735b5cda3af2ba2eba9ecaa6c0e8a2a",
-            "shasum": ""
-        },
-        "require": {
-            "league/oauth2-client": "^2.2",
-            "php": ">=7.2"
-        },
-        "conflict": {
-            "league/oauth2-client": "2.4.0"
-        },
-        "require-dev": {
-            "friendsofphp/php-cs-fixer": "^2.0",
-            "m4tthumphrey/php-gitlab-api": "^9.0.0",
-            "mockery/mockery": "^1.0",
-            "php-http/guzzle6-adapter": "^2.0.1",
-            "phpunit/phpunit": "^8.0|^9.0"
-        },
-        "suggest": {
-            "m4tthumphrey/php-gitlab-api": "For further API usage using the acquired OAuth2 token"
-        },
-        "time": "2020-02-10T10:37:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Omines\\OAuth2\\Client\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Niels Keurentjes",
-                "email": "niels.keurentjes@omines.com",
-                "homepage": "https://www.omines.nl/"
-            }
-        ],
-        "description": "GitLab OAuth 2.0 Client Provider for The PHP League OAuth2-Client",
-        "keywords": [
-            "authorisation",
-            "authorization",
-            "client",
-            "gitlab",
-            "oauth",
-            "oauth2"
-        ]
-    },
-    {
-        "name": "paragonie/random_compat",
-        "version": "v9.99.99",
-        "version_normalized": "9.99.99.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/paragonie/random_compat.git",
-            "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-            "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^7"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.*|5.*",
-            "vimeo/psalm": "^1"
-        },
-        "suggest": {
-            "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-        },
-        "time": "2018-07-02T15:55:56+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Paragon Initiative Enterprises",
-                "email": "security@paragonie.com",
-                "homepage": "https://paragonie.com"
-            }
-        ],
-        "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-        "keywords": [
-            "csprng",
-            "polyfill",
-            "pseudorandom",
-            "random"
-        ]
-    },
-    {
-        "name": "php-http/guzzle6-adapter",
-        "version": "v1.1.1",
-        "version_normalized": "1.1.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-http/guzzle6-adapter.git",
-            "reference": "a56941f9dc6110409cfcddc91546ee97039277ab"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/a56941f9dc6110409cfcddc91546ee97039277ab",
-            "reference": "a56941f9dc6110409cfcddc91546ee97039277ab",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/guzzle": "^6.0",
-            "php": ">=5.5.0",
-            "php-http/httplug": "^1.0"
-        },
-        "provide": {
-            "php-http/async-client-implementation": "1.0",
-            "php-http/client-implementation": "1.0"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "php-http/adapter-integration-tests": "^0.4"
-        },
-        "time": "2016-05-10T06:13:32+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.2-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Http\\Adapter\\Guzzle6\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Márk Sági-Kazár",
-                "email": "mark.sagikazar@gmail.com"
-            },
-            {
-                "name": "David de Boer",
-                "email": "david@ddeboer.nl"
-            }
-        ],
-        "description": "Guzzle 6 HTTP Adapter",
-        "homepage": "http://httplug.io",
-        "keywords": [
-            "Guzzle",
-            "http"
-        ]
-    },
-    {
-        "name": "php-http/httplug",
-        "version": "v1.1.0",
-        "version_normalized": "1.1.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-http/httplug.git",
-            "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-http/httplug/zipball/1c6381726c18579c4ca2ef1ec1498fdae8bdf018",
-            "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4",
-            "php-http/promise": "^1.0",
-            "psr/http-message": "^1.0"
-        },
-        "require-dev": {
-            "henrikbjorn/phpspec-code-coverage": "^1.0",
-            "phpspec/phpspec": "^2.4"
-        },
-        "time": "2016-08-31T08:30:17+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Http\\Client\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Eric GELOEN",
-                "email": "geloen.eric@gmail.com"
-            },
-            {
-                "name": "Márk Sági-Kazár",
-                "email": "mark.sagikazar@gmail.com"
-            }
-        ],
-        "description": "HTTPlug, the HTTP client abstraction for PHP",
-        "homepage": "http://httplug.io",
-        "keywords": [
-            "client",
-            "http"
-        ]
-    },
-    {
-        "name": "php-http/message-factory",
-        "version": "v1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-http/message-factory.git",
-            "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1",
-            "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4",
-            "psr/http-message": "^1.0"
-        },
-        "time": "2015-12-19T14:08:53+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Márk Sági-Kazár",
-                "email": "mark.sagikazar@gmail.com"
-            }
-        ],
-        "description": "Factory interfaces for PSR-7 HTTP Message",
-        "homepage": "http://php-http.org",
-        "keywords": [
-            "factory",
-            "http",
-            "message",
-            "stream",
-            "uri"
-        ]
-    },
-    {
-        "name": "php-http/promise",
-        "version": "v1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-http/promise.git",
-            "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980",
-            "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980",
-            "shasum": ""
-        },
-        "require-dev": {
-            "henrikbjorn/phpspec-code-coverage": "^1.0",
-            "phpspec/phpspec": "^2.4"
-        },
-        "time": "2016-01-26T13:27:02+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Http\\Promise\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Márk Sági-Kazár",
-                "email": "mark.sagikazar@gmail.com"
-            },
-            {
-                "name": "Joel Wurtz",
-                "email": "joel.wurtz@gmail.com"
-            }
-        ],
-        "description": "Promise used for asynchronous HTTP requests",
-        "homepage": "http://httplug.io",
-        "keywords": [
-            "promise"
-        ]
-    },
-    {
-        "name": "phpmailer/phpmailer",
-        "version": "v6.1.5",
-        "version_normalized": "6.1.5.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/PHPMailer/PHPMailer.git",
-            "reference": "a8bf068f64a580302026e484ee29511f661b2ad3"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a8bf068f64a580302026e484ee29511f661b2ad3",
-            "reference": "a8bf068f64a580302026e484ee29511f661b2ad3",
-            "shasum": ""
-        },
-        "require": {
-            "ext-ctype": "*",
-            "ext-filter": "*",
-            "php": ">=5.5.0"
-        },
-        "require-dev": {
-            "doctrine/annotations": "^1.2",
-            "friendsofphp/php-cs-fixer": "^2.2",
-            "phpunit/phpunit": "^4.8 || ^5.7"
-        },
-        "suggest": {
-            "ext-mbstring": "Needed to send email in multibyte encoding charset",
-            "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-            "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-            "psr/log": "For optional PSR-3 debug logging",
-            "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
-            "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
-        },
-        "time": "2020-03-14T14:23:48+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "PHPMailer\\PHPMailer\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "LGPL-2.1-only"
-        ],
-        "authors": [
-            {
-                "name": "Marcus Bointon",
-                "email": "phpmailer@synchromedia.co.uk"
-            },
-            {
-                "name": "Jim Jagielski",
-                "email": "jimjag@gmail.com"
-            },
-            {
-                "name": "Andy Prevost",
-                "email": "codeworxtech@users.sourceforge.net"
-            },
-            {
-                "name": "Brent R. Matzelle"
-            }
-        ],
-        "description": "PHPMailer is a full-featured email creation and transfer class for PHP"
-    },
-    {
-        "name": "psr/container",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/container.git",
-            "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-            "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2017-02-14T16:28:37+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Container\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common Container Interface (PHP FIG PSR-11)",
-        "homepage": "https://github.com/php-fig/container",
-        "keywords": [
-            "PSR-11",
-            "container",
-            "container-interface",
-            "container-interop",
-            "psr"
-        ]
-    },
-    {
-        "name": "psr/http-factory",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-factory.git",
-            "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-            "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.0.0",
-            "psr/http-message": "^1.0"
-        },
-        "time": "2019-04-30T12:38:16+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interfaces for PSR-7 HTTP message factories",
-        "keywords": [
-            "factory",
-            "http",
-            "message",
-            "psr",
-            "psr-17",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "psr/http-message",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-message.git",
-            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2016-08-06T14:39:51+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP messages",
-        "homepage": "https://github.com/php-fig/http-message",
-        "keywords": [
-            "http",
-            "http-message",
-            "psr",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "psr/http-server-handler",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-server-handler.git",
-            "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7",
-            "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.0",
-            "psr/http-message": "^1.0"
-        },
-        "time": "2018-10-30T16:46:14+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Server\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP server-side request handler",
-        "keywords": [
-            "handler",
-            "http",
-            "http-interop",
-            "psr",
-            "psr-15",
-            "psr-7",
-            "request",
-            "response",
-            "server"
-        ]
-    },
-    {
-        "name": "psr/http-server-middleware",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-server-middleware.git",
-            "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5",
-            "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.0",
-            "psr/http-message": "^1.0",
-            "psr/http-server-handler": "^1.0"
-        },
-        "time": "2018-10-30T17:12:04+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Server\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP server-side middleware",
-        "keywords": [
-            "http",
-            "http-interop",
-            "middleware",
-            "psr",
-            "psr-15",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "psr/log",
-        "version": "1.1.3",
-        "version_normalized": "1.1.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-            "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2020-03-23T09:12:05+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Log\\": "Psr/Log/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for logging libraries",
-        "homepage": "https://github.com/php-fig/log",
-        "keywords": [
-            "log",
-            "psr",
-            "psr-3"
-        ]
-    },
-    {
-        "name": "ralouphie/getallheaders",
-        "version": "3.0.3",
-        "version_normalized": "3.0.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/ralouphie/getallheaders.git",
-            "reference": "120b605dfeb996808c31b6477290a714d356e822"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
-            "reference": "120b605dfeb996808c31b6477290a714d356e822",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.6"
-        },
-        "require-dev": {
-            "php-coveralls/php-coveralls": "^2.1",
-            "phpunit/phpunit": "^5 || ^6.5"
-        },
-        "time": "2019-03-08T08:55:37+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "src/getallheaders.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Ralph Khattar",
-                "email": "ralph.khattar@gmail.com"
-            }
-        ],
-        "description": "A polyfill for getallheaders."
-    },
-    {
-        "name": "slim/psr7",
-        "version": "0.6",
-        "version_normalized": "0.6.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/slimphp/Slim-Psr7.git",
-            "reference": "23015a8814382c244315602d44cb02d412b6b059"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/23015a8814382c244315602d44cb02d412b6b059",
-            "reference": "23015a8814382c244315602d44cb02d412b6b059",
-            "shasum": ""
-        },
-        "require": {
-            "fig/http-message-util": "^1.1.2",
-            "php": "^7.1",
-            "psr/http-factory": "^1.0",
-            "psr/http-message": "^1.0",
-            "ralouphie/getallheaders": "^3"
-        },
-        "provide": {
-            "psr/http-message-implementation": "1.0"
-        },
-        "require-dev": {
-            "ext-json": "*",
-            "http-interop/http-factory-tests": "^0.6.0",
-            "php-http/psr7-integration-tests": "dev-master",
-            "phpstan/phpstan": "^0.10",
-            "phpunit/phpunit": "^6.0|^7.0",
-            "squizlabs/php_codesniffer": "^3.3"
-        },
-        "time": "2019-10-05T20:27:07+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Slim\\Psr7\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Josh Lockhart",
-                "email": "hello@joshlockhart.com",
-                "homepage": "http://joshlockhart.com"
-            },
-            {
-                "name": "Andrew Smith",
-                "email": "a.smith@silentworks.co.uk",
-                "homepage": "http://silentworks.co.uk"
-            },
-            {
-                "name": "Rob Allen",
-                "email": "rob@akrabat.com",
-                "homepage": "http://akrabat.com"
-            },
-            {
-                "name": "Pierre Berube",
-                "email": "pierre@lgse.com",
-                "homepage": "http://www.lgse.com"
-            }
-        ],
-        "description": "Strict PSR-7 implementation",
-        "homepage": "https://www.slimframework.com",
-        "keywords": [
-            "http",
-            "psr-7",
-            "psr7"
-        ]
-    },
-    {
-        "name": "slim/slim",
-        "version": "4.5.0",
-        "version_normalized": "4.5.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/slimphp/Slim.git",
-            "reference": "5613cbb521081ed676d5d7eb3e44f2b80a818c24"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/slimphp/Slim/zipball/5613cbb521081ed676d5d7eb3e44f2b80a818c24",
-            "reference": "5613cbb521081ed676d5d7eb3e44f2b80a818c24",
-            "shasum": ""
-        },
-        "require": {
-            "ext-json": "*",
-            "nikic/fast-route": "^1.3",
-            "php": "^7.2",
-            "psr/container": "^1.0",
-            "psr/http-factory": "^1.0",
-            "psr/http-message": "^1.0",
-            "psr/http-server-handler": "^1.0",
-            "psr/http-server-middleware": "^1.0",
-            "psr/log": "^1.1"
-        },
-        "require-dev": {
-            "adriansuter/php-autoload-override": "^1.0",
-            "ext-simplexml": "*",
-            "guzzlehttp/psr7": "^1.5",
-            "http-interop/http-factory-guzzle": "^1.0",
-            "laminas/laminas-diactoros": "^2.1",
-            "nyholm/psr7": "^1.1",
-            "nyholm/psr7-server": "^0.3.0",
-            "phpspec/prophecy": "^1.10",
-            "phpstan/phpstan": "^0.11.5",
-            "phpunit/phpunit": "^8.5",
-            "slim/http": "^1.0",
-            "slim/psr7": "^1.0",
-            "squizlabs/php_codesniffer": "^3.5"
-        },
-        "suggest": {
-            "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
-            "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
-            "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
-            "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
-        },
-        "time": "2020-04-14T20:49:48+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Slim\\": "Slim"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Josh Lockhart",
-                "email": "hello@joshlockhart.com",
-                "homepage": "https://joshlockhart.com"
-            },
-            {
-                "name": "Andrew Smith",
-                "email": "a.smith@silentworks.co.uk",
-                "homepage": "http://silentworks.co.uk"
-            },
-            {
-                "name": "Rob Allen",
-                "email": "rob@akrabat.com",
-                "homepage": "http://akrabat.com"
-            },
-            {
-                "name": "Pierre Berube",
-                "email": "pierre@lgse.com",
-                "homepage": "http://www.lgse.com"
-            },
-            {
-                "name": "Gabriel Manricks",
-                "email": "gmanricks@me.com",
-                "homepage": "http://gabrielmanricks.com"
-            }
-        ],
-        "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
-        "homepage": "https://www.slimframework.com",
-        "keywords": [
-            "api",
-            "framework",
-            "micro",
-            "router"
-        ]
-    },
-    {
-        "name": "smarty/smarty",
-        "version": "v3.1.36",
-        "version_normalized": "3.1.36.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/smarty-php/smarty.git",
-            "reference": "fd148f7ade295014fff77f89ee3d5b20d9d55451"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/smarty-php/smarty/zipball/fd148f7ade295014fff77f89ee3d5b20d9d55451",
-            "reference": "fd148f7ade295014fff77f89ee3d5b20d9d55451",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "6.4.1",
-            "smarty/smarty-lexer": "^3.1"
-        },
-        "time": "2020-04-14T14:44:26+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.1.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "libs/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "LGPL-3.0"
-        ],
-        "authors": [
-            {
-                "name": "Monte Ohrt",
-                "email": "monte@ohrt.com"
-            },
-            {
-                "name": "Uwe Tews",
-                "email": "uwe.tews@googlemail.com"
-            },
-            {
-                "name": "Rodney Rehm",
-                "email": "rodney.rehm@medialize.de"
-            }
-        ],
-        "description": "Smarty - the compiling PHP template engine",
-        "homepage": "http://www.smarty.net",
-        "keywords": [
-            "templating"
-        ]
-    },
-    {
-        "name": "symfony/polyfill-intl-idn",
-        "version": "v1.15.0",
-        "version_normalized": "1.15.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-intl-idn.git",
-            "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
-            "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "symfony/polyfill-mbstring": "^1.3",
-            "symfony/polyfill-php72": "^1.10"
-        },
-        "suggest": {
-            "ext-intl": "For best performance"
-        },
-        "time": "2020-03-09T19:04:49+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.15-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Polyfill\\Intl\\Idn\\": ""
-            },
-            "files": [
-                "bootstrap.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Laurent Bassin",
-                "email": "laurent@bassin.info"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "idn",
-            "intl",
-            "polyfill",
-            "portable",
-            "shim"
-        ]
-    },
-    {
-        "name": "symfony/polyfill-mbstring",
-        "version": "v1.15.0",
-        "version_normalized": "1.15.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-mbstring.git",
-            "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
-            "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "suggest": {
-            "ext-mbstring": "For best performance"
-        },
-        "time": "2020-03-09T19:04:49+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.15-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Polyfill\\Mbstring\\": ""
-            },
-            "files": [
-                "bootstrap.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill for the Mbstring extension",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "mbstring",
-            "polyfill",
-            "portable",
-            "shim"
-        ]
-    },
-    {
-        "name": "symfony/polyfill-php72",
-        "version": "v1.15.0",
-        "version_normalized": "1.15.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-php72.git",
-            "reference": "37b0976c78b94856543260ce09b460a7bc852747"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
-            "reference": "37b0976c78b94856543260ce09b460a7bc852747",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "time": "2020-02-27T09:26:54+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.15-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Polyfill\\Php72\\": ""
-            },
-            "files": [
-                "bootstrap.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "polyfill",
-            "portable",
-            "shim"
-        ]
-    }
-]
+{
+    "packages": [
+        {
+            "name": "adodb/adodb-php",
+            "version": "v5.21.3",
+            "version_normalized": "5.21.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ADOdb/ADOdb.git",
+                "reference": "c5415722049f36c446a4034d15f1d17943f11458"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/c5415722049f36c446a4034d15f1d17943f11458",
+                "reference": "c5415722049f36c446a4034d15f1d17943f11458",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5"
+            },
+            "time": "2021-10-31T14:56:48+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "adodb.inc.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "LGPL-2.1-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "John Lim",
+                    "email": "jlim@natsoft.com",
+                    "role": "Author"
+                },
+                {
+                    "name": "Damien Regad",
+                    "role": "Current maintainer"
+                },
+                {
+                    "name": "Mark Newnham",
+                    "role": "Developer"
+                }
+            ],
+            "description": "ADOdb is a PHP database abstraction layer library",
+            "homepage": "https://adodb.org/",
+            "keywords": [
+                "abstraction",
+                "database",
+                "layer",
+                "library",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/ADOdb/ADOdb/issues",
+                "source": "https://github.com/ADOdb/ADOdb"
+            },
+            "install-path": "../adodb/adodb-php"
+        },
+        {
+            "name": "fig/http-message-util",
+            "version": "1.1.4",
+            "version_normalized": "1.1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message-util.git",
+                "reference": "3242caa9da7221a304b8f84eb9eaddae0a7cf422"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message-util/zipball/3242caa9da7221a304b8f84eb9eaddae0a7cf422",
+                "reference": "3242caa9da7221a304b8f84eb9eaddae0a7cf422",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3 || ^7.0"
+            },
+            "suggest": {
+                "psr/http-message": "The package containing the PSR-7 interfaces"
+            },
+            "time": "2020-02-05T20:36:27+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Fig\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Utility classes and constants for use with PSR-7 (psr/http-message)",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "install-path": "../fig/http-message-util"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.5.3",
+            "version_normalized": "6.5.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
+                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.6.1",
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.11"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "psr/log": "^1.1"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
+            "time": "2020-04-18T10:38:46+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.5-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "install-path": "../guzzlehttp/guzzle"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "version_normalized": "1.3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "time": "2016-12-20T10:07:11+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "install-path": "../guzzlehttp/promises"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.6.1",
+            "version_normalized": "1.6.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-zlib": "*",
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+            },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "time": "2019-07-01T23:21:34+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "install-path": "../guzzlehttp/psr7"
+        },
+        {
+            "name": "http-interop/http-factory-guzzle",
+            "version": "1.0.0",
+            "version_normalized": "1.0.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/http-interop/http-factory-guzzle.git",
+                "reference": "34861658efb9899a6618cef03de46e2a52c80fc0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/http-interop/http-factory-guzzle/zipball/34861658efb9899a6618cef03de46e2a52c80fc0",
+                "reference": "34861658efb9899a6618cef03de46e2a52c80fc0",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/psr7": "^1.4.2",
+                "psr/http-factory": "^1.0"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "^1.0"
+            },
+            "require-dev": {
+                "http-interop/http-factory-tests": "^0.5",
+                "phpunit/phpunit": "^6.5"
+            },
+            "time": "2018-07-31T19:32:56+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Factory\\Guzzle\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "An HTTP Factory using Guzzle PSR7",
+            "keywords": [
+                "factory",
+                "http",
+                "psr-17",
+                "psr-7"
+            ],
+            "install-path": "../http-interop/http-factory-guzzle"
+        },
+        {
+            "name": "laminas/laminas-diactoros",
+            "version": "2.2.3",
+            "version_normalized": "2.2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-diactoros.git",
+                "reference": "b596c7141f5093aefec94cb5e8745212299e290f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/b596c7141f5093aefec94cb5e8745212299e290f",
+                "reference": "b596c7141f5093aefec94cb5e8745212299e290f",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^7.1",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "conflict": {
+                "phpspec/prophecy": "<1.9.0"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "1.0",
+                "psr/http-message-implementation": "1.0"
+            },
+            "replace": {
+                "zendframework/zend-diactoros": "^2.2.1"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "http-interop/http-factory-tests": "^0.5.0",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "php-http/psr7-integration-tests": "^1.0",
+                "phpunit/phpunit": "^7.5.18"
+            },
+            "time": "2020-03-29T12:30:54+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev",
+                    "dev-develop": "2.2.x-dev",
+                    "dev-release-1.8": "1.8.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "src/functions/create_uploaded_file.php",
+                    "src/functions/marshal_headers_from_sapi.php",
+                    "src/functions/marshal_method_from_sapi.php",
+                    "src/functions/marshal_protocol_version_from_sapi.php",
+                    "src/functions/marshal_uri_from_sapi.php",
+                    "src/functions/normalize_server.php",
+                    "src/functions/normalize_uploaded_files.php",
+                    "src/functions/parse_cookie_header.php",
+                    "src/functions/create_uploaded_file.legacy.php",
+                    "src/functions/marshal_headers_from_sapi.legacy.php",
+                    "src/functions/marshal_method_from_sapi.legacy.php",
+                    "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+                    "src/functions/marshal_uri_from_sapi.legacy.php",
+                    "src/functions/normalize_server.legacy.php",
+                    "src/functions/normalize_uploaded_files.legacy.php",
+                    "src/functions/parse_cookie_header.legacy.php"
+                ],
+                "psr-4": {
+                    "Laminas\\Diactoros\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "http",
+                "laminas",
+                "psr",
+                "psr-7"
+            ],
+            "install-path": "../laminas/laminas-diactoros"
+        },
+        {
+            "name": "laminas/laminas-zendframework-bridge",
+            "version": "1.0.3",
+            "version_normalized": "1.0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
+                "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
+                "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "time": "2020-04-03T16:01:00+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev",
+                    "dev-develop": "1.1.x-dev"
+                },
+                "laminas": {
+                    "module": "Laminas\\ZendFrameworkBridge"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "src/autoload.php"
+                ],
+                "psr-4": {
+                    "Laminas\\ZendFrameworkBridge\\": "src//"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
+            "keywords": [
+                "ZendFramework",
+                "autoloading",
+                "laminas",
+                "zf"
+            ],
+            "install-path": "../laminas/laminas-zendframework-bridge"
+        },
+        {
+            "name": "league/oauth2-client",
+            "version": "2.4.1",
+            "version_normalized": "2.4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/oauth2-client.git",
+                "reference": "cc114abc622a53af969e8664722e84ca36257530"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/cc114abc622a53af969e8664722e84ca36257530",
+                "reference": "cc114abc622a53af969e8664722e84ca36257530",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "paragonie/random_compat": "^1|^2|^9.99",
+                "php": "^5.6|^7.0"
+            },
+            "require-dev": {
+                "eloquent/liberator": "^2.0",
+                "eloquent/phony-phpunit": "^1.0|^3.0",
+                "jakub-onderka/php-parallel-lint": "^0.9.2",
+                "phpunit/phpunit": "^5.7|^6.0",
+                "squizlabs/php_codesniffer": "^2.3|^3.0"
+            },
+            "time": "2018-11-22T18:33:57+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "League\\OAuth2\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alex Bilbie",
+                    "email": "hello@alexbilbie.com",
+                    "homepage": "http://www.alexbilbie.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Woody Gilk",
+                    "homepage": "https://github.com/shadowhand",
+                    "role": "Contributor"
+                }
+            ],
+            "description": "OAuth 2.0 Client Library",
+            "keywords": [
+                "Authentication",
+                "SSO",
+                "authorization",
+                "identity",
+                "idp",
+                "oauth",
+                "oauth2",
+                "single sign on"
+            ],
+            "install-path": "../league/oauth2-client"
+        },
+        {
+            "name": "league/oauth2-github",
+            "version": "2.0.0",
+            "version_normalized": "2.0.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/oauth2-github.git",
+                "reference": "e63d64f3ec167c09232d189c6b0c397458a99357"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-github/zipball/e63d64f3ec167c09232d189c6b0c397458a99357",
+                "reference": "e63d64f3ec167c09232d189c6b0c397458a99357",
+                "shasum": ""
+            },
+            "require": {
+                "league/oauth2-client": "^2.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "~0.9",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "time": "2017-01-26T01:14:51+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "League\\OAuth2\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Steven Maguire",
+                    "email": "stevenmaguire@gmail.com",
+                    "homepage": "https://github.com/stevenmaguire"
+                }
+            ],
+            "description": "Github OAuth 2.0 Client Provider for The PHP League OAuth2-Client",
+            "keywords": [
+                "authorisation",
+                "authorization",
+                "client",
+                "github",
+                "oauth",
+                "oauth2"
+            ],
+            "install-path": "../league/oauth2-github"
+        },
+        {
+            "name": "league/oauth2-google",
+            "version": "3.0.2",
+            "version_normalized": "3.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/oauth2-google.git",
+                "reference": "cfe9b0ae69eb5dbac64a282f04410b731f6b9c04"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-google/zipball/cfe9b0ae69eb5dbac64a282f04410b731f6b9c04",
+                "reference": "cfe9b0ae69eb5dbac64a282f04410b731f6b9c04",
+                "shasum": ""
+            },
+            "require": {
+                "league/oauth2-client": "^2.0"
+            },
+            "require-dev": {
+                "eloquent/phony-phpunit": "^2.0",
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^6.0",
+                "squizlabs/php_codesniffer": "^2.0"
+            },
+            "time": "2019-11-16T14:11:06+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "League\\OAuth2\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Woody Gilk",
+                    "email": "woody.gilk@gmail.com",
+                    "homepage": "http://shadowhand.me"
+                }
+            ],
+            "description": "Google OAuth 2.0 Client Provider for The PHP League OAuth2-Client",
+            "keywords": [
+                "Authentication",
+                "authorization",
+                "client",
+                "google",
+                "oauth",
+                "oauth2"
+            ],
+            "install-path": "../league/oauth2-google"
+        },
+        {
+            "name": "nikic/fast-route",
+            "version": "v1.3.0",
+            "version_normalized": "1.3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/FastRoute.git",
+                "reference": "181d480e08d9476e61381e04a71b34dc0432e812"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812",
+                "reference": "181d480e08d9476e61381e04a71b34dc0432e812",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35|~5.7"
+            },
+            "time": "2018-02-13T20:26:39+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "FastRoute\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov",
+                    "email": "nikic@php.net"
+                }
+            ],
+            "description": "Fast request router for PHP",
+            "keywords": [
+                "router",
+                "routing"
+            ],
+            "install-path": "../nikic/fast-route"
+        },
+        {
+            "name": "nyholm/psr7",
+            "version": "1.2.1",
+            "version_normalized": "1.2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Nyholm/psr7.git",
+                "reference": "55ff6b76573f5b242554c9775792bd59fb52e11c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Nyholm/psr7/zipball/55ff6b76573f5b242554c9775792bd59fb52e11c",
+                "reference": "55ff6b76573f5b242554c9775792bd59fb52e11c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1",
+                "php-http/message-factory": "^1.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "1.0",
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "http-interop/http-factory-tests": "dev-master",
+                "php-http/psr7-integration-tests": "dev-master",
+                "phpunit/phpunit": "^7.5"
+            },
+            "time": "2019-09-05T13:24:16+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Nyholm\\Psr7\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com"
+                },
+                {
+                    "name": "Martijn van der Ven",
+                    "email": "martijn@vanderven.se"
+                }
+            ],
+            "description": "A fast PHP7 implementation of PSR-7",
+            "homepage": "http://tnyholm.se",
+            "keywords": [
+                "psr-17",
+                "psr-7"
+            ],
+            "install-path": "../nyholm/psr7"
+        },
+        {
+            "name": "nyholm/psr7-server",
+            "version": "0.4.1",
+            "version_normalized": "0.4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Nyholm/psr7-server.git",
+                "reference": "e6a526e9170e6e33a13efc2b61703ca476b7ea68"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Nyholm/psr7-server/zipball/e6a526e9170e6e33a13efc2b61703ca476b7ea68",
+                "reference": "e6a526e9170e6e33a13efc2b61703ca476b7ea68",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "require-dev": {
+                "nyholm/nsa": "^1.1",
+                "nyholm/psr7": "^1.0",
+                "phpunit/phpunit": "^7.0"
+            },
+            "time": "2019-11-05T20:36:33+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Nyholm\\Psr7Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com"
+                },
+                {
+                    "name": "Martijn van der Ven",
+                    "email": "martijn@vanderven.se"
+                }
+            ],
+            "description": "Helper classes to handle PSR-7 server requests",
+            "homepage": "http://tnyholm.se",
+            "keywords": [
+                "psr-17",
+                "psr-7"
+            ],
+            "install-path": "../nyholm/psr7-server"
+        },
+        {
+            "name": "omines/oauth2-gitlab",
+            "version": "3.2.0",
+            "version_normalized": "3.2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/omines/oauth2-gitlab.git",
+                "reference": "2d2d0d055735b5cda3af2ba2eba9ecaa6c0e8a2a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/omines/oauth2-gitlab/zipball/2d2d0d055735b5cda3af2ba2eba9ecaa6c0e8a2a",
+                "reference": "2d2d0d055735b5cda3af2ba2eba9ecaa6c0e8a2a",
+                "shasum": ""
+            },
+            "require": {
+                "league/oauth2-client": "^2.2",
+                "php": ">=7.2"
+            },
+            "conflict": {
+                "league/oauth2-client": "2.4.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.0",
+                "m4tthumphrey/php-gitlab-api": "^9.0.0",
+                "mockery/mockery": "^1.0",
+                "php-http/guzzle6-adapter": "^2.0.1",
+                "phpunit/phpunit": "^8.0|^9.0"
+            },
+            "suggest": {
+                "m4tthumphrey/php-gitlab-api": "For further API usage using the acquired OAuth2 token"
+            },
+            "time": "2020-02-10T10:37:24+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Omines\\OAuth2\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Niels Keurentjes",
+                    "email": "niels.keurentjes@omines.com",
+                    "homepage": "https://www.omines.nl/"
+                }
+            ],
+            "description": "GitLab OAuth 2.0 Client Provider for The PHP League OAuth2-Client",
+            "keywords": [
+                "authorisation",
+                "authorization",
+                "client",
+                "gitlab",
+                "oauth",
+                "oauth2"
+            ],
+            "install-path": "../omines/oauth2-gitlab"
+        },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v9.99.99",
+            "version_normalized": "9.99.99.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "time": "2018-07-02T15:55:56+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
+            ],
+            "install-path": "../paragonie/random_compat"
+        },
+        {
+            "name": "php-http/guzzle6-adapter",
+            "version": "v1.1.1",
+            "version_normalized": "1.1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/guzzle6-adapter.git",
+                "reference": "a56941f9dc6110409cfcddc91546ee97039277ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/a56941f9dc6110409cfcddc91546ee97039277ab",
+                "reference": "a56941f9dc6110409cfcddc91546ee97039277ab",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "php": ">=5.5.0",
+                "php-http/httplug": "^1.0"
+            },
+            "provide": {
+                "php-http/async-client-implementation": "1.0",
+                "php-http/client-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "php-http/adapter-integration-tests": "^0.4"
+            },
+            "time": "2016-05-10T06:13:32+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Adapter\\Guzzle6\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "David de Boer",
+                    "email": "david@ddeboer.nl"
+                }
+            ],
+            "description": "Guzzle 6 HTTP Adapter",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "Guzzle",
+                "http"
+            ],
+            "install-path": "../php-http/guzzle6-adapter"
+        },
+        {
+            "name": "php-http/httplug",
+            "version": "v1.1.0",
+            "version_normalized": "1.1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/httplug.git",
+                "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/httplug/zipball/1c6381726c18579c4ca2ef1ec1498fdae8bdf018",
+                "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "php-http/promise": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "require-dev": {
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4"
+            },
+            "time": "2016-08-31T08:30:17+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eric GELOEN",
+                    "email": "geloen.eric@gmail.com"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "HTTPlug, the HTTP client abstraction for PHP",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "client",
+                "http"
+            ],
+            "install-path": "../php-http/httplug"
+        },
+        {
+            "name": "php-http/message-factory",
+            "version": "v1.0.2",
+            "version_normalized": "1.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/message-factory.git",
+                "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1",
+                "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "psr/http-message": "^1.0"
+            },
+            "time": "2015-12-19T14:08:53+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "Factory interfaces for PSR-7 HTTP Message",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "stream",
+                "uri"
+            ],
+            "install-path": "../php-http/message-factory"
+        },
+        {
+            "name": "php-http/promise",
+            "version": "v1.0.0",
+            "version_normalized": "1.0.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/promise.git",
+                "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980",
+                "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980",
+                "shasum": ""
+            },
+            "require-dev": {
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4"
+            },
+            "time": "2016-01-26T13:27:02+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "Joel Wurtz",
+                    "email": "joel.wurtz@gmail.com"
+                }
+            ],
+            "description": "Promise used for asynchronous HTTP requests",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "promise"
+            ],
+            "install-path": "../php-http/promise"
+        },
+        {
+            "name": "phpmailer/phpmailer",
+            "version": "v6.1.5",
+            "version_normalized": "6.1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPMailer/PHPMailer.git",
+                "reference": "a8bf068f64a580302026e484ee29511f661b2ad3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a8bf068f64a580302026e484ee29511f661b2ad3",
+                "reference": "a8bf068f64a580302026e484ee29511f661b2ad3",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-filter": "*",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.2",
+                "friendsofphp/php-cs-fixer": "^2.2",
+                "phpunit/phpunit": "^4.8 || ^5.7"
+            },
+            "suggest": {
+                "ext-mbstring": "Needed to send email in multibyte encoding charset",
+                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+                "psr/log": "For optional PSR-3 debug logging",
+                "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
+                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+            },
+            "time": "2020-03-14T14:23:48+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "PHPMailer\\PHPMailer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1-only"
+            ],
+            "authors": [
+                {
+                    "name": "Marcus Bointon",
+                    "email": "phpmailer@synchromedia.co.uk"
+                },
+                {
+                    "name": "Jim Jagielski",
+                    "email": "jimjag@gmail.com"
+                },
+                {
+                    "name": "Andy Prevost",
+                    "email": "codeworxtech@users.sourceforge.net"
+                },
+                {
+                    "name": "Brent R. Matzelle"
+                }
+            ],
+            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+            "install-path": "../phpmailer/phpmailer"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "version_normalized": "1.0.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "time": "2017-02-14T16:28:37+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "install-path": "../psr/container"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.0.1",
+            "version_normalized": "1.0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0"
+            },
+            "time": "2019-04-30T12:38:16+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "install-path": "../psr/http-factory"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "version_normalized": "1.0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "time": "2016-08-06T14:39:51+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "install-path": "../psr/http-message"
+        },
+        {
+            "name": "psr/http-server-handler",
+            "version": "1.0.1",
+            "version_normalized": "1.0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-handler.git",
+                "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7",
+                "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0"
+            },
+            "time": "2018-10-30T16:46:14+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side request handler",
+            "keywords": [
+                "handler",
+                "http",
+                "http-interop",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response",
+                "server"
+            ],
+            "install-path": "../psr/http-server-handler"
+        },
+        {
+            "name": "psr/http-server-middleware",
+            "version": "1.0.1",
+            "version_normalized": "1.0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-middleware.git",
+                "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5",
+                "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0",
+                "psr/http-server-handler": "^1.0"
+            },
+            "time": "2018-10-30T17:12:04+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side middleware",
+            "keywords": [
+                "http",
+                "http-interop",
+                "middleware",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "install-path": "../psr/http-server-middleware"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.3",
+            "version_normalized": "1.1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "time": "2020-03-23T09:12:05+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "install-path": "../psr/log"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "version_normalized": "3.0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "time": "2019-03-08T08:55:37+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "install-path": "../ralouphie/getallheaders"
+        },
+        {
+            "name": "slim/psr7",
+            "version": "0.6",
+            "version_normalized": "0.6.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slimphp/Slim-Psr7.git",
+                "reference": "23015a8814382c244315602d44cb02d412b6b059"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/23015a8814382c244315602d44cb02d412b6b059",
+                "reference": "23015a8814382c244315602d44cb02d412b6b059",
+                "shasum": ""
+            },
+            "require": {
+                "fig/http-message-util": "^1.1.2",
+                "php": "^7.1",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0",
+                "ralouphie/getallheaders": "^3"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-json": "*",
+                "http-interop/http-factory-tests": "^0.6.0",
+                "php-http/psr7-integration-tests": "dev-master",
+                "phpstan/phpstan": "^0.10",
+                "phpunit/phpunit": "^6.0|^7.0",
+                "squizlabs/php_codesniffer": "^3.3"
+            },
+            "time": "2019-10-05T20:27:07+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Slim\\Psr7\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Josh Lockhart",
+                    "email": "hello@joshlockhart.com",
+                    "homepage": "http://joshlockhart.com"
+                },
+                {
+                    "name": "Andrew Smith",
+                    "email": "a.smith@silentworks.co.uk",
+                    "homepage": "http://silentworks.co.uk"
+                },
+                {
+                    "name": "Rob Allen",
+                    "email": "rob@akrabat.com",
+                    "homepage": "http://akrabat.com"
+                },
+                {
+                    "name": "Pierre Berube",
+                    "email": "pierre@lgse.com",
+                    "homepage": "http://www.lgse.com"
+                }
+            ],
+            "description": "Strict PSR-7 implementation",
+            "homepage": "https://www.slimframework.com",
+            "keywords": [
+                "http",
+                "psr-7",
+                "psr7"
+            ],
+            "install-path": "../slim/psr7"
+        },
+        {
+            "name": "slim/slim",
+            "version": "4.5.0",
+            "version_normalized": "4.5.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slimphp/Slim.git",
+                "reference": "5613cbb521081ed676d5d7eb3e44f2b80a818c24"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/5613cbb521081ed676d5d7eb3e44f2b80a818c24",
+                "reference": "5613cbb521081ed676d5d7eb3e44f2b80a818c24",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "nikic/fast-route": "^1.3",
+                "php": "^7.2",
+                "psr/container": "^1.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0",
+                "psr/http-server-handler": "^1.0",
+                "psr/http-server-middleware": "^1.0",
+                "psr/log": "^1.1"
+            },
+            "require-dev": {
+                "adriansuter/php-autoload-override": "^1.0",
+                "ext-simplexml": "*",
+                "guzzlehttp/psr7": "^1.5",
+                "http-interop/http-factory-guzzle": "^1.0",
+                "laminas/laminas-diactoros": "^2.1",
+                "nyholm/psr7": "^1.1",
+                "nyholm/psr7-server": "^0.3.0",
+                "phpspec/prophecy": "^1.10",
+                "phpstan/phpstan": "^0.11.5",
+                "phpunit/phpunit": "^8.5",
+                "slim/http": "^1.0",
+                "slim/psr7": "^1.0",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "suggest": {
+                "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
+                "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
+                "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
+                "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
+            },
+            "time": "2020-04-14T20:49:48+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Slim\\": "Slim"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Josh Lockhart",
+                    "email": "hello@joshlockhart.com",
+                    "homepage": "https://joshlockhart.com"
+                },
+                {
+                    "name": "Andrew Smith",
+                    "email": "a.smith@silentworks.co.uk",
+                    "homepage": "http://silentworks.co.uk"
+                },
+                {
+                    "name": "Rob Allen",
+                    "email": "rob@akrabat.com",
+                    "homepage": "http://akrabat.com"
+                },
+                {
+                    "name": "Pierre Berube",
+                    "email": "pierre@lgse.com",
+                    "homepage": "http://www.lgse.com"
+                },
+                {
+                    "name": "Gabriel Manricks",
+                    "email": "gmanricks@me.com",
+                    "homepage": "http://gabrielmanricks.com"
+                }
+            ],
+            "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
+            "homepage": "https://www.slimframework.com",
+            "keywords": [
+                "api",
+                "framework",
+                "micro",
+                "router"
+            ],
+            "install-path": "../slim/slim"
+        },
+        {
+            "name": "smarty/smarty",
+            "version": "v3.1.36",
+            "version_normalized": "3.1.36.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "fd148f7ade295014fff77f89ee3d5b20d9d55451"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/fd148f7ade295014fff77f89ee3d5b20d9d55451",
+                "reference": "fd148f7ade295014fff77f89ee3d5b20d9d55451",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "6.4.1",
+                "smarty/smarty-lexer": "^3.1"
+            },
+            "time": "2020-04-14T14:44:26+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "libs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "http://www.smarty.net",
+            "keywords": [
+                "templating"
+            ],
+            "install-path": "../smarty/smarty"
+        },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.15.0",
+            "version_normalized": "1.15.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
+                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "time": "2020-03-09T19:04:49+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.15-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "install-path": "../symfony/polyfill-intl-idn"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.15.0",
+            "version_normalized": "1.15.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
+                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "time": "2020-03-09T19:04:49+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.15-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "install-path": "../symfony/polyfill-mbstring"
+        },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.15.0",
+            "version_normalized": "1.15.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "37b0976c78b94856543260ce09b460a7bc852747"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
+                "reference": "37b0976c78b94856543260ce09b460a7bc852747",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2020-02-27T09:26:54+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.15-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "install-path": "../symfony/polyfill-php72"
+        }
+    ],
+    "dev": true,
+    "dev-package-names": []
+}
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
new file mode 100644
index 0000000000..e466beab2e
--- /dev/null
+++ b/vendor/composer/installed.php
@@ -0,0 +1,360 @@
+ array(
+        'pretty_version' => 'dev-2.0.0-testplan-explode',
+        'version' => 'dev-2.0.0-testplan-explode',
+        'type' => 'library',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'reference' => '7e3781d7a9af75bcf5ba74d4ed9d4496f5866b58',
+        'name' => '__root__',
+        'dev' => true,
+    ),
+    'versions' => array(
+        '__root__' => array(
+            'pretty_version' => 'dev-2.0.0-testplan-explode',
+            'version' => 'dev-2.0.0-testplan-explode',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'reference' => '7e3781d7a9af75bcf5ba74d4ed9d4496f5866b58',
+            'dev_requirement' => false,
+        ),
+        'adodb/adodb-php' => array(
+            'pretty_version' => 'v5.21.3',
+            'version' => '5.21.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../adodb/adodb-php',
+            'aliases' => array(),
+            'reference' => 'c5415722049f36c446a4034d15f1d17943f11458',
+            'dev_requirement' => false,
+        ),
+        'fig/http-message-util' => array(
+            'pretty_version' => '1.1.4',
+            'version' => '1.1.4.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../fig/http-message-util',
+            'aliases' => array(),
+            'reference' => '3242caa9da7221a304b8f84eb9eaddae0a7cf422',
+            'dev_requirement' => false,
+        ),
+        'guzzlehttp/guzzle' => array(
+            'pretty_version' => '6.5.3',
+            'version' => '6.5.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
+            'aliases' => array(),
+            'reference' => 'aab4ebd862aa7d04f01a4b51849d657db56d882e',
+            'dev_requirement' => false,
+        ),
+        'guzzlehttp/promises' => array(
+            'pretty_version' => 'v1.3.1',
+            'version' => '1.3.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../guzzlehttp/promises',
+            'aliases' => array(),
+            'reference' => 'a59da6cf61d80060647ff4d3eb2c03a2bc694646',
+            'dev_requirement' => false,
+        ),
+        'guzzlehttp/psr7' => array(
+            'pretty_version' => '1.6.1',
+            'version' => '1.6.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../guzzlehttp/psr7',
+            'aliases' => array(),
+            'reference' => '239400de7a173fe9901b9ac7c06497751f00727a',
+            'dev_requirement' => false,
+        ),
+        'http-interop/http-factory-guzzle' => array(
+            'pretty_version' => '1.0.0',
+            'version' => '1.0.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../http-interop/http-factory-guzzle',
+            'aliases' => array(),
+            'reference' => '34861658efb9899a6618cef03de46e2a52c80fc0',
+            'dev_requirement' => false,
+        ),
+        'laminas/laminas-diactoros' => array(
+            'pretty_version' => '2.2.3',
+            'version' => '2.2.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../laminas/laminas-diactoros',
+            'aliases' => array(),
+            'reference' => 'b596c7141f5093aefec94cb5e8745212299e290f',
+            'dev_requirement' => false,
+        ),
+        'laminas/laminas-zendframework-bridge' => array(
+            'pretty_version' => '1.0.3',
+            'version' => '1.0.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../laminas/laminas-zendframework-bridge',
+            'aliases' => array(),
+            'reference' => 'bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9',
+            'dev_requirement' => false,
+        ),
+        'league/oauth2-client' => array(
+            'pretty_version' => '2.4.1',
+            'version' => '2.4.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../league/oauth2-client',
+            'aliases' => array(),
+            'reference' => 'cc114abc622a53af969e8664722e84ca36257530',
+            'dev_requirement' => false,
+        ),
+        'league/oauth2-github' => array(
+            'pretty_version' => '2.0.0',
+            'version' => '2.0.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../league/oauth2-github',
+            'aliases' => array(),
+            'reference' => 'e63d64f3ec167c09232d189c6b0c397458a99357',
+            'dev_requirement' => false,
+        ),
+        'league/oauth2-google' => array(
+            'pretty_version' => '3.0.2',
+            'version' => '3.0.2.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../league/oauth2-google',
+            'aliases' => array(),
+            'reference' => 'cfe9b0ae69eb5dbac64a282f04410b731f6b9c04',
+            'dev_requirement' => false,
+        ),
+        'nikic/fast-route' => array(
+            'pretty_version' => 'v1.3.0',
+            'version' => '1.3.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../nikic/fast-route',
+            'aliases' => array(),
+            'reference' => '181d480e08d9476e61381e04a71b34dc0432e812',
+            'dev_requirement' => false,
+        ),
+        'nyholm/psr7' => array(
+            'pretty_version' => '1.2.1',
+            'version' => '1.2.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../nyholm/psr7',
+            'aliases' => array(),
+            'reference' => '55ff6b76573f5b242554c9775792bd59fb52e11c',
+            'dev_requirement' => false,
+        ),
+        'nyholm/psr7-server' => array(
+            'pretty_version' => '0.4.1',
+            'version' => '0.4.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../nyholm/psr7-server',
+            'aliases' => array(),
+            'reference' => 'e6a526e9170e6e33a13efc2b61703ca476b7ea68',
+            'dev_requirement' => false,
+        ),
+        'omines/oauth2-gitlab' => array(
+            'pretty_version' => '3.2.0',
+            'version' => '3.2.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../omines/oauth2-gitlab',
+            'aliases' => array(),
+            'reference' => '2d2d0d055735b5cda3af2ba2eba9ecaa6c0e8a2a',
+            'dev_requirement' => false,
+        ),
+        'paragonie/random_compat' => array(
+            'pretty_version' => 'v9.99.99',
+            'version' => '9.99.99.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../paragonie/random_compat',
+            'aliases' => array(),
+            'reference' => '84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95',
+            'dev_requirement' => false,
+        ),
+        'php-http/async-client-implementation' => array(
+            'dev_requirement' => false,
+            'provided' => array(
+                0 => '1.0',
+            ),
+        ),
+        'php-http/client-implementation' => array(
+            'dev_requirement' => false,
+            'provided' => array(
+                0 => '1.0',
+            ),
+        ),
+        'php-http/guzzle6-adapter' => array(
+            'pretty_version' => 'v1.1.1',
+            'version' => '1.1.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../php-http/guzzle6-adapter',
+            'aliases' => array(),
+            'reference' => 'a56941f9dc6110409cfcddc91546ee97039277ab',
+            'dev_requirement' => false,
+        ),
+        'php-http/httplug' => array(
+            'pretty_version' => 'v1.1.0',
+            'version' => '1.1.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../php-http/httplug',
+            'aliases' => array(),
+            'reference' => '1c6381726c18579c4ca2ef1ec1498fdae8bdf018',
+            'dev_requirement' => false,
+        ),
+        'php-http/message-factory' => array(
+            'pretty_version' => 'v1.0.2',
+            'version' => '1.0.2.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../php-http/message-factory',
+            'aliases' => array(),
+            'reference' => 'a478cb11f66a6ac48d8954216cfed9aa06a501a1',
+            'dev_requirement' => false,
+        ),
+        'php-http/promise' => array(
+            'pretty_version' => 'v1.0.0',
+            'version' => '1.0.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../php-http/promise',
+            'aliases' => array(),
+            'reference' => 'dc494cdc9d7160b9a09bd5573272195242ce7980',
+            'dev_requirement' => false,
+        ),
+        'phpmailer/phpmailer' => array(
+            'pretty_version' => 'v6.1.5',
+            'version' => '6.1.5.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpmailer/phpmailer',
+            'aliases' => array(),
+            'reference' => 'a8bf068f64a580302026e484ee29511f661b2ad3',
+            'dev_requirement' => false,
+        ),
+        'psr/container' => array(
+            'pretty_version' => '1.0.0',
+            'version' => '1.0.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/container',
+            'aliases' => array(),
+            'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f',
+            'dev_requirement' => false,
+        ),
+        'psr/http-factory' => array(
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-factory',
+            'aliases' => array(),
+            'reference' => '12ac7fcd07e5b077433f5f2bee95b3a771bf61be',
+            'dev_requirement' => false,
+        ),
+        'psr/http-factory-implementation' => array(
+            'dev_requirement' => false,
+            'provided' => array(
+                0 => '^1.0',
+                1 => '1.0',
+            ),
+        ),
+        'psr/http-message' => array(
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-message',
+            'aliases' => array(),
+            'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363',
+            'dev_requirement' => false,
+        ),
+        'psr/http-message-implementation' => array(
+            'dev_requirement' => false,
+            'provided' => array(
+                0 => '1.0',
+            ),
+        ),
+        'psr/http-server-handler' => array(
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-server-handler',
+            'aliases' => array(),
+            'reference' => 'aff2f80e33b7f026ec96bb42f63242dc50ffcae7',
+            'dev_requirement' => false,
+        ),
+        'psr/http-server-middleware' => array(
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-server-middleware',
+            'aliases' => array(),
+            'reference' => '2296f45510945530b9dceb8bcedb5cb84d40c5f5',
+            'dev_requirement' => false,
+        ),
+        'psr/log' => array(
+            'pretty_version' => '1.1.3',
+            'version' => '1.1.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/log',
+            'aliases' => array(),
+            'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc',
+            'dev_requirement' => false,
+        ),
+        'ralouphie/getallheaders' => array(
+            'pretty_version' => '3.0.3',
+            'version' => '3.0.3.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../ralouphie/getallheaders',
+            'aliases' => array(),
+            'reference' => '120b605dfeb996808c31b6477290a714d356e822',
+            'dev_requirement' => false,
+        ),
+        'slim/psr7' => array(
+            'pretty_version' => '0.6',
+            'version' => '0.6.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../slim/psr7',
+            'aliases' => array(),
+            'reference' => '23015a8814382c244315602d44cb02d412b6b059',
+            'dev_requirement' => false,
+        ),
+        'slim/slim' => array(
+            'pretty_version' => '4.5.0',
+            'version' => '4.5.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../slim/slim',
+            'aliases' => array(),
+            'reference' => '5613cbb521081ed676d5d7eb3e44f2b80a818c24',
+            'dev_requirement' => false,
+        ),
+        'smarty/smarty' => array(
+            'pretty_version' => 'v3.1.36',
+            'version' => '3.1.36.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../smarty/smarty',
+            'aliases' => array(),
+            'reference' => 'fd148f7ade295014fff77f89ee3d5b20d9d55451',
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-intl-idn' => array(
+            'pretty_version' => 'v1.15.0',
+            'version' => '1.15.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
+            'aliases' => array(),
+            'reference' => '47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf',
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-mbstring' => array(
+            'pretty_version' => 'v1.15.0',
+            'version' => '1.15.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
+            'aliases' => array(),
+            'reference' => '81ffd3a9c6d707be22e3012b827de1c9775fc5ac',
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-php72' => array(
+            'pretty_version' => 'v1.15.0',
+            'version' => '1.15.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-php72',
+            'aliases' => array(),
+            'reference' => '37b0976c78b94856543260ce09b460a7bc852747',
+            'dev_requirement' => false,
+        ),
+        'zendframework/zend-diactoros' => array(
+            'dev_requirement' => false,
+            'replaced' => array(
+                0 => '^2.2.1',
+            ),
+        ),
+    ),
+);
diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php
new file mode 100644
index 0000000000..589e9e770b
--- /dev/null
+++ b/vendor/composer/platform_check.php
@@ -0,0 +1,26 @@
+= 70200)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}