diff --git a/CHANGELOG b/CHANGELOG index f6b71b4..4a73e10 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +Thu Sep 01 2022 + rubo77 - fix CVE-2020-13565: sanitize URL +Thu Aug 25 2022 + rubo77 - Adapt to PHP 8.2 + rubo77 - Update ADODB to v5.20.20 + rubo77 - work around missing get- and set_magic_quotes_runtime() + rubo77 - Lite.php 376 2004-11-08 + rubo77 - update adodb to SVN Revision 425 + rubo77 - Merge remote-tracking branch 'origin/master' from github @IPSO + mikeb - Switch from CVS to SVN on sourceforge.net Tue Sep 05 2006 mikeb - Release version 3.3.7 Mon Sep 04 2006 @@ -26,7 +36,7 @@ Thu Sep 22 2005 Wed Sep 21 2005 mikeb - Addslashes to JS creation code in assign_group.php. Thu Sep 08 2005 - mikeb - Added support for MS-SQL in setup.php, thanks to François Tissandier + mikeb - Added support for MS-SQL in setup.php, thanks to François Tissandier Sat Sep 03 2005 mikeb - Fixed typo in manual mikeb - Fixed comments in gacl.class.php @@ -36,7 +46,7 @@ Mon Aug 22 2005 Thu Aug 04 2005 mikeb - Fixed bug with config ini file path in setup.php Thu Jul 28 2005 - mikeb - Fixed bug with double/single quotes on line 3526. Jérémy Cohen Solal + mikeb - Fixed bug with double/single quotes on line 3526. JĂ©rĂ©my Cohen Solal Sun Jul 24 2005 mikeb - Removed table prefix comment regarding not using "_". Apparently it works now mikeb - Fixed comments in gacl.class.php regarding group IDs, it now correctly says group values. diff --git a/Cache_Lite/Hashed_Cache_Lite.php b/Cache_Lite/Hashed_Cache_Lite.php index 894952f..a0ca635 100644 --- a/Cache_Lite/Hashed_Cache_Lite.php +++ b/Cache_Lite/Hashed_Cache_Lite.php @@ -69,7 +69,7 @@ function _create_dir_structure($dir) { if (!@file_exists($dir)) { $dir_parts = preg_split('![\/]+!', $dir, -1, PREG_SPLIT_NO_EMPTY); - $new_dir = ($dir{0} == DIR_SEP) ? DIR_SEP : ''; + $new_dir = ($dir[0] == DIR_SEP) ? DIR_SEP : ''; foreach ($dir_parts as $dir_part) { $new_dir .= $dir_part; if (!file_exists($new_dir) && !mkdir($new_dir, 0771)) { @@ -145,7 +145,7 @@ function clean($group = false) unset($this->_memoryCachingArray[$key]); } } - $this->_memoryCachingCounter = count($this->_memoryCachingArray); + $this->_memoryCachingCounter = phpgacl_legacy_count($this->_memoryCachingArray); if ($this->_onlyMemoryCaching) { return true; } diff --git a/Cache_Lite/Lite.php b/Cache_Lite/Lite.php index 17e2fa5..8f44a28 100644 --- a/Cache_Lite/Lite.php +++ b/Cache_Lite/Lite.php @@ -22,7 +22,7 @@ * * @package Cache_Lite * @category Caching -* @version $Id$ +* @version $Id: Lite.php 376 2004-11-08 00:47:05Z ipso $ * @author Fabien MARTY */ @@ -366,7 +366,7 @@ function clean($group = false) $motif = ($group) ? 'cache_'.$group.'_' : 'cache_'; } if ($this->_memoryCaching) { - while (list($key, $value) = each($this->_memoryCachingArray)) { + foreach($this->_memoryCachingArray as $key=>$value) { if (strpos($key, $motif, 0)) { unset($this->_memoryCachingArray[$key]); $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1; @@ -526,14 +526,14 @@ function _read() if ($fp) { clearstatcache(); // because the filesize can be cached by PHP itself... $length = @filesize($this->_file); - $mqr = get_magic_quotes_runtime(); - set_magic_quotes_runtime(0); + $mqr = (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime()); + if(function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0); if ($this->_readControl) { $hashControl = @fread($fp, 32); $length = $length - 32; } $data = @fread($fp, $length); - set_magic_quotes_runtime($mqr); + if(function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime($mqr); if ($this->_fileLocking) @flock($fp, LOCK_UN); @fclose($fp); if ($this->_readControl) { diff --git a/admin/acl_test2.php b/admin/acl_test2.php index 893bd9f..912ae0f 100644 --- a/admin/acl_test2.php +++ b/admin/acl_test2.php @@ -32,9 +32,9 @@ echo(""); */ -$total_rows = count($rows); +$total_rows = phpgacl_legacy_count($rows); -while (list(,$row) = @each(&$rows)) { +foreach($rows as $row) { list( $aco_section_value, $aco_section_name, $aco_value, diff --git a/admin/acl_test3.php b/admin/acl_test3.php index 86c2fde..efdeac9 100644 --- a/admin/acl_test3.php +++ b/admin/acl_test3.php @@ -52,9 +52,9 @@ echo(""); */ -$total_rows = count($rows); +$total_rows = phpgacl_legacy_count($rows); -while (list(,$row) = @each(&$rows)) { +foreach($rows as $row) { list( $aco_section_value, $aco_section_name, $aco_value, diff --git a/admin/assign_group.php b/admin/assign_group.php index 8d02afc..a07f2de 100644 --- a/admin/assign_group.php +++ b/admin/assign_group.php @@ -33,13 +33,13 @@ //Parse the form values //foreach ($_POST['delete_assigned_aro'] as $aro_value) { - while (list(,$object_value) = @each($_POST['delete_assigned_object'])) { + foreach($_POST['delete_assigned_object'] as $object_value) { $split_object_value = explode('^', $object_value); $selected_object_array[$split_object_value[0]][] = $split_object_value[1]; } //Insert Object -> GROUP mappings - while (list($object_section_value,$object_array) = @each($selected_object_array)) { + foreach($selected_object_array as $object_section_value=>$object_array) { $gacl_api->debug_text('Assign: Object ID: '. $object_section_value .' to Group: '. $_POST['group_id']); foreach ($object_array as $object_value) { @@ -56,14 +56,13 @@ //showarray($_POST['selected_'.$_POST['group_type']]); //Parse the form values - //foreach ($_POST['selected_aro'] as $aro_value) { - while (list(,$object_value) = @each($_POST['selected_'.$_POST['group_type']])) { + foreach ($_POST['selected_'.$_POST['group_type']] as $object_value) { $split_object_value = explode('^', $object_value); $selected_object_array[$split_object_value[0]][] = $split_object_value[1]; } //Insert ARO -> GROUP mappings - while (list($object_section_value,$object_array) = @each($selected_object_array)) { + foreach($selected_object_array as $object_section_value=>$object_array) { $gacl_api->debug_text('Assign: Object ID: '. $object_section_value .' to Group: '. $_POST['group_id']); foreach ($object_array as $object_value) { diff --git a/admin/edit_group.php b/admin/edit_group.php index 23a86d9..15e5b04 100644 --- a/admin/edit_group.php +++ b/admin/edit_group.php @@ -30,7 +30,7 @@ case 'Delete': $gacl_api->debug_text('Delete'); - if (count($_POST['delete_group']) > 0) { + if (phpgacl_legacy_count($_POST['delete_group']) > 0) { //Always reparent children when deleting a group. foreach ($_POST['delete_group'] as $group_id) { $gacl_api->debug_text('Deleting group_id: '. $group_id); @@ -41,7 +41,7 @@ } } - if (count($retry) > 0) { + if (phpgacl_legacy_count($retry) > 0) { foreach($retry as $group_id) { $gacl_api->del_group($group_id, TRUE, $group_type); } diff --git a/admin/edit_object_sections.php b/admin/edit_object_sections.php index 6c12115..2fd07f3 100644 --- a/admin/edit_object_sections.php +++ b/admin/edit_object_sections.php @@ -34,7 +34,7 @@ switch ($_POST['action']) { case 'Delete': - if (count($_POST['delete_sections']) > 0) { + if (phpgacl_legacy_count($_POST['delete_sections']) > 0) { foreach($_POST['delete_sections'] as $id) { $gacl_api->del_object_section($id, $object_type, TRUE); } @@ -48,7 +48,7 @@ $gacl_api->debug_text("Submit!!"); //Update sections - while (list(,$row) = @each($_POST['sections'])) { + foreach($_POST['sections'] as $row) { list($id, $value, $order, $name) = $row; $gacl_api->edit_object_section($id, $name, $value, $order,0,$object_type ); } @@ -58,7 +58,7 @@ unset($name); //Insert new sections - while (list(,$row) = @each($_POST['new_sections'])) { + foreach($_POST['new_sections'] as $row) { list($value, $order, $name) = $row; if (!empty($value) AND !empty($order) AND !empty($name)) { @@ -79,7 +79,7 @@ $sections = array(); - while (list(,$row) = @each($rows)) { + foreach($rows as $row) { list($id, $value, $order_value, $name) = $row; $sections[] = array( diff --git a/admin/edit_objects.php b/admin/edit_objects.php index 90a2f62..3c854c4 100644 --- a/admin/edit_objects.php +++ b/admin/edit_objects.php @@ -33,7 +33,7 @@ switch ($_POST['action']) { case 'Delete': - if (count($_POST['delete_object']) > 0) { + if (phpgacl_legacy_count($_POST['delete_object']) > 0) { foreach($_POST['delete_object'] as $id) { $gacl_api->del_object($id, $object_type, TRUE); } @@ -47,7 +47,7 @@ $gacl_api->debug_text("Submit!!"); //Update objects - while (list(,$row) = @each($_POST['objects'])) { + foreach($_POST['objects'] as $row) { list($id, $value, $order, $name) = $row; $gacl_api->edit_object($id, $_POST['section_value'], $name, $value, $order, 0, $object_type); } @@ -58,7 +58,7 @@ unset($name); //Insert new sections - while (list(,$row) = @each($_POST['new_objects'])) { + foreach($_POST['new_objects'] as $row) { list($value, $order, $name) = $row; if (!empty($value) AND !empty($name)) { @@ -86,7 +86,7 @@ $rs = $db->pageexecute($query, $gacl_api->_items_per_page, $_GET['page']); $rows = $rs->GetRows(); - while (list(,$row) = @each($rows)) { + foreach($rows as $row) { list($id, $section_value, $value, $order_value, $name) = $row; $objects[] = array( diff --git a/admin/gacl_admin_api.class.php b/admin/gacl_admin_api.class.php index 400dc08..5c27f94 100644 --- a/admin/gacl_admin_api.class.php +++ b/admin/gacl_admin_api.class.php @@ -81,6 +81,8 @@ function return_page($url="") { } if (!$debug OR $debug==0) { + # fix CVE-2020-13565: sanitize URL + $url=preg_replace('/^([a-z0-9\s%;\+]+:\/\/+)+/i','',$url); header("Location: $url\n\n"); } else { $this->debug_text("return_page(): URL: $url -- Referer: $_SERVER[HTTP_REFERRER]"); diff --git a/admin/object_search.php b/admin/object_search.php index bec1d30..8579707 100644 --- a/admin/object_search.php +++ b/admin/object_search.php @@ -24,7 +24,7 @@ function array_walk_trim(&$array_field) { $exploded_value_search_str = explode("\n", $value_search_str); $exploded_name_search_str = explode("\n", $name_search_str); - if (count($exploded_value_search_str) > 1 OR count($exploded_name_search_str) > 1) { + if (phpgacl_legacy_count($exploded_value_search_str) > 1 OR phpgacl_legacy_count($exploded_name_search_str) > 1) { //Given a list, lets try to match all lines in it. array_walk($exploded_value_search_str, 'array_walk_trim'); array_walk($exploded_name_search_str, 'array_walk_trim'); @@ -45,7 +45,7 @@ function array_walk_trim(&$array_field) { WHERE section_value='. $db->qstr($_GET['section_value']) .' AND ('; - if (count($exploded_value_search_str) > 1) { + if (phpgacl_legacy_count($exploded_value_search_str) > 1) { $query .= 'lower(value) IN ('. implode(',', $exploded_value_search_str) .')'; } else { $query .= 'lower(value) LIKE ' . $db->qstr($value_search_str); @@ -53,7 +53,7 @@ function array_walk_trim(&$array_field) { $query .= ' OR '; - if (count($exploded_name_search_str) > 1) { + if (phpgacl_legacy_count($exploded_name_search_str) > 1) { $query .= 'lower(name) IN ('. implode(',', $exploded_name_search_str) .')'; } else { $query .= 'lower(name) LIKE ' . $db->qstr($name_search_str); diff --git a/admin/smarty/libs/plugins/function.fetch.php b/admin/smarty/libs/plugins/function.fetch.php index 81b1bfc..8b36ce3 100644 --- a/admin/smarty/libs/plugins/function.fetch.php +++ b/admin/smarty/libs/plugins/function.fetch.php @@ -181,12 +181,12 @@ function smarty_function_fetch($params, &$smarty) $content .= fgets($fp,4096); } fclose($fp); - $csplit = split("\r\n\r\n",$content,2); + $csplit = explode("\r\n\r\n",$content,2); $content = $csplit[1]; if(!empty($params['assign_headers'])) { - $smarty->assign($params['assign_headers'],split("\r\n",$csplit[0])); + $smarty->assign($params['assign_headers'],explode("\r\n",$csplit[0])); } } } else { diff --git a/adodb/.mailmap b/adodb/.mailmap new file mode 100644 index 0000000..1f2f7e7 --- /dev/null +++ b/adodb/.mailmap @@ -0,0 +1,4 @@ +Andreas Fernandez +Mike Benoit MikeB +Mike Benoit mike.benoit + diff --git a/adodb/LICENSE.md b/adodb/LICENSE.md new file mode 100644 index 0000000..d00e2b1 --- /dev/null +++ b/adodb/LICENSE.md @@ -0,0 +1,499 @@ +ADOdb License +============= + +The ADOdb Library is dual-licensed, released under both the +[BSD 3-clause](#bsd-3-clause-license) and the +[GNU Lesser General Public License (LGPL) v2.1](#gnu-lesser-general-public-license) +or, at your option, any later version. + +In plain English, you do not need to distribute your application in source code form, +nor do you need to distribute ADOdb source code, provided you follow the rest of +terms of the BSD license. + +For more information about ADOdb, visit https://adodb.org/ + +BSD 3-Clause License +-------------------- + +(c) 2000-2013 John Lim (jlim@natsoft.com) +(c) 2014 Damien Regad, Mark Newnham and the ADOdb community +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + +### DISCLAIMER + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +GNU LESSER GENERAL PUBLIC LICENSE +--------------------------------- + +_Version 2.1, February 1999_ +_Copyright © 1991, 1999 Free Software Foundation, Inc._ +_51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA_ + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +_This is the first released version of the Lesser GPL. It also counts +as the successor of the GNU Library Public License, version 2, hence +the version number 2.1._ + +### Preamble + +The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + +When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + +To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: **(1)** we copyright the +library, and **(2)** we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + +Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + +When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + +We call this license the “Lesser” General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + +For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + +Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +“work based on the library” and a “work that uses the library”. The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + +### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +**0.** This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called “this License”). +Each licensee is addressed as “you”. + +A “library” means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + +The “Library”, below, refers to any such software library or work +which has been distributed under these terms. A “work based on the +Library” means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term “modification”.) + +“Source code” for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + +**1.** You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + +You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + +**2.** You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + +* **a)** The modified work must itself be a software library. +* **b)** You must cause the files modified to carry prominent notices +stating that you changed the files and the date of any change. +* **c)** You must cause the whole of the work to be licensed at no +charge to all third parties under the terms of this License. +* **d)** If a facility in the modified Library refers to a function or a +table of data to be supplied by an application program that uses +the facility, other than as an argument passed when the facility +is invoked, then you must make a good faith effort to ensure that, +in the event an application does not supply such function or +table, the facility still operates, and performs whatever part of +its purpose remains meaningful. +(For example, a function in a library to compute square roots has +a purpose that is entirely well-defined independent of the +application. Therefore, Subsection 2d requires that any +application-supplied function or table used by this function must +be optional: if the application does not supply it, the square +root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +**3.** You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + +Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + +**4.** You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + +**5.** A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a “work that uses the Library”. Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + +However, linking a “work that uses the Library” with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a “work that uses the +library”. The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + +When a “work that uses the Library” uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +**6.** As an exception to the Sections above, you may also combine or +link a “work that uses the Library” with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + +* **a)** Accompany the work with the complete corresponding +machine-readable source code for the Library including whatever +changes were used in the work (which must be distributed under +Sections 1 and 2 above); and, if the work is an executable linked +with the Library, with the complete machine-readable “work that +uses the Library”, as object code and/or source code, so that the +user can modify the Library and then relink to produce a modified +executable containing the modified Library. (It is understood +that the user who changes the contents of definitions files in the +Library will not necessarily be able to recompile the application +to use the modified definitions.) +* **b)** Use a suitable shared library mechanism for linking with the +Library. A suitable mechanism is one that (1) uses at run time a +copy of the library already present on the user's computer system, +rather than copying library functions into the executable, and (2) +will operate properly with a modified version of the library, if +the user installs one, as long as the modified version is +interface-compatible with the version that the work was made with. +* **c)** Accompany the work with a written offer, valid for at +least three years, to give the same user the materials +specified in Subsection 6a, above, for a charge no more +than the cost of performing this distribution. +* **d)** If distribution of the work is made by offering access to copy +from a designated place, offer equivalent access to copy the above +specified materials from the same place. +* **e)** Verify that the user has already received a copy of these +materials or that you have already sent this user a copy. + +For an executable, the required form of the “work that uses the +Library” must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + +It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + +**7.** You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + +* **a)** Accompany the combined library with a copy of the same work +based on the Library, uncombined with any other library +facilities. This must be distributed under the terms of the +Sections above. +* **b)** Give prominent notice with the combined library of the fact +that part of it is a work based on the Library, and explaining +where to find the accompanying uncombined form of the same work. + +**8.** You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +**9.** You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +**10.** Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + +**11.** If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +**12.** If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + +**13.** The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +“any later version”, you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + +**14.** If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + +### NO WARRANTY + +**15.** BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY “AS IS” WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +**16.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +_END OF TERMS AND CONDITIONS_ diff --git a/adodb/README.md b/adodb/README.md new file mode 100644 index 0000000..e432b2f --- /dev/null +++ b/adodb/README.md @@ -0,0 +1,102 @@ +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) +[![Download ADOdb](https://img.shields.io/sourceforge/dm/adodb.svg)](https://sourceforge.net/projects/adodb/files/latest/download) + +(c) 2000-2013 John Lim (jlim@natsoft.com) +(c) 2014 Damien Regad, Mark Newnham and the + [ADOdb community](https://github.com/ADOdb/ADOdb/graphs/contributors) + +The ADOdb Library is dual-licensed, released under both the +[BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license) +and the +[GNU Lesser General Public Licence (LGPL) v2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license) +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: https://adodb.org/ + + +Introduction +============ + +PHP's database access functions are not standardized. This creates a +need for a database class library to hide the differences between the +different databases (encapsulate the differences) so we can easily +switch databases. + +The library currently supports MySQL, 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. + + +Installation +============ + +Unpack all the files into a directory accessible by your web server. + +To test, try modifying some of the tutorial examples. +Make sure you customize the connection settings correctly. + +You can debug using: + +``` php +debug = true; +$db->connect($server, $user, $password, $database); +$rs = $db->execute('select * from some_small_table'); +print "
";
+print_r($rs->getRows());
+print "
"; +``` + + +Documentation and Examples +========================== + +Refer to the [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](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](https://adodb.org/dokuwiki/doku.php?id=v5:userguide:mysql_tutorial) that contrasts ADOdb code with PHP native MySQL code. + + +Files +===== + +- `adodb.inc.php` is the library's main file. You only need to include this file. +- `adodb-*.inc.php` are the database specific driver code. +- `adodb-session.php` is the PHP4 session handling code. +- `test.php` contains a list of test commands to exercise the class library. +- `testdatabases.inc.php` contains the list of databases to apply the tests on. +- `Benchmark.php` is a simple benchmark to test the throughput of a SELECT +statement for databases described in testdatabases.inc.php. The benchmark +tables are created in test.php. + + +Support +======= + +To discuss with the ADOdb development team and users, connect to our +[Gitter chatroom](https://gitter.im/adodb/adodb) using your Github credentials. + +Please report bugs, issues and feature requests on Github: + +https://github.com/ADOdb/ADOdb/issues + +You may also find legacy issues in + +- the [SourceForge tickets section](http://sourceforge.net/p/adodb/_list/tickets) + +However, please note that they are not actively monitored and should +only be used as reference. diff --git a/adodb/adodb-active-record.inc.php b/adodb/adodb-active-record.inc.php index c5c6cb7..8f3b005 100644 --- a/adodb/adodb-active-record.inc.php +++ b/adodb/adodb-active-record.inc.php @@ -1,27 +1,36 @@ _dbat $_ADODB_ACTIVE_DBS = array(); - +$ACTIVE_RECORD_SAFETY = true; +$ADODB_ACTIVE_DEFVALS = false; +$ADODB_ACTIVE_CACHESECS = 0; class ADODB_Active_DB { var $db; // ADOConnection @@ -33,28 +42,45 @@ class ADODB_Active_Table { var $flds; // assoc array of adofieldobjs, indexed by fieldname var $keys; // assoc array of primary keys, indexed by fieldname var $_created; // only used when stored as a cached file + var $_belongsTo = array(); + var $_hasMany = array(); } +// $db = database connection +// $index = name of index - can be associative, for an example see +// PHPLens Issue No: 17790 // returns index into $_ADODB_ACTIVE_DBS -function ADODB_SetDatabaseAdapter(&$db) +function ADODB_SetDatabaseAdapter(&$db, $index=false) { global $_ADODB_ACTIVE_DBS; - - foreach($_ADODB_ACTIVE_DBS as $k => $d) { - if ($d->db == $db) return $k; - } - - $obj = new ADODB_Active_DB(); - $obj->db =& $db; - $obj->tables = array(); - - $_ADODB_ACTIVE_DBS[] = $obj; - - return sizeof($_ADODB_ACTIVE_DBS)-1; + + foreach($_ADODB_ACTIVE_DBS as $k => $d) { + if($d->db === $db) { + return $k; + } + } + + $obj = new ADODB_Active_DB(); + $obj->db = $db; + $obj->tables = array(); + + if ($index == false) { + $index = sizeof($_ADODB_ACTIVE_DBS); + } + + $_ADODB_ACTIVE_DBS[$index] = $obj; + + return sizeof($_ADODB_ACTIVE_DBS)-1; } class ADODB_Active_Record { + static $_changeNames = true; // dynamically pluralize table names + + /** @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] var $_table; // tablename, if set in class definition then use it as table name var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat] @@ -62,104 +88,338 @@ class ADODB_Active_Record { var $_saved = false; // indicates whether data is already inserted. var $_lasterr = false; // last error message var $_original = false; // the original values loaded or inserted, refreshed on update - + + var $foreignName; // CFR: class name when in a relationship + + var $lockMode = ' for update '; // you might want to change to + + static function UseDefaultValues($bool=null) + { + global $ADODB_ACTIVE_DEFVALS; + if (isset($bool)) { + $ADODB_ACTIVE_DEFVALS = $bool; + } + return $ADODB_ACTIVE_DEFVALS; + } + // should be static - function SetDatabaseAdapter(&$db) + static function SetDatabaseAdapter(&$db, $index=false) { - return ADODB_SetDatabaseAdapter($db); + return ADODB_SetDatabaseAdapter($db, $index); } - - // php4 constructor - function ADODB_Active_Record($table = false, $pkeyarr=false, $db=false) + + + public function __set($name, $value) { - ADODB_Active_Record::__construct($table,$pkeyarr,$db); + $name = str_replace(' ', '_', $name); + $this->$name = $value; } - + // php5 constructor function __construct($table = false, $pkeyarr=false, $db=false) { - global $ADODB_ASSOC_CASE,$_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; $pkeyarr = false; } - - if (!$table) { - if (!empty($this->_table)) $table = $this->_table; + + if (!$table) { + if (!empty($this->_table)) { + $table = $this->_table; + } else $table = $this->_pluralize(get_class($this)); } + $this->foreignName = strtolower(get_class($this)); // CFR: default foreign name if ($db) { $this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db); - } else - $this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1; - - - if ($this->_dbat < 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor'); - + } else if (!isset($this->_dbat)) { + if (sizeof($_ADODB_ACTIVE_DBS) == 0) { + $this->Error( + "No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)", + 'ADODB_Active_Record::__constructor' + ); + } + end($_ADODB_ACTIVE_DBS); + $this->_dbat = key($_ADODB_ACTIVE_DBS); + } + $this->_table = $table; $this->_tableat = $table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future + $this->UpdateActiveTable($pkeyarr); } - + function __wakeup() { $class = get_class($this); new $class; } - + function _pluralize($table) { + if (!ADODB_Active_Record::$_changeNames) { + return $table; + } + $ut = strtoupper($table); $len = strlen($table); $lastc = $ut[$len-1]; $lastc2 = substr($ut,$len-2); switch ($lastc) { case 'S': - return $table.'es'; + return $table.'es'; case 'Y': return substr($table,0,$len-1).'ies'; - case 'X': + case 'X': return $table.'es'; - case 'H': - if ($lastc2 == 'CH' || $lastc2 == 'SH') + case 'H': + if ($lastc2 == 'CH' || $lastc2 == 'SH') { return $table.'es'; + } default: return $table.'s'; } } - + + // CFR Lamest singular inflector ever - @todo Make it real! + // Note: There is an assumption here...and it is that the argument's length >= 4 + function _singularize($tables) + { + + if (!ADODB_Active_Record::$_changeNames) { + return $table; + } + + $ut = strtoupper($tables); + $len = strlen($tables); + if($ut[$len-1] != 'S') { + return $tables; // I know...forget oxen + } + if($ut[$len-2] != 'E') { + return substr($tables, 0, $len-1); + } + switch($ut[$len-3]) { + case 'S': + case 'X': + return substr($tables, 0, $len-2); + case 'I': + return substr($tables, 0, $len-3) . 'y'; + case 'H'; + if($ut[$len-4] == 'C' || $ut[$len-4] == 'S') { + return substr($tables, 0, $len-2); + } + default: + return substr($tables, 0, $len-1); // ? + } + } + + function hasMany($foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') + { + $ar = new $foreignClass($foreignRef); + $ar->foreignName = $foreignRef; + $ar->UpdateActiveTable(); + $ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix; + $table =& $this->TableInfo(); + $table->_hasMany[$foreignRef] = $ar; + # $this->$foreignRef = $this->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get() + } + + // use when you don't want ADOdb to auto-pluralize tablename + static function TableHasMany($table, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') + { + $ar = new ADODB_Active_Record($table); + $ar->hasMany($foreignRef, $foreignKey, $foreignClass); + } + + // use when you don't want ADOdb to auto-pluralize tablename + static function TableKeyHasMany($table, $tablePKey, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') + { + if (!is_array($tablePKey)) { + $tablePKey = array($tablePKey); + } + $ar = new ADODB_Active_Record($table,$tablePKey); + $ar->hasMany($foreignRef, $foreignKey, $foreignClass); + } + + + // use when you want ADOdb to auto-pluralize tablename for you. Note that the class must already be defined. + // e.g. class Person will generate relationship for table Persons + static function ClassHasMany($parentclass, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') + { + $ar = new $parentclass(); + $ar->hasMany($foreignRef, $foreignKey, $foreignClass); + } + + + function belongsTo($foreignRef,$foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') + { + global $inflector; + + $ar = new $parentClass($this->_pluralize($foreignRef)); + $ar->foreignName = $foreignRef; + $ar->parentKey = $parentKey; + $ar->UpdateActiveTable(); + $ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix; + + $table =& $this->TableInfo(); + $table->_belongsTo[$foreignRef] = $ar; + # $this->$foreignRef = $this->_belongsTo[$foreignRef]; + } + + static function ClassBelongsTo($class, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') + { + $ar = new $class(); + $ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass); + } + + static function TableBelongsTo($table, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') + { + $ar = new ADOdb_Active_Record($table); + $ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass); + } + + static function TableKeyBelongsTo($table, $tablePKey, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') + { + if (!is_array($tablePKey)) { + $tablePKey = array($tablePKey); + } + $ar = new ADOdb_Active_Record($table, $tablePKey); + $ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass); + } + + + /** + * __get Access properties - used for lazy loading + * + * @param mixed $name + * @access protected + * @return mixed + */ + function __get($name) + { + return $this->LoadRelations($name, '', -1, -1); + } + + /** + * @param string $name + * @param string $whereOrderBy : eg. ' AND field1 = value ORDER BY field2' + * @param offset + * @param limit + * @return mixed + */ + function LoadRelations($name, $whereOrderBy='', $offset=-1,$limit=-1) + { + $extras = array(); + $table = $this->TableInfo(); + if ($limit >= 0) { + $extras['limit'] = $limit; + } + if ($offset >= 0) { + $extras['offset'] = $offset; + } + + if (strlen($whereOrderBy)) { + if (!preg_match('/^[ \n\r]*AND/i', $whereOrderBy)) { + if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i', $whereOrderBy)) { + $whereOrderBy = 'AND ' . $whereOrderBy; + } + } + } + + if(!empty($table->_belongsTo[$name])) { + $obj = $table->_belongsTo[$name]; + $columnName = $obj->foreignKey; + if(empty($this->$columnName)) { + $this->$name = null; + } + else { + if ($obj->parentKey) { + $key = $obj->parentKey; + } + else { + $key = reset($table->keys); + } + + $arrayOfOne = $obj->Find($key.'='.$this->$columnName.' '.$whereOrderBy,false,false,$extras); + if ($arrayOfOne) { + $this->$name = $arrayOfOne[0]; + return $arrayOfOne[0]; + } + } + } + if(!empty($table->_hasMany[$name])) { + $obj = $table->_hasMany[$name]; + $key = reset($table->keys); + $id = @$this->$key; + if (!is_numeric($id)) { + $db = $this->DB(); + $id = $db->qstr($id); + } + $objs = $obj->Find($obj->foreignKey.'='.$id. ' '.$whereOrderBy,false,false,$extras); + if (!$objs) { + $objs = array(); + } + $this->$name = $objs; + return $objs; + } + + return array(); + } ////////////////////////////////// - + // update metadata function UpdateActiveTable($pkeys=false,$forceUpdate=false) { - global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; - - $activedb =& $_ADODB_ACTIVE_DBS[$this->_dbat]; + global $_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; + global $ADODB_ACTIVE_DEFVALS,$ADODB_FETCH_MODE; + + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; $table = $this->_table; $tables = $activedb->tables; $tableat = $this->_tableat; if (!$forceUpdate && !empty($tables[$tableat])) { - $tobj =& $tables[$tableat]; - foreach($tobj->flds as $name => $fld) - $this->$name = null; + + $acttab = $tables[$tableat]; + foreach($acttab->flds as $name => $fld) { + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) { + $this->$name = $fld->default_value; + } + else { + $this->$name = null; + } + } return; } - - $db =& $activedb->db; + $db = $activedb->db; $fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache'; if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) { $fp = fopen($fname,'r'); @flock($fp, LOCK_SH); $acttab = unserialize(fread($fp,100000)); fclose($fp); - if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { + if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { // abs(rand()) randomizes deletion, reducing contention to delete/refresh file // ideally, you should cache at least 32 secs + + foreach($acttab->flds as $name => $fld) { + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) { + $this->$name = $fld->default_value; + } + else { + $this->$name = null; + } + } + $activedb->tables[$table] = $acttab; - + //if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname"); return; } else if ($db->debug) { @@ -168,11 +428,22 @@ function UpdateActiveTable($pkeys=false,$forceUpdate=false) } $activetab = new ADODB_Active_Table(); $activetab->name = $table; - - + + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; + if ($db->fetchMode !== false) { + $savem = $db->SetFetchMode(false); + } + $cols = $db->MetaColumns($table); + + if (isset($savem)) { + $db->SetFetchMode($savem); + } + $ADODB_FETCH_MODE = $save; + if (!$cols) { - $this->Error("Invalid table name: $table",'UpdateActiveTable'); + $this->Error("Invalid table name: $table",'UpdateActiveTable'); return false; } $fld = reset($cols); @@ -180,186 +451,293 @@ function UpdateActiveTable($pkeys=false,$forceUpdate=false) if (isset($fld->primary_key)) { $pkeys = array(); foreach($cols as $name => $fld) { - if (!empty($fld->primary_key)) $pkeys[] = $name; + if (!empty($fld->primary_key)) { + $pkeys[] = $name; + } } - } else + } else $pkeys = $this->GetPrimaryKeys($db, $table); } if (empty($pkeys)) { $this->Error("No primary key found for table $table",'UpdateActiveTable'); return false; } - + $attr = array(); $keys = array(); - - switch($ADODB_ASSOC_CASE) { - case 0: + + switch (ADODB_ASSOC_CASE) { + case ADODB_ASSOC_CASE_LOWER: foreach($cols as $name => $fldobj) { $name = strtolower($name); - $this->$name = null; + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) { + $this->$name = $fldobj->default_value; + } + else { + $this->$name = null; + } $attr[$name] = $fldobj; } foreach($pkeys as $k => $name) { $keys[strtolower($name)] = strtolower($name); } break; - - case 1: + + case ADODB_ASSOC_CASE_UPPER: foreach($cols as $name => $fldobj) { $name = strtoupper($name); - $this->$name = null; + + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) { + $this->$name = $fldobj->default_value; + } + else { + $this->$name = null; + } $attr[$name] = $fldobj; } - + foreach($pkeys as $k => $name) { $keys[strtoupper($name)] = strtoupper($name); } break; default: foreach($cols as $name => $fldobj) { - $name = ($name); - $this->$name = null; + + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) { + $this->$name = $fldobj->default_value; + } + else { + $this->$name = null; + } $attr[$name] = $fldobj; } foreach($pkeys as $k => $name) { - $keys[$name] = ($name); + $keys[$name] = $cols[strtoupper($name)]->name; } break; } - + $activetab->keys = $keys; $activetab->flds = $attr; if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) { $activetab->_created = time(); $s = serialize($activetab); - if (!function_exists('adodb_write_file')) include(ADODB_DIR.'/adodb-csvlib.inc.php'); + if (!function_exists('adodb_write_file')) { + include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); + } adodb_write_file($fname,$s); } + if (isset($activedb->tables[$table])) { + $oldtab = $activedb->tables[$table]; + + if ($oldtab) { + $activetab->_belongsTo = $oldtab->_belongsTo; + $activetab->_hasMany = $oldtab->_hasMany; + } + } $activedb->tables[$table] = $activetab; } - + function GetPrimaryKeys(&$db, $table) { return $db->MetaPrimaryKeys($table); } - - // error handler for both PHP4+5. + + // error handler for both PHP4+5. function Error($err,$fn) { global $_ADODB_ACTIVE_DBS; - + $fn = get_class($this).'::'.$fn; $this->_lasterr = $fn.': '.$err; - - if ($this->_dbat < 0) $db = false; + + if ($this->_dbat < 0) { + $db = false; + } else { $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; - $db =& $activedb->db; + $db = $activedb->db; } - - if (function_exists('adodb_throw')) { - if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false); - else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db); - } else - if (!$db || $db->debug) ADOConnection::outp($this->_lasterr); - + + if (function_exists('adodb_throw')) { + if (!$db) { + adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false); + } + else { + adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db); + } + } else { + if (!$db || $db->debug) { + ADOConnection::outp($this->_lasterr); + } + } + } - + // return last error message function ErrorMsg() { if (!function_exists('adodb_throw')) { - if ($this->_dbat < 0) $db = false; - else $db = $this->DB(); - + if ($this->_dbat < 0) { + $db = false; + } + else { + $db = $this->DB(); + } + // last error could be database error too - if ($db && $db->ErrorMsg()) return $db->ErrorMsg(); + if ($db && $db->ErrorMsg()) { + return $db->ErrorMsg(); + } } return $this->_lasterr; } - + + function ErrorNo() + { + if ($this->_dbat < 0) { + return -9999; // no database connection... + } + $db = $this->DB(); + + return (int) $db->ErrorNo(); + } + + // retrieve ADOConnection from _ADODB_Active_DBs - function &DB() + function DB() { global $_ADODB_ACTIVE_DBS; - + if ($this->_dbat < 0) { $false = false; $this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB"); return $false; } $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; - $db =& $activedb->db; + $db = $activedb->db; return $db; } - + // retrieve ADODB_Active_Table function &TableInfo() { global $_ADODB_ACTIVE_DBS; - $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; - $table =& $activedb->tables[$this->_tableat]; + $table = $activedb->tables[$this->_tableat]; return $table; } - + + + // I have an ON INSERT trigger on a table that sets other columns in the table. + // So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook + function Reload() + { + $db = $this->DB(); + if (!$db) { + return false; + } + $table = $this->TableInfo(); + $where = $this->GenWhere($db, $table); + return($this->Load($where)); + } + + // set a numeric array (using natural table field ordering) as object properties function Set(&$row) { - $db =& $this->DB(); - + global $ACTIVE_RECORD_SAFETY; + + $db = $this->DB(); + if (!$row) { - $this->_saved = false; + $this->_saved = false; return false; } - + $this->_saved = true; - - $table =& $this->TableInfo(); - if (sizeof($table->flds) != sizeof($row)) { + + $table = $this->TableInfo(); + if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) { + # + $bad_size = TRUE; + if (sizeof($row) == 2 * sizeof($table->flds)) { + // Only keep string keys + $keys = array_filter(array_keys($row), 'is_string'); + if (sizeof($keys) == sizeof($table->flds)) { + $bad_size = FALSE; + } + } + if ($bad_size) { $this->Error("Table structure of $this->_table has changed","Load"); return false; } - - $cnt = 0; + # + } + else + $keys = array_keys($row); + + # + reset($keys); + $this->_original = array(); foreach($table->flds as $name=>$fld) { - $this->$name = $row[$cnt]; - $cnt += 1; + $value = $row[current($keys)]; + $this->$name = $value; + $this->_original[] = $value; + next($keys); } - $this->_original = $row; + + # return true; } - + // get last inserted id for INSERT function LastInsertID(&$db,$fieldname) { - if ($db->hasInsertID) + if ($db->hasInsertID) { $val = $db->Insert_ID($this->_table,$fieldname); - else + } + else { $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; } - + // quote data in where clause function doquote(&$db, $val,$t) { switch($t) { + case 'L': + if (strpos($db->databaseType,'postgres') !== false) { + return $db->qstr($val); + } case 'D': case 'T': - if (empty($val)) return 'null'; - + if (empty($val)) { + return 'null'; + } + case 'B': + case 'N': case 'C': case 'X': - if (is_null($val)) return 'null'; - - if (strncmp($val,"'",1) != 0 && substr($val,strlen($val)-1,1) != "'") { + if (is_null($val)) { + return 'null'; + } + + if (strlen($val)>0 && + (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'") + ) { return $db->qstr($val); break; } @@ -368,78 +746,155 @@ function doquote(&$db, $val,$t) break; } } - + // generate where clause for an UPDATE/SELECT function GenWhere(&$db, &$table) { $keys = $table->keys; $parr = array(); - + foreach($keys as $k) { $f = $table->flds[$k]; if ($f) { - $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); } - - + + + function _QName($n,$db=false) + { + if (!ADODB_Active_Record::$_quoteNames) { + return $n; + } + if (!$db) { + $db = $this->DB(); + if (!$db) { + return false; + } + } + return $db->nameQuote.$n.$db->nameQuote; + } + //------------------------------------------------------------ Public functions below - - function Load($where,$bindarr=false) + + function Load($where=null,$bindarr=false, $lock = false) { - $db =& $this->DB(); if (!$db) return false; + global $ADODB_FETCH_MODE; + + $db = $this->DB(); + if (!$db) { + return false; + } $this->_where = $where; - - $save = $db->SetFetchMode(ADODB_FETCH_NUM); - $row = $db->GetRow("select * from ".$this->_table.' WHERE '.$where,$bindarr); - $db->SetFetchMode($save); - + + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + if ($db->fetchMode !== false) { + $savem = $db->SetFetchMode(false); + } + + $qry = sprintf("SELECT * FROM %s", + $this->nameQuoter($db,$this->_table) + ); + + if($where) { + $qry .= ' WHERE '.$where; + } + if ($lock) { + $qry .= $this->lockMode; + } + + $row = $db->GetRow($qry,$bindarr); + + if (isset($savem)) { + $db->SetFetchMode($savem); + } + $ADODB_FETCH_MODE = $save; + return $this->Set($row); } - + + function LoadLocked($where=null, $bindarr=false) + { + $this->Load($where,$bindarr,true); + } + + # useful for multiple record inserts + # see PHPLens Issue No: 17795 + function Reset() + { + $this->_where=null; + $this->_saved = false; + $this->_lasterr = false; + $this->_original = false; + $vars=get_object_vars($this); + foreach($vars as $k=>$v){ + if(substr($k,0,1)!=='_'){ + $this->{$k}=null; + } + } + $this->foreignName=strtolower(get_class($this)); + return true; + } + // false on error function Save() { - if ($this->_saved) $ok = $this->Update(); - else $ok = $this->Insert(); - + if ($this->_saved) { + $ok = $this->Update(); + } + else { + $ok = $this->Insert(); + } + return $ok; } - + + // false on error function Insert() { - $db =& $this->DB(); if (!$db) return false; + $db = $this->DB(); + if (!$db) { + return false; + } $cnt = 0; - $table =& $this->TableInfo(); - + $table = $this->TableInfo(); + $valarr = array(); $names = array(); $valstr = array(); foreach($table->flds as $name=>$fld) { $val = $this->$name; - if(!is_null($val) || !array_key_exists($name, $table->keys)) { + if(!is_array($val) || !is_null($val) || !array_key_exists($name, $table->keys)) { $valarr[] = $val; - $names[] = $name; + $names[] = $this->nameQuoter($db,$name); $valstr[] = $db->Param($cnt); $cnt += 1; } } - + 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) { $this->_saved = true; $autoinc = false; @@ -454,47 +909,63 @@ function Insert() $this->$k = $this->LastInsertID($db,$k); } } - + $this->_original = $valarr; return !empty($ok); } - + function Delete() { - $db =& $this->DB(); if (!$db) return false; - $table =& $this->TableInfo(); - + $db = $this->DB(); + if (!$db) { + return false; + } + $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; } - + // returns an array of active record objects - function &Find($whereOrderBy,$bindarr=false,$pkeysArr=false) + function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()) { - $db =& $this->DB(); if (!$db || empty($this->_table)) return false; - $arr =& $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr); + $db = $this->DB(); + if (!$db || empty($this->_table)) { + return false; + } + $arr = $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr,$extra); return $arr; } - + // returns 0 on error, 1 on update, 2 on insert function Replace() { - global $ADODB_ASSOC_CASE; - - $db =& $this->DB(); if (!$db) return false; - $table =& $this->TableInfo(); - + $db = $this->DB(); + if (!$db) { + return false; + } + $table = $this->TableInfo(); + $pkey = $table->keys; - + foreach($table->flds as $name=>$fld) { $val = $this->$name; /* if (is_null($val)) { if (isset($fld->not_null) && $fld->not_null) { - if (isset($fld->default_value) && strlen($fld->default_value)) continue; + if (isset($fld->default_value) && strlen($fld->default_value)) { + continue; + } else { $this->Error("Cannot update null into $name","Replace"); return false; @@ -502,24 +973,48 @@ function Replace() } }*/ if (is_null($val) && !empty($fld->auto_increment)) { - continue; - } + continue; + } + + if (is_array($val)) { + continue; + } + $t = $db->MetaType($fld->type); $arr[$name] = $this->doquote($db,$val,$t); $valarr[] = $val; } - - if (!is_array($pkey)) $pkey = array($pkey); - - - if ($ADODB_ASSOC_CASE == 0) - foreach($pkey as $k => $v) - $pkey[$k] = strtolower($v); - elseif ($ADODB_ASSOC_CASE == 0) - foreach($pkey as $k => $v) - $pkey[$k] = strtoupper($v); - - $ok = $db->Replace($this->_table,$arr,$pkey); + + if (!is_array($pkey)) { + $pkey = array($pkey); + } + + switch (ADODB_ASSOC_CASE) { + case ADODB_ASSOC_CASE_LOWER: + foreach ($pkey as $k => $v) { + $pkey[$k] = strtolower($v); + } + break; + case ADODB_ASSOC_CASE_UPPER: + foreach ($pkey as $k => $v) { + $pkey[$k] = strtoupper($v); + } + break; + } + + $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) { @@ -535,25 +1030,28 @@ function Replace() $this->$k = $this->LastInsertID($db,$k); } } - - $this->_original =& $valarr; - } + + $this->_original = $valarr; + } return $ok; } // returns 0 on error, 1 on update, -1 if no change in data (no update) function Update() { - $db =& $this->DB(); if (!$db) return false; - $table =& $this->TableInfo(); - + $db = $this->DB(); + if (!$db) { + return false; + } + $table = $this->TableInfo(); + $where = $this->GenWhere($db, $table); - + if (!$where) { $this->error("Where missing for table $table", "Update"); return false; } - $valarr = array(); + $valarr = array(); $neworig = array(); $pairs = array(); $i = -1; @@ -562,47 +1060,151 @@ function Update() $i += 1; $val = $this->$name; $neworig[] = $val; - - if (isset($table->keys[$name])) { + + if (isset($table->keys[$name]) || is_array($val)) { continue; } - + if (is_null($val)) { if (isset($fld->not_null) && $fld->not_null) { - if (isset($fld->default_value) && strlen($fld->default_value)) continue; + if (isset($fld->default_value) && strlen($fld->default_value)) { + continue; + } else { $this->Error("Cannot set field $name to NULL","Update"); return false; } } } - - if (isset($this->_original[$i]) && $val == $this->_original[$i]) { + + if (isset($this->_original[$i]) && strcmp($val,$this->_original[$i]) == 0) { + continue; + } + + if (is_null($this->_original[$i]) && is_null($val)) { continue; - } + } + $valarr[] = $val; - $pairs[] = $name.'='.$db->Param($cnt); + $pairs[] = $this->nameQuoter($db,$name).'='.$db->Param($cnt); $cnt += 1; } - - - if (!$cnt) return -1; - $sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where; + + + if (!$cnt) { + return -1; + } + + $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; + $this->_original = $neworig; return 1; } return 0; } - + function GetAttributeNames() { - $table =& $this->TableInfo(); - if (!$table) return false; + $table = $this->TableInfo(); + if (!$table) { + return false; + } 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; + } + }; -?> \ No newline at end of file +function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr, $primkeyArr, + $extra) +{ +global $_ADODB_ACTIVE_DBS; + + + $save = $db->SetFetchMode(ADODB_FETCH_NUM); + + $qry = "select * from ".$table; + + if (!empty($whereOrderBy)) { + $qry .= ' WHERE '.$whereOrderBy; + } + if(isset($extra['limit'])) { + $rows = false; + if(isset($extra['offset'])) { + $rs = $db->SelectLimit($qry, $extra['limit'], $extra['offset'],$bindarr); + } else { + $rs = $db->SelectLimit($qry, $extra['limit'],-1,$bindarr); + } + if ($rs) { + while (!$rs->EOF) { + $rows[] = $rs->fields; + $rs->MoveNext(); + } + } + } else + $rows = $db->GetAll($qry,$bindarr); + + $db->SetFetchMode($save); + + $false = false; + + if ($rows === false) { + return $false; + } + + + if (!class_exists($class)) { + $db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); + return $false; + } + $arr = array(); + // 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 developers. + $arrRef = array(); + $bTos = array(); // Will store belongTo's indices if any + foreach($rows as $row) { + + $obj = new $class($table,$primkeyArr,$db); + if ($obj->ErrorNo()){ + $db->_errorMsg = $obj->ErrorMsg(); + return $false; + } + $obj->Set($row); + $arr[] = $obj; + } // foreach($rows as $row) + + return $arr; +} diff --git a/adodb/adodb-active-recordx.inc.php b/adodb/adodb-active-recordx.inc.php new file mode 100644 index 0000000..5de5b13 --- /dev/null +++ b/adodb/adodb-active-recordx.inc.php @@ -0,0 +1,1489 @@ +_dbat +$_ADODB_ACTIVE_DBS = array(); +$ACTIVE_RECORD_SAFETY = true; // CFR: disabled while playing with relations +$ADODB_ACTIVE_DEFVALS = false; + +class ADODB_Active_DB { + var $db; // ADOConnection + var $tables; // assoc array of ADODB_Active_Table objects, indexed by tablename +} + +class ADODB_Active_Table { + var $name; // table name + var $flds; // assoc array of adofieldobjs, indexed by fieldname + var $keys; // assoc array of primary keys, indexed by fieldname + var $_created; // only used when stored as a cached file + var $_belongsTo = array(); + var $_hasMany = array(); + var $_colsCount; // total columns count, including relations + + function updateColsCount() + { + $this->_colsCount = sizeof($this->flds); + foreach($this->_belongsTo as $foreignTable) + $this->_colsCount += sizeof($foreignTable->TableInfo()->flds); + foreach($this->_hasMany as $foreignTable) + $this->_colsCount += sizeof($foreignTable->TableInfo()->flds); + } +} + +// returns index into $_ADODB_ACTIVE_DBS +function ADODB_SetDatabaseAdapter(&$db) +{ + global $_ADODB_ACTIVE_DBS; + + foreach($_ADODB_ACTIVE_DBS as $k => $d) { + if ($d->db === $db) { + return $k; + } + } + + $obj = new ADODB_Active_DB(); + $obj->db = $db; + $obj->tables = array(); + + $_ADODB_ACTIVE_DBS[] = $obj; + + return sizeof($_ADODB_ACTIVE_DBS)-1; +} + + +class ADODB_Active_Record { + static $_changeNames = true; // dynamically pluralize table names + static $_foreignSuffix = '_id'; // + var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat] + var $_table; // tablename, if set in class definition then use it as table name + var $_sTable; // singularized table name + var $_pTable; // pluralized table name + var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat] + var $_where; // where clause set in Load() + var $_saved = false; // indicates whether data is already inserted. + var $_lasterr = false; // last error message + var $_original = false; // the original values loaded or inserted, refreshed on update + + var $foreignName; // CFR: class name when in a relationship + + static function UseDefaultValues($bool=null) + { + global $ADODB_ACTIVE_DEFVALS; + if (isset($bool)) { + $ADODB_ACTIVE_DEFVALS = $bool; + } + return $ADODB_ACTIVE_DEFVALS; + } + + // should be static + static function SetDatabaseAdapter(&$db) + { + return ADODB_SetDatabaseAdapter($db); + } + + + public function __set($name, $value) + { + $name = str_replace(' ', '_', $name); + $this->$name = $value; + } + + // php5 constructor + // Note: if $table is defined, then we will use it as our table name + // Otherwise we will use our classname... + // In our database, table names are pluralized (because there can be + // more than one row!) + // Similarly, if $table is defined here, it has to be plural form. + // + // $options is an array that allows us to tweak the constructor's behaviour + // if $options['refresh'] is true, we re-scan our metadata information + // if $options['new'] is true, we forget all relations + function __construct($table = false, $pkeyarr=false, $db=false, $options=array()) + { + global $_ADODB_ACTIVE_DBS; + + if ($db == false && is_object($pkeyarr)) { + $db = $pkeyarr; + $pkeyarr = false; + } + + if($table) { + // table argument exists. It is expected to be + // already plural form. + $this->_pTable = $table; + $this->_sTable = $this->_singularize($this->_pTable); + } + else { + // We will use current classname as table name. + // We need to pluralize it for the real table name. + $this->_sTable = strtolower(get_class($this)); + $this->_pTable = $this->_pluralize($this->_sTable); + } + $this->_table = &$this->_pTable; + + $this->foreignName = $this->_sTable; // CFR: default foreign name (singular) + + if ($db) { + $this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db); + } else + $this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1; + + + if ($this->_dbat < 0) { + $this->Error( + "No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)", + 'ADODB_Active_Record::__constructor' + ); + } + + $this->_tableat = $this->_table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future + + // CFR: Just added this option because UpdateActiveTable() can refresh its information + // but there was no way to ask it to do that. + $forceUpdate = (isset($options['refresh']) && true === $options['refresh']); + $this->UpdateActiveTable($pkeyarr, $forceUpdate); + if(isset($options['new']) && true === $options['new']) { + $table =& $this->TableInfo(); + unset($table->_hasMany); + unset($table->_belongsTo); + $table->_hasMany = array(); + $table->_belongsTo = array(); + } + } + + function __wakeup() + { + $class = get_class($this); + new $class; + } + + // CFR: Constants found in Rails + static $IrregularP = array( + 'PERSON' => 'people', + 'MAN' => 'men', + 'WOMAN' => 'women', + 'CHILD' => 'children', + 'COW' => 'kine', + ); + + static $IrregularS = array( + 'PEOPLE' => 'PERSON', + 'MEN' => 'man', + 'WOMEN' => 'woman', + 'CHILDREN' => 'child', + 'KINE' => 'cow', + ); + + static $WeIsI = array( + 'EQUIPMENT' => true, + 'INFORMATION' => true, + 'RICE' => true, + 'MONEY' => true, + 'SPECIES' => true, + 'SERIES' => true, + 'FISH' => true, + 'SHEEP' => true, + ); + + function _pluralize($table) + { + if (!ADODB_Active_Record::$_changeNames) { + return $table; + } + $ut = strtoupper($table); + if(isset(self::$WeIsI[$ut])) { + return $table; + } + if(isset(self::$IrregularP[$ut])) { + return self::$IrregularP[$ut]; + } + $len = strlen($table); + $lastc = $ut[$len-1]; + $lastc2 = substr($ut,$len-2); + switch ($lastc) { + case 'S': + return $table.'es'; + case 'Y': + return substr($table,0,$len-1).'ies'; + case 'X': + return $table.'es'; + case 'H': + if ($lastc2 == 'CH' || $lastc2 == 'SH') { + return $table.'es'; + } + default: + return $table.'s'; + } + } + + // CFR Lamest singular inflector ever - @todo Make it real! + // Note: There is an assumption here...and it is that the argument's length >= 4 + function _singularize($table) + { + + if (!ADODB_Active_Record::$_changeNames) { + return $table; + } + $ut = strtoupper($table); + if(isset(self::$WeIsI[$ut])) { + return $table; + } + if(isset(self::$IrregularS[$ut])) { + return self::$IrregularS[$ut]; + } + $len = strlen($table); + if($ut[$len-1] != 'S') { + return $table; // I know...forget oxen + } + if($ut[$len-2] != 'E') { + return substr($table, 0, $len-1); + } + switch($ut[$len-3]) { + case 'S': + case 'X': + return substr($table, 0, $len-2); + case 'I': + return substr($table, 0, $len-3) . 'y'; + case 'H'; + if($ut[$len-4] == 'C' || $ut[$len-4] == 'S') { + return substr($table, 0, $len-2); + } + default: + return substr($table, 0, $len-1); // ? + } + } + + /* + * ar->foreignName will contain the name of the tables associated with this table because + * these other tables' rows may also be referenced by this table using theirname_id or the provided + * foreign keys (this index name is stored in ar->foreignKey) + * + * this-table.id = other-table-#1.this-table_id + * = other-table-#2.this-table_id + */ + function hasMany($foreignRef,$foreignKey=false) + { + $ar = new ADODB_Active_Record($foreignRef); + $ar->foreignName = $foreignRef; + $ar->UpdateActiveTable(); + $ar->foreignKey = ($foreignKey) ? $foreignKey : strtolower(get_class($this)) . self::$_foreignSuffix; + + $table =& $this->TableInfo(); + if(!isset($table->_hasMany[$foreignRef])) { + $table->_hasMany[$foreignRef] = $ar; + $table->updateColsCount(); + } +# @todo Can I make this guy be lazy? + $this->$foreignRef = $table->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get() + } + + /** + * ar->foreignName will contain the name of the tables associated with this table because + * this table's rows may also be referenced by those tables using thistable_id or the provided + * foreign keys (this index name is stored in ar->foreignKey) + * + * this-table.other-table_id = other-table.id + */ + function belongsTo($foreignRef,$foreignKey=false) + { + global $inflector; + + $ar = new ADODB_Active_Record($this->_pluralize($foreignRef)); + $ar->foreignName = $foreignRef; + $ar->UpdateActiveTable(); + $ar->foreignKey = ($foreignKey) ? $foreignKey : $ar->foreignName . self::$_foreignSuffix; + + $table =& $this->TableInfo(); + if(!isset($table->_belongsTo[$foreignRef])) { + $table->_belongsTo[$foreignRef] = $ar; + $table->updateColsCount(); + } + $this->$foreignRef = $table->_belongsTo[$foreignRef]; + } + + /** + * __get Access properties - used for lazy loading + * + * @param mixed $name + * @access protected + * @return void + */ + function __get($name) + { + return $this->LoadRelations($name, '', -1. -1); + } + + function LoadRelations($name, $whereOrderBy, $offset=-1, $limit=-1) + { + $extras = array(); + if($offset >= 0) { + $extras['offset'] = $offset; + } + if($limit >= 0) { + $extras['limit'] = $limit; + } + $table =& $this->TableInfo(); + + if (strlen($whereOrderBy)) { + if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy)) { + if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy)) { + $whereOrderBy = 'AND '.$whereOrderBy; + } + } + } + + if(!empty($table->_belongsTo[$name])) { + $obj = $table->_belongsTo[$name]; + $columnName = $obj->foreignKey; + if(empty($this->$columnName)) { + $this->$name = null; + } + else { + if(($k = reset($obj->TableInfo()->keys))) { + $belongsToId = $k; + } + else { + $belongsToId = 'id'; + } + + $arrayOfOne = + $obj->Find( + $belongsToId.'='.$this->$columnName.' '.$whereOrderBy, false, false, $extras); + $this->$name = $arrayOfOne[0]; + } + return $this->$name; + } + if(!empty($table->_hasMany[$name])) { + $obj = $table->_hasMany[$name]; + if(($k = reset($table->keys))) { + $hasManyId = $k; + } + else { + $hasManyId = 'id'; + } + + $this->$name = + $obj->Find( + $obj->foreignKey.'='.$this->$hasManyId.' '.$whereOrderBy, false, false, $extras); + return $this->$name; + } + } + ////////////////////////////////// + + // update metadata + function UpdateActiveTable($pkeys=false,$forceUpdate=false) + { + global $_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; + global $ADODB_ACTIVE_DEFVALS, $ADODB_FETCH_MODE; + + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + + $table = $this->_table; + $tables = $activedb->tables; + $tableat = $this->_tableat; + if (!$forceUpdate && !empty($tables[$tableat])) { + + $tobj = $tables[$tableat]; + foreach($tobj->flds as $name => $fld) { + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) { + $this->$name = $fld->default_value; + } + else { + $this->$name = null; + } + } + return; + } + + $db = $activedb->db; + $fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache'; + if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) { + $fp = fopen($fname,'r'); + @flock($fp, LOCK_SH); + $acttab = unserialize(fread($fp,100000)); + fclose($fp); + if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { + // abs(rand()) randomizes deletion, reducing contention to delete/refresh file + // ideally, you should cache at least 32 secs + $activedb->tables[$table] = $acttab; + + //if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname"); + return; + } else if ($db->debug) { + ADOConnection::outp("Refreshing cached active record file: $fname"); + } + } + $activetab = new ADODB_Active_Table(); + $activetab->name = $table; + + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; + if ($db->fetchMode !== false) { + $savem = $db->SetFetchMode(false); + } + + $cols = $db->MetaColumns($table); + + if (isset($savem)) { + $db->SetFetchMode($savem); + } + $ADODB_FETCH_MODE = $save; + + if (!$cols) { + $this->Error("Invalid table name: $table",'UpdateActiveTable'); + return false; + } + $fld = reset($cols); + if (!$pkeys) { + if (isset($fld->primary_key)) { + $pkeys = array(); + foreach($cols as $name => $fld) { + if (!empty($fld->primary_key)) { + $pkeys[] = $name; + } + } + } else { + $pkeys = $this->GetPrimaryKeys($db, $table); + } + } + if (empty($pkeys)) { + $this->Error("No primary key found for table $table",'UpdateActiveTable'); + return false; + } + + $attr = array(); + $keys = array(); + + switch (ADODB_ASSOC_CASE) { + case ADODB_ASSOC_CASE_LOWER: + foreach($cols as $name => $fldobj) { + $name = strtolower($name); + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) { + $this->$name = $fldobj->default_value; + } + else { + $this->$name = null; + } + $attr[$name] = $fldobj; + } + foreach($pkeys as $k => $name) { + $keys[strtolower($name)] = strtolower($name); + } + break; + + case ADODB_ASSOC_CASE_UPPER: + foreach($cols as $name => $fldobj) { + $name = strtoupper($name); + + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) { + $this->$name = $fldobj->default_value; + } + else { + $this->$name = null; + } + $attr[$name] = $fldobj; + } + + foreach($pkeys as $k => $name) { + $keys[strtoupper($name)] = strtoupper($name); + } + break; + default: + foreach($cols as $name => $fldobj) { + $name = ($fldobj->name); + + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) { + $this->$name = $fldobj->default_value; + } + else { + $this->$name = null; + } + $attr[$name] = $fldobj; + } + foreach($pkeys as $k => $name) { + $keys[$name] = $cols[$name]->name; + } + break; + } + + $activetab->keys = $keys; + $activetab->flds = $attr; + $activetab->updateColsCount(); + + if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) { + $activetab->_created = time(); + $s = serialize($activetab); + if (!function_exists('adodb_write_file')) { + include_once(ADODB_DIR.'/adodb-csvlib.inc.php'); + } + adodb_write_file($fname,$s); + } + if (isset($activedb->tables[$table])) { + $oldtab = $activedb->tables[$table]; + + if ($oldtab) { + $activetab->_belongsTo = $oldtab->_belongsTo; + $activetab->_hasMany = $oldtab->_hasMany; + } + } + $activedb->tables[$table] = $activetab; + } + + function GetPrimaryKeys(&$db, $table) + { + return $db->MetaPrimaryKeys($table); + } + + // error handler for both PHP4+5. + function Error($err,$fn) + { + global $_ADODB_ACTIVE_DBS; + + $fn = get_class($this).'::'.$fn; + $this->_lasterr = $fn.': '.$err; + + if ($this->_dbat < 0) { + $db = false; + } + else { + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $db = $activedb->db; + } + + if (function_exists('adodb_throw')) { + if (!$db) { + adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false); + } + else { + adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db); + } + } else { + if (!$db || $db->debug) { + ADOConnection::outp($this->_lasterr); + } + } + + } + + // return last error message + function ErrorMsg() + { + if (!function_exists('adodb_throw')) { + if ($this->_dbat < 0) { + $db = false; + } + else { + $db = $this->DB(); + } + + // last error could be database error too + if ($db && $db->ErrorMsg()) { + return $db->ErrorMsg(); + } + } + return $this->_lasterr; + } + + function ErrorNo() + { + if ($this->_dbat < 0) { + return -9999; // no database connection... + } + $db = $this->DB(); + + return (int) $db->ErrorNo(); + } + + + // retrieve ADOConnection from _ADODB_Active_DBs + function DB() + { + global $_ADODB_ACTIVE_DBS; + + if ($this->_dbat < 0) { + $false = false; + $this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB"); + return $false; + } + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $db = $activedb->db; + return $db; + } + + // retrieve ADODB_Active_Table + function &TableInfo() + { + global $_ADODB_ACTIVE_DBS; + + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $table = $activedb->tables[$this->_tableat]; + return $table; + } + + + // I have an ON INSERT trigger on a table that sets other columns in the table. + // So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook + function Reload() + { + $db =& $this->DB(); + if (!$db) { + return false; + } + $table =& $this->TableInfo(); + $where = $this->GenWhere($db, $table); + return($this->Load($where)); + } + + + // set a numeric array (using natural table field ordering) as object properties + function Set(&$row) + { + global $ACTIVE_RECORD_SAFETY; + + $db = $this->DB(); + + if (!$row) { + $this->_saved = false; + return false; + } + + $this->_saved = true; + + $table = $this->TableInfo(); + $sizeofFlds = sizeof($table->flds); + $sizeofRow = sizeof($row); + if ($ACTIVE_RECORD_SAFETY && $table->_colsCount != $sizeofRow && $sizeofFlds != $sizeofRow) { + # + $bad_size = TRUE; + if($sizeofRow == 2 * $table->_colsCount || $sizeofRow == 2 * $sizeofFlds) { + // Only keep string keys + $keys = array_filter(array_keys($row), 'is_string'); + if (sizeof($keys) == sizeof($table->flds)) { + $bad_size = FALSE; + } + } + if ($bad_size) { + $this->Error("Table structure of $this->_table has changed","Load"); + return false; + } + # + } + else { + $keys = array_keys($row); + } + + # + reset($keys); + $this->_original = array(); + foreach($table->flds as $name=>$fld) { + $value = $row[current($keys)]; + $this->$name = $value; + $this->_original[] = $value; + if(!next($keys)) { + break; + } + } + $table =& $this->TableInfo(); + foreach($table->_belongsTo as $foreignTable) { + $ft = $foreignTable->TableInfo(); + $propertyName = $ft->name; + foreach($ft->flds as $name=>$fld) { + $value = $row[current($keys)]; + $foreignTable->$name = $value; + $foreignTable->_original[] = $value; + if(!next($keys)) { + break; + } + } + } + foreach($table->_hasMany as $foreignTable) { + $ft = $foreignTable->TableInfo(); + foreach($ft->flds as $name=>$fld) { + $value = $row[current($keys)]; + $foreignTable->$name = $value; + $foreignTable->_original[] = $value; + if(!next($keys)) { + break; + } + } + } + # + + return true; + } + + // get last inserted id for INSERT + function LastInsertID(&$db,$fieldname) + { + if ($db->hasInsertID) { + $val = $db->Insert_ID($this->_table,$fieldname); + } + else { + $val = false; + } + + if (is_null($val) || $val === false) { + // this might not work reliably in multi-user environment + return $db->GetOne("select max(".$fieldname.") from ".$this->_table); + } + return $val; + } + + // quote data in where clause + function doquote(&$db, $val,$t) + { + switch($t) { + case 'D': + case 'T': + if (empty($val)) { + return 'null'; + } + case 'C': + case 'X': + if (is_null($val)) { + return 'null'; + } + if (strlen($val)>0 && + (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'") + ) { + return $db->qstr($val); + break; + } + default: + return $val; + break; + } + } + + // generate where clause for an UPDATE/SELECT + function GenWhere(&$db, &$table) + { + $keys = $table->keys; + $parr = array(); + + foreach($keys as $k) { + $f = $table->flds[$k]; + if ($f) { + $parr[] = $k.' = '.$this->doquote($db,$this->$k,$db->MetaType($f->type)); + } + } + return implode(' and ', $parr); + } + + + //------------------------------------------------------------ Public functions below + + function Load($where=null,$bindarr=false) + { + $db = $this->DB(); + if (!$db) { + return false; + } + $this->_where = $where; + + $save = $db->SetFetchMode(ADODB_FETCH_NUM); + $qry = "select * from ".$this->_table; + $table =& $this->TableInfo(); + + if(($k = reset($table->keys))) { + $hasManyId = $k; + } + else { + $hasManyId = 'id'; + } + + foreach($table->_belongsTo as $foreignTable) { + if(($k = reset($foreignTable->TableInfo()->keys))) { + $belongsToId = $k; + } + else { + $belongsToId = 'id'; + } + $qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '. + $this->_table.'.'.$foreignTable->foreignKey.'='. + $foreignTable->_table.'.'.$belongsToId; + } + foreach($table->_hasMany as $foreignTable) + { + $qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '. + $this->_table.'.'.$hasManyId.'='. + $foreignTable->_table.'.'.$foreignTable->foreignKey; + } + if($where) { + $qry .= ' WHERE '.$where; + } + + // Simple case: no relations. Load row and return. + if((count($table->_hasMany) + count($table->_belongsTo)) < 1) { + $row = $db->GetRow($qry,$bindarr); + if(!$row) { + return false; + } + $db->SetFetchMode($save); + return $this->Set($row); + } + + // More complex case when relations have to be collated + $rows = $db->GetAll($qry,$bindarr); + if(!$rows) { + return false; + } + $db->SetFetchMode($save); + if(count($rows) < 1) { + return false; + } + $class = get_class($this); + $isFirstRow = true; + + if(($k = reset($this->TableInfo()->keys))) { + $myId = $k; + } + else { + $myId = 'id'; + } + $index = 0; $found = false; + /** @todo Improve by storing once and for all in table metadata */ + /** @todo Also re-use info for hasManyId */ + foreach($this->TableInfo()->flds as $fld) { + if($fld->name == $myId) { + $found = true; + break; + } + $index++; + } + if(!$found) { + $this->outp_throw("Unable to locate key $myId for $class in Load()",'Load'); + } + + foreach($rows as $row) { + $rowId = intval($row[$index]); + if($rowId > 0) { + if($isFirstRow) { + $isFirstRow = false; + if(!$this->Set($row)) { + return false; + } + } + $obj = new $class($table,false,$db); + $obj->Set($row); + // TODO Copy/paste code below: bad! + if(count($table->_hasMany) > 0) { + foreach($table->_hasMany as $foreignTable) { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) { + if(!is_array($this->$foreignName)) { + $foreignObj = $this->$foreignName; + $this->$foreignName = array(clone($foreignObj)); + } + else { + $foreignObj = $obj->$foreignName; + array_push($this->$foreignName, clone($foreignObj)); + } + } + } + } + if(count($table->_belongsTo) > 0) { + foreach($table->_belongsTo as $foreignTable) { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) { + if(!is_array($this->$foreignName)) { + $foreignObj = $this->$foreignName; + $this->$foreignName = array(clone($foreignObj)); + } + else { + $foreignObj = $obj->$foreignName; + array_push($this->$foreignName, clone($foreignObj)); + } + } + } + } + } + } + return true; + } + + // false on error + function Save() + { + if ($this->_saved) { + $ok = $this->Update(); + } + else { + $ok = $this->Insert(); + } + + return $ok; + } + + // CFR: Sometimes we may wish to consider that an object is not to be replaced but inserted. + // Sample use case: an 'undo' command object (after a delete()) + function Dirty() + { + $this->_saved = false; + } + + // false on error + function Insert() + { + $db = $this->DB(); + if (!$db) { + return false; + } + $cnt = 0; + $table = $this->TableInfo(); + + $valarr = array(); + $names = array(); + $valstr = array(); + + foreach($table->flds as $name=>$fld) { + $val = $this->$name; + if(!is_null($val) || !array_key_exists($name, $table->keys)) { + $valarr[] = $val; + $names[] = $name; + $valstr[] = $db->Param($cnt); + $cnt += 1; + } + } + + if (empty($names)){ + foreach($table->flds as $name=>$fld) { + $valarr[] = null; + $names[] = $name; + $valstr[] = $db->Param($cnt); + $cnt += 1; + } + } + $sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')'; + $ok = $db->Execute($sql,$valarr); + + if ($ok) { + $this->_saved = true; + $autoinc = false; + foreach($table->keys as $k) { + if (is_null($this->$k)) { + $autoinc = true; + break; + } + } + if ($autoinc && sizeof($table->keys) == 1) { + $k = reset($table->keys); + $this->$k = $this->LastInsertID($db,$k); + } + } + + $this->_original = $valarr; + return !empty($ok); + } + + function Delete() + { + $db = $this->DB(); + if (!$db) { + return false; + } + $table = $this->TableInfo(); + + $where = $this->GenWhere($db,$table); + $sql = 'DELETE FROM '.$this->_table.' WHERE '.$where; + $ok = $db->Execute($sql); + + return $ok ? true : false; + } + + // returns an array of active record objects + function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()) + { + $db = $this->DB(); + if (!$db || empty($this->_table)) { + return false; + } + $table =& $this->TableInfo(); + $arr = $db->GetActiveRecordsClass(get_class($this),$this, $whereOrderBy,$bindarr,$pkeysArr,$extra, + array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany)); + return $arr; + } + + // CFR: In introduced this method to ensure that inner workings are not disturbed by + // subclasses...for instance when GetActiveRecordsClass invokes Find() + // Why am I not invoking parent::Find? + // Shockingly because I want to preserve PHP4 compatibility. + function packageFind($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()) + { + $db = $this->DB(); + if (!$db || empty($this->_table)) { + return false; + } + $table =& $this->TableInfo(); + $arr = $db->GetActiveRecordsClass(get_class($this),$this, $whereOrderBy,$bindarr,$pkeysArr,$extra, + array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany)); + return $arr; + } + + // returns 0 on error, 1 on update, 2 on insert + function Replace() + { + $db = $this->DB(); + if (!$db) { + return false; + } + $table = $this->TableInfo(); + + $pkey = $table->keys; + + foreach($table->flds as $name=>$fld) { + $val = $this->$name; + /* + if (is_null($val)) { + if (isset($fld->not_null) && $fld->not_null) { + if (isset($fld->default_value) && strlen($fld->default_value)) { + continue; + } + else { + $this->Error("Cannot update null into $name","Replace"); + return false; + } + } + }*/ + if (is_null($val) && !empty($fld->auto_increment)) { + continue; + } + $t = $db->MetaType($fld->type); + $arr[$name] = $this->doquote($db,$val,$t); + $valarr[] = $val; + } + + if (!is_array($pkey)) { + $pkey = array($pkey); + } + + + switch (ADODB_ASSOC_CASE) { + case ADODB_ASSOC_CASE_LOWER: + foreach($pkey as $k => $v) { + $pkey[$k] = strtolower($v); + } + break; + case ADODB_ASSOC_CASE_UPPER: + foreach($pkey as $k => $v) { + $pkey[$k] = strtoupper($v); + } + break; + } + + $ok = $db->Replace($this->_table,$arr,$pkey); + if ($ok) { + $this->_saved = true; // 1= update 2=insert + if ($ok == 2) { + $autoinc = false; + foreach($table->keys as $k) { + if (is_null($this->$k)) { + $autoinc = true; + break; + } + } + if ($autoinc && sizeof($table->keys) == 1) { + $k = reset($table->keys); + $this->$k = $this->LastInsertID($db,$k); + } + } + + $this->_original = $valarr; + } + return $ok; + } + + // returns 0 on error, 1 on update, -1 if no change in data (no update) + function Update() + { + $db = $this->DB(); + if (!$db) { + return false; + } + $table = $this->TableInfo(); + + $where = $this->GenWhere($db, $table); + + if (!$where) { + $this->error("Where missing for table $table", "Update"); + return false; + } + $valarr = array(); + $neworig = array(); + $pairs = array(); + $i = -1; + $cnt = 0; + foreach($table->flds as $name=>$fld) { + $i += 1; + $val = $this->$name; + $neworig[] = $val; + + if (isset($table->keys[$name])) { + continue; + } + + if (is_null($val)) { + if (isset($fld->not_null) && $fld->not_null) { + if (isset($fld->default_value) && strlen($fld->default_value)) { + continue; + } + else { + $this->Error("Cannot set field $name to NULL","Update"); + return false; + } + } + } + + if (isset($this->_original[$i]) && $val === $this->_original[$i]) { + continue; + } + $valarr[] = $val; + $pairs[] = $name.'='.$db->Param($cnt); + $cnt += 1; + } + + + if (!$cnt) { + return -1; + } + $sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where; + $ok = $db->Execute($sql,$valarr); + if ($ok) { + $this->_original = $neworig; + return 1; + } + return 0; + } + + function GetAttributeNames() + { + $table = $this->TableInfo(); + if (!$table) { + return false; + } + return array_keys($table->flds); + } + +}; + +function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bindarr, $primkeyArr, + $extra, $relations) +{ + global $_ADODB_ACTIVE_DBS; + + if (empty($extra['loading'])) { + $extra['loading'] = ADODB_LAZY_AR; + } + $save = $db->SetFetchMode(ADODB_FETCH_NUM); + $table = &$tableObj->_table; + $tableInfo =& $tableObj->TableInfo(); + if(($k = reset($tableInfo->keys))) { + $myId = $k; + } + else { + $myId = 'id'; + } + $index = 0; $found = false; + /** @todo Improve by storing once and for all in table metadata */ + /** @todo Also re-use info for hasManyId */ + foreach($tableInfo->flds as $fld) + { + if($fld->name == $myId) { + $found = true; + break; + } + $index++; + } + if(!$found) { + $db->outp_throw("Unable to locate key $myId for $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); + } + + $qry = "select * from ".$table; + if(ADODB_JOIN_AR == $extra['loading']) { + if(!empty($relations['belongsTo'])) { + foreach($relations['belongsTo'] as $foreignTable) { + if(($k = reset($foreignTable->TableInfo()->keys))) { + $belongsToId = $k; + } + else { + $belongsToId = 'id'; + } + + $qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '. + $table.'.'.$foreignTable->foreignKey.'='. + $foreignTable->_table.'.'.$belongsToId; + } + } + if(!empty($relations['hasMany'])) { + if(empty($relations['foreignName'])) { + $db->outp_throw("Missing foreignName is relation specification in GetActiveRecordsClass()",'GetActiveRecordsClass'); + } + if(($k = reset($tableInfo->keys))) { + $hasManyId = $k; + } + else { + $hasManyId = 'id'; + } + + foreach($relations['hasMany'] as $foreignTable) { + $qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '. + $table.'.'.$hasManyId.'='. + $foreignTable->_table.'.'.$foreignTable->foreignKey; + } + } + } + if (!empty($whereOrderBy)) { + $qry .= ' WHERE '.$whereOrderBy; + } + if(isset($extra['limit'])) { + $rows = false; + if(isset($extra['offset'])) { + $rs = $db->SelectLimit($qry, $extra['limit'], $extra['offset']); + } else { + $rs = $db->SelectLimit($qry, $extra['limit']); + } + if ($rs) { + while (!$rs->EOF) { + $rows[] = $rs->fields; + $rs->MoveNext(); + } + } + } else + $rows = $db->GetAll($qry,$bindarr); + + $db->SetFetchMode($save); + + $false = false; + + if ($rows === false) { + return $false; + } + + + if (!isset($_ADODB_ACTIVE_DBS)) { + include_once(ADODB_DIR.'/adodb-active-record.inc.php'); + } + if (!class_exists($class)) { + $db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); + return $false; + } + $uniqArr = array(); // CFR Keep track of records for relations + $arr = array(); + // 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 developers. + $arrRef = array(); + $bTos = array(); // Will store belongTo's indices if any + foreach($rows as $row) { + + $obj = new $class($table,$primkeyArr,$db); + if ($obj->ErrorNo()){ + $db->_errorMsg = $obj->ErrorMsg(); + return $false; + } + $obj->Set($row); + // CFR: FIXME: Insane assumption here: + // If the first column returned is an integer, then it's a 'id' field + // And to make things a bit worse, I use intval() rather than is_int() because, in fact, + // $row[0] is not an integer. + // + // So, what does this whole block do? + // When relationships are found, we perform JOINs. This is fast. But not accurate: + // instead of returning n objects with their n' associated cousins, + // we get n*n' objects. This code fixes this. + // Note: to-many relationships mess around with the 'limit' parameter + $rowId = intval($row[$index]); + + if(ADODB_WORK_AR == $extra['loading']) { + $arrRef[$rowId] = $obj; + $arr[] = &$arrRef[$rowId]; + if(!isset($indices)) { + $indices = $rowId; + } + else { + $indices .= ','.$rowId; + } + if(!empty($relations['belongsTo'])) { + foreach($relations['belongsTo'] as $foreignTable) { + $foreignTableRef = $foreignTable->foreignKey; + // First array: list of foreign ids we are looking for + if(empty($bTos[$foreignTableRef])) { + $bTos[$foreignTableRef] = array(); + } + // Second array: list of ids found + if(empty($obj->$foreignTableRef)) { + continue; + } + if(empty($bTos[$foreignTableRef][$obj->$foreignTableRef])) { + $bTos[$foreignTableRef][$obj->$foreignTableRef] = array(); + } + $bTos[$foreignTableRef][$obj->$foreignTableRef][] = $obj; + } + } + continue; + } + + if($rowId>0) { + if(ADODB_JOIN_AR == $extra['loading']) { + $isNewObj = !isset($uniqArr['_'.$row[0]]); + if($isNewObj) { + $uniqArr['_'.$row[0]] = $obj; + } + + // TODO Copy/paste code below: bad! + if(!empty($relations['hasMany'])) { + foreach($relations['hasMany'] as $foreignTable) { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) { + $masterObj = &$uniqArr['_'.$row[0]]; + // Assumption: this property exists in every object since they are instances of the same class + if(!is_array($masterObj->$foreignName)) { + // Pluck! + $foreignObj = $masterObj->$foreignName; + $masterObj->$foreignName = array(clone($foreignObj)); + } + else { + // Pluck pluck! + $foreignObj = $obj->$foreignName; + array_push($masterObj->$foreignName, clone($foreignObj)); + } + } + } + } + if(!empty($relations['belongsTo'])) { + foreach($relations['belongsTo'] as $foreignTable) { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) { + $masterObj = &$uniqArr['_'.$row[0]]; + // Assumption: this property exists in every object since they are instances of the same class + if(!is_array($masterObj->$foreignName)) { + // Pluck! + $foreignObj = $masterObj->$foreignName; + $masterObj->$foreignName = array(clone($foreignObj)); + } + else { + // Pluck pluck! + $foreignObj = $obj->$foreignName; + array_push($masterObj->$foreignName, clone($foreignObj)); + } + } + } + } + if(!$isNewObj) { + unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array + } + } + else if(ADODB_LAZY_AR == $extra['loading']) { + // Lazy loading: we need to give AdoDb a hint that we have not really loaded + // anything, all the while keeping enough information on what we wish to load. + // Let's do this by keeping the relevant info in our relationship arrays + // but get rid of the actual properties. + // We will then use PHP's __get to load these properties on-demand. + if(!empty($relations['hasMany'])) { + foreach($relations['hasMany'] as $foreignTable) { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) { + unset($obj->$foreignName); + } + } + } + if(!empty($relations['belongsTo'])) { + foreach($relations['belongsTo'] as $foreignTable) { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) { + unset($obj->$foreignName); + } + } + } + } + } + + if(isset($obj)) { + $arr[] = $obj; + } + } + + if(ADODB_WORK_AR == $extra['loading']) { + // The best of both worlds? + // Here, the number of queries is constant: 1 + n*relationship. + // The second query will allow us to perform a good join + // while preserving LIMIT etc. + if(!empty($relations['hasMany'])) { + foreach($relations['hasMany'] as $foreignTable) { + $foreignName = $foreignTable->foreignName; + $className = ucfirst($foreignTable->_singularize($foreignName)); + $obj = new $className(); + $dbClassRef = $foreignTable->foreignKey; + $objs = $obj->packageFind($dbClassRef.' IN ('.$indices.')'); + foreach($objs as $obj) { + if(!is_array($arrRef[$obj->$dbClassRef]->$foreignName)) { + $arrRef[$obj->$dbClassRef]->$foreignName = array(); + } + array_push($arrRef[$obj->$dbClassRef]->$foreignName, $obj); + } + } + + } + if(!empty($relations['belongsTo'])) { + foreach($relations['belongsTo'] as $foreignTable) { + $foreignTableRef = $foreignTable->foreignKey; + if(empty($bTos[$foreignTableRef])) { + continue; + } + if(($k = reset($foreignTable->TableInfo()->keys))) { + $belongsToId = $k; + } + else { + $belongsToId = 'id'; + } + $origObjsArr = $bTos[$foreignTableRef]; + $bTosString = implode(',', array_keys($bTos[$foreignTableRef])); + $foreignName = $foreignTable->foreignName; + $className = ucfirst($foreignTable->_singularize($foreignName)); + $obj = new $className(); + $objs = $obj->packageFind($belongsToId.' IN ('.$bTosString.')'); + foreach($objs as $obj) + { + foreach($origObjsArr[$obj->$belongsToId] as $idx=>$origObj) + { + $origObj->$foreignName = $obj; + } + } + } + } + } + + return $arr; +} diff --git a/adodb/adodb-csvlib.inc.php b/adodb/adodb-csvlib.inc.php index e7923db..c81254b 100644 --- a/adodb/adodb-csvlib.inc.php +++ b/adodb/adodb-csvlib.inc.php @@ -1,4 +1,26 @@ FieldCount() : 0; - + if ($sql) $sql = urlencode($sql); // metadata setup - + if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete if (is_object($conn)) { $sql .= ','.$conn->Affected_Rows(); $sql .= ','.$conn->Insert_ID(); } else $sql .= ',,'; - + $text = "====-1,0,$sql\n"; return $text; } $tt = ($rs->timeCreated) ? $rs->timeCreated : time(); - + ## changed format from ====0 to ====1 $line = "====1,$tt,$sql\n"; - + if ($rs->databaseType == 'array') { - $rows =& $rs->_array; + $rows = $rs->_array; } else { $rows = array(); - while (!$rs->EOF) { + while (!$rs->EOF) { $rows[] = $rs->fields; $rs->MoveNext(); - } + } } - + for($i=0; $i < $max; $i++) { - $o =& $rs->FetchField($i); + $o = $rs->FetchField($i); $flds[] = $o; } - + $savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode; $class = $rs->connection->arrayClass; $rs2 = new $class(); + $rs2->timeCreated = $rs->timeCreated; # memcache fix $rs2->sql = $rs->sql; - $rs2->oldProvider = $rs->dataProvider; + $rs2->oldProvider = $rs->dataProvider; $rs2->InitArrayFields($rows,$flds); $rs2->fetchMode = $savefetch; return $line.serialize($rs2); } - + /** -* Open CSV file and convert it into Data. +* Open CSV file and convert it into Data. * * @param url file/ftp/http url * @param err returns the error message * @param timeout dispose if recordset has been alive for $timeout secs * -* @return recordset, or false if error occured. If no -* error occurred in sql INSERT/UPDATE/DELETE, +* @return recordset, or false if error occurred. If no +* error occurred in sql INSERT/UPDATE/DELETE, * empty recordset is returned */ - function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') + function csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') { $false = false; $err = false; @@ -102,7 +107,7 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') @flock($fp, LOCK_SH); $arr = array(); $ttl = 0; - + if ($meta = fgetcsv($fp, 32000, ",")) { // check if error message if (strncmp($meta[0],'****',4) === 0) { @@ -112,10 +117,10 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') } // check for meta data // $meta[0] is -1 means return an empty recordset - // $meta[1] contains a time - + // $meta[1] contains a time + if (strncmp($meta[0], '====',4) === 0) { - + if ($meta[0] == "====-1") { if (sizeof($meta) < 5) { $err = "Corrupt first line for format -1"; @@ -123,12 +128,12 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') return $false; } fclose($fp); - + if ($timeout > 0) { $err = " Illegal Timeout $timeout "; return $false; } - + $rs = new $rsclass($val=true); $rs->fields = array(); $rs->timeCreated = $meta[1]; @@ -136,9 +141,9 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') $rs->_numOfFields = 0; $rs->sql = urldecode($meta[2]); $rs->affectedrows = (integer)$meta[3]; - $rs->insertid = $meta[4]; + $rs->insertid = $meta[4]; return $rs; - } + } # Under high volume loads, we want only 1 thread/process to _write_file # so that we don't have 50 processes queueing to write the same data. # We use probabilistic timeout, ahead of time. @@ -148,7 +153,7 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') # -1 sec after timeout give processes 1/4 chance of timing out # +0 sec after timeout, give processes 100% chance of timing out if (sizeof($meta) > 1) { - if($timeout >0){ + if($timeout >0){ $tdiff = (integer)( $meta[1]+$timeout - time()); if ($tdiff <= 2) { switch($tdiff) { @@ -160,7 +165,7 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') return $false; } break; - case 2: + case 2: if ((rand() & 15) == 0) { fclose($fp); $err = "Timeout 2"; @@ -174,12 +179,12 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') return $false; } break; - default: + default: fclose($fp); $err = "Timeout 0"; return $false; } // switch - + } // if check flush cache }// (timeout>0) $ttl = $meta[1]; @@ -189,7 +194,7 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') if ($meta[0] === '====1') { // slurp in the data $MAXSIZE = 128000; - + $text = fread($fp,$MAXSIZE); if (strlen($text)) { while ($txt = fread($fp,$MAXSIZE)) { @@ -205,7 +210,7 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') } return $rs; } - + $meta = false; $meta = fgetcsv($fp, 32000, ","); if (!$meta) { @@ -235,21 +240,19 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') $err = "Recordset had unexpected EOF 2"; return $false; } - + // slurp in the data $MAXSIZE = 128000; - + $text = ''; while ($txt = fread($fp,$MAXSIZE)) { $text .= $txt; } - + fclose($fp); @$arr = unserialize($text); - //var_dump($arr); if (!is_array($arr)) { $err = "Recordset had unexpected EOF (in serialized recordset)"; - if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!"; return $false; } $rs = new $rsclass(); @@ -257,17 +260,18 @@ function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') $rs->InitArrayFields($arr,$flds); return $rs; } - + /** * Save a file $filename and its $contents (normally for caching) with file locking + * Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked) */ function adodb_write_file($filename, $contents,$debug=false) - { + { # http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows # So to simulate locking, we assume that rename is an atomic operation. - # First we delete $filename, then we create a $tempfile write to it and - # rename to the desired $filename. If the rename works, then we successfully + # First we delete $filename, then we create a $tempfile write to it and + # rename to the desired $filename. If the rename works, then we successfully # modified the file exclusively. # What a stupid need - having to simulate locking. # Risks: @@ -277,36 +281,39 @@ function adodb_write_file($filename, $contents,$debug=false) # 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and cache updated if (strncmp(PHP_OS,'WIN',3) === 0) { // skip the decimal place - $mtime = substr(str_replace(' ','_',microtime()),2); + $mtime = substr(str_replace(' ','_',microtime()),2); // getmypid() actually returns 0 on Win98 - never mind! $tmpname = $filename.uniqid($mtime).getmypid(); - if (!($fd = @fopen($tmpname,'a'))) return false; - $ok = ftruncate($fd,0); - if (!fwrite($fd,$contents)) $ok = false; + if (!($fd = @fopen($tmpname,'w'))) return false; + if (fwrite($fd,$contents)) $ok = true; + else $ok = false; fclose($fd); - chmod($tmpname,0644); - // the tricky moment - @unlink($filename); - if (!@rename($tmpname,$filename)) { - unlink($tmpname); - $ok = false; - } - if (!$ok) { - if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed')); + + if ($ok) { + @chmod($tmpname,0644); + // the tricky moment + @unlink($filename); + if (!@rename($tmpname,$filename)) { + @unlink($tmpname); + $ok = 0; + } + if (!$ok) { + if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed')); + } } return $ok; } if (!($fd = @fopen($filename, 'a'))) return false; if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) { - $ok = fwrite( $fd, $contents ); + if (fwrite( $fd, $contents )) $ok = true; + else $ok = false; fclose($fd); - chmod($filename,0644); + @chmod($filename,0644); }else { fclose($fd); if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename
\n"); $ok = false; } - + return $ok; } -?> \ No newline at end of file diff --git a/adodb/adodb-datadict.inc.php b/adodb/adodb-datadict.inc.php index 9674cd9..dbed95d 100644 --- a/adodb/adodb-datadict.inc.php +++ b/adodb/adodb-datadict.inc.php @@ -1,30 +1,35 @@ $str

"; -$a= Lens_ParseArgs($str); +$a= lens_ParseArgs($str); print "
";
 print_r($a);
 print "
"; @@ -42,16 +47,16 @@ function ctype_alnum($text) { /** Parse arguments, treat "text" (text) and 'text' as quotation marks. To escape, use "" or '' or )) - + Will read in "abc def" sans quotes, as: abc def Same with 'abc def'. However if `abc def`, then will read in as `abc def` - + @param endstmtchar Character that indicates end of statement - @param tokenchars Include the following characters in tokens apart from A-Z and 0-9 + @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; @@ -62,7 +67,7 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') $max = strlen($args); $quoted = false; $tokarr = array(); - + while ($pos < $max) { $ch = substr($args,$pos,1); switch($ch) { @@ -77,17 +82,17 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') } break; } - + $tokarr[] = $ch; break; - + case '`': if ($intoken) $tokarr[] = $ch; case '(': - case ')': + case ')': case '"': case "'": - + if ($intoken) { if (empty($endquote)) { $tokens[$stmtno][] = implode('',$tokarr); @@ -109,9 +114,9 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') } } else $tokarr[] = $ch; - + }else { - + if ($ch == '(') $endquote = ')'; else $endquote = $ch; $quoted = true; @@ -120,27 +125,27 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') if ($ch == '`') $tokarr[] = '`'; } break; - + default: - + if (!$intoken) { if ($ch == $endstmtchar) { $stmtno += 1; $tokens[$stmtno] = array(); break; } - + $intoken = true; $quoted = false; $endquote = false; $tokarr = array(); - + } - + if ($quoted) $tokarr[] = $ch; else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch; else { - if ($ch == $endstmtchar) { + if ($ch == $endstmtchar) { $tokens[$stmtno][] = implode('',$tokarr); $stmtno += 1; $tokens[$stmtno] = array(); @@ -156,16 +161,17 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') $pos += 1; } if ($intoken) $tokens[$stmtno][] = implode('',$tokarr); - + return $tokens; } class ADODB_DataDict { + /** @var ADOConnection */ var $connection; var $debug = false; var $dropTable = 'DROP TABLE %s'; - var $renameTable = 'RENAME TABLE %s TO %s'; + var $renameTable = 'RENAME TABLE %s TO %s'; var $dropIndex = 'DROP INDEX %s'; var $addCol = ' ADD'; var $alterCol = ' ALTER COLUMN'; @@ -177,291 +183,453 @@ 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. - - function GetCommentSQL($table,$col) + /// 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) { 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) { - return ADORecordSet::MetaType($t,$len,$fieldobj); + static $typeMap = array( + 'VARCHAR' => 'C', + 'VARCHAR2' => 'C', + 'CHAR' => 'C', + 'C' => 'C', + 'STRING' => 'C', + 'NCHAR' => 'C', + 'NVARCHAR' => 'C', + 'VARYING' => 'C', + 'BPCHAR' => 'C', + 'CHARACTER' => 'C', + 'INTERVAL' => 'C', # Postgres + 'MACADDR' => 'C', # postgres + 'VAR_STRING' => 'C', # mysql + ## + 'LONGCHAR' => 'X', + 'TEXT' => 'X', + 'NTEXT' => 'X', + 'M' => 'X', + 'X' => 'X', + 'CLOB' => 'X', + 'NCLOB' => 'X', + 'LVARCHAR' => 'X', + ## + 'BLOB' => 'B', + 'IMAGE' => 'B', + 'BINARY' => 'B', + 'VARBINARY' => 'B', + 'LONGBINARY' => 'B', + 'B' => 'B', + ## + 'YEAR' => 'D', // mysql + 'DATE' => 'D', + 'D' => 'D', + ## + 'UNIQUEIDENTIFIER' => 'C', # MS SQL Server + ## + 'TIME' => 'T', + 'TIMESTAMP' => 'T', + 'DATETIME' => 'T', + 'TIMESTAMPTZ' => 'T', + 'SMALLDATETIME' => 'T', + 'T' => 'T', + 'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql + ## + 'BOOL' => 'L', + 'BOOLEAN' => 'L', + 'BIT' => 'L', + 'L' => 'L', + ## + 'COUNTER' => 'R', + 'R' => 'R', + 'SERIAL' => 'R', // ifx + 'INT IDENTITY' => 'R', + ## + 'INT' => 'I', + 'INT2' => 'I', + 'INT4' => 'I', + 'INT8' => 'I', + 'INTEGER' => 'I', + 'INTEGER UNSIGNED' => 'I', + 'SHORT' => 'I', + 'TINYINT' => 'I', + 'SMALLINT' => 'I', + 'I' => 'I', + ## + 'LONG' => 'N', // interbase is numeric, oci8 is blob + 'BIGINT' => 'N', // this is bigger than PHP 32-bit integers + 'DECIMAL' => 'N', + 'DEC' => 'N', + 'REAL' => 'N', + 'DOUBLE' => 'N', + 'DOUBLE PRECISION' => 'N', + 'SMALLFLOAT' => 'N', + 'FLOAT' => 'N', + 'NUMBER' => 'N', + 'NUM' => 'N', + 'NUMERIC' => 'N', + 'MONEY' => 'N', + + ## informix 9.2 + 'SQLINT' => 'I', + 'SQLSERIAL' => 'I', + 'SQLSMINT' => 'I', + 'SQLSMFLOAT' => 'N', + 'SQLFLOAT' => 'N', + 'SQLMONEY' => 'N', + 'SQLDECIMAL' => 'N', + 'SQLDATE' => 'D', + 'SQLVCHAR' => 'C', + 'SQLCHAR' => 'C', + 'SQLDTIME' => 'T', + 'SQLINTERVAL' => 'N', + 'SQLBYTES' => 'B', + 'SQLTEXT' => 'X', + ## informix 10 + "SQLINT8" => 'I8', + "SQLSERIAL8" => 'I8', + "SQLNCHAR" => 'C', + "SQLNVCHAR" => 'C', + "SQLLVARCHAR" => 'X', + "SQLBOOL" => 'L' + ); + + if (!$this->connection->isConnected()) { + $t = strtoupper($t); + if (isset($typeMap[$t])) return $typeMap[$t]; + return ADODB_DEFAULT_METATYPE; + } + 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; } - + $name = trim($name); - + if ( !is_object($this->connection) ) { return $name; } - + $quote = $this->connection->nameQuote; - + // if name is of the form `name`, quote it if ( preg_match('/^`(.+)`$/', $name, $matches) ) { return $quote . $matches[1] . $quote; } - + // if name contains special characters, quote it $regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex; - + if ( !preg_match('/^[' . $regex . ']+$/', $name) ) { return $quote . $name . $quote; } - + return $name; } - - function TableName($name) + + 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; + $conn = $this->connection; $saved = $conn->debug; 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; } } return $rez; } - - /* + + /** Returns the actual type given a character code. - + C: varchar X: CLOB (character large object) or largest varchar size if CLOB is not supported C2: Multibyte varchar X2: Multibyte CLOB - + B: BLOB (binary large object) - + D: Date - T: Date-time + T: Date-time L: Integer field suitable for storing booleans (0 or 1) I: Integer F: Floating point number N: Numeric or decimal number */ - - function ActualType($meta) + + 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]; - + $sql[] = $s; return $sql; } - + /* 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); } - + 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) = $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 . ' '; 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; } - + /** * 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) = $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 . ' '; 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; } - + /** * 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) = $this->_GenFields($flds); - list(,$first) = each($lines); - list(,$column_def) = split("[\t ]+",$first,2); + 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=false) - { - if (!$tableoptions) $tableoptions = array(); - - list($lines,$pkey) = $this->_GenFields($flds, true); - - $taboptions = $this->_Options($tableoptions); - $tabname = $this->TableName ($tabname); - $sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions); - - $tsql = $this->_Triggers($tabname,$taboptions); + 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); + + // ggiunta - 2006/10/12 - KLUDGE: + // if we are on autoincrement, and table options includes REPLACE, the + // autoincrement sequence has already been dropped on table creation sql, so + // we avoid passing REPLACE to trigger creation code. This prevents + // creating sql that double-drops the sequence + if ($this->autoIncrement && isset($taboptions['REPLACE'])) + unset($taboptions['REPLACE']); + $tsql = $this->_triggers($tabname,$taboptions); foreach($tsql as $s) $sql[] = $s; - + + if (is_array($idxs)) { + foreach($idxs as $idx => $idxdef) { + $sql_idxs = $this->createIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql = array_merge($sql, $sql_idxs); + } + } + return $sql; } - - 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(); foreach($f0 as $token) { switch (strtoupper($token)) { + case 'INDEX': + $f1['INDEX'] = ''; + // fall through intentionally case 'CONSTRAINT': - case 'DEFAULT': + case 'DEFAULT': $hasparam = $token; break; default: @@ -471,16 +639,31 @@ function _GenFields($flds,$widespacing=false) break; } } + // 'index' token without a name means single column index: name it after column + if (array_key_exists('INDEX', $f1) && $f1['INDEX'] == '') { + $f1['INDEX'] = isset($f0['NAME']) ? $f0['NAME'] : $f0[0]; + // check if column name used to create an index name was quoted + if (($f1['INDEX'][0] == '"' || $f1['INDEX'][0] == "'" || $f1['INDEX'][0] == "`") && + ($f1['INDEX'][0] == substr($f1['INDEX'], -1))) { + $f1['INDEX'] = $f1['INDEX'][0].'idx_'.substr($f1['INDEX'], 1, -1).$f1['INDEX'][0]; + } + else + $f1['INDEX'] = 'idx_'.$f1['INDEX']; + } + // reset it, so we don't get next field 1st token as INDEX... + $hasparam = false; + $flds[] = $f1; - + } } $this->autoIncrement = false; $lines = array(); $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; @@ -494,20 +677,27 @@ function _GenFields($flds,$widespacing=false) $fconstraint = false; $fnotnull = 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 'SIZE': + case 'TYPE': $ty = $v; $ftype = $this->actualType(strtoupper($v)); break; + + case 'SIZE': $dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,','); if ($dotat === false) $fsize = $v; else { @@ -519,7 +709,8 @@ function _GenFields($flds,$widespacing=false) case 'AUTOINCREMENT': case 'AUTO': $fautoinc = true; $fnotnull = true; break; case 'KEY': - case 'PRIMARY': $fprimary = $v; $fnotnull = true; break; + // a primary key col can be non unique in itself (if key spans many cols...) + case 'PRIMARY': $fprimary = $v; $fnotnull = true; /*$funiqueindex = true;*/ break; case 'DEF': case 'DEFAULT': $fdefault = $v; break; case 'NOTNULL': $fnotnull = $v; break; @@ -527,35 +718,71 @@ function _GenFields($flds,$widespacing=false) case 'DEFDATE': $fdefdate = $v; break; case 'DEFTIMESTAMP': $fdefts = $v; break; case 'CONSTRAINT': $fconstraint = $v; break; + // 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 - + //-------------------- // VALIDATE FIELD INFO if (!strlen($fname)) { if ($this->debug) ADOConnection::outp("Undefined NAME"); return false; } - + $fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname)); - $fname = $this->NameQuote($fname); - + $fname = $this->nameQuote($fname); + if (!strlen($ftype)) { if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'"); return false; } else { $ftype = strtoupper($ftype); } - - $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec); - - if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls - - if ($fprimary) $pkey[] = $fname; - - // some databases do not allow blobs to have defaults - if ($ty == 'X') $fdefault = false; - + + $ftype = $this->_getSize($ftype, $ty, $fsize, $fprec, $fOptions); + + 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 (($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 != '') { + if (array_key_exists($findex, $idxs)) { + $idxs[$findex]['cols'][] = ($fname); + if (in_array('UNIQUE', $idxs[$findex]['opts']) != $funiqueindex) { + if ($this->debug) ADOConnection::outp("Index $findex defined once UNIQUE and once not"); + } + if ($funiqueindex && !in_array('UNIQUE', $idxs[$findex]['opts'])) + $idxs[$findex]['opts'][] = 'UNIQUE'; + } + else + { + $idxs[$findex] = array(); + $idxs[$findex]['cols'] = array($fname); + if ($funiqueindex) + $idxs[$findex]['opts'] = array('UNIQUE'); + else + $idxs[$findex]['opts'] = array(); + } + } + //-------------------- // CONSTRUCT FIELD SQL if ($fdefts) { @@ -570,129 +797,172 @@ function _GenFields($flds,$widespacing=false) } else { $fdefault = $this->connection->sysDate; } - } else if ($fdefault !== false && !$fnoquote) - if ($ty == 'C' or $ty == 'X' or - ( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) - if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') + } else if ($fdefault !== false && !$fnoquote) { + if ($ty == 'C' or $ty == 'X' or + ( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) { + + if (($ty == 'D' || $ty == 'T') && strtolower($fdefault) != 'null') { + // convert default date into database-aware code + if ($ty == 'T') + { + $fdefault = $this->connection->dbTimeStamp($fdefault); + } + else + { + $fdefault = $this->connection->dbDate($fdefault); + } + } + else + if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') $fdefault = trim($fdefault); else if (strtolower($fdefault) != 'null') $fdefault = $this->connection->qstr($fdefault); - $suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); - + } + } + $suffix = $this->_createSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); + + // add index creation if ($widespacing) $fname = str_pad($fname,24); + + // check for field names appearing twice + if (array_key_exists($fid, $lines)) { + ADOConnection::outp("Field '$fname' defined twice"); + } + $lines[$fid] = $fname.' '.$ftype.$suffix; - + if ($fautoinc) $this->autoIncrement = true; } // foreach $flds - - return array($lines,$pkey); + + return array($lines,$pkey,$idxs); } - /* + + /** GENERATE THE SIZE PART OF THE DATATYPE $ftype is the actual type $ty is the type defined originally in the DDL */ - function _GetSize($ftype, $ty, $fsize, $fprec) + 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) - { + function _createSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned) + { $suffix = ''; if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault"; if ($fnotnull) $suffix .= ' NOT NULL'; if ($fconstraint) $suffix .= ' '.$fconstraint; return $suffix; } - - function _IndexSQL($idxname, $tabname, $flds, $idxoptions) + + function _indexSQL($idxname, $tabname, $flds, $idxoptions) { $sql = array(); - + if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) { $sql[] = sprintf ($this->dropIndex, $idxname); if ( isset($idxoptions['DROP']) ) return $sql; } - + if ( empty ($flds) ) { return $sql; } - + $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : ''; - + $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' '; - + if ( isset($idxoptions[$this->upperName]) ) $s .= $idxoptions[$this->upperName]; - + if ( is_array($flds) ) $flds = implode(', ',$flds); $s .= '(' . $flds . ')'; $sql[] = $s; - + return $sql; } - - function _DropAutoIncrement($tabname) + + 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) { $s .= ",\n PRIMARY KEY ("; $s .= implode(", ",$pkey).")"; } - if (isset($tableoptions['CONSTRAINTS'])) + if (isset($tableoptions['CONSTRAINTS'])) $s .= "\n".$tableoptions['CONSTRAINTS']; - - if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) + + if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) $s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; - + $s .= "\n)"; if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName]; $sql[] = $s; - + return $sql; } - - /* + + /** GENERATE TRIGGERS IF NEEDED used when table has auto-incrementing field that is emulated using triggers */ - function _Triggers($tabname,$taboptions) + function _triggers($tabname,$taboptions) { return array(); } - - /* + + /** 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(); @@ -702,34 +972,49 @@ function _Options($opts) } return $newopts; } - - /* + + + function _getSizePrec($size) + { + $fsize = false; + $fprec = false; + $dotat = strpos($size,'.'); + if ($dotat === false) $dotat = strpos($size,','); + if ($dotat === false) $fsize = $size; + else { + $fsize = substr($size,0,$dotat); + $fprec = substr($size,$dotat+1); + } + return array($fsize, $fprec); + } + + /** "Florian Buzin [ easywe ]" - + This function changes/adds new fields to your table. You don't have to know if the col is new or not. It will check on its own. */ - function ChangeTableSQL($tablename, $flds, $tableoptions = false) + 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); + + if ( empty($cols)) { + return $this->createTableSQL($tablename, $flds, $tableoptions); } - + if (is_array($flds)) { // Cycle through the update fields, comparing // existing fields to fields to update. @@ -742,43 +1027,63 @@ function ChangeTableSQL($tablename, $flds, $tableoptions = false) $obj = $cols[$k]; if (isset($obj->not_null) && $obj->not_null) $v = str_replace('NOT NULL','',$v); + if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT'])) + $v = str_replace('AUTOINCREMENT','',$v); $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. + + if ($sc == -1) $sc = false; + list($fsize, $fprec) = $this->_getSizePrec($v['SIZE']); + if ($ml == -1) $ml = ''; if ($mt == 'X') $ml = $v['SIZE']; - if (($mt != $v['TYPE']) || $ml != $v['SIZE']) { + if (($mt != $v['TYPE']) || ($ml != $fsize || $sc != $fprec) || (isset($v['AUTOINCREMENT']) && $v['AUTOINCREMENT'] != $obj->auto_increment)) { $holdflds[$k] = $v; } } else { $holdflds[$k] = $v; - } + } } $flds = $holdflds; } - + // already exists, alter table instead - list($lines,$pkey) = $this->_GenFields($flds); - $alter = 'ALTER TABLE ' . $this->TableName($tablename); + list($lines,$pkey,$idxs) = $this->_genFields($flds); + // genfields can return FALSE at times + if ($lines == null) $lines = array(); + $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. - if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue; - + // $flds[1] holds the type, $flds[2] holds the size -postnuke addition + if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4) + && (isset($flds[0][2]) && is_numeric($flds[0][2]))) { + if ($this->debug) ADOConnection::outp(sprintf("

%s cannot be changed to %s currently

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

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

"; + continue; + } $sql[] = $alter . $this->alterCol . ' ' . $v; } else { $sql[] = $alter . $this->addCol . ' ' . $v; } } - + + if ($dropOldFlds) { + foreach ( $cols as $id => $v ) + if ( !isset($lines[$id]) ) + $sql[] = $alter . $this->dropCol . ' ' . $v->name; + } return $sql; } } // class -?> \ No newline at end of file diff --git a/adodb/adodb-error.inc.php b/adodb/adodb-error.inc.php index c66d4d7..517cf9b 100644 --- a/adodb/adodb-error.inc.php +++ b/adodb/adodb-error.inc.php @@ -1,17 +1,27 @@ DB_ERROR_NOSUCHTABLE, - '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/' => DB_ERROR_ALREADY_EXISTS, - '/divide by zero$/' => DB_ERROR_DIVZERO, - '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER, - '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD, - '/parser: parse error at or near \"/' => DB_ERROR_SYNTAX, - '/referential integrity violation/' => DB_ERROR_CONSTRAINT, - '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/' - => DB_ERROR_ALREADY_EXISTS - ); + // Postgres has no lock-wait timeout. The best we could do would be to set a statement timeout. + static $error_regexps = array( + '(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$' => DB_ERROR_NOSUCHTABLE, + 'Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key.*violates unique constraint' => DB_ERROR_ALREADY_EXISTS, + 'database ".+" does not exist$' => DB_ERROR_NOSUCHDB, + '(divide|division) by zero$' => DB_ERROR_DIVZERO, + 'pg_atoi: error in .*: can\'t parse ' => DB_ERROR_INVALID_NUMBER, + 'ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']' => DB_ERROR_NOSUCHFIELD, + '(parser: parse|syntax) error at or near \"' => DB_ERROR_SYNTAX, + 'referential integrity violation' => DB_ERROR_CONSTRAINT, + 'deadlock detected$' => DB_ERROR_DEADLOCK, + 'canceling statement due to statement timeout$' => DB_ERROR_STATEMENT_TIMEOUT, + 'could not serialize access due to' => DB_ERROR_SERIALIZATION_FAILURE + ); reset($error_regexps); - while (list($regexp,$code) = each($error_regexps)) { - if (preg_match($regexp, $errormsg)) { - return $code; - } - } - // Fall back to DB_ERROR if there was no mapping. - return DB_ERROR; + foreach ($error_regexps as $regexp => $code) { + if (preg_match("/$regexp/mi", $errormsg)) { + return $code; + } + } + // Fall back to DB_ERROR if there was no mapping. + return DB_ERROR; } - + function adodb_error_odbc() { static $MAP = array( @@ -169,7 +189,7 @@ function adodb_error_ibase() -923 => DB_ERROR_CONNECT_FAILED, -924 => DB_ERROR_CONNECT_FAILED ); - + return $MAP; } @@ -187,7 +207,7 @@ function adodb_error_ifx() '-1210' => DB_ERROR_INVALID_DATE, '-1212' => DB_ERROR_INVALID_DATE ); - + return $MAP; } @@ -206,7 +226,7 @@ function adodb_error_oci8() 2291 => DB_ERROR_CONSTRAINT, 2449 => DB_ERROR_CONSTRAINT ); - + return $MAP; } @@ -216,7 +236,7 @@ function adodb_error_mssql() 208 => DB_ERROR_NOSUCHTABLE, 2601 => DB_ERROR_ALREADY_EXISTS ); - + return $MAP; } @@ -225,7 +245,7 @@ function adodb_error_sqlite() static $MAP = array( 1 => DB_ERROR_SYNTAX ); - + return $MAP; } @@ -237,9 +257,9 @@ function adodb_error_mysql() 1006 => 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, @@ -249,10 +269,9 @@ 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; } -?> \ No newline at end of file diff --git a/adodb/adodb-errorhandler.inc.php b/adodb/adodb-errorhandler.inc.php index 41f2c48..0cd3f21 100644 --- a/adodb/adodb-errorhandler.inc.php +++ b/adodb/adodb-errorhandler.inc.php @@ -1,19 +1,26 @@ $s

"; - trigger_error($s,ADODB_ERROR_HANDLER_TYPE); + trigger_error($s,ADODB_ERROR_HANDLER_TYPE); } -?> diff --git a/adodb/adodb-errorpear.inc.php b/adodb/adodb-errorpear.inc.php index 143d8fc..2bb1594 100644 --- a/adodb/adodb-errorpear.inc.php +++ b/adodb/adodb-errorpear.inc.php @@ -1,15 +1,24 @@ !$s

"; } /** * Returns last PEAR_Error object. This error might be for an error that -* occured several sql statements ago. +* occurred several sql statements ago. */ -function &ADODB_PEAR_Error() +function ADODB_PEAR_Error() { global $ADODB_Last_PEAR_Error; return $ADODB_Last_PEAR_Error; } - -?> \ No newline at end of file diff --git a/adodb/adodb-exceptions.inc.php b/adodb/adodb-exceptions.inc.php index 394f7dc..9f1176f 100644 --- a/adodb/adodb-exceptions.inc.php +++ b/adodb/adodb-exceptions.inc.php @@ -1,20 +1,25 @@ sql = $p1; + $this->sql = is_array($p1) ? $p1[0] : $p1; $this->params = $p2; - $s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n"; + $s = "$dbms error: [$errno: $errmsg] in $fn(\"$this->sql\")"; break; - + case 'PCONNECT': case 'CONNECT': $user = $thisConnection->user; - $s = "$dbms error: [$errno: $errmsg] in $fn($p1, '$user', '****', $p2)\n"; + $s = "$dbms error: [$errno: $errmsg] in $fn($p1, '$user', '****', $p2)"; break; default: - $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n"; + $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)"; break; } - + $this->dbms = $dbms; if ($thisConnection) { $this->host = $thisConnection->host; @@ -51,32 +56,29 @@ function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection) } $this->fn = $fn; $this->msg = $errmsg; - + if (!is_numeric($errno)) $errno = -1; parent::__construct($s,$errno); } } /** -* Default Error Handler. This will be called with the following params +* Default Error Handler. * -* @param $dbms the RDBMS you are connecting to -* @param $fn the name of the calling function (in uppercase) -* @param $errno the native error number from the database -* @param $errmsg the native error msg from the database -* @param $p1 $fn specific parameter - see below -* @param $P2 $fn specific parameter - see below +* @param string $dbms the RDBMS you are connecting to +* @param string $fn the name of the calling function (in uppercase) +* @param int $errno the native error number from the database +* @param string $errmsg the native error msg from the database +* @param mixed $p1 $fn specific parameter - see below +* @param mixed $p2 $fn specific parameter - see below */ function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection) { global $ADODB_EXCEPTION; - + if (error_reporting() == 0) return; // obey @ protocol if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION; else $errfn = 'ADODB_EXCEPTION'; throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection); } - - -?> \ No newline at end of file diff --git a/adodb/adodb-iterator.inc.php b/adodb/adodb-iterator.inc.php deleted file mode 100644 index 86e2895..0000000 --- a/adodb/adodb-iterator.inc.php +++ /dev/null @@ -1,85 +0,0 @@ -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 - */ - - - class ADODB_Iterator implements Iterator { - - private $rs; - - function __construct($rs) - { - $this->rs = $rs; - } - function rewind() - { - $this->rs->MoveFirst(); - } - - function valid() - { - return !$this->rs->EOF; - } - - function key() - { - return $this->rs->_currentRow; - } - - function current() - { - return $this->rs->fields; - } - - function next() - { - $this->rs->MoveNext(); - } - - function __call($func, $params) - { - return call_user_func_array(array($this->rs, $func), $params); - } - - - function hasMore() - { - return !$this->rs->EOF; - } - -} - - -class ADODB_BASE_RS implements IteratorAggregate { - function getIterator() { - return new ADODB_Iterator($this); - } - - /* this is experimental - i don't really know what to return... */ - function __toString() - { - include_once(ADODB_DIR.'/toexport.inc.php'); - return _adodb_export($this,',',',',false,true); - } -} - - -?> \ No newline at end of file diff --git a/adodb/adodb-lib.inc.php b/adodb/adodb-lib.inc.php index 51c45c7..ced5e12 100644 --- a/adodb/adodb-lib.inc.php +++ b/adodb/adodb-lib.inc.php @@ -1,4 +1,25 @@ array_pop($tmp)]; + } + if ($arr) + if (strpos($arr[1], '(') !== false) { + $at = strpos($sql, $arr[1]); + $cntin = 0; + for ($i=$at, $max=strlen($sql); $i < $max; $i++) { + $ch = $sql[$i]; + if ($ch == '(') { + $cntin += 1; + } elseif($ch == ')') { + $cntin -= 1; + if ($cntin < 0) { + break; + } + } + } + $sql = substr($sql,0,$at).substr($sql,$i); + } else { + $sql = str_replace($arr[1], '', $sql); + } + + return $sql; +} + +if (false) { + $sql = 'select * from (select a from b order by a(b),b(c) desc)'; + $sql = '(select * from abc order by 1)'; + die(adodb_strip_order_by($sql)); +} function adodb_probetypes(&$array,&$types,$probe=8) { @@ -22,26 +70,26 @@ function adodb_probetypes(&$array,&$types,$probe=8) $types = array(); if ($probe > sizeof($array)) $max = sizeof($array); else $max = $probe; - - + + for ($j=0;$j < $max; $j++) { - $row =& $array[$j]; + $row = $array[$j]; if (!$row) break; $i = -1; foreach($row as $v) { $i += 1; if (isset($types[$i]) && $types[$i]=='C') continue; - + //print " ($i ".$types[$i]. "$v) "; $v = trim($v); - + if (!preg_match('/^[+-]{0,1}[0-9\.]+$/',$v)) { $types[$i] = 'C'; // once C, always C - + continue; } - if ($j == 0) { + if ($j == 0) { // If empty string, we presume is character // test for integer for 1st row only // after that it is up to testing other rows to prove @@ -51,21 +99,22 @@ function adodb_probetypes(&$array,&$types,$probe=8) else $types[$i] = 'I'; continue; } - + if (strpos($v,'.') !== false) $types[$i] = 'N'; - + } } + } -function &adodb_transpose(&$arr, &$newarr, &$hdr) +function adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs) { $oldX = sizeof(reset($arr)); - $oldY = sizeof($arr); - + $oldY = sizeof($arr); + if ($hdr) { $startx = 1; - $hdr = array(); + $hdr = array('Fields'); for ($y = 0; $y < $oldY; $y++) { $hdr[] = $arr[$y][0]; } @@ -73,369 +122,395 @@ function &adodb_transpose(&$arr, &$newarr, &$hdr) $startx = 0; for ($x = $startx; $x < $oldX; $x++) { - $newarr[] = array(); + if ($fobjs) { + $o = $fobjs[$x]; + $newarr[] = array($o->name); + } else + $newarr[] = array(); + for ($y = 0; $y < $oldY; $y++) { $newarr[$x-$startx][] = $arr[$y][$x]; } } } -// 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 = ''; - - if (!is_array($keyCol)) { - $keyCol = array($keyCol); - } - foreach($fieldArray as $k => $v) { - if ($autoQuote && !is_numeric($v) and strncmp($v,"'",1) !== 0 and strcasecmp($v,'null')!=0) { - $v = $zthis->qstr($v); - $fieldArray[$k] = $v; - } - if (in_array($k,$keyCol)) continue; // skip UPDATE if is key - - if ($first) { - $first = false; - $uSet = "$k=$v"; - } else - $uSet .= ",$k=$v"; - } - - $where = false; - foreach ($keyCol as $v) { - if (isset($fieldArray[$v])) { - if ($where) $where .= ' and '.$v.'='.$fieldArray[$v]; - else $where = $v.'='.$fieldArray[$v]; - } + // Add Quote around table name to support use of spaces / reserved keywords + $table=sprintf('%s%s%s', $zthis->nameQuote,$table,$zthis->nameQuote); + + if (count($fieldArray) == 0) return 0; + + 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 ($uSet && $where) { - $update = "UPDATE $table SET $uSet WHERE $where"; - - $rs = $zthis->Execute($update); - - - if ($rs) { - if ($zthis->poorAffectedRows) { - /* - The Select count(*) wipes out any errors that the update would have returned. - http://phplens.com/lens/lensforum/msgs.php?id=5696 - */ - if ($zthis->ErrorNo()<>0) return 0; - - # affected_rows == 0 if update field values identical to old values - # for mysql - which is silly. - - $cnt = $zthis->GetOne("select count(*) from $table where $where"); - if ($cnt > 0) return 1; // record already exists - } else { - if (($zthis->Affected_Rows()>0)) return 1; - } - } else - return 0; + if (in_array($k,$keyCol)) continue; // skip UPDATE if is key + + // 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, ','); + + // 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]); } - - // print "

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

'; - $first = true; - foreach($fieldArray as $k => $v) { - if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col - - if ($first) { - $first = false; - $iCols = "$k"; - $iVals = "$v"; + } + 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. + // 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. + $cnt = $zthis->GetOne("select count(*) from $table where $where"); + if ($cnt > 0) return 1; // record already exists } else { - $iCols .= ",$k"; - $iVals .= ",$v"; - } - } - $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; - $rs = $zthis->Execute($insert); - return ($rs) ? 2 : 0; + 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 + + // Add Quote around Column Name + $iCols .= sprintf(',%s%s%s',$zthis->nameQuote,$k,$zthis->nameQuote); + $iVals .= ",$v"; + } + $iCols = ltrim($iCols, ','); + $iVals = ltrim($iVals, ','); + + $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; + $rs = $zthis->Execute($insert); + return ($rs) ? 2 : 0; } -// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, $size=0, $selectAttr='',$compareFields0=true) { - $hasvalue = false; - - if ($multiple or is_array($defstr)) { - if ($size==0) $size=5; - $attr = ' multiple size="'.$size.'"'; - if (!strpos($name,'[]')) $name .= '[]'; - } else if ($size) $attr = ' size="'.$size.'"'; - else $attr =''; - - $s = '\n"; } -// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, $size=0, $selectAttr='',$compareFields0=true) { - $hasvalue = false; - - if ($multiple or is_array($defstr)) { - if ($size==0) $size=5; - $attr = ' multiple size="'.$size.'"'; - if (!strpos($name,'[]')) $name .= '[]'; - } else if ($size) $attr = ' size="'.$size.'"'; - else $attr =''; - - $s = '\n"; } +/** + * Generate the opening SELECT tag for getmenu functions. + * + * ADOdb internal function, used by _adodb_getmenu() and _adodb_getmenu_gp(). + * + * @param string $name + * @param string $defstr + * @param bool $blank1stItem + * @param bool $multiple + * @param int $size + * @param string $selectAttr + * + * @return string HTML + */ +function _adodb_getmenu_select($name, $defstr = '', $blank1stItem = true, + $multiple = false, $size = 0, $selectAttr = '') +{ + if ($multiple || is_array($defstr)) { + if ($size == 0 ) { + $size = 5; + } + $attr = ' multiple size="' . $size . '"'; + if (!strpos($name,'[]')) { + $name .= '[]'; + } + } elseif ($size) { + $attr = ' size="' . $size . '"'; + } else { + $attr = ''; + } + + $html = ' "; else $form = " "; - + $allowsql = !defined('ADODB_PERF_NO_RUN_SQL'); - + global $ADODB_PERF_MIN; + $app .= " (Min sql timing \$ADODB_PERF_MIN=$ADODB_PERF_MIN secs)"; + if (empty($_GET['hidem'])) echo "
- ADOdb Performance Monitor for $app
+ ADOdb Performance Monitor for $app
Performance Stats   View SQL   View Tables   Poll Stats", $allowsql ? '   Run SQL' : '', "$form", "
"; - + switch ($do) { default: case 'stats': + if (empty($ADODB_LOG_CONN)) + echo "

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

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

@@ -907,8 +946,8 @@ function DoSQLForm()
 
 undomq(trim($sql));
+
+		$sql = trim($sql);
 		if (substr($sql,strlen($sql)-1) === ';') {
 			$print = true;
 			$sqla = $this->SplitSQL($sql);
@@ -919,7 +958,7 @@ function DoSQLForm()
 		foreach($sqla as $sqls) {
 
 			if (!$sqls) continue;
-			
+
 			if ($print) {
 				print "
".htmlspecialchars($sqls)."
";
 				flush();
@@ -945,31 +984,19 @@ function DoSQLForm()
 			}
 		} // foreach
 	}
-	
+
 	function SplitSQL($sql)
 	{
 		$arr = explode(';',$sql);
 		return $arr;
 	}
-	
-	function undomq($m) 
-	{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-	}
-	return $m;
-}
 
-    
    /************************************************************************/
-   
-    /** 
+
+    /**
      * Reorganise multiple table-indices/statistics/..
      * OptimizeMode could be given by last Parameter
-     * 
+     *
      * @example
      *      
      *          optimizeTables( 'tableA');
@@ -980,12 +1007,12 @@ function undomq($m)
      *      
      *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
      *      

-     * 
+     *
      * @param string table name of the table to optimize
      * @param int mode optimization-mode
-     *      ADODB_OPT_HIGH for full optimization 
+     *      ADODB_OPT_HIGH for full optimization
      *      ADODB_OPT_LOW for CPU-less optimization
-     *      Default is LOW ADODB_OPT_LOW 
+     *      Default is LOW ADODB_OPT_LOW
      * @author Markus Staab
      * @return Returns true on success and false on error
      */
@@ -993,52 +1020,52 @@ function OptimizeTables()
     {
         $args = func_get_args();
         $numArgs = func_num_args();
-        
+
         if ( $numArgs == 0) return false;
-        
-        $mode = ADODB_OPT_LOW; 
+
+        $mode = ADODB_OPT_LOW;
         $lastArg = $args[ $numArgs - 1];
         if ( !is_string($lastArg)) {
             $mode = $lastArg;
             unset( $args[ $numArgs - 1]);
         }
-        
+
         foreach( $args as $table) {
             $this->optimizeTable( $table, $mode);
         }
 	}
 
-    /** 
+    /**
      * Reorganise the table-indices/statistics/.. depending on the given mode.
      * Default Implementation throws an error.
-     * 
+     *
      * @param string table name of the table to optimize
      * @param int mode optimization-mode
-     *      ADODB_OPT_HIGH for full optimization 
+     *      ADODB_OPT_HIGH for full optimization
      *      ADODB_OPT_LOW for CPU-less optimization
-     *      Default is LOW ADODB_OPT_LOW 
+     *      Default is LOW ADODB_OPT_LOW
      * @author Markus Staab
      * @return Returns true on success and false on error
      */
-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+    function OptimizeTable( $table, $mode = ADODB_OPT_LOW)
     {
         ADOConnection::outp( sprintf( "
%s: '%s' not implemented for driver '%s'
", __CLASS__, __FUNCTION__, $this->conn->databaseType));
         return false;
     }
-    
-    /** 
+
+    /**
      * Reorganise current database.
-     * Default implementation loops over all MetaTables() and 
+     * Default implementation loops over all MetaTables() and
      * optimize each using optmizeTable()
-     * 
+     *
      * @author Markus Staab
      * @return Returns true on success and false on error
      */
-    function optimizeDatabase() 
+    function optimizeDatabase()
     {
         $conn = $this->conn;
         if ( !$conn) return false;
-        
+
         $tables = $conn->MetaTables( 'TABLES');
         if ( !$tables ) return false;
 
@@ -1047,10 +1074,8 @@ function optimizeDatabase()
                 return false;
             }
         }
-      
+
         return true;
     }
-    // end hack 
+    // end hack
 }
-
-?>
\ No newline at end of file
diff --git a/adodb/adodb-php4.inc.php b/adodb/adodb-php4.inc.php
deleted file mode 100644
index abe990b..0000000
--- a/adodb/adodb-php4.inc.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/adodb/adodb-time.inc.php b/adodb/adodb-time.inc.php
index 51f69f7..cfbdc6a 100644
--- a/adodb/adodb-time.inc.php
+++ b/adodb/adodb-time.inc.php
@@ -1,86 +1,82 @@
  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-2005 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
 
+** FUNCTION adodb_time()
+
+Returns the current time measured in the number of seconds since the Unix Epoch (January 1 1970 00:00:00 GMT) as an unsigned integer.
 
 ** FUNCTION adodb_getdate($date=false)
 
 Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a 
-heuristic the first time adodb_getdate is called. 
-	 
-	 
+dates greater than 1901 to 2038. The local date/time format is derived from a
+heuristic the first time adodb_getdate is called.
+
+
 ** FUNCTION adodb_date($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted local date. If $timestamp is not defined, the
@@ -90,45 +86,45 @@
 The format fields that adodb_date supports:
 
 
-	a - "am" or "pm" 
-	A - "AM" or "PM" 
-	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
-	D - day of the week, textual, 3 letters; e.g. "Fri" 
-	F - month, textual, long; e.g. "January" 
-	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
-	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
-	h - hour, 12-hour format; i.e. "01" to "12" 
-	H - hour, 24-hour format; i.e. "00" to "23" 
-	i - minutes; i.e. "00" to "59" 
-	j - day of the month without leading zeros; i.e. "1" to "31" 
-	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
-	L - boolean for whether it is a leap year; i.e. "0" or "1" 
-	m - month; i.e. "01" to "12" 
-	M - month, textual, 3 letters; e.g. "Jan" 
-	n - month without leading zeros; i.e. "1" to "12" 
-	O - Difference to Greenwich time in hours; e.g. "+0200" 
-	Q - Quarter, as in 1, 2, 3, 4 
-	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
-	s - seconds; i.e. "00" to "59" 
-	S - English ordinal suffix for the day of the month, 2 characters; 
-	   			i.e. "st", "nd", "rd" or "th" 
+	a - "am" or "pm"
+	A - "AM" or "PM"
+	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
+	D - day of the week, textual, 3 letters; e.g. "Fri"
+	F - month, textual, long; e.g. "January"
+	g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
+	G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
+	h - hour, 12-hour format; i.e. "01" to "12"
+	H - hour, 24-hour format; i.e. "00" to "23"
+	i - minutes; i.e. "00" to "59"
+	j - day of the month without leading zeros; i.e. "1" to "31"
+	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"
+	L - boolean for whether it is a leap year; i.e. "0" or "1"
+	m - month; i.e. "01" to "12"
+	M - month, textual, 3 letters; e.g. "Jan"
+	n - month without leading zeros; i.e. "1" to "12"
+	O - Difference to Greenwich time in hours; e.g. "+0200"
+	Q - Quarter, as in 1, 2, 3, 4
+	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200"
+	s - seconds; i.e. "00" to "59"
+	S - English ordinal suffix for the day of the month, 2 characters;
+	   			i.e. "st", "nd", "rd" or "th"
 	t - number of days in the given month; i.e. "28" to "31"
-	T - Timezone setting of this machine; e.g. "EST" or "MDT" 
-	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
-	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
-	Y - year, 4 digits; e.g. "1999" 
-	y - year, 2 digits; e.g. "99" 
-	z - day of the year; i.e. "0" to "365" 
-	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
-	   			The offset for timezones west of UTC is always negative, 
-				and for those east of UTC is always positive. 
+	T - Timezone setting of this machine; e.g. "EST" or "MDT"
+	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
+	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
+	Y - year, 4 digits; e.g. "1999"
+	y - year, 2 digits; e.g. "99"
+	z - day of the year; i.e. "0" to "365"
+	Z - timezone offset in seconds (i.e. "-43200" to "43200").
+	   			The offset for timezones west of UTC is always negative,
+				and for those east of UTC is always positive.
 

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

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

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

 
 =============================================================================
@@ -230,10 +226,10 @@
 Useful url for generating test timestamps:
 	http://www.4webhelp.net/us/timestamp.php
 
-Possible future optimizations include 
+Possible future optimizations include
 
-a. Using an algorithm similar to Plauger's in "The Standard C Library" 
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
+a. Using an algorithm similar to Plauger's in "The Standard C Library"
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
 work outside 32-bit signed range, so i decided not to implement it.
 
 b. Implement daylight savings, which looks awfully complicated, see
@@ -241,11 +237,37 @@
 
 
 CHANGELOG
+- 16 Jan 2011 0.36
+Added adodb_time() which returns current time. If > 2038, will return as float
+
+- 7 Feb 2011 0.35
+Changed adodb_date to be symmetric with adodb_mktime. See $jan1_71. fix for bc.
+
+- 13 July 2010 0.34
+Changed adodb_get_gm_diff to use DateTimeZone().
+
+- 11 Feb 2008 0.33
+* Bug in 0.32 fix for hour handling. Fixed.
+
+- 1 Feb 2008 0.32
+* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly.
+
+- 10 Jan 2008 0.31
+* Now adodb_mktime(0,0,0,24,1,2037) works correctly.
+
+- 15 July 2007 0.30
+Added PHP 5.2.0 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
+   in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
+ *
+
 - 19 March 2006 0.24
 Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
 
 - 10 Feb 2006 0.23
-PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000. 
+PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000.
 	In PHP4, we will still use -0000 for 100% compat with PHP4.
 
 - 08 Sept 2005 0.22
@@ -259,7 +281,7 @@
 Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
 
 - 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 
+In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
 Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
 
 - 17 Nov 2004 0.16
@@ -268,7 +290,7 @@
 Suggested by Ryan.
 
 - 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
 This brings it more in line with mktime (still not identical).
 
 - 23 June 2004 0.14
@@ -286,21 +308,21 @@ function adodb_daylight_sv(&$arr, $is_gmt)
 	if ($m == 6 || $m == 7) $arr['hours'] += 1;
 }
 
-This is only called by adodb_date() and not by adodb_mktime(). 
+This is only called by adodb_date() and not by adodb_mktime().
 
 The format of $arr is
-Array ( 
-   [seconds] => 0 
-   [minutes] => 0 
-   [hours] => 0 
+Array (
+   [seconds] => 0
+   [minutes] => 0
+   [hours] => 0
    [mday] => 1      # day of month, eg 1st day of the month
    [mon] => 2       # month (eg. Feb)
-   [year] => 2102 
+   [year] => 2102
    [yday] => 31     # days in current year
    [leap] =>        # true if leap year
    [ndays] => 28    # no of days in current month
-   ) 
-   
+   )
+
 
 - 28 Apr 2004 0.13
 Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
@@ -309,12 +331,12 @@ function adodb_daylight_sv(&$arr, $is_gmt)
 Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
 
 - 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to 
+Because of daylight savings problems (some systems apply daylight savings to
 January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
 
 - 9 Aug 2003 0.10
-Fixed bug with dates after 2038. 
-See http://phplens.com/lens/lensforum/msgs.php?id=6980
+Fixed bug with dates after 2038.
+See PHPLens Issue No: 6980
 
 - 1 July 2003 0.09
 Added support for Q (Quarter).
@@ -343,14 +365,14 @@ function adodb_daylight_sv(&$arr, $is_gmt)
 
 - 28 Jan 2003 0.04
 
-Gregorian correction handled. In PHP5, we might throw an error if 
+Gregorian correction handled. In PHP5, we might throw an error if
 mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
 Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
 
 - 27 Jan 2003 0.03
 
 Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970. 
+Fixed calculation of days since start of year for <1970.
 
 - 27 Jan 2003 0.02
 
@@ -368,16 +390,16 @@ function adodb_daylight_sv(&$arr, $is_gmt)
 /*
 	Version Number
 */
-define('ADODB_DATE_VERSION',0.24);
+define('ADODB_DATE_VERSION',0.35);
 
 /*
-	This code was originally for windows. But apparently this problem happens 
+	This code was originally for windows. But apparently this problem happens
 	also with Linux, RH 7.3 and later!
-	
+
 	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
 	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
 	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
-	
+
 	References:
 	 http://bugs.php.net/bug.php?id=20048&edit=2
 	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
@@ -385,12 +407,18 @@ function adodb_daylight_sv(&$arr, $is_gmt)
 
 if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
 
+if (!DEFINED('ADODB_FUTURE_DATE_CUTOFF_YEARS'))
+	DEFINE('ADODB_FUTURE_DATE_CUTOFF_YEARS',200);
+
 function adodb_date_test_date($y1,$m,$d=13)
 {
-	$t = adodb_mktime(0,0,0,$m,$d,$y1);
+	$h = round(rand()% 24);
+	$t = adodb_mktime($h,0,0,$m,$d,$y1);
 	$rez = adodb_date('Y-n-j H:i:s',$t);
-	if ("$y1-$m-$d 00:00:00" != $rez) {
-		print "$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez
";
+	if ($h == 0) $h = '00';
+	else if ($h < 10) $h = '0'.$h;
+	if ("$y1-$m-$d $h:00:00" != $rez) {
+		print "$y1 error, expected=$y1-$m-$d $h:00:00, adodb=$rez
";
 		return false;
 	}
 	return true;
@@ -400,10 +428,10 @@ function adodb_date_test_strftime($fmt)
 {
 	$s1 = strftime($fmt);
 	$s2 = adodb_strftime($fmt);
-	
+
 	if ($s1 == $s2) return true;
-	
-	echo "error for $fmt,  strftime=$s1, $adodb=$s2
";
+
+	echo "error for $fmt,  strftime=$s1, adodb=$s2
";
 	return false;
 }
 
@@ -412,50 +440,62 @@ function adodb_date_test_strftime($fmt)
 */
 function adodb_date_test()
 {
-	
+
+	for ($m=-24; $m<=24; $m++)
+		echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"
";
+
 	error_reporting(E_ALL);
 	print "
Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."
";
 	@set_time_limit(0);
 	$fail = false;
-	
+
 	// This flag disables calling of PHP native functions, so we can properly test the code
 	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-	
+
+	$t = time();
+
+
+	$fmt = 'Y-m-d H:i:s';
+	echo '
';
+	echo 'adodb: ',adodb_date($fmt,$t),'
';
+	echo 'php  : ',date($fmt,$t),'
';
+	echo '
';
+
 	adodb_date_test_strftime('%Y %m %x %X');
 	adodb_date_test_strftime("%A %d %B %Y");
 	adodb_date_test_strftime("%H %M S");
-	
+
 	$t = adodb_mktime(0,0,0);
 	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'
';
-	
+
 	$t = adodb_mktime(0,0,0,6,1,2102);
 	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'
';
-	
+
 	$t = adodb_mktime(0,0,0,2,1,2102);
 	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'
';
-	
-	
+
+
 	print "
Testing gregorian <=> julian conversion
";
 	$t = adodb_mktime(0,0,0,10,11,1492);
 	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
 	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing
';
-	
+
 	$t = adodb_mktime(0,0,0,2,29,1500);
 	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years
';
-	
+
 	$t = adodb_mktime(0,0,0,2,29,1700);
 	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years
';
-	
+
 	print  adodb_mktime(0,0,0,10,4,1582).' ';
 	print adodb_mktime(0,0,0,10,15,1582);
 	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
 	if ($diff != 3600*24) print " Error in gregorian correction = ".($diff/3600/24)." days 
";
-		
+
 	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : 'Error')."
";
 	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : 'Error')."
";
-	
+
 	print "
Testing overflow
";
-	
+
 	$t = adodb_mktime(0,0,0,3,33,1965);
 	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 
';
 	$t = adodb_mktime(0,0,0,4,33,1971);
@@ -468,7 +508,7 @@ function adodb_date_test()
 	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' 
';
 	$t = adodb_mktime(0,0,0,13,3,1965);
 	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 
';
-	
+
 	print "Testing 2-digit => 4-digit year conversion
";
 	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000
";
 	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010
";
@@ -477,9 +517,10 @@ function adodb_date_test()
 	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940
";
 	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950
";
 	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990
";
-	
-	// Test string formating
-	print "
Testing date formating
";
+
+	// 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);
 	$s2 = adodb_date($fmt,0);
@@ -502,12 +543,12 @@ function adodb_date_test()
 					break;
 				}
 			}
-			print "Error date(): $ts
 
+			print "Error date(): $ts
   \"$s1\" (date len=".strlen($s1).")
   \"$s2\" (adodb_date len=".strlen($s2).")

";
 			$fail = true;
 		}
-		
+
 		$a1 = getdate($ts);
 		$a2 = adodb_getdate($ts);
 		$rez = array_diff($a1,$a2);
@@ -520,7 +561,7 @@ function adodb_date_test()
 			$fail = true;
 		}
 	}
-	
+
 	// Test generation of dates outside 1901-2038
 	print "
Testing random dates between 100 and 4000
";
 	adodb_date_test_date(100,1);
@@ -528,7 +569,7 @@ function adodb_date_test()
 		$y1 = 100+rand(0,1970-100);
 		$m = rand(1,12);
 		adodb_date_test_date($y1,$m);
-		
+
 		$y1 = 3000-rand(0,3000-1970);
 		adodb_date_test_date($y1,$m);
 	}
@@ -539,7 +580,7 @@ function adodb_date_test()
 	$offset = 36000+rand(10000,60000);
 	$max = 365*$yrs*86400;
 	$lastyear = 0;
-	
+
 	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
 	// and check if the roundtrip broke the original timestamp value.
 	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
@@ -565,59 +606,65 @@ function adodb_date_test()
 	else print "
Failed :-(
";
 }
 
+function adodb_time()
+{
+	$d = new DateTime();
+	return $d->format('U');
+}
+
 /**
-	Returns day of week, 0 = Sunday,... 6=Saturday. 
+	Returns day of week, 0 = Sunday,... 6=Saturday.
 	Algorithm from PEAR::Date_Calc
 */
 function adodb_dow($year, $month, $day)
 {
 /*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 
-proclaimed that from that time onwards 3 days would be dropped from the calendar 
+Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and
+proclaimed that from that time onwards 3 days would be dropped from the calendar
 every 400 years.
 
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
+Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian).
 */
 	if ($year <= 1582) {
-		if ($year < 1582 || 
+		if ($year < 1582 ||
 			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
 		 else
 			$greg_correction = 0;
 	} else
 		$greg_correction = 0;
-	
+
 	if($month > 2)
 	    $month -= 2;
 	else {
 	    $month += 10;
 	    $year--;
 	}
-	
+
 	$day =  floor((13 * $month - 1) / 5) +
 	        $day + ($year % 100) +
 	        floor(($year % 100) / 4) +
 	        floor(($year / 100) / 4) - 2 *
 	        floor($year / 100) + 77 + $greg_correction;
-	
+
 	return $day - 7 * floor($day / 7);
 }
 
 
 /**
- Checks for leap year, returns true if it is. No 2-digit year check. Also 
+ Checks for leap year, returns true if it is. No 2-digit year check. Also
  handles julian calendar correctly.
 */
-function _adodb_is_leap_year($year) 
+function _adodb_is_leap_year($year)
 {
 	if ($year % 4 != 0) return false;
-	
+
 	if ($year % 400 == 0) {
 		return true;
 	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
 	} else if ($year > 1582 && $year % 100 == 0 ) {
 		return false;
-	} 
-	
+	}
+
 	return true;
 }
 
@@ -625,7 +672,7 @@ function _adodb_is_leap_year($year)
 /**
  checks for leap year, returns true if it is. Has 2-digit year check
 */
-function adodb_is_leap_year($year) 
+function adodb_is_leap_year($year)
 {
 	return  _adodb_is_leap_year(adodb_year_digit_check($year));
 }
@@ -634,13 +681,13 @@ function adodb_is_leap_year($year)
 	Fix 2-digit years. Works for any century.
  	Assumes that if 2-digit is more than 30 years in future, then previous century.
 */
-function adodb_year_digit_check($y) 
+function adodb_year_digit_check($y)
 {
 	if ($y < 100) {
-	
+
 		$yr = (integer) date("Y");
 		$century = (integer) ($yr /100);
-		
+
 		if ($yr%100 > 50) {
 			$c1 = $century + 1;
 			$c0 = $century;
@@ -657,15 +704,52 @@ function adodb_year_digit_check($y)
 	return $y;
 }
 
+function adodb_get_gmt_diff_ts($ts)
+{
+	if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
+		$arr = getdate($ts);
+		$y = $arr['year'];
+		$m = $arr['mon'];
+		$d = $arr['mday'];
+		return adodb_get_gmt_diff($y,$m,$d);
+	} else {
+		return adodb_get_gmt_diff(false,false,false);
+	}
+
+}
+
 /**
- get local time zone offset from GMT
+ get local time zone offset from GMT. Does not handle historical timezones before 1970.
 */
-function adodb_get_gmt_diff() 
+function adodb_get_gmt_diff($y,$m,$d)
 {
-static $TZ;
-	if (isset($TZ)) return $TZ;
-	
-	$TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);
+	static $TZ,$tzo;
+
+	if (!defined('ADODB_TEST_DATES')) $y = false;
+	else if ($y < 1970 || $y >= 2038) $y = false;
+
+	if ($y !== false) {
+		$dt = new DateTime();
+		$dt->setISODate($y,$m,$d);
+		if (empty($tzo)) {
+			$tzo = new DateTimeZone(date_default_timezone_get());
+		#	$tzt = timezone_transitions_get( $tzo );
+		}
+		return -$tzo->getOffset($dt);
+	} else {
+		if (isset($TZ)) return $TZ;
+		$y = date('Y');
+		/*
+		if (function_exists('date_default_timezone_get') && function_exists('timezone_offset_get')) {
+			$tzonename = date_default_timezone_get();
+			if ($tzonename) {
+				$tobj = new DateTimeZone($tzonename);
+				$TZ = -timezone_offset_get($tobj,new DateTime("now",$tzo));
+			}
+		}
+		*/
+		if (empty($TZ)) $TZ = mktime(0,0,0,12,2,$y) - gmmktime(0,0,0,12,2,$y);
+	}
 	return $TZ;
 }
 
@@ -691,7 +775,7 @@ function adodb_date_gentable($out=true)
 
 	for ($i=1970; $i >= 1600; $i-=10) {
 		$s = adodb_gmmktime(0,0,0,1,1,$i);
-		echo "$i => $s,
";	
+		echo "$i => $s,
";
 	}
 }
 adodb_date_gentable();
@@ -707,22 +791,22 @@ function adodb_date_gentable($out=true)
 
 $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 $_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 function adodb_validdate($y,$m,$d)
 {
 global $_month_table_normal,$_month_table_leaf;
 
-	if (_adodb_is_leap_year($y)) $marr =& $_month_table_leaf;
-	else $marr =& $_month_table_normal;
-	
+	if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
+	else $marr = $_month_table_normal;
+
 	if ($m > 12 || $m < 1) return false;
-	
+
 	if ($d > 31 || $d < 1) return false;
-	
+
 	if ($marr[$m] < $d) return false;
-	
-	if ($y < 1000 && $y > 3000) return false;
-	
+
+	if ($y < 1000 || $y > 3000) return false;
+
 	return true;
 }
 
@@ -734,24 +818,33 @@ function adodb_validdate($y,$m,$d)
 function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 {
 static $YRS;
-global $_month_table_normal,$_month_table_leaf;
+global $_month_table_normal,$_month_table_leaf, $_adodb_last_date_call_failed;
+
+	$_adodb_last_date_call_failed = false;
 
-	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
-	
+	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff_ts($origd));
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
-	
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
-	
+
+	$cutoffDate = time() + (60 * 60 * 24 * 365 * ADODB_FUTURE_DATE_CUTOFF_YEARS);
+
+	if ($d > $cutoffDate)
+	{
+		$d = $cutoffDate;
+		$_adodb_last_date_call_failed = true;
+	}
+
+	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction
+
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 	$d366 = $_day_power * 366;
 	$d365 = $_day_power * 365;
-	
+
 	if ($d < 0) {
-		
+
 		if (empty($YRS)) $YRS = array(
 			1970 => 0,
 			1960 => -315619200,
@@ -793,28 +886,28 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 			1600 => -11676096000);
 
 		if ($is_gmt) $origd = $d;
-		// The valid range of a 32bit signed timestamp is typically from 
+		// The valid range of a 32bit signed timestamp is typically from
 		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
 		//
-		
+
 		# old algorithm iterates through all years. new algorithm does it in
 		# 10 year blocks
-		
+
 		/*
 		# old algo
 		for ($a = 1970 ; --$a >= 0;) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
 			else $d += $d365;
-			
+
 			if ($d >= 0) {
 				$year = $a;
 				break;
 			}
 		}
 		*/
-		
+
 		$lastsecs = 0;
 		$lastyear = 1970;
 		foreach($YRS as $year => $secs) {
@@ -825,27 +918,27 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 			$lastsecs = $secs;
 			$lastyear = $year;
 		}
-		
+
 		$d -= $lastsecs;
 		if (!isset($a)) $a = $lastyear;
-		
+
 		//echo ' yr=',$a,' ', $d,'.';
-		
+
 		for (; --$a >= 0;) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
 			else $d += $d365;
-			
+
 			if ($d >= 0) {
 				$year = $a;
 				break;
 			}
 		}
 		/**/
-		
+
 		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-		
+
 		$d = $lastd;
 		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
 		for ($a = 13 ; --$a > 0;) {
@@ -857,17 +950,17 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 				break;
 			}
 		}
-		
+
 		$d = $lastd;
 		$day = $ndays + ceil(($d+1) / ($_day_power));
 
 		$d += ($ndays - $day+1)* $_day_power;
 		$hour = floor($d/$_hour_power);
-	
+
 	} else {
 		for ($a = 1970 ;; $a++) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
 			else $d -= $d365;
 			if ($d < 0) {
@@ -892,7 +985,7 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 		$d = $d - ($day-1) * $_day_power;
 		$hour = floor($d /$_hour_power);
 	}
-	
+
 	$d -= $hour * $_hour_power;
 	$min = floor($d/$_min_power);
 	$secs = $d - $min * $_min_power;
@@ -909,8 +1002,8 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 		'ndays' => $ndays
 		);
 	}
-	
-	
+
+
 	$dow = adodb_dow($year,$month,$day);
 
 	return array(
@@ -928,6 +1021,22 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 	);
 }
 
+/**
+ * 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;
+	$hrs = floor($zhrs);
+	return sprintf('%s%02d%02d', ($gmt <= 0) ? '+' : '-', $hrs, ($zhrs - $hrs) * 60);
+}
+
+
 function adodb_gmdate($fmt,$d=false)
 {
 	return adodb_date($fmt,$d,true);
@@ -937,17 +1046,17 @@ function adodb_gmdate($fmt,$d=false)
 function adodb_date2($fmt, $d=false, $is_gmt=false)
 {
 	if ($d !== false) {
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
 
 		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
-	
+
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
 		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
 	}
-	
+
 	return adodb_date($fmt,$d,$is_gmt);
 }
 
@@ -957,69 +1066,88 @@ function adodb_date2($fmt, $d=false, $is_gmt=false)
 */
 function adodb_date($fmt,$d=false,$is_gmt=false)
 {
-static $daylight;
+	static $daylight;
+	static $jan1_1971;
+
+	if (!isset($daylight)) {
+		$daylight = function_exists('adodb_daylight_sv');
+		if (empty($jan1_1971)) $jan1_1971 = mktime(0,0,0,1,1,1971); // we only use date() when > 1970 as adodb_mktime() only uses mktime() when > 1970
+	}
 
 	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
 	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
+
+		/*
+		* 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);
 
 		}
 	}
 	$_day_power = 86400;
-	
+
 	$arr = _adodb_getdate($d,true,$is_gmt);
-	
-	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
+
 	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
-	
+
 	$year = $arr['year'];
 	$month = $arr['mon'];
 	$day = $arr['mday'];
 	$hour = $arr['hours'];
 	$min = $arr['minutes'];
 	$secs = $arr['seconds'];
-	
+
 	$max = strlen($fmt);
 	$dates = '';
-	
-	$isphp5 = PHP_VERSION >= 5;
-	
+
 	/*
 		at this point, we have the following integer vars to manipulate:
 		$year, $month, $day, $hour, $min, $secs
 	*/
 	for ($i=0; $i < $max; $i++) {
 		switch($fmt[$i]) {
-		case 'T': $dates .= date('T');break;
+		case 'e':
+			$dates .= date('e');
+			break;
+		case 'T':
+			$dt = new DateTime();
+			$dt->SetDate($year,$month,$day);
+			$dates .= $dt->Format('T');
+			break;
 		// YEAR
 		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
 		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-		
+
 			// 4.3.11 uses '04 Jun 2004'
 			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
+			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '
 				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-			
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
-			
+
+			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour;
+
 			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
-			
+
 			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
-			
-			$gmt = adodb_get_gmt_diff();
-			if ($isphp5) 
-				$dates .= sprintf(' %s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-			else
-				$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+
+			$gmt = adodb_get_gmt_diff($year,$month,$day);
+
+			$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;
@@ -1027,54 +1155,54 @@ 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;
 		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S': 
+		case 'S':
 			$d10 = $day % 10;
 			if ($d10 == 1) $dates .= 'st';
 			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
 			else if ($d10 == 3) $dates .= 'rd';
 			else $dates .= 'th';
 			break;
-			
+
 		// HOUR
 		case 'Z':
-			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
-		case 'O': 
-			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-			
-			if ($isphp5)
-				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-			else
-				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
+		case 'O':
+			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
+
+			$dates .= adodb_tz_offset($gmt);
 			break;
-			
-		case 'H': 
-			if ($hour < 10) $dates .= '0'.$hour; 
-			else $dates .= $hour; 
+
+		case 'H':
+			if ($hour < 10) $dates .= '0'.$hour;
+			else $dates .= $hour;
 			break;
-		case 'h': 
-			if ($hour > 12) $hh = $hour - 12; 
+		case 'h':
+			if ($hour > 12) $hh = $hour - 12;
 			else {
-				if ($hour == 0) $hh = '12'; 
+				if ($hour == 0) $hh = '12';
 				else $hh = $hour;
 			}
-			
+
 			if ($hh < 10) $dates .= '0'.$hh;
 			else $dates .= $hh;
 			break;
-			
-		case 'G': 
+
+		case 'G':
 			$dates .= $hour;
 			break;
-			
+
 		case 'g':
-			if ($hour > 12) $hh = $hour - 12; 
+			if ($hour > 12) $hh = $hour - 12;
 			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour; 
+				if ($hour == 0) $hh = '12';
+				else $hh = $hour;
 			}
 			$dates .= $hh;
 			break;
@@ -1096,7 +1224,7 @@ function adodb_date($fmt,$d=false,$is_gmt=false)
 		default:
 			$dates .= $fmt[$i]; break;
 		// ESCAPE
-		case "\\": 
+		case "\\":
 			$i++;
 			if ($i < $max) $dates .= $fmt[$i];
 			break;
@@ -1106,7 +1234,7 @@ function adodb_date($fmt,$d=false,$is_gmt=false)
 }
 
 /**
-	Returns a timestamp given a GMT/UTC time. 
+	Returns a timestamp given a GMT/UTC time.
 	Note that $is_dst is not implemented and is ignored.
 */
 function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
@@ -1117,29 +1245,34 @@ function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=
 /**
 	Return a timestamp given a local time. Originally by jackbbs.
 	Note that $is_dst is not implemented and is ignored.
-	
+
 	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
 */
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
+function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false)
 {
 	if (!defined('ADODB_TEST_DATES')) {
 
 		if ($mon === false) {
 			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
 		}
-		
-		// for windows, we don't check 1970 because with timezone differences, 
+
+		// for windows, we don't check 1970 because with timezone differences,
 		// 1 Jan 1970 could generate negative timestamp, which is illegal
-		if (1971 < $year && $year < 2038
+		$usephpfns = (1970 < $year && $year < 2038
 			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-			) {
+			);
+
+
+		if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
+
+		if ($usephpfns) {
 				return $is_gmt ?
 					@gmmktime($hr,$min,$sec,$mon,$day,$year):
 					@mktime($hr,$min,$sec,$mon,$day,$year);
-			}
+		}
 	}
-	
-	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+
+	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
 
 	/*
 	# disabled because some people place large values in $sec.
@@ -1151,12 +1284,12 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 	$mon = intval($mon);
 	$day = intval($day);
 	$year = intval($year);
-	
-	
+
+
 	$year = adodb_year_digit_check($year);
 
 	if ($mon > 12) {
-		$y = floor($mon / 12);
+		$y = floor(($mon-1)/ 12);
 		$year += $y;
 		$mon -= $y*12;
 	} else if ($mon < 1) {
@@ -1164,14 +1297,14 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 		$year -= $y;
 		$mon += $y*12;
 	}
-	
+
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
-	
+
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 	$_total_date = 0;
 	if ($year >= 1970) {
 		for ($a = 1970 ; $a <= $year; $a++) {
@@ -1183,7 +1316,7 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 				$loop_table = $_month_table_normal;
 				$_add_date = 365;
 			}
-			if ($a < $year) { 
+			if ($a < $year) {
 				$_total_date += $_add_date;
 			} else {
 				for($b=1;$b<$mon;$b++) {
@@ -1193,7 +1326,7 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 		}
 		$_total_date +=$day-1;
 		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
-	
+
 	} else {
 		for ($a = 1969 ; $a >= $year; $a--) {
 			$leaf = _adodb_is_leap_year($a);
@@ -1212,13 +1345,13 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 			}
 		}
 		$_total_date += $loop_table[$mon] - $day;
-		
+
 		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
 		$_day_time = $_day_power - $_day_time;
 		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
 		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
 		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
-	} 
+	}
 	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
 	return $ret;
 }
@@ -1240,23 +1373,23 @@ function adodb_strftime($fmt, $ts=false,$is_gmt=false)
 
 		}
 	}
-	
+
 	if (empty($ADODB_DATE_LOCALE)) {
 	/*
 		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
 		$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
 		$hasAM = strrpos($tstr,'M') !== false;
-		
+
 		$ADODB_DATE_LOCALE = array();
-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
+		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';
 		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
-			
+
 	}
 	$inpct = false;
 	$fmtdate = '';
@@ -1269,7 +1402,7 @@ function adodb_strftime($fmt, $ts=false,$is_gmt=false)
 			} else
 				$inpct = true;
 		} else if ($inpct) {
-		
+
 			$inpct = false;
 			switch($ch) {
 			case '0':
@@ -1285,9 +1418,9 @@ function adodb_strftime($fmt, $ts=false,$is_gmt=false)
 			case 'E':
 			case 'O':
 				/* ignore format modifiers */
-				$inpct = true; 
+				$inpct = true;
 				break;
-				
+
 			case 'a': $fmtdate .= 'D'; break;
 			case 'A': $fmtdate .= 'l'; break;
 			case 'h':
@@ -1333,5 +1466,15 @@ function adodb_strftime($fmt, $ts=false,$is_gmt=false)
 	return $ret;
 }
 
+/**
+* Returns the status of the last date calculation and whether it exceeds
+* the limit of ADODB_FUTURE_DATE_CUTOFF_YEARS
+*
+* @return boolean
+*/
+function adodb_last_date_status()
+{
+	global $_adodb_last_date_call_failed;
 
-?>
\ No newline at end of file
+	return $_adodb_last_date_call_failed;
+}
diff --git a/adodb/adodb-xmlschema.inc.php b/adodb/adodb-xmlschema.inc.php
index c925f0b..58e3aff 100644
--- a/adodb/adodb-xmlschema.inc.php
+++ b/adodb/adodb-xmlschema.inc.php
@@ -1,31 +1,39 @@
 parent =& $parent;
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
 	* @access private
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
-	function create() {
+
+	function create(&$xmls) {
 		return array();
 	}
-	
+
 	/**
 	* Destroys the object
 	*/
 	function destroy() {
-		unset( $this );
 	}
-	
+
 	/**
 	* Checks whether the specified RDBMS is supported by the current
 	* database object or its ranking ancestor.
@@ -170,7 +177,7 @@ function destroy() {
 	function supportedPlatform( $platform = NULL ) {
 		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
 	}
-	
+
 	/**
 	* Returns the prefix set by the ranking ancestor of the database object.
 	*
@@ -180,7 +187,7 @@ function supportedPlatform( $platform = NULL ) {
 	function prefix( $name = '' ) {
 		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
 	}
-	
+
 	/**
 	* Extracts a field ID from the specified field.
 	*
@@ -204,73 +211,75 @@ function FieldID( $field ) {
 * @access private
 */
 class dbTable extends dbObject {
-	
+
 	/**
 	* @var string Table name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array Field specifier: Meta-information about each field
 	*/
 	var $fields = array();
-	
+
 	/**
 	* @var array List of table indexes.
 	*/
 	var $indexes = array();
-	
+
 	/**
 	* @var array Table options: Table-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var string Field index: Keeps track of which field is currently being processed
 	*/
 	var $current_field;
-	
+
 	/**
 	* @var boolean Mark table for destruction
 	* @access private
 	*/
 	var $drop_table;
-	
+
 	/**
 	* @var boolean Mark field for destruction (not yet implemented)
 	* @access private
 	*/
 	var $drop_field = array();
-	
+
 	/**
 	* Iniitializes a new table object.
 	*
 	* @param string $prefix DB Object prefix
 	* @param array $attributes Array of table attributes.
 	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'INDEX':
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
+					$index = $this->addIndex( $attributes );
+					xml_set_object( $parser,  $index );
 				}
 				break;
 			case 'DATA':
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
+					$data = $this->addData( $attributes );
+					xml_set_object( $parser, $data );
 				}
 				break;
 			case 'DROP':
@@ -282,7 +291,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				$fieldType = $attributes['TYPE'];
 				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
 				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
+
 				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
 				break;
 			case 'KEY':
@@ -293,12 +302,12 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				break;
 			case 'DEFAULT':
 				// Add a field option to the table object
-				
+
 				// Work around ADOdb datadict issue that misinterprets empty strings.
 				if( $attributes['VALUE'] == '' ) {
 					$attributes['VALUE'] = " '' ";
 				}
-				
+
 				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
 				break;
 			case 'DEFDATE':
@@ -310,7 +319,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -331,10 +340,10 @@ function _tag_cdata( &$parser, $cdata ) {
 				$this->addTableOpt( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -342,7 +351,7 @@ function _tag_cdata( &$parser, $cdata ) {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'TABLE':
 				$this->parent->addSQL( $this->create( $this->parent ) );
@@ -355,36 +364,36 @@ function _tag_close( &$parser, $tag ) {
 
 		}
 	}
-	
+
 	/**
 	* Adds an index to a table object
 	*
 	* @param array $attributes Index attributes
 	* @return object dbIndex object
 	*/
-	function &addIndex( $attributes ) {
+	function addIndex( $attributes ) {
 		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] =& new dbIndex( $this, $attributes );
+		$this->indexes[$name] = new dbIndex( $this, $attributes );
 		return $this->indexes[$name];
 	}
-	
+
 	/**
 	* Adds data to a table object
 	*
 	* @param array $attributes Data attributes
 	* @return object dbData object
 	*/
-	function &addData( $attributes ) {
+	function addData( $attributes ) {
 		if( !isset( $this->data ) ) {
-			$this->data =& new dbData( $this, $attributes );
+			$this->data = new dbData( $this, $attributes );
 		}
 		return $this->data;
 	}
-	
+
 	/**
 	* Adds a field to a table object
 	*
-	* $name is the name of the table to which the field should be added. 
+	* $name is the name of the table to which the field should be added.
 	* $type is an ADODB datadict field type. The following field types
 	* are supported as of ADODB 3.40:
 	* 	- C:  varchar
@@ -412,31 +421,31 @@ function &addData( $attributes ) {
 	*/
 	function addField( $name, $type, $size = NULL, $opts = NULL ) {
 		$field_id = $this->FieldID( $name );
-		
+
 		// Set the field index so we know where we are
 		$this->current_field = $field_id;
-		
+
 		// Set the field name (required)
 		$this->fields[$field_id]['NAME'] = $name;
-		
+
 		// Set the field type (required)
 		$this->fields[$field_id]['TYPE'] = $type;
-		
+
 		// Set the field size (optional)
 		if( isset( $size ) ) {
 			$this->fields[$field_id]['SIZE'] = $size;
 		}
-		
+
 		// Set the field options
 		if( isset( $opts ) ) {
 			$this->fields[$field_id]['OPTS'][] = $opts;
 		}
 	}
-	
+
 	/**
 	* Adds a field option to the current field specifier
 	*
-	* This method adds a field option allowed by the ADOdb datadict 
+	* This method adds a field option allowed by the ADOdb datadict
 	* and appends it to the given field.
 	*
 	* @param string $field	Field name
@@ -452,7 +461,7 @@ function addFieldOpt( $field, $opt, $value = NULL ) {
 			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
 		}
 	}
-	
+
 	/**
 	* Adds an option to the table
 	*
@@ -463,11 +472,13 @@ function addFieldOpt( $field, $opt, $value = NULL ) {
 	* @return array Options
 	*/
 	function addTableOpt( $opt ) {
-		$this->opts[] = $opt;
-		
+		if(isset($this->currentPlatform)) {
+			$this->opts[$this->parent->db->databaseType] = $opt;
+		}
 		return $this->opts;
 	}
-	
+
+
 	/**
 	* Generates the SQL that will create the table in the database
 	*
@@ -476,28 +487,28 @@ function addTableOpt( $opt ) {
 	*/
 	function create( &$xmls ) {
 		$sql = array();
-		
+
 		// drop any existing indexes
 		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
 			foreach( $legacy_indexes as $index => $index_details ) {
 				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
 			}
 		}
-		
+
 		// remove fields to be dropped from table object
 		foreach( $this->drop_field as $field ) {
 			unset( $this->fields[$field] );
 		}
-		
+
 		// if table exists
 		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
 			// drop table
 			if( $this->drop_table ) {
 				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
+
 				return $sql;
 			}
-			
+
 			// drop any existing fields not in schema
 			foreach( $legacy_fields as $field_id => $field ) {
 				if( !isset( $this->fields[$field_id] ) ) {
@@ -509,27 +520,27 @@ function create( &$xmls ) {
 			if( $this->drop_table ) {
 				return $sql;
 			}
-			
+
 			$legacy_fields = array();
 		}
-		
+
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
-		
+
 		foreach( $this->fields as $field_id => $finfo ) {
 			// Set an empty size if it isn't supplied
 			if( !isset( $finfo['SIZE'] ) ) {
 				$finfo['SIZE'] = '';
 			}
-			
+
 			// Initialize the field array with the type and size
 			$fldarray[$field_id] = array(
 				'NAME' => $finfo['NAME'],
 				'TYPE' => $finfo['TYPE'],
 				'SIZE' => $finfo['SIZE']
 			);
-			
-			// Loop through the options array and add the field options. 
+
+			// Loop through the options array and add the field options.
 			if( isset( $finfo['OPTS'] ) ) {
 				foreach( $finfo['OPTS'] as $opt ) {
 					// Option has an argument.
@@ -544,7 +555,7 @@ function create( &$xmls ) {
 				}
 			}
 		}
-		
+
 		if( empty( $legacy_fields ) ) {
 			// Create the new table
 			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
@@ -568,18 +579,18 @@ function create( &$xmls ) {
 					return array();
 			}
 		}
-		
+
 		foreach( $this->indexes as $index ) {
 			$sql[] = $index->create( $xmls );
 		}
-		
+
 		if( isset( $this->data ) ) {
 			$sql[] = $this->data->create( $xmls );
 		}
-		
+
 		return $sql;
 	}
-	
+
 	/**
 	* Marks a field or table for destruction
 	*/
@@ -610,28 +621,28 @@ function drop() {
 * @access private
 */
 class dbIndex extends dbObject {
-	
+
 	/**
 	* @var string	Index name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array	Index options: Index-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var array	Indexed fields: Table columns included in this index
 	*/
 	var $columns = array();
-	
+
 	/**
 	* @var boolean Mark index for destruction
 	* @access private
 	*/
 	var $drop = FALSE;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -640,23 +651,23 @@ class dbIndex extends dbObject {
 	*
 	* @internal
 	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+
 		$this->name = $this->prefix ($attributes['NAME']);
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	* Processes XML opening tags.
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'DROP':
 				$this->drop();
@@ -673,7 +684,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -688,10 +699,10 @@ function _tag_cdata( &$parser, $cdata ) {
 				$this->addField( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -699,14 +710,14 @@ function _tag_cdata( &$parser, $cdata ) {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'INDEX':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the index
 	*
@@ -715,11 +726,11 @@ function _tag_close( &$parser, $tag ) {
 	*/
 	function addField( $name ) {
 		$this->columns[$this->FieldID( $name )] = $name;
-		
+
 		// Return the field list
 		return $this->columns;
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -728,11 +739,11 @@ function addField( $name ) {
 	*/
 	function addIndexOpt( $opt ) {
 		$this->opts[] = $opt;
-		
+
 		// Return the options list
 		return $this->opts;
 	}
-	
+
 	/**
 	* Generates the SQL that will create the index in the database
 	*
@@ -743,17 +754,17 @@ function create( &$xmls ) {
 		if( $this->drop ) {
 			return NULL;
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->columns as $id => $col ) {
 			if( !isset( $this->parent->fields[$id] ) ) {
 				unset( $this->columns[$id] );
 			}
 		}
-		
+
 		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
 	}
-	
+
 	/**
 	* Marks an index for destruction
 	*/
@@ -771,11 +782,11 @@ function drop() {
 * @access private
 */
 class dbData extends dbObject {
-	
+
 	var $data = array();
-	
+
 	var $row;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -784,21 +795,21 @@ class dbData extends dbObject {
 	*
 	* @internal
 	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	* Processes XML opening tags.
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'ROW':
 				$this->row = count( $this->data );
@@ -810,7 +821,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -825,10 +836,10 @@ function _tag_cdata( &$parser, $cdata ) {
 				$this->addData( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -836,14 +847,14 @@ function _tag_cdata( &$parser, $cdata ) {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'DATA':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the index
 	*
@@ -856,11 +867,11 @@ function addField( $attributes ) {
 		} else {
 			$name = count($this->data[$this->row]);
 		}
-		
+
 		// Set the field index so we know where we are
 		$this->current_field = $this->FieldID( $name );
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -871,14 +882,14 @@ function addData( $cdata ) {
 		if( !isset( $this->data[$this->row] ) ) {
 			$this->data[$this->row] = array();
 		}
-		
+
 		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
 			$this->data[$this->row][$this->current_field] = '';
 		}
-		
+
 		$this->data[$this->row][$this->current_field] .= $cdata;
 	}
-	
+
 	/**
 	* Generates the SQL that will create the index in the database
 	*
@@ -889,12 +900,12 @@ function create( &$xmls ) {
 		$table = $xmls->dict->TableName($this->parent->name);
 		$table_field_count = count($this->parent->fields);
 		$sql = array();
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->data as $row ) {
 			$table_fields = $this->parent->fields;
 			$fields = array();
-			
+
 			foreach( $row as $field_id => $field_data ) {
 				if( !array_key_exists( $field_id, $table_fields ) ) {
 					if( is_numeric( $field_id ) ) {
@@ -903,9 +914,9 @@ function create( &$xmls ) {
 						continue;
 					}
 				}
-				
+
 				$name = $table_fields[$field_id]['NAME'];
-				
+
 				switch( $table_fields[$field_id]['TYPE'] ) {
 					case 'C':
 					case 'C2':
@@ -923,15 +934,15 @@ function create( &$xmls ) {
 					default:
 						$fields[$name] = $field_data;
 				}
-				
+
 				unset($table_fields[$field_id]);
 			}
-			
+
 			// check that at least 1 column is specified
 			if( empty( $fields ) ) {
 				continue;
 			}
-			
+
 			// check that no required columns are missing
 			if( count( $fields ) < $table_field_count ) {
 				foreach( $table_fields as $field ) {
@@ -941,10 +952,10 @@ function create( &$xmls ) {
 						}
 				}
 			}
-			
+
 			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 		}
-		
+
 		return $sql;
 	}
 }
@@ -956,43 +967,43 @@ function create( &$xmls ) {
 * @access private
 */
 class dbQuerySet extends dbObject {
-	
+
 	/**
 	* @var array	List of SQL queries
 	*/
 	var $queries = array();
-	
+
 	/**
 	* @var string	String used to build of a query line by line
 	*/
 	var $query;
-	
+
 	/**
 	* @var string	Query prefix key
 	*/
 	var $prefixKey = '';
-	
+
 	/**
 	* @var boolean	Auto prefix enable (TRUE)
 	*/
 	var $prefixMethod = 'AUTO';
-	
+
 	/**
 	* Initializes the query set.
 	*
 	* @param object $parent Parent object
 	* @param array $attributes Attributes
 	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-			
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+
 		// Overrides the manual prefix key
 		if( isset( $attributes['KEY'] ) ) {
 			$this->prefixKey = $attributes['KEY'];
 		}
-		
+
 		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
+
 		// Enables or disables automatic prefix prepending
 		switch( $prefixMethod ) {
 			case 'AUTO':
@@ -1006,20 +1017,20 @@ function dbQuerySet( &$parent, $attributes = NULL ) {
 				break;
 		}
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: QUERY.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'QUERY':
 				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
+				// Ignore this query set if a platform is specified and it's different than the
 				// current connection platform.
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					$this->newQuery();
@@ -1031,7 +1042,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*/
@@ -1042,10 +1053,10 @@ function _tag_cdata( &$parser, $cdata ) {
 				$this->buildQuery( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1053,7 +1064,7 @@ function _tag_cdata( &$parser, $cdata ) {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'QUERY':
 				// Add the finished query to the open query set.
@@ -1065,10 +1076,10 @@ function _tag_close( &$parser, $tag ) {
 				$this->destroy();
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* Re-initializes the query.
 	*
@@ -1076,10 +1087,10 @@ function _tag_close( &$parser, $tag ) {
 	*/
 	function newQuery() {
 		$this->query = '';
-		
+
 		return TRUE;
 	}
-	
+
 	/**
 	* Discards the existing query.
 	*
@@ -1087,11 +1098,11 @@ function newQuery() {
 	*/
 	function discardQuery() {
 		unset( $this->query );
-		
+
 		return TRUE;
 	}
-	
-	/** 
+
+	/**
 	* Appends a line to a query that is being built line by line
 	*
 	* @param string $data Line of SQL data or NULL to initialize a new query
@@ -1101,12 +1112,12 @@ function buildQuery( $sql = NULL ) {
 		if( !isset( $this->query ) OR empty( $sql ) ) {
 			return FALSE;
 		}
-		
+
 		$this->query .= $sql;
-		
+
 		return $this->query;
 	}
-	
+
 	/**
 	* Adds a completed query to the query list
 	*
@@ -1116,14 +1127,14 @@ function addQuery() {
 		if( !isset( $this->query ) ) {
 			return FALSE;
 		}
-		
+
 		$this->queries[] = $return = trim($this->query);
-		
+
 		unset( $this->query );
-		
+
 		return $return;
 	}
-	
+
 	/**
 	* Creates and returns the current query set
 	*
@@ -1135,16 +1146,16 @@ function create( &$xmls ) {
 			switch( $this->prefixMethod ) {
 				case 'AUTO':
 					// Enable auto prefix replacement
-					
+
 					// Process object prefix.
 					// Evaluate SQL statements to prepend prefix to objects
 					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
 					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
 					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
+
 					// SELECT statements aren't working yet
 					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
+
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
@@ -1156,14 +1167,14 @@ function create( &$xmls ) {
 						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
 					}
 			}
-			
+
 			$this->queries[$id] = trim( $query );
 		}
-		
+
 		// Return the query set array
 		return $this->queries;
 	}
-	
+
 	/**
 	* Rebuilds the query with the prefix attached to any objects
 	*
@@ -1176,120 +1187,114 @@ function prefixQuery( $regex, $query, $prefix = NULL ) {
 		if( !isset( $prefix ) ) {
 			return $query;
 		}
-		
+
 		if( preg_match( $regex, $query, $match ) ) {
 			$preamble = $match[1];
 			$postamble = $match[5];
 			$objectList = explode( ',', $match[3] );
 			// $prefix = $prefix . '_';
-			
+
 			$prefixedList = '';
-			
+
 			foreach( $objectList as $object ) {
 				if( $prefixedList !== '' ) {
 					$prefixedList .= ', ';
 				}
-				
+
 				$prefixedList .= $prefix . trim( $object );
 			}
-			
+
 			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
 		}
-		
+
 		return $query;
 	}
 }
 
 /**
 * Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
+*
 * This class is used to load and parse the XML file, to create an array of SQL statements
 * that can be used to build a database, and to build the database using the SQL array.
 *
 * @tutorial getting_started.pkg
 *
 * @author Richard Tango-Lowy & Dan Cech
-* @version $Revision$
+* @version $Revision: 1.12 $
 *
 * @package axmls
 */
 class adoSchema {
-	
+
 	/**
 	* @var array	Array containing SQL queries to generate all objects
 	* @access private
 	*/
 	var $sqlArray;
-	
+
 	/**
 	* @var object	ADOdb connection object
 	* @access private
 	*/
 	var $db;
-	
+
 	/**
 	* @var object	ADOdb Data Dictionary
 	* @access private
 	*/
 	var $dict;
-	
+
 	/**
 	* @var string Current XML element
 	* @access private
 	*/
 	var $currentElement = '';
-	
+
 	/**
 	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
 	* @access private
 	*/
 	var $upgrade = '';
-	
+
 	/**
 	* @var string Optional object prefix
 	* @access private
 	*/
 	var $objectPrefix = '';
-	
-	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
-	var $mgq;
-	
+
 	/**
 	* @var long	System debug
 	* @access private
 	*/
 	var $debug;
-	
+
 	/**
 	* @var string Regular expression to find schema version
 	* @access private
 	*/
 	var $versionRegex = '//';
-	
+
 	/**
 	* @var string Current schema version
 	* @access private
 	*/
 	var $schemaVersion;
-	
+
 	/**
 	* @var int	Success of last Schema execution
 	*/
 	var $success;
-	
+
 	/**
 	* @var bool	Execute SQL inline as it is generated
 	*/
 	var $executeInline;
-	
+
 	/**
 	* @var bool	Continue SQL execution if errors occur
 	*/
 	var $continueOnError;
-	
+
 	/**
 	* Creates an adoSchema object
 	*
@@ -1299,21 +1304,17 @@ class adoSchema {
 	*
 	* @param object $db ADOdb database connection object.
 	*/
-	function adoSchema( &$db ) {
-		// Initialize the environment
-		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-		
-		$this->db =& $db;
+	function __construct( $db ) {
+		$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 );
 		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
 		$this->setUpgradeMethod();
 	}
-	
+
 	/**
 	* Sets the method to be used for upgrading an existing database
 	*
@@ -1334,9 +1335,9 @@ function SetUpgradeMethod( $method = '' ) {
 		if( !is_string( $method ) ) {
 			return FALSE;
 		}
-		
+
 		$method = strtoupper( $method );
-		
+
 		// Handle the upgrade methods
 		switch( $method ) {
 			case 'ALTER':
@@ -1355,10 +1356,10 @@ function SetUpgradeMethod( $method = '' ) {
 				// Use default if no legitimate method is passed.
 				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
 		}
-		
+
 		return $this->upgrade;
 	}
-	
+
 	/**
 	* Enables/disables inline SQL execution.
 	*
@@ -1376,10 +1377,10 @@ function ExecuteInline( $mode = NULL ) {
 		if( is_bool( $mode ) ) {
 			$this->executeInline = $mode;
 		}
-		
+
 		return $this->executeInline;
 	}
-	
+
 	/**
 	* Enables/disables SQL continue on error.
 	*
@@ -1397,15 +1398,15 @@ function ContinueOnError( $mode = NULL ) {
 		if( is_bool( $mode ) ) {
 			$this->continueOnError = $mode;
 		}
-		
+
 		return $this->continueOnError;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
 	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database described. 
+	* the filesystem and generate the SQL necessary to create the database described.
 	* @see ParseSchemaString()
 	*
 	* @param string $file Name of XML schema file.
@@ -1415,11 +1416,11 @@ function ContinueOnError( $mode = NULL ) {
 	function ParseSchema( $filename, $returnSchema = FALSE ) {
 		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
-	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
+	* Call this method to load the specified schema from a file (see the DTD for the proper format)
 	* and generate the SQL necessary to create the database described by the schema.
 	*
 	* @param string $file Name of XML schema file.
@@ -1435,12 +1436,12 @@ function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
 			return FALSE;
 		}
-		
+
 		if ( $returnSchema )
 		{
 			$xmlstring = '';
@@ -1449,11 +1450,11 @@ function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
 			}
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
@@ -1464,17 +1465,17 @@ function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
 				) );
 			}
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Converts an XML schema string to SQL.
 	*
 	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
+	* and generate the SQL necessary to create the database described by the schema.
 	* @see ParseSchema()
 	*
 	* @param string $xmlstring XML schema string.
@@ -1485,21 +1486,21 @@ function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
 			return FALSE;
 		}
-		
+
 		if ( $returnSchema )
 		{
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
 			die( sprintf(
 				"XML error: %s at line %d",
@@ -1507,12 +1508,12 @@ function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
 				xml_get_current_line_number( $xmlParser)
 			) );
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to uninstallation SQL.
 	*
@@ -1527,12 +1528,12 @@ function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
 	function RemoveSchema( $filename, $returnSchema = FALSE ) {
 		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
-	
+
 	/**
 	* Converts an XML schema string to uninstallation SQL.
 	*
 	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
+	* and generate the SQL necessary to uninstall the database described by the schema.
 	* @see RemoveSchema()
 	*
 	* @param string $schema XML schema string.
@@ -1540,20 +1541,20 @@ function RemoveSchema( $filename, $returnSchema = FALSE ) {
 	* @return array Array of SQL queries, ready to execute.
 	*/
 	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
 			return FALSE;
 		}
-		
+
 		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
 	}
-	
+
 	/**
 	* Applies the current XML schema to the database (post execution).
 	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* Call this method to apply the current schema (generally created by calling
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
 	* and executing other SQL specified in the schema) after parsing.
 	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
 	*
@@ -1566,25 +1567,25 @@ function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
 		if( !is_bool( $continueOnErr ) ) {
 			$continueOnErr = $this->ContinueOnError();
 		}
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			$this->success = 0;
 		} else {
 			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
 		}
-		
+
 		return $this->success;
 	}
-	
+
 	/**
-	* Returns the current SQL array. 
+	* Returns the current SQL array.
 	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
+	* Call this method to fetch the array of SQL queries resulting from
+	* ParseSchema() or ParseSchemaString().
 	*
 	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
 	* @return array Array of SQL statements or FALSE if an error occurs
@@ -1593,7 +1594,7 @@ function PrintSQL( $format = 'NONE' ) {
 		$sqlArray = null;
 		return $this->getSQL( $format, $sqlArray );
 	}
-	
+
 	/**
 	* Saves the current SQL array to the local filesystem as a list of SQL queries.
 	*
@@ -1601,25 +1602,25 @@ function PrintSQL( $format = 'NONE' ) {
 	* parsed XML schema) to the filesystem.
 	*
 	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
+	* @return boolean TRUE if save is successful, else FALSE.
 	*/
 	function SaveSQL( $filename = './schema.sql' ) {
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
 		if( !isset( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		$fp = fopen( $filename, "w" );
-		
+
 		foreach( $sqlArray as $key => $query ) {
 			fwrite( $fp, $query . ";\n" );
 		}
 		fclose( $fp );
 	}
-	
+
 	/**
 	* Create an xml parser
 	*
@@ -1627,18 +1628,18 @@ function SaveSQL( $filename = './schema.sql' ) {
 	*
 	* @access private
 	*/
-	function &create_parser() {
+	function create_parser() {
 		// Create the parser
 		$xmlParser = xml_parser_create();
 		xml_set_object( $xmlParser, $this );
-		
+
 		// Initialize the XML callback functions
 		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
 		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
+
 		return $xmlParser;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
@@ -1659,9 +1660,9 @@ function _tag_open( &$parser, $tag, $attributes ) {
 			default:
 				// print_r( array( $tag, $attributes ) );
 		}
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -1669,7 +1670,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1677,16 +1678,16 @@ function _tag_cdata( &$parser, $cdata ) {
 	* @internal
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	/**
 	* Converts an XML schema string to the specified DTD version.
 	*
 	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaFile()
@@ -1697,44 +1698,44 @@ function _tag_close( &$parser, $tag ) {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = $schema;
 		} else {
 			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
 		}
-		
+
 		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
-	
+
 	// compat for pre-4.3 - jlim
 	function _file_get_contents($path)
 	{
 		if (function_exists('file_get_contents')) return file_get_contents($path);
 		return join('',file($path));
 	}
-	
+
 	/**
 	* Converts an XML schema file to the specified DTD version.
 	*
 	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaString()
@@ -1745,19 +1746,19 @@ function _file_get_contents($path)
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = _file_get_contents( $filename );
-			
+
 			// remove unicode BOM if present
 			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
 				$result = substr( $result, 3 );
@@ -1765,36 +1766,36 @@ function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
 		} else {
 			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
 		}
-		
+
 		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
-	
+
 	function TransformSchema( $schema, $xsl, $schematype='string' )
 	{
 		// Fail if XSLT extension is not available
 		if( ! function_exists( 'xslt_create' ) ) {
 			return FALSE;
 		}
-		
+
 		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
+
 		// look for xsl
 		if( !is_readable( $xsl_file ) ) {
 			return FALSE;
 		}
-		
+
 		switch( $schematype )
 		{
 			case 'file':
 				if( !is_readable( $schema ) ) {
 					return FALSE;
 				}
-				
+
 				$schema = _file_get_contents( $schema );
 				break;
 			case 'string':
@@ -1803,26 +1804,26 @@ function TransformSchema( $schema, $xsl, $schematype='string' )
 					return FALSE;
 				}
 		}
-		
+
 		$arguments = array (
 			'/_xml' => $schema,
 			'/_xsl' => _file_get_contents( $xsl_file )
 		);
-		
+
 		// create an XSLT processor
 		$xh = xslt_create ();
-		
+
 		// set error handler
 		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
+
 		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
+
 		xslt_free ($xh);
-		
+
 		return $result;
 	}
-	
+
 	/**
 	* Processes XSLT transformation errors
 	*
@@ -1842,7 +1843,7 @@ function xslt_error_handler( $parser, $errno, $level, $fields ) {
 				'Error Number' => $errno,
 				'Level' => $level
 			);
-			
+
 			switch( $fields['URI'] ) {
 				case 'arg:/_xml':
 					$msg['Input'] = 'XML';
@@ -1853,7 +1854,7 @@ function xslt_error_handler( $parser, $errno, $level, $fields ) {
 				default:
 					$msg['Input'] = $fields['URI'];
 			}
-			
+
 			$msg['Line'] = $fields['line'];
 		} else {
 			$msg = array(
@@ -1863,19 +1864,19 @@ function xslt_error_handler( $parser, $errno, $level, $fields ) {
 				'Fields' => var_export( $fields, TRUE )
 			);
 		}
-		
+
 		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
 					   . '' . "\n";
-		
+
 		foreach( $msg as $label => $details ) {
 			$error_details .= '' . "\n";
 		}
-		
+
 		$error_details .= '
' . $label . ': ' . htmlentities( $details ) . '
';
-		
+
 		trigger_error( $error_details, E_USER_ERROR );
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the requested XML schema file.
 	*
@@ -1891,17 +1892,17 @@ function SchemaFileVersion( $filename ) {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( preg_match( $this->versionRegex, $data, $matches ) ) {
 				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 			}
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the provided XML schema string.
 	*
@@ -1915,125 +1916,125 @@ function SchemaStringVersion( $xmlstring ) {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
 		}
-		
+
 		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
 			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Extracts an XML schema from an existing database.
 	*
 	* Call this method to create an XML schema string from an existing database.
 	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
+	* in the schema.
 	*
 	* @param boolean $data Include data in schema dump
 	* @return string Generated XML schema
 	*/
 	function ExtractSchema( $data = FALSE ) {
 		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
+
 		$schema = '' . "\n"
 				. '' . "\n";
-		
+
 		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
 			foreach( $tables as $table ) {
 				$schema .= '	' . "\n";
-				
+
 				// grab details from database
 				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
 				$fields = $this->db->MetaColumns( $table );
 				$indexes = $this->db->MetaIndexes( $table );
-				
+
 				if( is_array( $fields ) ) {
 					foreach( $fields as $details ) {
 						$extra = '';
 						$content = array();
-						
+
 						if( $details->max_length > 0 ) {
 							$extra .= ' size="' . $details->max_length . '"';
 						}
-						
+
 						if( $details->primary_key ) {
 							$content[] = '';
 						} elseif( $details->not_null ) {
 							$content[] = '';
 						}
-						
+
 						if( $details->has_default ) {
 							$content[] = '';
 						}
-						
+
 						if( $details->auto_increment ) {
 							$content[] = '';
 						}
-						
+
 						// this stops the creation of 'R' columns,
 						// AUTOINCREMENT is used to create auto columns
 						$details->primary_key = 0;
 						$type = $rs->MetaType( $details );
-						
+
 						$schema .= '		';
-						
+
 						if( !empty( $content ) ) {
 							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
 						}
-						
+
 						$schema .= '' . "\n";
 					}
 				}
-				
+
 				if( is_array( $indexes ) ) {
 					foreach( $indexes as $index => $details ) {
 						$schema .= '		' . "\n";
-						
+
 						if( $details['unique'] ) {
 							$schema .= '			' . "\n";
 						}
-						
+
 						foreach( $details['columns'] as $column ) {
 							$schema .= '			' . $column . '' . "\n";
 						}
-						
+
 						$schema .= '		' . "\n";
 					}
 				}
-				
+
 				if( $data ) {
 					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
+
 					if( is_object( $rs ) ) {
 						$schema .= '		' . "\n";
-						
+
 						while( $row = $rs->FetchRow() ) {
 							foreach( $row as $key => $val ) {
 								$row[$key] = htmlentities($val);
 							}
-							
+
 							$schema .= '			' . implode( '', $row ) . '' . "\n";
 						}
-						
+
 						$schema .= '		' . "\n";
 					}
 				}
-				
+
 				$schema .= '	
' . "\n";
 			}
 		}
-		
+
 		$this->db->SetFetchMode( $old_mode );
-		
+
 		$schema .= '';
 		return $schema;
 	}
-	
+
 	/**
 	* Sets a prefix for database objects
 	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* Call this method to set a standard prefix that will be prepended to all database tables
 	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
 	*
 	* @param string $prefix Prefix that will be prepended.
@@ -2054,17 +2055,17 @@ function SetPrefix( $prefix = '', $underscore = TRUE ) {
 				logMsg( 'Invalid prefix: ' . $prefix );
 				return FALSE;
 		}
-		
+
 		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
 			$prefix .= '_';
 		}
-		
+
 		// prefix valid
 		logMsg( 'Set prefix: ' . $prefix );
 		$this->objectPrefix = $prefix;
 		return TRUE;
 	}
-	
+
 	/**
 	* Returns an object name with the current prefix prepended.
 	*
@@ -2080,11 +2081,11 @@ function prefix( $name = '' ) {
 			// prepend after quote if used
 			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
 		}
-		
+
 		// No prefix set. Use name provided.
 		return $name;
 	}
-	
+
 	/**
 	* Checks if element references a specific platform
 	*
@@ -2095,7 +2096,7 @@ function prefix( $name = '' ) {
 	*/
 	function supportedPlatform( $platform = NULL ) {
 		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-		
+
 		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
 			logMsg( "Platform $platform is supported" );
 			return TRUE;
@@ -2104,7 +2105,7 @@ function supportedPlatform( $platform = NULL ) {
 			return FALSE;
 		}
 	}
-	
+
 	/**
 	* Clears the array of generated SQL.
 	*
@@ -2113,7 +2114,7 @@ function supportedPlatform( $platform = NULL ) {
 	function clearSQL() {
 		$this->sqlArray = array();
 	}
-	
+
 	/**
 	* Adds SQL into the SQL array.
 	*
@@ -2121,58 +2122,58 @@ function clearSQL() {
 	* @return boolean TRUE if successful, else FALSE.
 	*
 	* @access private
-	*/	
+	*/
 	function addSQL( $sql = NULL ) {
 		if( is_array( $sql ) ) {
 			foreach( $sql as $line ) {
 				$this->addSQL( $line );
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		if( is_string( $sql ) ) {
 			$this->sqlArray[] = $sql;
-			
+
 			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
 			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
 				$saved = $this->db->debug;
 				$this->db->debug = $this->debug;
 				$ok = $this->db->Execute( $sql );
 				$this->db->debug = $saved;
-				
+
 				if( !$ok ) {
 					if( $this->debug ) {
 						ADOConnection::outp( $this->db->ErrorMsg() );
 					}
-					
+
 					$this->success = 1;
 				}
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Gets the SQL array in the specified format.
 	*
 	* @param string $format Format
 	* @return mixed SQL
-	*	
+	*
 	* @access private
 	*/
 	function getSQL( $format = NULL, $sqlArray = NULL ) {
 		if( !is_array( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		switch( strtolower( $format ) ) {
 			case 'string':
 			case 'text':
@@ -2180,20 +2181,17 @@ function getSQL( $format = NULL, $sqlArray = NULL ) {
 			case'html':
 				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
 		}
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Destroys an adoSchema object.
 	*
 	* Call this method to clean up after an adoSchema object that is no longer in use.
 	* @deprecated adoSchema now cleans up automatically.
 	*/
-	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
-	}
+	function Destroy() {}
 }
 
 /**
@@ -2204,18 +2202,17 @@ function Destroy() {
 function logMsg( $msg, $title = NULL, $force = FALSE ) {
 	if( XMLS_DEBUG or $force ) {
 		echo '
';
-		
+
 		if( isset( $title ) ) {
 			echo '
' . htmlentities( $title ) . '
';
 		}
-		
+
 		if( is_object( $this ) ) {
 			echo '[' . get_class( $this ) . '] ';
 		}
-		
+
 		print_r( $msg );
-		
+
 		echo '
';
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/adodb-xmlschema03.inc.php b/adodb/adodb-xmlschema03.inc.php
index ffd4460..de1ea26 100644
--- a/adodb/adodb-xmlschema03.inc.php
+++ b/adodb/adodb-xmlschema03.inc.php
@@ -1,31 +1,39 @@
 parent =& $parent;
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		
+	function _tag_open( $parser, $tag, $attributes ) {
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		
+	function _tag_cdata( $parser, $cdata ) {
+
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
-		
+	function _tag_close( $parser, $tag ) {
+
 	}
-	
-	function create() {
+
+	function create(&$xmls) {
 		return array();
 	}
-	
+
 	/**
 	* Destroys the object
 	*/
 	function destroy() {
-		unset( $this );
 	}
-	
+
 	/**
 	* Checks whether the specified RDBMS is supported by the current
 	* database object or its ranking ancestor.
@@ -188,7 +195,7 @@ function destroy() {
 	function supportedPlatform( $platform = NULL ) {
 		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
 	}
-	
+
 	/**
 	* Returns the prefix set by the ranking ancestor of the database object.
 	*
@@ -198,14 +205,14 @@ function supportedPlatform( $platform = NULL ) {
 	function prefix( $name = '' ) {
 		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
 	}
-	
+
 	/**
 	* Extracts a field ID from the specified field.
 	*
 	* @param string $field Field.
 	* @return string Field ID.
 	*/
-	function FieldID( $field ) {
+	function fieldID( $field ) {
 		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
 	}
 }
@@ -222,80 +229,82 @@ function FieldID( $field ) {
 * @access private
 */
 class dbTable extends dbObject {
-	
+
 	/**
 	* @var string Table name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array Field specifier: Meta-information about each field
 	*/
 	var $fields = array();
-	
+
 	/**
 	* @var array List of table indexes.
 	*/
 	var $indexes = array();
-	
+
 	/**
 	* @var array Table options: Table-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var string Field index: Keeps track of which field is currently being processed
 	*/
 	var $current_field;
-	
+
 	/**
 	* @var boolean Mark table for destruction
 	* @access private
 	*/
 	var $drop_table;
-	
+
 	/**
 	* @var boolean Mark field for destruction (not yet implemented)
 	* @access private
 	*/
 	var $drop_field = array();
-	
+
 	/**
 	* @var array Platform-specific options
 	* @access private
 	*/
 	var $currentPlatform = true;
-	
-	
+
+
 	/**
 	* Iniitializes a new table object.
 	*
 	* @param string $prefix DB Object prefix
 	* @param array $attributes Array of table attributes.
 	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT.
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( $parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'INDEX':
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
+					$index = $this->addIndex( $attributes );
+					xml_set_object( $parser,  $index );
 				}
 				break;
 			case 'DATA':
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
+					$data = $this->addData( $attributes );
+					xml_set_object( $parser, $data );
 				}
 				break;
 			case 'DROP':
@@ -307,7 +316,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				$fieldType = $attributes['TYPE'];
 				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
 				$fieldOpts = !empty( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
+
 				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
 				break;
 			case 'KEY':
@@ -321,12 +330,12 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				break;
 			case 'DEFAULT':
 				// Add a field option to the table object
-				
+
 				// Work around ADOdb datadict issue that misinterprets empty strings.
 				if( $attributes['VALUE'] == '' ) {
 					$attributes['VALUE'] = " '' ";
 				}
-				
+
 				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
 				break;
 			case 'OPT':
@@ -338,14 +347,22 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
 	* @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 ) ) {
@@ -363,18 +380,18 @@ function _tag_cdata( &$parser, $cdata ) {
 				}
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( $parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'TABLE':
 				$this->parent->addSQL( $this->create( $this->parent ) );
@@ -392,36 +409,36 @@ function _tag_close( &$parser, $tag ) {
 
 		}
 	}
-	
+
 	/**
 	* Adds an index to a table object
 	*
 	* @param array $attributes Index attributes
 	* @return object dbIndex object
 	*/
-	function &addIndex( $attributes ) {
+	function addIndex( $attributes ) {
 		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] =& new dbIndex( $this, $attributes );
+		$this->indexes[$name] = new dbIndex( $this, $attributes );
 		return $this->indexes[$name];
 	}
-	
+
 	/**
 	* Adds data to a table object
 	*
 	* @param array $attributes Data attributes
 	* @return object dbData object
 	*/
-	function &addData( $attributes ) {
+	function addData( $attributes ) {
 		if( !isset( $this->data ) ) {
-			$this->data =& new dbData( $this, $attributes );
+			$this->data = new dbData( $this, $attributes );
 		}
 		return $this->data;
 	}
-	
+
 	/**
 	* Adds a field to a table object
 	*
-	* $name is the name of the table to which the field should be added. 
+	* $name is the name of the table to which the field should be added.
 	* $type is an ADODB datadict field type. The following field types
 	* are supported as of ADODB 3.40:
 	* 	- C:  varchar
@@ -448,22 +465,22 @@ 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;
-		
+
 		// Set the field name (required)
 		$this->fields[$field_id]['NAME'] = $name;
-		
+
 		// Set the field type (required)
 		$this->fields[$field_id]['TYPE'] = $type;
-		
+
 		// Set the field size (optional)
 		if( isset( $size ) ) {
 			$this->fields[$field_id]['SIZE'] = $size;
 		}
-		
+
 		// Set the field options
 		if( isset( $opts ) ) {
 			$this->fields[$field_id]['OPTS'] = array($opts);
@@ -471,11 +488,11 @@ function addField( $name, $type, $size = NULL, $opts = NULL ) {
 			$this->fields[$field_id]['OPTS'] = array();
 		}
 	}
-	
+
 	/**
 	* Adds a field option to the current field specifier
 	*
-	* This method adds a field option allowed by the ADOdb datadict 
+	* This method adds a field option allowed by the ADOdb datadict
 	* and appends it to the given field.
 	*
 	* @param string $field	Field name
@@ -493,7 +510,7 @@ function addFieldOpt( $field, $opt, $value = NULL ) {
 		}
 	}
 	}
-	
+
 	/**
 	* Adds an option to the table
 	*
@@ -504,12 +521,17 @@ function addFieldOpt( $field, $opt, $value = NULL ) {
 	* @return array Options
 	*/
 	function addTableOpt( $opt ) {
-		if( $this->currentPlatform ) {
-		$this->opts[] = $opt;
+		if(isset($this->currentPlatform)) {
+			$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
 	*
@@ -518,32 +540,32 @@ function addTableOpt( $opt ) {
 	*/
 	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 );
 			}
 		}
-		
+
 		// remove fields to be dropped from table object
 		foreach( $this->drop_field as $field ) {
 			unset( $this->fields[$field] );
 		}
-		
+
 		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
+		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;
 			}
-			
+
 			// 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
@@ -551,27 +573,27 @@ function create( &$xmls ) {
 			if( $this->drop_table ) {
 				return $sql;
 			}
-			
+
 			$legacy_fields = array();
 		}
-		
+
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
-		
+
 		foreach( $this->fields as $field_id => $finfo ) {
 			// Set an empty size if it isn't supplied
 			if( !isset( $finfo['SIZE'] ) ) {
 				$finfo['SIZE'] = '';
 			}
-			
+
 			// Initialize the field array with the type and size
 			$fldarray[$field_id] = array(
 				'NAME' => $finfo['NAME'],
 				'TYPE' => $finfo['TYPE'],
 				'SIZE' => $finfo['SIZE']
 			);
-			
-			// Loop through the options array and add the field options. 
+
+			// Loop through the options array and add the field options.
 			if( isset( $finfo['OPTS'] ) ) {
 				foreach( $finfo['OPTS'] as $opt ) {
 					// Option has an argument.
@@ -586,42 +608,42 @@ 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:
 					return array();
 			}
 		}
-		
+
 		foreach( $this->indexes as $index ) {
 			$sql[] = $index->create( $xmls );
 		}
-		
+
 		if( isset( $this->data ) ) {
 			$sql[] = $this->data->create( $xmls );
 		}
-		
+
 		return $sql;
 	}
-	
+
 	/**
 	* Marks a field or table for destruction
 	*/
@@ -652,28 +674,28 @@ function drop() {
 * @access private
 */
 class dbIndex extends dbObject {
-	
+
 	/**
 	* @var string	Index name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array	Index options: Index-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var array	Indexed fields: Table columns included in this index
 	*/
 	var $columns = array();
-	
+
 	/**
 	* @var boolean Mark index for destruction
 	* @access private
 	*/
 	var $drop = FALSE;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -682,23 +704,23 @@ class dbIndex extends dbObject {
 	*
 	* @internal
 	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+
 		$this->name = $this->prefix ($attributes['NAME']);
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	* Processes XML opening tags.
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH.
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( $parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'DROP':
 				$this->drop();
@@ -715,7 +737,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -723,32 +745,32 @@ 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':
 				$this->addField( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( $parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'INDEX':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the index
 	*
@@ -756,12 +778,12 @@ 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;
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -770,11 +792,11 @@ function addField( $name ) {
 	*/
 	function addIndexOpt( $opt ) {
 		$this->opts[] = $opt;
-		
+
 		// Return the options list
 		return $this->opts;
 	}
-	
+
 	/**
 	* Generates the SQL that will create the index in the database
 	*
@@ -785,17 +807,17 @@ function create( &$xmls ) {
 		if( $this->drop ) {
 			return NULL;
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->columns as $id => $col ) {
 			if( !isset( $this->parent->fields[$id] ) ) {
 				unset( $this->columns[$id] );
 			}
 		}
-		
-		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
+
+		return $xmls->dict->createIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
 	}
-	
+
 	/**
 	* Marks an index for destruction
 	*/
@@ -814,11 +836,11 @@ function drop() {
 * @access private
 */
 class dbData extends dbObject {
-	
+
 	var $data = array();
-	
+
 	var $row;
-	
+
 	/**
 	* Initializes the new dbData object.
 	*
@@ -827,21 +849,21 @@ class dbData extends dbObject {
 	*
 	* @internal
 	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: ROW and F (field). 
+	* Processes XML opening tags.
+	* Elements currently processed are: ROW and F (field).
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( $parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'ROW':
 				$this->row = count( $this->data );
@@ -853,7 +875,7 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -861,32 +883,32 @@ 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':
 				$this->addData( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( $parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'DATA':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the insert
 	*
@@ -898,20 +920,20 @@ function addField( $attributes ) {
 		if( !isset( $this->row ) || !isset( $this->data[$this->row] ) ) {
 			return;
 		}
-		
+
 		// Set the field index so we know where we are
 		if( isset( $attributes['NAME'] ) ) {
-			$this->current_field = $this->FieldID( $attributes['NAME'] );
+			$this->current_field = $this->fieldID( $attributes['NAME'] );
 		} else {
 			$this->current_field = count( $this->data[$this->row] );
 		}
-		
+
 		// initialise data
 		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
 			$this->data[$this->row][$this->current_field] = '';
 		}
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -925,7 +947,7 @@ function addData( $cdata ) {
 			$this->data[$this->row][$this->current_field] .= $cdata;
 		}
 	}
-	
+
 	/**
 	* Generates the SQL that will add/update the data in the database
 	*
@@ -933,24 +955,24 @@ 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;
 			}
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->data as $row ) {
 			$table_fields = $this->parent->fields;
 			$fields = array();
 			$rawfields = array(); // Need to keep some of the unprocessed data on hand.
-			
+
 			foreach( $row as $field_id => $field_data ) {
 				if( !array_key_exists( $field_id, $table_fields ) ) {
 					if( is_numeric( $field_id ) ) {
@@ -959,9 +981,9 @@ function create( &$xmls ) {
 						continue;
 					}
 				}
-				
+
 				$name = $table_fields[$field_id]['NAME'];
-				
+
 				switch( $table_fields[$field_id]['TYPE'] ) {
 					case 'I':
 					case 'I1':
@@ -978,16 +1000,16 @@ function create( &$xmls ) {
 						$fields[$name] = $xmls->db->qstr( $field_data );
 						$rawfields[$name] = $field_data;
 				}
-				
+
 				unset($table_fields[$field_id]);
-				
+
 			}
-			
+
 			// check that at least 1 column is specified
 			if( empty( $fields ) ) {
 				continue;
 			}
-			
+
 			// check that no required columns are missing
 			if( count( $fields ) < $table_field_count ) {
 				foreach( $table_fields as $field ) {
@@ -996,27 +1018,27 @@ function create( &$xmls ) {
 						}
 				}
 			}
-			
+
 			// The rest of this method deals with updating existing data records.
-			
+
 			if( !in_array( $table, $tables ) or ( $mode = $xmls->existingData() ) == XMLS_MODE_INSERT ) {
 				// Table doesn't yet exist, so it's safe to insert.
 				logMsg( "$table doesn't exist, inserting or mode is INSERT" );
 			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 				continue;
 		}
-		
+
 			// Prepare to test for potential violations. Get primary keys and unique indexes
 			$mfields = array_merge( $fields, $rawfields );
 			$keyFields = array_intersect( $ukeys, array_keys( $mfields ) );
-			
+
 			if( empty( $ukeys ) or count( $keyFields ) == 0 ) {
 				// No unique keys in schema, so safe to insert
 				logMsg( "Either schema or data has no unique keys, so safe to insert" );
 				$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 				continue;
 			}
-			
+
 			// Select record containing matching unique keys.
 			$where = '';
 			foreach( $ukeys as $key ) {
@@ -1025,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:
@@ -1056,43 +1078,43 @@ function create( &$xmls ) {
 * @access private
 */
 class dbQuerySet extends dbObject {
-	
+
 	/**
 	* @var array	List of SQL queries
 	*/
 	var $queries = array();
-	
+
 	/**
 	* @var string	String used to build of a query line by line
 	*/
 	var $query;
-	
+
 	/**
 	* @var string	Query prefix key
 	*/
 	var $prefixKey = '';
-	
+
 	/**
 	* @var boolean	Auto prefix enable (TRUE)
 	*/
 	var $prefixMethod = 'AUTO';
-	
+
 	/**
 	* Initializes the query set.
 	*
 	* @param object $parent Parent object
 	* @param array $attributes Attributes
 	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-			
+	function __construct( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+
 		// Overrides the manual prefix key
 		if( isset( $attributes['KEY'] ) ) {
 			$this->prefixKey = $attributes['KEY'];
 		}
-		
+
 		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
+
 		// Enables or disables automatic prefix prepending
 		switch( $prefixMethod ) {
 			case 'AUTO':
@@ -1106,20 +1128,20 @@ function dbQuerySet( &$parent, $attributes = NULL ) {
 				break;
 		}
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: QUERY.
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( $parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'QUERY':
 				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
+				// Ignore this query set if a platform is specified and it's different than the
 				// current connection platform.
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					$this->newQuery();
@@ -1131,29 +1153,29 @@ function _tag_open( &$parser, $tag, $attributes ) {
 				// print_r( array( $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':
 				$this->buildQuery( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( $parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'QUERY':
 				// Add the finished query to the open query set.
@@ -1165,10 +1187,10 @@ function _tag_close( &$parser, $tag ) {
 				$this->destroy();
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* Re-initializes the query.
 	*
@@ -1176,10 +1198,10 @@ function _tag_close( &$parser, $tag ) {
 	*/
 	function newQuery() {
 		$this->query = '';
-		
+
 		return TRUE;
 	}
-	
+
 	/**
 	* Discards the existing query.
 	*
@@ -1187,11 +1209,11 @@ function newQuery() {
 	*/
 	function discardQuery() {
 		unset( $this->query );
-		
+
 		return TRUE;
 	}
-	
-	/** 
+
+	/**
 	* Appends a line to a query that is being built line by line
 	*
 	* @param string $data Line of SQL data or NULL to initialize a new query
@@ -1201,12 +1223,12 @@ function buildQuery( $sql = NULL ) {
 		if( !isset( $this->query ) OR empty( $sql ) ) {
 			return FALSE;
 		}
-		
+
 		$this->query .= $sql;
-		
+
 		return $this->query;
 	}
-	
+
 	/**
 	* Adds a completed query to the query list
 	*
@@ -1216,14 +1238,14 @@ function addQuery() {
 		if( !isset( $this->query ) ) {
 			return FALSE;
 		}
-		
+
 		$this->queries[] = $return = trim($this->query);
-		
+
 		unset( $this->query );
-		
+
 		return $return;
 	}
-	
+
 	/**
 	* Creates and returns the current query set
 	*
@@ -1235,16 +1257,16 @@ function create( &$xmls ) {
 			switch( $this->prefixMethod ) {
 				case 'AUTO':
 					// Enable auto prefix replacement
-					
+
 					// Process object prefix.
 					// Evaluate SQL statements to prepend prefix to objects
 					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
 					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
 					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
+
 					// SELECT statements aren't working yet
 					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
+
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
@@ -1256,14 +1278,14 @@ function create( &$xmls ) {
 						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
 					}
 			}
-			
+
 			$this->queries[$id] = trim( $query );
 		}
-		
+
 		// Return the query set array
 		return $this->queries;
 	}
-	
+
 	/**
 	* Rebuilds the query with the prefix attached to any objects
 	*
@@ -1276,33 +1298,33 @@ function prefixQuery( $regex, $query, $prefix = NULL ) {
 		if( !isset( $prefix ) ) {
 			return $query;
 		}
-		
+
 		if( preg_match( $regex, $query, $match ) ) {
 			$preamble = $match[1];
 			$postamble = $match[5];
 			$objectList = explode( ',', $match[3] );
 			// $prefix = $prefix . '_';
-			
+
 			$prefixedList = '';
-			
+
 			foreach( $objectList as $object ) {
 				if( $prefixedList !== '' ) {
 					$prefixedList .= ', ';
 				}
-				
+
 				$prefixedList .= $prefix . trim( $object );
 			}
-			
+
 			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
 		}
-		
+
 		return $query;
 	}
 }
 
 /**
 * Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
+*
 * This class is used to load and parse the XML file, to create an array of SQL statements
 * that can be used to build a database, and to build the database using the SQL array.
 *
@@ -1314,87 +1336,81 @@ function prefixQuery( $regex, $query, $prefix = NULL ) {
 * @package axmls
 */
 class adoSchema {
-	
+
 	/**
 	* @var array	Array containing SQL queries to generate all objects
 	* @access private
 	*/
 	var $sqlArray;
-	
+
 	/**
 	* @var object	ADOdb connection object
 	* @access private
 	*/
 	var $db;
-	
+
 	/**
 	* @var object	ADOdb Data Dictionary
 	* @access private
 	*/
 	var $dict;
-	
+
 	/**
 	* @var string Current XML element
 	* @access private
 	*/
 	var $currentElement = '';
-	
+
 	/**
 	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
 	* @access private
 	*/
 	var $upgrade = '';
-	
+
 	/**
 	* @var string Optional object prefix
 	* @access private
 	*/
 	var $objectPrefix = '';
-	
-	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
-	var $mgq;
-	
+
 	/**
 	* @var long	System debug
 	* @access private
 	*/
 	var $debug;
-	
+
 	/**
 	* @var string Regular expression to find schema version
 	* @access private
 	*/
 	var $versionRegex = '//';
-	
+
 	/**
 	* @var string Current schema version
 	* @access private
 	*/
 	var $schemaVersion;
-	
+
 	/**
 	* @var int	Success of last Schema execution
 	*/
 	var $success;
-	
+
 	/**
 	* @var bool	Execute SQL inline as it is generated
 	*/
 	var $executeInline;
-	
+
 	/**
 	* @var bool	Continue SQL execution if errors occur
 	*/
 	var $continueOnError;
-	
+
 	/**
 	* @var int	How to handle existing data rows (insert, update, or ignore)
 	*/
 	var $existingData;
-	
+
 	/**
 	* Creates an adoSchema object
 	*
@@ -1404,14 +1420,10 @@ class adoSchema {
 	*
 	* @param object $db ADOdb database connection object.
 	*/
-	function adoSchema( &$db ) {
-		// Initialize the environment
-		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-		
-		$this->db =& $db;
+	function __construct( $db ) {
+		$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 );
@@ -1419,7 +1431,7 @@ function adoSchema( &$db ) {
 		$this->existingData( XMLS_EXISTING_DATA );
 		$this->setUpgradeMethod();
 	}
-	
+
 	/**
 	* Sets the method to be used for upgrading an existing database
 	*
@@ -1436,13 +1448,13 @@ function adoSchema( &$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;
 		}
-		
+
 		$method = strtoupper( $method );
-		
+
 		// Handle the upgrade methods
 		switch( $method ) {
 			case 'ALTER':
@@ -1461,10 +1473,10 @@ function SetUpgradeMethod( $method = '' ) {
 				// Use default if no legitimate method is passed.
 				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
 		}
-		
+
 		return $this->upgrade;
 	}
-	
+
 	/**
 	* Specifies how to handle existing data row when there is a unique key conflict.
 	*
@@ -1473,7 +1485,7 @@ function SetUpgradeMethod( $method = '' ) {
 	* data into an existing table with one or more primary keys or unique indexes.
 	* The existingData method takes one of three options: XMLS_MODE_INSERT attempts
 	* to always insert the data as a new row. In the event of a unique key violation,
-	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the 
+	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the
 	* any existing rows with the new data based upon primary or unique key fields in
 	* the schema. If the data row in the schema specifies no unique fields, the row
 	* data will be inserted as a new row. XMLS_MODE_IGNORE specifies that any data rows
@@ -1484,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:
@@ -1497,15 +1509,15 @@ function ExistingData( $mode = NULL ) {
 					$mode = XMLS_MODE_INSERT;
 					break;
 				default:
-					$mode = XMLS_EXISITNG_DATA;
+					$mode = XMLS_EXISTING_DATA;
 					break;
 			}
 			$this->existingData = $mode;
 		}
-		
+
 		return $this->existingData;
 	}
-	
+
 	/**
 	* Enables/disables inline SQL execution.
 	*
@@ -1519,14 +1531,14 @@ function ExistingData( $mode = NULL ) {
 	*
 	* @see ParseSchema(), ExecuteSchema()
 	*/
-	function ExecuteInline( $mode = NULL ) {
+	function executeInline( $mode = NULL ) {
 		if( is_bool( $mode ) ) {
 			$this->executeInline = $mode;
 		}
-		
+
 		return $this->executeInline;
 	}
-	
+
 	/**
 	* Enables/disables SQL continue on error.
 	*
@@ -1540,14 +1552,14 @@ function ExecuteInline( $mode = NULL ) {
 	*
 	* @see addSQL(), ExecuteSchema()
 	*/
-	function ContinueOnError( $mode = NULL ) {
+	function continueOnError( $mode = NULL ) {
 		if( is_bool( $mode ) ) {
 			$this->continueOnError = $mode;
 		}
-		
+
 		return $this->continueOnError;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
@@ -1561,44 +1573,44 @@ 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 );
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
 	* 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' );
 			return FALSE;
 		}
-		
+
 		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
+		if( $this->schemaFileVersion( $filename ) != $this->schemaVersion ) {
 			logMsg( 'Invalid Schema Version' );
 			return FALSE;
 		}
-		
+
 		if( $returnSchema ) {
 			$xmlstring = '';
 			while( $data = fread( $fp, 4096 ) ) {
@@ -1606,11 +1618,11 @@ function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
 			}
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
@@ -1621,43 +1633,43 @@ function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
 				) );
 			}
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Converts an XML schema string to SQL.
 	*
 	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
-	* @see ParseSchema()
+	* and generate the SQL necessary to create the database described by the schema.
+	* @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;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
 			logMsg( 'Invalid Schema Version' );
 			return FALSE;
 		}
-		
+
 		if( $returnSchema ) {
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
 			die( sprintf(
 				"XML error: %s at line %d",
@@ -1665,12 +1677,12 @@ function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
 				xml_get_current_line_number( $xmlParser)
 			) );
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to uninstallation SQL.
 	*
@@ -1682,76 +1694,76 @@ 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 );
 	}
-	
+
 	/**
 	* Converts an XML schema string to uninstallation SQL.
 	*
 	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
-	* @see RemoveSchema()
+	* and generate the SQL necessary to uninstall the database described by the schema.
+	* @see removeSchema()
 	*
 	* @param string $schema XML schema string.
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute.
 	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
+	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, 
+	* Call this method to apply the current schema (generally created by calling
+	* parseSchema() or parseSchemaString() ) to the database (creating the tables, indexes,
 	* and executing other SQL specified in the schema) after parsing.
-	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
+	* @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 ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		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;
 	}
-	
+
 	/**
-	* Returns the current SQL array. 
+	* Returns the current SQL array.
 	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
+	* Call this method to fetch the array of SQL queries resulting from
+	* parseSchema() or parseSchemaString().
 	*
 	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
 	* @return array Array of SQL statements or FALSE if an error occurs
 	*/
-	function PrintSQL( $format = 'NONE' ) {
+	function printSQL( $format = 'NONE' ) {
 		$sqlArray = null;
 		return $this->getSQL( $format, $sqlArray );
 	}
-	
+
 	/**
 	* Saves the current SQL array to the local filesystem as a list of SQL queries.
 	*
@@ -1759,25 +1771,25 @@ function PrintSQL( $format = 'NONE' ) {
 	* parsed XML schema) to the filesystem.
 	*
 	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
+	* @return boolean TRUE if save is successful, else FALSE.
 	*/
-	function SaveSQL( $filename = './schema.sql' ) {
-		
+	function saveSQL( $filename = './schema.sql' ) {
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
 		if( !isset( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		$fp = fopen( $filename, "w" );
-		
+
 		foreach( $sqlArray as $key => $query ) {
 			fwrite( $fp, $query . ";\n" );
 		}
 		fclose( $fp );
 	}
-	
+
 	/**
 	* Create an xml parser
 	*
@@ -1785,24 +1797,24 @@ function SaveSQL( $filename = './schema.sql' ) {
 	*
 	* @access private
 	*/
-	function &create_parser() {
+	function create_parser() {
 		// Create the parser
 		$xmlParser = xml_parser_create();
 		xml_set_object( $xmlParser, $this );
-		
+
 		// Initialize the XML callback functions
 		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
 		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
+
 		return $xmlParser;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
 	* @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'] ) ) {
@@ -1819,65 +1831,65 @@ function _tag_open( &$parser, $tag, $attributes ) {
 			default:
 				// print_r( array( $tag, $attributes ) );
 		}
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
+	function _tag_cdata( $parser, $cdata ) {
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	* @internal
 	*/
-	function _tag_close( &$parser, $tag ) {
-		
+	function _tag_close( $parser, $tag ) {
+
 	}
-	
+
 	/**
 	* Converts an XML schema string to the specified DTD version.
 	*
 	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
-	* @see ConvertSchemaFile()
+	* @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;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		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' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
 
@@ -1888,74 +1900,74 @@ function _file_get_contents($path)
 		if (function_exists('file_get_contents')) return file_get_contents($path);
 		return join('',file($path));
 	}*/
-	
+
 	/**
 	* Converts an XML schema file to the specified DTD version.
 	*
 	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
-	* @see ConvertSchemaString()
+	* @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;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = _file_get_contents( $filename );
-			
+
 			// remove unicode BOM if present
 			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
 				$result = substr( $result, 3 );
 			}
 		} else {
-			$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' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		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' ) ) {
 			return FALSE;
 		}
-		
+
 		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
+
 		// look for xsl
 		if( !is_readable( $xsl_file ) ) {
 			return FALSE;
 		}
-		
+
 		switch( $schematype )
 		{
 			case 'file':
 				if( !is_readable( $schema ) ) {
 					return FALSE;
 				}
-				
+
 				$schema = _file_get_contents( $schema );
 				break;
 			case 'string':
@@ -1964,26 +1976,26 @@ function TransformSchema( $schema, $xsl, $schematype='string' )
 					return FALSE;
 				}
 		}
-		
+
 		$arguments = array (
 			'/_xml' => $schema,
 			'/_xsl' => _file_get_contents( $xsl_file )
 		);
-		
+
 		// create an XSLT processor
 		$xh = xslt_create ();
-		
+
 		// set error handler
 		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
+
 		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
+
 		xslt_free ($xh);
-		
+
 		return $result;
 	}
-	
+
 	/**
 	* Processes XSLT transformation errors
 	*
@@ -2003,7 +2015,7 @@ function xslt_error_handler( $parser, $errno, $level, $fields ) {
 				'Error Number' => $errno,
 				'Level' => $level
 			);
-			
+
 			switch( $fields['URI'] ) {
 				case 'arg:/_xml':
 					$msg['Input'] = 'XML';
@@ -2014,7 +2026,7 @@ function xslt_error_handler( $parser, $errno, $level, $fields ) {
 				default:
 					$msg['Input'] = $fields['URI'];
 			}
-			
+
 			$msg['Line'] = $fields['line'];
 		} else {
 			$msg = array(
@@ -2024,19 +2036,19 @@ function xslt_error_handler( $parser, $errno, $level, $fields ) {
 				'Fields' => var_export( $fields, TRUE )
 			);
 		}
-		
+
 		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
 					   . '' . "\n";
-		
+
 		foreach( $msg as $label => $details ) {
 			$error_details .= '' . "\n";
 		}
-		
+
 		$error_details .= '
' . $label . ': ' . htmlentities( $details ) . '
';
-		
+
 		trigger_error( $error_details, E_USER_ERROR );
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the requested XML schema file.
 	*
@@ -2046,23 +2058,23 @@ 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' );
 			return FALSE;
 		}
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( preg_match( $this->versionRegex, $data, $matches ) ) {
 				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 			}
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the provided XML schema string.
 	*
@@ -2072,81 +2084,82 @@ 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;
 		}
-		
+
 		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
 			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Extracts an XML schema from an existing database.
 	*
 	* Call this method to create an XML schema string from an existing database.
 	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
+	* 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' , ($prefix) ? $prefix.'%' : '') ) ) {
+		if( is_array( $tables = $this->db->metaTables( 'TABLES' ,false ,($prefix) ? str_replace('_','\_',$prefix).'%' : '') ) ) {
 			foreach( $tables as $table ) {
-				if ($stripprefix) $table = str_replace(str_replace('\\_', '_', $pfx ), '', $table);
-				$schema .= $indent . '' . "\n";
-				
+				$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 ) {
 						$extra = '';
 						$content = array();
-						
+
 						if( isset($details->max_length) && $details->max_length > 0 ) {
 							$extra .= ' size="' . $details->max_length . '"';
 						}
-						
+
 						if( isset($details->primary_key) && $details->primary_key ) {
 							$content[] = '';
 						} elseif( isset($details->not_null) && $details->not_null ) {
 							$content[] = '';
 						}
-						
+
 						if( isset($details->has_default) && $details->has_default ) {
 							$content[] = '';
 						}
-						
+
 						if( isset($details->auto_increment) && $details->auto_increment ) {
 							$content[] = '';
 						}
-						
+
 						if( isset($details->unsigned) && $details->unsigned ) {
 							$content[] = '';
 						}
-						
+
 						// this stops the creation of 'R' columns,
 						// AUTOINCREMENT is used to create auto columns
 						$details->primary_key = 0;
-						$type = $rs->MetaType( $details );
-						
+						$type = $rs->metaType( $details );
+
 						$schema .= str_repeat( $indent, 2 ) . ' $details ) {
 						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
-						
+
 						if( $details['unique'] ) {
 							$schema .= str_repeat( $indent, 3 ) . '' . "\n";
 						}
-						
+
 						foreach( $details['columns'] as $column ) {
 							$schema .= str_repeat( $indent, 3 ) . '' . htmlentities( $column ) . '' . "\n";
 						}
-						
+
 						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
 					}
 				}
-				
+
 				if( $data ) {
-					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
+					$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] = '';
 								}
 							}
-							
+
 							$schema .= str_repeat( $indent, 3 ) . '' . implode( '', $row ) . "\n";
 						}
-						
+
 						$schema .= str_repeat( $indent, 2 ) . "\n";
 					}
 				}
-				
+
 				$schema .= $indent . "
\n";
 			}
 		}
-		
-		$this->db->SetFetchMode( $old_mode );
-		
+
+		$this->db->setFetchMode( $old_mode );
+
 		$schema .= '';
 		return $schema;
 	}
-	
+
 	/**
 	* Sets a prefix for database objects
 	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* Call this method to set a standard prefix that will be prepended to all database tables
 	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
 	*
 	* @param string $prefix Prefix that will be prepended.
 	* @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 ):
@@ -2227,17 +2240,17 @@ function SetPrefix( $prefix = '', $underscore = TRUE ) {
 				logMsg( 'Invalid prefix: ' . $prefix );
 				return FALSE;
 		}
-		
+
 		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
 			$prefix .= '_';
 		}
-		
+
 		// prefix valid
 		logMsg( 'Set prefix: ' . $prefix );
 		$this->objectPrefix = $prefix;
 		return TRUE;
 	}
-	
+
 	/**
 	* Returns an object name with the current prefix prepended.
 	*
@@ -2253,11 +2266,11 @@ function prefix( $name = '' ) {
 			// prepend after quote if used
 			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
 		}
-		
+
 		// No prefix set. Use name provided.
 		return $name;
 	}
-	
+
 	/**
 	* Checks if element references a specific platform
 	*
@@ -2269,7 +2282,7 @@ function prefix( $name = '' ) {
 	function supportedPlatform( $platform = NULL ) {
 		if( !empty( $platform ) ) {
 			$regex = '/(^|\|)' . $this->db->databaseType . '(\||$)/i';
-		
+
 			if( preg_match( '/^- /', $platform ) ) {
 				if (preg_match ( $regex, substr( $platform, 2 ) ) ) {
 					logMsg( 'Platform ' . $platform . ' is NOT supported' );
@@ -2282,11 +2295,11 @@ function supportedPlatform( $platform = NULL ) {
 		}
 	}
 		}
-		
+
 		logMsg( 'Platform ' . $platform . ' is supported' );
 		return TRUE;
 	}
-	
+
 	/**
 	* Clears the array of generated SQL.
 	*
@@ -2295,7 +2308,7 @@ function supportedPlatform( $platform = NULL ) {
 	function clearSQL() {
 		$this->sqlArray = array();
 	}
-	
+
 	/**
 	* Adds SQL into the SQL array.
 	*
@@ -2303,58 +2316,58 @@ function clearSQL() {
 	* @return boolean TRUE if successful, else FALSE.
 	*
 	* @access private
-	*/	
+	*/
 	function addSQL( $sql = NULL ) {
 		if( is_array( $sql ) ) {
 			foreach( $sql as $line ) {
 				$this->addSQL( $line );
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		if( is_string( $sql ) ) {
 			$this->sqlArray[] = $sql;
-			
+
 			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
 			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
 				$saved = $this->db->debug;
 				$this->db->debug = $this->debug;
 				$ok = $this->db->Execute( $sql );
 				$this->db->debug = $saved;
-				
+
 				if( !$ok ) {
 					if( $this->debug ) {
 						ADOConnection::outp( $this->db->ErrorMsg() );
 					}
-					
+
 					$this->success = 1;
 				}
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Gets the SQL array in the specified format.
 	*
 	* @param string $format Format
 	* @return mixed SQL
-	*	
+	*
 	* @access private
 	*/
 	function getSQL( $format = NULL, $sqlArray = NULL ) {
 		if( !is_array( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		switch( strtolower( $format ) ) {
 			case 'string':
 			case 'text':
@@ -2362,19 +2375,17 @@ function getSQL( $format = NULL, $sqlArray = NULL ) {
 			case'html':
 				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
 		}
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Destroys an adoSchema object.
 	*
 	* Call this method to clean up after an adoSchema object that is no longer in use.
 	* @deprecated adoSchema now cleans up automatically.
 	*/
-	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
+	function destroy() {
 	}
 }
 
@@ -2386,18 +2397,17 @@ function Destroy() {
 function logMsg( $msg, $title = NULL, $force = FALSE ) {
 	if( XMLS_DEBUG or $force ) {
 		echo '
';
-		
+
 		if( isset( $title ) ) {
 			echo '
' . htmlentities( $title ) . '
';
 		}
-		
+
 		if( @is_object( $this ) ) {
 			echo '[' . get_class( $this ) . '] ';
 		}
-		
+
 		print_r( $msg );
-		
+
 		echo '
';
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/adodb.inc.php b/adodb/adodb.inc.php
index d8bec49..f15158f 100644
--- a/adodb/adodb.inc.php
+++ b/adodb/adodb.inc.php
@@ -1,258 +1,421 @@
-fields is available on EOF
-	 	$ADODB_FETCH_MODE;	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
-	
-	//==============================================================================================	
+		$ADODB_FETCH_MODE,	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
+		$ADODB_GETONE_EOF,
+		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.
+
+	//==============================================================================================
 	// 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
+	//==============================================================================================
+
+	/*********************************************************
+	* 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);
+	// ********************************************************
+
+
+	/**
+	 * 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);
 
- 		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.
+	/*
+	* Defines the the default meta type returned
+	* when ADOdb encounters a type that it is not
+	* defined in the metaTypes.
 	*/
-        define('ADODB_FORCE_IGNORE',0);
-        define('ADODB_FORCE_NULL',1);
-        define('ADODB_FORCE_EMPTY',2);
-        define('ADODB_FORCE_VALUE',3);
-    //********************************************************//
+	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;
');
 
-	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-		
-		define('ADODB_BAD_RS','
Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;
');
-	
 	// allow [ ] @ ` " and . in table names
-		define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
-	
+	define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
+
 	// prefetching used by oracle
-		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-	
-	
-	/*
-	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
-	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-	
- 		0 = assoc lowercase field names. $rs->fields['orderid']
-		1 = assoc uppercase field names. $rs->fields['ORDERID']
-		2 = use native-case field names. $rs->fields['OrderID']
-	*/
-	
-		define('ADODB_FETCH_DEFAULT',0);
-		define('ADODB_FETCH_NUM',1);
-		define('ADODB_FETCH_ASSOC',2);
-		define('ADODB_FETCH_BOTH',3);
-		
-		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-	
-		// PHP's version scheme makes converting to numbers difficult - workaround
-		$_adodb_ver = (float) PHP_VERSION;
-		if ($_adodb_ver >= 5.0) {
-			define('ADODB_PHPVER',0x5000);
-		} else if ($_adodb_ver > 4.299999) { # 4.3
-			define('ADODB_PHPVER',0x4300);
-		} else if ($_adodb_ver > 4.199999) { # 4.2
-			define('ADODB_PHPVER',0x4200);
-		} else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
-			define('ADODB_PHPVER',0x4050);
-		} else {
-			define('ADODB_PHPVER',0x4000);
-		}
+	if (!defined('ADODB_PREFETCH_ROWS')) {
+		define('ADODB_PREFETCH_ROWS',10);
+	}
+
+
+	/**
+	 * Fetch mode
+	 *
+	 * Set global variable $ADODB_FETCH_MODE to one of these constants or use
+	 * the SetFetchMode() method to control how recordset fields are returned
+	 * when fetching data.
+	 *
+	 *   - NUM:     array()
+	 *   - ASSOC:   array('id' => 456, 'name' => 'john')
+	 *   - 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);
+
+	/**
+	 * Associative array case constants
+	 *
+	 * By defining the ADODB_ASSOC_CASE constant to one of these values, it is
+	 * possible to control the case of field names (associative array's keys)
+	 * when operating in ADODB_FETCH_ASSOC fetch mode.
+	 *   - LOWER:  $rs->fields['orderid']
+	 *   - UPPER:  $rs->fields['ORDERID']
+	 *   - NATIVE: $rs->fields['OrderID'] (or whatever the RDBMS will return)
+	 *
+	 * The default is to use native case-names.
+	 *
+	 * 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);
 	}
-	
-	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 
-	
 	/**
-	 	Accepts $src and $dest arrays, replacing string $data
-	*/
-	function ADODB_str_replace($src, $dest, $data)
-	{
-		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
-		
-		$s = reset($src);
-		$d = reset($dest);
-		while ($s !== false) {
-			$data = str_replace($s,$d,$data);
-			$s = next($src);
-			$d = next($dest);
-		}
-		return $data;
-	}
-	
-	function ADODB_Setup()
-	{
-	GLOBAL 
-		$ADODB_vers, 		// database version
+	 * 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);
+
+
+
+	function ADODB_Setup() {
+	GLOBAL
+		$ADODB_vers,		// database version
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
-	 	$ADODB_FETCH_MODE,
-		$ADODB_FORCE_TYPE;
-		
+		$ADODB_FETCH_MODE,
+		$ADODB_CACHE,
+		$ADODB_CACHE_CLASS,
+		$ADODB_FORCE_TYPE,
+		$ADODB_GETONE_EOF,
+		$ADODB_QUOTE_FIELDNAMES;
+
+		if (empty($ADODB_CACHE_CLASS)) {
+			$ADODB_CACHE_CLASS =  'ADODB_Cache_File' ;
+		}
 		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
 		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
-
+		$ADODB_GETONE_EOF = null;
 
 		if (!isset($ADODB_CACHE_DIR)) {
 			$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
 		} else {
 			// do not accept url based paths, eg. http:/ or ftp:/
-			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
+			if (strpos($ADODB_CACHE_DIR,'://') !== false) {
 				die("Illegal path http:// or ftp://");
+			}
 		}
-		
-			
-		// Initialize random number generator for randomizing cache flushes
-		srand(((double)microtime())*1000000);
-		
+
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
-	
+		$ADODB_vers = 'v5.21.2  2021-08-22';
+
 		/**
-		 * Determines whether recordset->RecordCount() is used. 
+		 * Determines whether recordset->RecordCount() is used.
 		 * Set to false for highest performance -- RecordCount() will always return -1 then
 		 * for databases that provide "virtual" recordcounts...
 		 */
-		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
+		if (!isset($ADODB_COUNTRECS)) {
+			$ADODB_COUNTRECS = true;
+		}
 	}
-	
-	
-	//==============================================================================================	
+
+
+	//==============================================================================================
 	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	ADODB_Setup();
 
-	//==============================================================================================	
+	//==============================================================================================
 	// CLASS ADOFieldObject
-	//==============================================================================================	
+	//==============================================================================================
 	/**
 	 * Helper class for FetchFields -- holds info on a column
 	 */
-	class ADOFieldObject { 
+	class ADOFieldObject {
 		var $name = '';
 		var $max_length=0;
 		var $type="";
 /*
 		// additional fields by dannym... (danny_milo@yahoo.com)
-		var $not_null = false; 
+		var $not_null = false;
 		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
 		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
 
-		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
+		var $has_default = false; // this one I have done only in mysql and postgres for now ...
 			// others to come (dannym)
 		var $default_value; // default, if any, and supported. Check has_default first.
 */
 	}
-	
 
-	
-	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
-	{
+
+	function _adodb_safedate($s) {
+		return str_replace(array("'", '\\'), '', $s);
+	}
+
+	// parse date string to prevent injection attack
+	// date string will have one quote at beginning e.g. '3434343'
+	function _adodb_safedateq($s) {
+		$len = strlen($s);
+		if ($s[0] !== "'") {
+			$s2 = "'".$s[0];
+		} else {
+			$s2 = "'";
+		}
+		for($i=1; $i<$len; $i++) {
+			$ch = $s[$i];
+			if ($ch === '\\') {
+				$s2 .= "'";
+				break;
+			} elseif ($ch === "'") {
+				$s2 .= $ch;
+				break;
+			}
+
+			$s2 .= $ch;
+		}
+
+		return strlen($s2) == 0 ? 'null' : $s2;
+	}
+
+
+	// for transaction handling
+
+	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection) {
 		//print "Errorno ($fn errno=$errno m=$errmsg) ";
 		$thisConnection->_transOK = false;
 		if ($thisConnection->_oldRaiseFn) {
-			$fn = $thisConnection->_oldRaiseFn;
-			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
+			$errfn = $thisConnection->_oldRaiseFn;
+			$errfn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
+		}
+	}
+
+	//------------------
+	// class for caching
+	class ADODB_Cache_File {
+
+		var $createdir = true; // requires creation of temp dirs
+
+		function __construct() {
+			global $ADODB_INCLUDED_CSV;
+			if (empty($ADODB_INCLUDED_CSV)) {
+				include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+			}
+		}
+
+		// write serialised recordset to cache item/file
+		function writecache($filename, $contents,  $debug, $secs2cache) {
+			return adodb_write_file($filename, $contents,$debug);
+		}
+
+		// load serialised recordset and unserialise it
+		function &readcache($filename, &$err, $secs2cache, $rsClass) {
+			$rs = csv2rs($filename,$err,$secs2cache,$rsClass);
+			return $rs;
+		}
+
+		// flush all items in cache
+		function flushall($debug=false) {
+			global $ADODB_CACHE_DIR;
+
+			$rez = false;
+
+			if (strlen($ADODB_CACHE_DIR) > 1) {
+				$rez = $this->_dirFlush($ADODB_CACHE_DIR);
+				if ($debug) {
+					ADOConnection::outp( "flushall: $ADODB_CACHE_DIR
\n". $rez."
");
+				}
+			}
+			return $rez;
+		}
+
+		// flush one file in cache
+		function flushcache($f, $debug=false) {
+			if (!@unlink($f)) {
+				if ($debug) {
+					ADOConnection::outp( "flushcache: failed for $f");
+				}
+			}
+		}
+
+		function getdirname($hash) {
+			global $ADODB_CACHE_DIR;
+			if (!isset($this->notSafeMode)) {
+				$this->notSafeMode = !ini_get('safe_mode');
+			}
+			return ($this->notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($hash,0,2) : $ADODB_CACHE_DIR;
+		}
+
+		// create temp directories
+		function createdir($hash, $debug) {
+			global $ADODB_CACHE_PERMS;
+
+			$dir = $this->getdirname($hash);
+			if ($this->notSafeMode && !file_exists($dir)) {
+				$oldu = umask(0);
+				if (!@mkdir($dir, empty($ADODB_CACHE_PERMS) ? 0771 : $ADODB_CACHE_PERMS)) {
+					if(!is_dir($dir) && $debug) {
+						ADOConnection::outp("Cannot create $dir");
+					}
+				}
+				umask($oldu);
+			}
+
+			return $dir;
+		}
+
+		/**
+		* Private function to erase all of the files and subdirectories in a directory.
+		*
+		* Just specify the directory, and tell it if you want to delete the directory or just clear it out.
+		* Note: $kill_top_level is used internally in the function to flush subdirectories.
+		*/
+		function _dirFlush($dir, $kill_top_level = false) {
+			if(!$dh = @opendir($dir)) return;
+
+			while (($obj = readdir($dh))) {
+				if($obj=='.' || $obj=='..') continue;
+				$f = $dir.'/'.$obj;
+
+				if (strpos($obj,'.cache')) {
+					@unlink($f);
+				}
+				if (is_dir($f)) {
+					$this->_dirFlush($f, true);
+				}
+			}
+			if ($kill_top_level === true) {
+				@rmdir($dir);
+			}
+			return true;
 		}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADOConnection
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * Connection object. For connecting to databases, and executing queries.
-	 */ 
-	class ADOConnection {
+	 */
+	abstract class ADOConnection {
 	//
-	// PUBLIC VARS 
+	// PUBLIC VARS
 	//
 	var $dataProvider = 'native';
-	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
-	var $database = '';			/// Name of database to be used.	
-	var $host = ''; 			/// The hostname of the database server	
-	var $user = ''; 			/// The username which is used to connect to the database server. 
-	var $password = ''; 		/// Password for the username. For security, we no longer store it.
-	var $debug = false; 		/// if set to true will output sql statements
-	var $maxblobsize = 262144; 	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
-	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
+	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql
+	var $database = '';			/// Name of database to be used.
+	var $host = '';				/// The hostname of the database server
+	var $port = '';				/// The port of the database server
+	var $user = '';				/// The username which is used to connect to the database server.
+	var $password = '';			/// Password for the username. For security, we no longer store it.
+	var $debug = false;			/// if set to true will output sql statements
+	var $maxblobsize = 262144;	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
+	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase
 	var $substr = 'substr';		/// substring operator
 	var $length = 'length';		/// string length ofperator
 	var $random = 'rand()';		/// random function
 	var $upperCase = 'upper';		/// uppercase function
 	var $fmtDate = "'Y-m-d'";	/// used by DBDate() as the default date format used by the database
 	var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; /// used by DBTimeStamp as the default timestamp fmt.
-	var $true = '1'; 			/// string that represents TRUE for a database
-	var $false = '0'; 			/// string that represents FALSE for a database
-	var $replaceQuote = "\\'"; 	/// string to use to replace quotes
+	var $true = '1';			/// string that represents TRUE for a database
+	var $false = '0';			/// string that represents FALSE for a database
+	var $replaceQuote = "\\'";	/// string to use to replace quotes
 	var $nameQuote = '"';		/// string to use to quote identifiers and names
-	var $charSet=false; 		/// character set to use - only for interbase, postgres and oci8
+	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 = '';
 	var $uniqueOrderBy = false; /// All order by columns have to be unique
@@ -260,32 +423,36 @@ class ADOConnection {
 	var $emptyTimeStamp = ' ';
 	var $lastInsID = false;
 	//--
-	var $hasInsertID = false; 		/// supports autoincrement ID?
-	var $hasAffectedRows = false; 	/// supports affected rows for update/delete?
+	var $hasInsertID = false;		/// supports autoincrement ID?
+	var $hasAffectedRows = false;	/// supports affected rows for update/delete?
 	var $hasTop = false;			/// support mssql/access SELECT TOP 10 * FROM TABLE
 	var $hasLimit = false;			/// support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	var $readOnly = false; 			/// this is a readonly database - used by phpLens
-	var $hasMoveFirst = false;  /// has ability to run MoveFirst(), scrolling backwards
-	var $hasGenID = false; 		/// can generate sequences using GenID();
-	var $hasTransactions = true; /// has transactions
+	var $readOnly = false;			/// this is a readonly database - used by phpLens
+	var $hasMoveFirst = false;		/// has ability to run MoveFirst(), scrolling backwards
+	var $hasGenID = false;			/// can generate sequences using GenID();
+	var $hasTransactions = true;	/// has transactions
 	//--
-	var $genID = 0; 			/// sequence id used by GenID();
-	var $raiseErrorFn = false; 	/// error function to call
-	var $isoDates = false; /// accepts dates in ISO format
-	var $cacheSecs = 3600; /// cache for 1 hour
+	var $genID = 0;					/// sequence id used by GenID();
+
+	/** @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
 
 	// memcache
 	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
+	var $sysUTimeStamp = false; // name of function that returns the current timestamp accurate to the microsecond or nearest fraction
 	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
-	
+
 	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
-	var $numCacheHits = 0; 
+	var $numCacheHits = 0;
 	var $numCacheMisses = 0;
 	var $pageExecuteCountRows = true;
 	var $uniqueSort = false; /// indicates that all fields in order by must be unique
@@ -294,218 +461,399 @@ class ADOConnection {
 	var $ansiOuter = false; /// whether ansi outer join syntax supported
 	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_";
-	
-	var $autoCommit = true; 	/// do not modify this yourself - actually private
-	var $transOff = 0; 			/// temporarily disable transactions
-	var $transCnt = 0; 			/// count of nested transactions
-	
+
+	var $autoCommit = true;		/// do not modify this yourself - actually private
+	var $transOff = 0;			/// temporarily disable transactions
+	var $transCnt = 0;			/// count of nested transactions
+
 	var $fetchMode=false;
-	 //
-	 // PRIVATE VARS
-	 //
+
+	var $null2null = 'null'; // in autoexecute/getinsertsql/getupdatesql, this value will be converted to a null
+	var $bulkBind = false; // enable 2D Execute array
+	//
+	// PRIVATE VARS
+	//
 	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					
+								/// then returned by the errorMsg() function
+	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8
 	var $_queryID = false;		/// This variable keeps the last created result link identifier
-	
+
 	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
 	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
 	var $_transmode = ''; // transaction mode
-	
+
 	/**
-	 * Constructor
+	 * 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();
+
+	/**
+	 * 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.
 	 */
-	function ADOConnection()			
+	public function __construct()
 	{
-		die('Virtual Class -- cannot instantiate');
 	}
-	
-	function Version()
-	{
-	global $ADODB_vers;
-	
-		return (float) substr($ADODB_vers,1);
+
+	/**
+	 * 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;
 	}
-	
+
 	/**
-		Get server version info...
-		
-		@returns An array with 2 elements: $arr['string'] is the description string, 
-			and $arr[version] is the version (also a string).
-	*/
-	function ServerInfo()
-	{
+	 * ADOdb version.
+	 *
+	 * @return string
+	 */
+	static function Version() {
+		global $ADODB_vers;
+
+		// Semantic Version number matching regex
+		$regex = '^[vV]?(\d+\.\d+\.\d+'         // Version number (X.Y.Z) with optional 'V'
+			. '(?:-(?:'                         // Optional preprod version: a '-'
+			. 'dev|'                            // followed by 'dev'
+			. '(?:(?:alpha|beta|rc)(?:\.\d+))'  // or a preprod suffix and version number
+			. '))?)(?:\s|$)';                   // Whitespace or end of string
+
+		if (!preg_match("/$regex/", $ADODB_vers, $matches)) {
+			// This should normally not happen... Return whatever is between the start
+			// of the string and the first whitespace (or the end of the string).
+			self::outp("Invalid version number: '$ADODB_vers'", 'Version');
+			$regex = '^[vV]?(.*?)(?:\s|$)';
+			preg_match("/$regex/", $ADODB_vers, $matches);
+		}
+		return $matches[1];
+	}
+
+	/**
+	 * 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' => '');
 	}
-	
-	function IsConnected()
-	{
-    	return !empty($this->_connectionID);
+
+	/**
+	 * Return true if connected to the database.
+	 *
+	 * @return bool
+	 */
+	function IsConnected() {
+		return !empty($this->_connectionID);
 	}
-	
-	function _findvers($str)
-	{
-		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
-		else return '';
+
+	function _findvers($str) {
+		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) {
+			return $arr[1];
+		} else {
+			return '';
+		}
 	}
-	
+
 	/**
-	* All error messages go through this bottleneck function.
-	* You can define your own handler by defining the function name in ADODB_OUTP.
-	*/
-	function outp($msg,$newline=true)
-	{
-	global $ADODB_FLUSH,$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;
+
 		if (defined('ADODB_OUTP')) {
 			$fn = ADODB_OUTP;
 			$fn($msg,$newline);
 			return;
 		} else if (isset($ADODB_OUTP)) {
-			$fn = $ADODB_OUTP;
-			$fn($msg,$newline);
+			call_user_func($ADODB_OUTP,$msg,$newline);
 			return;
 		}
-		
-		if ($newline) $msg .= "
\n";
-		
-		if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) echo $msg;
-		else echo strip_tags($msg);
-	
-		
-		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
-		
-	}
-	
-	function Time()
-	{
-		$rs =& $this->_Execute("select $this->sysTimeStamp");
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
+		if ($newline) {
+			$msg .= "
\n";
+		}
+
+		if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) {
+			echo $msg;
+		} else {
+			echo strip_tags($msg);
+		}
+
+
+		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) {
+			flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan
+		}
+
+	}
+
+	/**
+	 * Return the database server's current date and time.
+	 * @return int|false
+	 */
+	function Time() {
+		$rs = $this->_Execute("select $this->sysTimeStamp");
+		if ($rs && !$rs->EOF) {
+			return $this->UnixTimeStamp(reset($rs->fields));
+		}
+
 		return false;
 	}
-	
+
+	/**
+	 * Parses the hostname to extract the port.
+	 * Overwrites $this->host and $this->port, only if a port is specified.
+	 * The Hostname can be fully or partially qualified,
+	 * ie: "db.mydomain.com:5432" or "ldaps://ldap.mydomain.com:636"
+	 * Any specified scheme such as ldap:// or ldaps:// is maintained.
+	 */
+	protected function parseHostNameAndPort() {
+		$parsed_url = parse_url($this->host);
+		if (is_array($parsed_url) && isset($parsed_url['host']) && isset($parsed_url['port'])) {
+			if ( isset($parsed_url['scheme']) ) {
+				// If scheme is specified (ie: ldap:// or ldaps://, make sure we retain that.
+				$this->host = $parsed_url['scheme'] . "://" . $parsed_url['host'];
+			} else {
+				$this->host = $parsed_url['host'];
+			}
+			$this->port = $parsed_url['port'];
+		}
+	}
+
 	/**
-	 * 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
-	 */	  
-	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
-	{
-		if ($argHostname != "") $this->host = $argHostname;
-		if ($argUsername != "") $this->user = $argUsername;
-		if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-		
-		$this->_isPersistentConnection = false;	
+	 * @return bool
+	 */
+	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) {
+		if ($argHostname != "") {
+			$this->host = $argHostname;
+		}
+		// Overwrites $this->host and $this->port if a port is specified.
+		$this->parseHostNameAndPort();
+
+		if ($argUsername != "") {
+			$this->user = $argUsername;
+		}
+		if ($argPassword != "") {
+			$this->password = 'not stored'; // not stored for security reasons
+		}
+		if ($argDatabaseName != "") {
+			$this->database = $argDatabaseName;
+		}
+
+		$this->_isPersistentConnection = false;
+
 		if ($forceNew) {
-			if ($rez=$this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
+			if ($rez=$this->_nconnect($this->host, $this->user, $argPassword, $this->database)) {
+				return true;
+			}
 		} else {
-			 if ($rez=$this->_connect($this->host, $this->user, $this->password, $this->database)) return true;
+			if ($rez=$this->_connect($this->host, $this->user, $argPassword, $this->database)) {
+				return true;
+			}
 		}
 		if (isset($rez)) {
 			$err = $this->ErrorMsg();
-			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
-			$ret = false;
+			$errno = $this->ErrorNo();
+			if (empty($err)) {
+				$err = "Connection error to server '$argHostname' with user '$argUsername'";
+			}
 		} else {
 			$err = "Missing extension for ".$this->dataProvider;
-			$ret = 0;
+			$errno = 0;
 		}
-		if ($fn = $this->raiseErrorFn) 
-			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		
-		
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType, 'CONNECT', $errno, $err, $this->host, $this->database, $this);
+		}
+
 		$this->_connectionID = false;
-		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
-		return $ret;
-	}	
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
-	{
+		if ($this->debug) {
+			ADOConnection::outp( $this->host.': '.$err);
+		}
+		return false;
+	}
+
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName) {
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
 	}
-	
-	
+
 	/**
-	 * Always force a new connection to database - currently only works with oracle
+	 * Always force a new connection to database.
 	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
+	 * Currently this only works with Oracle.
 	 *
-	 * @return true or false
-	 */	  
-	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
-	{
+	 * @param string $argHostname     Host to connect to
+	 * @param string $argUsername     Userid to login
+	 * @param string $argPassword     Associated password
+	 * @param string $argDatabaseName Database name
+	 *
+	 * @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
-	 */	
-	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
-	{
-		if (defined('ADODB_NEVER_PERSIST')) 
+	 * @return bool
+	 */
+	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") {
+
+		if (defined('ADODB_NEVER_PERSIST')) {
 			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-		
-		if ($argHostname != "") $this->host = $argHostname;
-		if ($argUsername != "") $this->user = $argUsername;
-		if ($argPassword != "") $this->password = $argPassword;
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-			
-		$this->_isPersistentConnection = true;	
-		if ($rez = $this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
+		}
+
+		if ($argHostname != "") {
+			$this->host = $argHostname;
+		}
+		// Overwrites $this->host and $this->port if a port is specified.
+		$this->parseHostNameAndPort();
+
+		if ($argUsername != "") {
+			$this->user = $argUsername;
+		}
+		if ($argPassword != "") {
+			$this->password = 'not stored';
+		}
+		if ($argDatabaseName != "") {
+			$this->database = $argDatabaseName;
+		}
+
+		$this->_isPersistentConnection = true;
+
+		if ($rez = $this->_pconnect($this->host, $this->user, $argPassword, $this->database)) {
+			return true;
+		}
 		if (isset($rez)) {
 			$err = $this->ErrorMsg();
-			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
+			if (empty($err)) {
+				$err = "Connection error to server '$argHostname' with user '$argUsername'";
+			}
 			$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);
 		}
-		
+
 		$this->_connectionID = false;
-		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
+		if ($this->debug) {
+			ADOConnection::outp( $this->host.': '.$err);
+		}
 		return $ret;
 	}
 
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysDate;
+	function outp_throw($msg,$src='WARN',$sql='') {
+		if (defined('ADODB_ERROR_HANDLER') &&  ADODB_ERROR_HANDLER == 'adodb_throw') {
+			adodb_throw($this->databaseType,$src,-9999,$msg,$sql,false,$this);
+			return;
+		}
+		ADOConnection::outp($msg);
+	}
+
+	/**
+	 * Create cache class.
+	 *
+	 * Code is backwards-compatible with old memcache implementation.
+	 */
+	function _CreateCache() {
+		global $ADODB_CACHE, $ADODB_CACHE_CLASS;
+
+		if ($this->memCache) {
+			global $ADODB_INCLUDED_MEMCACHE;
+
+			if (empty($ADODB_INCLUDED_MEMCACHE)) {
+				include_once(ADODB_DIR.'/adodb-memcache.lib.inc.php');
+			}
+			$ADODB_CACHE = new ADODB_Cache_MemCache($this);
+		} else {
+			$ADODB_CACHE = new $ADODB_CACHE_CLASS($this);
+		}
+	}
+
+	/**
+	 * Format date column in sql string.
+	 *
+	 * 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;
+		}
 		return $col; // child class implement
 	}
-	
+
 	/**
-	 * 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:
 	 *
@@ -513,187 +861,193 @@ 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
 	 *
-	 */	
-	function Prepare($sql)
-	{
+	 * @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
 	 *
-	 */	
-	function PrepareSP($sql,$param=true)
-	{
+	 * @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" 
-	*/
-	function QMagic($s)
-	{
-		return $this->qstr($s,get_magic_quotes_gpc());
+	 * PEAR DB Compat - alias for qStr.
+	 * @param $s
+	 * @return string
+	 */
+	function Quote($s) {
+		return $this->qstr($s);
 	}
 
-	function q(&$s)
-	{
-		#if (!empty($this->qNull)) if ($s == 'null') return $s;
-		$s = $this->qstr($s,false);
+	function q(&$s) {
+		//if (!empty($this->qNull && $s == 'null') {
+		//	return $s;
+		//}
+		$s = $this->qstr($s);
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
-	function ErrorNative()
-	{
+	function ErrorNative() {
 		return $this->ErrorNo();
 	}
 
-	
-   /**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function nextId($seq_name)
-	{
+
+	/**
+	 * PEAR DB Compat - do not use internally.
+	 */
+	function nextId($seq_name) {
 		return $this->GenID($seq_name);
 	}
 
 	/**
-	*	 Lock a row, will escalate and lock the table if row locking not supported
-	*	will normally free the lock at the end of the transaction
-	*
-	*  @param $table	name of table to lock
-	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
-	*/
-	function RowLock($table,$where)
-	{
+	 * 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 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;
 	}
-	
-	function CommitLock($table)
-	{
+
+	/**
+	 * @param string $table
+	 * @return true
+	 */
+	function CommitLock($table) {
 		return $this->CommitTrans();
 	}
-	
-	function RollbackLock($table)
-	{
+
+	/**
+	 * @param string $table
+	 * @return true
+	 */
+	function RollbackLock($table) {
 		return $this->RollbackTrans();
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*
 	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
-	* 	for easy porting :-)
+	* for easy porting :-)
+	*
+	* @param int $mode The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
 	*
-	* @param mode	The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
-	* @returns		The previous fetch mode
+	* @return int Previous fetch mode
 	*/
-	function SetFetchMode($mode)
-	{	
+	function SetFetchMode($mode) {
 		$old = $this->fetchMode;
 		$this->fetchMode = $mode;
-		
+
 		if ($old === false) {
-		global $ADODB_FETCH_MODE;
+			global $ADODB_FETCH_MODE;
 			return $ADODB_FETCH_MODE;
 		}
 		return $old;
 	}
-	
+
 
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* 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);
-		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+	function Query($sql, $inputarr=false) {
+		$rs = $this->Execute($sql, $inputarr);
+		if (!$rs && defined('ADODB_PEAR')) {
+			return ADODB_PEAR_Error();
+		}
 		return $rs;
 	}
 
-	
+
 	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function &LimitQuery($sql, $offset, $count, $params=false)
-	{
-		$rs = &$this->SelectLimit($sql, $count, $offset, $params); 
-		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+	 * PEAR DB Compat - do not use internally
+	 */
+	function LimitQuery($sql, $offset, $count, $params=false) {
+		$rs = $this->SelectLimit($sql, $count, $offset, $params);
+		if (!$rs && defined('ADODB_PEAR')) {
+			return ADODB_PEAR_Error();
+		}
 		return $rs;
 	}
 
-	
+
 	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function Disconnect()
-	{
+	 * PEAR DB Compat - do not use internally
+	 */
+	function Disconnect() {
 		return $this->Close();
 	}
-	
-	/*
-		 Returns placeholder for parameter, eg.
-		 $DB->Param('a')
-		 
-		 will return ':a' for Oracle, and '?' for most other databases...
-		 
-		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
-		 	pass in Param(false) before setting the first parameter.
-	*/
-	function Param($name,$type='C')
-	{
+
+	/**
+	 * 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 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
+	 */
+	function Param($name,$type='C') {
 		return '?';
 	}
-	
+
 	/*
 		InParameter and OutParameter are self-documenting versions of Parameter().
 	*/
-	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
+	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false) {
 		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
 	}
-	
+
 	/*
 	*/
-	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
+	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false) {
 		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-	
+
 	}
 
-	
-	/* 
+
+	/*
 	Usage in oracle
 		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
 		$db->Parameter($stmt,$id,'myid');
 		$db->Parameter($stmt,$group,'group',64);
 		$db->Execute();
-		
+
 		@param $stmt Statement returned by Prepare() or PrepareSP().
 		@param $var PHP variable to bind to
 		@param $name Name of stored procedure variable name to bind to.
@@ -702,14 +1056,12 @@ function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 		@param [$type] The data type of $var. Legal values depend on driver.
 
 	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-	{
+	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false) {
 		return false;
 	}
-	
-	
-	function IgnoreErrors($saveErrs=false)
-	{
+
+
+	function IgnoreErrors($saveErrs=false) {
 		if (!$saveErrs) {
 			$saveErrs = array($this->raiseErrorFn,$this->_transOK);
 			$this->raiseErrorFn = false;
@@ -719,72 +1071,79 @@ function IgnoreErrors($saveErrs=false)
 			$this->_transOK = $saveErrs[1];
 		}
 	}
-	
+
 	/**
-		Improved method of initiating a transaction. Used together with CompleteTrans().
-		Advantages include:
-		
-		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
-		   Only the outermost block is treated as a transaction.

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

-		c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block
-		   are disabled, making it backward compatible.
-	*/
-	function StartTrans($errfn = 'ADODB_TransMonitor')
-	{
+	 * Improved method of initiating a transaction. Used together with CompleteTrans().
+	 * Advantages include:
+     *
+	 * a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
+	 *    Only the outermost block is treated as a transaction.

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

+	 * c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block
+	 *    are disabled, making it backward compatible.
+	 */
+	function StartTrans($errfn = 'ADODB_TransMonitor') {
 		if ($this->transOff > 0) {
 			$this->transOff += 1;
-			return;
+			return true;
 		}
-		
+
 		$this->_oldRaiseFn = $this->raiseErrorFn;
 		$this->raiseErrorFn = $errfn;
 		$this->_transOK = true;
-		
-		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
-		$this->BeginTrans();
+
+		if ($this->debug && $this->transCnt > 0) {
+			ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
+		}
+		$ok = $this->BeginTrans();
 		$this->transOff = 1;
+		return $ok;
 	}
-	
-	
+
+
 	/**
 		Used together with StartTrans() to end a transaction. Monitors connection
 		for sql errors, and will commit or rollback as appropriate.
-		
-		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
+
+		@autoComplete if true, monitor sql errors and commit and rollback as appropriate,
 		and if set to false force rollback even if no SQL error detected.
 		@returns true on commit, false on rollback.
 	*/
-	function CompleteTrans($autoComplete = true)
-	{
+	function CompleteTrans($autoComplete = true) {
 		if ($this->transOff > 1) {
 			$this->transOff -= 1;
 			return true;
 		}
 		$this->raiseErrorFn = $this->_oldRaiseFn;
-		
+
 		$this->transOff = 0;
 		if ($this->_transOK && $autoComplete) {
 			if (!$this->CommitTrans()) {
 				$this->_transOK = false;
-				if ($this->debug) ADOConnection::outp("Smart Commit failed");
-			} else
-				if ($this->debug) ADOConnection::outp("Smart Commit occurred");
+				if ($this->debug) {
+					ADOConnection::outp("Smart Commit failed");
+				}
+			} else {
+				if ($this->debug) {
+					ADOConnection::outp("Smart Commit occurred");
+				}
+			}
 		} else {
 			$this->_transOK = false;
 			$this->RollbackTrans();
-			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
+			if ($this->debug) {
+				ADOCOnnection::outp("Smart Rollback occurred");
+			}
 		}
-		
+
 		return $this->_transOK;
 	}
-	
+
 	/*
 		At the end of a StartTrans/CompleteTrans block, perform a rollback.
 	*/
-	function FailTrans()
-	{
-		if ($this->debug) 
+	function FailTrans() {
+		if ($this->debug)
 			if ($this->transOff == 0) {
 				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
 			} else {
@@ -793,140 +1152,220 @@ function FailTrans()
 			}
 		$this->_transOK = false;
 	}
-	
+
 	/**
 		Check if transaction has failed, only for Smart Transactions.
 	*/
-	function HasFailedTrans()
-	{
-		if ($this->transOff > 0) return $this->_transOK == false;
+	function HasFailedTrans() {
+		if ($this->transOff > 0) {
+			return $this->_transOK == false;
+		}
 		return false;
 	}
-	
+
 	/**
-	 * Execute SQL 
+	 * Execute SQL
+	 *
+	 * @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.
 	 *
-	 * @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
+	 * @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);
-			if (isset($ret)) return $ret;
+			$ret = $fn($this,$sql,$inputarr);
+			if (isset($ret)) {
+				return $ret;
+			}
 		}
-		if ($inputarr) {
-			if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
+		if ($inputarr !== false) {
+			if (!is_array($inputarr)) {
+				$inputarr = array($inputarr);
+			}
+
 			$element0 = reset($inputarr);
 			# is_object check because oci8 descriptors can be passed in
-			$array_2d = is_array($element0) && !is_object(reset($element0));
+			$array_2d = $this->bulkBind && is_array($element0) && !is_object(reset($element0));
+
 			//remove extra memory copy of input -mikefedyk
 			unset($element0);
-			
+
 			if (!is_array($sql) && !$this->_bindInputArray) {
+				// @TODO this would consider a '?' within a string as a parameter...
 				$sqlarr = explode('?',$sql);
-					
-				if (!$array_2d) $inputarr = array($inputarr);
+				$nparams = sizeof($sqlarr)-1;
+
+				if (!$array_2d) {
+					// When not Bind Bulk - convert to array of arguments list
+					$inputarr = array($inputarr);
+				} else {
+					// Bulk bind - Make sure all list of params have the same number of elements
+					$countElements = array_map('count', $inputarr);
+					if (1 != count(array_unique($countElements))) {
+						$this->outp_throw(
+							"[bulk execute] Input array has different number of params  [" . print_r($countElements, true) .  "].",
+							'Execute'
+						);
+						return false;
+					}
+					unset($countElements);
+				}
+				// Make sure the number of parameters provided in the input
+				// array matches what the query expects
+				$element0 = reset($inputarr);
+				if ($nparams != count($element0)) {
+					$this->outp_throw(
+						"Input array has " . count($element0) .
+						" params, does not match query: '" . htmlspecialchars($sql) . "'",
+						'Execute'
+					);
+					return false;
+				}
+
+				// clean memory
+				unset($element0);
+
 				foreach($inputarr as $arr) {
 					$sql = ''; $i = 0;
-					//Use each() instead of foreach to reduce memory usage -mikefedyk
-					while(list(, $v) = each($arr)) {
+					foreach ($arr as $v) {
 						$sql .= $sqlarr[$i];
 						// from Ron Baldwin 
-						// Only quote string types	
+						// Only quote string types
 						$typ = gettype($v);
-						if ($typ == 'string')
+						if ($typ == 'string') {
 							//New memory copy of input created here -mikefedyk
 							$sql .= $this->qstr($v);
-						else if ($typ == 'double')
+						} else if ($typ == 'double') {
 							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
-						else if ($typ == 'boolean')
+						} else if ($typ == 'boolean') {
 							$sql .= $v ? $this->true : $this->false;
-						else if ($typ == 'object') {
-							if (method_exists($v, '__toString')) $sql .= $this->qstr($v->__toString());
-							else $sql .= $this->qstr((string) $v);
-						} else if ($v === null)
+						} else if ($typ == 'object') {
+							if (method_exists($v, '__toString')) {
+								$sql .= $this->qstr($v->__toString());
+							} else {
+								$sql .= $this->qstr((string) $v);
+							}
+						} else if ($v === null) {
 							$sql .= 'NULL';
-						else
+						} else {
 							$sql .= $v;
+						}
 						$i += 1;
-					}
+
+						if ($i == $nparams) {
+							break;
+						}
+					} // while
 					if (isset($sqlarr[$i])) {
 						$sql .= $sqlarr[$i];
-						if ($i+1 != sizeof($sqlarr)) ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
-					} else if ($i != sizeof($sqlarr))	
-						ADOConnection::outp( "Input array does not match ?: ".htmlspecialchars($sql));
-		
-					$ret =& $this->_Execute($sql);
-					if (!$ret) return $ret;
-				}	
+						if ($i+1 != sizeof($sqlarr)) {
+							$this->outp_throw( "Input Array does not match ?: ".htmlspecialchars($sql),'Execute');
+						}
+					} else if ($i != sizeof($sqlarr)) {
+						$this->outp_throw( "Input array does not match ?: ".htmlspecialchars($sql),'Execute');
+					}
+
+					$ret = $this->_Execute($sql);
+					if (!$ret) {
+						return $ret;
+					}
+				}
 			} else {
 				if ($array_2d) {
-					if (is_string($sql))
+					if (is_string($sql)) {
 						$stmt = $this->Prepare($sql);
-					else
+					} else {
 						$stmt = $sql;
-						
+					}
+
 					foreach($inputarr as $arr) {
-						$ret =& $this->_Execute($stmt,$arr);
-						if (!$ret) return $ret;
+						$ret = $this->_Execute($stmt,$arr);
+						if (!$ret) {
+							return $ret;
+						}
 					}
 				} else {
-					$ret =& $this->_Execute($sql,$inputarr);
+					$ret = $this->_Execute($sql,$inputarr);
 				}
 			}
 		} else {
-			$ret =& $this->_Execute($sql,false);
+			$ret = $this->_Execute($sql,false);
 		}
 
 		return $ret;
 	}
-	
-	
-	function &_Execute($sql,$inputarr=false)
-	{
+
+	function _Execute($sql,$inputarr=false) {
+		// ExecuteCursor() may send non-string queries (such as arrays),
+		// so we need to ignore those.
+		if( is_string($sql) ) {
+			// Strips keyword used to help generate SELECT COUNT(*) queries
+			// from SQL if it exists.
+			// 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');
+			if (empty($ADODB_INCLUDED_LIB)) {
+				include_once(ADODB_DIR.'/adodb-lib.inc.php');
+			}
 			$this->_queryID = _adodb_debug_execute($this, $sql,$inputarr);
 		} else {
 			$this->_queryID = @$this->_query($sql,$inputarr);
 		}
-		
-		/************************
+
+		// ************************
 		// OK, query executed
-		*************************/
+		// ************************
 
-		if ($this->_queryID === false) { // error handling if query fails
-			if ($this->debug == 99) adodb_backtrace(true,5);	
+		// error handling if query fails
+		if ($this->_queryID === false) {
+			if ($this->debug == 99) {
+				adodb_backtrace(true,5);
+			}
 			$fn = $this->raiseErrorFn;
 			if ($fn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-			} 
-			$false = false;
-			return $false;
-		} 
-		
-		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
-			$rs =& new ADORecordSet_empty();
+			}
+			return false;
+		}
+
+		// return simplified recordset for inserts/updates/deletes with lower overhead
+		if ($this->_queryID === true) {
+			$rsclass = $this->rsPrefix.'empty';
+			$rs = (class_exists($rsclass)) ? new $rsclass():  new ADORecordSet_empty();
+
 			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->connection = $this; // Pablo suggestion
 		$rs->Init();
-		if (is_array($sql)) $rs->sql = $sql[0];
-		else $rs->sql = $sql;
+		if (is_array($sql)) {
+			$rs->sql = $sql[0];
+		} else {
+			$rs->sql = $sql;
+		}
 		if ($rs->_numOfRows <= 0) {
-		global $ADODB_COUNTRECS;
+			global $ADODB_COUNTRECS;
 			if ($ADODB_COUNTRECS) {
-				if (!$rs->EOF) { 
-					$rs = &$this->_rs2rs($rs,-1,-1,!is_array($sql));
+				if (!$rs->EOF) {
+					$rs = $this->_rs2rs($rs,-1,-1,!is_array($sql));
 					$rs->_queryID = $this->_queryID;
 				} else
 					$rs->_numOfRows = 0;
@@ -935,63 +1374,80 @@ function &_Execute($sql,$inputarr=false)
 		return $rs;
 	}
 
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
+	function CreateSequence($seqname='adodbseq',$startID=1) {
+		if (empty($this->_genSeqSQL)) {
+			return false;
+		}
 		return $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
 	}
 
-	function DropSequence($seqname='adodbseq')
-	{
-		if (empty($this->_dropSeqSQL)) return false;
+	function DropSequence($seqname='adodbseq') {
+		if (empty($this->_dropSeqSQL)) {
+			return false;
+		}
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
 
 	/**
-	 * 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)
-	{
+	function GenID($seqname='adodbseq',$startID=1) {
 		if (!$this->hasGenID) {
 			return 0; // formerly returns false pre 1.60
 		}
-		
+
 		$getnext = sprintf($this->_genIDSQL,$seqname);
-		
+
 		$holdtransOK = $this->_transOK;
-		
+
 		$save_handler = $this->raiseErrorFn;
 		$this->raiseErrorFn = '';
 		@($rs = $this->Execute($getnext));
 		$this->raiseErrorFn = $save_handler;
-		
+
 		if (!$rs) {
 			$this->_transOK = $holdtransOK; //if the status was ok before reset
 			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
 			$rs = $this->Execute($getnext);
 		}
-		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
-		else $this->genID = 0; // false
-	
-		if ($rs) $rs->Close();
+		if ($rs && !$rs->EOF) {
+			$this->genID = reset($rs->fields);
+		} else {
+			$this->genID = 0; // false
+		}
+
+		if ($rs) {
+			$rs->Close();
+		}
 
 		return $this->genID;
-	}	
+	}
 
 	/**
-	 * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
-	 * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
-	 * @return  the last inserted ID. Not all databases support this.
-	 */ 
-	function Insert_ID($table='',$column='')
-	{
-		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
-		if ($this->hasInsertID) return $this->_insertid($table,$column);
+	 * 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);
+		}
 		if ($this->debug) {
 			ADOConnection::outp( '
Insert_ID error
');
 			adodb_backtrace();
@@ -999,228 +1455,281 @@ 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) {}
 
 	/**
-	 * Portable Insert ID. Pablo Roca 
+	 * Return the id of the last row that has been inserted in a table.
 	 *
-	 * @return  the last inserted ID. All databases support this. But aware possible
-	 * problems in multiuser environments. Heavy test this before deploying.
-	 */ 
-	function PO_Insert_ID($table="", $id="") 
+	 * @param string $table
+	 * @param string $column
+	 *
+	 * @return int|false
+	 */
+	protected function _insertID($table = '', $column = '')
 	{
-	   if ($this->hasInsertID){
-		   return $this->Insert_ID($table,$id);
-	   } else {
-		   return $this->GetOne("SELECT MAX($id) FROM $table");
-	   }
+		return false;
+	}
+
+	/**
+	 * Portable Insert ID. Pablo Roca 
+	 *
+	 * @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){
+			return $this->Insert_ID($table,$id);
+		} else {
+			return $this->GetOne("SELECT MAX($id) FROM $table");
+		}
 	}
 
 	/**
 	* @return # rows affected by UPDATE/DELETE
-	*/ 
-	function Affected_Rows()
-	{
+	*/
+	function Affected_Rows() {
 		if ($this->hasAffectedRows) {
 			if ($this->fnExecute === 'adodb_log_sql') {
-				if ($this->_logsql && $this->_affected !== false) return $this->_affected;
+				if ($this->_logsql && $this->_affected !== false) {
+					return $this->_affected;
+				}
 			}
 			$val = $this->_affectedrows();
 			return ($val < 0) ? false : $val;
 		}
-				  
-		if ($this->debug) ADOConnection::outp( '
Affected_Rows error
',false);
+
+		if ($this->debug) {
+			ADOConnection::outp( '
Affected_Rows error
',false);
+		}
 		return false;
 	}
-	
-	
+
+
 	/**
-	 * @return  the last error message
+	 * @return string the last error message
 	 */
-	function ErrorMsg()
-	{
-		if ($this->_errorMsg) return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
-		else return '';
+	function ErrorMsg() {
+		if ($this->_errorMsg) {
+			return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
+		} else {
+			return '';
+		}
 	}
-	
-	
+
+
 	/**
-	 * @return the last error number. Normally 0 means no error.
+	 * @return int the last error number. Normally 0 means no error.
 	 */
-	function ErrorNo() 
-	{
+	function ErrorNo() {
 		return ($this->_errorMsg) ? -1 : 0;
 	}
-	
-	function MetaError($err=false)
-	{
+
+	function MetaError($err=false) {
 		include_once(ADODB_DIR."/adodb-error.inc.php");
-		if ($err === false) $err = $this->ErrorNo();
+		if ($err === false) {
+			$err = $this->ErrorNo();
+		}
 		return adodb_error($this->dataProvider,$this->databaseType,$err);
 	}
-	
-	function MetaErrorMsg($errno)
-	{
+
+	function MetaErrorMsg($errno) {
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		return adodb_errormsg($errno);
 	}
-	
+
 	/**
 	 * @returns an array with the primary key columns in it.
 	 */
-	function MetaPrimaryKeys($table, $owner=false)
-	{
+	function MetaPrimaryKeys($table, $owner=false) {
 	// owner not used in base class - see oci8
 		$p = array();
-		$objs =& $this->MetaColumns($table);
+		$objs = $this->MetaColumns($table);
 		if ($objs) {
 			foreach($objs as $v) {
-				if (!empty($v->primary_key))
+				if (!empty($v->primary_key)) {
 					$p[] = $v->name;
+				}
 			}
 		}
-		if (sizeof($p)) return $p;
-		if (function_exists('ADODB_VIEW_PRIMARYKEYS'))
+		if (sizeof($p)) {
+			return $p;
+		}
+		if (function_exists('ADODB_VIEW_PRIMARYKEYS')) {
 			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
+		}
 		return false;
 	}
-	
+
 	/**
 	 * @returns assoc array where keys are tables, and values are foreign keys
 	 */
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
+	function MetaForeignKeys($table, $owner=false, $upper=false) {
 		return false;
 	}
 	/**
 	 * Choose a database to connect to. Many databases do not support this.
 	 *
-	 * @param dbName 	is the name of the database to select
-	 * @return 		true or false
-	 */
-	function SelectDB($dbName) 
-	{return false;}
-	
-	
-	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
-	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
-	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]		is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($this->hasTop && $nrows > 0) {
-		// suggested by Reinhard Balling. Access requires top after distinct 
-		 // Informix requires first before distinct - F Riosa
+	 * @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
+	 * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	 * eg.
+	 *  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
+	 *  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
+	 *
+	 * Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
+	 * BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
+	 *
+	 * @param 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;
+		$offset = (int)$offset;
+
+		if ($this->hasTop && $nrows > 0) {
+			// suggested by Reinhard Balling. Access requires top after distinct
+			// Informix requires first before distinct - F Riosa
 			$ismssql = (strpos($this->databaseType,'mssql') !== false);
-			if ($ismssql) $isaccess = false;
-			else $isaccess = (strpos($this->databaseType,'access') !== false);
-			
-			if ($offset <= 	0) {
-				
-					// access includes ties in result
-					if ($isaccess) {
-						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$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.' '.((integer)$nrows).' ',$sql);
+			if ($ismssql) {
+				$isaccess = false;
+			} else {
+				$isaccess = (strpos($this->databaseType,'access') !== false);
+			}
+
+			if ($offset <= 0) {
+				// access includes ties in result
+				if ($isaccess) {
+					$sql = preg_replace(
+						'/(^\s*select\s+(distinctrow|distinct)?)/i',
+						'\\1 '.$this->hasTop.' '.$nrows.' ',
+						$sql
+					);
+
+					if ($secs2cache != 0) {
+						$ret = $this->CacheExecute($secs2cache, $sql,$inputarr);
 					} else {
-						$sql = preg_replace(
-						'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.((integer)$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
+					);
 				}
 			}
 		}
-		
+
 		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
 		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
 		global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-			
-		if ($offset>0){
-			if ($secs2cache != 0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-			else $rs = &$this->Execute($sql,$inputarr);
+
+
+		if ($secs2cache != 0) {
+			$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		} else {
-			if ($secs2cache != 0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-			else $rs = &$this->Execute($sql,$inputarr);
+			$rs = $this->Execute($sql,$inputarr);
 		}
+
 		$ADODB_COUNTRECS = $savec;
 		if ($rs && !$rs->EOF) {
-			$rs =& $this->_rs2rs($rs,$nrows,$offset);
+			$rs = $this->_rs2rs($rs,$nrows,$offset);
 		}
 		//print_r($rs);
 		return $rs;
 	}
-	
+
 	/**
 	* Create serializable recordset. Breaks rs link to connection.
 	*
-	* @param rs			the recordset to serialize
+	* @param ADORecordSet $rs the recordset to serialize
+	 *
+	* @return ADORecordSet_array|bool the new recordset
 	*/
-	function &SerializableRS(&$rs)
-	{
-		$rs2 =& $this->_rs2rs($rs);
+	function SerializableRS(&$rs) {
+		$rs2 = $this->_rs2rs($rs);
 		$ignore = false;
-		$rs2->connection =& $ignore;
-		
+		$rs2->connection = $ignore;
+
 		return $rs2;
 	}
-	
+
 	/**
-	* Convert database recordset to an array recordset
-	* input recordset's cursor should be at beginning, and
-	* old $rs will be closed.
+	* 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)
-	{
+	function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true) {
 		if (! $rs) {
-			$false = false;
-			return $false;
+			$ret = false;
+			return $ret;
 		}
 		$dbtype = $rs->databaseType;
 		if (!$dbtype) {
-			$rs = &$rs;  // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
+			$rs = $rs;  // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
 			return $rs;
 		}
 		if (($dbtype == 'array' || $dbtype == 'csv') && $nrows == -1 && $offset == -1) {
 			$rs->MoveFirst();
-			$rs = &$rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1-- why ?
+			$rs = $rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1-- why ?
 			return $rs;
 		}
 		$flds = array();
@@ -1228,254 +1737,339 @@ function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
 			$flds[] = $rs->FetchField($i);
 		}
 
-		$arr =& $rs->GetArrayLimit($nrows,$offset);
+		$arr = $rs->GetArrayLimit($nrows,$offset);
 		//print_r($arr);
-		if ($close) $rs->Close();
-		
+		if ($close) {
+			$rs->Close();
+		}
+
 		$arrayClass = $this->arrayClass;
-		
+
 		$rs2 = new $arrayClass();
-		$rs2->connection = &$this;
+		$rs2->connection = $this;
 		$rs2->sql = $rs->sql;
 		$rs2->dataProvider = $this->dataProvider;
 		$rs2->InitArrayFields($arr,$flds);
 		$rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
 		return $rs2;
 	}
-	
+
 	/*
-	* 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;
+	function GetAll($sql, $inputarr=false) {
+        return $this->GetArray($sql,$inputarr);
 	}
-	
-	function &GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
-	{
-		$rs =& $this->Execute($sql, $inputarr);
+
+	/**
+	 * 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) {
-			$false = false;
-			return $false;
+			/*
+			* 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;
 		}
-		$rs =& $this->CacheExecute($secs2cache, $sql, $inputarr);
+		$rs = $this->CacheExecute($secs2cache, $sql, $inputarr);
 		if (!$rs) {
-			$false = false;
-			return $false;
+			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)
-	{
-	global $ADODB_COUNTRECS;
+	 * 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;
-		
+
 		$ret = false;
-		$rs = &$this->Execute($sql,$inputarr);
-		if ($rs) {	
-			if (!$rs->EOF) $ret = reset($rs->fields);
+		$rs = $this->Execute($sql,$inputarr);
+		if ($rs) {
+			if ($rs->EOF) {
+				$ret = $ADODB_GETONE_EOF;
+			} else {
+				$ret = reset($rs->fields);
+			}
+
 			$rs->Close();
 		}
 		$ADODB_COUNTRECS = $crecs;
 		return $ret;
 	}
-	
-	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
-	{
+
+	// $where should include 'WHERE fld=value'
+	function GetMedian($table, $field,$where = '') {
+		$total = $this->GetOne("select count(*) from $table $where");
+		if (!$total) {
+			return false;
+		}
+
+		$midrow = (integer) ($total/2);
+		$rs = $this->SelectLimit("select $field from $table $where order by 1",1,$midrow);
+		if ($rs && !$rs->EOF) {
+			return reset($rs->fields);
+		}
+		return false;
+	}
+
+
+	function CacheGetOne($secs2cache,$sql=false,$inputarr=false) {
+		global $ADODB_GETONE_EOF;
+
 		$ret = false;
-		$rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-		if ($rs) {		
-			if (!$rs->EOF) $ret = reset($rs->fields);
+		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
+		if ($rs) {
+			if ($rs->EOF) {
+				$ret = $ADODB_GETONE_EOF;
+			} else {
+				$ret = reset($rs->fields);
+			}
 			$rs->Close();
-		} 
-		
+		}
+
 		return $ret;
 	}
-	
-	function GetCol($sql, $inputarr = false, $trim = false)
-	{
-	  	$rv = false;
-	  	$rs = &$this->Execute($sql, $inputarr);
-	  	if ($rs) {
+
+	/**
+	 * 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);
+		if ($rs) {
 			$rv = array();
-	   		if ($trim) {
+			if ($trim) {
 				while (!$rs->EOF) {
 					$rv[] = trim(reset($rs->fields));
 					$rs->MoveNext();
-		   		}
+				}
 			} else {
 				while (!$rs->EOF) {
 					$rv[] = reset($rs->fields);
 					$rs->MoveNext();
-		   		}
+				}
 			}
-	   		$rs->Close();
-	  	}
-	  	return $rv;
+			$rs->Close();
+		} else {
+			$rv = false;
+		}
+		return $rv;
 	}
-	
-	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
-	{
-	  	$rv = false;
-	  	$rs = &$this->CacheExecute($secs, $sql, $inputarr);
-	  	if ($rs) {
+
+	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false) {
+		$rs = $this->CacheExecute($secs, $sql, $inputarr);
+		if ($rs) {
+			$rv = array();
 			if ($trim) {
 				while (!$rs->EOF) {
 					$rv[] = trim(reset($rs->fields));
 					$rs->MoveNext();
-		   		}
+				}
 			} else {
 				while (!$rs->EOF) {
 					$rv[] = reset($rs->fields);
 					$rs->MoveNext();
-		   		}
+				}
 			}
-	   		$rs->Close();
-	  	}
-	  	return $rv;
+			$rs->Close();
+		} else
+			$rv = false;
+
+		return $rv;
 	}
-	
-	function &Transpose(&$rs)
-	{
-		$rs2 =& $this->_rs2rs($rs);
-		$false = false;
-		if (!$rs2) return $false;
-		
-		$rs2->_transpose();
+
+	function Transpose(&$rs,$addfieldnames=true) {
+		$rs2 = $this->_rs2rs($rs);
+		if (!$rs2) {
+			return false;
+		}
+
+		$rs2->_transpose($addfieldnames);
 		return $rs2;
 	}
- 
+
 	/*
 		Calculate the offset of a date for a particular database and generate
 			appropriate SQL. Useful for calculating future/past dates and storing
 			in a database.
-			
+
 		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
 	*/
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
+	function OffsetDate($dayFraction,$date=false) {
+		if (!$date) {
+			$date = $this->sysDate;
+		}
 		return  '('.$date.'+'.$dayFraction.')';
 	}
-	
-	
+
+
 	/**
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function &GetArray($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		
+	 * 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);
+		$rs = $this->Execute($sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		if (!$rs) 
+		if (!$rs)
 			if (defined('ADODB_PEAR')) {
-				$cls = ADODB_PEAR_Error();
-				return $cls;
+				return ADODB_PEAR_Error();
 			} else {
-				$false = false;
-				return $false;
+				return false;
 			}
-		$arr =& $rs->GetArray();
+		$arr = $rs->GetArray();
 		$rs->Close();
 		return $arr;
 	}
-	
-	function &CacheGetAll($secs2cache,$sql=false,$inputarr=false)
-	{
+
+	function CacheGetAll($secs2cache,$sql=false,$inputarr=false) {
 		return $this->CacheGetArray($secs2cache,$sql,$inputarr);
 	}
-	
-	function &CacheGetArray($secs2cache,$sql=false,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		
+
+	function CacheGetArray($secs2cache,$sql=false,$inputarr=false) {
+		global $ADODB_COUNTRECS;
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
+		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		
-		if (!$rs) 
+
+		if (!$rs)
 			if (defined('ADODB_PEAR')) {
-				$cls = ADODB_PEAR_Error();
-				return $cls;
+				return ADODB_PEAR_Error();
 			} else {
-				$false = false;
-				return $false;
+				return false;
 			}
-		$arr =& $rs->GetArray();
+		$arr = $rs->GetArray();
 		$rs->Close();
 		return $arr;
 	}
-	
-	
-	
+
+	function GetRandRow($sql, $arr= false) {
+		$rezarr = $this->GetAll($sql, $arr);
+		$sz = sizeof($rezarr);
+		return $rezarr[abs(rand()) % $sz];
+	}
+
 	/**
 	* Return one row of sql statement. Recordset is disposed for you.
+	* 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;
+	function GetRow($sql,$inputarr=false) {
+		global $ADODB_COUNTRECS;
+
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
-		$rs =& $this->Execute($sql,$inputarr);
-		
+
+		$rs = $this->Execute($sql,$inputarr);
+
 		$ADODB_COUNTRECS = $crecs;
 		if ($rs) {
-			if (!$rs->EOF) $arr = $rs->fields;
-			else $arr = array();
+			if (!$rs->EOF) {
+				$arr = $rs->fields;
+			} else {
+				$arr = array();
+			}
 			$rs->Close();
 			return $arr;
 		}
-		
-		$false = false;
-		return $false;
+
+		return false;
 	}
-	
-	function &CacheGetRow($secs2cache,$sql=false,$inputarr=false)
-	{
-		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
+
+	/**
+	 * @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) {
-			$arr = false;
-			if (!$rs->EOF) $arr = $rs->fields;
+			if (!$rs->EOF) {
+				$arr = $rs->fields;
+			} else {
+				$arr = array();
+			}
+
 			$rs->Close();
 			return $arr;
 		}
-		$false = false;
-		return $false;
+		return false;
 	}
-	
+
 	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
+	* Insert or replace a single record. Note: this is not the same as MySQL's replace.
 	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
 	* Also note that no table locking is done currently, so it is possible that the
 	* record be inserted twice by two programs...
@@ -1485,416 +2079,378 @@ 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.
 	*
 	* Currently blob replace not supported
 	*
-	* returns 0 = fail, 1 = update, 2 = insert 
+	* returns 0 = fail, 1 = update, 2 = insert
 	*/
-	
-	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
-	{
+
+	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');
-		
+		if (empty($ADODB_INCLUDED_LIB)) {
+			include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		}
+
 		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
 	}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
-	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]	is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
-	function &CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-	{	
+	 * Will select, getting rows from $offset (1-based), for $nrows.
+	 * This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	 * the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	 * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	 * eg.
+	 *  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
+	 *  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
+	 *
+	 * BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
+	 *
+	 * @param 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)) {
-			if ($sql === false) $sql = -1;
-			if ($offset == -1) $offset = false;
-									  // sql,	nrows, offset,inputarr
-			$rs =& $this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
+			if ($sql === false) {
+				$sql = -1;
+			}
+			if ($offset == -1) {
+				$offset = false;
+			}
+												// sql,	nrows, offset,inputarr
+			$rs = $this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
 		} else {
-			if ($sql === false) ADOConnection::outp( "Warning: \$sql missing from CacheSelectLimit()");
-			$rs =& $this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			if ($sql === false) {
+				$this->outp_throw("Warning: \$sql missing from CacheSelectLimit()",'CacheSelectLimit');
+			}
+			$rs = $this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		}
 		return $rs;
 	}
-	
-	
-	/**
-	* Flush cached recordsets that match a particular $sql statement. 
-	* If $sql == false, then we purge all files in the cache.
- 	*/
-	
+
 	/**
-   * Flush cached recordsets that match a particular $sql statement. 
-   * If $sql == false, then we purge all files in the cache.
-    */
-	function CacheFlush($sql=false,$inputarr=false)
-	{
-	global $ADODB_CACHE_DIR;
-	
-		if ($this->memCache) {
-		global $ADODB_INCLUDED_MEMCACHE;
-		
-			$key = false;
-			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
-			if ($sql) $key = $this->_gencachename($sql.serialize($inputarr),false,true);
-			FlushMemCache($key, $this->memCacheHost, $this->memCachePort, $this->debug);
-			return;
+	 * Flush cached recordsets that match a particular $sql statement.
+	 * If $sql == false, then we purge all files in the cache.
+	 */
+	function CacheFlush($sql=false,$inputarr=false) {
+		global $ADODB_CACHE_DIR, $ADODB_CACHE;
+
+		# Create cache if it does not exist
+		if (empty($ADODB_CACHE)) {
+			$this->_CreateCache();
 		}
-	
-		if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
-         /*if (strncmp(PHP_OS,'WIN',3) === 0)
-            $dir = str_replace('/', '\\', $ADODB_CACHE_DIR);
-         else */
-            $dir = $ADODB_CACHE_DIR;
-            
-         if ($this->debug) {
-            ADOConnection::outp( "CacheFlush: $dir
\n", $this->_dirFlush($dir),"
");
-         } else {
-            $this->_dirFlush($dir);
-         }
-         return;
-      } 
-      
-      global $ADODB_INCLUDED_CSV;
-      if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-      
-      $f = $this->_gencachename($sql.serialize($inputarr),false);
-      adodb_write_file($f,''); // is adodb_write_file needed?
-      if (!@unlink($f)) {
-         if ($this->debug) ADOConnection::outp( "CacheFlush: failed for $f");
-      }
-   }
-   
-   /**
-   * Private function to erase all of the files and subdirectories in a directory.
-   *
-   * Just specify the directory, and tell it if you want to delete the directory or just clear it out.
-   * Note: $kill_top_level is used internally in the function to flush subdirectories.
-   */
-   function _dirFlush($dir, $kill_top_level = false) {
-      if(!$dh = @opendir($dir)) return;
-      
-      while (($obj = readdir($dh))) {
-         if($obj=='.' || $obj=='..')
-            continue;
-			
-         if (!@unlink($dir.'/'.$obj))
-			  $this->_dirFlush($dir.'/'.$obj, true);
-      }
-      if ($kill_top_level === true)
-         @rmdir($dir);
-      return true;
-   }
-   
-   
-	function xCacheFlush($sql=false,$inputarr=false)
-	{
-	global $ADODB_CACHE_DIR;
-	
-		if ($this->memCache) {
-			global $ADODB_INCLUDED_MEMCACHE;
-			$key = false;
-			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
-			if ($sql) $key = $this->_gencachename($sql.serialize($inputarr),false,true);
-			flushmemCache($key, $this->memCacheHost, $this->memCachePort, $this->debug);
+
+		if (!$sql) {
+			$ADODB_CACHE->flushall($this->debug);
 			return;
 		}
 
-		if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
-			if (strncmp(PHP_OS,'WIN',3) === 0) {
-				$cmd = 'del /s '.str_replace('/','\\',$ADODB_CACHE_DIR).'\adodb_*.cache';
-			} else {
-				//$cmd = 'find "'.$ADODB_CACHE_DIR.'" -type f -maxdepth 1 -print0 | xargs -0 rm -f';
-				$cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/'; 
-				// old version 'rm -f `find '.$ADODB_CACHE_DIR.' -name adodb_*.cache`';
-			}
-			if ($this->debug) {
-				ADOConnection::outp( "CacheFlush: $cmd
\n", system($cmd),"
");
-			} else {
-				exec($cmd);
-			}
-			return;
-		} 
-		
-		global $ADODB_INCLUDED_CSV;
-		if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-		
 		$f = $this->_gencachename($sql.serialize($inputarr),false);
-		adodb_write_file($f,''); // is adodb_write_file needed?
-		if (!@unlink($f)) {
-			if ($this->debug) ADOConnection::outp( "CacheFlush: failed for $f");
-		}
+		return $ADODB_CACHE->flushcache($f, $this->debug);
 	}
-	
+
+
 	/**
-	* Private function to generate filename for caching.
-	* Filename is generated based on:
-	*
-	*  - sql statement
-	*  - database type (oci8, ibase, ifx, etc)
-	*  - database name
-	*  - userid
-	*  - setFetchMode (adodb 4.23)
-	*
-	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
-	* Assuming that we can have 50,000 files per directory with good performance, 
-	* then we can scale to 12.8 million unique cached recordsets. Wow!
- 	*/
-	function _gencachename($sql,$createdir,$memcache=false)
-	{
-	global $ADODB_CACHE_DIR;
-	static $notSafeMode;
-		
-		if ($this->fetchMode === false) { 
-		global $ADODB_FETCH_MODE;
+	 * Private function to generate filename for caching.
+	 * Filename is generated based on:
+	 *
+	 *  - sql statement
+	 *  - database type (oci8, ibase, ifx, etc)
+	 *  - database name
+	 *  - userid
+	 *  - setFetchMode (adodb 4.23)
+	 *
+	 * When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR).
+	 * Assuming that we can have 50,000 files per directory with good performance,
+	 * then we can scale to 12.8 million unique cached recordsets. Wow!
+	 */
+	function _gencachename($sql,$createdir) {
+		global $ADODB_CACHE, $ADODB_CACHE_DIR;
+
+		if ($this->fetchMode === false) {
+			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		} else {
 			$mode = $this->fetchMode;
 		}
 		$m = md5($sql.$this->databaseType.$this->database.$this->user.$mode);
-		if ($memcache) return $m;
-		
-		if (!isset($notSafeMode)) $notSafeMode = !ini_get('safe_mode');
-		$dir = ($notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($m,0,2) : $ADODB_CACHE_DIR;
-			
-		if ($createdir && $notSafeMode && !file_exists($dir)) {
-			$oldu = umask(0);
-			if (!mkdir($dir,0771)) 
-				if ($this->debug) ADOConnection::outp( "Unable to mkdir $dir for $sql");
-			umask($oldu);
+		if (!$ADODB_CACHE->createdir) {
+			return $m;
+		}
+		if (!$createdir) {
+			$dir = $ADODB_CACHE->getdirname($m);
+		} else {
+			$dir = $ADODB_CACHE->createdir($m, $this->debug);
 		}
+
 		return $dir.'/adodb_'.$m.'.cache';
 	}
-	
-	
+
+
 	/**
 	 * Execute SQL, caching recordsets.
 	 *
-	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
-	 *					  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)
-	{
+	function CacheExecute($secs2cache,$sql=false,$inputarr=false) {
+		global $ADODB_CACHE;
+
+		if (empty($ADODB_CACHE)) {
+			$this->_CreateCache();
+		}
 
-			
 		if (!is_numeric($secs2cache)) {
 			$inputarr = $sql;
 			$sql = $secs2cache;
 			$secs2cache = $this->cacheSecs;
 		}
-		
+
 		if (is_array($sql)) {
 			$sqlparam = $sql;
 			$sql = $sql[0];
 		} else
 			$sqlparam = $sql;
-			
-		if ($this->memCache) {
-			global $ADODB_INCLUDED_MEMCACHE;
-			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
-			$md5file = $this->_gencachename($sql.serialize($inputarr),false,true);
-		} else {
-		global $ADODB_INCLUDED_CSV;
-			if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-			$md5file = $this->_gencachename($sql.serialize($inputarr),true);
-		}
 
+
+		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
 		$err = '';
-		
+
 		if ($secs2cache > 0){
-			if ($this->memCache)
-				$rs = &getmemCache($md5file,$err,$secs2cache, $this->memCacheHost, $this->memCachePort);
-			else
-				$rs = &csv2rs($md5file,$err,$secs2cache,$this->arrayClass);
+			$rs = $ADODB_CACHE->readcache($md5file,$err,$secs2cache,$this->arrayClass);
 			$this->numCacheHits += 1;
 		} else {
 			$err='Timeout 1';
 			$rs = false;
 			$this->numCacheMisses += 1;
 		}
+
 		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)");
 				}
-				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
 			}
-			
-			$rs = &$this->Execute($sqlparam,$inputarr);
-
-			if ($rs && $this->memCache) {
-				$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
-				if(!putmemCache($md5file, $rs, $this->memCacheHost, $this->memCachePort, $this->memCacheCompress, $this->debug)) {
-					if ($fn = $this->raiseErrorFn)
-						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
-					if ($this->debug) ADOConnection::outp( " Cache write error");
-				}
-			} else
+
+			$rs = $this->Execute($sqlparam,$inputarr);
+
 			if ($rs) {
 				$eof = $rs->EOF;
-				$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
+				$rs = $this->_rs2rs($rs); // read entire recordset into memory immediately
+				$rs->timeCreated = time(); // used by caching
 				$txt = _rs2serialize($rs,false,$sql); // serialize
-		
-				if (!adodb_write_file($md5file,$txt,$this->debug)) {
-					if ($fn = $this->raiseErrorFn) {
-						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
+
+				$ok = $ADODB_CACHE->writecache($md5file,$txt,$this->debug, $secs2cache);
+				if (!$ok) {
+					if ($ok === false) {
+						$em = 'Cache write error';
+						$en = -32000;
+
+						if ($fn = $this->raiseErrorFn) {
+							$fn($this->databaseType,'CacheExecute', $en, $em, $md5file,$sql,$this);
+						}
+					} else {
+						$em = 'Cache file locked warning';
+						$en = -32001;
+						// do not call error handling for just a warning
+					}
+
+					if ($this->debug) {
+						ADOConnection::outp( " ".$em);
 					}
-					if ($this->debug) ADOConnection::outp( " Cache write error");
 				}
 				if ($rs->EOF && !$eof) {
 					$rs->MoveFirst();
-					//$rs = &csv2rs($md5file,$err);		
-					$rs->connection = &$this; // Pablo suggestion
-				}  
-				
-			} else
-			if (!$this->memCache)
-				@unlink($md5file);
+					//$rs = csv2rs($md5file,$err);
+					$rs->connection = $this; // Pablo suggestion
+				}
+
+			} else if (!$this->memCache) {
+				$ADODB_CACHE->flushcache($md5file);
+			}
 		} else {
 			$this->_errorMsg = '';
 			$this->_errorCode = 0;
-			
+
 			if ($this->fnCacheExecute) {
 				$fn = $this->fnCacheExecute;
 				$fn($this, $secs2cache, $sql, $inputarr);
 			}
-		// ok, set cached object found
-			$rs->connection = &$this; // Pablo suggestion
-			if ($this->debug){ 
-					
+			// ok, set cached object found
+			$rs->connection = $this; // Pablo suggestion
+			if ($this->debug){
+				if ($this->debug == 99) {
+					adodb_backtrace();
+				}
 				$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
 				$ttl = $rs->timeCreated + $secs2cache - time();
 				$s = is_array($sql) ? $sql[0] : $sql;
-				if ($inBrowser) $s = ''.htmlspecialchars($s).'';
-				
+				if ($inBrowser) {
+					$s = ''.htmlspecialchars($s).'';
+				}
+
 				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
 			}
 		}
 		return $rs;
 	}
-	
-	
-	/* 
-		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) 
-	{
-		$false = false;
-		$sql = 'SELECT * FROM '.$table;  
-		if ($where!==FALSE) $sql .= ' WHERE '.$where;
-		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
-			ADOConnection::outp('AutoExecute: Illegal mode=UPDATE with empty WHERE clause');
-			return $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;
+		}
+
+		$sql = "SELECT * FROM $table";
+		$rs = $this->SelectLimit($sql, 1);
+		if (!$rs) {
+			return false; // table does not exist
 		}
 
-		$rs =& $this->SelectLimit($sql,1);
-		if (!$rs) return $false; // table does not exist
 		$rs->tableName = $table;
-		
-		switch((string) $mode) {
-		case 'UPDATE':
-		case '2':
-			$sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq);
-			break;
-		case 'INSERT':
-		case '1':
-			$sql = $this->GetInsertSQL($rs, $fields_values, $magicq);
-			break;
-		default:
-			ADOConnection::outp("AutoExecute: Unknown mode=$mode");
-			return $false;
+		if ($where !== false) {
+			$sql .= " WHERE $where";
 		}
-		$ret = false;
-		if ($sql) $ret = $this->Execute($sql);
-		if ($ret) $ret = true;
-		return $ret;
+		$rs->sql = $sql;
+
+		switch($mode) {
+			case 'UPDATE':
+			case DB_AUTOQUERY_UPDATE:
+				$sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate);
+				break;
+			case 'INSERT':
+			case DB_AUTOQUERY_INSERT:
+				$sql = $this->GetInsertSQL($rs, $fields_values);
+				break;
+			default:
+				$this->outp_throw("AutoExecute: Unknown mode=$mode", 'AutoExecute');
+				return false;
+		}
+		return $sql && $this->Execute($sql);
 	}
-	
-	
+
+
 	/**
 	 * 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" 
 	 *
-	 * "Jonathan Younger" 
-  	 */
-	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
-	{
+	 * @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
+	 *
+	 * @noinspection PhpUnusedParameterInspection
+	 */
+	function GetUpdateSQL(&$rs, $arrFields, $forceUpdate=false, $magic_quotes=false, $force=null) {
 		global $ADODB_INCLUDED_LIB;
 
-        //********************************************************//
-        //This is here to maintain compatibility
-        //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
+		// ********************************************************
+		// This is here to maintain compatibility
+		// with older adodb versions. Sets force type to force nulls if $forcenulls is set.
 		if (!isset($force)) {
-				global $ADODB_FORCE_TYPE;
-			    $force = $ADODB_FORCE_TYPE;
+			global $ADODB_FORCE_TYPE;
+			$force = $ADODB_FORCE_TYPE;
 		}
-		//********************************************************//
+		// ********************************************************
 
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
+		if (empty($ADODB_INCLUDED_LIB)) {
+			include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		}
+		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.
-  	 */
-	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
-	{	
+	 *       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, $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');
-		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
+		if (empty($ADODB_INCLUDED_LIB)) {
+			include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		}
+		return _adodb_getinsertsql($this, $rs, $arrFields, $force);
 	}
-	
+
 
 	/**
 	* Update a blob column, given a where clause. There are more sophisticated
 	* blob handling functions that we could have implemented, but all require
 	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use. 
+	* simple to understand and use.
 	*
 	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
 	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
+	* Usage to update a $blobvalue which has a primary key blob_id=1 into a
 	* field blobtable.blobcolumn:
 	*
 	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
@@ -1904,68 +2460,82 @@ function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=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;
 	}
 
 	/**
 	* Usage:
 	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*	
+	*
 	*	$blobtype supports 'BLOB' and 'CLOB'
 	*
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 	*	$conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
 	*/
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
-	{
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') {
 		$fd = fopen($path,'rb');
-		if ($fd === false) return false;
+		if ($fd === false) {
+			return false;
+		}
 		$val = fread($fd,filesize($path));
 		fclose($fd);
 		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
 	}
-	
-	function BlobDecode($blob)
-	{
+
+	function BlobDecode($blob) {
 		return $blob;
 	}
-	
-	function BlobEncode($blob)
-	{
+
+	function BlobEncode($blob) {
 		return $blob;
 	}
-	
-	function SetCharSet($charset)
-	{
-		return false;
+
+	/**
+	 * 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 IfNull( $field, $ifNull ) 
-	{
+
+	/**
+	 * 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;
+	}
+
+	function IfNull( $field, $ifNull ) {
 		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
 	}
-	
-	function LogSQL($enable=true)
-	{
+
+	function LogSQL($enable=true) {
 		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		
-		if ($enable) $this->fnExecute = 'adodb_log_sql';
-		else $this->fnExecute = false;
-		
-		$old = $this->_logsql;	
+
+		if ($enable) {
+			$this->fnExecute = 'adodb_log_sql';
+		} else {
+			$this->fnExecute = false;
+		}
+
+		$old = $this->_logsql;
 		$this->_logsql = $enable;
-		if ($enable && !$old) $this->_affected = false;
+		if ($enable && !$old) {
+			$this->_affected = false;
+		}
 		return $old;
 	}
-	
-	function GetCharSet()
-	{
-		return false;
-	}
-	
+
 	/**
 	* Usage:
 	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
@@ -1973,31 +2543,28 @@ function GetCharSet()
 	*	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
 	*	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
 	*/
-	function UpdateClob($table,$column,$val,$where)
-	{
+	function UpdateClob($table,$column,$val,$where) {
 		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
 	}
-	
+
 	// not the fastest implementation - quick and dirty - jlim
 	// for best performance, use the actual $rs->MetaType().
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		
+	function MetaType($t,$len=-1,$fieldobj=false) {
+
 		if (empty($this->_metars)) {
 			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars =& new $rsclass(false,$this->fetchMode); 
-			$this->_metars->connection =& $this;
+			$this->_metars = new $rsclass(false,$this->fetchMode);
+			$this->_metars->connection = $this;
 		}
 		return $this->_metars->MetaType($t,$len,$fieldobj);
 	}
-	
-	
+
+
 	/**
 	*  Change the SQL connection locale to a specified locale.
 	*  This is used to get the date formats written depending on the client locale.
 	*/
-	function SetDateLocale($locale = 'En')
-	{
+	function SetDateLocale($locale = 'En') {
 		$this->locale = $locale;
 		switch (strtoupper($locale))
 		{
@@ -2005,12 +2572,13 @@ function SetDateLocale($locale = 'En')
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
 				break;
-				
+
 			case 'US':
 				$this->fmtDate = "'m-d-Y'";
 				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
 				break;
-				
+
+			case 'PT_BR':
 			case 'NL':
 			case 'FR':
 			case 'RO':
@@ -2018,12 +2586,12 @@ function SetDateLocale($locale = 'En')
 				$this->fmtDate="'d-m-Y'";
 				$this->fmtTimeStamp = "'d-m-Y H:i:s'";
 				break;
-				
+
 			case 'GE':
 				$this->fmtDate="'d.m.Y'";
 				$this->fmtTimeStamp = "'d.m.Y H:i:s'";
 				break;
-				
+
 			default:
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
@@ -2031,69 +2599,62 @@ function SetDateLocale($locale = 'En')
 		}
 	}
 
-	function &GetActiveRecordsClass($class, $table,$whereOrderBy=false,$bindarr=false, $primkeyArr=false)
-	{
-	global $_ADODB_ACTIVE_DBS;
-	
-		$save = $this->SetFetchMode(ADODB_FETCH_NUM);
-		if (empty($whereOrderBy)) $whereOrderBy = '1=1';
-		$rows = $this->GetAll("select * from ".$table.' WHERE '.$whereOrderBy,$bindarr);
-		$this->SetFetchMode($save);
-		
-		$false = false;
-		
-		if ($rows === false) {	
-			return $false;
-		}
-		
-		
+	/**
+	 * GetActiveRecordsClass Performs an 'ALL' query
+	 *
+	 * @param mixed $class This string represents the class of the current active record
+	 * @param mixed $table Table used by the active record object
+	 * @param mixed $whereOrderBy Where, order, by clauses
+	 * @param mixed $bindarr
+	 * @param mixed $primkeyArr
+	 * @param array $extra Query extras: limit, offset...
+	 * @param mixed $relations Associative array: table's foreign name, "hasMany", "belongsTo"
+	 * @access public
+	 * @return void
+	 */
+	function GetActiveRecordsClass(
+			$class, $table,$whereOrderBy=false,$bindarr=false, $primkeyArr=false,
+			$extra=array(),
+			$relations=array())
+	{
+		global $_ADODB_ACTIVE_DBS;
+		## reduce overhead of adodb.inc.php -- moved to adodb-active-record.inc.php
+		## if adodb-active-recordx is loaded -- should be no issue as they will probably use Find()
 		if (!isset($_ADODB_ACTIVE_DBS)) {
-			include(ADODB_DIR.'/adodb-active-record.inc.php');
-		}	
-		if (!class_exists($class)) {
-			ADOConnection::outp("Unknown class $class in GetActiveRcordsClass()");
-			return $false;
-		}
-		$arr = array();
-		foreach($rows as $row) {
-		
-			$obj =& new $class($table,$primkeyArr,$this);
-			if ($obj->ErrorMsg()){
-				$this->_errorMsg = $obj->ErrorMsg();
-				return $false;
-			}
-			$obj->Set($row);
-			$arr[] =& $obj;
+			include_once(ADODB_DIR.'/adodb-active-record.inc.php');
 		}
-		return $arr;
+		return adodb_GetActiveRecordsClass($this, $class, $table, $whereOrderBy, $bindarr, $primkeyArr, $extra, $relations);
 	}
-	
-	function &GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false)
-	{
-		$arr =& $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
+
+	function GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false) {
+		$arr = $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
 		return $arr;
 	}
-	
+
 	/**
 	 * Close Connection
 	 */
-	function Close()
-	{
+	function Close() {
 		$rez = $this->_close();
+		$this->_queryID = false;
 		$this->_connectionID = false;
 		return $rez;
 	}
-	
+
 	/**
 	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
 	 *
-	 * @return true if succeeded or false if database does not support transactions
+	 * @return bool true if succeeded or false if database does not support transactions
 	 */
-	function BeginTrans() {return false;}
-	
+	function BeginTrans() {
+		if ($this->debug) {
+			ADOConnection::outp("BeginTrans: Transactions not supported for this driver");
+		}
+		return false;
+	}
+
 	/* set transaction mode */
-	function SetTransactionMode( $transaction_mode ) 
-	{
+	function SetTransactionMode( $transaction_mode ) {
 		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
 		$this->_transmode  = $transaction_mode;
 	}
@@ -2103,15 +2664,14 @@ function SetTransactionMode( $transaction_mode )
 http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
 http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
 */
-	function MetaTransaction($mode,$db)
-	{
+	function MetaTransaction($mode,$db) {
 		$mode = strtoupper($mode);
 		$mode = str_replace('ISOLATION LEVEL ','',$mode);
-		
+
 		switch($mode) {
 
 		case 'READ UNCOMMITTED':
-			switch($db) { 
+			switch($db) {
 			case 'oci8':
 			case 'oracle':
 				return 'ISOLATION LEVEL READ COMMITTED';
@@ -2119,11 +2679,11 @@ function MetaTransaction($mode,$db)
 				return 'ISOLATION LEVEL READ UNCOMMITTED';
 			}
 			break;
-					
+
 		case 'READ COMMITTED':
 				return 'ISOLATION LEVEL READ COMMITTED';
 			break;
-			
+
 		case 'REPEATABLE READ':
 			switch($db) {
 			case 'oci8':
@@ -2133,106 +2693,139 @@ function MetaTransaction($mode,$db)
 				return 'ISOLATION LEVEL REPEATABLE READ';
 			}
 			break;
-			
+
 		case 'SERIALIZABLE':
 				return 'ISOLATION LEVEL SERIALIZABLE';
 			break;
-			
+
 		default:
 			return $mode;
 		}
 	}
-	
+
 	/**
-	 * If database does not support transactions, always return true as data always commited
+	 * 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.
 	 */
-	function CommitTrans($ok=true) 
-	{ return true;}
-	
-	
+	function CommitTrans($ok=true) {
+		return true;
+	}
+
+
 	/**
 	 * If database does not support transactions, rollbacks always fail, so return false
 	 *
-	 * @return true/false.
+	 * @return bool
 	 */
-	function RollbackTrans() 
-	{ return false;}
+	function RollbackTrans() {
+		return false;
+	}
 
 
 	/**
-	 * return the databases that the driver can connect to. 
+	 * return the databases that the driver can connect to.
 	 * Some databases will return an empty array.
 	 *
-	 * @return an array of database names.
+	 * @return array|bool an array of database names.
 	 */
-		function MetaDatabases() 
-		{
+	function MetaDatabases() {
 		global $ADODB_FETCH_MODE;
-		
-			if ($this->metaDatabasesSQL) {
-				$save = $ADODB_FETCH_MODE; 
-				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-				
-				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-				
-				$arr = $this->GetCol($this->metaDatabasesSQL);
-				if (isset($savem)) $this->SetFetchMode($savem);
-				$ADODB_FETCH_MODE = $save; 
-			
-				return $arr;
+
+		if ($this->metaDatabasesSQL) {
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+			if ($this->fetchMode !== false) {
+				$savem = $this->SetFetchMode(false);
 			}
-			
-			return false;
+
+			$arr = $this->GetCol($this->metaDatabasesSQL);
+			if (isset($savem)) {
+				$this->SetFetchMode($savem);
+			}
+			$ADODB_FETCH_MODE = $save;
+
+			return $arr;
 		}
-	
-		
+
+		return false;
+	}
+
+	/**
+	 * List procedures or functions in an array.
+	 * @param procedureNamePattern  a procedure name pattern; must match the procedure name as it is stored in the database
+	 * @param catalog a catalog name; must match the catalog name as it is stored in the database;
+	 * @param schemaPattern a schema name pattern;
+	 *
+	 * @return array of procedures on current database.
+	 *
+	 * Array(
+	 *   [name_of_procedure] => Array(
+	 *     [type] => PROCEDURE or FUNCTION
+	 *     [catalog] => Catalog_name
+	 *     [schema] => Schema_name
+	 *     [remarks] => explanatory comment on the procedure
+	 *   )
+	 * )
+	 */
+	function MetaProcedures($procedureNamePattern = null, $catalog  = null, $schemaPattern  = null) {
+		return false;
+	}
+
+
 	/**
-	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
-	 * 		If false, both views and tables are returned.
+	 * @param ttype can either be 'VIEW' or 'TABLE' or false.
+	 *		If false, both views and tables are returned.
 	 *		"VIEW" returns only views
 	 *		"TABLE" returns only tables
 	 * @param showSchema returns the schema/user with the table name, eg. USER.TABLE
 	 * @param mask  is the input mask - only supported by oci8 and postgresql
 	 *
 	 * @return  array of tables for current database.
-	 */ 
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		
-		$false = false;
+	 */
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) {
+		global $ADODB_FETCH_MODE;
+
 		if ($mask) {
-			return $false;
+			return false;
 		}
 		if ($this->metaTablesSQL) {
-			$save = $ADODB_FETCH_MODE; 
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-			
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+			if ($this->fetchMode !== false) {
+				$savem = $this->SetFetchMode(false);
+			}
+
 			$rs = $this->Execute($this->metaTablesSQL);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save; 
-			
-			if ($rs === false) return $false;
-			$arr =& $rs->GetArray();
+			if (isset($savem)) {
+				$this->SetFetchMode($savem);
+			}
+			$ADODB_FETCH_MODE = $save;
+
+			if ($rs === false) {
+				return false;
+			}
+			$arr = $rs->GetArray();
 			$arr2 = array();
-			
-			if ($hast = ($ttype && isset($arr[0][1]))) { 
+
+			if ($hast = ($ttype && isset($arr[0][1]))) {
 				$showt = strncmp($ttype,'T',1);
 			}
-			
+
 			for ($i=0; $i < sizeof($arr); $i++) {
 				if ($hast) {
 					if ($showt == 0) {
-						if (strncmp($arr[$i][1],'T',1) == 0) $arr2[] = trim($arr[$i][0]);
+						if (strncmp($arr[$i][1],'T',1) == 0) {
+							$arr2[] = trim($arr[$i][0]);
+						}
 					} else {
-						if (strncmp($arr[$i][1],'V',1) == 0) $arr2[] = trim($arr[$i][0]);
+						if (strncmp($arr[$i][1],'V',1) == 0) {
+							$arr2[] = trim($arr[$i][0]);
+						}
 					}
 				} else
 					$arr2[] = trim($arr[$i][0]);
@@ -2240,20 +2833,19 @@ function &MetaTables($ttype=false,$showSchema=false,$mask=false)
 			$rs->Close();
 			return $arr2;
 		}
-		return $false;
+		return false;
 	}
-	
-	
-	function _findschema(&$table,&$schema)
-	{
+
+
+	function _findschema(&$table,&$schema) {
 		if (!$schema && ($at = strpos($table,'.')) !== false) {
 			$schema = substr($table,0,$at);
 			$table = substr($table,$at+1);
 		}
 	}
-	
+
 	/**
-	 * List columns in a database as an array of ADOFieldObjects. 
+	 * List columns in a database as an array of ADOFieldObjects.
 	 * See top of file for definition of object.
 	 *
 	 * @param $table	table name to query
@@ -2262,24 +2854,26 @@ function _findschema(&$table,&$schema)
 	 *
 	 * @return  array of ADOFieldObjects for current table.
 	 */
-	function &MetaColumns($table,$normalize=true) 
-	{
-	global $ADODB_FETCH_MODE;
-		
-		$false = false;
-		
+	function MetaColumns($table,$normalize=true) {
+		global $ADODB_FETCH_MODE;
+
 		if (!empty($this->metaColumnsSQL)) {
-		
 			$schema = false;
 			$this->_findschema($table,$schema);
-		
+
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+			if ($this->fetchMode !== false) {
+				$savem = $this->SetFetchMode(false);
+			}
 			$rs = $this->Execute(sprintf($this->metaColumnsSQL,($normalize)?strtoupper($table):$table));
-			if (isset($savem)) $this->SetFetchMode($savem);
+			if (isset($savem)) {
+				$this->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
-			if ($rs === false || $rs->EOF) return $false;
+			if ($rs === false || $rs->EOF) {
+				return false;
+			}
 
 			$retarr = array();
 			while (!$rs->EOF) { //print_r($rs->fields);
@@ -2287,478 +2881,802 @@ function &MetaColumns($table,$normalize=true)
 				$fld->name = $rs->fields[0];
 				$fld->type = $rs->fields[1];
 				if (isset($rs->fields[3]) && $rs->fields[3]) {
-					if ($rs->fields[3]>0) $fld->max_length = $rs->fields[3];
+					if ($rs->fields[3]>0) {
+						$fld->max_length = $rs->fields[3];
+					}
 					$fld->scale = $rs->fields[4];
-					if ($fld->scale>0) $fld->max_length += 1;
-				} else
+					if ($fld->scale>0) {
+						$fld->max_length += 1;
+					}
+				} else {
 					$fld->max_length = $rs->fields[2];
-					
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-				else $retarr[strtoupper($fld->name)] = $fld;
+				}
+
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) {
+					$retarr[] = $fld;
+				} else {
+					$retarr[strtoupper($fld->name)] = $fld;
+				}
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
-		}
-		return $false;
-	}
-	
-    /**
-      * List indexes on a table as an array.
-      * @param table  table name to query
-      * @param primary true to only show primary keys. Not actually used for most databases
-	  *
-      * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
-	  
-		 Array (
-		    [name_of_index] => Array
-		      (
-	          [unique] => true or false
-	          [columns] => Array
-	          (
-	          	[0] => firstname
-		      	[1] => lastname
-	          )
-		)		
-      */
-     function &MetaIndexes($table, $primary = false, $owner = false)
-     {
-	 		$false = false;
-            return $false;
-     }
-
-	/**
-	 * List columns names in a table as an array. 
+			return $retarr;
+		}
+		return false;
+	}
+
+	/**
+	 * List indexes on a table as an array.
+	 * @param table  table name to query
+	 * @param primary true to only show primary keys. Not actually used for most databases
+	 *
+	 * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
+	 *
+	 * Array(
+	 *   [name_of_index] => Array(
+	 *     [unique] => true or false
+	 *     [columns] => Array(
+	 *       [0] => firstname
+	 *       [1] => lastname
+	 *     )
+	 *   )
+	 * )
+	 */
+	function MetaIndexes($table, $primary = false, $owner = false) {
+		return false;
+	}
+
+	/**
+	 * List columns names in a table as an array.
 	 * @param table	table name to query
 	 *
 	 * @return  array of column names for current table.
-	 */ 
-	function &MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
-	{
-		$objarr =& $this->MetaColumns($table);
+	 */
+	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) {
+		$objarr = $this->MetaColumns($table);
 		if (!is_array($objarr)) {
-			$false = false;
-			return $false;
+			return false;
 		}
 		$arr = array();
 		if ($numIndexes) {
 			$i = 0;
 			if ($useattnum) {
-				foreach($objarr as $v) 
+				foreach($objarr as $v)
 					$arr[$v->attnum] = $v->name;
-				
+
 			} else
 				foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
-		
+
 		return $arr;
 	}
-			
+
 	/**
+	 * Concatenate strings.
+	 *
 	 * Different SQL databases used different methods to combine strings together.
-	 * This function provides a wrapper. 
-	 * 
-	 * param s	variable number of string parameters
+	 * This function provides a wrapper.
 	 *
 	 * Usage: $db->Concat($str1,$str2);
-	 * 
-	 * @return concatenated string
-	 */ 	 
-	function Concat()
-	{	
+	 *
+	 * @param string $s Variable number of string parameters
+	 *
+	 * @return string concatenated string
+	 */
+	function Concat() {
 		$arr = func_get_args();
 		return implode($this->concat_operator, $arr);
 	}
-	
-	
+
+
 	/**
 	 * Converts a date "d" to a string that the database can understand.
 	 *
-	 * @param d	a date in Unix date time format.
+	 * @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)
-	{
-		if (empty($d) && $d !== 0) return 'null';
+	function DBDate($d, $isfld=false) {
+		if (empty($d) && $d !== 0) {
+			return 'null';
+		}
+		if ($isfld) {
+			return $d;
+		}
+		if (is_object($d)) {
+			return $d->format($this->fmtDate);
+		}
 
 		if (is_string($d) && !is_numeric($d)) {
-			if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
-			if ($this->isoDates) return "'$d'";
+			if ($d === 'null') {
+				return $d;
+			}
+			if (strncmp($d,"'",1) === 0) {
+				$d = _adodb_safedateq($d);
+				return $d;
+			}
+			if ($this->isoDates) {
+				return "'$d'";
+			}
 			$d = ADOConnection::UnixDate($d);
 		}
 
 		return adodb_date($this->fmtDate,$d);
 	}
-	
-	function BindDate($d)
-	{
+
+	function BindDate($d) {
 		$d = $this->DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
+		if (strncmp($d,"'",1)) {
+			return $d;
+		}
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
-	function BindTimeStamp($d)
-	{
+
+	function BindTimeStamp($d) {
 		$d = $this->DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
+		if (strncmp($d,"'",1)) {
+			return $d;
+		}
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
-	
+
+
 	/**
 	 * Converts a timestamp "ts" to a string that the database can understand.
 	 *
-	 * @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)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
+	function DBTimeStamp($ts,$isfld=false) {
+		if (empty($ts) && $ts !== 0) {
+			return 'null';
+		}
+		if ($isfld) {
+			return $ts;
+		}
+		if (is_object($ts)) {
+			return $ts->format($this->fmtTimeStamp);
+		}
 
 		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
+		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) {
 			return adodb_date($this->fmtTimeStamp,$ts);
-		
-		if ($ts === 'null') return $ts;
-		if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
-		
+		}
+
+		if ($ts === 'null') {
+			return $ts;
+		}
+		if ($this->isoDates && strlen($ts) !== 14) {
+			$ts = _adodb_safedate($ts);
+			return "'$ts'";
+		}
 		$ts = ADOConnection::UnixTimeStamp($ts);
 		return adodb_date($this->fmtTimeStamp,$ts);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
-	 * @param $v is a date string in YYYY-MM-DD format
+	 * @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
 	 */
-	function UnixDate($v)
-	{
+	static function UnixDate($v) {
 		if (is_object($v)) {
 		// odbtp support
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-	
-		if (is_numeric($v) && strlen($v) !== 8) return $v;
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
-			($v), $rr)) return false;
 
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
+		if (is_numeric($v) && strlen($v) !== 8) {
+			return $v;
+		}
+		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", $v, $rr)) {
+			return false;
+		}
+
+		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) {
+			return 0;
+		}
+
 		// h-m-s-MM-DD-YY
 		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 
 	/**
 	 * Also in ADORecordSet.
-	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
+	 * @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
 	 */
-	function UnixTimeStamp($v)
-	{
+	static function UnixTimeStamp($v) {
 		if (is_object($v)) {
 		// odbtp support
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-		
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($v), $rr)) return false;
-			
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
+
+		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) {
+			return 0;
+		}
+
 		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+		if (!isset($rr[5])) {
+			return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+		}
+		return @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 	/**
-	 * Also in ADORecordSet.
-	 *
 	 * Format database date based on user defined format.
 	 *
-	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
-	 * @param fmt 	is the format to apply to it, using date()
+	 * 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)
-	{
+	function UserDate($v,$fmt='Y-m-d',$gmt=false) {
 		$tt = $this->UnixDate($v);
 
 		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		else if ($tt == 0) return $this->emptyDate;
-		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) {
+			return $v;
+		} else if ($tt == 0) {
+			return $this->emptyDate;
+		} else if ($tt == -1) {
+			// pre-TIMESTAMP_FIRST_YEAR
 		}
-		
+
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	
+
 	}
-	
-		/**
+
+	/**
+	 * 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)) return $this->emptyTimeStamp;
+	function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false) {
+		if (!isset($v)) {
+			return $this->emptyTimeStamp;
+		}
 		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (is_numeric($v) && strlen($v)<14) return ($gmt) ? adodb_gmdate($fmt,$v) : adodb_date($fmt,$v);
+		if (is_numeric($v) && strlen($v)<14) {
+			return ($gmt) ? adodb_gmdate($fmt,$v) : adodb_date($fmt,$v);
+		}
 		$tt = $this->UnixTimeStamp($v);
 		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		if ($tt == 0) return $this->emptyTimeStamp;
+		if (($tt === false || $tt == -1) && $v != false) {
+			return $v;
+		}
+		if ($tt == 0) {
+			return $this->emptyTimeStamp;
+		}
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
 	}
-	
-	function escape($s,$magic_quotes=false)
-	{
-		return $this->addq($s,$magic_quotes);
+
+	/**
+	 * 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);
 	}
-	
+
 	/**
-	* 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 == "\\'")  // ' already quoted, no need to change anything
-			return $s;
-		else {// change \' to '' for sybase/mssql
-			$s = str_replace('\\\\','\\',$s);
-			return str_replace("\\'",$this->replaceQuote,$s);
-		}
-	}
-	
-	/**
-	 * Correctly quotes a string so that all strings are escaped. We prefix and append
-	 * to the string single-quotes.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
-	 *
-	 * @return  quoted string to be sent back to database
-	 */
-	function qstr($s,$magic_quotes=false)
-	{	
-		if (!$magic_quotes) {
-		
-			if ($this->replaceQuote[0] == '\\'){
-				// only since php 4.0.5
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
-			return "'$s'";
-		else {// change \' to '' for sybase/mssql
-			$s = str_replace('\\\\','\\',$s);
-			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+	 * 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);
 	}
-	
-	
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
-	*
-	* See readme.htm#ex8 for an example of usage.
-	*
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
-	*
-	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
-	*
-	*/
-	function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
-	{
+	 * 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 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) {
+		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.
+	 * 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');
-		if ($this->pageExecuteCountRows) $rs =& _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
-		else $rs =& _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
+		if (empty($ADODB_INCLUDED_LIB)) {
+			include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		}
+		if ($this->pageExecuteCountRows) {
+			$rs = _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
+		} else {
+			$rs = _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
+		}
 		return $rs;
 	}
-	
-		
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
-	* @param secs2cache	seconds to cache data, set to 0 to force query
-	* @param sql
-	* @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) 
-	{
+	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) {
 		/*switch($this->dataProvider) {
 		case 'postgres':
-		case 'mysql': 
+		case 'mysql':
 			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);
+	}
+
+	/**
+	 * Get the last error recorded by PHP and clear the message.
+	 *
+	 * 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 mixed[]|null Array if an error has previously occurred. Null otherwise.
+	 */
+	protected function resetLastError() {
+		$error = error_get_last();
+
+		if (is_array($error)) {
+			$error['message'] = '';
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Compare a previously stored error message with the last error recorded by PHP
+	 * to determine whether a new error has occurred.
+	 *
+	 * @param mixed[]|null $old Optional. Previously stored return value of error_get_last().
+	 *
+	 * @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 occurred yet at all.
+			return '';
+		}
+
+		if (is_null($old)) {
+			// First error recorded.
+			return $new['message'];
+		}
+
+		$changed = false;
+		foreach($new as $key => $value) {
+			if ($new[$key] !== $old[$key]) {
+				$changed = true;
+				break;
+			}
+		}
+
+		if ($changed === true) {
+			return $new['message'];
+		}
+
+		return '';
 	}
 
 } // end class ADOConnection
-	
-	
-	
-	//==============================================================================================	
+
+
+
+	//==============================================================================================
 	// CLASS ADOFetchObj
-	//==============================================================================================	
-		
+	//==============================================================================================
+
 	/**
 	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
 	*/
 	class ADOFetchObj {
 	};
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_empty
-	//==============================================================================================	
-	
+	//==============================================================================================
+
+	class ADODB_Iterator_empty implements Iterator {
+
+		private $rs;
+
+		function __construct($rs) {
+			$this->rs = $rs;
+		}
+
+		function rewind() {}
+
+		function valid() {
+			return !$this->rs->EOF;
+		}
+
+		function key() {
+			return false;
+		}
+
+		function current() {
+			return false;
+		}
+
+		function next() {}
+
+		function __call($func, $params) {
+			return call_user_func_array(array($this->rs, $func), $params);
+		}
+
+		function hasMore() {
+			return false;
+		}
+
+	}
+
+
 	/**
 	* Lightweight recordset when there are no records to be returned
 	*/
-	class ADORecordSet_empty
+	class ADORecordSet_empty implements IteratorAggregate
 	{
 		var $dataProvider = 'empty';
 		var $databaseType = false;
 		var $EOF = true;
 		var $_numOfRows = 0;
+		/** @var bool|array  */
 		var $fields = false;
 		var $connection = false;
-		function RowCount() {return 0;}
-		function RecordCount() {return 0;}
-		function PO_RecordCount(){return 0;}
-		function Close(){return true;}
-		function FetchRow() {return false;}
-		function FieldCount(){ return 0;}
+
+		function RowCount() {
+			return 0;
+		}
+
+		function RecordCount() {
+			return 0;
+		}
+
+		function PO_RecordCount() {
+			return 0;
+		}
+
+		function Close() {
+			return true;
+		}
+
+		function FetchRow() {
+			return false;
+		}
+
+		function FieldCount() {
+			return 0;
+		}
+
 		function Init() {}
+
+		function getIterator() {
+			return new ADODB_Iterator_empty($this);
+		}
+
+		function GetAssoc() {
+			return array();
+		}
+
+		function GetArray() {
+			return array();
+		}
+
+		function GetAll() {
+			return array();
+		}
+
+		function GetArrayLimit() {
+			return array();
+		}
+
+		function GetRows() {
+			return array();
+		}
+
+		function GetRowAssoc() {
+			return array();
+		}
+
+		function MaxRecordCount() {
+			return 0;
+		}
+
+		function NumRows() {
+			return 0;
+		}
+
+		function NumCols() {
+			return 0;
+		}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// DATE AND TIME FUNCTIONS
-	//==============================================================================================	
-	if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php');
-	
-	//==============================================================================================	
+	//==============================================================================================
+	if (!defined('ADODB_DATE_VERSION')) {
+		include_once(ADODB_DIR.'/adodb-time.inc.php');
+	}
+
+	//==============================================================================================
 	// CLASS ADORecordSet
-	//==============================================================================================	
+	//==============================================================================================
+
+	class ADODB_Iterator implements Iterator {
+
+		private $rs;
+
+		function __construct($rs) {
+			$this->rs = $rs;
+		}
+
+		function rewind() {
+			$this->rs->MoveFirst();
+		}
+
+		function valid() {
+			return !$this->rs->EOF;
+		}
+
+		function key() {
+			return $this->rs->_currentRow;
+		}
+
+		function current() {
+			return $this->rs->fields;
+		}
+
+		function next() {
+			$this->rs->MoveNext();
+		}
+
+		function __call($func, $params) {
+			return call_user_func_array(array($this->rs, $func), $params);
+		}
 
-	if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
-	else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
-   /**
+		function hasMore() {
+			return !$this->rs->EOF;
+		}
+
+	}
+
+
+	/**
 	 * RecordSet class that represents the dataset returned by the database.
 	 * To keep memory overhead low, this class holds only the current row in memory.
 	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
 	 * means recordcount not known).
 	 */
-	class ADORecordSet extends ADODB_BASE_RS {
-	/*
-	 * public variables	
+	class ADORecordSet implements IteratorAggregate {
+
+	/**
+	 * public variables
 	 */
 	var $dataProvider = "native";
-	var $fields = false; 	/// holds the current row data
-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
+	/** @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.
-	var $canSeek = false; 	/// indicates that seek is supported
-	var $sql; 				/// sql text
-	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
-	
+	var $canSeek = false;	/// indicates that seek is supported
+	var $sql;				/// sql text
+	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object.
+
 	var $emptyTimeStamp = ' '; /// what to display when $time==0
 	var $emptyDate = ' '; /// what to display when $time==0
 	var $debug = false;
-	var $timeCreated=0; 	/// datetime in Unix format rs created -- for cached recordsets
+	var $timeCreated=0;		/// datetime in Unix format rs created -- for cached recordsets
 
-	var $bind = false; 		/// used by Fields() to hold array - should be private?
+	var $bind = false;		/// used by Fields() to hold array - should be private?
 	var $fetchMode;			/// default fetch mode
 	var $connection = false; /// the parent connection
-	/*
-	 *	private variables	
+
+	/**
+	 *	private variables
 	 */
 	var $_numOfRows = -1;	/** number of rows, or -1 */
 	var $_numOfFields = -1;	/** number of fields in recordset */
-	var $_queryID = -1;		/** This variable keeps the result link identifier.	*/
+	/** @var 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 */
-	var $_obj; 				/** Used by FetchObj */
+	var $_closed = false;	/** has recordset been closed */
+	var $_inited = false;	/** Init() should only be called once */
+	var $_obj;				/** Used by FetchObj */
 	var $_names;			/** Used by FetchObj */
-	
-	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_lastPageNo = -1; 
+
+	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_lastPageNo = -1;
 	var $_maxRecordCount = 0;
 	var $datetime = false;
-	
+
+	/**
+	 * @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 ADORecordSet($queryID) 
-	{
+	function __construct($queryID) {
 		$this->_queryID = $queryID;
 	}
-	
-	
-	
-	function Init()
-	{
-		if ($this->_inited) return;
+
+	function __destruct() {
+		$this->Close();
+	}
+
+	function getIterator() {
+		return new ADODB_Iterator($this);
+	}
+
+	/* this is experimental - i don't really know what to return... */
+	function __toString() {
+		include_once(ADODB_DIR.'/toexport.inc.php');
+		return _adodb_export($this,',',',',false,true);
+	}
+
+	function Init() {
+		if ($this->_inited) {
+			return;
+		}
 		$this->_inited = true;
-		if ($this->_queryID) @$this->_initrs();
-		else {
+		if ($this->_queryID) {
+			@$this->_initrs();
+		} else {
 			$this->_numOfRows = 0;
 			$this->_numOfFields = 0;
 		}
 		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
-			
 			$this->_currentRow = 0;
 			if ($this->EOF = ($this->_fetch() === false)) {
 				$this->_numOfRows = 0; // _numOfRows could be -1
@@ -2767,77 +3685,131 @@ function Init()
 			$this->EOF = true;
 		}
 	}
-	
-	
+
+
 	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the FIRST column.
+	 * Generate a SELECT tag from a recordset, and return the HTML markup.
 	 *
-	 * @param name  		name of SELECT tag
-	 * @param [defstr]		the value to hilite. Use an array for multiple hilites for listbox.
-	 * @param [blank1stItem]	true to leave the 1st item in list empty
-	 * @param [multiple]		true for listbox, false for popup
-	 * @param [size]		#rows to show for listbox. not used by popup
-	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
-	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
-	 *				column 0 (1st col) if this is true. This is not documented.
+	 * If the recordset has 2 columns, we treat the first one as the text to
+	 * display to the user, and the second as the return value. Extra columns
+	 * are discarded.
 	 *
-	 * @return HTML
+	 * @param string       $name            Name of SELECT tag
+	 * @param string|array $defstr          The value to highlight. Use an array for multiple highlight values.
+	 * @param bool|string $blank1stItem     True to create an empty item (default), False not to add one;
+	 *                                      'string' to set its label and 'value:string' to assign a value to it.
+	 * @param bool         $multiple        True for multi-select list
+	 * @param int          $size            Number of rows to show (applies to multi-select box only)
+	 * @param string       $selectAttr      Additional attributes to defined for SELECT tag,
+	 *                                      useful for holding javascript onChange='...' handlers, CSS class, etc.
+	 * @param bool         $compareFirstCol When true (default), $defstr is compared against the value (column 2),
+	 *                                      while false will compare against the description (column 1).
 	 *
-	 * changes by glen.davies@cce.ac.nz to support multiple hilited items
+	 * @return string HTML
 	 */
-	function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='',$compareFields0=true)
+	function getMenu($name, $defstr = '', $blank1stItem = true, $multiple = false,
+					 $size = 0, $selectAttr = '', $compareFirstCol = true)
 	{
 		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,$compareFields0);
+		if (empty($ADODB_INCLUDED_LIB)) {
+			include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		}
+		return _adodb_getmenu($this, $name, $defstr, $blank1stItem, $multiple,
+			$size, $selectAttr, $compareFirstCol);
 	}
-	
 
-	
 	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the SECOND column.
+	 * Generate a SELECT tag with groups from a recordset, and return the HTML markup.
+	 *
+	 * The recordset must have 3 columns and be ordered by the 3rd column. The
+	 * first column contains the text to display to the user, the second is the
+	 * return value and the third is the option group. Extra columns are discarded.
+	 * Default strings are compared with the SECOND column.
 	 *
+	 * @param string       $name            Name of SELECT tag
+	 * @param string|array $defstr          The value to highlight. Use an array for multiple highlight values.
+	 * @param bool|string $blank1stItem     True to create an empty item (default), False not to add one;
+	 *                                      'string' to set its label and 'value:string' to assign a value to it.
+	 * @param bool         $multiple        True for multi-select list
+	 * @param int          $size            Number of rows to show (applies to multi-select box only)
+	 * @param string       $selectAttr      Additional attributes to defined for SELECT tag,
+	 *                                      useful for holding javascript onChange='...' handlers, CSS class, etc.
+	 * @param bool         $compareFirstCol When true (default), $defstr is compared against the value (column 2),
+	 *                                      while false will compare against the description (column 1).
+	 *
+	 * @return string HTML
 	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
+	function getMenuGrouped($name, $defstr = '', $blank1stItem = true, $multiple = false,
+							$size = 0, $selectAttr = '', $compareFirstCol = true)
 	{
-		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,false);
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) {
+			include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		}
+		return _adodb_getmenu_gp($this, $name, $defstr, $blank1stItem, $multiple,
+			$size, $selectAttr, $compareFirstCol);
 	}
-	
-	/*
-		Grouped Menu
-	*/
-	function GetMenu3($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='')
+
+	/**
+	 * Generate a SELECT tag from a recordset, and return the HTML markup.
+	 *
+	 * Same as GetMenu(), except that default strings are compared with the
+	 * FIRST column (the description).
+	 *
+	 * @param string       $name            Name of SELECT tag
+	 * @param string|array $defstr          The value to highlight. Use an array for multiple highlight values.
+	 * @param bool|string $blank1stItem     True to create an empty item (default), False not to add one;
+	 *                                      'string' to set its label and 'value:string' to assign a value to it.
+	 * @param bool         $multiple        True for multi-select list
+	 * @param int          $size            Number of rows to show (applies to multi-select box only)
+	 * @param string       $selectAttr      Additional attributes to defined for SELECT tag,
+	 *                                      useful for holding javascript onChange='...' handlers, CSS class, etc.
+	 *
+	 * @return string HTML
+	 *
+	 * @deprecated 5.21.0 Use getMenu() with $compareFirstCol = false instead.
+	 */
+	function getMenu2($name, $defstr = '', $blank1stItem = true, $multiple = false,
+					  $size = 0, $selectAttr = '')
 	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple,
+		return $this->getMenu($name, $defstr, $blank1stItem, $multiple,
 			$size, $selectAttr,false);
 	}
 
 	/**
-	 * return recordset as a 2-dimensional array.
+	 * Generate a SELECT tag with groups from a recordset, and return the HTML markup.
 	 *
-	 * @param [nRows]  is the number of rows to return. -1 means every row.
+	 * Same as GetMenuGrouped(), except that default strings are compared with the
+	 * FIRST column (the description).
+	 *
+	 * @param string       $name            Name of SELECT tag
+	 * @param string|array $defstr          The value to highlight. Use an array for multiple highlight values.
+	 * @param bool|string $blank1stItem     True to create an empty item (default), False not to add one;
+	 *                                      'string' to set its label and 'value:string' to assign a value to it.
+	 * @param bool         $multiple        True for multi-select list
+	 * @param int          $size            Number of rows to show (applies to multi-select box only)
+	 * @param string       $selectAttr      Additional attributes to defined for SELECT tag,
+	 *                                      useful for holding javascript onChange='...' handlers, CSS class, etc.
 	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
+	 * @return string HTML
+	 *
+	 * @deprecated 5.21.0 Use getMenuGrouped() with $compareFirstCol = false instead.
 	 */
-	function &GetArray($nRows = -1) 
+	function getMenu3($name, $defstr = '', $blank1stItem = true, $multiple = false,
+					  $size = 0, $selectAttr = '')
 	{
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
-		$results = adodb_getall($this,$nRows);
-		return $results;
+		return $this->getMenuGrouped($name, $defstr, $blank1stItem, $multiple,
+			$size, $selectAttr, false);
 	}
+
+	/**
+	 * return recordset as a 2-dimensional array.
+	 *
+	 * @param int $nRows  Number of rows to return. -1 means every row.
+	 *
+	 * @return array indexed by the rows (0-based) from the recordset
+	 */
+	function GetArray($nRows = -1) {
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nRows != $cnt) {
@@ -2847,318 +3819,354 @@ function &GetArray($nRows = -1)
 		}
 		return $results;
 	}
-	
-	function &GetAll($nRows = -1)
-	{
-		$arr =& $this->GetArray($nRows);
-		return $arr;
+
+	function GetAll($nRows = -1) {
+		return $this->GetArray($nRows);
 	}
-	
+
 	/*
 	* Some databases allow multiple recordsets to be returned. This function
 	* will return true if there is a next recordset, or false if no more.
 	*/
-	function NextRecordSet()
-	{
+	function NextRecordSet() {
 		return false;
 	}
-	
+
 	/**
-	 * return recordset as a 2-dimensional array. 
+	 * return recordset as a 2-dimensional array.
 	 * Helper function for ADOConnection->SelectLimit()
 	 *
 	 * @param offset	is the row to start calculations from (1-based)
 	 * @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) 
-	{	
+	function GetArrayLimit($nrows,$offset=-1) {
 		if ($offset <= 0) {
-			$arr =& $this->GetArray($nrows);
-			return $arr;
-		} 
-		
+			return $this->GetArray($nrows);
+		}
+
 		$this->Move($offset);
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
+
+
 	/**
 	 * Synonym for GetArray() for compatibility with ADO.
 	 *
 	 * @param [nRows]  is the number of rows to return. -1 means every row.
 	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
+	 * @return array an array indexed by the rows (0-based) from the recordset
 	 */
-	function &GetRows($nRows = -1) 
-	{
-		$arr =& $this->GetArray($nRows);
-		return $arr;
+	function GetRows($nRows = -1) {
+		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) 
+	function getAssoc($force_array = false, $first2cols = false)
 	{
-	global $ADODB_EXTENSION;
-	
-		$cols = $this->_numOfFields;
-		if ($cols < 2) {
-			$false = false;
-			return $false;
-		}
-		$numIndex = isset($this->fields[0]);
-		$results = array();
-		
-		if (!$first2cols && ($cols > 2 || $force_array)) {
-			if ($ADODB_EXTENSION) {
-				if ($numIndex) {
-					while (!$this->EOF) {
-						// $results[trim($this->fields[0])] = array_slice($this->fields, 1);
-						// Fix for array_slice re-numbering numeric associative keys in PHP5
-						$keys = array_slice(array_keys($this->fields), 1);
-						$sliced_array = array();
-
-						foreach($keys as $key) {
-							$sliced_array[$key] = $this->fields[$key];
-						}
-						
-						$results[trim(reset($this->fields))] = $sliced_array;
+		/*
+		* Insufficient rows to show data
+		*/
+		if ($this->_numOfFields < 2)
+			  return;
+
+		/*
+		* Empty recordset
+		*/
+		if (!$this->fields) {
+			return array();
+		}
+
+		/*
+		* The number of fields is half the actual returned in BOTH mode
+		*/
+		$numberOfFields = $this->_numOfFields;
 
-						adodb_movenext($this);
-					}
-				} else {
-					while (!$this->EOF) {
-						$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
-						adodb_movenext($this);
-					}
-				}
-			} else {
-				if ($numIndex) {
-					while (!$this->EOF) {
-						//$results[trim($this->fields[0])] = array_slice($this->fields, 1);
-						// Fix for array_slice re-numbering numeric associative keys in PHP5
-						$keys = array_slice(array_keys($this->fields), 1);
-						$sliced_array = array();
-
-						foreach($keys as $key) {
-							$sliced_array[$key] = $this->fields[$key];
-						}
-						
-						$results[trim(reset($this->fields))] = $sliced_array;
-						$this->MoveNext();
-					}
-				} else {
-					while (!$this->EOF) {
-						$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
-						$this->MoveNext();
-					}
-				}
+		/*
+		* 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);
+		}
+
+		$showArrayMethod = 0;
+
+		if ($numberOfFields == 2)
+			/*
+			* Key is always value of first element
+			* Value is always value of second element
+			*/
+			$showArrayMethod = 1;
+
+		if ($force_array)
+			$showArrayMethod = 0;
+
+		if ($first2cols)
+			$showArrayMethod = 1;
+
+		$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;
 			}
+
+			$this->MoveNext();
 		}
-		
-		$ref =& $results; # workaround accelerator incompat with PHP 4.4 :(
-		return $ref; 
+		/*
+		 * 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) return adodb_date($fmt,$v);
+	function UserTimeStamp($v,$fmt='Y-m-d H:i:s') {
+		if (is_numeric($v) && strlen($v)<14) {
+			return adodb_date($fmt,$v);
+		}
 		$tt = $this->UnixTimeStamp($v);
 		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		if ($tt === 0) return $this->emptyTimeStamp;
+		if (($tt === false || $tt == -1) && $v != false) {
+			return $v;
+		}
+		if ($tt === 0) {
+			return $this->emptyTimeStamp;
+		}
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
-	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
-	 * @param fmt 	is the format to apply to it, using date()
+	 * @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')
-	{
+	function UserDate($v,$fmt='Y-m-d') {
 		$tt = $this->UnixDate($v);
 		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		else if ($tt == 0) return $this->emptyDate;
-		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) {
+			return $v;
+		} else if ($tt == 0) {
+			return $this->emptyDate;
+		} else if ($tt == -1) {
+			// pre-TIMESTAMP_FIRST_YEAR
 		}
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
-	 * @param $v is a date string in YYYY-MM-DD format
+	 * @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
 	 */
-	function UnixDate($v)
-	{
+	static function UnixDate($v) {
 		return ADOConnection::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
 	 */
-	function UnixTimeStamp($v)
-	{
+	static function UnixTimeStamp($v) {
 		return ADOConnection::UnixTimeStamp($v);
 	}
-	
-	
+
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
-	function Free()
-	{
+	function Free() {
 		return $this->Close();
 	}
-	
-	
+
+
 	/**
-	* PEAR DB compat, number of rows
-	*/
-	function NumRows()
-	{
+	 * PEAR DB compat, number of rows
+	 *
+	 * @return int
+	 */
+	function NumRows() {
 		return $this->_numOfRows;
 	}
-	
-	
+
+
 	/**
-	* PEAR DB compat, number of cols
-	*/
-	function NumCols()
-	{
+	 * 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
-	*/
-	function &FetchRow()
-	{
+	 * 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) {
-			$false = false;
-			return $false;
+			return false;
 		}
 		$arr = $this->fields;
 		$this->_currentRow++;
-		if (!$this->_fetch()) $this->EOF = true;
+		if (!$this->_fetch()) {
+			$this->EOF = true;
+		}
 		return $arr;
 	}
-	
-	
+
+
 	/**
-	* Fetch a row, returning PEAR_Error if no more rows. 
+	* Fetch a row, returning PEAR_Error if no more rows.
 	* This is PEAR DB compat mode.
 	*
-	* @return DB_OK or error object
+	* @param mixed[]|false $arr
+	*
+	* @return mixed DB_OK or error object
 	*/
-	function FetchInto(&$arr)
-	{
-		if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new PEAR_Error('EOF',-1): false;
+	function FetchInto(&$arr) {
+		if ($this->EOF) {
+			return (defined('PEAR_ERROR_RETURN')) ? new PEAR_Error('EOF',-1): false;
+		}
 		$arr = $this->fields;
 		$this->MoveNext();
 		return 1; // DB_OK
 	}
-	
-	
+
+
 	/**
 	 * Move to the first row in the recordset. Many databases do NOT support this.
 	 *
-	 * @return true or false
+	 * @return bool true or false
 	 */
-	function MoveFirst() 
-	{
-		if ($this->_currentRow == 0) return true;
-		return $this->Move(0);			
-	}			
+	function MoveFirst() {
+		if ($this->_currentRow == 0) {
+			return true;
+		}
+		return $this->Move(0);
+	}
+
 
-	
 	/**
-	 * Move to the last row in the recordset. 
+	 * Move to the last row in the recordset.
 	 *
-	 * @return true or false
+	 * @return bool true or false
 	 */
-	function MoveLast() 
-	{
-		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
-		if ($this->EOF) return false;
+	function MoveLast() {
+		if ($this->_numOfRows >= 0) {
+			return $this->Move($this->_numOfRows-1);
+		}
+		if ($this->EOF) {
+			return false;
+		}
 		while (!$this->EOF) {
 			$f = $this->fields;
 			$this->MoveNext();
@@ -3167,18 +4175,19 @@ function MoveLast()
 		$this->EOF = false;
 		return true;
 	}
-	
-	
+
+
 	/**
 	 * Move to next record in the recordset.
 	 *
-	 * @return true if there still rows available, or false if there are no more rows (EOF).
+	 * @return bool true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function MoveNext() 
-	{
+	function MoveNext() {
 		if (!$this->EOF) {
 			$this->_currentRow++;
-			if ($this->_fetch()) return true;
+			if ($this->_fetch()) {
+				return true;
+			}
 		}
 		$this->EOF = true;
 		/* -- tested error handling when scrolling cursor -- seems useless.
@@ -3190,25 +4199,33 @@ function MoveNext()
 		*/
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * Random access to a specific row in the recordset. Some databases do not support
 	 * access to previous rows in the databases (no scrolling backwards).
 	 *
-	 * @param rowNumber is the row to move to (0-based)
+	 * @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) 
-	{
+	function Move($rowNumber = 0) {
 		$this->EOF = false;
-		if ($rowNumber == $this->_currentRow) return true;
-		if ($rowNumber >= $this->_numOfRows)
-	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-  				
-		if ($this->canSeek) { 
-	
+		if ($rowNumber == $this->_currentRow) {
+			return true;
+		}
+		if ($rowNumber >= $this->_numOfRows) {
+			if ($this->_numOfRows != -1) {
+				$rowNumber = $this->_numOfRows-2;
+			}
+		}
+
+		if ($rowNumber < 0) {
+			$this->EOF = true;
+			return false;
+		}
+
+		if ($this->canSeek) {
 			if ($this->_seek($rowNumber)) {
 				$this->_currentRow = $rowNumber;
 				if ($this->_fetch()) {
@@ -3219,119 +4236,162 @@ function Move($rowNumber = 0)
 				return false;
 			}
 		} else {
-			if ($rowNumber < $this->_currentRow) return false;
-			global $ADODB_EXTENSION;
-			if ($ADODB_EXTENSION) {
-				while (!$this->EOF && $this->_currentRow < $rowNumber) {
-					adodb_movenext($this);
-				}
-			} else {
-			
-				while (! $this->EOF && $this->_currentRow < $rowNumber) {
-					$this->_currentRow++;
-					
-					if (!$this->_fetch()) $this->EOF = true;
+			if ($rowNumber < $this->_currentRow) {
+				return false;
+			}
+			while (! $this->EOF && $this->_currentRow < $rowNumber) {
+				$this->_currentRow++;
+
+				if (!$this->_fetch()) {
+					$this->EOF = true;
 				}
 			}
 			return !($this->EOF);
 		}
-		
-		$this->fields = false;	
+
+		$this->fields = false;
 		$this->EOF = true;
 		return false;
 	}
-	
-		
+
+
 	/**
 	 * Get the value of a field in the current row by column name.
 	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
-	 * 
-	 * @param colname  is the field to access
 	 *
-	 * @return the value of $colname column
+	 * @param string $colname is the field to access
+	 *
+	 * @return mixed the value of $colname column
 	 */
-	function Fields($colname)
-	{
+	function Fields($colname) {
 		return $this->fields[$colname];
 	}
-	
-	function GetAssocKeys($upper=true)
-	{
+
+	/**
+	 * 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) {
+		switch($case) {
+			case ADODB_ASSOC_CASE_UPPER:
+				return 'strtoupper';
+			case ADODB_ASSOC_CASE_LOWER:
+				return 'strtolower';
+			case ADODB_ASSOC_CASE_NATIVE:
+			default:
+				return false;
+		}
+	}
+
+	/**
+	 * Builds the bind array associating keys to recordset fields
+	 *
+	 * @param int [$upper] Case for the array keys, defaults to uppercase
+	 *                   (see ADODB_ASSOC_CASE_xxx constants)
+	 */
+	function GetAssocKeys($upper = ADODB_ASSOC_CASE) {
+		if ($this->bind) {
+			return;
+		}
 		$this->bind = array();
+
+		// Define case conversion function for ASSOC fetch mode
+		$fn_change_case = $this->AssocCaseConvertFunction($upper);
+
+		// Build the bind array
 		for ($i=0; $i < $this->_numOfFields; $i++) {
 			$o = $this->FetchField($i);
-			if ($upper === 2) $this->bind[$o->name] = $i;
-			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
-		}
-	}
-	
-  /**
-   * Use associative array to get fields array for databases that do not support
-   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
-   *
-   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC
-   * before you execute your SQL statement, and access $rs->fields['col'] directly.
-   *
-   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by FetchField
-   */
-	function &GetRowAssoc($upper=1)
-	{
-		$record = array();
-	 //	if (!$this->fields) return $record;
-		
-	   	if (!$this->bind) {
-			$this->GetAssocKeys($upper);
+
+			// Set the array's key
+			if(is_numeric($o->name)) {
+				// Just use the field ID
+				$key = $i;
+			}
+			elseif( $fn_change_case ) {
+				// Convert the key's case
+				$key = $fn_change_case($o->name);
+			}
+			else {
+				$key = $o->name;
+			}
+
+			$this->bind[$key] = $i;
 		}
-		
+	}
+
+	/**
+	 * Use associative array to get fields array for databases that do not support
+	 * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
+	 *
+	 * @param int [$upper] Case for the array keys, defaults to uppercase
+	 *                   (see ADODB_ASSOC_CASE_xxx constants)
+	 */
+	function GetRowAssoc($upper = ADODB_ASSOC_CASE) {
+		$record = array();
+		$this->GetAssocKeys($upper);
+
 		foreach($this->bind as $k => $v) {
-			$record[$k] = $this->fields[$v];
+			if( array_key_exists( $v, $this->fields ) ) {
+				$record[$k] = $this->fields[$v];
+			} elseif( array_key_exists( $k, $this->fields ) ) {
+				$record[$k] = $this->fields[$k];
+			} else {
+				# This should not happen... trigger error ?
+				$record[$k] = null;
+			}
 		}
-
 		return $record;
 	}
-	
-	
+
 	/**
 	 * Clean up recordset
 	 *
-	 * @return true or false
+	 * @return bool
 	 */
-	function Close() 
-	{
+	function Close() {
 		// free connection object - this seems to globally free the object
 		// and not merely the reference, so don't do this...
-		// $this->connection = false; 
+		// $this->connection = false;
 		if (!$this->_closed) {
 			$this->_closed = true;
-			return $this->_close();		
+			return $this->_close();
 		} else
 			return true;
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * Synonyms RecordCount and RowCount
 	 *
-	 * @return the number of rows or -1 if this is not supported
+	 * @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.
-	*/
-	function MaxRecordCount()
-	{
+	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.
+	 *
+	 * @return int
+	 */
+	function MaxRecordCount() {
 		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
-	function RowCount() {return $this->_numOfRows;} 
-	
+	function RowCount() {
+		return $this->_numOfRows;
+	}
+
 
 	 /**
 	 * Portable RecordCount. Pablo Roca 
@@ -3340,87 +4400,97 @@ function RowCount() {return $this->_numOfRows;}
 	 *
 	 * But aware possible problems in multiuser environments. For better speed the table
 	 * must be indexed by the condition. Heavy test this before deploying.
-	 */ 
+	 */
 	function PO_RecordCount($table="", $condition="") {
-		
+
 		$lnumrows = $this->_numOfRows;
 		// the database doesn't support native recordcount, so we do a workaround
 		if ($lnumrows == -1 && $this->connection) {
 			IF ($table) {
-				if ($condition) $condition = " WHERE " . $condition; 
-				$resultrows = &$this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
-				if ($resultrows) $lnumrows = reset($resultrows->fields);
+				if ($condition) {
+					$condition = " WHERE " . $condition;
+				}
+				$resultrows = $this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
+				if ($resultrows) {
+					$lnumrows = reset($resultrows->fields);
+				}
 			}
 		}
 		return $lnumrows;
 	}
-	
-	
+
+
 	/**
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
-	function CurrentRow() {return $this->_currentRow;}
-	
+	function CurrentRow() {
+		return $this->_currentRow;
+	}
+
 	/**
 	 * synonym for CurrentRow -- for ADO compat
 	 *
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
-	function AbsolutePosition() {return $this->_currentRow;}
-	
+	function AbsolutePosition() {
+		return $this->_currentRow;
+	}
+
 	/**
 	 * @return the number of columns in the recordset. Some databases will set this to 0
 	 * if no records are returned, others will return the number of columns in the query.
 	 */
-	function FieldCount() {return $this->_numOfFields;}   
-
+	function FieldCount() {
+		return $this->_numOfFields;
+	}
 
 	/**
-	 * 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) 
+	function fetchField($fieldOffset)
 	{
-		// must be defined by child class
-	}	
-	
+		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;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is lowercase field names.
 	*
 	* @return the object with the properties set to the fields of the current row
 	*/
-	function &FetchObj()
-	{
-		$o =& $this->FetchObject(false);
-		return $o;
+	function FetchObj() {
+		return $this->FetchObject(false);
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is uppercase.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row
 	*/
-	function &FetchObject($isupper=true)
-	{
+	function FetchObject($isupper=true) {
 		if (empty($this->_obj)) {
 			$this->_obj = new ADOFetchObj();
 			$this->_names = array();
@@ -3430,58 +4500,59 @@ 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];
-			if ($isupper) $n = strtoupper($name);
-			else $n = $name;
-			
+			if ($isupper) {
+				$n = strtoupper($name);
+			} else {
+				$n = $name;
+			}
+
 			$o->$n = $this->Fields($name);
 		}
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default is lower-case field names.
-	* 
+	*
 	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
+	*	or false if EOF
 	*
 	* Fixed bug reported by tim@orotech.net
 	*/
-	function &FetchNextObj()
-	{
-		$o =& $this->FetchNextObject(false);
-		return $o;
+	function FetchNextObj() {
+		return $this->FetchNextObject(false);
 	}
-	
-	
+
+
 	/**
-	* Return the fields array of the current row as an object for convenience. 
+	* Return the fields array of the current row as an object for convenience.
 	* The default is upper case field names.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
+	*	or false if EOF
 	*
 	* Fixed bug reported by tim@orotech.net
 	*/
-	function &FetchNextObject($isupper=true)
-	{
+	function FetchNextObject($isupper=true) {
 		$o = false;
 		if ($this->_numOfRows != 0 && !$this->EOF) {
-			$o = $this->FetchObject($isupper);	
+			$o = $this->FetchObject($isupper);
 			$this->_currentRow++;
-			if ($this->_fetch()) return $o;
+			if ($this->_fetch()) {
+				return $o;
+			}
 		}
 		$this->EOF = true;
 		return $o;
 	}
-	
+
 	/**
 	 * Get the metatype of the column. This is used for formatting. This is because
 	 * many databases use different names for the same type, so we transform the original
@@ -3489,221 +4560,267 @@ function &FetchNextObject($isupper=true)
 	 *
 	 * @param t  is the type passed in. Normally is ADOFieldObject->type.
 	 * @param len is the maximum length of that field. This is because we treat character
-	 * 	fields bigger than a certain size as a 'B' (blob).
+	 *	fields bigger than a certain size as a 'B' (blob).
 	 * @param fieldobj is the field object returned by the database driver. Can hold
 	 *	additional info (eg. primary_key for mysql).
-	 * 
-	 * @return the general type of the data: 
+	 *
+	 * @return the general type of the data:
 	 *	C for character < 250 chars
 	 *	X for teXt (>= 250 chars)
 	 *	B for Binary
-	 * 	N for numeric or floating point
+	 *	N for numeric or floating point
 	 *	D for date
 	 *	T for timestamp
-	 * 	L for logical/Boolean
+	 *	L for logical/Boolean
 	 *	I for integer
 	 *	R for autoincrement counter/integer
-	 * 
+	 *
 	 *
 	*/
-	function MetaType($t,$len=-1,$fieldobj=false)
+	function MetaType($t,$len=-1,$fieldobj=false) {
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+
+
+		// changed in 2.32 to hashing instead of switch stmt for speed...
+		static $typeMap = array(
+			'VARCHAR' => 'C',
+			'VARCHAR2' => 'C',
+			'CHAR' => 'C',
+			'C' => 'C',
+			'STRING' => 'C',
+			'NCHAR' => 'C',
+			'NVARCHAR' => 'C',
+			'VARYING' => 'C',
+			'BPCHAR' => 'C',
+			'CHARACTER' => 'C',
+			'INTERVAL' => 'C',  # Postgres
+			'MACADDR' => 'C', # postgres
+			'VAR_STRING' => 'C', # mysql
+			##
+			'LONGCHAR' => 'X',
+			'TEXT' => 'X',
+			'NTEXT' => 'X',
+			'M' => 'X',
+			'X' => 'X',
+			'CLOB' => 'X',
+			'NCLOB' => 'X',
+			'LVARCHAR' => 'X',
+			##
+			'BLOB' => 'B',
+			'IMAGE' => 'B',
+			'BINARY' => 'B',
+			'VARBINARY' => 'B',
+			'LONGBINARY' => 'B',
+			'B' => 'B',
+			##
+			'YEAR' => 'D', // mysql
+			'DATE' => 'D',
+			'D' => 'D',
+			##
+			'UNIQUEIDENTIFIER' => 'C', # MS SQL Server
+			##
+			'SMALLDATETIME' => 'T',
+			'TIME' => 'T',
+			'TIMESTAMP' => 'T',
+			'DATETIME' => 'T',
+			'DATETIME2' => 'T',
+			'TIMESTAMPTZ' => 'T',
+			'T' => 'T',
+			'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
+			##
+			'BOOL' => 'L',
+			'BOOLEAN' => 'L',
+			'BIT' => 'L',
+			'L' => 'L',
+			##
+			'COUNTER' => 'R',
+			'R' => 'R',
+			'SERIAL' => 'R', // ifx
+			'INT IDENTITY' => 'R',
+			##
+			'INT' => 'I',
+			'INT2' => 'I',
+			'INT4' => 'I',
+			'INT8' => 'I',
+			'INTEGER' => 'I',
+			'INTEGER UNSIGNED' => 'I',
+			'SHORT' => 'I',
+			'TINYINT' => 'I',
+			'SMALLINT' => 'I',
+			'I' => 'I',
+			##
+			'LONG' => 'N', // interbase is numeric, oci8 is blob
+			'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
+			'DECIMAL' => 'N',
+			'DEC' => 'N',
+			'REAL' => 'N',
+			'DOUBLE' => 'N',
+			'DOUBLE PRECISION' => 'N',
+			'SMALLFLOAT' => 'N',
+			'FLOAT' => 'N',
+			'NUMBER' => 'N',
+			'NUM' => 'N',
+			'NUMERIC' => 'N',
+			'MONEY' => 'N',
+
+			## informix 9.2
+			'SQLINT' => 'I',
+			'SQLSERIAL' => 'I',
+			'SQLSMINT' => 'I',
+			'SQLSMFLOAT' => 'N',
+			'SQLFLOAT' => 'N',
+			'SQLMONEY' => 'N',
+			'SQLDECIMAL' => 'N',
+			'SQLDATE' => 'D',
+			'SQLVCHAR' => 'C',
+			'SQLCHAR' => 'C',
+			'SQLDTIME' => 'T',
+			'SQLINTERVAL' => 'N',
+			'SQLBYTES' => 'B',
+			'SQLTEXT' => 'X',
+			## informix 10
+			"SQLINT8" => 'I8',
+			"SQLSERIAL8" => 'I8',
+			"SQLNCHAR" => 'C',
+			"SQLNVCHAR" => 'C',
+			"SQLLVARCHAR" => 'X',
+			"SQLBOOL" => 'L'
+		);
+
+
+		$tmap = false;
+		$t = strtoupper($t);
+		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : ADODB_DEFAULT_METATYPE;
+		switch ($tmap) {
+			case 'C':
+				// is the char field is too long, return as text field...
+				if ($this->blobSize >= 0) {
+					if ($len > $this->blobSize) {
+						return 'X';
+					}
+				} else if ($len > 250) {
+					return 'X';
+				}
+				return 'C';
+
+			case 'I':
+				if (!empty($fieldobj->primary_key)) {
+					return 'R';
+				}
+				return 'I';
+
+			case false:
+				return 'N';
+
+			case 'B':
+				if (isset($fieldobj->binary)) {
+					return ($fieldobj->binary) ? 'B' : 'X';
+				}
+				return 'B';
+
+			case 'D':
+				if (!empty($this->connection) && !empty($this->connection->datetime)) {
+					return 'T';
+				}
+				return 'D';
+
+			default:
+				if ($t == 'LONG' && $this->dataProvider == 'oci8') {
+					return 'B';
+				}
+				return $tmap;
+		}
+	}
+
+	/**
+	 * Convert case of field names associative array, if needed
+	 * @return void
+	 */
+	protected function _updatefields()
 	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
+		if( empty($this->fields)) {
+			return;
 		}
-	// changed in 2.32 to hashing instead of switch stmt for speed...
-	static $typeMap = array(
-		'VARCHAR' => 'C',
-		'VARCHAR2' => 'C',
-		'CHAR' => 'C',
-		'C' => 'C',
-		'STRING' => 'C',
-		'NCHAR' => 'C',
-		'NVARCHAR' => 'C',
-		'VARYING' => 'C',
-		'BPCHAR' => 'C',
-		'CHARACTER' => 'C',
-		'INTERVAL' => 'C',  # Postgres
-		'MACADDR' => 'C', # postgres
-		##
-		'LONGCHAR' => 'X',
-		'TEXT' => 'X',
-		'NTEXT' => 'X',
-		'M' => 'X',
-		'X' => 'X',
-		'CLOB' => 'X',
-		'NCLOB' => 'X',
-		'LVARCHAR' => 'X',
-		##
-		'BLOB' => 'B',
-		'IMAGE' => 'B',
-		'BINARY' => 'B',
-		'VARBINARY' => 'B',
-		'LONGBINARY' => 'B',
-		'B' => 'B',
-		##
-		'YEAR' => 'D', // mysql
-		'DATE' => 'D',
-		'D' => 'D',
-		##
-		'TIME' => 'T',
-		'TIMESTAMP' => 'T',
-		'DATETIME' => 'T',
-		'TIMESTAMPTZ' => 'T',
-		'T' => 'T',
-		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
-		##
-		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
-		'BIT' => 'L',
-		'L' => 'L',
-		##
-		'COUNTER' => 'R',
-		'R' => 'R',
-		'SERIAL' => 'R', // ifx
-		'INT IDENTITY' => 'R',
-		##
-		'INT' => 'I',
-		'INT2' => 'I',
-		'INT4' => 'I',
-		'INT8' => 'I',
-		'INTEGER' => 'I',
-		'INTEGER UNSIGNED' => 'I',
-		'SHORT' => 'I',
-		'TINYINT' => 'I',
-		'SMALLINT' => 'I',
-		'I' => 'I',
-		##
-		'LONG' => 'N', // interbase is numeric, oci8 is blob
-		'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
-		'DECIMAL' => 'N',
-		'DEC' => 'N',
-		'REAL' => 'N',
-		'DOUBLE' => 'N',
-		'DOUBLE PRECISION' => 'N',
-		'SMALLFLOAT' => 'N',
-		'FLOAT' => 'N',
-		'NUMBER' => 'N',
-		'NUM' => 'N',
-		'NUMERIC' => 'N',
-		'MONEY' => 'N',
-		
-		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
-		'SQLTEXT' => 'X',
-		 ## informix 10
-		"SQLINT8" => 'I8',
-		"SQLSERIAL8" => 'I8',
-		"SQLNCHAR" => 'C',
-		"SQLNVCHAR" => 'C',
-		"SQLLVARCHAR" => 'X',
-		"SQLBOOL" => 'L'
-		);
-		
-		$tmap = false;
-		$t = strtoupper($t);
-		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
-		switch ($tmap) {
-		case 'C':
-		
-			// is the char field is too long, return as text field... 
-			if ($this->blobSize >= 0) {
-				if ($len > $this->blobSize) return 'X';
-			} else if ($len > 250) {
-				return 'X';
+
+		// Determine case conversion function
+		$fn_change_case = $this->AssocCaseConvertFunction();
+		if(!$fn_change_case) {
+			// No conversion needed
+			return;
+		}
+
+		$arr = array();
+
+		// Change the case
+		foreach($this->fields as $k => $v) {
+			if (!is_integer($k)) {
+				$k = $fn_change_case($k);
 			}
-			return 'C';
-			
-		case 'I':
-			if (!empty($fieldobj->primary_key)) return 'R';
-			return 'I';
-		
-		case false:
-			return 'N';
-			
-		case 'B':
-			 if (isset($fieldobj->binary)) 
-				 return ($fieldobj->binary) ? 'B' : 'X';
-			return 'B';
-		
-		case 'D':
-			if (!empty($this->connection) && !empty($this->connection->datetime)) return 'T';
-			return 'D';
-			
-		default: 
-			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
-			return $tmap;
-		}
-	}
-	
-	
+			$arr[$k] = $v;
+		}
+		$this->fields = $arr;
+	}
+
 	function _close() {}
-	
+
 	/**
 	 * set/returns the current recordset page when paginating
 	 */
-	function AbsolutePage($page=-1)
-	{
-		if ($page != -1) $this->_currentPage = $page;
+	function AbsolutePage($page=-1) {
+		if ($page != -1) {
+			$this->_currentPage = $page;
+		}
 		return $this->_currentPage;
 	}
-	
+
 	/**
 	 * set/returns the status of the atFirstPage flag when paginating
 	 */
-	function AtFirstPage($status=false)
-	{
-		if ($status != false) $this->_atFirstPage = $status;
+	function AtFirstPage($status=false) {
+		if ($status != false) {
+			$this->_atFirstPage = $status;
+		}
 		return $this->_atFirstPage;
 	}
-	
-	function LastPageNo($page = false)
-	{
-		if ($page != false) $this->_lastPageNo = $page;
+
+	function LastPageNo($page = false) {
+		if ($page != false) {
+			$this->_lastPageNo = $page;
+		}
 		return $this->_lastPageNo;
 	}
-	
+
 	/**
 	 * set/returns the status of the atLastPage flag when paginating
 	 */
-	function AtLastPage($status=false)
-	{
-		if ($status != false) $this->_atLastPage = $status;
+	function AtLastPage($status=false) {
+		if ($status != false) {
+			$this->_atLastPage = $status;
+		}
 		return $this->_atLastPage;
 	}
-	
+
 } // end class ADORecordSet
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_array
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * This class encapsulates the concept of a recordset created in memory
 	 * as an array. This is useful for the creation of cached recordsets.
-	 * 
+	 *
 	 * Note that the constructor is different from the standard ADORecordSet
 	 */
-	
 	class ADORecordSet_array extends ADORecordSet
 	{
 		var $databaseType = 'array';
 
-		var $_array; 	// holds the 2-dimensional data array
+		var $_array;	// holds the 2-dimensional data array
 		var $_types;	// the array of types of each column (C B I L M)
 		var $_colnames;	// names of each column in array
 		var $_skiprow1;	// skip 1st row because it holds column names
@@ -3713,71 +4830,70 @@ class ADORecordSet_array extends ADORecordSet
 		var $insertid = false;
 		var $sql = '';
 		var $compat = false;
+
 		/**
 		 * Constructor
-		 *
 		 */
-		function ADORecordSet_array($fakeid=1)
-		{
-		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-		
+		function __construct($fakeid=1) {
+			global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
+
 			// fetch() on EOF does not delete $this->fields
 			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
+			parent::__construct($fakeid); // fake queryID
 			$this->fetchMode = $ADODB_FETCH_MODE;
 		}
-		
-		function _transpose()
-		{
-		global $ADODB_INCLUDED_LIB;
-			
-			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+
+		function _transpose($addfieldnames=true) {
+			global $ADODB_INCLUDED_LIB;
+
+			if (empty($ADODB_INCLUDED_LIB)) {
+				include_once(ADODB_DIR.'/adodb-lib.inc.php');
+			}
 			$hdr = true;
-			
-			adodb_transpose($this->_array, $newarr, $hdr);
+
+			$fobjs = $addfieldnames ? $this->_fieldobjects : false;
+			adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
 			//adodb_pr($newarr);
-			
+
 			$this->_skiprow1 = false;
-			$this->_array =& $newarr;
+			$this->_array = $newarr;
 			$this->_colnames = $hdr;
-			
+
 			adodb_probetypes($newarr,$this->_types);
-		
+
 			$this->_fieldobjects = array();
-			
+
 			foreach($hdr as $k => $name) {
 				$f = new ADOFieldObject();
 				$f->name = $name;
 				$f->type = $this->_types[$k];
 				$f->max_length = -1;
 				$this->_fieldobjects[] = $f;
-				
 			}
 			$this->fields = reset($this->_array);
-			
+
 			$this->_initrs();
-			
+
 		}
-		
+
 		/**
 		 * Setup the array.
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
-		 *			unless paramter $colnames is used.
-		 * @param typearr	holds an array of types. These are the same types 
+		 *			The first row should hold the column names
+		 *			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)
-		{
+		function InitArray($array,$typearr,$colnames=false) {
 			$this->_array = $array;
-			$this->_types = $typearr;	
+			$this->_types = $typearr;
 			if ($colnames) {
 				$this->_skiprow1 = false;
 				$this->_colnames = $colnames;
-			} else  {
+			} else {
 				$this->_skiprow1 = true;
 				$this->_colnames = $array[0];
 			}
@@ -3786,47 +4902,56 @@ function InitArray($array,$typearr,$colnames=false)
 		/**
 		 * Setup the Array and datatype file objects
 		 *
-		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
-		 *			unless paramter $colnames is used.
-		 * @param fieldarr	holds an array of ADOFieldObject's.
+		 * @param array $array    2-dimensional array holding the data
+		 *			The first row should hold the column names
+		 *			unless parameter $colnames is used.
+		 * @param array $fieldarr Array of ADOFieldObject's.
 		 */
-		function InitArrayFields(&$array,&$fieldarr)
-		{
-			$this->_array =& $array;
+		function InitArrayFields(&$array,&$fieldarr) {
+			$this->_array = $array;
 			$this->_skiprow1= false;
 			if ($fieldarr) {
-				$this->_fieldobjects =& $fieldarr;
-			} 
+				$this->_fieldobjects = $fieldarr;
+			}
 			$this->Init();
 		}
-		
-		function &GetArray($nRows=-1)
-		{
+
+		/**
+		 * @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);
 			}
 		}
-		
-		function _initrs()
-		{
+
+		function _initrs() {
 			$this->_numOfRows =  sizeof($this->_array);
-			if ($this->_skiprow1) $this->_numOfRows -= 1;
-		
-			$this->_numOfFields =(isset($this->_fieldobjects)) ?
-				 sizeof($this->_fieldobjects):sizeof($this->_types);
-		}
-		
-		/* Use associative array to get fields array */
-		function Fields($colname)
-		{
+			if ($this->_skiprow1) {
+				$this->_numOfRows -= 1;
+			}
+
+			$this->_numOfFields = (isset($this->_fieldobjects))
+				? sizeof($this->_fieldobjects)
+				: sizeof($this->_types);
+		}
+
+		/**
+		 * Use associative array to get fields array
+		 *
+		 * @param string $colname
+		 * @return mixed
+		 */
+		function Fields($colname) {
 			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
-			
+
 			if ($mode & ADODB_FETCH_ASSOC) {
-				if (!isset($this->fields[$colname])) $colname = strtolower($colname);
+				if (!isset($this->fields[$colname]) && !is_null($this->fields[$colname])) {
+					$colname = strtolower($colname);
+				}
 				return $this->fields[$colname];
 			}
 			if (!$this->bind) {
@@ -3838,9 +4963,13 @@ function Fields($colname)
 			}
 			return $this->fields[$this->bind[strtoupper($colname)]];
 		}
-		
-		function &FetchField($fieldOffset = -1) 
-		{
+
+		/**
+		 * @param int [$fieldOffset]
+		 *
+		 * @return \ADOFieldObject
+		 */
+		function FetchField($fieldOffset = -1) {
 			if (isset($this->_fieldobjects)) {
 				return $this->_fieldobjects[$fieldOffset];
 			}
@@ -3848,172 +4977,276 @@ function &FetchField($fieldOffset = -1)
 			$o->name = $this->_colnames[$fieldOffset];
 			$o->type =  $this->_types[$fieldOffset];
 			$o->max_length = -1; // length not known
-			
+
 			return $o;
 		}
-			
-		function _seek($row)
-		{
+
+		/**
+		 * @param int $row
+		 * @return bool
+		 */
+		function _seek($row) {
 			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
 				$this->_currentRow = $row;
-				if ($this->_skiprow1) $row += 1;
+				if ($this->_skiprow1) {
+					$row += 1;
+				}
 				$this->fields = $this->_array[$row];
 				return true;
 			}
 			return false;
 		}
-		
-		function MoveNext() 
-		{
-			if (!$this->EOF) {		
+
+		/**
+		 * @return bool
+		 */
+		function MoveNext() {
+			if (!$this->EOF) {
 				$this->_currentRow++;
-				
+
 				$pos = $this->_currentRow;
-				
+
 				if ($this->_numOfRows <= $pos) {
-					if (!$this->compat) $this->fields = false;
+					if (!$this->compat) {
+						$this->fields = false;
+					}
 				} else {
-					if ($this->_skiprow1) $pos += 1;
+					if ($this->_skiprow1) {
+						$pos += 1;
+					}
 					$this->fields = $this->_array[$pos];
 					return true;
-				}		
+				}
 				$this->EOF = true;
 			}
-			
+
 			return false;
-		}	
-	
-		function _fetch()
-		{
+		}
+
+		/**
+		 * @return bool
+		 */
+		function _fetch() {
 			$pos = $this->_currentRow;
-			
+
 			if ($this->_numOfRows <= $pos) {
-				if (!$this->compat) $this->fields = false;
+				if (!$this->compat) {
+					$this->fields = false;
+				}
 				return false;
 			}
-			if ($this->_skiprow1) $pos += 1;
+			if ($this->_skiprow1) {
+				$pos += 1;
+			}
 			$this->fields = $this->_array[$pos];
 			return true;
 		}
-		
-		function _close() 
-		{
-			return true;	
+
+		function _close() {
+			return true;
 		}
-	
+
 	} // ADORecordSet_array
 
-	//==============================================================================================	
+	//==============================================================================================
 	// HELPER FUNCTIONS
-	//==============================================================================================			
-	
+	//==============================================================================================
+
 	/**
 	 * Synonym for ADOLoadCode. Private function. Do not use.
 	 *
 	 * @deprecated
 	 */
-	function ADOLoadDB($dbType) 
-	{ 
+	function ADOLoadDB($dbType) {
 		return ADOLoadCode($dbType);
 	}
-		
+
 	/**
 	 * Load the code for a specific database driver. Private function. Do not use.
 	 */
-	function ADOLoadCode($dbType) 
-	{
-	global $ADODB_LASTDB;
-	
-		if (!$dbType) return false;
+	function ADOLoadCode($dbType) {
+		global $ADODB_LASTDB;
+
+		if (!$dbType) {
+			return false;
+		}
 		$db = strtolower($dbType);
 		switch ($db) {
-			case 'ado': 
-				if (PHP_VERSION >= 5) $db = 'ado5';
-				$class = 'ado'; 
+			case 'ado':
+				$db = 'ado5';
+				$class = 'ado';
 				break;
+
 			case 'ifx':
-			case 'maxsql': $class = $db = 'mysqlt'; break;
+			case 'maxsql':
+				$class = $db = 'mysqlt';
+				break;
+
+			case 'pgsql':
 			case 'postgres':
-			case 'postgres8':
-			case 'pgsql': $class = $db = 'postgres7'; break;
+				$class = $db = '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 = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
-		@include_once($file);
+
+		$file = "drivers/adodb-$db.inc.php";
+		@include_once(ADODB_DIR . '/' . $file);
 		$ADODB_LASTDB = $class;
-		if (class_exists("ADODB_" . $class)) return $class;
-		
+		if (class_exists("ADODB_" . $class)) {
+			return $class;
+		}
+
 		//ADOConnection::outp(adodb_pr(get_declared_classes(),true));
-		if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
-		else ADOConnection::outp("Syntax error in file: $file");
+		if (!file_exists($file)) {
+			ADOConnection::outp("Missing file: $file");
+		} else {
+			ADOConnection::outp("Syntax error in file: $file");
+		}
 		return false;
 	}
 
 	/**
-	 * synonym for ADONewConnection for people like me who cannot remember the correct name
+	 * 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;
+	function NewADOConnection($db='') {
+		return ADONewConnection($db);
 	}
-	
+
 	/**
 	 * Instantiate a new Connection class for a specific database driver.
 	 *
-	 * @param [db]  is the database Connection object to create. If undefined,
-	 * 	use the last database driver that was loaded by ADOLoadCode().
+	 * @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;
-		
-		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
+	function ADONewConnection($db='') {
+		global $ADODB_NEWCONNECTION, $ADODB_LASTDB;
+
+		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;
-		$false = false;
-		if ($at = strpos($db,'://')) {
+		if (($at = strpos($db,'://')) !== FALSE) {
 			$origdsn = $db;
-			if (PHP_VERSION < 5) $dsna = @parse_url($db);
-			else {
-				$fakedsn = 'fake'.substr($db,$at);
-				$dsna = @parse_url($fakedsn);
-				$dsna['scheme'] = substr($db,0,$at);
-			
-				if (strncmp($db,'pdo',3) == 0) {
-					$sch = explode('_',$dsna['scheme']);
-					if (sizeof($sch)>1) {
-						$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
-						$dsna['host'] = rawurlencode($sch[1].':host='.rawurldecode($dsna['host']));
-						$dsna['scheme'] = 'pdo';
-					}
+			$fakedsn = 'fake'.substr($origdsn,$at);
+			if (($at2 = strpos($origdsn,'@/')) !== FALSE) {
+				// special handling of oracle, which might not have host
+				$fakedsn = str_replace('@/','@adodb-fakehost/',$fakedsn);
+			}
+
+			if ((strpos($origdsn, 'sqlite')) !== FALSE && stripos($origdsn, '%2F') === FALSE) {
+				// special handling for SQLite, it only might have the path to the database file.
+				// If you try to connect to a SQLite database using a dsn
+				// like 'sqlite:///path/to/database', the 'parse_url' php function
+				// will throw you an exception with a message such as "unable to parse url"
+				list($scheme, $path) = explode('://', $origdsn);
+				$dsna['scheme'] = $scheme;
+				if ($qmark = strpos($path,'?')) {
+					$dsn['query'] = substr($path,$qmark+1);
+					$path = substr($path,0,$qmark);
+				}
+				$dsna['path'] = '/' . urlencode($path);
+			} 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) {
-				// special handling of oracle, which might not have host
-				$db = str_replace('@/','@adodb-fakehost/',$db);
-				$dsna = parse_url($db);
-				if (!$dsna) return $false;
+				return false;
+			}
+			$dsna['scheme'] = substr($origdsn,0,$at);
+			if ($at2 !== FALSE) {
 				$dsna['host'] = '';
 			}
+
+			if (strncmp($origdsn,'pdo',3) == 0) {
+				$sch = explode('_',$dsna['scheme']);
+				if (sizeof($sch)>1) {
+					$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
+					if ($sch[1] == 'sqlite') {
+						$dsna['host'] = rawurlencode($sch[1].':'.rawurldecode($dsna['host']));
+					} else {
+						$dsna['host'] = rawurlencode($sch[1].':host='.rawurldecode($dsna['host']));
+					}
+					$dsna['scheme'] = 'pdo';
+				}
+			}
+
 			$db = @$dsna['scheme'];
-			if (!$db) return $false;
+			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) {
 					$arr = explode('=',$v);
 					$opt[$arr[0]] = isset($arr[1]) ? rawurldecode($arr[1]) : 1;
 				}
-			} else $opt = array();
+			} else {
+				$opt = array();
+			}
+
 		}
 	/*
 	 *  phptype: Database backend used in PHP (mysql, odbc etc.)
@@ -4027,51 +5260,64 @@ function &ADONewConnection($db='')
 		if (!empty($ADODB_NEWCONNECTION)) {
 			$obj = $ADODB_NEWCONNECTION($db);
 
-		} else {
-		
-			if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
-			if (empty($db)) $db = $ADODB_LASTDB;
-			
-			if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
-			
+		}
+
+		if(empty($obj)) {
+
+			if (!isset($ADODB_LASTDB)) {
+				$ADODB_LASTDB = '';
+			}
+			if (empty($db)) {
+				$db = $ADODB_LASTDB;
+			}
+			if ($db != $ADODB_LASTDB) {
+				$db = ADOLoadCode($db);
+			}
+
 			if (!$db) {
-				if (isset($origdsn)) $db = $origdsn;
+				if (isset($origdsn)) {
+					$db = $origdsn;
+				}
 				if ($errorfn) {
 					// raise an error
 					$ignore = false;
 					$errorfn('ADONewConnection', 'ADONewConnection', -998,
-							 "could not load the database driver for '$db'",
-							 $db,false,$ignore);
-				} else
-					 ADOConnection::outp( "
ADONewConnection: Unable to load database driver '$db'
",false);
-					
-				return $false;
+							"could not load the database driver for '$db'",
+							$db,false,$ignore);
+				} else {
+					ADOConnection::outp( "
ADONewConnection: Unable to load database driver '$db'
",false);
+				}
+				return false;
 			}
-			
+
 			$cls = 'ADODB_'.$db;
 			if (!class_exists($cls)) {
 				adodb_backtrace();
-				return $false;
+				return false;
 			}
-			
+
 			$obj = new $cls();
 		}
-		
+
 		# constructor should not fail
 		if ($obj) {
-			if ($errorfn)  $obj->raiseErrorFn = $errorfn;
+			if ($errorfn) {
+				$obj->raiseErrorFn = $errorfn;
+			}
 			if (isset($dsna)) {
-				if (isset($dsna['port'])) $obj->port = $dsna['port'];
+				if (isset($dsna['port'])) {
+					$obj->port = $dsna['port'];
+				}
 				foreach($opt as $k => $v) {
 					switch(strtolower($k)) {
 					case 'new':
 										$nconnect = true; $persist = true; break;
 					case 'persist':
-					case 'persistent': 	$persist = $v; break;
+					case 'persistent':	$persist = $v; break;
 					case 'debug':		$obj->debug = (integer) $v; break;
 					#ibase
 					case 'role':		$obj->role = $v; break;
-					case 'dialect': 	$obj->dialect = (integer) $v; break;
+					case 'dialect':	$obj->dialect = (integer) $v; break;
 					case 'charset':		$obj->charset = $v; $obj->charSet=$v; break;
 					case 'buffers':		$obj->buffers = $v; break;
 					case 'fetchmode':   $obj->SetFetchMode($v); break;
@@ -4085,74 +5331,122 @@ function &ADONewConnection($db='')
 					case 'socket': $obj->socket = $v; break;
 					#oci8
 					case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break;
+					case 'cachesecs': $obj->cacheSecs = $v; break;
+					case 'memcache':
+						$varr = explode(':',$v);
+						$vlen = sizeof($varr);
+						if ($vlen == 0) {
+							break;
+						}
+						$obj->memCache = true;
+						$obj->memCacheHost = explode(',',$varr[0]);
+						if ($vlen == 1) {
+							break;
+						}
+						$obj->memCachePort = $varr[1];
+						if ($vlen == 2) {
+							break;
+						}
+						$obj->memCacheCompress = $varr[2] ?  true : false;
+						break;
 					}
 				}
-				if (empty($persist))
+				if (empty($persist)) {
 					$ok = $obj->Connect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-				else if (empty($nconnect))
+				} else if (empty($nconnect)) {
 					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-				else
+				} else {
 					$ok = $obj->NConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-					
-				if (!$ok) return $false;
+				}
+
+				if (!$ok) {
+					return false;
+				}
 			}
 		}
 		return $obj;
 	}
-	
-	
-	
+
+
+
 	// $perf == true means called by NewPerfMonitor(), otherwise for data dictionary
-	function _adodb_getdriver($provider,$drivername,$perf=false)
-	{
+	function _adodb_getdriver($provider,$drivername,$perf=false) {
 		switch ($provider) {
-		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); 
-		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); 
-		case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
-		case 'native':  break;
-		default:
-			return $provider;
+			case 'odbtp':
+				if (strncmp('odbtp_',$drivername,6)==0) {
+					return substr($drivername,6);
+				}
+			case 'odbc' :
+				if (strncmp('odbc_',$drivername,5)==0) {
+					return substr($drivername,5);
+				}
+			case 'ado'  :
+				if (strncmp('ado_',$drivername,4)==0) {
+					return substr($drivername,4);
+				}
+			case 'native':
+				break;
+			default:
+				return $provider;
 		}
-		
+
 		switch($drivername) {
-		case 'mysqlt':
-		case 'mysqli': 
-				$drivername='mysql'; 
+			case 'mysqlt':
+			case 'mysqli':
+				$drivername='mysql';
+				break;
+			case 'postgres7':
+			case 'postgres8':
+				$drivername = 'postgres';
+				break;
+			case 'firebird15':
+				$drivername = 'firebird';
+				break;
+			case 'oracle':
+				$drivername = 'oci8';
+				break;
+			case 'access':
+				if ($perf) {
+					$drivername = '';
+				}
+				break;
+			case 'db2'   :
+			case 'sapdb' :
+				break;
+			default:
+				$drivername = 'generic';
 				break;
-		case 'postgres7':
-		case 'postgres8':
-				$drivername = 'postgres'; 
-				break;	
-		case 'firebird15': $drivername = 'firebird'; break;
-		case 'oracle': $drivername = 'oci8'; break;
-		case 'access': if ($perf) $drivername = ''; break;
-		case 'db2'   : break;
-		case 'sapdb' : break;
-		default:
-			$drivername = 'generic';
-			break;
 		}
 		return $drivername;
 	}
-	
-	function &NewPerfMonitor(&$conn)
-	{
-		$false = false;
+
+	function NewPerfMonitor(&$conn) {
 		$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
-		if (!$drivername || $drivername == 'generic') return $false;
+		if (!$drivername || $drivername == 'generic') {
+			return false;
+		}
 		include_once(ADODB_DIR.'/adodb-perf.inc.php');
 		@include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
 		$class = "Perf_$drivername";
-		if (!class_exists($class)) return $false;
-		$perf = new $class($conn);
-		
-		return $perf;
+		if (!class_exists($class)) {
+			return false;
+		}
+
+		return new $class($conn);
 	}
-	
-	function &NewDataDictionary(&$conn,$drivername=false)
-	{
-		$false = false;
-		if (!$drivername) $drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
+
+	/**
+	 * 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);
+		}
 
 		include_once(ADODB_DIR.'/adodb-lib.inc.php');
 		include_once(ADODB_DIR.'/adodb-datadict.inc.php');
@@ -4160,55 +5454,55 @@ function &NewDataDictionary(&$conn,$drivername=false)
 
 		if (!file_exists($path)) {
 			ADOConnection::outp("Dictionary driver '$path' not available");
-			return $false;
+			return false;
 		}
 		include_once($path);
 		$class = "ADODB2_$drivername";
 		$dict = new $class();
 		$dict->dataProvider = $conn->dataProvider;
-		$dict->connection = &$conn;
+		$dict->connection = $conn;
 		$dict->upperName = strtoupper($drivername);
 		$dict->quote = $conn->nameQuote;
-		if (!empty($conn->_connectionID))
+		if (!empty($conn->_connectionID)) {
 			$dict->serverInfo = $conn->ServerInfo();
-		
+		}
+
 		return $dict;
 	}
 
-
-	
 	/*
 		Perform a print_r, with pre tags for better formatting.
 	*/
-	function adodb_pr($var,$as_string=false)
-	{
-		if ($as_string) ob_start();
-		
-		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
+	function adodb_pr($var,$as_string=false) {
+		if ($as_string) {
+			ob_start();
+		}
+
+		if (isset($_SERVER['HTTP_USER_AGENT'])) {
 			echo " 
\n";print_r($var);echo "
\n";
-		} else
+		} else {
 			print_r($var);
-			
+		}
+
 		if ($as_string) {
 			$s = ob_get_contents();
 			ob_end_clean();
 			return $s;
 		}
 	}
-	
+
 	/*
 		Perform a stack-crawl and pretty print it.
-		
+
 		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
 		@param levels Number of levels to display
 	*/
-	function adodb_backtrace($printOrArr=true,$levels=9999)
-	{
+	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');
-		return _adodb_backtrace($printOrArr,$levels);
+		if (empty($ADODB_INCLUDED_LIB)) {
+			include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		}
+		return _adodb_backtrace($printOrArr,$levels,0,$ishtml);
 	}
 
-
 }
-?>
diff --git a/adodb/composer.json b/adodb/composer.json
new file mode 100644
index 0000000..807866b
--- /dev/null
+++ b/adodb/composer.json
@@ -0,0 +1,41 @@
+{
+	"name" : "adodb/adodb-php",
+	"description" : "ADOdb is a PHP database abstraction layer library",
+	"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"
+		}
+	],
+
+	"keywords" : [ "database", "abstraction", "layer", "library", "php" ],
+
+	"homepage": "https://adodb.org/",
+	"support" : {
+		"issues" : "https://github.com/ADOdb/ADOdb/issues",
+		"source" : "https://github.com/ADOdb/ADOdb"
+	},
+
+	"require" : {
+		"php" : "^5.5.9 || ^7.0 || ^8.0"
+	},
+
+	"require-dev" : {
+		"phpunit/phpunit": "^8.5"
+	},
+
+	"autoload" : {
+		"files" : ["adodb.inc.php"]
+	}
+
+}
diff --git a/adodb/contrib/toxmlrpc.inc.php b/adodb/contrib/toxmlrpc.inc.php
deleted file mode 100644
index ef49235..0000000
--- a/adodb/contrib/toxmlrpc.inc.php
+++ /dev/null
@@ -1,183 +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;
-
-    }
-
-?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-access.inc.php b/adodb/datadict/datadict-access.inc.php
index aac2182..7a7d4cb 100644
--- a/adodb/datadict/datadict-access.inc.php
+++ b/adodb/datadict/datadict-access.inc.php
@@ -1,55 +1,65 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
+
+
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-}
 
-
-?>
\ No newline at end of file
+}
diff --git a/adodb/datadict/datadict-db2.inc.php b/adodb/datadict/datadict-db2.inc.php
index e512d94..c5dda09 100644
--- a/adodb/datadict/datadict-db2.inc.php
+++ b/adodb/datadict/datadict-db2.inc.php
@@ -1,28 +1,43 @@
 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)
+	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)
 	{
-		
+
 		/**
 		  Allow basic table changes to DB2 databases
-		  DB2 will fatally reject changes to non character columns 
+		  DB2 will fatally reject changes to non character columns
 
 		*/
-		
+
 		$validTypes = array("CHAR","VARC");
 		$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
 		// check table exists
-		$cols = &$this->MetaColumns($tablename);
-		if ( empty($cols)) { 
-			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
-		}
 		
+		
+		$cols = $this->metaColumns($tablename);
+		if ( empty($cols)) {
+			return $this->createTableSQL($tablename, $flds, $tableoptions);
+		}
+
 		// already exists, alter table instead
 		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
+		$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
@@ -109,10 +178,10 @@ function ChangeTableSQL($tablename, $flds, $tableoptions = false)
 				for ($i=1;$ialterCol . ' ' . $v;
 			} else {
 				$sql[] = $alter . $this->addCol . ' ' . $v;
 			}
 		}
-		
+
 		return $sql;
 	}
-	
-}
 
-
-?>
\ No newline at end of file
+}
diff --git a/adodb/datadict/datadict-firebird.inc.php b/adodb/datadict/datadict-firebird.inc.php
index 0cd07f5..0020a0a 100644
--- a/adodb/datadict/datadict-firebird.inc.php
+++ b/adodb/datadict/datadict-firebird.inc.php
@@ -1,75 +1,94 @@
 connection) ) {
 			return $name;
 		}
-		
+
 		$quote = $this->connection->nameQuote;
-		
+
 		// if name is of the form `name`, quote it
 		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
 			return $quote . $matches[1] . $quote;
 		}
-		
+
 		// if name contains special characters, quote it
 		if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
 			return $quote . $name . $quote;
 		}
-		
+
 		return $quote . $name . $quote;
 	}
 
@@ -77,34 +96,64 @@ function CreateDatabase($dbname, $options=false)
 	{
 		$options = $this->_Options($options);
 		$sql = array();
-		
+
 		$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
-		
+
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($t)
 	{
 		if (strpos($t,'.') !== false) {
 			$tarr = explode('.',$t);
-			return 'DROP GENERATOR '.$tarr[0].'."gen_'.$tarr[1].'"';
+			return 'DROP GENERATOR '.$tarr[0].'."s_'.$tarr[1].'"';
 		}
-		return 'DROP GENERATOR "GEN_'.$t;
+		return 'DROP GENERATOR s_'.$t;
 	}
-	
 
-	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";
 		if ($fnotnull) $suffix .= ' NOT NULL';
 		if ($fautoinc) $this->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
@@ -115,9 +164,9 @@ function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,
 end;
 */
 	function _Triggers($tabname,$tableoptions)
-	{	
+	{
 		if (!$this->seqField) return array();
-		
+
 		$tab1 = preg_replace( '/"/', '', $tabname );
 		if ($this->schema) {
 			$t = strpos($tab1,'.');
@@ -125,27 +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['DROP']))
+		{ $sql[] = "DROP GENERATOR $seqname";
 		}
-		if (isset($tableoptions['REPLACE']))
+		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;
+	}
 
-?>
\ No newline at end of file
+}
diff --git a/adodb/datadict/datadict-generic.inc.php b/adodb/datadict/datadict-generic.inc.php
index e98dd99..c9c8dee 100644
--- a/adodb/datadict/datadict-generic.inc.php
+++ b/adodb/datadict/datadict-generic.inc.php
@@ -1,46 +1,56 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
+
+
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 }
 
 /*
@@ -69,52 +79,52 @@ function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
-		case 'X': return 'VARCHAR'; 
-		
+		case 'X': return 'VARCHAR';
+
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'DECIMAL';
 		default:
 			return $meta;
 		}
 	}
-	
+
 // ifx
 function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';// 255
-		case 'X': return 'TEXT'; 
-		
+		case 'X': return 'TEXT';
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'T': return 'DATETIME';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'DECIMAL(20)';
-		
+
 		case 'F': return 'FLOAT';
 		case 'N': return 'DECIMAL';
 		default:
@@ -122,4 +132,3 @@ function ActualType($meta)
 		}
 	}
 */
-?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-ibase.inc.php b/adodb/datadict/datadict-ibase.inc.php
index 0f120c4..5f58880 100644
--- a/adodb/datadict/datadict-ibase.inc.php
+++ b/adodb/datadict/datadict-ibase.inc.php
@@ -1,46 +1,56 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
+
+
+	function DropColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-}
-
 
-?>
\ No newline at end of file
+}
diff --git a/adodb/datadict/datadict-informix.inc.php b/adodb/datadict/datadict-informix.inc.php
index 5be6a98..acb5ba7 100644
--- a/adodb/datadict/datadict-informix.inc.php
+++ b/adodb/datadict/datadict-informix.inc.php
@@ -1,46 +1,56 @@
 debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
+
+
+	function DropColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
+	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		if ($fautoinc) {
 			$ftype = 'SERIAL';
@@ -74,7 +84,5 @@ function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstrai
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
-}
 
-?>
\ No newline at end of file
+}
diff --git a/adodb/datadict/datadict-mssql.inc.php b/adodb/datadict/datadict-mssql.inc.php
index 0918e40..1bcb27d 100644
--- a/adodb/datadict/datadict-mssql.inc.php
+++ b/adodb/datadict/datadict-mssql.inc.php
@@ -1,38 +1,47 @@
 type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 		case 'R':
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
 		case 'SMALLINT': return 'I2';
 		case 'BIGINT':  return  'I8';
-		
+		case 'SMALLDATETIME': return 'T';
 		case 'REAL':
 		case 'FLOAT': return 'F';
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
@@ -85,28 +94,30 @@ function ActualType($meta)
 		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
+
+		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
+
+		case 'R':
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -120,9 +131,9 @@ function AddColumnSQL($tabname, $flds)
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	/*
-	function AlterColumnSQL($tabname, $flds)
+	function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		$tabname = $this->TableName ($tabname);
 		$sql = array();
@@ -134,8 +145,8 @@ function AlterColumnSQL($tabname, $flds)
 		return $sql;
 	}
 	*/
-	
-	function DropColumnSQL($tabname, $flds)
+
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 		$tabname = $this->TableName ($tabname);
 		if (!is_array($flds))
@@ -149,10 +160,10 @@ function DropColumnSQL($tabname, $flds)
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
@@ -161,111 +172,111 @@ function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
-	
-	function _GetSize($ftype, $ty, $fsize, $fprec)
+
+
+	function _GetSize($ftype, $ty, $fsize, $fprec, $options=false)
 	{
 		switch ($ftype) {
 		case 'INT':
@@ -275,8 +286,7 @@ function _GetSize($ftype, $ty, $fsize, $fprec)
 			return $ftype;
 		}
     	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec, $options);
 
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-mssqlnative.inc.php b/adodb/datadict/datadict-mssqlnative.inc.php
new file mode 100644
index 0000000..b53dcd9
--- /dev/null
+++ b/adodb/datadict/datadict-mssqlnative.inc.php
@@ -0,0 +1,315 @@
+type;
+		}
+
+		$_typeConversion = array(
+			-155 => 'D',
+			  93 => 'D',
+			-154 => 'D',
+			  -2 => 'D',
+			  91 => 'D',
+
+			  12 => 'C',
+			   1 => 'C',
+			  -9 => 'C',
+			  -8 => 'C',
+
+			  -7 => 'L',
+			  -6 => 'I2',
+			  -5 => 'I8',
+			 -11 => 'I',
+			   4 => 'I',
+			   5 => 'I4',
+
+			  -1 => 'X',
+			 -10 => 'X',
+
+			   2 => 'N',
+			   3 => 'N',
+			   6 => 'N',
+			   7 => 'N',
+
+			-152 => 'X',
+			-151 => 'X',
+			  -4 => 'X',
+			  -3 => 'X'
+			);
+
+		if (isset($_typeConversion[$t])) {
+			return $_typeConversion[$t];
+		}
+
+		return ADODB_DEFAULT_METATYPE;
+	}
+
+	function ActualType($meta)
+	{
+		$DATE_TYPE = 'DATETIME';
+
+		switch(strtoupper($meta)) {
+
+		case 'C': return 'VARCHAR';
+		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
+		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+
+		case 'B': return 'IMAGE';
+
+		case 'D': return $DATE_TYPE;
+		case 'T': return 'TIME';
+		case 'L': return 'BIT';
+
+		case 'R':
+		case 'I': return 'INT';
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+
+
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+
+	/**
+	 * 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)
+	{
+		$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,,$idxs) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+		foreach($lines as $v) {
+			if ($not_null = preg_match('/NOT NULL/i',$v)) {
+				$v = preg_replace('/NOT NULL/i','',$v);
+			}
+			if (preg_match('/^([^ ]+) .*DEFAULT (\'[^\']+\'|\"[^\"]+\"|[^ ]+)/',$v,$matches)) {
+				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) ) {
+					$sql[] = 'ALTER TABLE '.$tabname.' DROP CONSTRAINT '. $constraintname;
+				}
+				if ($not_null) {
+					$sql[] = $alter . $colname . ' ' . $t  . ' NOT NULL';
+				} else {
+					$sql[] = $alter . $colname . ' ' . $t ;
+				}
+				$sql[] = 'ALTER TABLE ' . $tabname
+					. ' ADD CONSTRAINT DF__' . $tabname . '__' .  $colname .  '__' . dechex(rand())
+					. ' DEFAULT ' . $default . ' FOR ' . $colname;
+			} else {
+				$colname = strtok($v," ");
+				if ( $constraintname = $this->defaultConstraintName($tabname,$colname) ) {
+					$sql[] = 'ALTER TABLE '.$tabname.' DROP CONSTRAINT '. $constraintname;
+				}
+				if ($not_null) {
+					$sql[] = $alter . $v  . ' NOT NULL';
+				} else {
+					$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;
+	}
+
+
+	/**
+	 * Drop a column, syntax is ALTER TABLE table DROP COLUMN column,column
+	 *
+	 * @param string   $tabname      Table Name
+	 * @param string[] $flds         One, or an array of Fields To Drop
+	 * @param string   $tableflds    Throwaway value to make the function match the parent
+	 * @param string   $tableoptions Throway value to make the function match the parent
+	 *
+	 * @return string[]  The SQL necessary to drop the column
+	 */
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds)) {
+			/** @noinspection PhpParamsInspection */
+			$flds = explode(',', $flds);
+		}
+		$f = array();
+		$s = 'ALTER TABLE ' . $tabname;
+		foreach($flds as $v) {
+			if ( $constraintname = $this->defaultConstraintName($tabname,$v) ) {
+				$sql[] = 'ALTER TABLE ' . $tabname . ' DROP CONSTRAINT ' . $constraintname;
+			}
+			$f[] = ' DROP COLUMN ' . $this->NameQuote($v);
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+
+	// return string must begin with space
+
+	/** @noinspection DuplicatedCode */
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+
+	/** @noinspection DuplicatedCode */
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+
+
+		$sql[] = $s;
+
+		return $sql;
+	}
+
+
+	function _GetSize($ftype, $ty, $fsize, $fprec, $options=false)
+	{
+		switch ($ftype) {
+			case 'INT':
+			case 'SMALLINT':
+			case 'TINYINT':
+			case 'BIGINT':
+				return $ftype;
+		}
+		if ($ty == 'T') {
+			return $ftype;
+		}
+		return parent::_GetSize($ftype, $ty, $fsize, $fprec, $options);
+	}
+}
diff --git a/adodb/datadict/datadict-mysql.inc.php b/adodb/datadict/datadict-mysql.inc.php
index 79953e8..a1ee950 100644
--- a/adodb/datadict/datadict-mysql.inc.php
+++ b/adodb/datadict/datadict-mysql.inc.php
@@ -1,14 +1,23 @@
 type;
 			$len = $fieldobj->max_length;
 		}
 		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING': 
+		case 'STRING':
 		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
+		case 'VARCHAR':
+		case 'TINYBLOB':
+		case 'TINYTEXT':
+		case 'ENUM':
 		case 'SET':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 			return 'X';
-			
+
 		// php_mysql extension always returns 'blob' even if 'text'
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'YEAR':
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP': return 'T';
-		
+
 		case 'FLOAT':
 		case 'DOUBLE':
 			return 'F';
-			
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER': return $is_serial ? 'R' : 'I';
 		case 'TINYINT': return $is_serial ? 'R' : 'I1';
 		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
 		case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
 		case 'BIGINT':  return $is_serial ? 'R' : 'I8';
-		default: return 'N';
+		default: return ADODB_DEFAULT_METATYPE;
 		}
 	}
 
@@ -82,33 +94,34 @@ function ActualType($meta)
 		case 'C': return 'VARCHAR';
 		case 'XL':return 'LONGTEXT';
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'LONGTEXT';
-		
+
 		case 'B': return 'LONGBLOB';
-			
+
 		case 'D': return 'DATE';
+		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'TINYINT';
-		
+
 		case 'R':
 		case 'I4':
 		case 'I': return 'INTEGER';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
 		$suffix = '';
 		if ($funsigned) $suffix .= ' UNSIGNED';
 		if ($fnotnull) $suffix .= ' NOT NULL';
@@ -117,7 +130,7 @@ function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
 	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
 		[table_options] [select_statement]
@@ -133,16 +146,16 @@ function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,
 		[reference_definition]
 		or CHECK (expr)
 	*/
-	
+
 	/*
 	CREATE [UNIQUE|FULLTEXT] INDEX index_name
 		ON tbl_name (col_name[(length)],... )
 	*/
-	
+
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
 			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
@@ -150,11 +163,11 @@ function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		if (isset($idxoptions['FULLTEXT'])) {
 			$unique = ' FULLTEXT';
 		} elseif (isset($idxoptions['UNIQUE'])) {
@@ -162,20 +175,19 @@ function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 		} else {
 			$unique = '';
 		}
-		
+
 		if ( is_array($flds) ) $flds = implode(', ',$flds);
-		
+
 		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
 		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
-		
+
 		$s .= ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-oci8.inc.php b/adodb/datadict/datadict-oci8.inc.php
index 89d124e..9a23909 100644
--- a/adodb/datadict/datadict-oci8.inc.php
+++ b/adodb/datadict/datadict-oci8.inc.php
@@ -1,20 +1,29 @@
 blobSize) return 'C';
 			return 'X';
-		
+
 		case 'NCHAR':
 		case 'NVARCHAR2':
 		case 'NVARCHAR':
 			if (isset($this) && $len <= $this->blobSize) return 'C2';
 			return 'X2';
-			
+
 		case 'NCLOB':
 		case 'CLOB':
 			return 'XL';
-		
+
 		case 'LONG RAW':
 		case 'LONG VARBINARY':
 		case 'BLOB':
 			return 'B';
-		
-		case 'DATE': 
+
+		case 'TIMESTAMP':
+			return 'TS';
+
+		case 'DATE':
 			return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'SMALLINT':
-		case 'INTEGER': 
+		case 'INTEGER':
 			return 'I';
-			
+
 		default:
-			return 'N';
+			return ADODB_DEFAULT_METATYPE;
 		}
 	}
-	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'X': return $this->typeX;
 		case 'XL': return $this->typeXL;
-		
+
 		case 'C2': return 'NVARCHAR2';
 		case 'X2': return 'NVARCHAR2(4000)';
-		
+
 		case 'B': return 'BLOB';
-			
-		case 'D': 
+
+		case 'TS':
+				return 'TIMESTAMP';
+
+		case 'D':
 		case 'T': return 'DATE';
-		case 'L': return 'DECIMAL(1)';
-		case 'I1': return 'DECIMAL(3)';
-		case 'I2': return 'DECIMAL(5)';
+		case 'L': return 'NUMBER(1)';
+		case 'I1': return 'NUMBER(3)';
+		case 'I2': return 'NUMBER(5)';
 		case 'I':
-		case 'I4': return 'DECIMAL(10)';
-		
-		case 'I8': return 'DECIMAL(20)';
-		case 'F': return 'DECIMAL';
-		case 'N': return 'DECIMAL';
+		case 'I4': return 'NUMBER(10)';
+
+		case 'I8': return 'NUMBER(20)';
+		case 'F': return 'NUMBER';
+		case 'N': return 'NUMBER';
+		case 'R': return 'NUMBER(20)';
 		default:
 			return $meta;
-		}	
+		}
 	}
-	
+
 	function CreateDatabase($dbname, $options=false)
 	{
 		$options = $this->_Options($options);
@@ -103,26 +129,28 @@ function CreateDatabase($dbname, $options=false)
 		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
 		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
 		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
-		
+
 		return $sql;
 	}
-	
+
 	function AddColumnSQL($tabname, $flds)
 	{
+		$tabname = $this->TableName($tabname);
 		$f = array();
 		list($lines,$pkey) = $this->_GenFields($flds);
 		$s = "ALTER TABLE $tabname ADD (";
 		foreach($lines as $v) {
 			$f[] = "\n $v";
 		}
-		
+
 		$s .= implode(', ',$f).')';
 		$sql[] = $s;
 		return $sql;
 	}
-	
-	function AlterColumnSQL($tabname, $flds)
+
+	function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
+		$tabname = $this->TableName($tabname);
 		$f = array();
 		list($lines,$pkey) = $this->_GenFields($flds);
 		$s = "ALTER TABLE $tabname MODIFY(";
@@ -133,19 +161,19 @@ function AlterColumnSQL($tabname, $flds)
 		$sql[] = $s;
 		return $sql;
 	}
-	
-	function DropColumnSQL($tabname, $flds)
+
+	function DropColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		if (!is_array($flds)) $flds = explode(',',$flds);
 		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
-		
+
 		$sql = array();
 		$s = "ALTER TABLE $tabname DROP(";
 		$s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($t)
 	{
 		if (strpos($t,'.') !== false) {
@@ -154,62 +182,90 @@ function _DropAutoIncrement($t)
 		}
 		return "drop sequence seq_".$t;
 	}
-	
+
 	// 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 ($fdefault == "''" && $fnotnull) {// this is null in oracle
 			$fnotnull = false;
 			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
 		}
-		
+
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
-		
+
 		if ($fautoinc) $this->seqField = $fname;
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
+
 		return $suffix;
 	}
-	
-/*
-CREATE or replace TRIGGER jaddress_insert
-before insert on jaddress
-for each row
-begin
-select seqaddress.nextval into :new.A_ID from dual;
-end;
-*/
+
+	/**
+	 * Creates an insert trigger to emulate an auto-increment column
+	 * in a table
+	 *
+	 * @param string   $tabname       The name of the table
+	 * @param string[] $tableoptions  Optional configuration items
+	 *
+	 * @return string[] The SQL statements to create the trigger
+	 */
 	function _Triggers($tabname,$tableoptions)
 	{
-		if (!$this->seqField) return array();
 		
-		if ($this->schema) {
+		if (!$this->seqField) return array();
+
+		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
+
 		if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
 		$seqCache = '';
 		if (isset($tableoptions['SEQUENCE_CACHE'])){$seqCache = $tableoptions['SEQUENCE_CACHE'];}
 		$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;
 		return $sql;
 	}
-	
+
 	/*
 	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
 		[table_options] [select_statement]
@@ -225,58 +281,57 @@ function _Triggers($tabname,$tableoptions)
 		[reference_definition]
 		or CHECK (expr)
 	*/
-	
 
-	
+
+
 	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		if (isset($idxoptions['BITMAP'])) {
-			$unique = ' BITMAP'; 
+			$unique = ' BITMAP';
 		} elseif (isset($idxoptions['UNIQUE'])) {
 			$unique = ' UNIQUE';
 		} else {
 			$unique = '';
 		}
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		if (isset($idxoptions['oci8']))
 			$s .= $idxoptions['oci8'];
-		
+
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	function GetCommentSQL($table,$col)
 	{
 		$table = $this->connection->qstr($table);
-		$col = $this->connection->qstr($col);	
+		$col = $this->connection->qstr($col);
 		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
 	}
-	
+
 	function SetCommentSQL($table,$col,$cmt)
 	{
 		$cmt = $this->connection->qstr($cmt);
 		return  "COMMENT ON COLUMN $table.$col IS $cmt";
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-postgres.inc.php b/adodb/datadict/datadict-postgres.inc.php
index 903c8c4..17627c4 100644
--- a/adodb/datadict/datadict-postgres.inc.php
+++ b/adodb/datadict/datadict-postgres.inc.php
@@ -1,20 +1,29 @@
 type;
 			$len = $fieldobj->max_length;
 		}
-		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique && 
-			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
-		
+		$is_serial = is_object($fieldobj) && !empty($fieldobj->primary_key) && !empty($fieldobj->unique) &&
+			!empty($fieldobj->has_default) && substr($fieldobj->default_value,0,8) == 'nextval(';
+
 		switch (strtoupper($t)) {
 			case 'INTERVAL':
 			case 'CHAR':
@@ -41,83 +53,84 @@ function MetaType($t,$len=-1,$fieldobj=false)
 			case 'NAME':
 	   		case 'BPCHAR':
 				if ($len <= $this->blobSize) return 'C';
-			
+
 			case 'TEXT':
 				return 'X';
-	
+
 			case 'IMAGE': // user defined type
 			case 'BLOB': // user defined type
 			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
 			case 'VARBIT':
 			case 'BYTEA':
 				return 'B';
-			
+
 			case 'BOOL':
 			case 'BOOLEAN':
 				return 'L';
-			
+
 			case 'DATE':
 				return 'D';
-			
+
 			case 'TIME':
 			case 'DATETIME':
 			case 'TIMESTAMP':
 			case 'TIMESTAMPTZ':
 				return 'T';
-			
+
 			case 'INTEGER': return !$is_serial ? 'I' : 'R';
-			case 'SMALLINT': 
+			case 'SMALLINT':
 			case 'INT2': return !$is_serial ? 'I2' : 'R';
 			case 'INT4': return !$is_serial ? 'I4' : 'R';
-			case 'BIGINT': 
+			case 'BIGINT':
 			case 'INT8': return !$is_serial ? 'I8' : 'R';
-				
+
 			case 'OID':
 			case 'SERIAL':
 				return 'R';
-			
+
 			case 'FLOAT4':
 			case 'FLOAT8':
 			case 'DOUBLE PRECISION':
 			case 'REAL':
 				return 'F';
-				
+
 			 default:
-			 	return 'N';
+			 	return ADODB_DEFAULT_METATYPE;
 		}
 	}
- 	
- 	function ActualType($meta)
+
+ 	function actualType($meta)
 	{
-		switch($meta) {
+		switch ($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BYTEA';
-			
+
 		case 'D': return 'DATE';
+		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'BOOLEAN';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'INT2';
 		case 'I4': return 'INT4';
 		case 'I8': return 'INT8';
-		
+
 		case 'F': return 'FLOAT8';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	/**
-	 * Adding a new Column 
+	 * Adding a new Column
 	 *
 	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
 	 *
@@ -125,22 +138,23 @@ function ActualType($meta)
 	 * @param string $flds column-names and types for the changed columns
 	 * @return array with SQL strings
 	 */
-	function AddColumnSQL($tabname, $flds)
+	function addColumnSQL($tabname, $flds)
 	{
-		$tabname = $this->TableName ($tabname);
+		$tabname = $this->tableName($tabname);
 		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
+		$not_null = false;
+		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))) {
 				$v = preg_replace('/NOT NULL/i','',$v);
 			}
-			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
+			if (preg_match('/^([^ ]+) .*DEFAULT (\'[^\']+\'|\"[^\"]+\"|[^ ]+)/',$v,$matches)) {
 				list(,$colname,$default) = $matches;
 				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
 				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
 				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-			} else {				
+			} else {
 				$sql[] = $alter . $v;
 			}
 			if ($not_null) {
@@ -150,51 +164,138 @@ function AddColumnSQL($tabname, $flds)
 		}
 		return $sql;
 	}
-	
+
+
+	function dropIndexSQL($idxname, $tabname = NULL)
+	{
+	   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='')
+	function alterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
+		// Check if alter single column datatype available - works with 8.0+
+		$has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
+
+		if ($has_alter_column) {
+			$tabname = $this->tableName($tabname);
+			$sql = array();
+			list($lines,$pkey) = $this->_genFields($flds);
+			$set_null = false;
+			foreach($lines as $v) {
+				$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+				if ($not_null = preg_match('/NOT NULL/i',$v)) {
+					$v = preg_replace('/NOT NULL/i','',$v);
+				}
+				 // this next block doesn't work - there is no way that I can see to
+				 // explicitly ask a column to be null using $flds
+				else if ($set_null = preg_match('/NULL/i',$v)) {
+					// if they didn't specify not null, see if they 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
+					$v = preg_replace('/(?metaColumns($tabname);
+					list(,$colname,$default) = $matches;
+					$alter .= $colname;
+					if ($this->connection) {
+						$old_coltype = $this->connection->metaType($existing[strtoupper($colname)]);
+					} else {
+						$old_coltype = $t;
+					}
+					$v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
+					$t = trim(str_replace('DEFAULT '.$default,'',$v));
+
+					// Type change from bool to int
+					if ( $old_coltype == 'L' && $t == 'INTEGER' ) {
+						$sql[] = $alter . ' DROP DEFAULT';
+						$sql[] = $alter . " TYPE $t USING ($colname::BOOL)::INT";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+					// Type change from int to bool
+					else if ( $old_coltype == 'I' && $t == 'BOOLEAN' ) {
+						if( strcasecmp('NULL', trim($default)) != 0 ) {
+							$default = $this->connection->qstr($default);
+						}
+						$sql[] = $alter . ' DROP DEFAULT';
+						$sql[] = $alter . " TYPE $t USING CASE WHEN $colname = 0 THEN false ELSE true END";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+					// Any other column types conversion
+					else {
+						$sql[] = $alter . " TYPE $t";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+
+				}
+				else {
+					// drop default?
+					preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
+					list (,$colname,$rest) = $matches;
+					$alter .= $colname;
+					$sql[] = $alter . ' TYPE ' . $rest;
+				}
+
+				#list($colname) = explode(' ',$v);
+				if ($not_null) {
+					// this does not error out if the column is already not null
+					$sql[] = $alter . ' SET NOT NULL';
+				}
+				if ($set_null) {
+					// this does not error out if the column is already null
+					$sql[] = $alter . ' DROP NOT NULL';
+				}
+			}
+			return $sql;
+		}
+
+		// does not have alter column
 		if (!$tableflds) {
 			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
 			return array();
 		}
-		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+		return $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);
 	}
-	
+
 	/**
 	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
 	 *
@@ -203,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)
+	function _createSuffix($fname, &$ftype, $fnotnull, $fdefault, $fautoinc, $fconstraint, $funsigned)
 	{
 		if ($fautoinc) {
 			$ftype = 'SERIAL';
@@ -276,23 +391,37 @@ function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstrai
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		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)
+	{
+		if (!empty($this->schema)) {
+			$rename_from = $this->tableName($tabname);
+			$schema_save = $this->schema;
+			$this->schema = false;
+			$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)));
+	}
+
 	/*
 	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
 	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
@@ -316,8 +445,8 @@ function _DropAutoIncrement($tabname)
 	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
 	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
 	*/
-	
-	
+
+
 	/*
 	CREATE [ UNIQUE ] INDEX index_name ON table
 [ USING acc_method ] ( column [ ops_name ] [, ...] )
@@ -326,46 +455,111 @@ function _DropAutoIncrement($tabname)
 [ 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;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		
+
 		$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;
 	}
-}
-?>
\ No newline at end of file
+	
+	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/adodb/datadict/datadict-sapdb.inc.php b/adodb/datadict/datadict-sapdb.inc.php
index 144d81c..20c16aa 100644
--- a/adodb/datadict/datadict-sapdb.inc.php
+++ b/adodb/datadict/datadict-sapdb.inc.php
@@ -1,54 +1,63 @@
  '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)) {
@@ -78,10 +87,10 @@ function MetaType($t,$len=-1,$fieldobj=false)
 
 		return $type;
 	}
-	
+
 	// 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 ($funsigned) $suffix .= ' UNSIGNED';
 		if ($fnotnull) $suffix .= ' NOT NULL';
@@ -98,8 +107,8 @@ function AddColumnSQL($tabname, $flds)
 		list($lines,$pkey) = $this->_GenFields($flds);
 		return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
 	}
-	
-	function AlterColumnSQL($tabname, $flds)
+
+	function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		$tabname = $this->TableName ($tabname);
 		$sql = array();
@@ -107,7 +116,7 @@ function AlterColumnSQL($tabname, $flds)
 		return array( 'ALTER TABLE ' . $tabname . ' MODIFY (' . implode(', ',$lines) . ')' );
 	}
 
-	function DropColumnSQL($tabname, $flds)
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 		$tabname = $this->TableName ($tabname);
 		if (!is_array($flds)) $flds = explode(',',$flds);
@@ -115,7 +124,5 @@ function DropColumnSQL($tabname, $flds)
 			$flds[$k] = $this->NameQuote($v);
 		}
 		return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
-	}	
+	}
 }
-
-?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-sqlite.inc.php b/adodb/datadict/datadict-sqlite.inc.php
new file mode 100644
index 0000000..942927f
--- /dev/null
+++ b/adodb/datadict/datadict-sqlite.inc.php
@@ -0,0 +1,96 @@
+debug) ADOConnection::outp("AlterColumnSQL not supported natively by SQLite");
+		return array();
+	}
+
+	function DropColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported natively by SQLite");
+		return array();
+	}
+
+	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
+	{
+		if ($this->debug) ADOConnection::outp("RenameColumnSQL not supported natively by SQLite");
+		return array();
+	}
+
+}
diff --git a/adodb/datadict/datadict-sybase.inc.php b/adodb/datadict/datadict-sybase.inc.php
index 6649957..e565f8e 100644
--- a/adodb/datadict/datadict-sybase.inc.php
+++ b/adodb/datadict/datadict-sybase.inc.php
@@ -1,23 +1,32 @@
 type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
 		case 'SMALLINT': return 'I2';
 		case 'BIGINT':  return  'I8';
-		
+
 		case 'REAL':
 		case 'FLOAT': return 'F';
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
+		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'I': return 'INT'; 
+
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -85,8 +95,8 @@ function AddColumnSQL($tabname, $flds)
 		$sql[] = $s;
 		return $sql;
 	}
-	
-	function AlterColumnSQL($tabname, $flds)
+
+	function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		$tabname = $this->TableName ($tabname);
 		$sql = array();
@@ -97,8 +107,8 @@ function AlterColumnSQL($tabname, $flds)
 
 		return $sql;
 	}
-	
-	function DropColumnSQL($tabname, $flds)
+
+	function DropColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		$tabname = $this->TableName($tabname);
 		if (!is_array($flds)) $flds = explode(',',$flds);
@@ -111,10 +121,10 @@ function DropColumnSQL($tabname, $flds)
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
@@ -123,106 +133,105 @@ function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/docs/README.md b/adodb/docs/README.md
new file mode 100644
index 0000000..aefdc88
--- /dev/null
+++ b/adodb/docs/README.md
@@ -0,0 +1,17 @@
+# ADOdb Documentation
+
+ADOdb documentation is available in the following locations:
+
+- [Online](https://adodb.org/)
+- [Download](https://sourceforge.net/projects/adodb/files/Documentation/) for offline use
+
+## Legacy documentation
+
+The old HTML files are available in
+[GitHub](https://github.com/ADOdb/ADOdb/tree/8b8133771ecbe9c95e57abbe5dc3757f0226bfcd/docs),
+or in the release zip/tarballs for version 5.20 and before on
+[Sourceforge](https://sourceforge.net/projects/adodb/files/adodb-php5-only/).
+
+## Changelog
+
+The full historical [Changelog](changelog.md) is available on GitHub.
diff --git a/adodb/docs/adodb.gif b/adodb/docs/adodb.gif
new file mode 100644
index 0000000..c5e8dfc
Binary files /dev/null and b/adodb/docs/adodb.gif differ
diff --git a/adodb/docs/adodb2.gif b/adodb/docs/adodb2.gif
new file mode 100644
index 0000000..f12ae20
Binary files /dev/null and b/adodb/docs/adodb2.gif differ
diff --git a/adodb/docs/changelog.md b/adodb/docs/changelog.md
new file mode 100644
index 0000000..9ed825b
--- /dev/null
+++ b/adodb/docs/changelog.md
@@ -0,0 +1,1146 @@
+# ADOdb Changelog - v5.x
+
+All notable changes to this project will be documented in this file.
+As of version 5.20.1, its format is based on
+[Keep a Changelog](https://keepachangelog.com/).
+
+This project adheres to the [Semantic Versioning](https://semver.org/)
+specification, since version 5.20.0.
+
+Older changelogs:
+[v4.x](changelog_v4.x.md),
+[v3.x](changelog_v3.x.md),
+[v2.x](changelog_v2.x.md).
+
+--------------------------------------------------------------------------------
+
+## [5.21.2] - 2021-08-22
+
+### Fixed
+
+- Fix syntax error in toexport.inc.php
+  [#749](https://github.com/ADOdb/ADOdb/issues/749)
+- pgsql: fix fetchField() parameter naming
+  [#752](https://github.com/ADOdb/ADOdb/issues/752)
+
+
+## [5.21.1] - 2021-08-15
+
+### Changed
+
+- Standardized source code file headers
+  [#728](https://github.com/ADOdb/ADOdb/issues/728)
+- Code cleanup: PHPDoc, code style, whitespace, etc.
+  [#691](https://github.com/ADOdb/ADOdb/issues/691) 
+  (and others)
+
+### Fixed
+
+- Caching in FieldTypesArray() causes problems
+  [#687](https://github.com/ADOdb/ADOdb/issues/687)
+- setConnectionParameter() method should not be final
+  [#694](https://github.com/ADOdb/ADOdb/issues/694)
+- Final private methods throw warning (PHP 8)
+  [#711](https://github.com/ADOdb/ADOdb/issues/711)
+- Fix record count when executing SQL with subqueries
+  [#715](https://github.com/ADOdb/ADOdb/issues/715)
+- Incorrect handling of $ADODB_QUOTE_FIELDNAMES = true
+  [#721](https://github.com/ADOdb/ADOdb/issues/721)
+- db2: fix columns always returned in lowercase
+  [#719](https://github.com/ADOdb/ADOdb/issues/719)
+- PDO: Bind parameters fail if sent in associative array
+  [#705](https://github.com/ADOdb/ADOdb/issues/705)
+- mssql: _insertid() doesn't work anymore  
+  [#692](https://github.com/ADOdb/ADOdb/issues/692)
+- mssql: PHP warnings in dropColumnSQL()
+  [#696](https://github.com/ADOdb/ADOdb/issues/696)
+- mssql: duplicate key in SQLDate convert formats
+  [#748](https://github.com/ADOdb/ADOdb/issues/748)
+- mysql: affected_rows() returns number instead of false
+  [#604](https://github.com/ADOdb/ADOdb/issues/604)
+- mysql: TypeError when calling get/setChangeSet on unset connection (PHP 8)
+  [#686](https://github.com/ADOdb/ADOdb/issues/686)
+- mysql: TypeError when calling setConnectionParameter() with non-numeric value (PHP 8)
+  [#693](https://github.com/ADOdb/ADOdb/issues/693)
+- pdo: Affected_Rows() throws Notice and returns 0 when rows affected
+  [#733](https://github.com/ADOdb/ADOdb/issues/733)
+- pgsql: sub-selects require aliasing
+  [#736](https://github.com/ADOdb/ADOdb/issues/736)
+- xml: Invalid SQL in extractSchema()
+  [#707](https://github.com/ADOdb/ADOdb/issues/707)
+
+### Removed
+
+- Use of _ADODB_COUNT as workaround for counting in complex queries
+  (introduced in [#88](https://github.com/ADOdb/ADOdb/issues/88))
+  [#715](https://github.com/ADOdb/ADOdb/issues/715)
+
+
+
+## [5.21.0] - 2021-02-27
+
+### Fixed
+
+- pgsql: param(0) returns invalid `$0` placeholder
+  [#682](https://github.com/ADOdb/ADOdb/issues/682)
+
+
+## [5.21.0-rc.1] - 2021-02-02
+
+Includes all fixes from 5.20.20.
+
+### Added
+
+- Explicit support for PHP 8 with Composer
+
+### Fixed
+
+- Replace adodb_str_replace() calls with str_replace()
+  [#646](https://github.com/ADOdb/ADOdb/issues/646)
+- pgsql: override ADODB_DataDict::ChangeTableSQL()
+  [#634](https://github.com/ADOdb/ADOdb/issues/634)
+- sqlite: fix metaIndexes does not return primary key correctly
+  [#656](https://github.com/ADOdb/ADOdb/issues/656)
+- xmlschema: PHP8 compatibility
+  [#658](https://github.com/ADOdb/ADOdb/issues/658)
+
+### Removed
+
+- Support for PHP < 5.5.9
+  [#654](https://github.com/ADOdb/ADOdb/issues/654)
+- XML-RPC Interface
+  [#671](https://github.com/ADOdb/ADOdb/issues/671)
+- Magic quotes related code
+  [#674](https://github.com/ADOdb/ADOdb/issues/674)
+
+
+## [5.20.20] - 2021-01-31
+
+### Fixed
+
+- Fix usage of get_magic_* functions
+  [#619](https://github.com/ADOdb/ADOdb/issues/619)
+  [#657](https://github.com/ADOdb/ADOdb/issues/657)
+- Fix PHP warning in _rs2rs() function
+  [#679](https://github.com/ADOdb/ADOdb/issues/679)
+- pdo: Fix Fatal error in _query()
+  [#666](https://github.com/ADOdb/ADOdb/issues/666)
+- pdo: Fix undefined variable
+  [#678](https://github.com/ADOdb/ADOdb/issues/678)
+- pgsql: Fix Fatal error in _close() method (PHP8)
+  [#666](https://github.com/ADOdb/ADOdb/issues/666)
+- pgsql: fix deprecated function aliases (PHP8)
+  [#667](https://github.com/ADOdb/ADOdb/issues/667)
+- text: fix Cannot pass parameter by reference
+  [#668](https://github.com/ADOdb/ADOdb/issues/668)
+
+
+## [5.21.0-beta.1] - 2020-12-20
+
+Includes all fixes from 5.20.19.
+
+### Added
+
+- adodb: New helper methods: day(), month(), year()
+  [#225](https://github.com/ADOdb/ADOdb/issues/225)
+- adodb: add Occitan ([#285](https://github.com/ADOdb/ADOdb/issues/285))
+  and Indonesian ([#293](https://github.com/ADOdb/ADOdb/issues/293)) translations.
+- adodb: add control over BLOB data dictionary feature (NOT NULL, DEFAULT)
+  [#292](https://github.com/ADOdb/ADOdb/issues/292)
+  [#478](https://github.com/ADOdb/ADOdb/issues/478)
+- mssql: support Windows authentication
+  [#353](https://github.com/ADOdb/ADOdb/issues/353)
+- mysqli: support SSL connections
+  [#415](https://github.com/ADOdb/ADOdb/issues/415)
+- pdo/dblib: new driver
+  [#496](https://github.com/ADOdb/ADOdb/issues/496)
+- pdo/firebird: new driver
+  [#378](https://github.com/ADOdb/ADOdb/issues/378)
+- loadbalancer: read/write splitting and load balancing across multiple connections, thanks to Mike Benoit
+  [#111](https://github.com/ADOdb/ADOdb/issues/111)
+
+### Changed
+
+- adodb: addColumnSQL datadict function now supports ENUM data types
+  [#26](https://github.com/ADOdb/ADOdb/issues/26)
+- adodb: introduce user-defined default Metatype
+  [#165](https://github.com/ADOdb/ADOdb/issues/165)
+- adodb: AutoExecute validates empty fields array
+  [#154](https://github.com/ADOdb/ADOdb/issues/154)
+- adodb: Add new value defaulting mode for getInsertSQL()
+  [#214](https://github.com/ADOdb/ADOdb/issues/214)
+- adodb: Added portable substring method
+  [#219](https://github.com/ADOdb/ADOdb/issues/219)
+- adodb: Optimize FieldTypesArray with static variable
+  [#367](https://github.com/ADOdb/ADOdb/issues/367)
+- adodb: Allow output handler to be callable
+  [#312](https://github.com/ADOdb/ADOdb/issues/312)
+- adodb-time: Add 'W' (week of year) format support in adodb_date()
+  [#223](https://github.com/ADOdb/ADOdb/issues/223)
+- db2: full driver rewrite
+  [#442](https://github.com/ADOdb/ADOdb/issues/442)
+- firebird: updated driver, thanks to Lester Caine
+  [#201](https://github.com/ADOdb/ADOdb/issues/201)
+- mssql: Add Convert on SQLDate Method
+  [#304](https://github.com/ADOdb/ADOdb/issues/304)
+- mssql: support alternative port in connect
+  [#314](https://github.com/ADOdb/ADOdb/issues/314)
+- mssql: MetaForeignKeys() not returning all FKs
+  [#486](https://github.com/ADOdb/ADOdb/issues/486)
+- mssql: support for T-SQL-style square brackets
+  [#246](https://github.com/ADOdb/ADOdb/issues/246)
+- mssqlnative: add support for 'l' (day of week) format in sqlDate()
+  [#232](https://github.com/ADOdb/ADOdb/issues/232)
+- mssqlnative: support metaProcedures() method
+  [#578](https://github.com/ADOdb/ADOdb/issues/578)
+- setConnectionParameter() now allows multiple parameters with the same key value
+  [#187](https://github.com/ADOdb/ADOdb/issues/187)
+- mysqli: Insert_ID() did not return correct value after executing stored procedure
+  [#166](https://github.com/ADOdb/ADOdb/issues/166)
+- mysqli: method failed if $associative set true
+  [#181](https://github.com/ADOdb/ADOdb/issues/181)
+- oci8: provide option to create compact trigger/sequence names
+  [#565](https://github.com/ADOdb/ADOdb/issues/565)
+- odbc/mssql: fix null strings concatenation issue with SQL server 2012
+  [#148](https://github.com/ADOdb/ADOdb/issues/148)
+- odbc/mssql: add missing Concat() method
+  [#402](https://github.com/ADOdb/ADOdb/issues/402)
+- pdo: add setConnectionParameter support
+  [#247](https://github.com/ADOdb/ADOdb/issues/247)
+- pdo: add meta extension points
+  [#475](https://github.com/ADOdb/ADOdb/issues/475)
+- pdo/mysql: add genID() and createSequence() support
+  [#465](https://github.com/ADOdb/ADOdb/issues/465)
+- pdo/pgsql: Add support for transactions
+  [#363](https://github.com/ADOdb/ADOdb/issues/363)
+- pdo/sqlsrv: add SetTransactionMode() method
+  [#362](https://github.com/ADOdb/ADOdb/issues/362)
+- pgsql: optimize version check
+  [#334](https://github.com/ADOdb/ADOdb/issues/334)
+- pgsql: use postgres9 driver by default
+  [#474](https://github.com/ADOdb/ADOdb/issues/474)
+- sqlite: Fix Metataypes mapping
+  [#177](https://github.com/ADOdb/ADOdb/issues/177)
+- sqlite: driver did not support metaForeignKeys
+  [#179](https://github.com/ADOdb/ADOdb/issues/179)
+- memcache: add support for memcached PECL library
+  [#322](https://github.com/ADOdb/ADOdb/issues/322)
+- xml: support table 'opt' attribute with mysqli
+  [#267](https://github.com/ADOdb/ADOdb/issues/267)
+- xml: add support for 'DESCR' tags for tables/fields
+  [#265](https://github.com/ADOdb/ADOdb/issues/265)
+
+### Deprecated
+
+- mysqli: Deprecate $optionFlags property in favor of standard setConnectionParameter() method
+  [#188](https://github.com/ADOdb/ADOdb/issues/188)
+- proxy: the client driver and server.php script are deprecated
+  [#444](https://github.com/ADOdb/ADOdb/issues/444)
+
+### Removed
+
+- adodb: Remove references to obsolete ADOdb Extension
+  [#270](https://github.com/ADOdb/ADOdb/issues/270)
+- adodb: Remove unneeded ADODB_str_replace function
+  [#582](https://github.com/ADOdb/ADOdb/issues/582)
+- adodb: Remove useless PHP 4 and 5 version checks
+  [#583](https://github.com/ADOdb/ADOdb/issues/583)
+  [#584](https://github.com/ADOdb/ADOdb/issues/584)
+- adodb: replace _array_change_key_case() by internal PHP function
+  [#587](https://github.com/ADOdb/ADOdb/issues/587)
+
+### Fixed
+
+- adodb: Remove useless constructors 
+  [#171](https://github.com/ADOdb/ADOdb/issues/171)
+- adodb: Define default constructor in ADOConnection base class 
+  [#172](https://github.com/ADOdb/ADOdb/issues/172)
+- adodb: Reimplement base methods charMax() and textMax() 
+  [#183](https://github.com/ADOdb/ADOdb/issues/183)
+  [#220](https://github.com/ADOdb/ADOdb/issues/220)
+- adodb: fix getAssoc() 
+  [#189](https://github.com/ADOdb/ADOdb/issues/189) 
+  [#198](https://github.com/ADOdb/ADOdb/issues/198) 
+  [#204](https://github.com/ADOdb/ADOdb/issues/204)
+- adodb: Improve array identification in ADOrecordset::getAssoc() 
+  [#101](https://github.com/ADOdb/ADOdb/issues/101)
+- adodb: MetaColumns() consistently returns Actual Type by default in all drivers 
+  [#184](https://github.com/ADOdb/ADOdb/issues/184) 
+  [#133](https://github.com/ADOdb/ADOdb/issues/133)
+- adodb: getAssoc() should not change case of result set's outermost key
+  [#335](https://github.com/ADOdb/ADOdb/issues/335)
+- adodb: getAssoc() fix fetch mode
+  [#350](https://github.com/ADOdb/ADOdb/issues/350)
+- adodb: Replace each() with foreach (PHP 7.2 compatibility)
+  [#373](https://github.com/ADOdb/ADOdb/issues/373)
+- adodb: fix ADORecordSet constructor signature
+  [#278](https://github.com/ADOdb/ADOdb/issues/278)
+- adodb: support use of spaces and reserved keywords in replace function
+  [#390](https://github.com/ADOdb/ADOdb/issues/390)
+- adodb: fix adodb_strip_order_by() to only remove the last order by statement
+  [#549](https://github.com/ADOdb/ADOdb/issues/549)
+- adodb: fix field names quoting when setting value to null
+  [#572](https://github.com/ADOdb/ADOdb/issues/572)
+- adodb: fix getAssoc returning key as value column with ADODB_FETCH_BOTH mode
+  [#600](https://github.com/ADOdb/ADOdb/issues/600)
+- adodb-time: Fix 'Q' (quarter of year) format in adodb_date()
+  [#222](https://github.com/ADOdb/ADOdb/issues/222)
+- active record: honor column and table name quoting
+  [#309](https://github.com/ADOdb/ADOdb/issues/309)
+- db2: fix ChangeTableSQL() signature
+  [#338](https://github.com/ADOdb/ADOdb/issues/338)
+- mssqlnative: Query not returning id
+  [#185](https://github.com/ADOdb/ADOdb/issues/185)
+- mssqlnative: fix invalid return value for ErrorNo()
+  [#298](https://github.com/ADOdb/ADOdb/issues/298)
+- mssqlnative: ensure that the bind array is numeric
+  [#336](https://github.com/ADOdb/ADOdb/issues/336)
+- mssqlnative: fix crash with driver version 5.6 on queries returning no data
+  [#492](https://github.com/ADOdb/ADOdb/issues/492)
+- mysql: prevent use of driver with PHP >= 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)
+
+
+## [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] - 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
+
+- mssql: fix syntax error in version matching regex
+  [#305](https://github.com/ADOdb/ADOdb/issues/305)
+
+
+## [5.20.8] - 2016-12-17
+
+### Fixed
+
+- 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)
+
+
+## [5.20.7] - 2016-09-20
+
+### Fixed
+
+- 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)
+
+### Security
+
+- security: Fix SQL injection in PDO drivers qstr() method (CVE-2016-7405)
+  [#226](https://github.com/ADOdb/ADOdb/issues/226)
+
+
+## [5.20.6] - 2016-08-31
+
+### Fixed
+
+- 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)
+
+### Security
+
+- 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
+  [#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: 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
+  [#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
+  [#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
+  [#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
+  [#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)
+(i.e. when $ADODB_FETCH_MODE is set to ADODB_FETCH_ASSOC).
+It causes recordsets to return empty strings (no data) when using some database drivers.
+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 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 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 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
+    - Reintroduced MetaColumns function
+    - 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 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 PHPLens Issue No: 19359
+- odbc: Fixed MetaTables and MetaPrimaryKeys definitions in odbc driver to match adoconnection class.
+- 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 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()
+  [#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 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.
+- mssqlnative: Prepare() did not work previously. Now calling Prepare() will work but the sql is not actually compiled. Unfortunately bind params are passed to sqlsrv_prepare and not to sqlsrv_execute. make Prepare() and empty function, and we still execute the unprepared stmt.
+- mysql: FetchField(-1), turns it is is not possible to retrieve the max_length. Set to -1.
+- mysql-perf: Fixed "SHOW INNODB STATUS". Change to "SHOW ENGINE INNODB STATUS"
+
+## 5.17 - 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).
+  Previously $database had to be left blank and the $dsn was used to pass in this parameter.
+- oci8: Added better empty($rs) error handling to metaindexes().
+- oci8: Changed to use newer oci API to support PHP 5.4.
+- adodb.inc.php: Changed GetRowAssoc to more generic code that will work in all scenarios.
+
+## 5.16 - 2012-03-26
+
+- 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. 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 - 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 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 - 2011-09-08
+
+- mysqli: fix php compilation bug.
+- postgres: bind variables did not work properly. Fixed.
+- postgres: blob handling bug in _decode. Fixed.
+- ActiveRecord: if a null field was never updated, activerecord would still update the record. Fixed.
+- ActiveRecord: 1 char length string never quoted. Fixed.
+- LDAP: Connection string ldap:// and ldaps:// did not work. Fixed.
+
+## 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 PHPLens Issue No: 18919
+- mssqlnative: timestamp and fetchfield bugs fixed. PHPLens Issue: 18453
+
+## 5.12 - 2011-06-30
+
+- Postgres: Added information_schema support for postgresql.
+- Postgres: Use pg_unescape_bytea() in _decode.
+- 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 PHPLens Issue No: 18899
+
+## 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.
+- odbtp: Now you can define password in $password field of Connect()/PConnect(), and it will add it to DSN.
+- Datadict: altering columns did not consider the scale of the column. Now it does.
+- mssql: Fixed problem with ADODB_CASE_ASSOC causing multiple versions of column name appearing in recordset fields.
+- oci8: Added missing & to refLob.
+- oci8: Added obj->scale to FetchField().
+- oci8: Now you can get column info of a table in a different schema, e.g. MetaColumns("schema.table") is supported.
+- odbc_mssql: Fixed missing $metaDatabasesSQL.
+- xmlschema: Changed declaration of create() to create($xmls) to fix compat problems. Also changed constructor adoSchema() to pass in variable instead of variable reference.
+- 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 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 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 - 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 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
+- Moved _CreateCache() from PConnect()/Connect() to CacheExecute(). Suggested by Dumka.
+- Many bug fixes to adodb-pdo_sqlite.inc.php and new datadict-sqlite.inc.php. Thx Andrei B. [andreutz#mymail.ro]
+- 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 - 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.
+
+    ``` php
+    # we have a memcache servers mem1,mem2 on port 8888, compression=off and cachesecs=120
+    $dsn = 'mysql://user:pwd@localhost/mydb?memcache=mem1,mem2:8888:0&cachesecs=120';
+    ```
+
+- 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 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 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 - 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 - 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.
+- adodb-ado5.inc.php. Now has improved error handling.
+- Fixed typo in adodb-xmlschema03.inc.php. See XMLS_EXISTING_DATA, line 1501. Thx james johnson.
+- Made $inputarr optional for _query() in all drivers.
+- Fixed spelling mistake in flushall() in adodb.inc.ophp.
+- Fixed handling of quotes in adodb_active_record::doquote. Thx Jonathan Hohle (jhohle#godaddy.com).
+- Added new index parameter to adodb_active_record::setdatabaseadaptor. Thx Jonathan Hohle
+- Fixed & readcache() reference compat problem with php 5.3 in adodb.Thx Jonathan Hohle.
+- Some minor $ADODB_CACHE_CLASS definition issues in adodb.inc.php.
+- Added Reset() function to adodb_active_record. Thx marcus.
+- Minor dsn fix for pdo_sqlite in adodb.inc.php. Thx Sergey Chvalyuk.
+- Fixed adodb-datadict _CreateSuffix() inconsistencies. Thx Chris Miller.
+- Option to delete old fields $dropOldFlds in datadict ChangeTableSQL($table, $flds, $tableOptions, $dropOldFlds=false) added. Thx Philipp Niethammer.
+- Memcache caching did not expire properly. Fixed.
+- 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 - 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.
+- Postgresql qstr() now returns booleans as *true* and *false* without quotes.
+- MetaForeignKeys in mysql and mysqli drivers had this problem: A table can have two foreign keys pointing to the same column in the same table. The original code will incorrectly report only the last column. Fixed. https://sourceforge.net/p/adodb/bugs/100/
+- Passing in full ado connection string in $argHostname with ado drivers was failing in adodb5 due to bug. Fixed.
+- Fixed memcachelib flushcache and flushall bugs. Also fixed possible timeCreated = 0 problem in readcache. (Also in adodb 4.992). Thanks AlexB_UK (alexbarnes#hotmail.com).
+- Fixed a notice in adodb-sessions2.inc.php, in _conn(). Thx bober m.derlukiewicz#rocktech.remove_me.pl;
+- ADOdb Active Record: Fixed some issues with incompatible fetch modes (ADODB_FETCH_ASSOC) causing problems in UpdateActiveTable().
+- ADOdb Active Record: Added support for functions that support predefining one-to-many relationships:
+   _ClassHasMany ClassBelongsTo TableHasMany TableBelongsTo TableKeyHasMany TableKeyBelongsTo_.
+- You can also define your child/parent class in these functions, instead of the default ADODB_Active_Record. Thx Arialdo Martini & Chris R for idea.
+- ADOdb Active Record: HasMany hardcoded primary key to "id". Fixed.
+- Many pdo and pdo-sqlite fixes from Sid Dunayer [sdunayer#interserv.com].
+- CacheSelectLimit not working for mssql. Fixed. Thx AlexB.
+- 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 - 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.
+- Added BINARY type to mysql.inc.php (also in 4.991).
+- Added support for SelectLimit($sql,-1,100) in oci8. (also in 4.991).
+- New $conn->GetMedian($table, $field, $where='') to get median account no. (also in 4.991)
+- The rs2html() function in tohtml.inc.php did not handle dates with ':' in it properly. Fixed. (also in 4.991)
+- Added support for connecting to oci8 using `$DB->Connect($ip, $user, $pwd, "SID=$sid");` (also in 4.991)
+- Added mysql type 'VAR_STRING' to MetaType(). (also in 4.991)
+- The session and session2 code supports setfetchmode assoc properly now (also in 4.991).
+- Added concat support to pdo. Thx Andrea Baron.
+- Changed db2 driver to use format `Y-m-d H-i-s` for datetime instead of `Y-m-d-H-i-s` which was legacy from odbc_db2 conversion.
+- Removed vestigal break on adodb_tz_offset in adodb-time.inc.php.
+- MetaForeignKeys did not work for views in MySQL 5. Fixed.
+- Changed error handling in GetActiveRecordsClass.
+- Added better support for using existing driver when $ADODB_NEWCONNECTION function returns false.
+- In _CreateSuffix in adodb-datadict.inc.php, adding unsigned variable for mysql.
+- In adodb-xmlschema03.inc.php, changed addTableOpt to include db name.
+- If bytea blob in postgresql is null, empty string was formerly returned. Now null is returned.
+- Changed db2 driver CreateSequence to support $start parameter.
+- rs2html() now does not add nbsp to end if length of string > 0
+- The oci8po FetchField() now only lowercases field names if ADODB_ASSOC_CASE is set to 0.
+- New mssqlnative drivers for php. TQ Garrett Serack of M'soft. [Download](http://www.microsoft.com/downloads/details.aspx?FamilyId=61BF87E0-D031-466B-B09A-6597C21A2E2A&displaylang=en) mssqlnative extension. Note that this is still in beta.
+- Fixed bugs in memcache support.
+- 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 - 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 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.
+- Changed oci8 lob handler to use & reference `$this->_refLOBs[$numlob]['VAR'] = &$var`.
+- We now strtolower the get_class() function in PEAR::isError() for php5 compat.
+- CacheExecute did not retrieve cache recordsets properly for 5.04 (worked in 4.98). Fixed.
+- New ADODB_Cache_File class for file caching defined in adodb.inc.php.
+- Farsi language file contribution by Peyman Hooshmandi Raad (phooshmand#gmail.com)
+- New API for creating your custom caching class which is stored in $ADODB_CACHE:
+
+    ``` php
+    include "/path/to/adodb.inc.php";
+    $ADODB_CACHE_CLASS = 'MyCacheClass';
+    class MyCacheClass extends ADODB_Cache_File
+    {
+        function writecache($filename, $contents,$debug=false) {...}
+        function &readcache($filename, &$err, $secs2cache, $rsClass) { ...}
+         :
+    }
+    $DB = NewADOConnection($driver);
+    $DB->Connect(...); ## MyCacheClass created here and stored in $ADODB_CACHE global variable.
+    $data = $rs->CacheGetOne($sql); ## MyCacheClass is used here for caching...
+    ```
+
+- Memcache supports multiple pooled hosts now. Only if none of the pooled servers
+  can be contacted will a connect error be generated. Usage example below:
+
+    ``` php
+    $db = NewADOConnection($driver);
+    $db->memCache = true; /// should we use memCache instead of caching in files
+    $db->memCacheHost = array($ip1, $ip2, $ip3); /// $db->memCacheHost = $ip1; still works
+    $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);
+    ```
+
+## 5.04 - 2008-02-13
+
+Released together with [v4.98](changelog_v4.x.md#498---13-feb-2008)
+
+- Fixed adodb_mktime problem which causes a performance bottleneck in $hrs.
+- Added mysqli support to adodb_getcount().
+- Removed MYSQLI_TYPE_CHAR from MetaType().
+
+## 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. 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.
+- Also adodb_backtrace() now traces 1 level deeper as sometimes actual culprit function is not displayed.
+- Fixed a group by problem with adodb_getcount() for db's which are not postgres/oci8 based.
+- 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 - 2007-09-24
+
+Released together with [v4.96](changelog_v4.x.md#496---24-sept-2007)
+
+- ADOdb perf for oci8 now has non-table-locking code when clearing the sql. Slower but better transparency. Added in 4.96a and 5.02a.
+- Fix adodb count optimisation. Preg_match did not work properly. Also rewrote the ORDER BY stripping code in _adodb_getcount(), adodb-lib.inc.php.
+- SelectLimit for oci8 not optimal for large recordsets when offset=0. Changed $nrows check.
+- Active record optimizations. Added support for assoc arrays in Set().
+- Now GetOne returns null if EOF (no records found), and false if error occurs. Use ErrorMsg()/ErrorNo() to get the error.
+- Also CacheGetRow and CacheGetCol will return false if error occurs, or empty array() if EOF, just like GetRow and GetCol.
+- Datadict now allows changing of types which are not resizable, eg. VARCHAR to TEXT in ChangeTableSQL. -- Mateo TibaquirĂ¡
+- Added BIT data type support to adodb-ado.inc.php and adodb-ado5.inc.php.
+- Ldap driver did not return actual ldap error messages. Fixed.
+- Implemented GetRandRow($sql, $inputarr). Optimized for Oci8.
+- Changed adodb5 active record to use static SetDatabaseAdapter() and removed php4 constructor. Bas van Beek bas.vanbeek#gmail.com.
+- Also in adodb5, changed adodb-session2 to use static function declarations in class. Thx Daniel Berlin.
+- Added "Clear SQL Log" to bottom of Performance screen.
+- Sessions2 code echo'ed directly to the screen in debug mode. Now uses ADOConnection::outp().
+- In mysql/mysqli, qstr(null) will return the string `null` instead of empty quoted string `''`.
+- postgresql optimizeTable in perf-postgres.inc.php added by Daniel Berlin (mail#daniel-berlin.de)
+- Added 5.2.1 compat code for oci8.
+- Changed @@identity to SCOPE_IDENTITY() for multiple mssql drivers. Thx Stefano Nari.
+- Code sanitization introduced in 4.95 caused problems in European locales (as float 3.2 was typecast to 3,2). Now we only sanitize if is_numeric fails.
+- Added support for customizing ADORecordset_empty using $this->rsPrefix.'empty'. By Josh Truwin.
+- Added proper support for ALterColumnSQL for Postgresql in datadict code. Thx. Josh Truwin.
+- 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 - 2007-05-17
+
+Released together with [v4.95](changelog_v4.x.md#495---17-may-2007)
+
+- CacheFlush debug outp() passed in invalid parameters. Fixed.
+- Added Thai language file for adodb. Thx Trirat Petchsingh rosskouk#gmail.com and Marcos Pont
+- Added zerofill checking support to MetaColumns for mysql and mysqli.
+- CacheFlush no longer deletes all files/directories. Only *.cache files deleted.
+- DB2 timestamp format changed to `var $fmtTimeStamp = "'Y-m-d-H:i:s'";`
+- Added some code sanitization to AutoExecute in adodb-lib.inc.php.
+- Due to typo, all connections in adodb-oracle.inc.php would become persistent, even non-persistent ones. Fixed.
+- Oci8 DBTimeStamp uses 24 hour time for input now, so you can perform string comparisons between 2 DBTimeStamp values.
+- Some PHP4.4 compat issues fixed in adodb-session2.inc.php
+- For ADOdb 5.01, fixed some adodb-datadict.inc.php MetaType compat issues with PHP5.
+- 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.
+
+
+[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/adodb/docs/changelog_v2.x.md b/adodb/docs/changelog_v2.x.md
new file mode 100644
index 0000000..af718b7
--- /dev/null
+++ b/adodb/docs/changelog_v2.x.md
@@ -0,0 +1,531 @@
+# ADOdb old Changelog - v2.x and older
+
+See the [Current Changelog](changelog.md).
+
+
+## 2.91 - 3 Jan 2003
+
+- Revised PHP version checking to use $ADODB_PHPVER with legal values 0x4000, 0x4050, 0x4200, 0x4300.
+- Added support for bytea fields and oid blobs in postgres by allowing BlobDecode() to detect and convert non-oid fields. Also added BlobEncode to postgres when you want to encode oid blobs.
+- Added blobEncodeType property for connections to inform phpLens what encoding method to use for blobs.
+- Added BlobDecode() and BlobEncode() to base ADOConnection class.
+- Added umask() to _gencachename() when creating directories.
+- Added charPage for ado drivers, so you can set the code page.
+  ```
+$conn->charPage = CP_UTF8;
+$conn->Connect($dsn);
+  ```
+- Modified _seek in mysql to check for num rows=0.
+- Added to metatypes new informix types for IDS 9.30\. Thx Fernando Ortiz.
+- _maxrecordcount returned in CachePageExecute $rsreturn
+- Fixed sybase cacheselectlimit( ) problems
+- MetaColumns() max_length should use precision for types X and C for ms access. Fixed.
+- Speedup of odbc non-SELECT sql statements.
+- Added support in MetaColumns for Wide Char types for ODBC. We halve max_length if unicode/wide char.
+- Added 'B' to types handled by GetUpdateSQL/GetInsertSQL.
+- Fixed warning message in oci8 driver with $persist variable when using PConnect.
+
+## 2.90 - 11 Dec 2002
+
+- Mssql and mssqlpo and oci8po now support ADODB_ASSOC_CASE.
+- Now MetaType() can accept a field object as the first parameter.
+- New $arr = $db->ServerInfo( ) function. Returns $arr['description'] which is the string description, and $arr['version'].
+- PostgreSQL and MSSQL speedups for insert/updates.
+- Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. Each connection has 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 \
+- Rewrote bits and pieces of session code to check for time synch and improve reliability.
+- Added property ADOConnection::hasTransactions = true/false;
+- Added CreateSequence and DropSequence functions
+- Found misplaced MoveNext() in adodb-postgres.inc.php. Fixed.
+- Sybase SelectLimit not reliable because 'set rowcount' not cached - fixed.
+- Moved ADOConnection to adodb-connection.inc.php and ADORecordSet to adodb-recordset.inc.php. This allows us to use doxygen to generate documentation. Doxygen doesn't like the classes in the main adodb.inc.php file for some mysterious reason.
+
+## 2.50 - 14 Nov 2002
+
+- Added transOff and transCnt properties for disabling (transOff = true) and tracking transaction status (transCnt>0).
+- Added inputarray handling into _adodb_pageexecute_all_rows - "Ross Smith" RossSmith#bnw.com.
+- Fixed postgresql inconsistencies in date handling.
+- Added support for mssql_fetch_assoc.
+- Fixed $ADODB_FETCH_MODE bug in odbc MetaTables() and MetaPrimaryKeys().
+- Accidentally declared UnixDate() twice, making adodb incompatible with php 4.3.0\. Fixed.
+- Fixed pager problems with some databases that returned -1 for _currentRow on MoveLast() by switching to MoveNext() in adodb-lib.inc.php.
+- Also fixed uninited $discard in adodb-lib.inc.php.
+
+## 2.43 - 25 Oct 2002
+
+- Added ADODB_ASSOC_CASE constant to better support ibase and odbc field names.
+- Added support for NConnect() for oracle OCINLogin.
+- Fixed NumCols() bug.
+- Changed session handler to use Replace() on write.
+- Fixed oci8 SelectLimit aggregate function bug again.
+- Rewrote pivoting code.
+
+## 2.42 - 4 Oct 2002
+
+- Fixed ibase_fetch() problem with nulls. Also interbase now does automatic blob decoding, and is backward compatible. Suggested by Heinz Hombergs heinz#hhombergs.de.
+- Fixed postgresql MoveNext() problems when called repeatedly after EOF. Also suggested by Heinz Hombergs.
+- PageExecute() does not rewrite queries if SELECT DISTINCT is used. Requested by hans#velum.net
+- Added additional fixes to oci8 SelectLimit handling with aggregate functions - thx to Christian Bugge for reporting the problem.
+
+## 2.41 - 2 Oct 2002
+
+- Fixed ADODB_COUNTRECS bug in odbc. Thx to Joshua Zoshi jzoshi#hotmail.com.
+- Increased buffers for adodb-csvlib.inc.php for extremely long sql from 8192 to 32000.
+- Revised pivottable.inc.php code. Added better support for aggregate fields.
+- Fixed mysql text/blob types problem in MetaTypes base class - thx to horacio degiorgi.
+- Added SQLDate($fmt,$date) function, which allows an sql date format string to be generated - useful for group by's.
+- Fixed bug in oci8 SelectLimit when offset>100.
+
+## 2.40 - 4 Sept 2002
+
+- Added new NLS_DATE_FORMAT property to oci8\. Suggested by Laurent NAVARRO ln#altidev.com
+- Now use bind parameters in oci8 selectlimit for better performance.
+- Fixed interbase replaceQuote for dialect != 1\. Thx to "BEGUIN Pierre-Henri - INFOCOB" phb#infocob.com.
+- Added white-space check to QA.
+- Changed unixtimestamp to support fractional seconds (we always round down/floor the seconds). Thanks to beezly#beezly.org.uk.
+- Now you can set the trigger_error type your own user-defined type in adodb-errorhandler.inc.php. Suggested by Claudio Bustos clbustos#entelchile.net.
+- Added recordset filters with rsfilter.inc.php.
+ $conn->_rs2rs does not create a new recordset when it detects it is of type array. Some trickery there as there seems to be a bug in Zend Engine
+- Added render_pagelinks to adodb-pager.inc.php. Code by "Pablo Costa" pablo#cbsp.com.br.
+- MetaType() speedup in adodb.inc.php by using hashing instead of switch. Best performance if constant arrays are supported, as they are in PHP5.
+- adodb-session.php now updates only the expiry date if the crc32 check indicates that the data has not been modified.
+
+## 2.31 - 20 Aug 2002
+
+- Made changes to pivottable.inc.php due to daniel lucuzaeu's suggestions (we sum the pivottable column if desired).
+- Fixed ErrorNo() in postgres so it does not depend on _errorMsg property.
+- Robert Tuttle added support for oracle cursors. See ExecuteCursor().
+- Fixed Replace() so it works with mysql when updating record where data has not changed. Reported by Cal Evans (cal#calevans.com).
+
+## 2.30 - 1 Aug 2002
+
+- Added pivottable.inc.php. Thanks to daniel.lucazeau#ajornet.com for the original concept.
+- Added ADOConnection::outp($msg,$newline) to output error and debugging messages. Now you can override this using the ADODB_OUTP constant and use your own output handler.
+- Changed == to === for 'null' comparison. Reported by ericquil#yahoo.com
+- Fixed mssql SelectLimit( ) bug when distinct used.
+
+## 2.30 - 1 Aug 2002
+
+- New GetCol() and CacheGetCol() from ross#bnw.com that returns the first field as a 1 dim array.
+- We have an empty recordset, but RecordCount() could return -1\. Fixed. Reported by "Jonathan Polansky" jonathan#polansky.com.
+- We now check for session variable changes using strlen($sessval).crc32($sessval). Formerly we only used crc32().
+- Informix SelectLimit() problem with $ADODB_COUNTRECS fixed.
+- Fixed informix SELECT FIRST x DISTINCT, and not SELECT DISTINCT FIRST x - reported by F Riosa
+- Now default adodb error handlers ignores error if @ used.
+- If you set $conn->autoRollback=true, we auto-rollback persistent connections for odbc, mysql, oci8, mssql. Default for autoRollback is false. No need to do so for postgres. As interbase requires a transaction id (what a flawed api), we don't do it for interbase.
+- Changed PageExecute() to use non-greedy preg_match when searching for "FROM" keyword.
+
+## 2.20 - 9 July 2002
+
+- Added CacheGetOne($secs2cache,$sql), CacheGetRow($secs2cache,$sql), CacheGetAll($secs2cache,$sql).
+- Added $conn->OffsetDate($dayFraction,$date=false) to generate sql that calcs date offsets. Useful for scheduling appointments.
+- Added connection properties: leftOuter, rightOuter that hold left and right outer join operators.
+- Added connection property: ansiOuter to indicate whether ansi outer joins supported.
+- New driver _mssqlpo_, the portable mssql driver, which converts string concat operator from || to +.
+- Fixed ms access bug - SelectLimit() did not support ties - fixed.
+- Karsten Kraus (Karsten.Kraus#web.de), contributed error-handling code to ADONewConnection. Unfortunately due to backward compat problems, had to rollback most of the changes.
+- Added new parameter to GetAssoc() to allow returning an array of key-value pairs, ignoring any additional columns in the recordset. Off by default.
+- Corrected mssql $conn->sysDate to return only date using convert().
+- CacheExecute() improved debugging output.
+- Changed rs2html() so newlines are converted to BR tags. Also optimized rs2html() based on feedback by "Jerry Workman" jerry#mtncad.com.
+- Added support for Replace() with Interbase, using DELETE and INSERT.
+- Some minor optimizations (mostly removing & references when passing arrays).
+- Changed GenID() to allows id's larger than the size of an integer.
+- Added force_session property to oci8 for better updateblob() support.
+- Fixed PageExecute() which did not work properly with sql containing GROUP BY.
+
+## 2.12 - 12 June 2002
+
+- Added toexport.inc.php to export recordsets in CSV and tab-delimited format.
+- CachePageExecute() does not work - fixed - thx John Huong.
+- Interbase aliases not set properly in FetchField() - fixed. Thx Stefan Goethals.
+- Added cache property to adodb pager class. The number of secs to cache recordsets.
+- SQL rewriting bug in pageexecute() due to skipping of newlines due to missing /s modifier. Fixed.
+- Max size of cached recordset due to a bug was 256000 bytes. Fixed.
+- Speedup of 1st invocation of CacheExecute() by tuning code.
+- We compare $rewritesql with $sql in pageexecute code in case of rewrite failure.
+
+## 2.11 - 7 June 2002
+
+- Fixed PageExecute() rewrite sql problem - COUNT(*) and ORDER BY don't go together with mssql, access and postgres. Thx to Alexander Zhukov alex#unipack.ru
+- DB2 support for CHARACTER type added - thx John Huong huongch#bigfoot.com
+- For ado, $argProvider not properly checked. Fixed - kalimero#ngi.it
+- Added $conn->Replace() function for update with automatic insert if the record does not exist. Supported by all databases except interbase.
+
+## 2.10 - 4 June 2002
+
+- Added uniqueSort property to indicate mssql ORDER BY cols must be unique.
+- Optimized session handler by crc32 the data. We only write if session data has changed.
+- adodb_sess_read in adodb-session.php now returns ''correctly - thanks to Jorma Tuomainen, webmaster#wizactive.com
+- Mssql driver did not throw EXECUTE errors correctly because ErrorMsg() and ErrorNo() called in wrong order. Pointed out by Alexios Fakos. Fixed.
+- Changed ado to use client cursors. This fixes BeginTran() problems with ado.
+- Added handling of timestamp type in ado.
+- Added to ado_mssql support for insert_id() and affected_rows().
+- Added support for mssql.datetimeconvert=0, available since php 4.2.0.
+- Made UnixDate() less strict, so that the time is ignored if present.
+- Changed quote() so that it checks for magic_quotes_gpc.
+- Changed maxblobsize for odbc to default to 64000.
+
+## 2.00 - 13 May 2002
+
+- Added drivers _informix72_ for pre-7.3 versions, and _oci805_ for oracle 8.0.5, and postgres64 for postgresql 6.4 and earlier. The postgres and postgres7 drivers are now identical.
+- Interbase now partially supports ADODB_FETCH_BOTH, by defaulting to ASSOC mode.
+- Proper support for blobs in mssql. Also revised blob support code is base class. Now UpdateBlobFile() calls UpdateBlob() for consistency.
+- Added support for changed odbc_fetch_into api in php 4.2.0 with $conn->_has_stupid_odbc_fetch_api_change.
+- Fixed spelling of tablock locking hint in GenID( ) for mssql.
+- Added RowLock( ) to several databases, including oci8, informix, sybase, etc. Fixed where error in mssql RowLock().
+- Added sysDate and sysTimeStamp properties to most database drivers. These are the sql functions/constants for that database that return the current date and current timestamp, and are useful for portable inserts and updates.
+- Support for RecordCount() caused date handling in sybase and mssql to break. Fixed, thanks to Toni Tunkkari, by creating derived classes for ADORecordSet_array for both databases. Generalized using arrayClass property. Also to support RecordCount(), changed metatype handling for ado drivers. Now the type returned in FetchField is no longer a number, but the 1-char data type returned by MetaType. At the same time, fixed a lot of date handling. Now mssql support dmy and mdy date formats. Also speedups in sybase and mssql with preg_match and ^ in date/timestamp handling. Added support in sybase and mssql for 24 hour clock in timestamps (no AM/PM).
+- Extensive revisions to informix driver - thanks to Samuel CARRIERE samuel_carriere#hotmail.com
+- Added $ok parameter to CommitTrans($ok) for easy rollbacks.
+- Fixed odbc MetaColumns and MetaTables to save and restore $ADODB_FETCH_MODE.
+- Some odbc drivers did not call the base connection class constructor. Fixed.
+- Fixed regex for GetUpdateSQL() and GetInsertSQL() to support more legal character combinations.
+
+## 1.99 - 21 April 2002
+
+- Added emulated RecordCount() to all database drivers if $ADODB_COUNTRECS = true (which it is by default). Inspired by Cristiano Duarte (cunha17#uol.com.br).
+- Unified stored procedure support for mssql and oci8\. Parameter() and PrepareSP() functions implemented.
+- Added support for SELECT FIRST in informix, modified hasTop property to support this.
+- Changed csv driver to handle updates/deletes/inserts properly (when Execute() returns true). Bind params also work now, and raiseErrorFn with csv driver. Added csv driver to QA process.
+- Better error checking in oci8 UpdateBlob() and UpdateBlobFile().
+- Added TIME type to MySQL - patch by Manfred h9125297#zechine.wu-wien.ac.at
+- Prepare/Execute implemented for Interbase/Firebird
+- Changed some regular expressions to be anchored by /^ $/ for speed.
+- Added UnixTimeStamp() and UnixDate() to ADOConnection(). Now these functions are in both ADOConnection and ADORecordSet classes.
+- Empty recordsets were not cached - fixed.
+- Thanks to Gaetano Giunta (g.giunta#libero.it) for the oci8 code review. We didn't agree on everything, but i hoped we agreed to disagree!
+
+## 1.90 - 6 April 2002
+
+- Now all database drivers support fetch modes ADODB_FETCH_NUM and ADODB_FETCH_ASSOC, though still not fully tested. Eg. Frontbase, Sybase, Informix.
+- NextRecordSet() support for mssql. Contributed by "Sven Axelsson" sven.axelsson#bokochwebb.se
+- Added blob support for SQL Anywhere. Contributed by Wade Johnson wade#wadejohnson.de
+- Fixed some security loopholes in server.php. Server.php also supports fetch mode.
+- Generalized GenID() to support odbc and mssql drivers. Mssql no longer generates GUID's.
+- Experimental RowLock($table,$where) for mssql.
+- Properly implemented Prepare() in oci8 and ODBC.
+- Added Bind() support to oci8 to support Prepare().
+- Improved error handler. Catches CacheExecute() and GenID() errors now.
+- Now if you are running php from the command line, debugging messages do not output html formatting. Not 100% complete, but getting there.
+
+## 1.81 - 22 March 2002
+
+- Restored default $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT for backward compatibility.
+- SelectLimit for oci8 improved - Our FIRST_ROWS optimization now does not overwrite existing hint.
+- New Sybase SQL Anywhere driver. Contributed by Wade Johnson wade#wadejohnson.de
+
+## 1.80 - 15 March 2002
+
+- Redesigned directory structure of ADOdb files. Added new driver directory where all database drivers reside.
+- Changed caching algorithm to create subdirectories. Now we scale better.
+- Informix driver now supports insert_id(). Contribution by "Andrea Pinnisi" pinnisi#sysnet.it
+- Added experimental ISO date and FetchField support for informix.
+- Fixed a quoting bug in Execute() with bind parameters, causing problems with blobs.
+- Mssql driver speedup by 10-15%.
+- Now in CacheExecute($secs2cache,$sql,...), $secs2cache is optional. If missing, it will take the value defined in $connection->cacheSecs (default is 3600 seconds). Note that CacheSelectLimit(), the secs2cache is still compulsory - sigh.
+- Sybase SQL Anywhere driver (using ODBC) contributed by Wade Johnson wade#wadejohnson.de
+
+## 1.72 - 8 March 2002
+
+- Added @ when returning Fields() to prevent spurious error - "Michael William Miller" mille562#pilot.msu.edu
+- MetaDatabases() for postgres contributed by Phil pamelant#nerim.net
+- Mitchell T. Young (mitch#youngfamily.org) contributed informix driver.
+- Fixed rs2html() problem. I cannot reproduce, so probably a problem with pre PHP 4.1.0 versions, when supporting new ADODB_FETCH_MODEs.
+- Mattia Rossi (mattia#technologist.com) contributed BlobDecode() and UpdateBlobFile() for postgresql using the postgres specific pg_lo_import()/pg_lo_open() - i don't use them but hopefully others will find this useful. See [this posting](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.
+- Fixed UnixTimeStamp() bug - wasn't setting minutes and seconds properly. Patch from Agusti Fita i Borrell agusti#anglatecnic.com.
+- Toni Tunkkari added patch for sybase dates. Problem with spaces in day part of date fixed.
+
+## 1.71 - 18 Jan 2002
+
+- Sequence start id support. Now $conn->Gen_ID('seqname', 50) to start sequence from 50.
+- CSV driver fix for selectlimit, from Andreas - akaiser#vocote.de.
+- Gam3r spotted that a global variable was undefined in the session handler.
+- Mssql date regex had error. Fixed - reported by Minh Hoang vb_user#yahoo.com.
+- DBTimeStamp() and DBDate() now accept iso dates and unix timestamps. This means that the PostgreSQL handling of dates in GetInsertSQL() and GetUpdateSQL() can be removed. Also if these functions are passed '' or null or false, we return a SQL null.
+- GetInsertSQL() and GetUpdateSQL() now accept a new parameter, $magicq to indicate whether quotes should be inserted based on magic quote settings - suggested by dj#4ict.com.
+- Reformated docs slightly based on suggestions by Chris Small.
+
+## 1.65 - 28 Dec 2001
+
+- Fixed borland_ibase class naming bug.
+- Now instead of using $rs->fields[0] internally, we use reset($rs->fields) so that we are compatible with ADODB_FETCH_ASSOC mode. Reported by Nico S.
+- Changed recordset constructor and _initrs() for oci8 so that it returns the field definitions even if no rows in the recordset. Reported by Rick Hickerson (rhickers#mv.mv.com).
+- Improved support for postgresql in GetInsertSQL and GetUpdateSQL by "mike" mike#partner2partner.com and "Ryan Bailey" rebel#windriders.com
+
+## 1.64 - 20 Dec 2001
+
+- Danny Milosavljevic  added some patches for MySQL error handling and displaying default values.
+- Fixed some ADODB_FETCH_BOTH inconsistencies in odbc and interbase.
+- Added more tests to test suite to cover ADODB_FETCH_* and ADODB_ERROR_HANDLER.
+- Added firebird (ibase) driver
+- Added borland_ibase driver for interbase 6.5
+
+## 1.63 - 13 Dec 2001
+
+- Absolute to the adodb-lib.inc.php file not set properly. Fixed.
+
+## 1.62 - 11 Dec 2001
+
+- Major speedup of ADOdb for low-end web sites by reducing the php code loading and compiling cycle. We conditionally compile not so common functions. Moved csv code to adodb-csvlib.inc.php to reduce adodb.inc.php parsing. This file is loaded only when the csv/proxy driver is used, or CacheExecute() is run. Also moved PageExecute(), GetSelectSQL() and GetUpdateSQL() core code to adodb-lib.inc.php. This reduced the 70K main adodb.inc.php file to 55K, and since at least 20K of the file is comments, we have reduced 50K of code in adodb.inc.php to 35K. There should be 35% reduction in memory and thus 35% speedup in compiling the php code for the main adodb.inc.php file.
+- Highly tuned SelectLimit() for oci8 for massive speed improvements on large files. Selecting 20 rows starting from the 20,000th row of a table is now 7 times faster. Thx to Tomas V V Cox.
+- Allow . and # in table definitions in GetInsertSQL and GetUpdateSQL. See ADODB_TABLE_REGEX constant. Thx to Ari Kuorikoski.
+- Added ADODB_PREFETCH_ROWS constant, defaulting to 10\. This determines the number of records to prefetch in a SELECT statement. Only used by oci8.
+- Added high portability Oracle class called oci8po. This uses ? for bind variables, and lower cases column names.
+- Now all database drivers support $ADODB_FETCH_MODE, including interbase, ado, and odbc: ADODB_FETCH_NUM and ADODB_FETCH_ASSOC. ADODB_FETCH_BOTH is not fully implemented for all database drivers.
+
+## 1.61 - Nov 2001
+- Added PO_RecordCount() and PO_Insert_ID(). PO stands for portable. Pablo Roca [pabloroca#mvps.org]
+- GenID now returns 0 if not available. Safer is that you should check $conn->hasGenID for availability.
+- M'soft ADO we now correctly close recordset in _close() peterd#telephonetics.co.uk
+- MSSQL now supports GenID(). It generates a 16-byte GUID from mssql newid() function.
+- Changed ereg_replace to preg_replace in SelectLimit. This is a fix for mssql. Ereg doesn't support t or n! Reported by marino Carlos xaplo#postnuke-espanol.org
+- Added $recordset->connection. This is the ADOConnection object for the recordset. Works with cached and normal recordsets. Surprisingly, this had no affect on performance!
+
+## 1.54 - 15 Nov 2001
+
+- Fixed some more bugs in PageExecute(). I am getting sick of bug in this and will have to reconsider my QA here. The main issue is that I don't use PageExecute() and to check whether it is working requires a visual inspection of the html generated currently. It is possible to write a test script but it would be quite complicated :(
+- More speedups of SelectLimit() for DB2, Oci8, access, vfp, mssql.
+
+## 1.53 - 7 Nov 2001
+
+- Added support for ADODB_FETCH_ASSOC for ado and odbc drivers.
+- Tuned GetRowAssoc(false) in postgresql and mysql.
+- Stephen Van Dyke contributed ADOdb icon, accepted with some minor mods.
+- Enabled Affected_Rows() for postgresql
+- Speedup for Concat() using implode() - Benjamin Curtis ben_curtis#yahoo.com
+- Fixed some more bugs in PageExecute() to prevent infinite loops
+
+## 1.52 - 5 Nov 2001
+
+- Spelling error in CacheExecute() caused it to fail. $ql should be $sql in line 625!
+- Added fixes for parsing [ and ] in GetUpdateSQL().
+
+## 1.51 - 5 Nov 2001
+
+- Oci8 SelectLimit() speedup by using OCIFetch().
+- Oci8 was mistakenly reporting errors when $db->debug = true.
+- If a connection failed with ODBC, it was not correctly reported - fixed.
+- _connectionID was inited to -1, changed to false.
+- Added $rs->FetchRow(), to simplify API, ala PEAR DB
+- Added PEAR DB compat mode, which is still faster than PEAR! See adodb-pear.inc.php.
+- Removed postgres pconnect debugging statement.
+
+## 1.50 - 31 Oct 2001
+
+- ADOdbConnection renamed to ADOConnection, and ADOdbFieldObject to ADOFieldObject.
+- PageExecute() now checks for empty $rs correctly, and the errors in the docs on this subject have been fixed.
+- odbc_error() does not return 6 digit error correctly at times. Implemented workaround.
+- Added ADORecordSet_empty class. This will speedup INSERTS/DELETES/UPDATES because the return object created is much smaller.
+- Added Prepare() to odbc, and oci8 (but doesn't work properly for oci8 still).
+- Made pgsql a synonym for postgre7, and changed SELECT LIMIT to use OFFSET for compat with postgres 7.2.
+- Revised adodb-cryptsession.php thanks to Ari.
+- Set resources to false on _close, to force freeing of resources.
+- Added adodb-errorhandler.inc.php, adodb-errorpear.inc.php and raiseErrorFn on Freek's urging.
+- GetRowAssoc($toUpper=true): $toUpper added as default.
+- Errors when connecting to a database were not captured formerly. Now we do it correctly.
+
+## 1.40 - 19 September 2001
+
+- PageExecute() to implement page scrolling added. Code and idea by Iván Oliva.
+- Some minor postgresql fixes.
+- Added sequence support using GenID() for postgresql, oci8, mysql, interbase.
+- Added UpdateBlob support for interbase (untested).
+- Added encrypted sessions (see adodb-cryptsession.php). By Ari Kuorikoski 
+
+## 1.31 - 21 August 2001
+
+- Many bug fixes thanks to "GaM3R (Cameron)" . Some session changes due to Gam3r.
+- Fixed qstr() to quote also.
+- rs2html() now pretty printed.
+- Jonathan Younger  contributed the great idea GetUpdateSQL() and GetInsertSQL() which generates SQL to update and insert into a table from a recordset. Modify the recordset fields array, then can this function to generate the SQL (the SQL is not executed).
+- Nicola Fankhauser  found some bugs in date handling for mssql.
+- Added minimal Oracle support for LOBs. Still under development.
+- Added $ADODB_FETCH_MODE so you can control whether recordsets return arrays which are numeric, associative or both. This is a global variable you set. Currently only MySQL, Oci8, Postgres drivers support this.
+- PostgreSQL properly closes recordsets now. Reported by several people.
+- Added UpdateBlob() for Oracle. A hack to make it easier to save blobs.
+- Oracle timestamps did not display properly. Fixed.
+
+## 1.20 - 6 June 2001
+
+- Now Oracle can connect using tnsnames.ora or server and service name
+- Extensive Oci8 speed optimizations. Oci8 code revised to support variable binding, and /*+ FIRST_ROWS */ hint.
+- Worked around some 4.0.6 bugs in odbc_fetch_into().
+- Paolo S. Asioli paolo.asioli#libero.it suggested GetRowAssoc().
+- Escape quotes for oracle wrongly set to '. Now '' is used.
+- Variable binding now works in ODBC also.
+- Jumped to version 1.20 because I don't like 13 :-)
+
+## 1.12 - 6 June 2001
+
+- Changed $ADODB_DIR to ADODB_DIR constant to plug a security loophole.
+- Changed _close() to close persistent connections also. Prevents connection leaks.
+- Major revision of oracle and oci8 drivers. Added OCI_RETURN_NULLS and OCI_RETURN_LOBS to OCIFetchInto(). BLOB, CLOB and VARCHAR2 recognition in MetaType() improved. MetaColumns() returns columns in correct sort order.
+- Interbase timestamp input format was wrong. Fixed.
+
+## 1.11 - 20 May 2001
+
+- Improved file locking for Windows.
+- Probabilistic flushing of cache to avoid avalanche updates when cache timeouts.
+- Cached recordset timestamp not saved in some scenarios. Fixed.
+
+## 1.10 - 19 May 2001
+
+- Added caching. CacheExecute() and CacheSelectLimit().
+- Added csv driver.
+- Fixed SelectLimit(), SELECT TOP not working under certain circumstances.
+- Added better Frontbase support of MetaTypes() by Frank M. Kromann.
+
+## 1.01 - 24 April 2001
+
+- Fixed SelectLimit bug. not quoted properly.
+- SelectLimit: SELECT TOP -1 * FROM TABLE not support by Microsoft. Fixed.
+- GetMenu improved by glen.davies#cce.ac.nz to support multiple hilited items
+- FetchNextObject() did not work with only 1 record returned. Fixed bug reported by $tim#orotech.net
+- Fixed mysql field max_length problem. Fix suggested by Jim Nicholson (jnich#att.com)
+
+## 1.00 - 16 April 2001
+
+- Given some brilliant suggestions on how to simplify ADOdb by akul. You no longer need to setup $ADODB_DIR yourself, and ADOLoadCode() is automatically called by ADONewConnection(), simplifying the startup code.
+- FetchNextObject() added. Suggested by Jakub Marecek. This makes FetchObject() obsolete, as this is more flexible and powerful.
+- Misc fixes to SelectLimit() to support Access (top must follow distinct) and Fields() in the array recordset. From Reinhard Balling.
+
+## 0.96 - 27 Mar 2001
+
+- ADOConnection Close() did not return a value correctly. Thanks to akul#otamedia.com.
+- When the horrible magic_quotes is enabled, back-slash () is changed to double-backslash (\). This doesn't make sense for Microsoft/Sybase databases. We fix this in qstr().
+- Fixed Sybase date problem in UnixDate() thanks to Toni Tunkkari. Also fixed MSSQL problem in UnixDate() - thanks to milhouse31#hotmail.com.
+- MoveNext() moved to leaf classes for speed in MySQL/PostgreSQL. 10-15% speedup.
+- Added null handling in bindInputArray in Execute() -- Ron Baldwin suggestion.
+- Fixed some option tags. Thanks to john#jrmstudios.com.
+
+## 0.95 - 13 Mar 2001
+
+- Added postgres7 database driver which supports LIMIT and other version 7 stuff in the future.
+- Added SelectLimit to ADOConnection to simulate PostgreSQL's "select * from table limit 10 offset 3". Added helper function GetArrayLimit() to ADORecordSet.
+- Fixed mysql metacolumns bug. Thanks to Freek Dijkstra (phpeverywhere#macfreek.com).
+- Also many PostgreSQL changes by Freek. He almost rewrote the whole PostgreSQL driver!
+- Added fix to input parameters in Execute for non-strings by Ron Baldwin.
+- Added new metatype, X for TeXt. Formerly, metatype B for Blob also included text fields. Now 'B' is for binary/image data. 'X' for textual data.
+- Fixed $this->GetArray() in GetRows().
+- Oracle and OCI8: 1st parameter is always blank -- now warns if it is filled.
+- Now _hasLimit_ and _hasTop_ added to indicate whether SELECT * FROM TABLE LIMIT 10 or SELECT TOP 10 * FROM TABLE are supported.
+
+## 0.94 - 04 Feb 2001
+
+- Added ADORecordSet::GetRows() for compatibility with Microsoft ADO. Synonym for GetArray().
+- Added new metatype 'R' to represent autoincrement numbers.
+- Added ADORecordSet.FetchObject() to return a row as an object.
+- Finally got a Linux box to test PostgreSql. Many fixes.
+- Fixed copyright misspellings in 0.93.
+- Fixed mssql MetaColumns type bug.
+- Worked around odbc bug in PHP4 for sessions.
+- Fixed many documentation bugs (affected_rows, metadatabases, qstr).
+- Fixed MySQL timestamp format (removed comma).
+- Interbase driver did not call ibase_pconnect(). Fixed.
+
+## 0.93 - 18 Jan 2002
+
+- Fixed GetMenu bug.
+- Simplified Interbase commit and rollback.
+- Default behaviour on closing a connection is now to rollback all active transactions.
+- Added field object handling for array recordset for future XML compatibility.
+- Added arr2html() to convert array to html table.
+
+## 0.92 - 2 Jan 2002
+
+- Interbase Commit and Rollback should be working again.
+- Changed initialisation of ADORecordSet. This is internal and should not affect users. We are doing this to support cached recordsets in the future.
+- Implemented ADORecordSet_array class. This allows you to simulate a database recordset with an array.
+- Added UnixDate() and UnixTimeStamp() to ADORecordSet.
+
+## 0.91 - 21 Dec 2000
+
+- Fixed ODBC so ErrorMsg() is working.
+- Worked around ADO unrecognised null (0x1) value problem in COM.
+- Added Sybase support for FetchField() type
+- Removed debugging code and unneeded html from various files
+- Changed to javadoc style comments to adodb.inc.php.
+- Added maxsql as synonym for mysqlt
+- Now ODBC downloads first 8K of blob by default
+
+## 0.90 - 15 Nov 2000
+
+- Lots of testing of Microsoft ADO. Should be more stable now.
+- Added $ADODB_COUNTREC. Set to false for high speed selects.
+- Added Sybase support. Contributed by Toni Tunkkari (toni.tunkkari#finebyte.com). Bug in Sybase API: GetFields is unable to determine date types.
+- Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.
+- Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent empty dates.
+- Added MetaColumns($table) that returns an array of ADOFieldObject's listing the columns of a table.
+- Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.
+- Added adodb-session.php for session support.
+
+## 0.80 - 30 Nov 2000
+
+- Added support for charSet for interbase. Implemented MetaTables for most databases. PostgreSQL more extensively tested.
+
+## 0.71 - 22 Nov 2000
+
+- Switched from using require_once to include/include_once for backward compatibility with PHP 4.02 and earlier.
+
+## 0.70 - 15 Nov 2000
+
+- Calls by reference have been removed (call_time_pass_reference=Off) to ensure compatibility with future versions of PHP, except in Oracle 7 driver due to a bug in php_oracle.dll.
+- PostgreSQL database driver contributed by Alberto Cerezal (acerezalp#dbnet.es).
+- Oci8 driver for Oracle 8 contributed by George Fourlanos (fou#infomap.gr).
+- Added _mysqlt_ database driver to support MySQL 3.23 which has transaction support.
+- Oracle default date format (DD-MON-YY) did not match ADOdb default date format (which is YYYY-MM-DD). Use ALTER SESSION to force the default date.
+- Error message checking is now included in test suite.
+- MoveNext() did not check EOF properly -- fixed.
+
+## 0.60 - 8 Nov 2000
+
+- Fixed some constructor bugs in ODBC and ADO. Added ErrorNo function to ADOConnection class.
+
+## 0.51 - 18 Oct 2000
+
+- Fixed some interbase bugs.
+
+## 0.50 - 16 Oct 2000
+
+- Interbase commit/rollback changed to be compatible with PHP 4.03\.
+- CommitTrans( ) will now return true if transactions not supported.
+- Conversely RollbackTrans( ) will return false if transactions not supported.
+
+## 0.46 - 12 Oct 2000
+
+- Many Oracle compatibility issues fixed.
+
+## 0.40 - 26 Sept 2000
+
+- Many bug fixes
+- Now Code for BeginTrans, CommitTrans and RollbackTrans is working. So is the Affected_Rows and Insert_ID. Added above functions to test.php.
+- ADO type handling was busted in 0.30\. Fixed.
+- Generalised Move( ) so it works will all databases, including ODBC.
+
+## 0.30 - 18 Sept 2000
+
+- Renamed ADOLoadDB to ADOLoadCode. This is clearer.
+- Added BeginTrans, CommitTrans and RollbackTrans functions.
+- Added Affected_Rows() and Insert_ID(), _affectedrows() and _insertID(), ListTables(), ListDatabases(), ListColumns().
+- Need to add New_ID() and hasInsertID and hasAffectedRows, autoCommit
+
+## 0.20 - 12 Sept 2000
+
+- Added support for Microsoft's ADO.
+- Added new field to ADORecordSet -- canSeek
+- Added new parameter to _fetch($ignore_fields = false). Setting to true will not update fields array for faster performance.
+- Added new field to ADORecordSet/ADOConnection -- dataProvider to indicate whether a class is derived from odbc or ado.
+- Changed class ODBCFieldObject to ADOFieldObject -- not documented currently.
+- Added benchmark.php and testdatabases.inc.php to the test suite.
+- Added to ADORecordSet FastForward( ) for future high speed scrolling. Not documented.
+- Realised that ADO's Move( ) uses relative positioning. ADOdb uses absolute.
+
+## 0.10 - 9 Sept 2000
+
+- First release
diff --git a/adodb/docs/changelog_v3.x.md b/adodb/docs/changelog_v3.x.md
new file mode 100644
index 0000000..500c866
--- /dev/null
+++ b/adodb/docs/changelog_v3.x.md
@@ -0,0 +1,242 @@
+# ADOdb old Changelog - v3.x
+
+See the [Current Changelog](changelog.md).
+Older changelogs:
+[v2.x](changelog_v2.x.md).
+
+
+## 3.94 - 11 Oct 2003
+
+- Create trigger in datadict-oci8.inc.php did not work, because all cr/lf's must be removed.
+- ErrorMsg()/ErrorNo() did not work for many databases when logging enabled. Fixed.
+- Removed global variable $ADODB_LOGSQL as it does not work properly with multiple connections.
+- Added SQLDate support for sybase. Thx to Chris Phillipson
+- Postgresql checking of pgsql resultset resource was incorrect. Fix by Bharat Mediratta bharat#menalto.com. Same patch applied to _insertid and _affectedrows for adodb-postgres64.inc.php.
+- Added support for NConnect for postgresql.
+- Added Sybase data dict support. Thx to Chris Phillipson
+- Extensive improvements in $perf->UI(), eg. Explain now opens in new window, we show scripts which call sql, etc.
+- Perf Monitor UI works with magic quotes enabled.
+- rsPrefix was declared twice. Removed.
+- Oci8 stored procedure support, eg. "begin func(); end;" was incorrect in _query. Fixed.
+- Tiraboschi Massimiliano contributed italian language file.
+- Fernando Ortiz, fortiz#lacorona.com.mx, contributed informix performance monitor.
+- Added _varchar (varchar arrays) support for postgresql. Reported by PREVOT Stéphane.
+
+
+## 3.92 - 22 Sept 2003
+
+- Added GetAssoc and CacheGetAssoc to connection object.
+- Removed TextMax and CharMax functions from adodb.inc.php.
+- HasFailedTrans() returned false when trans failed. Fixed.
+- Moved perf driver classes into adodb/perf/*.php.
+- Misc improvements to performance monitoring, including UI().
+- RETVAL in mssql Parameter(), we do not append @ now.
+- Added Param($name) to connection class, returns '?' or ":$name", for defining bind parameters portably.
+- LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8 _stmt and _affectedrows() bugs.
+- Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also added new $conn->datetime field to oci8, controls whether MetaType() returns 'D' ($this->datetime==false) or 'T' ($this->datetime == true) for DATE type.
+- Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php.
+- Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL().
+- Tuned include_once handling to reduce file-system checking overhead.
+
+## 3.91 - 9 Sept 2003
+
+- Only released to InterAkt
+- Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory for driver instantiation.
+- Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com
+- Added portable substr support.
+- Now rs2html() has new parameter, $echo. Set to false to return $html instead of echoing it.
+
+## 3.90 - 5 Sept 2003
+
+- First beta of performance monitoring released.
+- MySQL supports MetaTable() masking.
+- Fixed key_exists() bug in adodb-lib.inc.php
+- Added sp_executesql Prepare() support to mssql.
+- Added bind support to db2.
+- Added swedish language file - Christian Tiberg" christian#commsoft.nu
+- Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich.
+- Left join setting for oci8 was wrong. Thx to johnwilk#juno.com
+
+## 3.80 - 27 Aug 2003
+
+- Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility.
+- Added matching mask for MetaTables. Only for oci8, mssql and postgres currently.
+- Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano.
+- Added better debugging for Smart Transactions.
+- Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP.
+- ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define it after including adodb.inc.php.
+- Added 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.
+- Added more debugging output to CacheFlush().
+
+## 3.72 - 9 Aug 2003
+
+- Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes and does the right thing...
+- Fixed CacheFlush() bug - Thx to martin#gmx.de
+- Walt Boring contributed MetaForeignKeys for postgres7.
+- _fetch() called _BlobDecode() wrongly in interbase. Fixed.
+- adodb_time bug fixed with dates after 2038 fixed by Jason Pell. PHPLens Issue No: 6980
+
+## 3.71 - 4 Aug 2003
+
+- The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner == false.
+- Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
+- Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com.
+- Error handling in oci8 bugfix - if there was an error in Execute(), then when calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but the 2nd call would return no error.
+- Error handling in odbc bugfix. ODBC would always return the last error, even if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 0 every time before CacheExecute() and Execute().
+
+## 3.70 - 29 July 2003
+
+- Added new SQLite driver. Tested on PHP 4.3 and PHP 5.
+- Added limited "sapdb" driver support - mainly date support.
+- The oci8 driver did not identify NUMBER with no defined precision correctly.
+- Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls in GetInsertSQL/GetUpdateSQL.
+- DBDate() and DBTimeStamp() format for postgresql had problems. Fixed.
+- Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit.
+- Added charset support to postgresql. Thx to Julian Tarkhanov.
+- Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS)
+- Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn.
+- adodb-cryptsession.php includes wrong. Fixed.
+- Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8.
+- Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring.
+- adodb_getcount() did not init qryRecs to 0\. Missing "WHERE" clause checking in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn.
+- Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring.
+- Upgraded to adodb-xmlschema.inc.php 0.0.2.
+- NConnect for mysql now returns value. Thx to Dennis Verspuij.
+- ADODB_FETCH_BOTH support added to interbase/firebird.
+- Czech language file contributed by Kamil Jakubovic jake#host.sk.
+- PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec.
+- Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it
+- ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed.
+
+## 3.60 - 16 June 2003
+
+- We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with mssql driver.
+- The property $emptyDate missing from connection class. Also changed 1903 to constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn.
+- ADOdb speedup optimization - we now return all arrays by reference.
+- Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. Suggested by vincent.
+- Added GetArray() to connection class.
+- Added not_null check in informix metacolumns().
+- Connection parameters for postgresql did not work correctly when port was defined.
+- DB2 is now a tested driver, making adodb 100% compatible. Extensive changes to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() fixes.
+- The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed.
+- Some bugs in adodb_backtrace() fixed.
+- Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql properly.
+- MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions to odbc MetaColumns() for vfp and db2 compat.
+- Added unsigned support to mysql datadict class. Thx to iamsure.
+- Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to Josh R, Night_Wulfe#hotmail.com.
+- ChangeTableSQL contributed by Florian Buzin.
+- The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with mssql driver.
+
+## 3.50 - 19 May 2003
+
+- Fixed mssql compat with FreeTDS. FreeTDS does not implement mssql_fetch_assoc().
+- Merged back connection and recordset code into adodb.inc.php.
+- ADOdb sessions using oracle clobs contributed by achim.gosse#ddd.de. See adodb-session-clob.php.
+- Added /s modifier to preg_match everywhere, which ensures that regex does not stop at /n. Thx Pao-Hsi Huang.
+- Fixed error in metacolumns() for mssql.
+- Added time format support for SQLDate.
+- Image => B added to metatype.
+- MetaType now checks empty($this->blobSize) instead of empty($this).
+- Datadict has beta support for informix, sybase (mapped to mssql), db2 and generic (which is a fudge).
+- BlobEncode for postgresql uses pg_escape_bytea, if available. Needed for compat with 7.3.
+- Added $ADODB_LANG, to support multiple languages in MetaErrorMsg().
+- Datadict can now parse table definition as declarative text.
+- For DataDict, oci8 autoincrement trigger missing semi-colon. Fixed.
+- For DataDict, when REPLACE flag enabled, drop sequence in datadict for autoincrement field in postgres and oci8.s
+- Postgresql defaults to template1 database if no database defined in connect/pconnect.
+- We now clear _resultid in postgresql if query fails.
+
+## 3.40 - 19 May 2003
+
+- Added insert_id for odbc_mssql.
+- Modified postgresql UpdateBlobFile() because it did not work in safe mode.
+- Now connection object is passed to raiseErrorFn as last parameter. Needed by StartTrans().
+- Added StartTrans() and CompleteTrans(). It is recommended that you do not modify transOff, but use the above functions.
+- oci8po now obeys ADODB_ASSOC_CASE settings.
+- Added virtualized error codes, using PEAR DB equivalents. Requires you to manually include adodb-error.inc.php yourself, with MetaError() and MetaErrorMsg($errno).
+- GetRowAssoc for mysql and pgsql were flawed. Fix by Ross Smith.
+- Added to datadict types I1, I2, I4 and I8\. Changed datadict type 'T' to map to timestamp instead of datetime for postgresql.
+- Error handling in ExecuteSQLArray(), adodb-datadict.inc.php did not work.
+- We now auto-quote postgresql connection parameters when building connection string.
+- Added session expiry notification.
+- We now test with odbc mysql - made some changes to odbc recordset constructor.
+- MetaColumns now special cases access and other databases for odbc.
+
+## 3.31 - 17 March 2003
+
+- Added row checking for _fetch in postgres.
+- Added Interval type to MetaType for postgres.
+- Remapped postgres driver to call postgres7 driver internally.
+- Adorecordset_array::getarray() did not return array when nRows >= 0.
+- Postgresql: at times, no error message returned by pg_result_error() but error message returned in pg_last_error(). Recoded again.
+- Interbase blob's now use chunking for updateblob.
+- Move() did not set EOF correctly. Reported by Jorma T.
+- We properly support mysql timestamp fields when we are creating mysql tables using the data-dict interface.
+- Table regex includes backticks character now.
+
+## 3.30 - 3 March 2003
+
+- Added $ADODB_EXTENSION and $ADODB_COMPAT_FETCH constant.
+- Made blank1stItem configurable using syntax "value:text" in GetMenu/GetMenu2. Thx to Gabriel Birke.
+- Previously ADOdb differed from the Microsoft standard because it did not define what to set $this->fields when EOF was reached. Now at EOF, ADOdb sets $this->fields to false for all databases, which is consist with Microsoft's implementation. Postgresql and mysql have always worked this way (in 3.11 and earlier). If you are experiencing compatibility problems (and you are not using postgresql nor mysql) on upgrading to 3.30, try setting the global variables $ADODB_COUNTRECS = true (which is the default) and $ADODB_FETCH_COMPAT = true (this is a new global variable).
+- We now check both pg_result_error and pg_last_error as sometimes pg_result_error does not display anything. Iman Mayes
+- We no longer check for magic quotes gpc in Quote().
+- Misc fixes for table creation in adodb-datadict.inc.php. Thx to iamsure.
+- Time calculations use adodb_time library for all negative timestamps due to problems in Red Hat 7.3 or later. Formerly, only did this for Windows.
+- In mssqlpo, we now check if $sql in _query is a string before we change || to +. This is to support prepared stmts.
+- Move() and MoveLast() internals changed to support to support EOF and $this->fields change.
+- Added ADODB_FETCH_BOTH support to mssql. Thx to Angel Fradejas afradejas#mediafusion.es
+- We now check if link resource exists before we run mysql_escape_string in qstr().
+- Before we flock in csv code, we check that it is not a http url.
+
+## 3.20 - 17 Feb 2003
+
+- Added new Data Dictionary classes for creating tables and indexes. Warning - this is very much alpha quality code. The API can still change. See adodb/tests/test-datadict.php for more info.
+- We now ignore $ADODB_COUNTRECS for mysql, because PHP truncates incomplete recordsets when mysql_unbuffered_query() is called a second time.
+- Now postgresql works correctly when $ADODB_COUNTRECS = false.
+- Changed _adodb_getcount to properly support SELECT DISTINCT.
+- Discovered that $ADODB_COUNTRECS=true has some problems with prepared queries - suspect PHP bug.
+- Now GetOne and GetRow run in $ADODB_COUNTRECS=false mode for better performance.
+- Added support for mysql_real_escape_string() and pg_escape_string() in qstr().
+- Added an intermediate variable for mysql _fetch() and MoveNext() to store fields, to prevent overwriting field array with boolean when mysql_fetch_array() returns false.
+- Made arrays for getinsertsql and getupdatesql case-insensitive. Suggested by Tim Uckun" tim#diligence.com
+
+## 3.11 - 11 Feb 2003
+
+- Added check for ADODB_NEVER_PERSIST constant in PConnect(). If defined, then PConnect() will actually call non-persistent Connect().
+- Modified interbase to properly work with Prepare().
+- Added $this->ibase_timefmt to allow you to change the date and time format.
+- Added support for $input_array parameter in CacheFlush().
+- Added experimental support for dbx, which was then removed when i found that it was slower than using native calls.
+- Added MetaPrimaryKeys for mssql and ibase/firebird.
+- Added new $trim parameter to GetCol and CacheGetCol
+- Uses updated adodb-time.inc.php 0.06.
+
+## 3.10 - 27 Jan 2003
+
+- Added adodb_date(), adodb_getdate(), adodb_mktime() and adodb-time.inc.php.
+- For interbase, added code to handle unlimited number of bind parameters. From Daniel Hasan daniel#hasan.cl.
+- Added BlobDecode and UpdateBlob for informix. Thx to Fernando Ortiz.
+- Added constant ADODB_WINDOWS. If defined, means that running on Windows.
+- Added constant ADODB_PHPVER which stores php version as a hex num. Removed $ADODB_PHPVER variable.
+- Felho Bacsi reported a minor white-space regular expression problem in GetInsertSQL.
+- Modified ADO to use variant to store _affectedRows
+- Changed ibase to use base class Replace(). Modified base class Replace() to support ibase.
+- Changed odbc to auto-detect when 0 records returned is wrong due to bad odbc drivers.
+- Changed mssql to use datetimeconvert ini setting only when 4.30 or later (does not work in 4.23).
+- ExecuteCursor($stmt, $cursorname, $params) now accepts a new $params array of additional bind parameters -- William Lovaton walovaton#yahoo.com.mx.
+- Added support for sybase_unbuffered_query if ADODB_COUNTRECS == false. Thx to chuck may.
+- Fixed FetchNextObj() bug. Thx to Jorma Tuomainen.
+- We now use SCOPE_IDENTITY() instead of @@IDENTITY for mssql - thx to marchesini#eside.it
+- Changed postgresql movenext logic to prevent illegal row number from being passed to pg_fetch_array().
+- Postgresql initrs bug found by "Bogdan RIPA" bripa#interakt.ro $f1 accidentally named $f
+
+## 3.00 - 6 Jan 2003
+
+- Fixed adodb-pear.inc.php syntax error.
+- Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages that accept it.
+- Fixed _adodb_getcount() caching error.
+- Added sql to retrieve table and column info for odbc_mssql.
diff --git a/adodb/docs/changelog_v4+5.md b/adodb/docs/changelog_v4+5.md
new file mode 100644
index 0000000..c102ac6
--- /dev/null
+++ b/adodb/docs/changelog_v4+5.md
@@ -0,0 +1,109 @@
+## 4.990/5.05 - 11 Jul 2008
+
+- 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.
+- Changed oci8 lob handler to use & reference $this->_refLOBs[$numlob]['VAR'] = &$var.
+- We now strtolower the get_class() function in PEAR::isError() for php5 compat.
+- CacheExecute did not retrieve cache recordsets properly for 5.04 (worked in 4.98). Fixed.
+- New ADODB_Cache_File class for file caching defined in adodb.inc.php.
+- Farsi language file contribution by Peyman Hooshmandi Raad (phooshmand#gmail.com)
+- New API for creating your custom caching class which is stored in $ADODB_CACHE:
+  ```
+include "/path/to/adodb.inc.php";
+$ADODB_CACHE_CLASS = 'MyCacheClass';
+
+class MyCacheClass extends ADODB_Cache_File
+{
+	function writecache($filename, $contents,$debug=false){...}
+	function &readcache($filename, &$err, $secs2cache, $rsClass){ ...}
+		:
+}
+
+$DB = NewADOConnection($driver);
+$DB->Connect(...);  ## MyCacheClass created here and stored in $ADODB_CACHE global variable.
+
+$data = $rs->CacheGetOne($sql); ## MyCacheClass is used here for caching...
+  ```
+- Memcache supports multiple pooled hosts now. Only if none of the pooled servers can be contacted will a connect error be generated. Usage example below:
+  ```
+$db = NewADOConnection($driver);
+$db->memCache = true; /// should we use memCache instead of caching in files
+$db->memCacheHost = array($ip1, $ip2, $ip3); /// $db->memCacheHost = $ip1; still works
+$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);
+  ```
+
+## 4.98/5.04 - 13 Feb 2008
+
+- Fixed adodb_mktime problem which causes a performance bottleneck in $hrs.
+- Added mysqli support to adodb_getcount().
+- Removed MYSQLI_TYPE_CHAR from MetaType().
+
+## 4.97/5.03 - 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. 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.
+- Also adodb_backtrace() now traces 1 level deeper as sometimes actual culprit function is not displayed.
+- Fixed a group by problem with adodb_getcount() for db's which are not postgres/oci8 based.
+- 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.
+
+## 4.96/5.02 - 24 Sept 2007
+
+ADOdb perf for oci8 now has non-table-locking code when clearing the sql. Slower but better transparency. Added in 4.96a and 5.02a.
+Fix adodb count optimisation. Preg_match did not work properly. Also rewrote the ORDER BY stripping code in _adodb_getcount(), adodb-lib.inc.php.
+SelectLimit for oci8 not optimal for large recordsets when offset=0. Changed $nrows check.
+Active record optimizations. Added support for assoc arrays in Set().
+Now GetOne returns null if EOF (no records found), and false if error occurs. Use ErrorMsg()/ErrorNo() to get the error.
+Also CacheGetRow and CacheGetCol will return false if error occurs, or empty array() if EOF, just like GetRow and GetCol.
+Datadict now allows changing of types which are not resizable, eg. VARCHAR to TEXT in ChangeTableSQL. -- Mateo Tibaquirá
+Added BIT data type support to adodb-ado.inc.php and adodb-ado5.inc.php.
+Ldap driver did not return actual ldap error messages. Fixed.
+Implemented GetRandRow($sql, $inputarr). Optimized for Oci8.
+Changed adodb5 active record to use static SetDatabaseAdapter() and removed php4 constructor. Bas van Beek bas.vanbeek#gmail.com.
+Also in adodb5, changed adodb-session2 to use static function declarations in class. Thx Daniel Berlin.
+Added "Clear SQL Log" to bottom of Performance screen.
+Sessions2 code echo'ed directly to the screen in debug mode. Now uses ADOConnection::outp().
+In mysql/mysqli, qstr(null) will return the string "null" instead of empty quoted string "''".
+postgresql optimizeTable in perf-postgres.inc.php added by Daniel Berlin (mail#daniel-berlin.de)
+Added 5.2.1 compat code for oci8.
+Changed @@identity to SCOPE_IDENTITY() for multiple mssql drivers. Thx Stefano Nari.
+Code sanitization introduced in 4.95 caused problems in European locales (as float 3.2 was typecast to 3,2). Now we only sanitize if is_numeric fails.
+Added support for customizing ADORecordset_empty using $this->rsPrefix.'empty'. By Josh Truwin.
+Added proper support for ALterColumnSQL for Postgresql in datadict code. Thx. Josh Truwin.
+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.
+
+## 4.95/5.01 - 17 May 2007
+
+CacheFlush debug outp() passed in invalid parameters. Fixed.
+Added Thai language file for adodb. Thx Trirat Petchsingh rosskouk#gmail.com
+and Marcos Pont
+Added zerofill checking support to MetaColumns for mysql and mysqli.
+CacheFlush no longer deletes all files/directories. Only *.cache files
+deleted.
+DB2 timestamp format changed to var $fmtTimeStamp =
+"'Y-m-d-H:i:s'";
+Added some code sanitization to AutoExecute in adodb-lib.inc.php.
+Due to typo, all connections in adodb-oracle.inc.php would become
+persistent, even non-persistent ones. Fixed.
+Oci8 DBTimeStamp uses 24 hour time for input now, so you can perform string
+comparisons between 2 DBTimeStamp values.
+Some PHP4.4 compat issues fixed in adodb-session2.inc.php
+For ADOdb 5.01, fixed some adodb-datadict.inc.php MetaType compat issues
+with PHP5.
+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.
diff --git a/adodb/docs/changelog_v4.x.md b/adodb/docs/changelog_v4.x.md
new file mode 100644
index 0000000..8b06444
--- /dev/null
+++ b/adodb/docs/changelog_v4.x.md
@@ -0,0 +1,717 @@
+# ADOdb old Changelog - v4.x
+
+See the [Current Changelog](changelog.md).
+Older changelogs:
+[v3.x](changelog_v3.x.md),
+[v2.x](changelog_v2.x.md).
+
+
+## 4.990 - 11 Jul 2008
+
+- 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.
+- Changed oci8 lob handler to use & reference $this->_refLOBs[$numlob]['VAR'] = &$var.
+- We now strtolower the get_class() function in PEAR::isError() for php5 compat.
+- CacheExecute did not retrieve cache recordsets properly for 5.04 (worked in 4.98). Fixed.
+- New ADODB_Cache_File class for file caching defined in adodb.inc.php.
+- Farsi language file contribution by Peyman Hooshmandi Raad (phooshmand#gmail.com)
+- New API for creating your custom caching class which is stored in $ADODB_CACHE:
+    ```
+    include "/path/to/adodb.inc.php";
+    $ADODB_CACHE_CLASS = 'MyCacheClass';
+    
+    class MyCacheClass extends ADODB_Cache_File
+    {
+        function writecache($filename, $contents,$debug=false){...}
+        function &readcache($filename, &$err, $secs2cache, $rsClass){ ...}
+            :
+    }
+    
+    $DB = NewADOConnection($driver);
+    $DB->Connect(...);  ## MyCacheClass created here and stored in $ADODB_CACHE global variable.
+    
+    $data = $rs->CacheGetOne($sql); ## MyCacheClass is used here for caching...
+    ```
+- Memcache supports multiple pooled hosts now. Only if none of the pooled servers can be contacted will a connect error be generated. Usage example below:
+    ```
+    $db = NewADOConnection($driver);
+    $db->memCache = true; /// should we use memCache instead of caching in files
+    $db->memCacheHost = array($ip1, $ip2, $ip3); /// $db->memCacheHost = $ip1; still works
+    $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);
+    ```
+
+## 4.98 - 13 Feb 2008
+
+- Fixed adodb_mktime problem which causes a performance bottleneck in $hrs.
+- Added mysqli support to adodb_getcount().
+- Removed MYSQLI_TYPE_CHAR from MetaType().
+
+## 4.97 - 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. 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.
+- Also adodb_backtrace() now traces 1 level deeper as sometimes actual culprit function is not displayed.
+- Fixed a group by problem with adodb_getcount() for db's which are not postgres/oci8 based.
+- 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.
+
+## 4.96 - 24 Sept 2007
+
+- ADOdb perf for oci8 now has non-table-locking code when clearing the sql. Slower but better transparency. Added in 4.96a and 5.02a.
+- Fix adodb count optimisation. Preg_match did not work properly. Also rewrote the ORDER BY stripping code in _adodb_getcount(), adodb-lib.inc.php.
+- SelectLimit for oci8 not optimal for large recordsets when offset=0. Changed $nrows check.
+- Active record optimizations. Added support for assoc arrays in Set().
+- Now GetOne returns null if EOF (no records found), and false if error occurs. Use ErrorMsg()/ErrorNo() to get the error.
+- Also CacheGetRow and CacheGetCol will return false if error occurs, or empty array() if EOF, just like GetRow and GetCol.
+- Datadict now allows changing of types which are not resizable, eg. VARCHAR to TEXT in ChangeTableSQL. -- Mateo Tibaquirá
+- Added BIT data type support to adodb-ado.inc.php and adodb-ado5.inc.php.
+- Ldap driver did not return actual ldap error messages. Fixed.
+- Implemented GetRandRow($sql, $inputarr). Optimized for Oci8.
+- Changed adodb5 active record to use static SetDatabaseAdapter() and removed php4 constructor. Bas van Beek bas.vanbeek#gmail.com.
+- Also in adodb5, changed adodb-session2 to use static function declarations in class. Thx Daniel Berlin.
+- Added "Clear SQL Log" to bottom of Performance screen.
+- Sessions2 code echo'ed directly to the screen in debug mode. Now uses ADOConnection::outp().
+- In mysql/mysqli, qstr(null) will return the string "null" instead of empty quoted string "''".
+- postgresql optimizeTable in perf-postgres.inc.php added by Daniel Berlin (mail#daniel-berlin.de)
+- Added 5.2.1 compat code for oci8.
+- Changed @@identity to SCOPE_IDENTITY() for multiple mssql drivers. Thx Stefano Nari.
+- Code sanitization introduced in 4.95 caused problems in European locales (as float 3.2 was typecast to 3,2). Now we only sanitize if is_numeric fails.
+- Added support for customizing ADORecordset_empty using $this->rsPrefix.'empty'. By Josh Truwin.
+- Added proper support for ALterColumnSQL for Postgresql in datadict code. Thx. Josh Truwin.
+- 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.
+
+## 4.95 - 17 May 2007
+
+- CacheFlush debug outp() passed in invalid parameters. Fixed.
+- Added Thai language file for adodb. Thx Trirat Petchsingh rosskouk#gmail.com and Marcos Pont
+- Added zerofill checking support to MetaColumns for mysql and mysqli.
+- CacheFlush no longer deletes all files directories. Only `*.cache` files deleted.
+- DB2 timestamp format changed to var $fmtTimeStamp = 'Y-m-d-H:i:s';
+- Added some code sanitization to AutoExecute in adodb-lib.inc.php.
+- Due to typo, all connections in adodb-oracle.inc.php would become persistent, even non-persistent ones. Fixed.
+- Oci8 DBTimeStamp uses 24 hour time for input now, so you can perform string comparisons between 2 DBTimeStamp values.
+- Some PHP4.4 compat issues fixed in adodb-session2.inc.php
+- For ADOdb 5.01, fixed some adodb-datadict.inc.php MetaType compat issues with PHP5.
+- 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.
+
+## 4.94 - 23 Jan 2007
+
+- 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. 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 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 multiple indexes, including a compound index idx_ev1.
+
+        ```
+        event_id I(11) NOTNULL AUTOINCREMENT PRIMARY,
+        event_type I(4) NOTNULL
+        event_start_date T DEFAULT NULL **INDEX id_esd**,
+        event_end_date T DEFAULT '0000-00-00 00:00:00' **INDEX id_eted**,
+        event_parent I(11) UNSIGNED NOTNULL DEFAULT 0 **INDEX id_evp**,
+        event_owner I(11) DEFAULT 0 **INDEX idx_ev1**,
+        event_project I(11) DEFAULT 0 **INDEX idx_ev1**,
+        event_times_recuring I(11) UNSIGNED NOTNULL DEFAULT 0,
+        event_icon C(20) DEFAULT 'obj/event',
+        event_description X
+        ```
+
+  - Prevents the generated SQL from including double drop-sequence statements for REPLACE case of tables with autoincrement columns (on those dbs that emulate it via sequences)
+  - 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 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().
+- Transpose now adds the field names as the first column after transposition.
+- Added === check in ADODB_SetDatabaseAdapter for $db, adodb-active-record.inc.php. Thx Christian Affolter.
+- Added ErrorNo() to adodb-active-record.inc.php. Thx ante#novisplet.com.
+
+## 4.93 - 10 Oct 2006
+
+- 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 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 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
+
+- Syntax error in postgres7 driver. Thx Eloy Lafuente Plaza.
+- Minor bug fixes - adodb informix 10 types added to adodb.inc.php. Thx Fernando Ortiz.
+
+## 4.92 - 29 Aug 2006
+
+- Better odbtp date support.
+- 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: 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:
+    ```
+    $db = NewADOConnection($driver);
+    $db->memCache = true; /// should we use memCache instead of caching in files
+    $db->memCacheHost = "126.0.1.1"; /// memCache host
+    $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);
+    ```
+
+- Implemented Transpose() for recordsets. Recordset must be retrieved using ADODB_FETCH_NUM. First column becomes the column name.
+    ```
+    $db = NewADOConnection('mysql');
+    $db->Connect(...);
+    $db->SetFetchMode(ADODB_FETCH_NUM);
+    $rs = $db->Execute('select productname,productid,unitprice from products limit 10');
+    $rs2 = $db->Transpose($rs);
+    rs2html($rs2);
+    ```
+
+## 4.91 - 2 Aug 2006
+
+- Major session code rewrite... See session docs.
+- PDO bindinputarray() was not set properly for MySQL (changed from true to false).
+- Changed CacheSelectLimit() to re-cache when $secs2cache==0. This is one way to flush the cache when SelectLimit is called.
+- 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 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 PHPLens Issue No: 15531
+- DB2 will now return db2_conn_errormsg() when it is a connection error.
+
+## 4.90 - 8 June 2006
+
+- Changed adodb_countrec() in adodb-lib.inc.php to allow LIMIT to be used as a speedup to reduce no of records counted.
+- Added support for transaction modes for postgres and oci8 with SetTransactionMode(). These transaction modes affect all subsequent transactions of that connection.
+- Thanks to Halmai Csongor for suggestion.
+- Removed `$off = $fieldOffset - 1` line in db2 driver, FetchField(). Tx Larry Menard.
+- Added support for PHP5 objects as Execute() bind parameters using `__toString` (eg. Simple-XML). Thx Carl-Christian Salvesen.
+- Rounding in tohtml.inc.php did not work properly. Fixed.
+- MetaIndexes in postgres fails when fields are deleted then added in again because the attnum has gaps in it. See https://sourceforge.net/p/adodb/bugs/45/. Fixed.
+- MetaForeignkeys in mysql and mysqli did not work when fetchMode==ADODB_FETCH_ASSOC used. Fixed.
+- Reference error in AutoExecute() fixed.
+- Added macaddr postgres type to MetaType. Maps to 'C'.
+- Added to `_connect()` in adodb-ado5.inc.php support for $database and $dataProvider parameters. Thx Larry Menard.
+- Added support for sequences in adodb-ado_mssql.inc.php. Thx Larry Menard.
+- Added ADODB_SESSION_READONLY.
+- Added session expiryref support to crc32 mode, and in LOB code.
+- Clear `_errorMsg` in postgres7 driver, so that ErrorMsg() displays properly when no error occurs.
+- Added BindDate and BindTimeStamp
+
+## 4.81 - 3 May 2006
+
+- 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 PHPLens Issue No: 14997
+
+## 4.80 - 8 Mar 2006
+
+- Added activerecord support.
+- Added mysql `$conn->compat323 = true` if you want MySQL 3.23 compat enabled. Fixes GetOne() Select-Limit problems.
+- Added adodb-xmlschema03.inc.php to support XML Schema version 3 and updated adodb-datadict.htm docs.
+- Better memory management in Execute. Thx Mike Fedyk.
+
+## 4.72 - 21 Feb 2006
+
+- Added 'new' DSN parameter for NConnect().
+- Pager now sanitizes $PHP_SELF to protect against XSS. Thx to James Bercegay and others.
+- ADOConnection::MetaType changed to setup $rs->connection correctly.
+- New native DB2 driver contributed by Larry Menard, Dan Scott, Andy Staudacher, Bharat Mediratta.
+- The mssql CreateSequence() did not BEGIN TRANSACTION correctly. Fixed. Thx Sean Lee.
+- The _adodb_countrecs() function in adodb-lib.inc.php has been revised to handle more ORDER BY variations.
+
+## 4.71 - 24 Jan 2006
+
+- Fixes postgresql security issue related to binary strings. Thx to Andy Staudacher.
+- Several DSN bugs found:
+  1. Fix bugs in DSN connections introduced in 4.70 when underscores are found in the DSN.
+  2. DSN with _ did not work properly in PHP5 (fine in PHP4). Fixed.
+  3. Added support for PDO DSN connections in NewADOConnection(), and database parameter in PDO::Connect().
+- The oci8 datetime flag not correctly implemented in ADORecordSet_array. Fixed.
+- Added BlobDelete() to postgres, as a counterpoint to UpdateBlobFile().
+- 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 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 PHPLens Issue No: 14160
+- Fixed invalid variable reference problem in undomq(), adodb-perf.inc.php.
+- 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().
+
+## 4.68 - 25 Nov 2005
+
+- PHP 5 compat for mysqli. MetaForeignKeys repeated twice and MYSQLI_BINARY_FLAG missing.
+- PHP 5.1 support for postgresql bind parameters using ? did not work if >= 10 parameters. Fixed. Thx to Stanislav Shramko.
+- Lots of PDO improvements.
+- Spelling error fixed in mysql MetaForeignKeys, $associative parameter.
+
+## 4.67 - 16 Nov 2005
+
+- Postgresql not_null flag not set to false correctly. Thx Cristian MARIN.
+- We now check in Replace() if key is in fieldArray. Thx SĂ©bastien Vanvelthem.
+- `_file_get_contents()` function was missing in xmlschema. fixed.
+- Added week in year support to SQLDate(), using 'W' flag. Thx Spider.
+- In sqlite metacolumns was repeated twice, causing PHP 5 problems. Fixed.
+- Made debug output XHTML compliant.
+
+## 4.66 - 28 Sept 2005
+
+- ExecuteCursor() in oci8 did not clean up properly on failure. Fixed.
+- Updated xmlschema.dtd, by "Alec Smecher" asmecher#smecher.bc.ca
+- Hardened SelectLimit, typecasting nrows and offset to integer.
+- Fixed misc bugs in AutoExecute() and GetInsertSQL().
+- Added $conn->database as the property holding the database name. The older $conn->databaseName is retained for backward compat.
+- Changed _adodb_backtrace() compat check to use function_exists().
+- Bug in postgresql MetaIndexes fixed. Thx Kevin Jamieson.
+- Improved OffsetDate for MySQL, reducing rounding error.
+- Metacolumns added to sqlite. Thx Mark Newnham.
+- PHP 4.4 compat fixes for GetAssoc().
+- Added postgresql bind support for php 5.1. Thx Cristiano da Cunha Duarte
+- OffsetDate() fixes for postgresql, typecasting strings to date or timestamp.
+- DBTimeStamp formats for mssql, odbc_mssql and postgresql made to conform with other db's.
+- Changed PDO constants from PDO_ to PDO:: to support latest spec.
+
+## 4.65 - 22 July 2005
+
+- Reverted 'X' in mssql datadict to 'TEXT' to be compat with mssql driver. However now you can set $datadict->typeX = 'varchar(4000)' or 'TEXT' or 'CLOB' for mssql and oci8 drivers.
+- Added charset support when using DSN for Oracle.
+- _adodb_getmenu did not use fieldcount() to get number of fields. Fixed.
+- MetaForeignKeys() for mysql/mysqli contributed by Juan Carlos Gonzalez.
+- MetaDatabases() now correctly returns an array for mysqli driver. Thx Cristian MARIN.
+- CompleteTrans(false) did not return false. Fixed. Thx to JMF.
+- AutoExecute() did not work with Oracle. Fixed. Thx José Moreira.
+- MetaType() added to connection object.
+- More PHP 4.4 reference return fixes. Thx Ryan C Bonham and others.
+
+## 4.64 - 20 June 2005
+
+- In datadict, if the default field value is set to '', then it is not applied when the field is created. Fixed by Eugenio.
+- MetaPrimaryKeys for postgres did not work because of true/false change in 4.63. Fixed.
+- Tested ocifetchstatement in oci8. Rejected at the end.
+- Added port to dsn handling. Supported in postgres, mysql, mysqli,ldap.
+- Added 'w' and 'l' to mysqli SQLDate().
+- Fixed error handling in ldap _connect() to be more consistent. Also added ErrorMsg() handling to ldap.
+- Added support for union in _adodb_getcount, adodb-lib.inc.php for postgres and oci8.
+- rs2html() did not work with null dates properly.
+- PHP 4.4 reference return fixes.
+
+## 4.63 - 18 May 2005
+
+- Added $nrows<0 check to mysqli's SelectLimit().
+- Added OptimizeTable() and OptimizeTables() in adodb-perf.inc.php. By Markus Staab.
+- PostgreSQL inconsistencies fixed. true and false set to TRUE and FALSE, and boolean type in datadict-postgres.inc.php set to 'L' => 'BOOLEAN'. Thx Kevin Jamieson.
+- New adodb_session_create_table() function in adodb-session.inc.php. By Markus Staab.
+- Added null check to UserTimeStamp().
+- Fixed typo in mysqlt driver in adorecordset. Thx to Andy Staudacher.
+- GenID() had a bug in the raiseErrorFn handling. Fixed. Thx Marcos Pont.
+- Datadict name quoting now handles ( ) in index fields correctly - they aren't part of the index field.
+- Performance monitoring:
+    1. oci8 Ixora checks moved down;
+    2. expensive sql changed so that only those sql with count(*)>1 are shown;
+    3. changed sql1 field to a length+crc32 checksum - this breaks backward compat.
+- We remap firebird15 to firebird in data dictionary.
+
+## 4.62 - 2 Apr 2005
+
+- Added 'w' (dow as 0-6 or 1-7) and 'l' (dow as string) for SQLDate for oci8, postgres and mysql.
+- Rolled back MetaType() changes for mysqli done in prev version.
+- Datadict change by chris, cblin#tennaxia.com data mappings from:
+    ```
+    oci8:  X->varchar(4000) XL->CLOB
+    mssql: X->XL->TEXT
+    mysql: X->XL->LONGTEXT
+    fbird: X->XL->varchar(4000)
+    ```
+  to:
+    ```
+    oci8:  X->varchar(4000) XL->CLOB
+    mssql: X->VARCHAR(4000) XL->TEXT
+    mysql: X->TEXT          XL->LONGTEXT
+    fbird: X->VARCHAR(4000) XL->VARCHAR(32000)
+    ```
+- Added $connection->disableBlobs to postgresql to improve performance when no bytea is used (2-5% improvement).
+- Removed all HTTP_* vars.
+- Added $rs->tableName to be set before calling AutoExecute().
+- Alex Rootoff rootoff#pisem.net contributed ukrainian language file.
+- Added new mysql_option() support using $conn->optionFlags array.
+- Added support for ldap_set_option() using the $LDAP_CONNECT_OPTIONS global variable. Contributed by Josh Eldridge.
+- Added LDAP_* constant definitions to ldap.
+- Added support for boolean bind variables. We use $conn->false and $conn->true to hold values to set false/true to.
+- We now do not close the session connection in adodb-session.inc.php as other objects could be using this connection.
+- We now strip off `\0` at end of Ixora SQL strings in $perf->tohtml() for oci8.
+
+## 4.61 - 23 Feb 2005
+
+- MySQLi added support for mysqli_connect_errno() and mysqli_connect_error().
+- Massive improvements to alpha PDO driver.
+- Quote string bind parameters logged by performance monitor for easy type checking. Thx Jason Judge.
+- Added support for $role when connecting with Interbase/firebird.
+- Added support for enum recognition in MetaColumns() mysql and mysqli. Thx Amedeo Petrella.
+- The sybase_ase driver contributed by Interakt Online. Thx Cristian Marin cristic#interaktonline.com.
+- Removed not_null, has_default, and default_value from ADOFieldObject.
+- Sessions code, fixed quoting of keys when handling LOBs in session write() function.
+- Sessions code, added adodb_session_regenerate_id(), to reduce risk of session hijacking by changing session cookie dynamically. Thx Joe Li.
+- Perf monitor, polling for CPU did not work for PHP 4.3.10 and 5.0.0-5.0.3 due to PHP bugs, so we special case these versions.
+- Postgresql, UpdateBlob() added code to handle type==CLOB.
+
+## 4.60 - 24 Jan 2005
+
+- Implemented PEAR DB's autoExecute(). Simplified design because I don't like using constants when strings work fine.
+- _rs2serialize will now update $rs->sql and $rs->oldProvider.
+- Added autoExecute().
+- Added support for postgres8 driver. Currently just remapped to postgres7 driver.
+- Changed oci8 _query(), so that OCIBindByName() sets the length to -1 if element size is > 4000. This provides better support for LONGs.
+- Added SetDateLocale() support for netherlands (Nl).
+- Spelling error in pivot code ($iff should be $iif).
+- mysql insert_id() did not work with mysql 3.x. Fixed.
+- `\r\n` not converted to spaces correctly in exporting data. Fixed.
+- _nconnect() in mysqli did not return value correctly. Fixed.
+- Arne Eckmann contributed danish language file.
+- Added clone() support to FetchObject() for PHP5.
+- Removed SQL_CUR_USE_ODBC from odbc_mssql.
+
+## 4.55 - 5 Jan 2005
+
+- Found bug in Execute() with bind params for db's that do not support binding natively.
+- DropSequence() now correctly uses default parameter.
+- Now Execute() ignores locale for floats, so 1.23 is NEVER converted to 1,23.
+- SetFetchMode() not properly saved in adodb-perf, suspicious sql and expensive sql. Fixed.
+- Added INET to postgresql metatypes. Thx motzel.
+- Allow oracle hints to work when counting with _adodb_getcount in adodb-lib.inc.php. Thx Chris Wrye.
+- Changed mysql insert_id() to use SELECT LAST_INSERT_ID().
+- If alter col in datadict does not modify col type/size of actual col, then it is removed from alter col code. By Mark Newham. Not perfect as MetaType() !== ActualType().
+- Added handling of view fields in metacolumns() for postgresql. Thx Renato De Giovanni.
+- Added to informix MetaPrimaryKeys and MetaColumns fixes for null bit. Thx to Cecilio Albero.
+- Removed obsolete connection_timeout() from perf code.
+- Added support for arrayClass in adodb-csv.inc.php.
+- RSFilter now accepts methods of the form $array($obj, 'methodname'). Thx to blake#near-time.com.
+- Changed CacheFlush to `$cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/';`
+- For better cursor concurrency, added code to free ref cursors in oci8 when $rs->Close() is called. Note that CLose() is called internally by the Get* functions too.
+- Added IIF support for access when pivoting. Thx Volodia Krupach.
+- Added mssql datadict support for timestamp. Thx Alexios.
+- Informix pager fix. By Mario Ramirez.
+- ADODB_TABLE_REGEX now includes ':'. By Mario Ramirez.
+- Mark Newnham contributed MetaIndexes for oci8 and db2.
+
+## 4.54 - 5 Nov 2004
+
+- Now you can set $db->charSet = ?? before doing a Connect() in oci8.
+- Added adodbFetchMode to sqlite.
+- Perf code, added a string typecast to substr in adodb_log_sql().
+- Postgres: Changed BlobDecode() to use po_loread, added new $maxblobsize parameter, and now it returns the blob instead of sending it to stdout - make sure to mention that as a compat warning. Also added $db->IsOID($oid) function; uses a heuristic, not guaranteed to work 100%.
+- Contributed arabic language file by "El-Shamaa, Khaled" k.el-shamaa#cgiar.org
+- PHP5 exceptions did not handle @ protocol properly. Fixed.
+- Added ifnull handling for postgresql (using coalesce).
+- Added metatables() support for Postgresql 8.0 (no longer uses pg_% dictionary tables).
+- Improved Sybase ErrorMsg() function. By Gaetano Giunta.
+- Improved oci8 SelectLimit() to use Prepare(). By Cristiano Duarte.
+- Type-cast $row parameter in ifx_fetch_row() to int. Thx stefan bodgan.
+- Ralf becker contributed improvements in postgresql, sapdb, mysql data dictionary handling:
+  - MySql and Postgres MetaType was reporting every int column which was part of a primary key and unique as serial
+  - Postgres was not reporting the scale of decimal types
+  - 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 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.
+
+## 4.53 - 28 Sept 2004
+
+- FetchMode cached in recordset is sometimes mapped to native db fetchMode. Normally this does not matter, but when using cached recordsets, we need to switch back to using adodb fetchmode. So we cache this in $rs->adodbFetchMode if it differs from the db's fetchMode.
+- For informix we now set canSeek = false driver because stefan bodgan tells me that seeking doesn't work.
+- SetDateLocale() never worked till now ;-) Thx david#tomato.it
+- Set $_bindInputArray = true in sapdb driver. Required for clob support.
+- Fixed some PEAR::DB emulation issues with isError() and isWarning. Thx to Gert-Rainer Bitterlich.
+- Empty() used in getupdatesql without strlen() check. Fixed.
+- Added unsigned detection to mysql and mysqli drivers. Thx to dan cech.
+- Added hungarian language file. Thx to Halászvári Gábor.
+- Improved fieldname-type formatting of datadict SQL generated (adding $widespacing parameter to _GenField).
+- Datadict oci8 DROP CONSTRAINTS misspelt. Fixed. Thx Mark Newnham.
+- Changed odbtp to dynamically change databaseType based on connection, eg. from 'odbtp' to 'odbtp_mssql' when connecting to mssql database.
+- In datadict, MySQL I4 was wrongly mapped to MEDIUMINT, which is actually I3. Fixed.
+- Fixed mysqli MetaType() recognition. Mysqli returns numeric types unlike mysql extension. Thx Francesco Riosa.
+- VFP odbc driver curmode set wrongly, causing problems with memo fields. Fixed.
+- Odbc driver did not recognize odbc version 2 driver date types properly. Fixed. Thx Bostjan.
+- ChangeTableSQL() fixes to datadict-db2.inc.php by Mark Newnham.
+- Perf monitoring with odbc improved. Now we try in perf code to manually set the sysTimeStamp using date() if sysTimeStamp is empty.
+- All ADO errors are thrown as exceptions in PHP5. So we added exception handling to ado in PHP5 by creating new adodb-ado5.inc.php driver.
+- Added IsConnected(). Returns true if connection object connected. By Luca.Gioppo.
+- "Ralf Becker" RalfBecker#digitalROCK.de contributed new sapdb data-dictionary driver and a large patch that implements field and table renaming for oracle, mssql, postgresql, mysql and sapdb. See the new RenameTableSQL() and RenameColumnSQL() functions.
+- We now check ExecuteCursor to see if PrepareSP was initially called.
+- Changed oci8 datadict to use MODIFY for $dd->alterCol. Thx Mark Newnham.
+
+## 4.52 - 10 Aug 2004
+
+- Bug found in Replace() when performance logging enabled, introduced in ADOdb 4.50. Fixed.
+- Replace() checks update stmt. If update stmt fails, we now return immediately. Thx to alex.
+- Added support for $ADODB_FORCE_TYPE in GetUpdateSQL/GetInsertSQL. Thx to niko.
+- Added ADODB_ASSOC_CASE support to postgres/postgres7 driver.
+- Support for DECLARE stmt in oci8. Thx Lochbrunner.
+
+## 4.51 - 29 July 2004
+
+- Added adodb-xmlschema 1.0.2. Thx dan and richard.
+- Added new adorecordset_ext_* classes. If ADOdb extension installed for mysql, mysqlt and oci8 (but not oci8po), we use the superfast ADOdb extension code for movenext.
+- Added schema support to mssql and odbc_mssql MetaPrimaryKeys().
+- Patched MSSQL driver to support PHP NULL and Boolean values while binding the input array parameters in the _query() function. By Stephen Farmer.
+- Added support for clob's for mssql, UpdateBlob(). Thx to gfran#directa.com.br
+- Added normalize support for postgresql (true=lowercase table name, or false=case-sensitive table names) to MetaColumns($table, $normalize=true).
+- PHP5 variant dates in ADO not working. Fixed in adodb-ado.inc.php.
+- Constant ADODB_FORCE_NULLS was not working properly for many releases (for GetUpdateSQL). Fixed. Also GetUpdateSQL strips off ORDER BY now - thx Elieser LeĂŁo.
+- Perf Monitor for oci8 now dynamically highlights optimizer_* params if too high/low.
+- Added dsn support to NewADOConnection/ADONewConnection.
+- Fixed out of page bounds bug in _adodb_pageexecute_all_rows() Thx to "Sergio Strampelli" sergio#rir.it
+- Speedup of movenext for mysql and oci8 drivers.
+- Moved debugging code _adodb_debug_execute() to adodb-lib.inc.php.
+- Fixed postgresql bytea detection bug. See PHPLens Issue No: 9849.
+- Fixed ibase datetimestamp typo in PHP5. Thx stefan.
+- Removed whitespace at end of odbtp drivers.
+- Added db2 metaprimarykeys fix.
+- Optimizations to MoveNext() for mysql and oci8. Misc speedups to Get* functions.
+
+## 4.50 - 6 July 2004
+
+- Bumped it to 4.50 to avoid confusion with PHP 4.3.x series.
+- Added db2 metatables and metacolumns extensions.
+- Added alpha PDO driver. Very buggy, only works with odbc.
+- Tested mysqli. Set poorAffectedRows = true. Cleaned up movenext() and _fetch().
+- PageExecute does not work properly with php5 (return val not a variable). Reported Dmytro Sychevsky sych#php.com.ua. Fixed.
+- 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.
+- 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 continuously.
+
+## 4.23 - 16 June 2004
+
+- New interbase/firebird fixes thx to Lester Caine. Driver fixes a problem with getting field names in the result array, and corrects a couple of data conversions. Also we default to dialect3 for firebird. Also ibase sysDate property was wrong. Changed to cast as timestamp.
+- The datadict driver is set up to give quoted tables and fields as this was the only way round reserved words being used as field names in TikiWiki. TikiPro is tidying that up, and I hope to be able to produce a build of THAT which uses what I consider proper UPPERCASE field and table names. The conversion of TikiWiki to ADOdb helped in that, but until the database is completely tidied up in TikiPro ...
+- Modified _gencachename() to include fetchmode in name hash. This means you should clear your cache directory after installing this release as the cache name algorithm has changed.
+- Now Cache* functions work in safe mode, because we do not create sub-directories in the $ADODB_CACHE_DIR in safe mode. In non-safe mode we still create sub-directories. Done by modifying _gencachename().
+- Added $gmt parameter (true/false) to UserDate and UserTimeStamp in connection class, to force conversion of input (in local time) to be converted to UTC/GMT.
+- Mssql datadict did not support INT types properly (no size param allowed). Added _GetSize() to datadict-mssql.inc.php.
+- For borland_ibase, BeginTrans(), changed:
+    ```
+    $this->_transactionID = $this->_connectionID;
+    ```
+  to
+    ```
+    $this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID);
+    ```
+
+- Fixed typo in mysqi_field_seek(). Thx to Sh4dow (sh4dow#php.pl).
+- LogSQL did not work with Firebird/Interbase. Fixed.
+- Postgres: made errorno() handling more consistent. Thx to Michael Jahn, Michael.Jahn#mailbox.tu-dresden.de.
+- Added informix patch to better support metatables, metacolumns by "Cecilio Albero" c-albero#eos-i.com
+- Cyril Malevanov contributed patch to oci8 to support passing of LOB parameters:
+    ```
+    $text = 'test test test';
+    $sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
+    $stmt = $conn -> PrepareSP($sql);
+    $conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB);
+    $rs = '';
+    $conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
+    $conn -> Execute($stmt);
+    echo "return = ".$rs."
";

+    ```
+
+  As he says, the LOBs limitations are:
+  - use OCINewDescriptor before binding
+  - if Param is IN, uses save() before each execute. This is done automatically for you.
+  - if Param is OUT, uses load() after each execute. This is done automatically for you.
+  - when we bind $var as LOB, we create new descriptor and return it as a Bind Result, so if we want to use OUT parameters, we have to store somewhere &$var to load() data from LOB to it.
+  - IN OUT params are not working now (should not be a big problem to fix it)
+  - now mass binding not working too (I've wrote about it before)
+- Simplified Connect() and PConnect() error handling. +- When extension not loaded, Connect() and PConnect() will return null. On connect error, the fns will return false. +- CacheGetArray() added to code. +- Added Init() to adorecordset_empty(). +- Changed postgres64 driver, MetaColumns() to not strip off quotes in default value if :: detected (type-casting of default). +- Added test: if (!defined('ADODB_DIR')) die(). Useful to prevent hackers from detecting file paths. +- Changed metaTablesSQL to ignore Postgres 7.4 information schemas (sql_*). +- New polish language file by Grzegorz Pacan +- Added support for UNION in _adodb_getcount(). +- Added security check for ADODB_DIR to limit path disclosure issues. Requested by postnuke team. +- Added better error message support to oracle driver. Thx to Gaetano Giunta. +- Added showSchema support to mysql. +- Bind in oci8 did not handle $name=false properly. Fixed. +- If extension not loaded, Connect(), PConnect(), NConnect() will return null. + +## 4.22 - 15 Apr 2004 + +- Moved docs to own adodb/docs folder. +- Fixed session bug when quoting compressed/encrypted data in Replace(). +- Netezza Driver and LDAP drivers contributed by Josh Eldridge. +- GetMenu now uses rtrim() on values instead of trim(). +- Changed MetaColumnNames to return an associative array, keys being the field names in uppercase. +- Suggested fix to adodb-ado.inc.php affected_rows to support PHP5 variants. Thx to Alexios Fakos. +- Contributed bulgarian language file by Valentin Sheiretsky valio#valio.eu.org. +- Contributed romanian language file by stefan bogdan. +- GetInsertSQL now checks for table name (string) in $rs, and will create a recordset for that table automatically. Contributed by Walt Boring. Also added OCI_B_BLOB in bind on Walt's request - hope it doesn't break anything :-) +- Some minor postgres speedups in `_initrs()`. +- ChangeTableSQL checks now if MetaColumns returns empty. Thx Jason Judge. +- Added ADOConnection::Time(), returns current database time in unix timestamp format, or false. + +## 4.21 - 20 Mar 2004 + +- We no longer in SelectLimit for VFP driver add SELECT TOP X unless an ORDER BY exists. +- Pim Koeman contributed dutch language file adodb-nl.inc.php. +- Rick Hickerson added CLOB support to db2 datadict. +- Added odbtp driver. Thx to "stefan bogdan" sbogdan#rsb.ro. +- Changed PrepareSP() 2nd parameter, $cursor, to default to true (formerly false). Fixes oci8 backward compat problems with OUT params. +- Fixed month calculation error in adodb-time.inc.php. 2102-June-01 appeared as 2102-May-32. +- Updated PHP5 RC1 iterator support. API changed, hasMore() renamed to valid(). +- Changed internal format of serialized cache recordsets. As we store a version number, this should be backward compatible. +- Error handling when driver file not found was flawed in ADOLoadCode(). Fixed. + +## 4.20 - 27 Feb 2004 + +- Updated to AXMLS 1.01. +- MetaForeignKeys for postgres7 modified by Edward Jaramilla, works on pg 7.4. +- Now numbers accepts function calls or sequences for GetInsertSQL/GetUpdateSQL numeric fields. +- Changed quotes of 'delete from $perf_table' to "". Thx Kehui (webmaster#kehui.net) +- Added ServerInfo() for ifx, and putenv trim fix. Thx Fernando Ortiz. +- Added addq(), which is analogous to addslashes(). +- Tested with php5b4. Fix some php5 compat problems with exceptions and sybase. +- Carl-Christian Salvesen added patch to mssql _query to support binds greater than 4000 chars. +- Mike suggested patch to PHP5 exception handler. $errno must be numeric. +- Added double quotes (") to ADODB_TABLE_REGEX. +- For oci8, Prepare(...,$cursor), $cursor's meaning was accidentally inverted in 4.11. This causes problems with ExecuteCursor() too, which calls Prepare() internally. Thx to William Lovaton. +- Now dateHasTime property in connection object renamed to datetime for consistency. This could break bc. +- Csongor Halmai reports that db2 SelectLimit with input array is not working. Fixed.. + +## 4.11 - 27 Jan 2004 + +- Csongor Halmai reports db2 binding not working. Reverted back to emulated binding. +- Dan Cech modifies datadict code. Adds support for DropIndex. Minor cleanups. +- Table misspelt in perf-oci8.inc.php. Changed v$conn_cache_advice to v$db_cache_advice. Reported by Steve W. +- UserTimeStamp and DBTimeStamp did not handle YYYYMMDDHHMMSS format properly. Reported by Mike Muir. Fixed. +- Changed oci8 Prepare(). Does not auto-allocate OCINewCursor automatically, unless 2nd param is set to true. This will break backward compat, if Prepare/Execute is used instead of ExecuteCursor. Reported by Chris Jones. +- Added InParameter() and OutParameter(). Wrapper functions to Parameter(), but nicer because they are self-documenting. +- Added 'R' handling in ActualType() to datadict-mysql.inc.php +- Added ADOConnection::SerializableRS($rs). Returns a recordset that can be serialized in a session. +- Added "Run SQL" to performance UI(). +- Misc spelling corrections in adodb-mysqli.inc.php, adodb-oci8.inc.php and datadict-oci8.inc.php, from Heinz Hombergs. +- MetaIndexes() for ibase contributed by Heinz Hombergs. + +## 4.10 - 12 Jan 2004 + +- Dan Cech contributed extensive changes to data dictionary to support name quoting (with `\``), and drop table/index. +- Informix added cursorType property. Default remains IFX_SCROLL, but you can change to 0 (non-scrollable cursor) for performance. +- Added ADODB_View_PrimaryKeys() for returning view primary keys to MetaPrimaryKeys(). +- Simplified chinese file, adodb-cn.inc.php from cysoft. +- Added check for ctype_alnum in adodb-datadict.inc.php. Thx to Jason Judge. +- Added connection parameter to ibase Prepare(). Fix by Daniel Hassan. +- Added nameQuote for quoting identifiers and names to connection obj. Requested by Jason Judge. Also the data dictionary parser now detects `field name` and generates column names with spaces correctly. +- BOOL type not recognised correctly as L. Fixed. +- Fixed paths in ADODB_DIR for session files, and back-ported it to 4.05 (15 Dec 2003) +- Added Schema to postgresql MetaTables. Thx to col#gear.hu +- Empty postgresql recordsets that had blob fields did not set EOF properly. Fixed. +- CacheSelectLimit internal parameters to SelectLimit were wrong. Thx to Nio. +- Modified adodb_pr() and adodb_backtrace() to support command-line usage (eg. no html). +- Fixed some fr and it lang errors. Thx to Gaetano G. +- Added contrib directory, with adodb rs to xmlrpc converter by Gaetano G. +- Fixed array recordset bugs when `_skiprow1` is true. Thx to Gaetano G. +- Fixed pivot table code when count is false. + +## 4.05 - 13 Dec 2003 + +- Added MetaIndexes to data-dict code - thx to Dan Cech. +- Rewritten session code by Ross Smith. Moved code to adodb/session directory. +- Added function exists check on connecting to most drivers, so we don't crash with the unknown function error. +- Smart Transactions failed with GenID() when it no seq table has been created because the sql statement fails. Fix by Mark Newnham. +- Added $db->length, which holds name of function that returns strlen. +- Fixed error handling for bad driver in ADONewConnection - passed too few params to error-handler. +- Datadict did not handle types like 16.0 properly in _GetSize. Fixed. +- Oci8 driver SelectLimit() bug &= instead of =& used. Thx to Swen ThĂĽmmler. +- Jesse Mullan suggested not flushing outp when output buffering enabled. Due to Apache 2.0 bug. Added. +- MetaTables/MetaColumns return ref bug with PHP5 fixed in adodb-datadict.inc.php. +- New mysqli driver contributed by Arjen de Rijke. Based on adodb 3.40 driver. Then jlim added BeginTrans, CommitTrans, RollbackTrans, IfNull, SQLDate. Also fixed return ref bug. +- $ADODB_FLUSH added, if true then force flush in debugging outp. Default is false. In earlier versions, outp defaulted to flush, which is not compat with apache 2.0. +- Mysql driver's GenID() function did not work when when sql logging is on. Fixed. +- $ADODB_SESSION_TBL not declared as global var. Not available if adodb-session.inc.php included in function. Fixed. +- The input array not passed to Execute() in _adodb_getcount(). Fixed. + +## 4.04 - 13 Nov 2003 + +- Switched back to foreach - faster than list-each. +- Fixed bug in ado driver - wiping out $this->fields with date fields. +- Performance Monitor, View SQL, Explain Plan did not work if strlen($SQL)>max($_GET length). Fixed. +- Performance monitor, oci8 driver added memory sort ratio. +- Added random property, returns SQL to generate a floating point number between 0 and 1; + +## 4.03 - 6 Nov 2003 + +- The path to adodb-php4.inc.php and adodb-iterators.inc.php was not setup properly. +- Patched SQLDate in interbase to support hours/mins/secs. Thx to ari kuorikoski. +- Force autorollback for pgsql persistent connections - apparently pgsql did not autorollback properly before 4.3.4. See http://bugs.php.net/bug.php?id=25404 + +## 4.02 - 5 Nov 2003 + +- Some errors in adodb_error_pg() fixed. Thx to Styve. +- Spurious Insert_ID() error was generated by LogSQL(). Fixed. +- Insert_ID was interfering with Affected_Rows() and Replace() when LogSQL() enabled. Fixed. +- More foreach loops optimized with list/each. +- Null dates not handled properly in ADO driver (it becomes 31 Dec 1969!). +- Heinz Hombergs contributed patches for mysql MetaColumns - adding scale, made interbase MetaColumns work with firebird/interbase, and added lang/adodb-de.inc.php. +- Added INFORMIXSERVER environment variable. +- Added $ADODB_ANSI_PADDING_OFF for interbase/firebird. +- PHP 5 beta 2 compat check. Foreach (Iterator) support. Exceptions support. + +## 4.01 - 23 Oct 2003 + +- Fixed bug in rs2html(), tohtml.inc.php, that generated blank table cells. +- Fixed insert_id() incorrectly generated when logsql() enabled. +- Modified PostgreSQL _fixblobs to use list/each instead of foreach. +- Informix ErrorNo() implemented correctly. +- Modified several places to use list/each, including GetRowAssoc(). +- Added UserTimeStamp() to connection class. +- Added $ADODB_ANSI_PADDING_OFF for oci8po. + +## 4.00 - 20 Oct 2003 + +- Upgraded adodb-xmlschema to 1 Oct 2003 snapshot. +- Fix to rs2html warning message. Thx to Filo. +- Fix for odbc_mssql/mssql SQLDate(), hours was wrong. +- Added MetaColumns and MetaPrimaryKeys for sybase. Thx to Chris Phillipson. +- Added autoquoting to datadict for MySQL and PostgreSQL. Suggestion by Karsten Dambekalns diff --git a/adodb/drivers/adodb-access.inc.php b/adodb/drivers/adodb-access.inc.php index 94913cc..13461a3 100644 --- a/adodb/drivers/adodb-access.inc.php +++ b/adodb/drivers/adodb-access.inc.php @@ -1,24 +1,36 @@ ADODB_odbc(); - } - + var $upperCase = 'ucase'; + function Time() { return time(); } - + function BeginTrans() { return false;} - - function IfNull( $field, $ifNull ) + + function IfNull( $field, $ifNull ) { return " IIF(IsNull($field), $ifNull, $field) "; // if Access } /* - function &MetaTables() + function MetaTables() { global $ADODB_FETCH_MODE; - + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $qid = odbc_tables($this->_connectionID); $rs = new ADORecordSet_odbc($qid); $ADODB_FETCH_MODE = $savem; if (!$rs) return false; - - $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change; - - $arr = &$rs->GetArray(); + + $arr = $rs->GetArray(); //print_pre($arr); $arr2 = array(); for ($i=0; $i < sizeof($arr); $i++) { @@ -72,15 +75,11 @@ function &MetaTables() }*/ } - -class ADORecordSet_access extends ADORecordSet_odbc { - - var $databaseType = "access"; - - function ADORecordSet_access($id,$mode=false) - { - return $this->ADORecordSet_odbc($id,$mode); - } -}// class -} -?> \ No newline at end of file + +class ADORecordSet_access extends ADORecordSet_odbc { + + var $databaseType = "access"; + +} // class + +} diff --git a/adodb/drivers/adodb-ado.inc.php b/adodb/drivers/adodb-ado.inc.php index 46bd779..67a032d 100644 --- a/adodb/drivers/adodb-ado.inc.php +++ b/adodb/drivers/adodb-ado.inc.php @@ -1,31 +1,41 @@ _affectedRows = new VARIANT; } @@ -47,14 +57,12 @@ function ServerInfo() if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider; return array('description' => $desc, 'version' => ''); } - + function _affectedrows() { - if (PHP_VERSION >= 5) return $this->_affectedRows; - - return $this->_affectedRows->value; + return $this->_affectedRows; } - + // you can also pass a connection string like this: // // $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB'); @@ -62,49 +70,49 @@ function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDAS { $u = 'UID'; $p = 'PWD'; - + if (!empty($this->charPage)) $dbc = new COM('ADODB.Connection',null,$this->charPage); else $dbc = new COM('ADODB.Connection'); - + if (! $dbc) return false; /* special support if provider is mssql or access */ if ($argProvider=='mssql') { $u = 'User Id'; //User parameter name for OLEDB - $p = 'Password'; + $p = 'Password'; $argProvider = "SQLOLEDB"; // SQL Server Provider - + // not yet //if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename"; - - //use trusted conection for SQL if username not specified + + //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 - - if ($argProvider) $dbc->Provider = $argProvider; - + + if ($argProvider) $dbc->Provider = $argProvider; + if ($argUsername) $argHostname .= ";$u=$argUsername"; if ($argPassword)$argHostname .= ";$p=$argPassword"; - + if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
\n version=$dbc->version"); // @ added below for php 4.0.1 and earlier @$dbc->Open((string) $argHostname); - + $this->_connectionID = $dbc; - + $dbc->CursorLocation = $this->_cursor_location; return $dbc->State > 0; } - + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL') { return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider); - } - + } + /* adSchemaCatalogs = 1, adSchemaCharacterSets = 2, @@ -146,12 +154,12 @@ function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDAS adSchemaMembers = 38 */ - - function &MetaTables() + + function MetaTables($ttype = false, $showSchema = false, $mask = false) { $arr= array(); $dbc = $this->_connectionID; - + $adors=@$dbc->OpenSchema(20);//tables if ($adors){ $f = $adors->Fields(2);//table/view name @@ -165,25 +173,25 @@ function &MetaTables() } $adors->Close(); } - + return $arr; } - - function &MetaColumns($table) + + function MetaColumns($table, $normalize=true) { $table = strtoupper($table); $arr = array(); $dbc = $this->_connectionID; - + $adors=@$dbc->OpenSchema(4);//tables - + if ($adors){ $t = $adors->Fields(2);//table/view name while (!$adors->EOF){ - - + + if (strtoupper($t->Value) == $table) { - + $fld = new ADOFieldObject(); $c = $adors->Fields(3); $fld->name = $c->Value; @@ -191,7 +199,7 @@ function &MetaColumns($table) $fld->max_length = -1; $arr[strtoupper($fld->name)]=$fld; } - + $adors->MoveNext(); } $adors->Close(); @@ -199,20 +207,20 @@ function &MetaColumns($table) $false = false; return empty($arr) ? $false : $arr; } - - + + /* returns queryID or false */ - function &_query($sql,$inputarr=false) + function _query($sql,$inputarr=false) { - + $dbc = $this->_connectionID; $false = false; - - // return rs + + // return rs if ($inputarr) { - + if (!empty($this->charPage)) $oCmd = new COM('ADODB.Command',null,$this->charPage); else @@ -221,11 +229,27 @@ function &_query($sql,$inputarr=false) $oCmd->CommandText = $sql; $oCmd->CommandType = 1; - foreach($inputarr as $val) { + // Map by http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ado270/htm/mdmthcreateparam.asp + // Check issue http://bugs.php.net/bug.php?id=40664 !!! + foreach ($inputarr as $val) { + $type = gettype($val); + $len=strlen($val); + if ($type == 'boolean') + $this->adoParameterType = 11; + else if ($type == 'integer') + $this->adoParameterType = 3; + else if ($type == 'double') + $this->adoParameterType = 5; + elseif ($type == 'string') + $this->adoParameterType = 202; + else if (($val === null) || (!defined($val))) + $len=1; + else + $this->adoParameterType = 130; + // name, type, direction 1 = input, len, - $this->adoParameterType = 130; - $p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val); - //print $p->Type.' '.$p->value; + $p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val); + $oCmd->Parameters->Append($p); } $p = false; @@ -234,12 +258,12 @@ function &_query($sql,$inputarr=false) if ($dbc->Errors->Count > 0) return $false; return $rs; } - + $rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option); if ($dbc->Errors->Count > 0) return $false; if (! $rs) return $false; - + if ($rs->State == 0) { $true = true; return $true; // 0 = adStateClosed means no records returned @@ -247,11 +271,11 @@ function &_query($sql,$inputarr=false) return $rs; } - - function BeginTrans() - { + + function BeginTrans() + { if ($this->transOff) return true; - + if (isset($this->_thisTransactions)) if (!$this->_thisTransactions) return false; else { @@ -263,12 +287,12 @@ function BeginTrans() $this->transCnt += 1; return true; } - - function CommitTrans($ok=true) - { + + function CommitTrans($ok=true) + { if (!$ok) return $this->RollbackTrans(); if ($this->transOff) return true; - + @$this->_connectionID->CommitTrans(); if ($this->transCnt) @$this->transCnt -= 1; return true; @@ -279,10 +303,10 @@ function RollbackTrans() { if ($this->transCnt) @$this->transCnt -= 1; return true; } - - /* Returns: the last error message from previous database operation */ - function ErrorMsg() + /* Returns: the last error message from previous database operation */ + + function ErrorMsg() { if (!$this->_connectionID) return "No connection established"; $errc = $this->_connectionID->Errors; @@ -291,8 +315,8 @@ function ErrorMsg() $err = $errc->Item($errc->Count-1); return $err->Description; } - - function ErrorNo() + + function ErrorNo() { $errc = $this->_connectionID->Errors; if ($errc->Count == 0) return 0; @@ -307,39 +331,39 @@ function _close() $this->_connectionID = false; return true; } - - + + } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_ado extends ADORecordSet { - +class ADORecordSet_ado extends ADORecordSet { + var $bind = false; - var $databaseType = "ado"; - var $dataProvider = "ado"; + var $databaseType = "ado"; + var $dataProvider = "ado"; var $_tarr = false; // caches the types var $_flds; // and field objects var $canSeek = true; var $hideErrors = true; - - function ADORecordSet_ado($id,$mode=false) + + function __construct($id,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - return $this->ADORecordSet($id,$mode); + parent::__construct($id); } // returns the field object - function &FetchField($fieldOffset = -1) { + function FetchField($fieldOffset = -1) { $off=$fieldOffset+1; // offsets begin at 1 - + $o= new ADOFieldObject(); $rs = $this->_queryID; $f = $rs->Fields($fieldOffset); @@ -347,12 +371,12 @@ function &FetchField($fieldOffset = -1) { $t = $f->Type; $o->type = $this->MetaType($t); $o->max_length = $f->DefinedSize; - $o->ado_type = $t; + $o->ado_type = $t; //print "off=$off name=$o->name type=$o->type len=$o->max_length
"; return $o; } - + /* Use associative array to get fields array */ function Fields($colname) { @@ -364,25 +388,25 @@ function Fields($colname) $this->bind[strtoupper($o->name)] = $i; } } - + return $this->fields[$this->bind[strtoupper($colname)]]; } - + function _initrs() { $rs = $this->_queryID; $this->_numOfRows = $rs->RecordCount; - + $f = $rs->Fields; $this->_numOfFields = $f->Count; } - - + + // should only be used to move forward as we normally use forward-only cursors function _seek($row) { - $rs = $this->_queryID; + $rs = $this->_queryID; // absoluteposition doesn't work -- my maths is wrong ? // $rs->AbsolutePosition->$row-2; // return true; @@ -390,10 +414,10 @@ function _seek($row) @$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst return true; } - + /* OLEDB types - + enum DBTYPEENUM { DBTYPE_EMPTY = 0, DBTYPE_NULL = 1, @@ -429,9 +453,9 @@ enum DBTYPEENUM DBTYPE_DBDATE = 133, DBTYPE_DBTIME = 134, DBTYPE_DBTIMESTAMP = 135 - + ADO Types - + adEmpty = 0, adTinyInt = 16, adSmallInt = 2, @@ -451,7 +475,7 @@ enum DBTYPEENUM adUserDefined = 132, adVariant = 12, adIDispatch = 9, - adIUnknown = 13, + adIUnknown = 13, adGUID = 72, adDate = 7, adDBDate = 133, @@ -480,9 +504,9 @@ function MetaType($t,$len=-1,$fieldobj=false) $t = $fieldobj->type; $len = $fieldobj->max_length; } - + if (!is_numeric($t)) return $t; - + switch ($t) { case 0: case 12: // variant @@ -495,7 +519,7 @@ function MetaType($t,$len=-1,$fieldobj=false) case 204: // varBin case 72: // guid if ($len <= $this->blobSize) return 'C'; - + case 201: case 203: return 'X'; @@ -505,12 +529,12 @@ function MetaType($t,$len=-1,$fieldobj=false) return 'B'; case 7: case 133: return 'D'; - + case 134: case 135: return 'T'; - + case 11: return 'L'; - + case 16:// adTinyInt = 16, case 2://adSmallInt = 2, case 3://adInteger = 3, @@ -520,20 +544,20 @@ 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; } } - + // time stamp not supported yet function _fetch() - { + { $rs = $this->_queryID; if (!$rs or $rs->EOF) { $this->fields = false; return false; } $this->fields = array(); - + if (!$this->_tarr) { $tarr = array(); $flds = array(); @@ -543,12 +567,12 @@ function _fetch() $tarr[] = $f->Type; } // bind types and flds only once - $this->_tarr = $tarr; + $this->_tarr = $tarr; $this->_flds = $flds; } $t = reset($this->_tarr); $f = reset($this->_flds); - + if ($this->hideErrors) $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) { //echo "

",$t,' ';var_dump($f->value); echo '

'; @@ -559,12 +583,12 @@ function _fetch() if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value); // VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00 $val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600; - else + else $val = $f->value; $this->fields[] = adodb_date('Y-m-d H:i:s',$val); } - break; - case 133:// A date value (yyyymmdd) + break; + case 133:// A date value (yyyymmdd) if ($val = $f->value) { $this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2); } else @@ -575,7 +599,7 @@ function _fetch() else { if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value); else $val = $f->value; - + if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val); else $this->fields[] = adodb_date('Y-m-d H:i:s',$val); } @@ -587,8 +611,18 @@ function _fetch() ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP'); $this->fields[] = (float) $f->value; break; + case 11: //BIT; + $val = ""; + if(is_bool($f->value)) { + if($f->value==true) $val = 1; + else $val = 0; + } + if(is_null($f->value)) $val = null; + + $this->fields[] = $val; + break; default: - $this->fields[] = $f->value; + $this->fields[] = $f->value; break; } //print " $f->value $t, "; @@ -597,27 +631,27 @@ function _fetch() } // for if ($this->hideErrors) error_reporting($olde); @$rs->MoveNext(); // @ needed for some versions of PHP! - + if ($this->fetchMode & ADODB_FETCH_ASSOC) { - $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE); + $this->fields = $this->GetRowAssoc(); } return true; } - + function NextRecordSet() { $rs = $this->_queryID; $this->_queryID = $rs->NextRecordSet(); //$this->_queryID = $this->_QueryId->NextRecordSet(); if ($this->_queryID == null) return false; - + $this->_currentRow = -1; $this->_currentPage = -1; $this->bind = false; $this->fields = false; $this->_flds = false; $this->_tarr = false; - + $this->_inited = false; $this->Init(); return true; @@ -626,9 +660,7 @@ function NextRecordSet() function _close() { $this->_flds = false; @$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk) - $this->_queryID = false; + $this->_queryID = false; } } - -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-ado5.inc.php b/adodb/drivers/adodb-ado5.inc.php index b2afbca..f673d09 100644 --- a/adodb/drivers/adodb-ado5.inc.php +++ b/adodb/drivers/adodb-ado5.inc.php @@ -1,31 +1,41 @@ _affectedRows = new VARIANT; } @@ -47,14 +57,12 @@ function ServerInfo() if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider; return array('description' => $desc, 'version' => ''); } - + function _affectedrows() { - if (PHP_VERSION >= 5) return $this->_affectedRows; - - return $this->_affectedRows->value; + return $this->_affectedRows; } - + // you can also pass a connection string like this: // // $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB'); @@ -63,71 +71,73 @@ function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $ar // two modes // - if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat // - if $argProvider is not empty, then $argDBorProvider holds db - - + + if ($argProvider) { $argDatabasename = $argDBorProvider; } else { $argDatabasename = ''; if ($argDBorProvider) $argProvider = $argDBorProvider; - else $argProvider = 'MSDASQL'; + else if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */ + $argProvider = 'MSDASQL'; } - - + + try { $u = 'UID'; $p = 'PWD'; - + if (!empty($this->charPage)) $dbc = new COM('ADODB.Connection',null,$this->charPage); else $dbc = new COM('ADODB.Connection'); - + if (! $dbc) return false; /* special support if provider is mssql or access */ if ($argProvider=='mssql') { $u = 'User Id'; //User parameter name for OLEDB - $p = 'Password'; + $p = 'Password'; $argProvider = "SQLOLEDB"; // SQL Server Provider - + // not yet //if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename"; - - //use trusted conection for SQL if username not specified + + //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 - - if ($argProvider) $dbc->Provider = $argProvider; - if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname"; - + if ($argProvider) $dbc->Provider = $argProvider; + + if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname"; - if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename"; + + if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename"; if ($argUsername) $argHostname .= ";$u=$argUsername"; if ($argPassword)$argHostname .= ";$p=$argPassword"; - + if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
\n version=$dbc->version"); // @ added below for php 4.0.1 and earlier @$dbc->Open((string) $argHostname); - + $this->_connectionID = $dbc; - + $dbc->CursorLocation = $this->_cursor_location; return $dbc->State > 0; } catch (exception $e) { + if ($this->debug) echo "
",$argHostname,"\n",$e,"
\n"; } - + return false; } - + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL') { return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider); - } - + } + /* adSchemaCatalogs = 1, adSchemaCharacterSets = 2, @@ -169,12 +179,12 @@ function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDAS adSchemaMembers = 38 */ - - function &MetaTables() + + function MetaTables($ttype = false, $showSchema = false, $mask = false) { $arr= array(); $dbc = $this->_connectionID; - + $adors=@$dbc->OpenSchema(20);//tables if ($adors){ $f = $adors->Fields(2);//table/view name @@ -188,25 +198,25 @@ function &MetaTables() } $adors->Close(); } - + return $arr; } - - function &MetaColumns($table) + + function MetaColumns($table, $normalize=true) { $table = strtoupper($table); $arr= array(); $dbc = $this->_connectionID; - + $adors=@$dbc->OpenSchema(4);//tables - + if ($adors){ $t = $adors->Fields(2);//table/view name while (!$adors->EOF){ - - + + if (strtoupper($t->Value) == $table) { - + $fld = new ADOFieldObject(); $c = $adors->Fields(3); $fld->name = $c->Value; @@ -214,28 +224,28 @@ function &MetaColumns($table) $fld->max_length = -1; $arr[strtoupper($fld->name)]=$fld; } - + $adors->MoveNext(); } $adors->Close(); } - + return $arr; } - + /* returns queryID or false */ - function &_query($sql,$inputarr=false) + function _query($sql,$inputarr=false) { try { // In PHP5, all COM errors are exceptions, so to maintain old behaviour... - + $dbc = $this->_connectionID; - - // return rs - + + // return rs + $false = false; - + if ($inputarr) { - + if (!empty($this->charPage)) $oCmd = new COM('ADODB.Command',null,$this->charPage); else @@ -244,42 +254,57 @@ function &_query($sql,$inputarr=false) $oCmd->CommandText = $sql; $oCmd->CommandType = 1; - foreach($inputarr as $val) { + foreach ($inputarr as $val) { + $type = gettype($val); + $len=strlen($val); + if ($type == 'boolean') + $this->adoParameterType = 11; + else if ($type == 'integer') + $this->adoParameterType = 3; + else if ($type == 'double') + $this->adoParameterType = 5; + elseif ($type == 'string') + $this->adoParameterType = 202; + else if (($val === null) || (!defined($val))) + $len=1; + else + $this->adoParameterType = 130; + // name, type, direction 1 = input, len, - $this->adoParameterType = 130; - $p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val); - //print $p->Type.' '.$p->value; + $p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val); + $oCmd->Parameters->Append($p); } + $p = false; $rs = $oCmd->Execute(); $e = $dbc->Errors; if ($dbc->Errors->Count > 0) return $false; return $rs; } - + $rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option); - + if ($dbc->Errors->Count > 0) return $false; if (! $rs) return $false; - + if ($rs->State == 0) { $true = true; return $true; // 0 = adStateClosed means no records returned } return $rs; - + } catch (exception $e) { - + } return $false; } - - function BeginTrans() - { + + function BeginTrans() + { if ($this->transOff) return true; - + if (isset($this->_thisTransactions)) if (!$this->_thisTransactions) return false; else { @@ -291,11 +316,11 @@ function BeginTrans() $this->transCnt += 1; return true; } - function CommitTrans($ok=true) - { + function CommitTrans($ok=true) + { if (!$ok) return $this->RollbackTrans(); if ($this->transOff) return true; - + @$this->_connectionID->CommitTrans(); if ($this->transCnt) @$this->transCnt -= 1; return true; @@ -306,14 +331,14 @@ function RollbackTrans() { if ($this->transCnt) @$this->transCnt -= 1; return true; } - - /* Returns: the last error message from previous database operation */ - function ErrorMsg() + /* Returns: the last error message from previous database operation */ + + function ErrorMsg() { if (!$this->_connectionID) return "No connection established"; $errmsg = ''; - + try { $errc = $this->_connectionID->Errors; if (!$errc) return "No Errors object found"; @@ -324,8 +349,8 @@ function ErrorMsg() } return $errmsg; } - - function ErrorNo() + + function ErrorNo() { $errc = $this->_connectionID->Errors; if ($errc->Count == 0) return 0; @@ -340,53 +365,55 @@ function _close() $this->_connectionID = false; return true; } - - + + } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_ado extends ADORecordSet { - +class ADORecordSet_ado extends ADORecordSet { + var $bind = false; - var $databaseType = "ado"; - var $dataProvider = "ado"; + var $databaseType = "ado"; + var $dataProvider = "ado"; var $_tarr = false; // caches the types var $_flds; // and field objects var $canSeek = true; var $hideErrors = true; - - function ADORecordSet_ado($id,$mode=false) + + function __construct($id,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - return $this->ADORecordSet($id,$mode); + parent::__construct($id); } // returns the field object - function &FetchField($fieldOffset = -1) { + function FetchField($fieldOffset = -1) { $off=$fieldOffset+1; // offsets begin at 1 - + $o= new ADOFieldObject(); $rs = $this->_queryID; + if (!$rs) return false; + $f = $rs->Fields($fieldOffset); $o->name = $f->Name; $t = $f->Type; $o->type = $this->MetaType($t); $o->max_length = $f->DefinedSize; $o->ado_type = $t; - + //print "off=$off name=$o->name type=$o->type len=$o->max_length
"; return $o; } - + /* Use associative array to get fields array */ function Fields($colname) { @@ -398,25 +425,29 @@ function Fields($colname) $this->bind[strtoupper($o->name)] = $i; } } - + return $this->fields[$this->bind[strtoupper($colname)]]; } - + function _initrs() { $rs = $this->_queryID; - $this->_numOfRows = $rs->RecordCount; - + + try { + $this->_numOfRows = $rs->RecordCount; + } catch (Exception $e) { + $this->_numOfRows = -1; + } $f = $rs->Fields; $this->_numOfFields = $f->Count; } - - + + // should only be used to move forward as we normally use forward-only cursors function _seek($row) { - $rs = $this->_queryID; + $rs = $this->_queryID; // absoluteposition doesn't work -- my maths is wrong ? // $rs->AbsolutePosition->$row-2; // return true; @@ -424,10 +455,10 @@ function _seek($row) @$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst return true; } - + /* OLEDB types - + enum DBTYPEENUM { DBTYPE_EMPTY = 0, DBTYPE_NULL = 1, @@ -463,9 +494,9 @@ enum DBTYPEENUM DBTYPE_DBDATE = 133, DBTYPE_DBTIME = 134, DBTYPE_DBTIMESTAMP = 135 - + ADO Types - + adEmpty = 0, adTinyInt = 16, adSmallInt = 2, @@ -485,7 +516,7 @@ enum DBTYPEENUM adUserDefined = 132, adVariant = 12, adIDispatch = 9, - adIUnknown = 13, + adIUnknown = 13, adGUID = 72, adDate = 7, adDBDate = 133, @@ -514,9 +545,9 @@ function MetaType($t,$len=-1,$fieldobj=false) $t = $fieldobj->type; $len = $fieldobj->max_length; } - + if (!is_numeric($t)) return $t; - + switch ($t) { case 0: case 12: // variant @@ -529,7 +560,7 @@ function MetaType($t,$len=-1,$fieldobj=false) case 204: // varBin case 72: // guid if ($len <= $this->blobSize) return 'C'; - + case 201: case 203: return 'X'; @@ -539,12 +570,12 @@ function MetaType($t,$len=-1,$fieldobj=false) return 'B'; case 7: case 133: return 'D'; - + case 134: case 135: return 'T'; - + case 11: return 'L'; - + case 16:// adTinyInt = 16, case 2://adSmallInt = 2, case 3://adInteger = 3, @@ -554,20 +585,20 @@ 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; } } - + // time stamp not supported yet function _fetch() - { + { $rs = $this->_queryID; if (!$rs or $rs->EOF) { $this->fields = false; return false; } $this->fields = array(); - + if (!$this->_tarr) { $tarr = array(); $flds = array(); @@ -577,12 +608,12 @@ function _fetch() $tarr[] = $f->Type; } // bind types and flds only once - $this->_tarr = $tarr; + $this->_tarr = $tarr; $this->_flds = $flds; } $t = reset($this->_tarr); $f = reset($this->_flds); - + if ($this->hideErrors) $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) { //echo "

",$t,' ';var_dump($f->value); echo '

'; @@ -593,12 +624,12 @@ function _fetch() if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value); // VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00 $val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600; - else + else $val = $f->value; $this->fields[] = adodb_date('Y-m-d H:i:s',$val); } - break; - case 133:// A date value (yyyymmdd) + break; + case 133:// A date value (yyyymmdd) if ($val = $f->value) { $this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2); } else @@ -609,7 +640,7 @@ function _fetch() else { if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value); else $val = $f->value; - + if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val); else $this->fields[] = adodb_date('Y-m-d H:i:s',$val); } @@ -617,12 +648,26 @@ function _fetch() case 1: // null $this->fields[] = false; break; + case 20: + case 21: // bigint (64 bit) + $this->fields[] = (float) $f->value; // if 64 bit PHP, could use (int) + break; case 6: // currency is not supported properly; ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP'); $this->fields[] = (float) $f->value; break; + case 11: //BIT; + $val = ""; + if(is_bool($f->value)) { + if($f->value==true) $val = 1; + else $val = 0; + } + if(is_null($f->value)) $val = null; + + $this->fields[] = $val; + break; default: - $this->fields[] = $f->value; + $this->fields[] = $f->value; break; } //print " $f->value $t, "; @@ -631,27 +676,27 @@ function _fetch() } // for if ($this->hideErrors) error_reporting($olde); @$rs->MoveNext(); // @ needed for some versions of PHP! - + if ($this->fetchMode & ADODB_FETCH_ASSOC) { - $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE); + $this->fields = $this->GetRowAssoc(); } return true; } - + function NextRecordSet() { $rs = $this->_queryID; $this->_queryID = $rs->NextRecordSet(); //$this->_queryID = $this->_QueryId->NextRecordSet(); if ($this->_queryID == null) return false; - + $this->_currentRow = -1; $this->_currentPage = -1; $this->bind = false; $this->fields = false; $this->_flds = false; $this->_tarr = false; - + $this->_inited = false; $this->Init(); return true; @@ -659,10 +704,11 @@ function NextRecordSet() function _close() { $this->_flds = false; + try { @$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk) - $this->_queryID = false; + } catch (Exception $e) { + } + $this->_queryID = false; } } - -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-ado_access.inc.php b/adodb/drivers/adodb-ado_access.inc.php index e884291..ad7ab38 100644 --- a/adodb/drivers/adodb-ado_access.inc.php +++ b/adodb/drivers/adodb-ado_access.inc.php @@ -1,54 +1,53 @@ = 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 { +class ADODB_ado_access extends ADODB_ado { var $databaseType = 'ado_access'; var $hasTop = 'top'; // support mssql SELECT TOP 10 * FROM TABLE var $fmtDate = "#Y-m-d#"; var $fmtTimeStamp = "#Y-m-d h:i:sA#";// note no comma var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')"; var $sysTimeStamp = 'NOW'; - var $hasTransactions = false; - - function ADODB_ado_access() - { - $this->ADODB_ado(); - } - - function BeginTrans() { return false;} - + var $upperCase = 'ucase'; + + /*function BeginTrans() { return false;} + function CommitTrans() { return false;} - - function RollbackTrans() { return false;} + + function RollbackTrans() { return false;}*/ } - -class ADORecordSet_ado_access extends ADORecordSet_ado { - - var $databaseType = "ado_access"; - - function ADORecordSet_ado_access($id,$mode=false) - { - return $this->ADORecordSet_ado($id,$mode); - } + +class ADORecordSet_ado_access extends ADORecordSet_ado { + + var $databaseType = "ado_access"; + } -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-ado_mssql.inc.php b/adodb/drivers/adodb-ado_mssql.inc.php index 5075e66..d0e9c19 100644 --- a/adodb/drivers/adodb-ado_mssql.inc.php +++ b/adodb/drivers/adodb-ado_mssql.inc.php @@ -1,30 +1,35 @@ = 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_mssql extends ADODB_ado { +class ADODB_ado_mssql extends ADODB_ado { var $databaseType = 'ado_mssql'; var $hasTop = 'top'; var $hasInsertID = true; @@ -35,25 +40,21 @@ class ADODB_ado_mssql extends ADODB_ado { var $ansiOuter = true; // for mssql7 or later var $substr = "substring"; var $length = 'len'; - + var $_dropSeqSQL = "drop table %s"; + //var $_inTransaction = 1; // always open recordsets, so no transaction problems. - - function ADODB_ado_mssql() - { - $this->ADODB_ado(); - } - - function _insertid() + + protected function _insertID($table = '', $column = '') { - return $this->GetOne('select @@identity'); + return $this->GetOne('select SCOPE_IDENTITY()'); } - + function _affectedrows() { - return $this->GetOne('select @@rowcount'); + return $this->GetOne('select @@rowcount'); } - - function SetTransactionMode( $transaction_mode ) + + function SetTransactionMode( $transaction_mode ) { $this->_transmode = $transaction_mode; if (empty($transaction_mode)) { @@ -63,41 +64,47 @@ function SetTransactionMode( $transaction_mode ) if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode; $this->Execute("SET TRANSACTION ".$transaction_mode); } - - function MetaColumns($table) + + function qStr($s, $magic_quotes=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; + $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; return empty($arr) ? $false : $arr; } - + function CreateSequence($seq='adodbseq',$start=1) { - + $this->Execute('BEGIN TRANSACTION adodbseq'); $start -= 1; $this->Execute("create table $seq (id float(53))"); @@ -106,7 +113,7 @@ function CreateSequence($seq='adodbseq',$start=1) $this->Execute('ROLLBACK TRANSACTION adodbseq'); return false; } - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return true; } @@ -122,26 +129,21 @@ function GenID($seq='adodbseq',$start=1) $this->Execute('ROLLBACK TRANSACTION adodbseq'); return false; } - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return $start; } $num = $this->GetOne("select id from $seq"); - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return $num; - + // in old implementation, pre 1.90, we returned GUID... //return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'"); } - - } // end class - - class ADORecordSet_ado_mssql extends ADORecordSet_ado { - + +} // end class + +class ADORecordSet_ado_mssql extends ADORecordSet_ado { + var $databaseType = 'ado_mssql'; - - function ADORecordSet_ado_mssql($id,$mode=false) - { - return $this->ADORecordSet_ado($id,$mode); - } + } -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-ads.inc.php b/adodb/drivers/adodb-ads.inc.php new file mode 100644 index 0000000..b9d4adb --- /dev/null +++ b/adodb/drivers/adodb-ads.inc.php @@ -0,0 +1,818 @@ +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; + } + +} + +/*-------------------------------------------------------------------------------------- + Class Name: Recordset +--------------------------------------------------------------------------------------*/ + +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/adodb/drivers/adodb-borland_ibase.inc.php b/adodb/drivers/adodb-borland_ibase.inc.php index e581544..da2c761 100644 --- a/adodb/drivers/adodb-borland_ibase.inc.php +++ b/adodb/drivers/adodb-borland_ibase.inc.php @@ -1,16 +1,25 @@ ADODB_ibase(); - } - + var $databaseType = "borland_ibase"; + function BeginTrans() - { + { if ($this->transOff) return true; $this->transCnt += 1; $this->autoCommit = false; $this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID); return $this->_transactionID; } - + function ServerInfo() { $arr['dialect'] = $this->dialect; switch($arr['dialect']) { - case '': + case '': case '1': $s = 'Interbase 6.5, Dialect 1'; break; case '2': $s = 'Interbase 6.5, Dialect 2'; break; default: @@ -49,44 +52,41 @@ function ServerInfo() $arr['description'] = $s; return $arr; } - + // Note that Interbase 6.5 uses ROWS instead - don't you love forking wars! - // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows + // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows // SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2 // Firebird uses // SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE - function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) + function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) { + $nrows = (int) $nrows; + $offset = (int) $offset; if ($nrows > 0) { - if ($offset <= 0) $str = " ROWS $nrows "; + if ($offset <= 0) $str = " ROWS $nrows "; else { $a = $offset+1; $b = $offset+$nrows; $str = " ROWS $a TO $b"; } } else { - // ok, skip + // ok, skip $a = $offset + 1; $str = " ROWS $a TO 999999999"; // 999 million } $sql .= $str; - - return ($secs2cache) ? + + return ($secs2cache) ? $this->CacheExecute($secs2cache,$sql,$inputarr) : $this->Execute($sql,$inputarr); } - + }; - -class ADORecordSet_borland_ibase extends ADORecordSet_ibase { - - var $databaseType = "borland_ibase"; - - function ADORecordSet_borland_ibase($id,$mode=false) - { - $this->ADORecordSet_ibase($id,$mode); - } + +class ADORecordSet_borland_ibase extends ADORecordSet_ibase { + + var $databaseType = "borland_ibase"; + } -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-csv.inc.php b/adodb/drivers/adodb-csv.inc.php index 6f20d1d..8a59626 100644 --- a/adodb/drivers/adodb-csv.inc.php +++ b/adodb/drivers/adodb-csv.inc.php @@ -1,19 +1,30 @@ _insertid; + return $this->_insertid; } - + function _affectedrows() { - return $this->_affectedrows; + return $this->_affectedrows; } - - function &MetaDatabases() + + function MetaDatabases() { return false; } - + // returns true or false function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) { if (strtolower(substr($argHostname,0,7)) !== 'http://') return false; $this->_url = $argHostname; - return true; + return true; } - + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { @@ -71,24 +78,26 @@ function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) $this->_url = $argHostname; return true; } - - function &MetaColumns($table) + + function MetaColumns($table, $normalize=true) { return false; } - - + + // parameters use PostgreSQL convention, not MySQL - function &SelectLimit($sql,$nrows=-1,$offset=-1) + function SelectLimit($sql, $nrows = -1, $offset = -1, $inputarr = false, $secs2cache = 0) { - global $ADODB_FETCH_MODE; - + global $ADODB_FETCH_MODE; + + $nrows = (int) $nrows; + $offset = (int) $offset; $url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=". (($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE). "&offset=$offset"; $err = false; $rs = csv2rs($url,$err,false); - + if ($this->debug) print "$url
$err
"; $at = strpos($err,'::::'); @@ -99,25 +108,25 @@ function &SelectLimit($sql,$nrows=-1,$offset=-1) $this->_errorMsg = substr($err,$at+4,1024); $this->_errorNo = -9999; } - if ($this->_errorNo) + if ($this->_errorNo) if ($fn = $this->raiseErrorFn) { $fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,''); } - - if (is_object($rs)) { - - $rs->databaseType='csv'; + + if (is_object($rs)) { + + $rs->databaseType='csv'; $rs->fetchMode = ($this->fetchMode !== false) ? $this->fetchMode : $ADODB_FETCH_MODE; - $rs->connection = &$this; + $rs->connection = $this; } return $rs; } - + // returns queryID or false - function &_Execute($sql,$inputarr=false) + function _Execute($sql,$inputarr=false) { global $ADODB_FETCH_MODE; - + if (!$this->_bindInputArray && $inputarr) { $sqlarr = explode('?',$sql); $sql = ''; @@ -132,57 +141,57 @@ function &_Execute($sql,$inputarr=false) else $sql .= $v; $i += 1; - + } $sql .= $sqlarr[$i]; - if ($i+1 != sizeof($sqlarr)) + if ($i+1 != sizeof($sqlarr)) print "Input Array does not match ?: ".htmlspecialchars($sql); $inputarr = false; } - + $url = $this->_url.'?sql='.urlencode($sql)."&fetch=". (($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE); $err = false; - - + + $rs = csv2rs($url,$err,false); if ($this->debug) print urldecode($url)."
$err
"; $at = strpos($err,'::::'); - if ($at === false) { + if ($at === false) { $this->_errorMsg = $err; $this->_errorNo = (integer)$err; } else { $this->_errorMsg = substr($err,$at+4,1024); $this->_errorNo = -9999; } - - if ($this->_errorNo) + + if ($this->_errorNo) if ($fn = $this->raiseErrorFn) { $fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr); } if (is_object($rs)) { $rs->fetchMode = ($this->fetchMode !== false) ? $this->fetchMode : $ADODB_FETCH_MODE; - + $this->_affectedrows = $rs->affectedrows; $this->_insertid = $rs->insertid; $rs->databaseType='csv'; - $rs->connection = &$this; + $rs->connection = $this; } return $rs; } - /* Returns: the last error message from previous database operation */ - function ErrorMsg() + /* Returns: the last error message from previous database operation */ + function ErrorMsg() { - return $this->_errorMsg; + return $this->_errorMsg; } - - /* Returns: the last error number from previous database operation */ - function ErrorNo() + + /* Returns: the last error number from previous database operation */ + function ErrorNo() { return $this->_errorNo; } - + // returns true or false function _close() { @@ -191,11 +200,7 @@ function _close() } // class class ADORecordset_csv extends ADORecordset { - function ADORecordset_csv($id,$mode=false) - { - $this->ADORecordset($id,$mode); - } - + function _close() { return true; @@ -203,5 +208,3 @@ function _close() } } // define - -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-db2.inc.php b/adodb/drivers/adodb-db2.inc.php index 72bb0d1..8f616fa 100644 --- a/adodb/drivers/adodb-db2.inc.php +++ b/adodb/drivers/adodb-db2.inc.php @@ -1,137 +1,427 @@ _haserrorfunctions = ADODB_PHPVER >= 0x4050; - } - - // returns true or false - function _connect($argDSN, $argUsername, $argPassword, $argDatabasename) + var $hasGenID = true; + + /* + * Character used to wrap column and table names for escaping special + * characters in column and table names as well as forcing upper and + * lower case + */ + public $nameQuote = '"'; + + /* + * Executed after successful connection + */ + public $connectStmt = ''; + + /* + * Holds the current database name + */ + private $databaseName = ''; + + /* + * Holds information about the stored procedure request + * currently being built + */ + private $storedProcedureParameters = false; + + + function __construct() {} + + protected function _insertID($table = '', $column = '') + { + return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()'); + } + + public function _connect($argDSN, $argUsername, $argPassword, $argDatabasename) + { + return $this->doDB2Connect($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."); + 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) { - $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword); - } else { - $this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword); + if ($persistent) + $db2Function = 'db2_pconnect'; + else + $db2Function = 'db2_connect'; + + /* + * 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; } - if (isset($php_errormsg)) $php_errormsg = ''; - // 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 && $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) { + global $php_errormsg; - - if (!function_exists('db2_connect')) return null; - - // This needs to be set before the connect(). - // Replaces the odbc_binmode() call that was in Execute() - ini_set('ibm_db2.binmode', $this->binmode); - if (isset($php_errormsg)) $php_errormsg = ''; - $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; - - if ($argDatabasename) { - $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword); - } else { - $this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword); + $connectionParameters = array('dsn'=>'', + 'uid'=>'', + 'pwd'=>'', + 'database'=>'', + 'catalogue'=>true + ); + + /* + * 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 (isset($php_errormsg)) $php_errormsg = ''; - $this->_errorMsg = @db2_conn_errormsg(); - if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID); - if (isset($this->connectStmt)) $this->Execute($this->connectStmt); - - return $this->_connectionID != false; + $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; + } + } + + if (!$this->isDsn($argDSN) && $this->isDsn($argDatabasename)) + { + /* + * Switch them around for next test + */ + $temp = $argDSN; + $argDsn = $argDatabasename; + $argDatabasenME = $temp; + } + + 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) + + /** + * 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) - { - // use right() and replace() ? + + /** + * 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) + { if (!$col) $col = $this->sysDate; /* use TO_CHAR() if $fmt is TO_CHAR() allowed fmt */ @@ -139,7 +429,7 @@ function SQLDate($fmt, $col=false) return 'TO_CHAR('.$col.", 'YYYY-MM-DD HH24:MI:SS')"; $s = ''; - + $len = strlen($fmt); for ($i=0; $i < $len; $i++) { if ($s) $s .= $this->concat_operator; @@ -166,7 +456,7 @@ function SQLDate($fmt, $col=false) case 'H': case 'h': if ($len==1) return "hour($col)"; - if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)"; + if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)"; else $s .= "''"; break; case 'i': @@ -192,273 +482,570 @@ function SQLDate($fmt, $col=false) } } return $s; - } - - - function ServerInfo() - { - - if (!empty($this->host) && ADODB_PHPVER >= 0x4300) { - $dsn = strtoupper($this->host); - $first = true; - $found = false; - - if (!function_exists('db2_data_source')) return false; - - while(true) { - - $rez = @db2_data_source($this->_connectionID, - $first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT); - $first = false; - if (!is_array($rez)) break; - if (strtoupper($rez['server']) == $dsn) { - $found = true; - break; - } - } - if (!$found) return ADOConnection::ServerInfo(); - if (!isset($rez['version'])) $rez['version'] = ''; - return $rez; + } + + + function serverInfo() + { + $sql = "SELECT service_level, fixpack_num + FROM TABLE(sysproc.env_get_inst_info()) + AS INSTANCEINFO"; + $row = $this->GetRow($sql); + + + if ($row) { + $info['version'] = $row[0].':'.$row[1]; + $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)); - 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) + + function dropSequence($seqname='adodbseq') { if (empty($this->_dropSeqSQL)) return false; - return $this->Execute(sprintf($this->_dropSeqSQL,$seqname)); + return $this->execute(sprintf($this->_dropSeqSQL,$seqname)); } - - /* - This algorithm is not very efficient, but works even if table locking - is not available. - - Will return false if unable to generate an ID after $MAXLOOPS attempts. - */ - function GenID($seq='adodbseq',$start=1) - { - // if you have to modify the parameter below, your database is overloaded, - // or you need to implement generation of id's yourself! - $num = $this->GetOne("VALUES NEXTVAL FOR $seq"); - return $num; + + function selectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false,$secs2cache=0) + { + $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 + { + $nrows += $offset; + $sql .= " FETCH FIRST $nrows ROWS ONLY "; } + /* + * DB2 has no native support for mid table offset + */ + $rs = ADOConnection::selectLimit($sql,$nrows,$offset,$inputArr); + + } + + return $rs; + } + - function 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(); + if ($this->_errorMsg !== false) + return $this->_errorMsg; + + if (empty($this->_connectionID)) + return @db2_conn_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 (empty($this->_connectionID)) $e = @db2_conn_error(); - else $e = @db2_conn_error($this->_connectionID); - - // bug in 4.0.6, error number can be corrupted string (should be 6 digits) - // so we check and patch - if (strlen($e)<=2) return 0; - return $e; - } else return ADOConnection::ErrorNo(); - } - - - - function BeginTrans() - { - if (!$this->hasTransactions) return false; - if ($this->transOff) return true; + if ($this->_errorCode !== false) + return $this->_errorCode; + + + if (empty($this->_connectionID)) + $e = @db2_conn_error(); + + else + $e = @db2_conn_error($this->_connectionID); + + return $e; + } + + + + function beginTrans() + { + 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; + + function CommitTrans($ok=true) + { + 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; } - + function RollbackTrans() { - if ($this->transOff) return true; + if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; $this->_autocommit = true; - $ret = db2_rollback($this->_connectionID); - db2_autocommit($this->_connectionID,true); + $ret = @db2_rollback($this->_connectionID); + @db2_autocommit($this->_connectionID,true); return $ret; } - - function MetaPrimaryKeys($table) + + /** + * 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); - - if (!$qid) { - $ADODB_FETCH_MODE = $savem; - return false; - } - $rs = new ADORecordSet_db2($qid); + $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 (!$rs) return false; - - $arr =& $rs->GetArray(); - $rs->Close(); - $arr2 = array(); - for ($i=0; $i < sizeof($arr); $i++) { - if ($arr[$i][3]) $arr2[] = $arr[$i][3]; + + if (empty($rows)) + return false; + + 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; - return false; - } - $rs = new ADORecordSet_db2($qid); + + $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; - /* - $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 - */ - 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]; - } - $rs->MoveNext(); + $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; } - $rs->Close(); - return $foreign_key; + return $foreignKeys; } - - - function &MetaTables($ttype=false,$schema=false) + + /** + * 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; + + global $ADODB_FETCH_MODE; + + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - $qid = db2_tables($this->_connectionID); - + + /* + * 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) { - $false = false; - return $false; - } - - $arr =& $rs->GetArray(); - + + if (!$rs) + return false; + + $arr = $rs->getArray(); + $rs->Close(); - $arr2 = array(); - - if ($ttype) { - $isview = strncmp($ttype,'V',1) === 0; - } - for ($i=0; $i < sizeof($arr); $i++) { - if (!$arr[$i][2]) continue; - $type = $arr[$i][3]; - $schemaval = ($schema) ? $arr[$i][1].'.' : ''; - if ($ttype) { - if ($isview) { - if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2]; - } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2]; - } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2]; + + $tableList = array(); + + /* + * 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. + */ + + 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 $arr2; + return $tableList; } - -/* -See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_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 (DB2VER >= 0x0300) -#define SQL_DATETIME 9 -#endif -#define SQL_VARCHAR 12 + /** + * 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) { -/ One-parameter shortcuts for date/time data types / -#if (DB2VER >= 0x0300) -#define SQL_TYPE_DATE 91 -#define SQL_TYPE_TIME 92 -#define SQL_TYPE_TIMESTAMP 93 + global $ADODB_FETCH_MODE; -#define SQL_UNICODE (-95) -#define SQL_UNICODE_VARCHAR (-96) + /* 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() + ); + } + $cols = explode('+',$r[6]); + foreach ($cols as $colIndex=>$col) + { + if ($colIndex == 0) + continue; + $columnName = $this->getMetaCasedValue($col); + $indices[$indexName]['columns'][] = $columnName; + } + + } + + 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) + + * @return array of procedures on current database. + * + */ + public function metaProcedures($procedureNamePattern = null, $catalog = null, $schemaPattern = null) { + + + global $ADODB_FETCH_MODE; + + $metaProcedures = array(); + $procedureSQL = ''; + $catalogSQL = ''; + $schemaSQL = ''; + + $savem = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + + 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 (!$result) + return false; + + 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] + ); + } + + 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 / +#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 (DB2VER >= 0x0300) +#define SQL_DATETIME 9 +#endif +#define SQL_VARCHAR 12 + + +/ One-parameter shortcuts for date/time data types / +#if (DB2VER >= 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 DB2Types($t) { switch ((integer)$t) { - case 1: + case 1: case 12: case 0: case -95: @@ -469,56 +1056,62 @@ function DB2Types($t) return 'X'; case -4: //image return 'B'; - - case 9: + + case 9: case 91: return 'D'; - + case 10: case 11: case 92: case 93: return 'T'; - + case 4: case 5: case -6: return 'I'; - + case -11: // uniqidentifier return 'R'; case -7: //bit return 'L'; - + default: return 'N'; } } - - function &MetaColumns($table) + + 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; - - $rs =& new ADORecordSet_db2($qid); - $ADODB_FETCH_MODE = $savem; - - if (!$rs) 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); + + if (!$rs) + return false; + $rs->_fetch(); - + $retarr = array(); - + /* $rs->fields indices 0 TABLE_QUALIFIER @@ -533,42 +1126,70 @@ function &MetaColumns($table) 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; else $fld->max_length = $rs->fields[7]; - } else + } else $fld->max_length = $rs->fields[7]; - $fld->not_null = !empty($rs->fields[10]); - $fld->scale = $rs->fields[8]; - $fld->primary_key = false; - $retarr[strtoupper($fld->name)] = $fld; - } 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; - $qid = db2_primary_keys($this->_connectionID, "", $schema, $table); - if (empty($qid)) return $false; - - $rs =& new ADORecordSet_db2($qid); - $ADODB_FETCH_MODE = $savem; - - if (!$rs) return $retarr; + $rs->Close(); + 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; + + $rs = new ADORecordSet_db2($qid); + + if (!$rs) + { + $ADODB_FETCH_MODE = $savem; + return $retarr; + } $rs->_fetch(); - + /* $rs->fields indices 0 TABLE_CAT @@ -579,22 +1200,371 @@ function &MetaColumns($table) 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; + $rs->Close(); + + $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; } - - function Prepare($sql) + + /** + * 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"); + } + + + /** + * 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; @@ -602,65 +1572,154 @@ 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) { - GLOBAL $php_errormsg; - if (isset($php_errormsg)) $php_errormsg = ''; + + GLOBAL $php_errormsg; + + if (isset($php_errormsg)) + $php_errormsg = ''; $this->_error = ''; - - if ($inputarr) { - if (is_array($sql)) { + + $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); - - if ($stmtid == false) { + } + else + { + $stmtid = @db2_prepare($this->_connectionID,$sql); + + if ($stmtid == false) + { $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; return false; } } - - if (! db2_execute($stmtid,$inputarr)) { - if ($this->_haserrorfunctions) { - $this->_errorMsg = db2_stmt_errormsg(); - $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)) + { + + /* + * 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; } - - } 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(); + /* + * 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 + + 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 = isset($php_errormsg) ? $php_errormsg : ''; - } else { - if ($this->_haserrorfunctions) { - $this->_errorMsg = db2_stmt_errormsg(); - $this->_errorCode = db2_stmt_error(); - } else - $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; + + $this->_errorMsg = ''; + $this->_errorCode = 0; + + } + else + { + + $this->_errorMsg = @db2_stmt_errormsg(); + $this->_errorCode = @db2_stmt_error(); } return $stmtid; @@ -669,17 +1728,17 @@ function _query($sql,$inputarr=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->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 function _close() { @@ -692,48 +1751,138 @@ 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; + } + } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_db2 extends ADORecordSet { - +class ADORecordSet_db2 extends ADORecordSet { + var $bind = false; - var $databaseType = "db2"; + var $databaseType = "db2"; var $dataProvider = "db2"; var $useFetchArray; - - function ADORecordSet_db2($id,$mode=false) + + function __construct($id,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - + $this->_queryID = $id; } // returns the field object - function &FetchField($offset = -1) - { - $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++) { @@ -744,85 +1893,117 @@ function Fields($colname) return $this->fields[$this->bind[strtoupper($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) { 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); + $rs = $this->GetArray($nrows); return $rs; } - $savem = $this->fetchMode; - $this->fetchMode = ADODB_FETCH_NUM; + $this->Move($offset); - $this->fetchMode = $savem; - - if ($this->fetchMode & ADODB_FETCH_ASSOC) { - $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE); - } - + + $results = array(); $cnt = 0; while (!$this->EOF && $nrows != $cnt) { $results[$cnt++] = $this->fields; $this->MoveNext(); } - + return $results; } - - - function MoveNext() + + 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(ADODB_ASSOC_CASE); - } - 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(ADODB_ASSOC_CASE); - } + return true; + } + + function _fetch() + { + $this->processCoreFetch(); + if ($this->fields) return true; - } + $this->fields = false; return false; } - - function _close() + + 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; + } + } } -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-db2oci.inc.php b/adodb/drivers/adodb-db2oci.inc.php new file mode 100644 index 0000000..eea63d9 --- /dev/null +++ b/adodb/drivers/adodb-db2oci.inc.php @@ -0,0 +1,202 @@ +_connectionID); + + $rs = new ADORecordSet_db2($qid); + + $ADODB_FETCH_MODE = $savem; + if (!$rs) { + $false = false; + return $false; + } + + $arr = $rs->GetArray(); + $rs->Close(); + $arr2 = array(); + // adodb_pr($arr); + if ($ttype) { + $isview = strncmp($ttype,'V',1) === 0; + } + for ($i=0; $i < sizeof($arr); $i++) { + if (!$arr[$i][2]) continue; + $type = $arr[$i][3]; + $schemaval = ($schema) ? $arr[$i][1].'.' : ''; + $name = $schemaval.$arr[$i][2]; + $owner = $arr[$i][1]; + if (substr($name,0,8) == 'EXPLAIN_') continue; + if ($ttype) { + if ($isview) { + if (strncmp($type,'V',1) === 0) $arr2[] = $name; + } else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name; + } else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name; + } + return $arr2; + } + + function _Execute($sql, $inputarr=false ) + { + if ($inputarr) list($sql,$inputarr) = _colonparser($sql, $inputarr); + return parent::_Execute($sql, $inputarr); + } +}; + + +class ADORecordSet_db2oci extends ADORecordSet_db2 { + + var $databaseType = "db2oci"; + +} + +} //define diff --git a/adodb/drivers/adodb-db2ora.inc.php b/adodb/drivers/adodb-db2ora.inc.php new file mode 100644 index 0000000..d343a8a --- /dev/null +++ b/adodb/drivers/adodb-db2ora.inc.php @@ -0,0 +1,93 @@ + $_COLONSZ) return $p[1]; + $_COLONARR[] = $v; + return '?'; +} + +/** + * smart remapping of :0, :1 bind vars to ? ? + * @param string $sql SQL statement + * @param array $arr parameters + * @return array + */ +function _colonscope($sql,$arr) +{ +global $_COLONARR,$_COLONSZ; + + $_COLONARR = array(); + $_COLONSZ = sizeof($arr); + + $sql2 = preg_replace_callback('/(:[0-9]+)/', '_colontrack', $sql); + + if (empty($_COLONARR)) return array($sql,$arr); + + foreach($_COLONARR as $k => $v) { + $arr2[] = $arr[$v]; + } + + return array($sql2,$arr2); +} + +class ADODB_db2oci extends ADODB_db2 { + var $databaseType = "db2oci"; + var $sysTimeStamp = 'sysdate'; + var $sysDate = 'trunc(sysdate)'; + + function _Execute($sql, $inputarr = false) + { + if ($inputarr) list($sql,$inputarr) = _colonscope($sql, $inputarr); + return parent::_Execute($sql, $inputarr); + } +}; + + +class ADORecordSet_db2oci extends ADORecordSet_odbc { + + var $databaseType = "db2oci"; + +} + +} //define diff --git a/adodb/drivers/adodb-fbsql.inc.php b/adodb/drivers/adodb-fbsql.inc.php index 4911dd4..0fb895a 100644 --- a/adodb/drivers/adodb-fbsql.inc.php +++ b/adodb/drivers/adodb-fbsql.inc.php @@ -1,12 +1,24 @@ . - 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(); @@ -17,27 +29,23 @@ class ADODB_fbsql extends ADOConnection { var $databaseType = 'fbsql'; var $hasInsertID = true; - var $hasAffectedRows = true; - var $metaTablesSQL = "SHOW TABLES"; + var $hasAffectedRows = true; + var $metaTablesSQL = "SHOW TABLES"; var $metaColumnsSQL = "SHOW COLUMNS FROM %s"; var $fmtTimeStamp = "'Y-m-d H:i:s'"; var $hasLimit = false; - - function ADODB_fbsql() - { - } - - function _insertid() + + protected function _insertID($table = '', $column = '') { return fbsql_insert_id($this->_connectionID); } - + function _affectedrows() { return fbsql_affected_rows($this->_connectionID); } - - function &MetaDatabases() + + function MetaDatabases() { $qid = fbsql_list_dbs($this->_connectionID); $arr = array(); @@ -61,39 +69,39 @@ function Concat() if (sizeof($arr) > 0) return "CONCAT($s)"; else return ''; } - + // returns true or false function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) { $this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword); if ($this->_connectionID === false) return false; if ($argDatabasename) return $this->SelectDB($argDatabasename); - return true; + return true; } - + // returns true or false function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { $this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword); if ($this->_connectionID === false) return false; if ($argDatabasename) return $this->SelectDB($argDatabasename); - return true; + return true; } - - function &MetaColumns($table) + + function MetaColumns($table, $normalize=true) { if ($this->metaColumnsSQL) { - + $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table)); - + if ($rs === false) return false; - + $retarr = array(); while (!$rs->EOF){ $fld = new ADOFieldObject(); $fld->name = $rs->fields[0]; $fld->type = $rs->fields[1]; - + // split type into type(length): if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) { $fld->type = $query_array[1]; @@ -105,89 +113,89 @@ function &MetaColumns($table) $fld->primary_key = ($rs->fields[3] == 'PRI'); $fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false); $fld->binary = (strpos($fld->type,'blob') !== false); - - $retarr[strtoupper($fld->name)] = $fld; + + $retarr[strtoupper($fld->name)] = $fld; $rs->MoveNext(); } $rs->Close(); - return $retarr; + return $retarr; } return false; } - + // returns true or false - function SelectDB($dbName) + function SelectDB($dbName) { $this->database = $dbName; if ($this->_connectionID) { - return @fbsql_select_db($dbName,$this->_connectionID); + return @fbsql_select_db($dbName,$this->_connectionID); } - else return false; + else return false; } - - + + // returns queryID or false - function _query($sql,$inputarr) + function _query($sql,$inputarr=false) { return fbsql_query("$sql;",$this->_connectionID); } - /* Returns: the last error message from previous database operation */ - function ErrorMsg() + /* Returns: the last error message from previous database operation */ + function ErrorMsg() { $this->_errorMsg = @fbsql_error($this->_connectionID); return $this->_errorMsg; } - - /* Returns: the last error number from previous database operation */ - function ErrorNo() + + /* Returns: the last error number from previous database operation */ + function ErrorNo() { return @fbsql_errno($this->_connectionID); } - + // returns true or false function _close() { return @fbsql_close($this->_connectionID); } - + } - + /*-------------------------------------------------------------------------------------- Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_fbsql extends ADORecordSet{ - +class ADORecordSet_fbsql extends ADORecordSet{ + var $databaseType = "fbsql"; var $canSeek = true; - - function ADORecordSet_fbsql($queryID,$mode=false) + + function __construct($queryID,$mode=false) { - if (!$mode) { + if (!$mode) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } switch ($mode) { case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break; case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break; - case ADODB_FETCH_BOTH: + case ADODB_FETCH_BOTH: default: $this->fetchMode = FBSQL_BOTH; break; } - return $this->ADORecordSet($queryID); + parent::__construct($queryID); } - + function _initrs() { GLOBAL $ADODB_COUNTRECS; $this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1; $this->_numOfFields = @fbsql_num_fields($this->_queryID); } - - function &FetchField($fieldOffset = -1) { + + function FetchField($fieldOffset = -1) { if ($fieldOffset != -1) { $o = @fbsql_fetch_field($this->_queryID, $fieldOffset); //$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable @@ -198,25 +206,25 @@ function &FetchField($fieldOffset = -1) { $o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable //$o->max_length = -1; } - + return $o; } - + function _seek($row) { return @fbsql_data_seek($this->_queryID,$row); } - + function _fetch($ignore_fields=false) { $this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode); return ($this->fields == true); } - + function _close() { - return @fbsql_free_result($this->_queryID); + return @fbsql_free_result($this->_queryID); } - + function MetaType($t,$len=-1,$fieldobj=false) { if (is_object($t)) { @@ -227,40 +235,39 @@ function MetaType($t,$len=-1,$fieldobj=false) $len = -1; // fbsql max_length is not accurate switch (strtoupper($t)) { case 'CHARACTER': - case 'CHARACTER VARYING': - case 'BLOB': - case 'CLOB': - case 'BIT': - case 'BIT VARYING': + case 'CHARACTER VARYING': + case 'BLOB': + case 'CLOB': + case 'BIT': + case 'BIT VARYING': if ($len <= $this->blobSize) return 'C'; - + // so we have to check whether binary... case 'IMAGE': - case 'LONGBLOB': + case 'LONGBLOB': case 'BLOB': case 'MEDIUMBLOB': return !empty($fieldobj->binary) ? 'B' : 'X'; - + case 'DATE': return 'D'; - + case 'TIME': case 'TIME WITH TIME ZONE': - case 'TIMESTAMP': + case 'TIMESTAMP': case 'TIMESTAMP WITH TIME ZONE': return 'T'; - + case 'PRIMARY_KEY': return 'R'; case 'INTEGER': - case 'SMALLINT': + case 'SMALLINT': case 'BOOLEAN': - + if (!empty($fieldobj->primary_key)) return 'R'; else return 'I'; - - default: return 'N'; + + default: return ADODB_DEFAULT_METATYPE; } } } //class } // defined -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-firebird.inc.php b/adodb/drivers/adodb-firebird.inc.php index a05d227..2fafbe4 100644 --- a/adodb/drivers/adodb-firebird.inc.php +++ b/adodb/drivers/adodb-firebird.inc.php @@ -1,36 +1,136 @@ ADODB_ibase(); + var $ansiOuter = true; + var $hasAffectedRows = true; + var $poorAffectedRows = false; + var $blobEncodeType = 'C'; + var $role = false; + var $nameQuote = ''; /// string to use to quote identifiers and names + + function __construct() + { + // Ignore IBASE_DEFAULT we want a more practical transaction! + // if (defined('IBASE_DEFAULT')) $this->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() { $arr['dialect'] = $this->dialect; switch($arr['dialect']) { - case '': + case '': case '1': $s = 'Firebird Dialect 1'; break; case '2': $s = 'Firebird Dialect 2'; break; default: @@ -40,38 +140,781 @@ function ServerInfo() $arr['description'] = $s; 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 ROWS 5 -- get 5 rows // SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0) { $nrows = (integer) $nrows; $offset = (integer) $offset; $str = 'SELECT '; - if ($nrows >= 0) $str .= "FIRST $nrows "; + if ($nrows >= 0) $str .= "FIRST $nrows "; $str .=($offset>=0) ? "SKIP $offset " : ''; - - $sql = preg_replace('/^[ \t]*select/i',$str,$sql); + + $sql = preg_replace('/^[ \t]*select/i',$str,$sql); if ($secs) - $rs =& $this->CacheExecute($secs,$sql,$inputarr); + $rs = $this->CacheExecute($secs,$sql,$inputarr); else - $rs =& $this->Execute($sql,$inputarr); - + $rs = $this->Execute($sql,$inputarr); + return $rs; } - - -}; - -class ADORecordSet_firebird extends ADORecordSet_ibase { - - var $databaseType = "firebird"; - - function ADORecordSet_firebird($id,$mode=false) +} + +/*-------------------------------------------------------------------------------------- + Class Name: Recordset +--------------------------------------------------------------------------------------*/ + +class ADORecordset_firebird extends ADORecordSet +{ + + var $databaseType = "firebird"; + var $bind=false; + var $_cacheType; + + function __construct($id,$mode=false) + { + 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->ADORecordSet_ibase($id,$mode); + $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; + } + } + } -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-ibase.inc.php b/adodb/drivers/adodb-ibase.inc.php index 812deb8..69de30d 100644 --- a/adodb/drivers/adodb-ibase.inc.php +++ b/adodb/drivers/adodb-ibase.inc.php @@ -1,27 +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(); @@ -53,26 +51,26 @@ class ADODB_ibase extends ADOConnection { var $poorAffectedRows = true; var $blobEncodeType = 'C'; var $role = false; - - function ADODB_ibase() - { - if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT; - } - - - // returns true or false + + function __construct() + { + if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT; + } + + + // returns true or false function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false) - { + { if (!function_exists('ibase_pconnect')) return null; if ($argDatabasename) $argHostname .= ':'.$argDatabasename; $fn = ($persist) ? 'ibase_pconnect':'ibase_connect'; if ($this->role) $this->_connectionID = $fn($argHostname,$argUsername,$argPassword, $this->charSet,$this->buffers,$this->dialect,$this->role); - else + else $this->_connectionID = $fn($argHostname,$argUsername,$argPassword, $this->charSet,$this->buffers,$this->dialect); - + if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html $this->replaceQuote = "''"; } @@ -80,14 +78,18 @@ function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$pe $this->_handleerror(); return false; } - + // PHP5 change. if (function_exists('ibase_timefmt')) { ibase_timefmt($this->ibase_datefmt,IBASE_DATE ); - if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP ); - else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP ); + if ($this->dialect == 1) { + ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP ); + } + else { + ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP ); + } ibase_timefmt($this->ibase_timefmt,IBASE_TIME ); - + } else { ini_set("ibase.timestampformat", $this->ibase_timestampfmt); ini_set("ibase.dateformat", $this->ibase_datefmt); @@ -95,34 +97,37 @@ function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$pe } return true; } - // returns true or false + + // 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'); - + { + if ($internalKey) { + return array('RDB$DB_KEY'); + } + $table = strtoupper($table); - + $sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME - FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME + FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\' ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION'; $a = $this->GetCol($sql,false,true); if ($a && sizeof($a)>0) return $a; - return false; + return false; } - + function ServerInfo() { $arr['dialect'] = $this->dialect; switch($arr['dialect']) { - case '': + case '': case '1': $s = 'Interbase 5.5 or earlier'; break; case '2': $s = 'Interbase 5.6'; break; default: @@ -134,135 +139,146 @@ function ServerInfo() } function BeginTrans() - { + { if ($this->transOff) return true; $this->transCnt += 1; $this->autoCommit = false; - $this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID); + $this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID); return $this->_transactionID; } - - function CommitTrans($ok=true) - { - if (!$ok) return $this->RollbackTrans(); - if ($this->transOff) return true; - if ($this->transCnt) $this->transCnt -= 1; + + 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 '; + //print ' commit '; $ret = ibase_commit($this->_transactionID); } $this->_transactionID = false; return $ret; } - + // there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently. // it appears that ibase extension cannot support multiple concurrent queryid's - function &_Execute($sql,$inputarr=false) + function _Execute($sql,$inputarr=false) { global $ADODB_COUNTRECS; - + if ($this->_logsql) { $savecrecs = $ADODB_COUNTRECS; $ADODB_COUNTRECS = true; // force countrecs - $ret =& ADOConnection::_Execute($sql,$inputarr); + $ret = ADOConnection::_Execute($sql,$inputarr); $ADODB_COUNTRECS = $savecrecs; } else { - $ret =& ADOConnection::_Execute($sql,$inputarr); + $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 = ibase_rollback($this->_transactionID); - $this->_transactionID = false; - + if ($this->_transactionID) { + $ret = ibase_rollback($this->_transactionID); + } + $this->_transactionID = false; + return $ret; } - - function &MetaIndexes ($table, $primary = FALSE, $owner=false) - { - // save old fetch mode - global $ADODB_FETCH_MODE; - $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(); + + 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() - ); - } + 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]; - } + while ($row1 = $rs1->FetchRow()) { + $indexes[$index]['columns'][$row1[2]] = $row1[1]; + } + } + // restore fetchmode + if (isset($savem)) { + $this->SetFetchMode($savem); } - // restore fetchmode - if (isset($savem)) { - $this->SetFetchMode($savem); - } - $ADODB_FETCH_MODE = $save; - - return $indexes; + $ADODB_FETCH_MODE = $save; + + return $indexes; } - + // See http://community.borland.com/article/0,1410,25844,00.html - function RowLock($tables,$where,$col) + function RowLock($tables,$where,$col=false) { - if ($this->autoCommit) $this->BeginTrans(); + if ($this->autoCommit) { + $this->BeginTrans(); + } $this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim? return 1; } - - - function CreateSequence($seqname,$startID=1) + + + function CreateSequence($seqname = 'adodbseq', $startID = 1) { $ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" )); if (!$ok) return false; return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';'); } - - function DropSequence($seqname) + + function DropSequence($seqname = 'adodbseq') { $seqname = strtoupper($seqname); $this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'"); } - + function GenID($seqname='adodbseq',$startID=1) { $getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE"); @@ -272,17 +288,23 @@ function GenID($seqname='adodbseq',$startID=1) $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(); - + if ($rs && !$rs->EOF) { + $this->genID = (integer) reset($rs->fields); + } + else { + $this->genID = 0; // false + } + + if ($rs) { + $rs->Close(); + } + return $this->genID; } - function SelectDB($dbName) + function SelectDB($dbName) { - return false; + return false; } function _handleerror() @@ -290,13 +312,13 @@ function _handleerror() $this->_errorMsg = ibase_errmsg(); } - function ErrorNo() + function ErrorNo() { if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1]; else return 0; } - function ErrorMsg() + function ErrorMsg() { return $this->_errorMsg; } @@ -308,10 +330,10 @@ function Prepare($sql) 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? + // returns query ID if successful, otherwise false + // there have been reports of problems with nested queries - the code is probably not re-entrant? function _query($sql,$iarr=false) - { + { if (!$this->autoCommit && $this->_transactionID) { $conn = $this->_transactionID; @@ -324,60 +346,44 @@ 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 (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) { + ibase_commit($this->_connectionID); } - if ($docommit && $ret === true) ibase_commit($this->_connectionID); $this->_handleerror(); return $ret; } - // returns true or false - function _close() - { - if (!$this->autoCommit) @ibase_rollback($this->_connectionID); + // returns true or false + function _close() + { + if (!$this->autoCommit) { + @ibase_rollback($this->_connectionID); + } return @ibase_close($this->_connectionID); - } - + } + //OPN STUFF start function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3) { @@ -385,27 +391,27 @@ function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision $fld->max_length = $flen; $fld->scale = null; switch($ftype){ - case 7: + case 7: case 8: if ($dialect3) { - switch($fsubtype){ - case 0: - $fld->type = ($ftype == 7 ? 'smallint' : 'integer'); - break; - case 1: - $fld->type = 'numeric'; + 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'; + break; + case 2: + $fld->type = 'decimal'; $fld->max_length = $fprecision; $fld->scale = $fscale; - break; - } // switch + break; + } // switch } else { if ($fscale !=0) { - $fld->type = 'decimal'; + $fld->type = 'decimal'; $fld->scale = $fscale; $fld->max_length = ($ftype == 7 ? 4 : 9); } else { @@ -413,25 +419,25 @@ function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision } } break; - case 16: + case 16: if ($dialect3) { - switch($fsubtype){ - case 0: - $fld->type = 'decimal'; + switch($fsubtype){ + case 0: + $fld->type = 'decimal'; $fld->max_length = 18; $fld->scale = 0; - break; - case 1: - $fld->type = 'numeric'; + break; + case 1: + $fld->type = 'numeric'; $fld->max_length = $fprecision; $fld->scale = $fscale; - break; - case 2: - $fld->type = 'decimal'; + break; + case 2: + $fld->type = 'decimal'; $fld->max_length = $fprecision; $fld->scale = $fscale; - break; - } // switch + break; + } // switch } break; case 10: @@ -442,7 +448,7 @@ function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision break; case 27: if ($fscale !=0) { - $fld->type = 'decimal'; + $fld->type = 'decimal'; $fld->max_length = 15; $fld->scale = 5; } else { @@ -451,7 +457,7 @@ function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision break; case 35: if ($dialect3) { - $fld->type = 'timestamp'; + $fld->type = 'timestamp'; } else { $fld->type = 'date'; } @@ -475,22 +481,23 @@ function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision } // switch } //OPN STUFF end - // returns array of ADOFieldObjects for current table - function &MetaColumns($table) + + // 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); @@ -502,16 +509,16 @@ function &MetaColumns($table) $this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3); if (isset($rs->fields[1]) && $rs->fields[1]) { $fld->not_null = true; - } + } if (isset($rs->fields[2])) { - + $fld->has_default = true; $d = substr($rs->fields[2],strlen('default ')); switch ($fld->type) { case 'smallint': case 'integer': $fld->default_value = (int) $d; break; - case 'char': + case 'char': case 'blob': case 'text': case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break; @@ -527,135 +534,129 @@ function &MetaColumns($table) $fld->sub_type = null; } //OPN STUFF end - if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld; + if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld; else $retarr[strtoupper($fld->name)] = $fld; - + $rs->MoveNext(); } $rs->Close(); if ( empty($retarr)) return $false; - else return $retarr; + else return $retarr; } - - function BlobEncode( $blob ) + + function BlobEncode( $blob ) { $blobid = ibase_blob_create( $this->_connectionID); ibase_blob_add( $blobid, $blob ); return ibase_blob_close( $blobid ); } - - // since we auto-decode all blob's since 2.42, + + // since we auto-decode all blob's since 2.42, // BlobDecode should not do any transforms function BlobDecode($blob) { - return $blob; + return $blob; } - - - - + + + + // old blobdecode function // still used to auto-decode all blob's - function _BlobDecode_old( $blob ) + function _BlobDecode_old( $blob ) { $blobid = ibase_blob_open($this->_connectionID, $blob ); $realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet - while($string = ibase_blob_get($blobid, 8192)){ - $realblob .= $string; + while($string = ibase_blob_get($blobid, 8192)){ + $realblob .= $string; } ibase_blob_close( $blobid ); return( $realblob ); - } - - function _BlobDecode( $blob ) - { - 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 ); - } - - if( $blob_data[0] > $this->maxblobsize ) { - - $realblob = ibase_blob_get($blobid, $this->maxblobsize); - - while($string = ibase_blob_get($blobid, 8192)){ - $realblob .= $string; - } - } else { - $realblob = ibase_blob_get($blobid, $blob_data[0]); - } - - ibase_blob_close( $blobid ); - return( $realblob ); - } - - function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') - { - $fd = fopen($path,'rb'); - if ($fd === false) return false; - $blob_id = ibase_blob_create($this->_connectionID); - - /* fill with data */ - - while ($val = fread($fd,32768)){ - ibase_blob_add($blob_id, $val); - } - - /* close and get $blob_id_str for inserting into table */ - $blob_id_str = ibase_blob_close($blob_id); - - fclose($fd); - return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; - } - + } + + function _BlobDecode( $blob ) + { + $blob_data = ibase_blob_info($this->_connectionID, $blob ); + $blobid = ibase_blob_open($this->_connectionID, $blob ); + + if( $blob_data[0] > $this->maxblobsize ) { + + $realblob = ibase_blob_get($blobid, $this->maxblobsize); + + while($string = ibase_blob_get($blobid, 8192)){ + $realblob .= $string; + } + } else { + $realblob = ibase_blob_get($blobid, $blob_data[0]); + } + + ibase_blob_close( $blobid ); + return( $realblob ); + } + + function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') + { + $fd = fopen($path,'rb'); + if ($fd === false) return false; + $blob_id = ibase_blob_create($this->_connectionID); + + /* fill with data */ + + while ($val = fread($fd,32768)){ + ibase_blob_add($blob_id, $val); + } + + /* close and get $blob_id_str for inserting into table */ + $blob_id_str = ibase_blob_close($blob_id); + + fclose($fd); + return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; + } + /* Insert a null into the blob field of the table first. Then use UpdateBlob to store the blob. - + Usage: - + $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1'); */ - function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') - { - $blob_id = ibase_blob_create($this->_connectionID); - - // ibase_blob_add($blob_id, $val); - - // replacement that solves the problem by which only the first modulus 64K / - // of $val are stored at the blob field //////////////////////////////////// + function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') + { + $blob_id = ibase_blob_create($this->_connectionID); + + // ibase_blob_add($blob_id, $val); + + // replacement that solves the problem by which only the first modulus 64K / + // of $val are stored at the blob field //////////////////////////////////// // Thx Abel Berenstein aberenstein#afip.gov.ar - $len = strlen($val); - $chunk_size = 32768; - $tail_size = $len % $chunk_size; - $n_chunks = ($len - $tail_size) / $chunk_size; - - for ($n = 0; $n < $n_chunks; $n++) { - $start = $n * $chunk_size; - $data = substr($val, $start, $chunk_size); - ibase_blob_add($blob_id, $data); - } - + $len = strlen($val); + $chunk_size = 32768; + $tail_size = $len % $chunk_size; + $n_chunks = ($len - $tail_size) / $chunk_size; + + for ($n = 0; $n < $n_chunks; $n++) { + $start = $n * $chunk_size; + $data = substr($val, $start, $chunk_size); + ibase_blob_add($blob_id, $data); + } + if ($tail_size) { - $start = $n_chunks * $chunk_size; - $data = substr($val, $start, $tail_size); - ibase_blob_add($blob_id, $data); - } - // end replacement ///////////////////////////////////////////////////////// - - $blob_id_str = ibase_blob_close($blob_id); - - return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; - - } - - + $start = $n_chunks * $chunk_size; + $data = substr($val, $start, $tail_size); + ibase_blob_add($blob_id, $data); + } + // end replacement ///////////////////////////////////////////////////////// + + $blob_id_str = ibase_blob_close($blob_id); + + return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; + + } + + function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB') { $blob_id = ibase_blob_create($this->_connectionID); @@ -663,15 +664,15 @@ function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB') $blob_id_str = ibase_blob_close($blob_id); return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; } - + // Format date column in sql string given an input format that understands Y M D // Only since Interbase 6.0 - uses EXTRACT // problem - does not zero-fill the day and month yet function SQLDate($fmt, $col=false) - { + { if (!$col) $col = $this->sysDate; $s = ''; - + $len = strlen($fmt); for ($i=0; $i < $len; $i++) { if ($s) $s .= '||'; @@ -695,16 +696,16 @@ function SQLDate($fmt, $col=false) break; case 'H': case 'h': - $s .= "(extract(hour from $col))"; - break; + $s .= "(extract(hour from $col))"; + break; case 'I': case 'i': - $s .= "(extract(minute from $col))"; - break; + $s .= "(extract(minute from $col))"; + break; case 'S': case 's': - $s .= "CAST((extract(second from $col)) AS INTEGER)"; - break; + $s .= "CAST((extract(second from $col)) AS INTEGER)"; + break; default: if ($ch == '\\') { @@ -720,7 +721,7 @@ function SQLDate($fmt, $col=false) } /*-------------------------------------------------------------------------------------- - Class Name: Recordset + Class Name: Recordset --------------------------------------------------------------------------------------*/ class ADORecordset_ibase extends ADORecordSet @@ -729,13 +730,13 @@ class ADORecordset_ibase extends ADORecordSet var $databaseType = "ibase"; var $bind=false; var $_cacheType; - - function ADORecordset_ibase($id,$mode=false) + + function __construct($id,$mode=false) { global $ADODB_FETCH_MODE; - + $this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode; - $this->ADORecordSet($id); + parent::__construct($id); } /* Returns: an object containing field information. @@ -743,33 +744,34 @@ function ADORecordset_ibase($id,$mode=false) fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by fetchField() is retrieved. */ - function &FetchField($fieldOffset = -1) - { - $fld = new ADOFieldObject; - $ibf = ibase_field_info($this->_queryID,$fieldOffset); - switch (ADODB_ASSOC_CASE) { - case 2: // the default - $fld->name = ($ibf['alias']); - if (empty($fld->name)) $fld->name = ($ibf['name']); - break; - case 0: - $fld->name = strtoupper($ibf['alias']); - if (empty($fld->name)) $fld->name = strtoupper($ibf['name']); - break; - case 1: - $fld->name = strtolower($ibf['alias']); - if (empty($fld->name)) $fld->name = strtolower($ibf['name']); - break; - } - - $fld->type = $ibf['type']; - $fld->max_length = $ibf['length']; - - /* This needs to be populated from the metadata */ - $fld->not_null = false; - $fld->has_default = false; - $fld->default_value = 'null'; - return $fld; + function FetchField($fieldOffset = -1) + { + $fld = new ADOFieldObject; + $ibf = ibase_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() @@ -778,53 +780,53 @@ function _initrs() $this->_numOfFields = @ibase_num_fields($this->_queryID); // cache types for blob decode check - for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { - $f1 = $this->FetchField($i); + for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { + $f1 = $this->FetchField($i); $this->_cacheType[] = $f1->type; - } + } } function _seek($row) { return false; } - - function _fetch() + + function _fetch() { - $f = @ibase_fetch_row($this->_queryID); + $f = @ibase_fetch_row($this->_queryID); if ($f === false) { $this->fields = false; return false; } // OPN stuff start - optimized // fix missing nulls and decode blobs automatically - + global $ADODB_ANSI_PADDING_OFF; //$ADODB_ANSI_PADDING_OFF=1; $rtrim = !empty($ADODB_ANSI_PADDING_OFF); - - for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { + + for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { if ($this->_cacheType[$i]=="BLOB") { - if (isset($f[$i])) { - $f[$i] = $this->connection->_BlobDecode($f[$i]); - } else { - $f[$i] = null; - } - } else { - if (!isset($f[$i])) { - $f[$i] = null; + if (isset($f[$i])) { + $f[$i] = $this->connection->_BlobDecode($f[$i]); + } else { + $f[$i] = null; + } + } else { + if (!isset($f[$i])) { + $f[$i] = null; } else if ($rtrim && is_string($f[$i])) { $f[$i] = rtrim($f[$i]); } - } - } - // OPN stuff end - + } + } + // OPN stuff end + $this->fields = $f; if ($this->fetchMode == ADODB_FETCH_ASSOC) { - $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE); + $this->fields = $this->GetRowAssoc(); } else if ($this->fetchMode == ADODB_FETCH_BOTH) { - $this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE)); + $this->fields = array_merge($this->fields,$this->GetRowAssoc()); } return true; } @@ -840,13 +842,13 @@ function Fields($colname) $this->bind[strtoupper($o->name)] = $i; } } - + return $this->fields[$this->bind[strtoupper($colname)]]; - + } - - function _close() + + function _close() { return @ibase_free_result($this->_queryID); } @@ -861,7 +863,7 @@ function MetaType($t,$len=-1,$fieldobj=false) switch (strtoupper($t)) { case 'CHAR': return 'C'; - + case 'TEXT': case 'VARCHAR': case 'VARYING': @@ -869,19 +871,18 @@ function MetaType($t,$len=-1,$fieldobj=false) return 'X'; case 'BLOB': return 'B'; - + case 'TIMESTAMP': case 'DATE': return 'D'; case 'TIME': return 'T'; //case 'T': return 'T'; //case 'L': return 'L'; - case 'INT': + case 'INT': case 'SHORT': case 'INTEGER': return 'I'; - default: return 'N'; + default: return ADODB_DEFAULT_METATYPE; } } } -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-informix.inc.php b/adodb/drivers/adodb-informix.inc.php index a91fe65..8e99137 100644 --- a/adodb/drivers/adodb-informix.inc.php +++ b/adodb/drivers/adodb-informix.inc.php @@ -1,17 +1,27 @@ ADORecordset_informix72($id,$mode); - } } -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-informix72.inc.php b/adodb/drivers/adodb-informix72.inc.php index 0b202a6..a9c43e2 100644 --- a/adodb/drivers/adodb-informix72.inc.php +++ b/adodb/drivers/adodb-informix72.inc.php @@ -1,18 +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(); @@ -31,7 +40,7 @@ class ADODB_informix72 extends ADOConnection { var $metaTablesSQL="select tabname,tabtype from systables where tabtype in ('T','V') and owner!='informix'"; //Don't get informix tables and pseudo-tables - var $metaColumnsSQL = + var $metaColumnsSQL = "select c.colname, c.coltype, c.collength, d.default,c.colno from syscolumns c, systables t,outer sysdefaults d where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno @@ -53,26 +62,26 @@ class ADODB_informix72 extends ADOConnection { var $sysDate = 'TODAY'; var $sysTimeStamp = 'CURRENT'; var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0 - - function ADODB_informix72() + + function __construct() { // alternatively, use older method: //putenv("DBDATE=Y4MD-"); - + // force ISO date format putenv('GL_DATE=%Y-%m-%d'); - + if (function_exists('ifx_byteasvarchar')) { - ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. - ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. + ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. + ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in memory, and mode "1" means save Byte-Blobs in a file. } } - + function ServerInfo() { if (isset($this->version)) return $this->version; - + $arr['description'] = $this->GetOne("select DBINFO('version','full') from systables where tabid = 1"); $arr['version'] = $this->GetOne("select DBINFO('version','major') || DBINFO('version','minor') from systables where tabid = 1"); $this->version = $arr; @@ -81,7 +90,7 @@ function ServerInfo() - function _insertid() + protected function _insertID($table = '', $column = '') { $sqlca =ifx_getsqlca($this->lastQuery); return @$sqlca["sqlerrd1"]; @@ -104,8 +113,8 @@ function BeginTrans() return true; } - function CommitTrans($ok=true) - { + function CommitTrans($ok=true) + { if (!$ok) return $this->RollbackTrans(); if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; @@ -123,16 +132,16 @@ function RollbackTrans() return true; } - function RowLock($tables,$where,$flds='1 as ignore') + function RowLock($tables,$where,$col='1 as adodbignore') { if ($this->_autocommit) $this->BeginTrans(); - return $this->GetOne("select $flds from $tables where $where for update"); + return $this->GetOne("select $col from $tables where $where for update"); } /* Returns: the last error message from previous database operation Note: This function is NOT available for Microsoft SQL Server. */ - function ErrorMsg() + function ErrorMsg() { if (!empty($this->_logsql)) return $this->_errorMsg; $this->_errorMsg = ifx_errormsg(); @@ -142,15 +151,60 @@ function ErrorMsg() function ErrorNo() { preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse); - if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; + if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; return 0; } - - function &MetaColumns($table) + + 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); + + } + $procedures = array (); + + // get index details + + $likepattern = ''; + if ($NamePattern) { + $likepattern = " WHERE procname LIKE '".$NamePattern."'"; + } + + $rs = $this->Execute('SELECT procname, isproc FROM sysprocedures'.$likepattern); + + if (is_object($rs)) { + // parse index data into array + + while ($row = $rs->FetchRow()) { + $procedures[$row[0]] = array( + 'type' => ($row[1] == 'f' ? 'FUNCTION' : 'PROCEDURE'), + 'catalog' => '', + 'schema' => '', + 'remarks' => '' + ); + } + } + + // restore fetchmode + if (isset($savem)) { + $this->SetFetchMode($savem); + } + $ADODB_FETCH_MODE = $save; + + return $procedures; + } + + function MetaColumns($table, $normalize=true) { global $ADODB_FETCH_MODE; - + $false = false; if (!empty($this->metaColumnsSQL)) { $save = $ADODB_FETCH_MODE; @@ -187,19 +241,19 @@ function &MetaColumns($table) $fld->has_default = 0; } - $retarr[strtolower($fld->name)] = $fld; + $retarr[strtolower($fld->name)] = $fld; $rs->MoveNext(); } $rs->Close(); $rspkey->Close(); //!eos - return $retarr; + return $retarr; } return $false; } - - function &xMetaColumns($table) + + function xMetaColumns($table) { return ADOConnection::MetaColumns($table,false); } @@ -219,7 +273,7 @@ function MetaForeignKeys($table, $owner=false, $upper=false) //!Eos $rs = $this->Execute($sql); if (!$rs || $rs->EOF) return false; - $arr =& $rs->GetArray(); + $arr = $rs->GetArray(); $a = array(); foreach($arr as $v) { $coldest=$this->metaColumnNames($v["tabname"]); @@ -247,15 +301,15 @@ function BlobDecode($blobid) { return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid); } - + // returns true or false function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) { if (!function_exists('ifx_connect')) return null; - + $dbs = $argDatabasename . "@" . $argHostname; - if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); - putenv("INFORMIXSERVER=".trim($argHostname)); + if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); + putenv("INFORMIXSERVER=".trim($argHostname)); $this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword); if ($this->_connectionID === false) return false; #if ($argDatabasename) return $this->SelectDB($argDatabasename); @@ -266,9 +320,9 @@ function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) { if (!function_exists('ifx_connect')) return null; - + $dbs = $argDatabasename . "@" . $argHostname; - putenv("INFORMIXSERVER=".trim($argHostname)); + putenv("INFORMIXSERVER=".trim($argHostname)); $this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword); if ($this->_connectionID === false) return false; #if ($argDatabasename) return $this->SelectDB($argDatabasename); @@ -284,10 +338,10 @@ function Prepare($sql) } */ // returns query ID if successful, otherwise false - function _query($sql,$inputarr) + function _query($sql,$inputarr=false) { global $ADODB_COUNTRECS; - + // String parameters have to be converted using ifx_create_char if ($inputarr) { foreach($inputarr as $v) { @@ -331,7 +385,10 @@ function _query($sql,$inputarr) function _close() { $this->lastQuery = false; - return ifx_close($this->_connectionID); + if($this->_connectionID) { + return ifx_close($this->_connectionID); + } + return true; } } @@ -346,14 +403,14 @@ class ADORecordset_informix72 extends ADORecordSet { var $canSeek = true; var $_fieldprops = false; - function ADORecordset_informix72($id,$mode=false) + function __construct($id,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - return $this->ADORecordSet($id); + parent::__construct($id); } @@ -362,14 +419,14 @@ function ADORecordset_informix72($id,$mode=false) Get column information in the Recordset object. fetchField() can be used in order to obtain information about fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by fetchField() is retrieved. */ - function &FetchField($fieldOffset = -1) + function FetchField($fieldOffset = -1) { if (empty($this->_fieldprops)) { $fp = ifx_fieldproperties($this->_queryID); foreach($fp as $k => $v) { $o = new ADOFieldObject; $o->name = $k; - $arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE" + $arr = explode(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE" $o->type = $arr[0]; $o->max_length = $arr[1]; $this->_fieldprops[] = $o; @@ -443,12 +500,15 @@ function _fetch($ignore_fields=false) is running. All associated result memory for the specified result identifier will automatically be freed. */ function _close() { - return ifx_free_result($this->_queryID); + if($this->_queryID) { + return ifx_free_result($this->_queryID); + } + return true; } } /** !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){ @@ -470,6 +530,3 @@ function ifx_props($coltype,$collength){ } return array($mtype,$length,$precision,$nullable); } - - -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-ldap.inc.php b/adodb/drivers/adodb-ldap.inc.php index 27706db..323b358 100644 --- a/adodb/drivers/adodb-ldap.inc.php +++ b/adodb/drivers/adodb-ldap.inc.php @@ -1,64 +1,75 @@ + */ // security - hide paths if (!defined('ADODB_DIR')) die(); if (!defined('LDAP_ASSOC')) { - define('LDAP_ASSOC',ADODB_FETCH_ASSOC); - define('LDAP_NUM',ADODB_FETCH_NUM); - define('LDAP_BOTH',ADODB_FETCH_BOTH); + define('LDAP_ASSOC',ADODB_FETCH_ASSOC); + define('LDAP_NUM',ADODB_FETCH_NUM); + define('LDAP_BOTH',ADODB_FETCH_BOTH); } class ADODB_ldap extends ADOConnection { - var $databaseType = 'ldap'; + var $databaseType = 'ldap'; var $dataProvider = 'ldap'; - + # Connection information - var $username = false; - var $password = false; - - # Used during searches - var $filter; - var $dn; + var $username = false; + var $password = false; + + # Used during searches + var $filter; + var $dn; var $version; var $port = 389; # Options configuration information var $LDAP_CONNECT_OPTIONS; - function ADODB_ldap() - { - } - + # error on binding, eg. "Binding: invalid credentials" + var $_bind_errmsg = "Binding: %s"; + // returns true or false - + function _connect( $host, $username, $password, $ldapbase) { - global $LDAP_CONNECT_OPTIONS; - + global $LDAP_CONNECT_OPTIONS; + if ( !function_exists( 'ldap_connect' ) ) return null; - - $conn_info = array( $host,$this->port); - - if ( strstr( $host, ':' ) ) { - $conn_info = split( ':', $host ); - } - - $this->_connectionID = ldap_connect( $conn_info[0], $conn_info[1] ); + + if (strpos($host,'ldap://') === 0 || strpos($host,'ldaps://') === 0) { + $this->_connectionID = @ldap_connect($host); + } else { + $conn_info = array( $host,$this->port); + + if ( strstr( $host, ':' ) ) { + $conn_info = explode( ':', $host ); + } + + $this->_connectionID = @ldap_connect( $conn_info[0], $conn_info[1] ); + } if (!$this->_connectionID) { $e = 'Could not connect to ' . $conn_info[0]; $this->_errorMsg = $e; @@ -68,16 +79,16 @@ function _connect( $host, $username, $password, $ldapbase) if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) { $this->_inject_bind_options( $LDAP_CONNECT_OPTIONS ); } - + if ($username) { - $bind = ldap_bind( $this->_connectionID, $username, $password ); + $bind = @ldap_bind( $this->_connectionID, $username, $password ); } else { $username = 'anonymous'; - $bind = ldap_bind( $this->_connectionID ); + $bind = @ldap_bind( $this->_connectionID ); } - + if (!$bind) { - $e = 'Could not bind to ' . $conn_info[0] . " as ".$username; + $e = sprintf($this->_bind_errmsg,ldap_error($this->_connectionID)); $this->_errorMsg = $e; if ($this->debug) ADOConnection::outp($e); return false; @@ -86,7 +97,7 @@ function _connect( $host, $username, $password, $ldapbase) $this->database = $ldapbase; return $this->_connectionID; } - + /* Valid Domain Values for LDAP Options: @@ -145,262 +156,275 @@ function _inject_bind_options( $options ) { or die( "Unable to set server option: " . $option["OPTION_NAME"] ); } } - + /* returns _queryID or false */ - function _query($sql,$inputarr) + function _query($sql,$inputarr=false) + { + $rs = @ldap_search( $this->_connectionID, $this->database, $sql ); + $this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql.': '.ldap_error($this->_connectionID); + return $rs; + } + + function ErrorMsg() { - $rs = ldap_search( $this->_connectionID, $this->database, $sql ); - $this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql; - return $rs; + return $this->_errorMsg; } - /* closes the LDAP connection */ + function ErrorNo() + { + return @ldap_errno($this->_connectionID); + } + + /* closes the LDAP connection */ function _close() { @ldap_close( $this->_connectionID ); $this->_connectionID = false; } - + function SelectDB($db) { $this->database = $db; return true; } // SelectDB - function ServerInfo() - { - if( !empty( $this->version ) ) return $this->version; - $version = array(); - /* - Determines how aliases are handled during search. - LDAP_DEREF_NEVER (0x00) - LDAP_DEREF_SEARCHING (0x01) - LDAP_DEREF_FINDING (0x02) - LDAP_DEREF_ALWAYS (0x03) - The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but - not when locating the base object of the search. The LDAP_DEREF_FINDING value means - aliases are dereferenced when locating the base object but not during the search. - Default: LDAP_DEREF_NEVER - */ - ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ; - switch ( $version['LDAP_OPT_DEREF'] ) { - case 0: - $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER'; - case 1: - $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING'; - case 2: - $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING'; - case 3: - $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS'; - } - - /* - A limit on the number of entries to return from a search. - LDAP_NO_LIMIT (0) means no limit. - Default: LDAP_NO_LIMIT - */ - ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, $version['LDAP_OPT_SIZELIMIT'] ); - if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) { - $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT'; - } - - /* - A limit on the number of seconds to spend on a search. - LDAP_NO_LIMIT (0) means no limit. - Default: LDAP_NO_LIMIT - */ - ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, $version['LDAP_OPT_TIMELIMIT'] ); - if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) { - $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT'; - } - - /* - Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. - LDAP_OPT_ON - LDAP_OPT_OFF - Default: ON - */ - ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, $version['LDAP_OPT_REFERRALS'] ); - if ( $version['LDAP_OPT_REFERRALS'] == 0 ) { - $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF'; - } else { - $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON'; - - } - /* - Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. - LDAP_OPT_ON - LDAP_OPT_OFF - Default: OFF - */ - ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, $version['LDAP_OPT_RESTART'] ); - if ( $version['LDAP_OPT_RESTART'] == 0 ) { - $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF'; - } else { - $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON'; - - } - /* - This option indicates the version of the LDAP protocol used when communicating with the primary LDAP server. - LDAP_VERSION2 (2) - LDAP_VERSION3 (3) - Default: LDAP_VERSION2 (2) - */ - ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, $version['LDAP_OPT_PROTOCOL_VERSION'] ); - if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) { - $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2'; - } else { - $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3'; - - } - /* The host name (or list of hosts) for the primary LDAP server. */ - ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); - ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); - ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); - ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); - - return $this->version = $version; - - } + function ServerInfo() + { + if( !empty( $this->version ) ) { + return $this->version; + } + + $version = array(); + /* + Determines how aliases are handled during search. + LDAP_DEREF_NEVER (0x00) + LDAP_DEREF_SEARCHING (0x01) + LDAP_DEREF_FINDING (0x02) + LDAP_DEREF_ALWAYS (0x03) + The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but + not when locating the base object of the search. The LDAP_DEREF_FINDING value means + aliases are dereferenced when locating the base object but not during the search. + Default: LDAP_DEREF_NEVER + */ + ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ; + switch ( $version['LDAP_OPT_DEREF'] ) { + case 0: + $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER'; + case 1: + $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING'; + case 2: + $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING'; + case 3: + $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS'; + } + + /* + A limit on the number of entries to return from a search. + LDAP_NO_LIMIT (0) means no limit. + Default: LDAP_NO_LIMIT + */ + ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, $version['LDAP_OPT_SIZELIMIT'] ); + if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) { + $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT'; + } + + /* + A limit on the number of seconds to spend on a search. + LDAP_NO_LIMIT (0) means no limit. + Default: LDAP_NO_LIMIT + */ + ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, $version['LDAP_OPT_TIMELIMIT'] ); + if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) { + $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT'; + } + + /* + Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. + LDAP_OPT_ON + LDAP_OPT_OFF + Default: ON + */ + ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, $version['LDAP_OPT_REFERRALS'] ); + if ( $version['LDAP_OPT_REFERRALS'] == 0 ) { + $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF'; + } else { + $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON'; + } + + /* + Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. + LDAP_OPT_ON + LDAP_OPT_OFF + Default: OFF + */ + ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, $version['LDAP_OPT_RESTART'] ); + if ( $version['LDAP_OPT_RESTART'] == 0 ) { + $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF'; + } else { + $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON'; + } + + /* + This option indicates the version of the LDAP protocol used when communicating with the primary LDAP server. + LDAP_VERSION2 (2) + LDAP_VERSION3 (3) + Default: LDAP_VERSION2 (2) + */ + ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, $version['LDAP_OPT_PROTOCOL_VERSION'] ); + if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) { + $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2'; + } else { + $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3'; + } + + /* The host name (or list of hosts) for the primary LDAP server. */ + ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); + ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); + ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); + ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); + + return $this->version = $version; + } } - + /*-------------------------------------------------------------------------------------- - Class Name: Recordset + Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordSet_ldap extends ADORecordSet{ - +class ADORecordSet_ldap extends ADORecordSet{ + var $databaseType = "ldap"; var $canSeek = false; var $_entryID; /* keeps track of the entry resource identifier */ - - function ADORecordSet_ldap($queryID,$mode=false) + + function __construct($queryID,$mode=false) { - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } switch ($mode) { - case ADODB_FETCH_NUM: - $this->fetchMode = LDAP_NUM; - break; - case ADODB_FETCH_ASSOC: - $this->fetchMode = LDAP_ASSOC; - break; + case ADODB_FETCH_NUM: + $this->fetchMode = LDAP_NUM; + break; + case ADODB_FETCH_ASSOC: + $this->fetchMode = LDAP_ASSOC; + break; case ADODB_FETCH_DEFAULT: - case ADODB_FETCH_BOTH: + case ADODB_FETCH_BOTH: default: - $this->fetchMode = LDAP_BOTH; - break; + $this->fetchMode = LDAP_BOTH; + break; } - - $this->ADORecordSet($queryID); + + parent::__construct($queryID); } - + function _initrs() { - /* - This could be teaked to respect the $COUNTRECS directive from ADODB - It's currently being used in the _fetch() function and the - GetAssoc() function - */ - $this->_numOfRows = ldap_count_entries( $this->connection->_connectionID, $this->_queryID ); - + /* + This could be teaked to respect the $COUNTRECS directive from ADODB + It's currently being used in the _fetch() function and the + GetAssoc() function + */ + $this->_numOfRows = ldap_count_entries( $this->connection->_connectionID, $this->_queryID ); } - /* - Return whole recordset as a multi-dimensional associative array + /* + 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(); - for ( $i=0; $i < $records; $i++ ) { - foreach ( $this->fields as $k=>$v ) { - if ( is_array( $v ) ) { - if ( $v['count'] == 1 ) { - $results[$i][$k] = $v[0]; - } else { - array_shift( $v ); - $results[$i][$k] = $v; - } - } - } - } - - return $results; + $results = array(); + for ( $i=0; $i < $records; $i++ ) { + foreach ( $this->fields as $k=>$v ) { + if ( is_array( $v ) ) { + if ( $v['count'] == 1 ) { + $results[$i][$k] = $v[0]; + } else { + array_shift( $v ); + $results[$i][$k] = $v; + } + } + } + } + + return $results; } - - function &GetRowAssoc() + + function GetRowAssoc($upper = ADODB_ASSOC_CASE) { - $results = array(); - foreach ( $this->fields as $k=>$v ) { - if ( is_array( $v ) ) { - if ( $v['count'] == 1 ) { - $results[$k] = $v[0]; - } else { - array_shift( $v ); - $results[$k] = $v; - } - } - } - - return $results; + $results = array(); + foreach ( $this->fields as $k=>$v ) { + if ( is_array( $v ) ) { + if ( $v['count'] == 1 ) { + $results[$k] = $v[0]; + } else { + array_shift( $v ); + $results[$k] = $v; + } + } + } + + return $results; } - - function GetRowNums() - { - $results = array(); - foreach ( $this->fields as $k=>$v ) { - static $i = 0; - if (is_array( $v )) { - if ( $v['count'] == 1 ) { - $results[$i] = $v[0]; - } else { - array_shift( $v ); - $results[$i] = $v; - } - $i++; - } - } - return $results; - } - + + function GetRowNums() + { + $results = array(); + foreach ( $this->fields as $k=>$v ) { + static $i = 0; + if (is_array( $v )) { + if ( $v['count'] == 1 ) { + $results[$i] = $v[0]; + } else { + array_shift( $v ); + $results[$i] = $v; + } + $i++; + } + } + return $results; + } + function _fetch() - { - if ( $this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0 ) - return false; - - if ( $this->_currentRow == 0 ) { - $this->_entryID = ldap_first_entry( $this->connection->_connectionID, $this->_queryID ); - } else { - $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID ); - } - - $this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID ); - $this->_numOfFields = $this->fields['count']; - switch ( $this->fetchMode ) { - - case LDAP_ASSOC: - $this->fields = $this->GetRowAssoc(); - break; - - case LDAP_NUM: - $this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc()); - break; - - case LDAP_BOTH: - default: - $this->fields = $this->GetRowNums(); - break; - } - return ( is_array( $this->fields ) ); + { + if ( $this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0 ) { + return false; + } + + if ( $this->_currentRow == 0 ) { + $this->_entryID = ldap_first_entry( $this->connection->_connectionID, $this->_queryID ); + } else { + $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID ); + } + + $this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID ); + $this->_numOfFields = $this->fields['count']; + + switch ( $this->fetchMode ) { + + case LDAP_ASSOC: + $this->fields = $this->GetRowAssoc(); + break; + + case LDAP_NUM: + $this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc()); + break; + + case LDAP_BOTH: + default: + $this->fields = $this->GetRowNums(); + break; + } + + return is_array( $this->fields ); } - + function _close() { - @ldap_free_result( $this->_queryID ); + @ldap_free_result( $this->_queryID ); $this->_queryID = false; } - + } -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-mssql.inc.php b/adodb/drivers/adodb-mssql.inc.php index 0f3a80f..3de3f8d 100644 --- a/adodb/drivers/adodb-mssql.inc.php +++ b/adodb/drivers/adodb-mssql.inc.php @@ -1,33 +1,40 @@ = 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"; + var $databaseType = "mssql"; var $dataProvider = "mssql"; var $replaceQuote = "''"; // string to use to replace quotes var $fmtDate = "'Y-m-d'"; - var $fmtTimeStamp = "'Y-m-d H:i:s'"; + var $fmtTimeStamp = "'Y-m-d\TH:i:s'"; var $hasInsertID = true; var $substr = "substring"; var $length = 'len'; @@ -83,15 +58,14 @@ class ADODB_mssql extends ADOConnection { var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'"; var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))"; var $metaColumnsSQL = # xtype==61 is datetime -"select c.name,t.name,c.length, - (case when c.xusertype=61 then 0 else c.xprec end), - (case when c.xusertype=61 then 0 else c.xscale end) + "select c.name,t.name,c.length,c.isnullable, c.status, + (case when c.xusertype=61 then 0 else c.xprec end), + (case when c.xusertype=61 then 0 else c.xscale end) from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'"; var $hasTop = 'top'; // support mssql SELECT TOP 10 * FROM TABLE var $hasGenID = true; var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)'; var $sysTimeStamp = 'GetDate()'; - var $_has_mssql_init; var $maxParameterLen = 4000; var $arrayClass = 'ADORecordSet_array_mssql'; var $uniqueSort = true; @@ -99,57 +73,79 @@ class ADODB_mssql extends ADOConnection { var $rightOuter = '=*'; var $ansiOuter = true; // for mssql7 or later var $poorAffectedRows = true; - var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # for mssql 2000 + var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000 var $uniqueOrderBy = true; var $_bindInputArray = true; - - function ADODB_mssql() - { - $this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0); - } + var $forceNewConnect = false; function ServerInfo() { global $ADODB_FETCH_MODE; - - $stmt = $this->PrepareSP('sp_server_info'); - $val = 2; + + if ($this->fetchMode === false) { $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - } else + } else $savem = $this->SetFetchMode(ADODB_FETCH_NUM); - - - $this->Parameter($stmt,$val,'attribute_id'); - $row = $this->GetRow($stmt); - - //$row = $this->GetRow("execute sp_server_info 2"); - - + + if (0) { + $stmt = $this->PrepareSP('sp_server_info'); + $val = 2; + $this->Parameter($stmt,$val,'attribute_id'); + $row = $this->GetRow($stmt); + } + + $row = $this->GetRow("execute sp_server_info 2"); + + if ($this->fetchMode === false) { $ADODB_FETCH_MODE = $savem; } else $this->SetFetchMode($savem); - + $arr['description'] = $row[2]; $arr['version'] = ADOConnection::_findvers($arr['description']); return $arr; } - - function IfNull( $field, $ifNull ) + + function IfNull( $field, $ifNull ) { return " ISNULL($field, $ifNull) "; // if MS SQL Server } - - function _insertid() + + 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 + // 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 { return $this->GetOne($this->identitySQL); + } + } + + + + /** + * 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) + { + return "'" . str_replace("'", $this->replaceQuote, $s) . "'"; } function _affectedrows() @@ -158,10 +154,10 @@ function _affectedrows() } var $_dropSeqSQL = "drop table %s"; - + function CreateSequence($seq='adodbseq',$start=1) { - + $this->Execute('BEGIN TRANSACTION adodbseq'); $start -= 1; $this->Execute("create table $seq (id float(53))"); @@ -170,7 +166,7 @@ function CreateSequence($seq='adodbseq',$start=1) $this->Execute('ROLLBACK TRANSACTION adodbseq'); return false; } - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return true; } @@ -186,37 +182,43 @@ function GenID($seq='adodbseq',$start=1) $this->Execute('ROLLBACK TRANSACTION adodbseq'); return false; } - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return $start; } $num = $this->GetOne("select id from $seq"); - $this->Execute('COMMIT TRANSACTION adodbseq'); + $this->Execute('COMMIT TRANSACTION adodbseq'); return $num; - + // in old implementation, pre 1.90, we returned GUID... //return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'"); } - - function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) + + function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) { + $nrows = (int) $nrows; + $offset = (int) $offset; if ($nrows > 0 && $offset <= 0) { $sql = preg_replace( '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql); - $rs =& $this->Execute($sql,$inputarr); + + if ($secs2cache) + $rs = $this->CacheExecute($secs2cache, $sql, $inputarr); + else + $rs = $this->Execute($sql,$inputarr); } else - $rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache); - + $rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache); + return $rs; } - - + + // Format date column in sql string given an input format that understands Y M D function SQLDate($fmt, $col=false) - { + { if (!$col) $col = $this->sysTimeStamp; $s = ''; - + $len = strlen($fmt); for ($i=0; $i < $len; $i++) { if ($s) $s .= '+'; @@ -243,11 +245,11 @@ function SQLDate($fmt, $col=false) case 'h': $s .= "substring(convert(char(14),$col,0),13,2)"; break; - + case 'H': $s .= "replace(str(datepart(hh,$col),2),' ','0')"; break; - + case 'i': $s .= "replace(str(datepart(mi,$col),2),' ','0')"; break; @@ -258,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++; @@ -271,32 +275,32 @@ function SQLDate($fmt, $col=false) return $s; } - + function BeginTrans() { - if ($this->transOff) return true; + if ($this->transOff) return true; $this->transCnt += 1; - $this->Execute('BEGIN TRAN'); - return true; + $ok = $this->Execute('BEGIN TRAN'); + return $ok; } - - function CommitTrans($ok=true) - { - if ($this->transOff) return true; + + function CommitTrans($ok=true) + { + if ($this->transOff) return true; if (!$ok) return $this->RollbackTrans(); if ($this->transCnt) $this->transCnt -= 1; - $this->Execute('COMMIT TRAN'); - return true; + $ok = $this->Execute('COMMIT TRAN'); + return $ok; } function RollbackTrans() { - if ($this->transOff) return true; + if ($this->transOff) return true; if ($this->transCnt) $this->transCnt -= 1; - $this->Execute('ROLLBACK TRAN'); - return true; + $ok = $this->Execute('ROLLBACK TRAN'); + return $ok; } - - function SetTransactionMode( $transaction_mode ) + + function SetTransactionMode( $transaction_mode ) { $this->_transmode = $transaction_mode; if (empty($transaction_mode)) { @@ -306,188 +310,253 @@ function SetTransactionMode( $transaction_mode ) if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode; $this->Execute("SET TRANSACTION ".$transaction_mode); } - + /* Usage: - + $this->BeginTrans(); $this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables - + # some operation on both tables table1 and table2 - + $this->CommitTrans(); - + See http://www.swynk.com/friends/achigrik/SQL70Locks.asp */ - function RowLock($tables,$where,$flds='top 1 null as ignore') + function RowLock($tables,$where,$col='1 as adodbignore') { + if ($col == '1 as adodbignore') $col = 'top 1 null as ignore'; if (!$this->transCnt) $this->BeginTrans(); - return $this->GetOne("select $flds from $tables with (ROWLOCK,HOLDLOCK) where $where"); + return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where"); + } + + + function MetaColumns($table, $normalize=true) + { +// $arr = ADOConnection::MetaColumns($table); +// return $arr; + + $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->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 &MetaIndexes($table,$primary=false) + + + function MetaIndexes($table,$primary=false, $owner=false) { $table = $this->qstr($table); - $sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, + $sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK, CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique - FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id - INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid + FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id + INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table ORDER BY O.name, I.Name, K.keyno"; global $ADODB_FETCH_MODE; $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - if ($this->fetchMode !== FALSE) { - $savem = $this->SetFetchMode(FALSE); - } - - $rs = $this->Execute($sql); - if (isset($savem)) { - $this->SetFetchMode($savem); - } - $ADODB_FETCH_MODE = $save; - - if (!is_object($rs)) { - return 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; + + 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; + if ($primary && !$row[5]) continue; + + $indexes[$row[0]]['unique'] = $row[6]; + $indexes[$row[0]]['columns'][] = $row[1]; + } + return $indexes; } - + function MetaForeignKeys($table, $owner=false, $upper=false) { global $ADODB_FETCH_MODE; - + $save = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $table = $this->qstr(strtoupper($table)); - - $sql = + + $sql = "select object_name(constid) as constraint_name, col_name(fkeyid, fkey) as column_name, object_name(rkeyid) as referenced_table_name, - 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"; - - $constraints =& $this->GetArray($sql); - + + $constraints = $this->GetArray($sql); + $ADODB_FETCH_MODE = $save; - + $arr = false; foreach($constraints as $constr) { //print_r($constr); - $arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; + $arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; } if (!$arr) return false; - + $arr2 = false; - + foreach($arr as $k => $v) { foreach($v as $a => $b) { if ($upper) $a = strtoupper($a); - $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; } //From: Fernando Moreira - function MetaDatabases() - { - if(@mssql_select_db("master")) { - $qry=$this->metaDatabasesSQL; - if($rs=@mssql_query($qry)){ - $tmpAr=$ar=array(); - while($tmpAr=@mssql_fetch_row($rs)) - $ar[]=$tmpAr[0]; - @mssql_select_db($this->database); - if(sizeof($ar)) - return($ar); - else - return(false); - } else { - @mssql_select_db($this->database); - return(false); - } - } - return(false); - } + function MetaDatabases() + { + if(@mssql_select_db("master")) { + $qry = $this->metaDatabasesSQL; + if($rs = @mssql_query($qry,$this->_connectionID)) { + $tmpAr = $ar = array(); + while($tmpAr = @mssql_fetch_row($rs)) { + $ar[]=$tmpAr[0]; + } + @mssql_select_db($this->database); + if(sizeof($ar)) { + return($ar); + } else { + return(false); + } + } else { + @mssql_select_db($this->database); + return(false); + } + } + return(false); + } // "Stein-Aksel Basma" // tested with MSSQL 2000 - function &MetaPrimaryKeys($table) + function MetaPrimaryKeys($table, $owner=false) { global $ADODB_FETCH_MODE; - + $schema = ''; $this->_findschema($table,$schema); if (!$schema) $schema = $this->database; - if ($schema) $schema = "and k.table_catalog like '$schema%'"; + if ($schema) $schema = "and k.table_catalog like '$schema%'"; $sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k, - information_schema.table_constraints tc + information_schema.table_constraints tc where tc.constraint_name = k.constraint_name and tc.constraint_type = 'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position "; - + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; $a = $this->GetCol($sql); $ADODB_FETCH_MODE = $savem; - + if ($a && sizeof($a)>0) return $a; $false = false; - return $false; + return $false; } - - function &MetaTables($ttype=false,$showSchema=false,$mask=false) + + function MetaTables($ttype=false,$showSchema=false,$mask=false) { if ($mask) { $save = $this->metaTablesSQL; $mask = $this->qstr(($mask)); $this->metaTablesSQL .= " AND name like $mask"; } - $ret =& ADOConnection::MetaTables($ttype,$showSchema); - + $ret = ADOConnection::MetaTables($ttype,$showSchema); + if ($mask) { $this->metaTablesSQL = $save; } return $ret; } - - function SelectDB($dbName) + + function SelectDB($dbName) { $this->database = $dbName; $this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions if ($this->_connectionID) { - return @mssql_select_db($dbName); + return @mssql_select_db($dbName); } - else return false; + else return false; } - - function ErrorMsg() + + function ErrorMsg() { if (empty($this->_errorMsg)){ $this->_errorMsg = mssql_get_last_message(); } return $this->_errorMsg; } - - function ErrorNo() + + function ErrorNo() { if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode; if (empty($this->_errorMsg)) { @@ -497,37 +566,47 @@ 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 - function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) + + // 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; - $this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword); + 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); - return true; + return true; } - - + + // returns true or false 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; - + // persistent connections can forget to rollback on crash, so we do it here. if ($this->autoRollback) { $cnt = $this->GetOne('select @@TRANCOUNT'); - while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); + while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); } if ($argDatabasename) return $this->SelectDB($argDatabasename); - return true; + return true; } - + + function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename) + { + return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true); + } + function Prepare($sql) { $sqlarr = explode('?',$sql); @@ -535,114 +614,110 @@ function Prepare($sql) $sql2 = $sqlarr[0]; for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) { $sql2 .= '@P'.($i-1) . $sqlarr[$i]; - } - return array($sql,$this->qstr($sql2),$max); + } + return array($sql,$this->qstr($sql2),$max,$sql2); } - - function PrepareSP($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; - } - - array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";')); - $s = implode('+',$arr); - if (sizeof($arr) > 0) return "$s"; - + // 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 ''; - } - - /* + } + + /* Usage: $stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group - + # note that the parameter does not have @ in front! $db->Parameter($stmt,$id,'myid'); $db->Parameter($stmt,$group,'group',false,64); $db->Execute($stmt); - + @param $stmt Statement returned by Prepare() or PrepareSP(). @param $var PHP variable to bind to. Can set to null (for isNull support). @param $name Name of stored procedure variable name to bind to. @param [$isOutput] Indicates direction of parameter 0/false=IN 1=OUT 2= IN/OUT. This is ignored in oci8. @param [$maxLen] Holds an maximum length of the variable. @param [$type] The data type of $var. Legal values depend on driver. - + See mssql_bind documentation at php.net. */ function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false) { - if (!$this->_has_mssql_init) { - ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0"); - return false; - } - $isNull = is_null($var); // php 4.0.4 and above... - - if ($type === false) + + if ($type === false) switch(gettype($var)) { default: - case 'string': $type = SQLCHAR; break; + case 'string': $type = SQLVARCHAR; break; case 'double': $type = SQLFLT8; break; case 'integer': $type = SQLINT4; break; case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0 - } - + } + if ($this->debug) { $prefix = ($isOutput) ? 'Out' : 'In'; $ztype = (empty($type)) ? 'false' : $type; ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);"); } /* - See http://phplens.com/lens/lensforum/msgs.php?id=7231 - + 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, - called "RETVAL" (without the @). See the example at mssql_execute to - see how it works. - type: one of this new supported PHP constants. - SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 + The return value (a long integer value) is treated like a special OUTPUT parameter, + called "RETVAL" (without the @). See the example at mssql_execute to + see how it works. - type: one of this new supported PHP constants. + SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 */ if ($name !== 'RETVAL') $name = '@'.$name; return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen); } - - /* + + /* Unfortunately, it appears that mssql cannot handle varbinary > 255 chars So all your blobs must be of type "image". - + Remember to set in php.ini the following... - - ; Valid range 0 - 2147483647. Default = 4096. - mssql.textlimit = 0 ; zero to pass through - ; Valid range 0 - 2147483647. Default = 4096. - mssql.textsize = 0 ; zero to pass through + ; Valid range 0 - 2147483647. Default = 4096. + mssql.textlimit = 0 ; zero to pass through + + ; Valid range 0 - 2147483647. Default = 4096. + mssql.textsize = 0 ; zero to pass through */ function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') { - + if (strtoupper($blobtype) == 'CLOB') { $sql = "UPDATE $table SET $column='" . $val . "' WHERE $where"; return $this->Execute($sql) != false; @@ -650,16 +725,21 @@ function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') $sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where"; return $this->Execute($sql) != false; } - + // returns query ID if successful, otherwise false - function _query($sql,$inputarr) + function _query($sql,$inputarr=false) { $this->_errorMsg = false; if (is_array($inputarr)) { - - # bind input params with sp_executesql: + + # bind input params with sp_executesql: # see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm # works only with sql server 7 and newer + $getIdentity = false; + 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 = ''; @@ -668,11 +748,11 @@ function _query($sql,$inputarr) if ($decl) { $decl .= ', '; $params .= ', '; - } + } if (is_string($v)) { $len = strlen($v); if ($len == 0) $len = 1; - + if ($len > 4000 ) { // NVARCHAR is max 4000 chars. Let's use NTEXT $decl .= "@P$i NTEXT"; @@ -680,7 +760,16 @@ function _query($sql,$inputarr) $decl .= "@P$i NVARCHAR($len)"; } - $params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v)); + if(substr($v,0,1) == "'" && substr($v,-1,1) == "'") + /* + * String is already fully quoted + */ + $inputVar = $v; + else + $inputVar = $db->this($v); + + $params .= "@P$i=N" . $inputVar; + } else if (is_integer($v)) { $decl .= "@P$i INT"; $params .= "@P$i=".$v; @@ -698,72 +787,100 @@ function _query($sql,$inputarr) } $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"); - + $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); + } + } else if (is_array($sql)) { # PrepareSP() $rez = mssql_execute($sql[1]); - + $this->lastInsID = false; + } else { $rez = mssql_query($sql,$this->_connectionID); + $this->lastInsID = false; } return $rez; } - + // returns true or false function _close() - { - if ($this->transCnt) $this->RollbackTrans(); - $rez = @mssql_close($this->_connectionID); + { + 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 - function UnixDate($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::UnixDate($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; } - - function UnixTimeStamp($v) - { - return ADORecordSet_array_mssql::UnixTimeStamp($v); - } } - + /*-------------------------------------------------------------------------------------- - Class Name: Recordset + Class Name: Recordset --------------------------------------------------------------------------------------*/ -class ADORecordset_mssql extends ADORecordSet { +class ADORecordset_mssql extends ADORecordSet { var $databaseType = "mssql"; var $canSeek = true; - var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083 + var $hasFetchAssoc; // see PHPLens Issue No: 6083 // _mths works only in non-localised system - - function ADORecordset_mssql($id,$mode=false) + + function __construct($id,$mode=false) { // freedts check... $this->hasFetchAssoc = function_exists('mssql_fetch_assoc'); - if ($mode === false) { + if ($mode === false) { global $ADODB_FETCH_MODE; $mode = $ADODB_FETCH_MODE; } $this->fetchMode = $mode; - return $this->ADORecordSet($id,$mode); + return parent::__construct($id); } - - + + function _initrs() { - GLOBAL $ADODB_COUNTRECS; + GLOBAL $ADODB_COUNTRECS; $this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1; $this->_numOfFields = @mssql_num_fields($this->_queryID); } - + //Contributed by "Sven Axelsson" // get next resultset - requires PHP 4.0.5 or later @@ -788,16 +905,16 @@ function Fields($colname) $this->bind[strtoupper($o->name)] = $i; } } - - return $this->fields[$this->bind[strtoupper($colname)]]; + + return $this->fields[$this->bind[strtoupper($colname)]]; } - - /* Returns: an object containing field information. + + /* Returns: an object containing field information. Get column information in the Recordset object. fetchField() can be used in order to obtain information about fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by fetchField() is retrieved. */ - function &FetchField($fieldOffset = -1) + function FetchField($fieldOffset = -1) { if ($fieldOffset != -1) { $f = @mssql_fetch_field($this->_queryID, $fieldOffset); @@ -809,19 +926,19 @@ function &FetchField($fieldOffset = -1) if (empty($f)) return $false; return $f; } - - function _seek($row) + + function _seek($row) { return @mssql_data_seek($this->_queryID, $row); } // speedup - function MoveNext() + function MoveNext() { if ($this->EOF) return false; - + $this->_currentRow++; - + if ($this->fetchMode & ADODB_FETCH_ASSOC) { if ($this->fetchMode & ADODB_FETCH_NUM) { //ADODB_FETCH_BOTH mode @@ -829,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)) { @@ -843,15 +960,23 @@ function MoveNext() $this->fields = false; } } - + if (is_array($this->fields)) { if (ADODB_ASSOC_CASE == 0) { foreach($this->fields as $k=>$v) { - $this->fields[strtolower($k)] = $v; + $kn = strtolower($k); + if ($kn <> $k) { + unset($this->fields[$k]); + $this->fields[$kn] = $v; + } } } else if (ADODB_ASSOC_CASE == 1) { foreach($this->fields as $k=>$v) { - $this->fields[strtoupper($k)] = $v; + $kn = strtoupper($k); + if ($kn <> $k) { + unset($this->fields[$k]); + $this->fields[$kn] = $v; + } } } } @@ -860,14 +985,14 @@ function MoveNext() } if ($this->fields) return true; $this->EOF = true; - + return false; } - + // INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4 // also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot! - function _fetch($ignore_fields=false) + function _fetch($ignore_fields=false) { if ($this->fetchMode & ADODB_FETCH_ASSOC) { if ($this->fetchMode & ADODB_FETCH_NUM) { @@ -878,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; } @@ -888,15 +1013,23 @@ function _fetch($ignore_fields=false) } } } - + if (!$this->fields) { } else if (ADODB_ASSOC_CASE == 0) { foreach($this->fields as $k=>$v) { - $this->fields[strtolower($k)] = $v; + $kn = strtolower($k); + if ($kn <> $k) { + unset($this->fields[$k]); + $this->fields[$kn] = $v; + } } } else if (ADODB_ASSOC_CASE == 1) { foreach($this->fields as $k=>$v) { - $this->fields[strtoupper($k)] = $v; + $kn = strtoupper($k); + if ($kn <> $k) { + unset($this->fields[$k]); + $this->fields[$kn] = $v; + } } } } else { @@ -904,118 +1037,57 @@ function _fetch($ignore_fields=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. */ - function _close() + function _close() { - $rez = mssql_free_result($this->_queryID); - $this->_queryID = false; - return $rez; + if($this->_queryID) { + $rez = mssql_free_result($this->_queryID); + $this->_queryID = false; + return $rez; + } + return true; } - // mssql uses a default date like Dec 30 2000 12:00AM - 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; } - - 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 ADORecordSet_array_mssql($id=-1,$mode=false) - { - $this->ADORecordSet_array($id,$mode); - } - - // mssql uses a default date like Dec 30 2000 12:00AM - function UnixDate($v) - { - - if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v); - - global $ADODB_mssql_mths,$ADODB_mssql_date_order; - - //Dec 30 2000 12:00AM - if ($ADODB_mssql_date_order == 'dmy') { - if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) { - return parent::UnixDate($v); - } - if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - - $theday = $rr[1]; - $themth = substr(strtoupper($rr[2]),0,3); - } else { - if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) { - return parent::UnixDate($v); - } - if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - - $theday = $rr[2]; - $themth = substr(strtoupper($rr[1]),0,3); - } - $themth = $ADODB_mssql_mths[$themth]; - if ($themth <= 0) return false; - // h-m-s-MM-DD-YY - return mktime(0,0,0,$themth,$theday,$rr[3]); - } - - function UnixTimeStamp($v) - { - - if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v); - - global $ADODB_mssql_mths,$ADODB_mssql_date_order; - - //Dec 30 2000 12:00AM - if ($ADODB_mssql_date_order == 'dmy') { - if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|" - ,$v, $rr)) return parent::UnixTimeStamp($v); - if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - - $theday = $rr[1]; - $themth = substr(strtoupper($rr[2]),0,3); - } else { - if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|" - ,$v, $rr)) return parent::UnixTimeStamp($v); - if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0; - - $theday = $rr[2]; - $themth = substr(strtoupper($rr[1]),0,3); - } - - $themth = $ADODB_mssql_mths[$themth]; - if ($themth <= 0) return false; - - switch (strtoupper($rr[6])) { - case 'P': - if ($rr[4]<12) $rr[4] += 12; - break; - case 'A': - if ($rr[4]==12) $rr[4] = 0; - break; - default: - break; - } - // h-m-s-MM-DD-YY - return mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]); - } -} +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 @@ -1031,5 +1103,3 @@ function UnixTimeStamp($v) http://www.databasejournal.com/scripts/article.php/1440551 */ - -?> \ No newline at end of file diff --git a/adodb/drivers/adodb-mssql_n.inc.php b/adodb/drivers/adodb-mssql_n.inc.php new file mode 100644 index 0000000..236c154 --- /dev/null +++ b/adodb/drivers/adodb-mssql_n.inc.php @@ -0,0 +1,226 @@ +_appendN($sql); + return ADODB_mssql::_query($sql,$inputarr); + } + + /** + * This function will intercept all the literals used in the SQL, prepending the "N" char to them + * in order to allow mssql to store properly data sent in the correct UCS-2 encoding (by freeTDS + * and ODBTP) keeping SQL compatibility at ADOdb level (instead of hacking every project to add + * the "N" notation when working against MSSQL. + * + * The original note indicated that this hack should only be used if ALL the char-based columns + * in your DB are of type nchar, nvarchar and ntext, but testing seems to indicate that SQL server + * doesn't seem to care if the statement is used against char etc fields. + * + * @todo This function should raise an ADOdb error if one of the transformations fail + * + * @param mixed $inboundData Either a string containing an SQL statement + * or an array with resources from prepared statements + * + * @return mixed + */ + function _appendN($inboundData) { + + $inboundIsArray = false; + + if (is_array($inboundData)) + { + $inboundIsArray = true; + $inboundArray = $inboundData; + } else + $inboundArray = (array)$inboundData; + + /* + * All changes will be placed here + */ + $outboundArray = $inboundArray; + + foreach($inboundArray as $inboundKey=>$inboundValue) + { + + if (is_resource($inboundValue)) + { + /* + * Prepared statement resource + */ + if ($this->debug) + ADOConnection::outp("{$this->databaseType} index $inboundKey value is resource, continue"); + + continue; + } + + if (strpos($inboundValue, SINGLEQUOTE) === false) + { + /* + * Check we have something to manipulate + */ + if ($this->debug) + ADOConnection::outp("{$this->databaseType} index $inboundKey value $inboundValue has no single quotes, continue"); + continue; + } + + /* + * 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 ($this->debug) + ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Wrong number of quotes (odd)"); + + break; + } + + /* + * Check we haven't any backslash + single quote combination. It should mean wrong + * backslashes use (bad magic_quotes_sybase?). Exit with debug info. + */ + $regexp = '/(\\\\' . SINGLEQUOTE . '[^' . SINGLEQUOTE . '])/'; + if (preg_match($regexp, $inboundValue)) + { + if ($this->debug) + ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Found bad use of backslash + single quote"); + + break; + } + + /* + * Remove pairs of single-quotes + */ + $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); + + } + + /* + * Remove the rest of literals present in the query + */ + $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); + } + + /* + * Analyse literals to prepend the N char to them if their contents aren't numeric + */ + if (!empty($literals)) + { + foreach ($literals as $key=>$value) { + if (!is_numeric(trim($value, SINGLEQUOTE))) + /* + * Non numeric string, prepend our dear N, whilst + * Trimming potentially existing previous "N" + */ + $literals[$key] = 'N' . trim($value, 'N'); + + } + } + + /* + * Re-apply literals to the text + */ + 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 + * (or strings beginning with single quotes will fail) + */ + $inboundValue = preg_replace("/((<@#@#@PAIR-(\d+)@#@#@>)+)N'/", "N'$1", $inboundValue); + + /* + * Re-apply pairs of single-quotes to the text + */ + 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"; +} diff --git a/adodb/drivers/adodb-mssqlnative.inc.php b/adodb/drivers/adodb-mssqlnative.inc.php new file mode 100644 index 0000000..36dc543 --- /dev/null +++ b/adodb/drivers/adodb-mssqlnative.inc.php @@ -0,0 +1,1310 @@ + '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, + t.name as type, + c.length, + c.xprec as precision, + c.xscale as scale, + c.isnullable as nullable, + c.cdefault as default_value, + c.xtype, + t.length as type_length, + sc.is_identity + from syscolumns c + join systypes t on t.xusertype=c.xusertype + join sysobjects o on o.id=c.id + join sys.tables st on st.name=o.name + join sys.columns sc on sc.object_id = st.object_id and sc.name=c.name + where o.name='%s'"; + var $hasTop = 'top'; // support mssql SELECT TOP 10 * FROM TABLE + var $hasGenID = true; + var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)'; + var $sysTimeStamp = 'GetDate()'; + var $maxParameterLen = 4000; + var $arrayClass = 'ADORecordSet_array_mssqlnative'; + var $uniqueSort = true; + var $leftOuter = '*='; + var $rightOuter = '=*'; + var $ansiOuter = true; // for mssql7 or later + var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000 + var $uniqueOrderBy = true; + var $_bindInputArray = true; + var $_dropSeqSQL = "drop table %s"; + + var $connectionInfo = array('ReturnDatesAsStrings'=>true); + var $cachedSchemaFlush = false; + + var $sequences = false; + var $mssql_version = ''; + + function __construct() + { + if ($this->debug) { + ADOConnection::outp("
");
+			sqlsrv_set_error_handling( SQLSRV_ERRORS_LOG_ALL );
+			sqlsrv_log_set_severity( SQLSRV_LOG_SEVERITY_ALL );
+			sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+			sqlsrv_configure('WarningsReturnAsErrors', 0);
+		} else {
+			sqlsrv_set_error_handling(0);
+			sqlsrv_log_set_severity(0);
+			sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+			sqlsrv_configure('WarningsReturnAsErrors', 0);
+		}
+	}
+
+	/**
+	 * Initializes the SQL Server version.
+	 * Dies if connected to a non-supported version (2000 and older)
+	 */
+	function ServerVersion() {
+		$data = $this->ServerInfo();
+		preg_match('/^\d{2}/', $data['version'], $matches);
+		$version = (int)reset($matches);
+
+		// We only support SQL Server 2005 and up
+		if($version < 9) {
+			die("SQL SERVER VERSION {$data['version']} NOT SUPPORTED IN mssqlnative DRIVER");
+		}
+
+		$this->mssql_version = $version;
+	}
+
+	function ServerInfo() {
+		global $ADODB_FETCH_MODE;
+		static $arr = false;
+		if (is_array($arr))
+			return $arr;
+		if ($this->fetchMode === false) {
+			$savem = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		} elseif ($this->fetchMode >=0 && $this->fetchMode <=2) {
+			$savem = $this->fetchMode;
+		} else
+			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+
+		$arrServerInfo = sqlsrv_server_info($this->_connectionID);
+		$ADODB_FETCH_MODE = $savem;
+		$arr['description'] = $arrServerInfo['SQLServerName'].' connected to '.$arrServerInfo['CurrentDatabase'];
+		$arr['version'] = $arrServerInfo['SQLServerVersion'];//ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+
+	function IfNull( $field, $ifNull )
+	{
+		return " ISNULL($field, $ifNull) "; // if MS SQL Server
+	}
+
+	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 = '')
+	{
+		return $this->lastInsID;
+	}
+
+	function _affectedrows()
+	{
+		if ($this->_queryID)
+		return sqlsrv_rows_affected($this->_queryID);
+	}
+
+	function GenID($seq='adodbseq',$start=1) {
+		switch($this->mssql_version){
+		case 9:
+		case 10:
+			return $this->GenID2008($seq, $start);
+			break;
+		default:
+			return $this->GenID2012($seq, $start);
+			break;
+		}
+	}
+
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		switch($this->mssql_version){
+		case 9:
+		case 10:
+			return $this->CreateSequence2008($seq, $start);
+			break;
+		default:
+			return $this->CreateSequence2012($seq, $start);
+			break;
+		}
+	}
+
+	/**
+	 * For Server 2005,2008, duplicate a sequence with an identity table
+	 */
+	function CreateSequence2008($seq='adodbseq',$start=1)
+	{
+		if($this->debug) ADOConnection::outp("
CreateSequence($seq,$start)");
+		sqlsrv_begin_transaction($this->_connectionID);
+		$start -= 1;
+		$this->Execute("create table $seq (id int)");//was float(53)
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+			if($this->debug) ADOConnection::outp("
Error: ROLLBACK");
+			sqlsrv_rollback($this->_connectionID);
+			return false;
+		}
+		sqlsrv_commit($this->_connectionID);
+		return true;
+	}
+
+	/**
+	 * Proper Sequences Only available to Server 2012 and up
+	 */
+	function CreateSequence2012($seq='adodbseq',$start=1){
+		if (!$this->sequences){
+			$sql = "SELECT name FROM sys.sequences";
+			$this->sequences = $this->GetCol($sql);
+		}
+		$ok = $this->Execute("CREATE SEQUENCE $seq START WITH $start INCREMENT BY 1");
+		if (!$ok)
+			die("CANNOT CREATE SEQUENCE" . print_r(sqlsrv_errors(),true));
+		$this->sequences[] = $seq;
+	}
+
+	/**
+	 * For Server 2005,2008, duplicate a sequence with an identity table
+	 */
+	function GenID2008($seq='adodbseq',$start=1)
+	{
+		if($this->debug) ADOConnection::outp("
CreateSequence($seq,$start)");
+		sqlsrv_begin_transaction($this->_connectionID);
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$start -= 1;
+			$this->Execute("create table $seq (id int)");//was float(53)
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+				if($this->debug) ADOConnection::outp("
Error: ROLLBACK");
+				sqlsrv_rollback($this->_connectionID);
+				return false;
+			}
+		}
+		$num = $this->GetOne("select id from $seq");
+		sqlsrv_commit($this->_connectionID);
+		return $num;
+	}
+	/**
+	 * Only available to Server 2012 and up
+	 * Cannot do this the normal adodb way by trapping an error if the
+	 * sequence does not exist because sql server will auto create a
+	 * sequence with the starting number of -9223372036854775808
+	 */
+	function GenID2012($seq='adodbseq',$start=1)
+	{
+
+		/*
+		 * First time in create an array of sequence names that we
+		 * can use in later requests to see if the sequence exists
+		 * the overhead is creating a list of sequences every time
+		 * we need access to at least 1. If we really care about
+		 * performance, we could maybe flag a 'nocheck' class variable
+		 */
+		if (!$this->sequences){
+			$sql = "SELECT name FROM sys.sequences";
+			$this->sequences = $this->GetCol($sql);
+		}
+		if (!is_array($this->sequences)
+		|| is_array($this->sequences) && !in_array($seq,$this->sequences)){
+			$this->CreateSequence2012($seq, $start);
+
+		}
+		$num = $this->GetOne("SELECT NEXT VALUE FOR $seq");
+		return $num;
+	}
+
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{
+		if (!$col) {
+			$col = $this->sysTimeStamp;
+		}
+		$s = '';
+
+		$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 .= '+';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "datename(yyyy,$col)";
+				break;
+			case 'M':
+				$s .= "convert(char(3),$col,0)";
+				break;
+			case 'm':
+				$s .= "replace(str(month($col),2),' ','0')";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "datename(quarter,$col)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "replace(str(day($col),2),' ','0')";
+				break;
+			case 'h':
+				$s .= "substring(convert(char(14),$col,0),13,2)";
+				break;
+
+			case 'H':
+				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
+				break;
+
+			case 'i':
+				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
+				break;
+			case 's':
+				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
+				break;
+			case 'a':
+			case 'A':
+				$s .= "substring(convert(char(19),$col,0),18,2)";
+				break;
+			case 'l':
+				$s .= "datename(dw,$col)";
+				break;
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+
+
+	function BeginTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		if ($this->debug) ADOConnection::outp('
begin transaction');
+		sqlsrv_begin_transaction($this->_connectionID);
+		return true;
+	}
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
+		if ($this->debug) ADOConnection::outp('
commit transaction');
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		sqlsrv_commit($this->_connectionID);
+		return true;
+	}
+
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->debug) ADOConnection::outp('
rollback transaction');
+		if ($this->transCnt) $this->transCnt -= 1;
+		sqlsrv_rollback($this->_connectionID);
+		return true;
+	}
+
+	function SetTransactionMode( $transaction_mode )
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+
+	/*
+		Usage:
+
+		$this->BeginTrans();
+		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
+
+		# some operation on both tables table1 and table2
+
+		$this->CommitTrans();
+
+		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
+	*/
+	function RowLock($tables,$where,$col='1 as adodbignore')
+	{
+		if ($col == '1 as adodbignore') $col = 'top 1 null as ignore';
+		if (!$this->transCnt) $this->BeginTrans();
+		return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
+	}
+
+	function SelectDB($dbName)
+	{
+		$this->database = $dbName;
+		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+		if ($this->_connectionID) {
+			$rs = $this->Execute('USE '.$dbName);
+			if($rs) {
+				return true;
+			} else return false;
+		}
+		else return false;
+	}
+
+	function ErrorMsg()
+	{
+		$retErrors = sqlsrv_errors(SQLSRV_ERR_ALL);
+		if($retErrors != null) {
+			foreach($retErrors as $arrError) {
+				$this->_errorMsg .= "SQLState: ".$arrError[ 'SQLSTATE']."\n";
+				$this->_errorMsg .= "Error Code: ".$arrError[ 'code']."\n";
+				$this->_errorMsg .= "Message: ".$arrError[ 'message']."\n";
+			}
+		}
+		return $this->_errorMsg;
+	}
+
+	function ErrorNo()
+	{
+		$err = sqlsrv_errors(SQLSRV_ERR_ALL);
+		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'))
+		{
+			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;
+		}
+
+		$this->ServerVersion();
+
+		return true;
+	}
+
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		//return null;//not implemented. NOTE: Persistent connections have no effect if PHP is used as a CGI program. (FastCGI!)
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+	}
+
+
+	function Prepare($sql)
+	{
+		return $sql; // prepare does not work properly with bind parameters as bind parameters are managed by sqlsrv_prepare!
+	}
+
+	// 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 '';
+	}
+
+	/*
+		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
+		So all your blobs must be of type "image".
+
+		Remember to set in php.ini the following...
+
+		; Valid range 0 - 2147483647. Default = 4096.
+		mssql.textlimit = 0 ; zero to pass through
+
+		; Valid range 0 - 2147483647. Default = 4096.
+		mssql.textsize = 0 ; zero to pass through
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+
+		if (strtoupper($blobtype) == 'CLOB') {
+			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
+			return $this->Execute($sql) != false;
+		}
+		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
+		return $this->Execute($sql) != false;
+	}
+
+	/**
+	 * 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];
+		}
+
+		// 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) {
+			// 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);
+		}
+
+		if ($this->debug) {
+			ADOConnection::outp("
running query: " . var_export($sql, true)
+				. "
input array: " . var_export($inputarr, true)
+				. "
result: " . var_export($rez, true)
+			);
+		}
+
+		$this->lastInsID = false;
+		if (!$rez) {
+			$rez = false;
+		} 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->lastInsID = sqlsrv_get_field($rez, 0, SQLSRV_PHPTYPE_INT);
+			}
+		}
+		return $rez;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		if ($this->transCnt) {
+			$this->RollbackTrans();
+		}
+		if($this->_connectionID) {
+			$rez = sqlsrv_close($this->_connectionID);
+		}
+		$this->_connectionID = false;
+		return $rez;
+	}
+
+
+	function MetaIndexes($table,$primary=false, $owner = false)
+	{
+		$table = $this->qstr($table);
+
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
+			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
+			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
+			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
+			ORDER BY O.name, I.Name, K.keyno";
+
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
+
+		$rs = $this->Execute($sql);
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		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;
+	}
+
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+		global $ADODB_FETCH_MODE;
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$table = $this->qstr(strtoupper($table));
+
+		$sql =
+			"select object_name(constid) as constraint_name,
+				col_name(fkeyid, fkey) as column_name,
+				object_name(rkeyid) as referenced_table_name,
+				col_name(rkeyid, rkey) as referenced_column_name
+			from sysforeignkeys
+			where upper(object_name(fkeyid)) = $table
+			order by constraint_name, referenced_table_name, keyno";
+
+		$constraints = $this->GetArray($sql);
+
+		$ADODB_FETCH_MODE = $save;
+
+		$arr = false;
+		foreach($constraints as $constr) {
+			//print_r($constr);
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3];
+		}
+		if (!$arr) return false;
+
+		$arr2 = false;
+
+		foreach($arr as $k => $v) {
+			foreach($v as $a => $b) {
+				if ($upper) $a = strtoupper($a);
+				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;
+	}
+
+	//From: Fernando Moreira 
+	function MetaDatabases()
+	{
+		$this->SelectDB("master");
+		$rs = $this->Execute($this->metaDatabasesSQL);
+		$rows = $rs->GetRows();
+		$ret = array();
+		for($i=0;$iSelectDB($this->database);
+		if($ret)
+			return $ret;
+		else
+			return false;
+	}
+
+	// "Stein-Aksel Basma" 
+	// tested with MSSQL 2000
+	function MetaPrimaryKeys($table, $owner=false)
+	{
+		global $ADODB_FETCH_MODE;
+
+		$schema = '';
+		$this->_findschema($table,$schema);
+		if (!$schema) $schema = $this->database;
+		if ($schema) $schema = "and k.table_catalog like '$schema%'";
+
+		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
+		information_schema.table_constraints tc
+		where tc.constraint_name = k.constraint_name and tc.constraint_type =
+		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
+
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$a = $this->GetCol($sql);
+		$ADODB_FETCH_MODE = $savem;
+
+		if ($a && sizeof($a)>0) return $a;
+		$false = false;
+		return $false;
+	}
+
+
+	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 MetaColumns($table, $upper=true, $schema=false){
+
+		/*
+		* A simple caching mechanism, to be replaced in ADOdb V6
+		*/
+		static $cached_columns = array();
+		if ($this->cachedSchemaFlush)
+			$cached_columns = array();
+
+		if (array_key_exists($table,$cached_columns)){
+			return $cached_columns[$table];
+		}
+
+
+		$this->_findschema($table,$schema);
+		if ($schema) {
+			$dbName = $this->database;
+			$this->SelectDB($schema);
+		}
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+
+		if ($schema) {
+			$this->SelectDB($dbName);
+		}
+
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		if (!is_object($rs)) {
+			$false = false;
+			return $false;
+		}
+
+		$retarr = array();
+		while (!$rs->EOF){
+
+			$fld = new ADOFieldObject();
+			if (array_key_exists(0,$rs->fields)) {
+				$fld->name          = $rs->fields[0];
+				$fld->type          = $rs->fields[1];
+				$fld->max_length    = $rs->fields[2];
+				$fld->precision     = $rs->fields[3];
+				$fld->scale         = $rs->fields[4];
+				$fld->not_null      =!$rs->fields[5];
+				$fld->has_default   = $rs->fields[6];
+				$fld->xtype         = $rs->fields[7];
+				$fld->type_length   = $rs->fields[8];
+				$fld->auto_increment= $rs->fields[9];
+			} else {
+				$fld->name          = $rs->fields['name'];
+				$fld->type          = $rs->fields['type'];
+				$fld->max_length    = $rs->fields['length'];
+				$fld->precision     = $rs->fields['precision'];
+				$fld->scale         = $rs->fields['scale'];
+				$fld->not_null      =!$rs->fields['nullable'];
+				$fld->has_default   = $rs->fields['default_value'];
+				$fld->xtype         = $rs->fields['xtype'];
+				$fld->type_length   = $rs->fields['type_length'];
+				$fld->auto_increment= $rs->fields['is_identity'];
+			}
+
+			if ($save == ADODB_FETCH_NUM)
+				$retarr[] = $fld;
+			else
+				$retarr[strtoupper($fld->name)] = $fld;
+
+			$rs->MoveNext();
+
+		}
+		$rs->Close();
+		$cached_columns[$table] = $retarr;
+
+		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 ADORecordset_mssqlnative extends ADORecordSet {
+
+	var $databaseType = "mssqlnative";
+	var $canSeek = false;
+	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) {
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+
+		}
+		$this->fetchMode = $mode;
+		parent::__construct($id);
+	}
+
+
+	function _initrs()
+	{
+		$this->_numOfRows = -1;//not supported
+		// Cache the metadata right now
+		$this->_fetchField();
+
+	}
+
+
+	//Contributed by "Sven Axelsson" 
+	// get next resultset - requires PHP 4.0.5 or later
+	function NextRecordSet()
+	{
+		if (!sqlsrv_next_result($this->_queryID)) return false;
+		$this->_inited = false;
+		$this->bind = false;
+		$this->_currentRow = -1;
+		$this->Init();
+		return true;
+	}
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!is_array($this->fields))
+			/*
+			* Too early
+			*/
+			return;
+		if ($this->fetchMode != ADODB_FETCH_NUM)
+			return $this->fields[$colname];
+
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+
+		return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+	/**
+	* Returns: an object containing field information.
+	*
+	* Get column information in the Recordset object. fetchField()
+	* can be used in order to obtain information about fields in a
+	* certain query result. If the field offset isn't specified,
+	* the next field that wasn't yet retrieved by fetchField()
+	* is retrieved.
+	*
+	* @param int $fieldOffset (optional default=-1 for all
+	* @return mixed an ADOFieldObject, or array of objects
+	*/
+	private function _fetchField($fieldOffset = -1)
+	{
+		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;
+			}
+		}
+
+		$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;
+		}
+
+		$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;
+		}
+		if ($fieldOffset == -1) {
+			return $this->fieldObjectsCache;
+		}
+
+		return $this->fieldObjectsCache[$fieldOffset];
+	}
+
+	/*
+	 * Fetchfield copies the oracle method, it loads the field information
+	 * into the _fieldobjs array once, to save multiple calls to the
+	 * sqlsrv_field_metadata function
+	 *
+	 * @param int $fieldOffset	(optional)
+	 *
+	 * @return adoFieldObject
+	 *
+	 * @author 	KM Newnham
+	 * @date 	02/20/2013
+	 */
+	function fetchField($fieldOffset = -1)
+	{
+		return $this->fieldObjectsCache[$fieldOffset];
+	}
+
+	function _seek($row)
+	{
+		return false;//There is no support for cursors in the driver at this time.  All data is returned via forward-only streams.
+	}
+
+	// speedup
+	function MoveNext()
+	{
+		if ($this->EOF)
+			return false;
+
+		$this->_currentRow++;
+
+		if ($this->_fetch())
+			return true;
+		$this->EOF = true;
+
+		return false;
+	}
+
+	function _fetch($ignore_fields=false)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			if ($this->fetchMode & ADODB_FETCH_NUM)
+				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_BOTH);
+			else
+				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
+
+			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);
+
+			}
+		}
+		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.
+	 *
+	 * @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;
+	}
+
+}
+
+
+class ADORecordSet_array_mssqlnative extends ADORecordSet_array {}
+
+/*
+Code Example 1:
+
+select	object_name(constid) as constraint_name,
+		object_name(fkeyid) as table_name,
+		col_name(fkeyid, fkey) as column_name,
+	object_name(rkeyid) as referenced_table_name,
+	col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where object_name(fkeyid) = x
+order by constraint_name, table_name, referenced_table_name,  keyno
+
+Code Example 2:
+select	constraint_name,
+	column_name,
+	ordinal_position
+from information_schema.key_column_usage
+where constraint_catalog = db_name()
+and table_name = x
+order by constraint_name, ordinal_position
+
+http://www.databasejournal.com/scripts/article.php/1440551
+*/
diff --git a/adodb/drivers/adodb-mssqlpo.inc.php b/adodb/drivers/adodb-mssqlpo.inc.php
index bfdacf2..f2d2f6f 100644
--- a/adodb/drivers/adodb-mssqlpo.inc.php
+++ b/adodb/drivers/adodb-mssqlpo.inc.php
@@ -1,51 +1,42 @@
 _has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
-			return $sql;
-		}
 		if (is_string($sql)) $sql = str_replace('||','+',$sql);
 		$stmt = mssql_init($sql,$this->_connectionID);
 		if (!$stmt)  return $sql;
 		return array($sql,$stmt);
 	}
-	
-	function _query($sql,$inputarr)
+
+	function _query($sql,$inputarr=false)
 	{
 		if (is_string($sql)) $sql = str_replace('||','+',$sql);
 		return ADODB_mssql::_query($sql,$inputarr);
@@ -54,9 +45,4 @@ function _query($sql,$inputarr)
 
 class ADORecordset_mssqlpo extends ADORecordset_mssql {
 	var $databaseType = "mssqlpo";
-	function ADORecordset_mssqlpo($id,$mode=false)
-	{
-		$this->ADORecordset_mssql($id,$mode);
-	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mysql.inc.php b/adodb/drivers/adodb-mysql.inc.php
index 7a7f341..f07c081 100644
--- a/adodb/drivers/adodb-mysql.inc.php
+++ b/adodb/drivers/adodb-mysql.inc.php
@@ -1,29 +1,47 @@
 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
+			}
+		}
 	}
-	
-	function ServerInfo()
+
+	function setCharSet($charset)
+	{
+		if (!function_exists('mysql_set_charset')) {
+			return false;
+		}
+
+		if ($this->charSet !== $charset) {
+			$ok = @mysql_set_charset($charset,$this->_connectionID);
+			if ($ok) {
+				$this->charSet = $charset;
+				return true;
+			}
+			return false;
+		}
+		return true;
+	}
+
+	function serverInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function ifNull( $field, $ifNull )
 	{
 		return " IFNULL($field, $ifNull) "; // if MySQL
 	}
-	
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	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);
+		}
+
+		$procedures = array ();
+
+		// get index details
+
+		$likepattern = '';
+		if ($NamePattern) {
+			$likepattern = " LIKE '".$NamePattern."'";
+		}
+		$rs = $this->Execute('SHOW PROCEDURE STATUS'.$likepattern);
+		if (is_object($rs)) {
+
+			// parse index data into array
+			while ($row = $rs->FetchRow()) {
+				$procedures[$row[1]] = array(
+					'type' => 'PROCEDURE',
+					'catalog' => '',
+					'schema' => '',
+					'remarks' => $row[7],
+				);
+			}
+		}
+
+		$rs = $this->Execute('SHOW FUNCTION STATUS'.$likepattern);
+		if (is_object($rs)) {
+			// parse index data into array
+			while ($row = $rs->FetchRow()) {
+				$procedures[$row[1]] = array(
+					'type' => 'FUNCTION',
+					'catalog' => '',
+					'schema' => '',
+					'remarks' => $row[7]
+				);
+			}
+		}
+
+		// restore fetchmode
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		return $procedures;
+	}
+
+	/**
+	 * Retrieves a list of tables based on given criteria
+	 *
+	 * @param string $ttype Table type = 'TABLE', 'VIEW' or false=both (default)
+	 * @param string $showSchema schema name, false = current schema (default)
+	 * @param string $mask filters the table by name
+	 *
+	 * @return array list of tables
+	 */
+	function metaTables($ttype=false,$showSchema=false,$mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
+			$this->metaTablesSQL .= $this->qstr($showSchema);
+		} else {
+			$this->metaTablesSQL .= "schema()";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
+			$this->metaTablesSQL .= " AND table_name LIKE $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
-	
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+
+
+	function metaIndexes ($table, $primary = FALSE, $owner=false)
 	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        
+		// save old fetch mode
+		global $ADODB_FETCH_MODE;
+
 		$false = false;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        
-        // get index details
-        $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
-        
-        // restore fetchmode
-        if (isset($savem)) {
-                $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        if (!is_object($rs)) {
-                return $false;
-        }
-        
-        $indexes = array ();
-        
-        // parse index data into array
-        while ($row = $rs->FetchRow()) {
-                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-                        continue;
-                }
-                
-                if (!isset($indexes[$row[2]])) {
-                        $indexes[$row[2]] = array(
-                                'unique' => ($row[1] == 0),
-                                'columns' => array()
-                        );
-                }
-                
-                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-        }
-        
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index )
-        {
-                ksort ($indexes[$index]['columns']);
-        }
-        
-        return $indexes;
-	}
-
-	
-	// if magic quotes disabled, use mysql_real_escape_string()
-	function qstr($s,$magic_quotes=false)
-	{
-		if (!$magic_quotes) {
-		
-			if (ADODB_PHPVER >= 0x4300) {
-				if (is_resource($this->_connectionID))
-					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
+
+		// get index details
+		$rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
+
+		// restore fetchmode
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		if (!is_object($rs)) {
+			return $false;
+		}
+
+		$indexes = array ();
+
+		// parse index data into array
+		while ($row = $rs->FetchRow()) {
+			if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+				continue;
 			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+
+			if (!isset($indexes[$row[2]])) {
+				$indexes[$row[2]] = array(
+					'unique' => ($row[1] == 0),
+					'columns' => array()
+				);
 			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+
+			$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']);
 		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
+
+		return $indexes;
 	}
-	
-	function _insertid()
+
+
+	/**
+	 * 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 (is_resource($this->_connectionID)) {
+			return "'" . mysql_real_escape_string($s, $this->_connectionID) . "'";
+		}
+
+		if ($this->replaceQuote[0] == '\\') {
+			$s = str_replace(array('\\', "\0"), array('\\\\', "\\\0"), $s);
+		}
+		return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
+	}
+
+	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) {
-			$rs =& $this->SelectLimit($sql,1,-1,$inputarr);
+			$rs = $this->SelectLimit($sql,1,-1,$inputarr);
 			if ($rs) {
 				$rs->Close();
-				if ($rs->EOF) return false;
+				if ($rs->EOF) return $ADODB_GETONE_EOF;
 				return reset($rs->fields);
 			}
 		} else {
@@ -169,40 +301,41 @@ 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");
 	}
-	
+
 	function _affectedrows()
 	{
 			return mysql_affected_rows($this->_connectionID);
 	}
-  
- 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
+
+	 // See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
 	// Reference on Last_Insert_ID on the recommended way to simulate sequences
- 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
-	var $_genSeqSQL = "create table %s (id int not null)";
+	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
+	var $_genSeqSQL = "create table if not exists %s (id int not null)";
+	var $_genSeqCountSQL = "select count(*) from %s";
 	var $_genSeq2SQL = "insert into %s values (%s)";
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seqname='adodbseq',$startID=1)
+	var $_dropSeqSQL = "drop table if exists %s";
+
+	function createSequence($seqname='adodbseq',$startID=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
 		$u = strtoupper($seqname);
-		
+
 		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
 		if (!$ok) return false;
 		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 	}
-	
 
-	function GenID($seqname='adodbseq',$startID=1)
+
+	function genID($seqname='adodbseq',$startID=1)
 	{
 		// post-nuke sets hasGenID to false
 		if (!$this->hasGenID) return false;
-		
+
 		$savelog = $this->_logsql;
 		$this->_logsql = false;
 		$getnext = sprintf($this->_genIDSQL,$seqname);
@@ -212,18 +345,22 @@ function GenID($seqname='adodbseq',$startID=1)
 			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
 			$u = strtoupper($seqname);
 			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
-			$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
+			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 			$rs = $this->Execute($getnext);
 		}
-		$this->genID = mysql_insert_id($this->_connectionID);
-		
-		if ($rs) $rs->Close();
-		
+
+		if ($rs) {
+			$this->genID = mysql_insert_id($this->_connectionID);
+			$rs->Close();
+		} else
+			$this->genID = 0;
+
 		$this->_logsql = $savelog;
 		return $this->genID;
 	}
-	
-  	function &MetaDatabases()
+
+	function metaDatabases()
 	{
 		$qid = mysql_list_dbs($this->_connectionID);
 		$arr = array();
@@ -236,11 +373,11 @@ function &MetaDatabases()
 		}
 		return $arr;
 	}
-	
-		
+
+
 	// 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.",'";
 		$concat = false;
@@ -248,7 +385,7 @@ function SQLDate($fmt, $col=false)
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -259,7 +396,7 @@ function SQLDate($fmt, $col=false)
 			case '/':
 				$s .= $ch;
 				break;
-				
+
 			case 'Y':
 			case 'y':
 				$s .= '%Y';
@@ -267,7 +404,7 @@ function SQLDate($fmt, $col=false)
 			case 'M':
 				$s .= '%b';
 				break;
-				
+
 			case 'm':
 				$s .= '%m';
 				break;
@@ -275,45 +412,45 @@ function SQLDate($fmt, $col=false)
 			case 'd':
 				$s .= '%d';
 				break;
-			
+
 			case 'Q':
 			case 'q':
 				$s .= "'),Quarter($col)";
-				
+
 				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
 				else $s .= ",('";
 				$concat = true;
 				break;
-			
-			case 'H': 
+
+			case 'H':
 				$s .= '%H';
 				break;
-				
+
 			case 'h':
 				$s .= '%I';
 				break;
-				
+
 			case 'i':
 				$s .= '%i';
 				break;
-				
+
 			case 's':
 				$s .= '%s';
 				break;
-				
+
 			case 'a':
 			case 'A':
 				$s .= '%p';
 				break;
-				
+
 			case 'w':
 				$s .= '%w';
 				break;
-				
+
 			 case 'W':
 				$s .= '%U';
 				break;
-				
+
 			case 'l':
 				$s .= '%W';
 				break;
@@ -323,72 +460,81 @@ function SQLDate($fmt, $col=false)
 		if ($concat) $s = "CONCAT($s)";
 		return $s;
 	}
-	
+
 
 	// returns concatenated string
 	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
-	function Concat()
+	function concat()
 	{
 		$s = "";
 		$arr = func_get_args();
-		
+
 		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
+		$s = implode(',',$arr);
 		if (strlen($s) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
-	function OffsetDate($dayFraction,$date=false)
-	{		
+
+	function offsetDate($dayFraction,$date=false)
+	{
 		if (!$date) $date = $this->sysDate;
-		
+
 		$fraction = $dayFraction * 24 * 3600;
-		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
+		return '('. $date . ' + INTERVAL ' .	 $fraction.' SECOND)';
+
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
-		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect,$this->clientFlags);
-		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect);
-		else
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
-	
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		if (!empty($this->port))
+			$argHostname .= ":".$this->port;
+
+		$this->_connectionID =
+			mysql_connect($argHostname,
+						  $argUsername,
+						  $argPassword,
+						  $this->forceNewConnect,
+						  $this->clientFlags
+						  );
+
+
+		if ($this->_connectionID === false)
+			return false;
+		if ($argDatabasename)
+			return $this->SelectDB($argDatabasename);
+
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!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);
-		return true;	
+
+		$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;
 	}
-	
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->forceNewConnect = true;
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
-	
- 	function &MetaColumns($table) 
+
+	function metaColumns($table, $normalize=true)
 	{
 		$this->_findschema($table,$schema);
 		if ($schema) {
@@ -398,27 +544,27 @@ function &MetaColumns($table)
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
+
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
 		if ($schema) {
 			$this->SelectDB($dbName);
 		}
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs)) {
 			$false = false;
 			return $false;
 		}
-			
+
 		$retarr = array();
 		while (!$rs->EOF){
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -441,9 +587,10 @@ function &MetaColumns($table)
 			$fld->not_null = ($rs->fields[2] != 'YES');
 			$fld->primary_key = ($rs->fields[3] == 'PRI');
 			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-			$fld->binary = (strpos($type,'blob') !== false);
+			$fld->binary = (strpos($type,'blob') !== false || strpos($type,'binary') !== false);
 			$fld->unsigned = (strpos($type,'unsigned') !== false);
-				
+			$fld->zerofill = (strpos($type,'zerofill') !== false);
+
 			if (!$fld->binary) {
 				$d = $rs->fields[4];
 				if ($d != '' && $d != 'NULL') {
@@ -453,7 +600,7 @@ function &MetaColumns($table)
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
@@ -461,144 +608,159 @@ function &MetaColumns($table)
 			}
 				$rs->MoveNext();
 			}
-		
+
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 	}
-		
+
 	// returns true or false
-	function SelectDB($dbName) 
+	function selectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-			return @mysql_select_db($dbName,$this->_connectionID);		
+			return @mysql_select_db($dbName,$this->_connectionID);
 		}
-		else return false;	
+		else return false;
 	}
-	
+
 	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
+	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
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
+		// jason judge, see PHPLens Issue No: 9220
+		if ($nrows < 0) $nrows = '18446744073709551615';
+
 		if ($secs)
-			$rs =& $this->CacheExecute($secs,$sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
+			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
 		else
-			$rs =& $this->Execute($sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
+			$rs = $this->Execute($sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
 		return $rs;
 	}
-	
+
 	// returns queryID or false
-	function _query($sql,$inputarr)
+	function _query($sql,$inputarr=false)
 	{
-	//global $ADODB_COUNTRECS;
-		//if($ADODB_COUNTRECS) 
-		return mysql_query($sql,$this->_connectionID);
-		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
+
+	return mysql_query($sql,$this->_connectionID);
+	/*
+	global $ADODB_COUNTRECS;
+		if($ADODB_COUNTRECS)
+			return mysql_query($sql,$this->_connectionID);
+		else
+			return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
+	*/
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function errorMsg()
 	{
-	
+
 		if ($this->_logsql) return $this->_errorMsg;
 		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
 		else $this->_errorMsg = @mysql_error($this->_connectionID);
 		return $this->_errorMsg;
 	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function errorNo()
 	{
 		if ($this->_logsql) return $this->_errorCode;
-		if (empty($this->_connectionID))  return @mysql_errno();
+		if (empty($this->_connectionID)) return @mysql_errno();
 		else return @mysql_errno($this->_connectionID);
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
 		@mysql_close($this->_connectionID);
+
+		$this->charSet = '';
 		$this->_connectionID = false;
 	}
 
-	
+
 	/*
 	* Maximum size of C field
 	*/
-	function CharMax()
+	function charMax()
 	{
-		return 255; 
+		return 255;
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
-	function TextMax()
+	function textMax()
 	{
-		return 4294967295; 
+		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;
 
-         if ( !empty($owner) ) {
-            $table = "$owner.$table";
-         }
-         $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
-		 if ($associative) $create_sql = $a_create_table["Create Table"];
-         else $create_sql  = $a_create_table[1];
-
-         $matches = array();
-
-         if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	     $foreign_keys = array();	 	 
-         $num_keys = count($matches[0]);
-         for ( $i = 0;  $i < $num_keys;  $i ++ ) {
-             $my_field  = explode('`, `', $matches[1][$i]);
-             $ref_table = $matches[2][$i];
-             $ref_field = explode('`, `', $matches[3][$i]);
-
-             if ( $upper ) {
-                 $ref_table = strtoupper($ref_table);
-             }
-
-             $foreign_keys[$ref_table] = array();
-             $num_fields = count($my_field);
-             for ( $j = 0;  $j < $num_fields;  $j ++ ) {
-                 if ( $associative ) {
-                     $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
-                 } else {
-                     $foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
-                 }
-             }
-         }
-         
-         return  $foreign_keys;
-     }
-	 
-	
+		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];
+		}
+
+		$matches = array();
+
+		if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
+		$foreign_keys = array();
+		$num_keys = count($matches[0]);
+		for ( $i = 0; $i < $num_keys; $i ++ ) {
+			$my_field  = explode('`, `', $matches[1][$i]);
+			$ref_table = $matches[2][$i];
+			$ref_field = explode('`, `', $matches[3][$i]);
+
+			if ( $upper ) {
+				$ref_table = strtoupper($ref_table);
+			}
+
+			// see https://sourceforge.net/p/adodb/bugs/100/
+			if (!isset($foreign_keys[$ref_table])) {
+				$foreign_keys[$ref_table] = array();
+			}
+			$num_fields = count($my_field);
+			for ( $j = 0; $j < $num_fields; $j ++ ) {
+				if ( $associative ) {
+					$foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
+				} else {
+					$foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
+				}
+			}
+		}
+
+		return $foreign_keys;
+	}
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 
-class ADORecordSet_mysql extends ADORecordSet{	
-	
+class ADORecordSet_mysql extends ADORecordSet{
+
 	var $databaseType = "mysql";
 	var $canSeek = true;
-	
-	function ADORecordSet_mysql($queryID,$mode=false) 
+
+	function __construct($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -612,9 +774,9 @@ function ADORecordSet_mysql($queryID,$mode=false)
 			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		parent::__construct($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	//GLOBAL $ADODB_COUNTRECS;
@@ -622,38 +784,42 @@ function _initrs()
 		$this->_numOfRows = @mysql_num_rows($this->_queryID);
 		$this->_numOfFields = @mysql_num_fields($this->_queryID);
 	}
-	
-	function &FetchField($fieldOffset = -1) 
-	{	
+
+	function fetchField($fieldOffset = -1)
+	{
 		if ($fieldOffset != -1) {
 			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
 			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
-			$o->max_length = @mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson (jnich@att.com)
+			if ($o) $o->max_length = @mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson (jnich#att.com)
 			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
-			$o->binary = (strpos($f,'binary')!== false);
+			if ($o) $o->binary = (strpos($f,'binary')!== false);
 		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+		else {	/*	The $fieldOffset argument is not provided thus its -1 	*/
 			$o = @mysql_fetch_field($this->_queryID);
-		$o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich@att.com)
-		//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
+			//if ($o) $o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich#att.com)
+			$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
 		}
-			
+
 		return $o;
 	}
 
-	function &GetRowAssoc($upper=true)
+	function getRowAssoc($upper = ADODB_ASSOC_CASE)
 	{
-		if ($this->fetchMode == MYSQL_ASSOC && !$upper) $row = $this->fields;
-		else $row =& ADORecordSet::GetRowAssoc($upper);
+		if ($this->fetchMode == MYSQL_ASSOC && $upper == ADODB_ASSOC_CASE_LOWER) {
+			$row = $this->fields;
+		}
+		else {
+			$row = ADORecordSet::GetRowAssoc($upper);
+		}
 		return $row;
 	}
-	
+
 	/* 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];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -663,18 +829,17 @@ function Fields($colname)
 		}
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	function _seek($row)
 	{
 		if ($this->_numOfRows == 0) return false;
 		return @mysql_data_seek($this->_queryID,$row);
 	}
-	
-	function MoveNext()
+
+	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;
 			return true;
 		}
@@ -684,99 +849,84 @@ function MoveNext()
 		}
 		return false;
 	}
-	
+
 	function _fetch()
 	{
-		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
+		$this->fields = @mysql_fetch_array($this->_queryID,$this->fetchMode);
+		$this->_updatefields();
 		return is_array($this->fields);
 	}
-	
+
 	function _close() {
-		@mysql_free_result($this->_queryID);	
-		$this->_queryID = false;	
+		@mysql_free_result($this->_queryID);
+		$this->_queryID = false;
 	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
+
+	function metaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING': 
+		case 'STRING':
 		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET': 
+		case 'VARCHAR':
+		case 'TINYBLOB':
+		case 'TINYTEXT':
+		case 'ENUM':
+		case 'SET':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 			return 'X';
-			
+
 		// php_mysql extension always returns 'blob' even if 'text'
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
+		case 'BINARY':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'YEAR':
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'TINYINT':
 		case 'MEDIUMINT':
-		case 'SMALLINT': 
-			
+		case 'SMALLINT':
+
 			if (!empty($fieldobj->primary_key)) return 'R';
 			else return 'I';
-		
-		default: return 'N';
+
+		default: return ADODB_DEFAULT_METATYPE;
 		}
 	}
 
 }
 
-class ADORecordSet_ext_mysql extends ADORecordSet_mysql {	
-	function ADORecordSet_ext_mysql($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default:
-		$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-	
-	function MoveNext()
+/**
+ * Class ADORecordSet_ext_mysql
+ */
+class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
+
+	function moveNext()
 	{
 		return @adodb_movenext($this);
 	}
 }
 
-
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mysqli.inc.php b/adodb/drivers/adodb-mysqli.inc.php
index 465d2bb..352810c 100644
--- a/adodb/drivers/adodb-mysqli.inc.php
+++ b/adodb/drivers/adodb-mysqli.inc.php
@@ -1,37 +1,54 @@
 _transmode  = $transaction_mode;
+		$this->_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);
-	}
-
-	// returns true or false
-	// To add: parameter int $port,
-	//         parameter string $socket
-	function _connect($argHostname = NULL, 
-			  $argUsername = NULL, 
-			  $argPassword = NULL, 
-			  $argDatabasename = NULL, $persist=false)
-	  {
-	  	 if(!extension_loaded("mysqli")) {
+		$this->execute("SET SESSION TRANSACTION ".$transaction_mode);
+	}
+
+	/**
+	 * 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;
-		 }
-	    $this->_connectionID = @mysqli_init();
-	    
-	    if (is_null($this->_connectionID)) {
-	      // mysqli_init only fails if insufficient memory
-	      if ($this->debug) 
-				ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
-	      return false;
-	    }
+		}
+		$this->_connectionID = @mysqli_init();
+
+		if (is_null($this->_connectionID)) {
+			// mysqli_init only fails if insufficient memory
+			if ($this->debug) {
+				ADOConnection::outp("mysqli_init() failed : "  . $this->errorMsg());
+			}
+			return false;
+		}
 		/*
 		I suggest a simple fix which would enable adodb and mysqli driver to
 		read connection options from the standard mysql configuration file
 		/etc/my.cnf - "Bastien Duclaux" 
 		*/
-		foreach($this->optionFlags as $arr) {	
+		$this->optionFlags = array();
+		foreach($this->optionFlags as $arr) {
 			mysqli_options($this->_connectionID,$arr[0],$arr[1]);
 		}
 
+		// 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,
- 				    $argHostname,
- 				    $argUsername,
- 				    $argPassword,
- 				    $argDatabasename,
-					$this->port,
+		$ok = @mysqli_real_connect($this->_connectionID,
+					$argHostname,
+					$argUsername,
+					$argPassword,
+					$argDatabasename,
+					# PHP7 compat: port must be int. Use default port if cast yields zero
+					(int)$this->port != 0 ? (int)$this->port : 3306,
 					$this->socket,
 					$this->clientFlags);
- 	     
+
 		if ($ok) {
-	 		if ($argDatabasename)  return $this->SelectDB($argDatabasename);
- 			return true;
- 	   } else {
-			if ($this->debug) 
-		  		ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
+			if ($argDatabasename)  return $this->selectDB($argDatabasename);
+			return true;
+		} else {
+			if ($this->debug) {
+				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 ) 
 	{
-		return " IFNULL($field, $ifNull) "; // if MySQL
+		$this->forceNewConnect = true;
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
-	
+
+	/**
+	 * 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) ";
+	}
+
+	/**
+	 * 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);
+		if ($rs) {
+			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
+			else $ret = reset($rs->fields);
+			$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('BEGIN');
+
+		//$this->execute('SET AUTOCOMMIT=0');
+		mysqli_autocommit($this->_connectionID, false);
+		$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 ($this->transOff) return true;
+		if (!$ok) return $this->rollbackTrans();
+
 		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->Execute('SET AUTOCOMMIT=1');
+		$this->execute('COMMIT');
+
+		//$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='',$flds='1 as adodb_ignore') 
+
+	/**
+	 * 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 $flds from $tables $where for update");
-		return !empty($rs); 
+		$rs = $this->execute("select $col from $tables $where for update");
+		return !empty($rs);
 	}
-	
-	// if magic quotes disabled, use mysql_real_escape_string()
-	// From readme.htm:
-	// Quotes a string to be sent to the database. The $magic_quotes_enabled
-	// parameter may look funny, but the idea is if you are quoting a 
-	// string extracted from a POST/GET variable, then 
-	// pass get_magic_quotes_gpc() as the second parameter. This will 
-	// ensure that the variable is not quoted twice, once by qstr and once 
-	// by the magic_quotes_gpc.
-	//
-	//Eg. $s = $db->qstr(_GET['name'],get_magic_quotes_gpc());
-	function qstr($s, $magic_quotes = false)
-	{
-		if (!$magic_quotes) {
-	    	if (PHP_VERSION >= 5)
-	      		return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";   
-	    
-		if ($this->replaceQuote[0] == '\\')
-			$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-	    return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-	  }
-	  // undo magic quotes for "
-	  $s = str_replace('\\"','"',$s);
-	  return "'$s'";
+
+	/**
+	 * 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)
+	{
+		if (is_null($s)) {
+			return 'NULL';
+		}
+
+		// mysqli_real_escape_string() throws a warning when the given
+		// connection is invalid
+		if ($this->_connectionID) {
+			return "'" . mysqli_real_escape_string($this->_connectionID, $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);
-	  if ($result == -1){
-	      if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : "  . $this->ErrorMsg());
-	  }
-	  return $result;
+		// 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());
+		}
+		// 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()
 	{
-	  $result =  @mysqli_affected_rows($this->_connectionID);
-	  if ($result == -1) {
-	      if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : "  . $this->ErrorMsg());
-	  }
-	  return $result;
+		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());
+		}
+		return $result;
 	}
-  
- 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
+
 	// Reference on Last_Insert_ID on the recommended way to simulate sequences
- 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
-	var $_genSeqSQL = "create table %s (id int not null)";
+	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
+	var $_genSeqSQL = "create table if not exists %s (id int not null)";
+	var $_genSeqCountSQL = "select count(*) from %s";
 	var $_genSeq2SQL = "insert into %s values (%s)";
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seqname='adodbseq',$startID=1)
+	var $_dropSeqSQL = "drop table if exists %s";
+
+	/**
+	 * 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));
-			$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);
 		}
-		$this->genID = mysqli_insert_id($this->_connectionID);
-		
-		if ($rs) $rs->Close();
-		
+
+		if ($rs) {
+			$this->genID = mysqli_insert_id($this->_connectionID);
+			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;
 	}
-	
-  	function &MetaDatabases()
+
+	/**
+	 * 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();
+			$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 $arr;
 		}
-        return $ret;
+		return $ret;
 	}
 
-	  
-	function &MetaIndexes ($table, $primary = 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;
-		
+
 		$false = 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;
-		
+
 		if (!is_object($rs)) {
-		        return $false;
+			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];
+		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']);
+			ksort ($indexes[$index]['columns']);
 		}
-		
+
 		return $indexes;
 	}
 
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
+	/**
+	 * 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.",'";
 		$concat = false;
@@ -353,7 +626,7 @@ function SQLDate($fmt, $col=false)
 			case 'Q':
 			case 'q':
 				$s .= "'),Quarter($col)";
-				
+
 				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
 				else $s .= ",('";
 				$concat = true;
@@ -361,7 +634,7 @@ function SQLDate($fmt, $col=false)
 			case 'M':
 				$s .= '%b';
 				break;
-				
+
 			case 'm':
 				$s .= '%m';
 				break;
@@ -369,38 +642,38 @@ function SQLDate($fmt, $col=false)
 			case 'd':
 				$s .= '%d';
 				break;
-			
-			case 'H': 
+
+			case 'H':
 				$s .= '%H';
 				break;
-				
+
 			case 'h':
 				$s .= '%I';
 				break;
-				
+
 			case 'i':
 				$s .= '%i';
 				break;
-				
+
 			case 's':
 				$s .= '%s';
 				break;
-				
+
 			case 'a':
 			case 'A':
 				$s .= '%p';
 				break;
-			
+
 			case 'w':
 				$s .= '%w';
 				break;
-				
+
 			case 'l':
 				$s .= '%W';
 				break;
-				
+
 			default:
-				
+
 				if ($ch == '\\') {
 					$i++;
 					$ch = substr($fmt,$i,1);
@@ -413,113 +686,250 @@ function SQLDate($fmt, $col=false)
 		if ($concat) $s = "CONCAT($s)";
 		return $s;
 	}
-	
-	// returns concatenated string
-	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
+
+	/**
+	 * 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
-		$s = implode(',',$arr); 
+		$s = implode(',',$arr);
 		if (strlen($s) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
-	// dayFraction is a day in floating point
-	function OffsetDate($dayFraction,$date=false)
-	{		
+
+	/**
+	 * 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;
-		
+
 		$fraction = $dayFraction * 24 * 3600;
 		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
+
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	/**
+	 * 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;
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->setFetchMode(FALSE);
+		}
+
+		$procedures = array ();
+
+		// get index details
+
+		$likepattern = '';
+		if ($NamePattern) {
+			$likepattern = " LIKE '".$NamePattern."'";
+		}
+		$rs = $this->execute('SHOW PROCEDURE STATUS'.$likepattern);
+		if (is_object($rs)) {
+
+			// parse index data into array
+			while ($row = $rs->fetchRow()) {
+				$procedures[$row[1]] = array(
+					'type' => 'PROCEDURE',
+					'catalog' => '',
+					'schema' => '',
+					'remarks' => $row[7],
+				);
+			}
+		}
+
+		$rs = $this->execute('SHOW FUNCTION STATUS'.$likepattern);
+		if (is_object($rs)) {
+			// parse index data into array
+			while ($row = $rs->fetchRow()) {
+				$procedures[$row[1]] = array(
+					'type' => 'FUNCTION',
+					'catalog' => '',
+					'schema' => '',
+					'remarks' => $row[7]
+				);
+			}
+		}
+
+		// restore fetchmode
+		if (isset($savem)) {
+				$this->setFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		return $procedures;
+	}
+
+	/**
+	 * Retrieves a list of tables based on given criteria
+	 *
+	 * @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)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
+			$this->metaTablesSQL .= $this->qstr($showSchema);
+		} else {
+			$this->metaTablesSQL .= "schema()";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
+			$this->metaTablesSQL .= " AND table_name LIKE $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+		$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;
-		
-	    if ( !empty($owner) ) {
-	       $table = "$owner.$table";
-	    }
-	    $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
-		if ($associative) $create_sql = $a_create_table["Create Table"];
-	    else $create_sql  = $a_create_table[1];
-	
-	    $matches = array();
-	
-	    if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	 	$foreign_keys = array();	 	 
-	    $num_keys = count($matches[0]);
-	    for ( $i = 0;  $i < $num_keys;  $i ++ ) {
-	        $my_field  = explode('`, `', $matches[1][$i]);
-	        $ref_table = $matches[2][$i];
-	        $ref_field = explode('`, `', $matches[3][$i]);
-	
-	        if ( $upper ) {
-	            $ref_table = strtoupper($ref_table);
-	        }
-	
-	        $foreign_keys[$ref_table] = array();
-	        $num_fields               = count($my_field);
-	        for ( $j = 0;  $j < $num_fields;  $j ++ ) {
-	            if ( $associative ) {
-	                $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
-	            } else {
-	                $foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
-	            }
-	        }
-	    }
-	    
-	    return  $foreign_keys;
+
+		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));
+
+		$this->setFetchMode($savem);
+
+		$create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
+
+		$matches = array();
+
+		if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
+		$foreign_keys = array();
+		$num_keys = count($matches[0]);
+		for ( $i = 0; $i < $num_keys; $i ++ ) {
+			$my_field  = explode('`, `', $matches[1][$i]);
+			$ref_table = $matches[2][$i];
+			$ref_field = explode('`, `', $matches[3][$i]);
+
+			if ( $upper ) {
+				$ref_table = strtoupper($ref_table);
+			}
+
+			// see https://sourceforge.net/p/adodb/bugs/100/
+			if (!isset($foreign_keys[$ref_table])) {
+				$foreign_keys[$ref_table] = array();
+			}
+			$num_fields = count($my_field);
+			for ( $j = 0; $j < $num_fields; $j ++ ) {
+				if ( $associative ) {
+					$foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
+				} else {
+					$foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
+				}
+			}
+		}
+
+		return $foreign_keys;
 	}
-	
- 	function &MetaColumns($table) 
+
+	/**
+	 * 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)
 			return $false;
-		
+
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$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;
 		if (!is_object($rs))
 			return $false;
-		
+
 		$retarr = array();
 		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$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)) {
@@ -531,17 +941,21 @@ function &MetaColumns($table)
 				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
 			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
 				$fld->type = $query_array[1];
-				$fld->max_length = max(array_map("strlen",explode(",",$query_array[2]))) - 2; // PHP >= 4.0.6
-				$fld->max_length = ($fld->max_length == 0 ? 1 : $fld->max_length);
+				$arr = explode(",",$query_array[2]);
+				$fld->enums = $arr;
+				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
+				$fld->max_length = ($zlen > 0) ? $zlen : 1;
 			} else {
 				$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);
 			$fld->binary = (strpos($type,'blob') !== false);
 			$fld->unsigned = (strpos($type,'unsigned') !== false);
+			$fld->zerofill = (strpos($type,'zerofill') !== false);
 
 			if (!$fld->binary) {
 				$d = $rs->fields[4];
@@ -552,224 +966,321 @@ function &MetaColumns($table)
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
 				$retarr[strtoupper($fld->name)] = $fld;
 			}
-			$rs->MoveNext();
+			$rs->moveNext();
 		}
-		
-		$rs->Close();
+
+		$rs->close();
 		return $retarr;
 	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
+
+	/**
+	 * 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);
-	    $this->database = $dbName;
+//		$this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
+		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		
-	    if ($this->_connectionID) {
-        	$result = @mysqli_select_db($this->_connectionID, $dbName);
+
+		if ($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 $result;
 		}
-	    return false;	
+		return false;
 	}
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,
-			      $nrows = -1,
-			      $offset = -1,
-			      $inputarr = false, 
-			      $arg3 = false,
-			      $secs = 0)
+
+	/**
+	 * 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 = (int) $nrows;
+		$offset = (int) $offset;
 		$offsetStr = ($offset >= 0) ? "$offset," : '';
 		if ($nrows < 0) $nrows = '18446744073709551615';
-		
+
 		if ($secs)
-			$rs =& $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
+			$rs = $this->cacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr );
 		else
-			$rs =& $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
-			
+			$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
+		// return value of the stored proc (ie the number of rows affected).
+		// Commented out for reasons of performance. You should retrieve every recordset yourself.
+		//	if (!mysqli_next_result($this->connection->_connectionID))	return false;
+
 		if (is_array($sql)) {
+
+			// Prepare() not supported because mysqli_stmt_execute does not return a recordset, but
+			// returns as bound variables.
+
 			$stmt = $sql[1];
 			$a = '';
 			foreach($inputarr as $k => $v) {
 				if (is_string($v)) $a .= 's';
-				else if (is_integer($v)) $a .= 'i'; 
+				else if (is_integer($v)) $a .= 'i';
 				else $a .= 'd';
 			}
-			
-			$fnarr = array_merge( array($stmt,$a) , $inputarr);
-			$ret = call_user_func_array('mysqli_stmt_bind_param',$fnarr);
 
+			/*
+			 * set prepared statement flags
+			 */
+			if ($this->usePreparedStatement)
+				$this->useLastInsertStatement = true;
+
+			$fnarr = array_merge( array($stmt,$a) , $inputarr);
+			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());
-		    return false;
+			if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->errorMsg());
+			return false;
 		}
-		
+
 		return $mysql_res;
+		*/
+		
+		if ($this->multiQuery) {
+			$rs = mysqli_multi_query($this->_connectionID, $sql.';');
+			if ($rs) {
+				$rs = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->_connectionID ) : @mysqli_use_result( $this->_connectionID );
+				return $rs ? $rs : true; // mysqli_more_results( $this->_connectionID )
+			}
+		} else {
+			$rs = mysqli_query($this->_connectionID, $sql, $ADODB_COUNTRECS ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
+			if ($rs) {
+				$this->isSelectStatement = is_object($rs);
+				return $rs;
+			}
+		}
+
+		if($this->debug)
+			ADOConnection::outp("Query: " . $sql . " failed. " . $this->errorMsg());
+
+		return false;
+
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	  {
-	    if (empty($this->_connectionID)) 
-	      $this->_errorMsg = @mysqli_connect_error();
-	    else 
-	      $this->_errorMsg = @mysqli_error($this->_connectionID);
-	    return $this->_errorMsg;
-	  }
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	  {
-	    if (empty($this->_connectionID))  
-	      return @mysqli_connect_errno();
-	    else 
-	      return @mysqli_errno($this->_connectionID);
-	  }
-	
-	// returns true or false
-	function _close()
-	  {
-	    @mysqli_close($this->_connectionID);
-	    $this->_connectionID = false;
-	  }
-
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
+	/**
+	 * 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()
 	{
-		return 255; 
+		if (empty($this->_connectionID))
+			$this->_errorMsg = @mysqli_connect_error();
+		else
+			$this->_errorMsg = @mysqli_error($this->_connectionID);
+		return $this->_errorMsg;
 	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
+
+	/**
+	 * Returns the last error number from previous database operation.
+	 *
+	 * @return int The last error number.
+	 */
+	function ErrorNo()
 	{
-	  return 4294967295; 
+		if (empty($this->_connectionID))
+			return @mysqli_connect_errno();
+		else
+			return @mysqli_errno($this->_connectionID);
 	}
 
+	/**
+	 * Close the database connection.
+	 *
+	 * @return void
+	 */
+	function _close()
+	{
+		if($this->_connectionID) {
+			mysqli_close($this->_connectionID);
+		}
+		$this->_connectionID = false;
+	}
 
+	/**
+	 * 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;
+	}
 
-	// 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()
-  {
-    //we will use ADO's builtin property charSet
-    if (!method_exists($this->_connectionID,'character_set_name'))
-    	return false;
-    	
-    $this->charSet = @$this->_connectionID->character_set_name();
-    if (!$this->charSet) {
-      return false;
-    } else {
-      return $this->charSet;
-    }
-  }
-
-  // SetCharSet - switch the client encoding
-  function SetCharSet($charset_name)
-  {
-    if (!method_exists($this->_connectionID,'set_charset'))
-    	return false;
+	/**
+	 * 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;
+	}
 
-    if ($this->charSet !== $charset_name) {
-      $if = @$this->_connectionID->set_charset($charset_name);
-      if ($if == "0" & $this->GetCharSet() == $charset_name) {
-        return true;
-      } else return false;
-    } else return true;
-  }
+	function getCharSet()
+	{
+		if (!$this->_connectionID || !method_exists($this->_connectionID,'character_set_name')) {
+			return false;
+		}
 
+		$this->charSet = $this->_connectionID->character_set_name();
+		return $this->charSet ?: false;
+	}
 
+	function setCharSet($charset)
+	{
+		if (!$this->_connectionID || !method_exists($this->_connectionID,'set_charset')) {
+			return false;
+		}
 
+		if ($this->charSet !== $charset) {
+			if (!$this->_connectionID->set_charset($charset)) {
+				return false;
+			}
+			$this->getCharSet();
+		}
+		return true;
+	}
 
 }
- 
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
 
-class ADORecordSet_mysqli extends ADORecordSet{	
-	
+/**
+ * Class ADORecordSet_mysqli
+ */
+class ADORecordSet_mysqli extends ADORecordSet{
+
 	var $databaseType = "mysqli";
 	var $canSeek = true;
-	
-	function ADORecordSet_mysqli($queryID, $mode = false) 
-	{
-	  if ($mode === false) 
-	   { 
-	      global $ADODB_FETCH_MODE;
-	      $mode = $ADODB_FETCH_MODE;
-	   }
-	   
-	  switch ($mode)
-	    {
-	    case ADODB_FETCH_NUM: 
-	      $this->fetchMode = MYSQLI_NUM; 
-	      break;
-	    case ADODB_FETCH_ASSOC:
-	      $this->fetchMode = MYSQLI_ASSOC; 
-	      break;
-	    case ADODB_FETCH_DEFAULT:
-	    case ADODB_FETCH_BOTH:
-	    default:
-	      $this->fetchMode = MYSQLI_BOTH; 
-	      break;
-	    }
-	  $this->adodbFetchMode = $mode;
-	  $this->ADORecordSet($queryID);	
+
+	function __construct($queryID, $mode = false)
+	{
+		if ($mode === false) {
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+
+		switch ($mode) {
+			case ADODB_FETCH_NUM:
+				$this->fetchMode = MYSQLI_NUM;
+				break;
+			case ADODB_FETCH_ASSOC:
+				$this->fetchMode = MYSQLI_ASSOC;
+				break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:
+			default:
+				$this->fetchMode = MYSQLI_BOTH;
+				break;
+		}
+		$this->adodbFetchMode = $mode;
+		parent::__construct($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		$this->_numOfRows = $ADODB_COUNTRECS ? @mysqli_num_rows($this->_queryID) : -1;
 		$this->_numOfFields = @mysqli_num_fields($this->_queryID);
 	}
-	
+
 /*
 1      = MYSQLI_NOT_NULL_FLAG
 2      = MYSQLI_PRI_KEY_FLAG
@@ -790,13 +1301,28 @@ function _initrs()
 131072 = MYSQLI_BINCMP_FLAG
 */
 
-	function &FetchField($fieldOffset = -1) 
-	{	
+	/**
+	 * 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;
 		if ($fieldOffset != -1) {
-		  $fieldOffset = mysqli_field_seek($this->_queryID, $fieldnr);
+			$fieldOffset = @mysqli_field_seek($this->_queryID, $fieldnr);
+		}
+		$o = @mysqli_fetch_field($this->_queryID);
+		if (!$o) return false;
+
+		//Fix for HHVM
+		if ( !isset($o->flags) ) {
+			$o->flags = 0;
 		}
-		$o = mysqli_fetch_field($this->_queryID);
 		/* Properties of an ADOFieldObject as set by MetaColumns */
 		$o->primary_key = $o->flags & MYSQLI_PRI_KEY_FLAG;
 		$o->not_null = $o->flags & MYSQLI_NOT_NULL_FLAG;
@@ -805,72 +1331,168 @@ 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;
 	}
 
-	function &GetRowAssoc($upper = true)
+	/**
+	 * 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) 
-		  return $this->fields;
-		$row =& ADORecordSet::GetRowAssoc($upper);
+		if ($this->fetchMode == MYSQLI_ASSOC && $upper == ADODB_ASSOC_CASE_LOWER) {
+			return $this->fields;
+		}
+		$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) 
-	    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)]];
+	{
+		if ($this->fetchMode != MYSQLI_NUM) {
+			return @$this->fields[$colname];
+		}
+
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i = 0; $i < $this->_numOfFields; $i++) {
+				$o = $this->fetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
+	/**
+	 * 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) 
-	    return false;
+		if ($this->_numOfRows == 0 || $row < 0) {
+			return false;
+		}
 
-	  if ($row < 0)
-	    return false;
+		mysqli_data_seek($this->_queryID, $row);
+		$this->EOF = false;
+		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;
+
+		mysqli_free_result($this->_queryID);
+		$this->_queryID = -1;
+		// 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
+		// return value of the stored proc (ie the number of rows affected).
+		if (!mysqli_next_result($this->connection->_connectionID)) {
+			return false;
+		}
 
-	  mysqli_data_seek($this->_queryID, $row);
-	  $this->EOF = false;
-	  return true;
+		// 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) {
+			return false;
+		}
+
+		$this->_inited     = false;
+		$this->bind        = false;
+		$this->_currentRow = -1;
+		$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.
-	function MoveNext() 
+
+	/**
+	 * 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;
 		$this->_currentRow++;
 		$this->fields = @mysqli_fetch_array($this->_queryID,$this->fetchMode);
-		
-		if (is_array($this->fields)) return true;
+
+		if (is_array($this->fields)) {
+			$this->_updatefields();
+			return true;
+		}
 		$this->EOF = true;
 		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);  
-	  	return is_array($this->fields);
+		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);
+		$this->_updatefields();
+		return is_array($this->fields);
 	}
-	
-	function _close() 
+
+	/**
+	 * Frees the memory associated with a result.
+	 *
+	 * @return void
+	 */
+	function _close()
 	{
-		mysqli_free_result($this->_queryID); 
-	  	$this->_queryID = false;	
+		//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)) {
+				mysqli_next_result($this->connection->_connectionID);
+			}
+		}
+
+		if ($this->_queryID instanceof mysqli_result) {
+			mysqli_free_result($this->_queryID);
+		}
+		$this->_queryID = false;
 	}
-	
+
 /*
 
 0 = MYSQLI_TYPE_DECIMAL
@@ -900,104 +1522,215 @@ 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)) {
-		    $fieldobj = $t;
-		    $t = $fieldobj->type;
-		    $len = $fieldobj->max_length;
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
 		}
-		
-		
-		 $len = -1; // mysql max_length is not accurate
-		 switch (strtoupper($t)) {
-		 case 'STRING': 
-		 case 'CHAR':
-		 case 'VARCHAR': 
-		 case 'TINYBLOB': 
-		 case 'TINYTEXT': 
-		 case 'ENUM': 
-		 case 'SET': 
-		
-		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
-	
+
+		$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 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';
+		}
+	}
+
 
 } // rs class
- 
+
+/**
+ * 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)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+			case 'STRING':
+			case 'CHAR':
+			case 'VARCHAR':
+			case 'TINYBLOB':
+			case 'TINYTEXT':
+			case 'ENUM':
+			case 'SET':
+
+			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';
+		}
+	}
 }
 
-?>
\ No newline at end of file
+} // if defined _ADODB_MYSQLI_LAYER
diff --git a/adodb/drivers/adodb-mysqlpo.inc.php b/adodb/drivers/adodb-mysqlpo.inc.php
new file mode 100644
index 0000000..8aa7779
--- /dev/null
+++ b/adodb/drivers/adodb-mysqlpo.inc.php
@@ -0,0 +1,124 @@
+transOff) return true;
+		$this->transCnt += 1;
+		$this->Execute('SET AUTOCOMMIT=0');
+		$this->Execute('BEGIN');
+		return true;
+	}
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
+		if (!$ok) return $this->RollbackTrans();
+
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('COMMIT');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('ROLLBACK');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+
+	function RowLock($tables,$where='',$col='1 as adodbignore')
+	{
+		if ($this->transCnt==0) $this->BeginTrans();
+		if ($where) $where = ' where '.$where;
+		$rs = $this->Execute("select $col from $tables $where for update");
+		return !empty($rs);
+	}
+
+}
+
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{
+	var $databaseType = "mysqlt";
+
+	function __construct($queryID,$mode=false)
+	{
+		if ($mode === false) {
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default: $this->fetchMode = MYSQL_BOTH; break;
+		}
+
+		$this->adodbFetchMode = $mode;
+		parent::__construct($queryID);
+	}
+
+	function MoveNext()
+	{
+		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
+		return false;
+	}
+}
+
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
+
+	function MoveNext()
+	{
+		return adodb_movenext($this);
+	}
+}
diff --git a/adodb/drivers/adodb-mysqlt.inc.php b/adodb/drivers/adodb-mysqlt.inc.php
index 452a76d..cccd93f 100644
--- a/adodb/drivers/adodb-mysqlt.inc.php
+++ b/adodb/drivers/adodb-mysqlt.inc.php
@@ -1,17 +1,30 @@
 
-  
-  Requires mysql client. Works on Windows and Unix.
-*/
+/**
+ * MySQL driver in transactional mode
+ *
+ * @deprecated
+ *
+ * This driver only supports the original MySQL driver in transactional mode. It
+ * is deprecated in PHP version 5.5 and removed in PHP version 7. It is deprecated
+ * as of ADOdb version 5.20.0. Use the mysqli driver instead, which supports both
+ * transactional and non-transactional updates
+ *
+ * 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();
@@ -23,20 +36,15 @@ class ADODB_mysqlt extends ADODB_mysql {
 	var $databaseType = 'mysqlt';
 	var $ansiOuter = true; // for Version 3.23.17 or later
 	var $hasTransactions = true;
-	var $autoRollback = true; // apparently mysql does not autorollback properly 
-	
-	function ADODB_mysqlt() 
-	{			
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
-	}
-	
+	var $autoRollback = true; // apparently mysql does not autorollback properly
+
 	/* set transaction mode
-	
+
 	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
 { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
 
 	*/
-	function SetTransactionMode( $transaction_mode ) 
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -46,70 +54,70 @@ function SetTransactionMode( $transaction_mode )
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
-	
+
 	function BeginTrans()
-	{	  
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->Execute('SET AUTOCOMMIT=0');
 		$this->Execute('BEGIN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
+
+	function CommitTrans($ok=true)
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
+		$ok = $this->Execute('COMMIT');
 		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
+		return $ok ? true : false;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
+		$ok = $this->Execute('ROLLBACK');
 		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
+		return $ok ? true : false;
 	}
-	
-	function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
+
+	function RowLock($tables,$where='',$col='1 as adodbignore')
 	{
 		if ($this->transCnt==0) $this->BeginTrans();
 		if ($where) $where = ' where '.$where;
-		$rs =& $this->Execute("select $flds from $tables $where for update");
-		return !empty($rs); 
+		$rs = $this->Execute("select $col from $tables $where for update");
+		return !empty($rs);
 	}
-	
+
 }
 
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{
 	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) 
+
+	function __construct($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
-		
+
 		switch ($mode)
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = MYSQL_BOTH; break;
 		}
-	
+
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		parent::__construct($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
@@ -124,32 +132,10 @@ function MoveNext()
 	}
 }
 
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
 
-	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: 
-			$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
 	function MoveNext()
 	{
 		return adodb_movenext($this);
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-netezza.inc.php b/adodb/drivers/adodb-netezza.inc.php
index 26be2ff..dc7c58e 100644
--- a/adodb/drivers/adodb-netezza.inc.php
+++ b/adodb/drivers/adodb-netezza.inc.php
@@ -1,26 +1,42 @@
 
+ */
+
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 include_once(ADODB_DIR.'/drivers/adodb-postgres64.inc.php');
 
 class ADODB_netezza extends ADODB_postgres64 {
-    var $databaseType = 'netezza';	
+    var $databaseType = 'netezza';
 	var $dataProvider = 'netezza';
 	var $hasInsertID = false;
 	var $_resultid = false;
@@ -34,11 +50,11 @@ class ADODB_netezza extends ADODB_postgres64 {
 	var $blobEncodeType = 'C';
 	var $metaColumnsSQL = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
 	var $metaColumnsSQL1 = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
-	// netezza doesn't have keys. it does have distributions, so maybe this is 
+	// netezza doesn't have keys. it does have distributions, so maybe this is
 	// something that can be pulled from the system tables
 	var $metaKeySQL = "";
 	var $hasAffectedRows = true;
-	var $hasLimit = true;	
+	var $hasLimit = true;
 	var $true = 't';		// string that represents TRUE for a database
 	var $false = 'f';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -47,52 +63,47 @@ class ADODB_netezza extends ADODB_postgres64 {
 	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
 							// http://bugs.php.net/bug.php?id=25404
 
-							
-	function ADODB_netezza() 
-	{
-	
-	}
-	
-	function &MetaColumns($table,$upper=true) 
+
+	function MetaColumns($table,$upper=true)
 	{
-	
+
 	// Changed this function to support Netezza which has no concept of keys
 	// could posisbly work on other things from the system table later.
-	
+
 	global $ADODB_FETCH_MODE;
-	
+
 		$table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) return false;
 
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
-			
-			// since we're returning type and length as one string, 
+
+			// since we're returning type and length as one string,
 			// split them out here.
-			
+
 			if ($first = strstr($rs->fields[1], "(")) {
 			 $fld->max_length = trim($first, "()");
 			} else {
 			 $fld->max_length = -1;
 			}
-		
+
 			if ($first = strpos($rs->fields[1], "(")) {
 			 $fld->type = substr($rs->fields[1], 0, $first);
 			} else {
 			 $fld->type = $rs->fields[1];
 			}
-			
+
 			switch ($fld->type) {
 			 case "byteint":
 			 case "boolean":
@@ -116,20 +127,20 @@ function &MetaColumns($table,$upper=true)
 			 $fld->max_length = 12;
 			 break;
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		return $retarr;	
-		
+		return $retarr;
+
 	}
 
-		
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -138,33 +149,13 @@ class ADORecordSet_netezza extends ADORecordSet_postgres64
 {
 	var $databaseType = "netezza";
 	var $canSeek = true;
-	
-	function ADORecordSet_netezza($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = PGSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-	
+
 	// _initrs modified to disable blob handling
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($this->_queryID):-1;
-		$this->_numOfFields = @pg_numfields($this->_queryID);
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @pg_num_fields($this->_queryID);
 	}
 
 }
-?>
diff --git a/adodb/drivers/adodb-oci8.inc.php b/adodb/drivers/adodb-oci8.inc.php
index 09dec1f..e541b6b 100644
--- a/adodb/drivers/adodb-oci8.inc.php
+++ b/adodb/drivers/adodb-oci8.inc.php
@@ -1,18 +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();
@@ -30,26 +37,25 @@
 yy-mm-dd or yyyy-mm-dd.
 
 Using 'RR' in the format forces two-digit years less than or equal to 49 to be
-interpreted as years in the 21st century (2000–2049), and years over 50 as years in
-the 20th century (1950–1999). Setting the RR format as the default for all two-digit
+interpreted as years in the 21st century (2000-2049), and years over 50 as years in
+the 20th century (1950-1999). Setting the RR format as the default for all two-digit
 year entries allows you to become year-2000 compliant. For example:
 NLS_DATE_FORMAT='RR-MM-DD'
 
-You can also modify the date format using the ALTER SESSION command. 
+You can also modify the date format using the ALTER SESSION command.
 */
 
 # define the LOB descriptor type for the given type
 # returns false if no LOB descriptor
 function oci_lob_desc($type) {
 	switch ($type) {
-		case OCI_B_BFILE: $result = OCI_D_FILE; break;
-		case OCI_B_CFILEE: $result = OCI_D_FILE; break;
-		case OCI_B_CLOB: $result = OCI_D_LOB; break;
-		case OCI_B_BLOB: $result = OCI_D_LOB; break;
-		case OCI_B_ROWID: $result = OCI_D_ROWID; break;
-		default: $result = false; break;
+		case OCI_B_BFILE:  return OCI_D_FILE;
+		case OCI_B_CFILEE: return OCI_D_FILE;
+		case OCI_B_CLOB:   return OCI_D_LOB;
+		case OCI_B_BLOB:   return OCI_D_LOB;
+		case OCI_B_ROWID:  return OCI_D_ROWID;
 	}
-	return $result;
+	return false;
 }
 
 class ADODB_oci8 extends ADOConnection {
@@ -58,17 +64,29 @@ class ADODB_oci8 extends ADOConnection {
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $concat_operator='||';
 	var $sysDate = "TRUNC(SYSDATE)";
-	var $sysTimeStamp = 'SYSDATE';
+	var $sysTimeStamp = 'SYSDATE'; // requires oracle 9 or later, otherwise use SYSDATE
 	var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
 	var $_stmt;
 	var $_commit = OCI_COMMIT_ON_SUCCESS;
 	var $_initdate = true; // init date to YYYY-MM-DD
-	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW')";
+	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW') and table_name not like 'BIN\$%'"; // bin$ tables are recycle bin tables
 	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
+	var $metaColumnsSQL2 = "select column_name,data_type,data_length, data_scale, data_precision,
+    case when nullable = 'Y' then 'NULL'
+    else 'NOT NULL' end as nulls,
+    data_default from all_tab_cols
+  where owner='%s' and table_name='%s' order by column_id"; // when there is a schema
 	var $_bindInputArray = true;
 	var $hasGenID = true;
 	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
+	var $_genSeqSQL = "
+DECLARE
+	PRAGMA AUTONOMOUS_TRANSACTION;
+BEGIN
+	execute immediate 'CREATE SEQUENCE %s START WITH %s';
+END;
+";
+
 	var $_dropSeqSQL = "DROP SEQUENCE %s";
 	var $hasAffectedRows = true;
 	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
@@ -76,129 +94,158 @@ 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 
+	var $session_sharing_force_blob = false; // alter session on updateblob if set to true
 	var $firstrows = true; // enable first rows optimization on SelectLimit()
-	var $selectOffsetAlg1 = 100; // when to use 1st algorithm of selectlimit.
+	var $selectOffsetAlg1 = 1000; // when to use 1st algorithm of selectlimit.
 	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
- 	var $useDBDateFormatForTextInput=false;
+	var $dateformat = 'YYYY-MM-DD'; // DBDate format
+	var $useDBDateFormatForTextInput=false;
 	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
 	var $_refLOBs = array();
-	
+
 	// var $ansiOuter = true; // if oracle9
-    
-	function ADODB_oci8() 
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
-	}
-	
-	/*  Function &MetaColumns($table) added by smondino@users.sourceforge.net*/
-	function &MetaColumns($table) 
+
+	/*
+	 * 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)
 	{
 	global $ADODB_FETCH_MODE;
-	
-		$false = false;
+
+		$schema = '';
+		$this->_findschema($table, $schema);
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
+		if ($this->fetchMode !== false) {
+			$savem = $this->SetFetchMode(false);
+		}
+
+		if ($schema){
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL2, strtoupper($schema), strtoupper($table)));
+		}
+		else {
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+		}
+
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
 		$ADODB_FETCH_MODE = $save;
 		if (!$rs) {
-			return $false;
+			return false;
 		}
 		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
-	   		$fld->name = $rs->fields[0];
-	   		$fld->type = $rs->fields[1];
-	   		$fld->max_length = $rs->fields[2];
+			$fld->name = $rs->fields[0];
+			$fld->type = $rs->fields[1];
+			$fld->max_length = $rs->fields[2];
 			$fld->scale = $rs->fields[3];
-			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
-				$fld->type ='INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
+			if ($rs->fields[1] == 'NUMBER') {
+				if ($rs->fields[3] == 0) {
+					$fld->type = 'INT';
+				}
+				$fld->max_length = $rs->fields[4];
+			}
+			$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
+
+			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;
+		if (empty($retarr)) {
+			return false;
+		}
+		return $retarr;
 	}
-	
+
 	function Time()
 	{
-		$rs =& $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+		$rs = $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
+		if ($rs && !$rs->EOF) {
+			return $this->UnixTimeStamp(reset($rs->fields));
+		}
+
 		return false;
 	}
- 
-/*
 
-  Multiple modes of connection are supported:
-  
-  a. Local Database
-    $conn->Connect(false,'scott','tiger');
-  
-  b. From tnsnames.ora
-    $conn->Connect(false,'scott','tiger',$tnsname); 
-    $conn->Connect($tnsname,'scott','tiger'); 
-  
-  c. Server + service name
-    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
-  
-  d. Server + SID
-  	$conn->connectSID = true;
-	$conn->Connect($serveraddress,'scott,'tiger',$SID);
-
-
-Example TNSName:
----------------
-NATSOFT.DOMAIN =
-  (DESCRIPTION =
-	(ADDRESS_LIST =
-	  (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
-	)
-	(CONNECT_DATA =
-	  (SERVICE_NAME = natsoft.domain)
-	)
-  )
-  
-  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
-	
-*/
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
+	/**
+	 * Multiple modes of connection are supported:
+	 *
+	 * a. Local Database
+	 *    $conn->Connect(false,'scott','tiger');
+	 *
+	 * b. From tnsnames.ora
+	 *    $conn->Connect($tnsname,'scott','tiger');
+	 *    $conn->Connect(false,'scott','tiger',$tnsname);
+	 *
+	 * c. Server + service name
+	 *    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
+	 *
+	 * d. Server + SID
+	 *    $conn->connectSID = true;
+	 *    $conn->Connect($serveraddress,'scott,'tiger',$SID);
+	 *
+	 * @param string|false $argHostname DB server hostname or TNS name
+	 * @param string $argUsername
+	 * @param string $argPassword
+	 * @param string $argDatabasename Service name, SID (defaults to null)
+	 * @param int $mode Connection mode, defaults to 0
+	 *                  (0 = non-persistent, 1 = persistent, 2 = force new connection)
+	 *
+	 * @return bool
+	 */
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename=null, $mode=0)
 	{
-		if (!function_exists('OCIPLogon')) return null;
-		
-		
-        $this->_errorMsg = false;
+		if (!function_exists('oci_pconnect')) {
+			return null;
+		}
+		#adodb_backtrace();
+
+		$this->_errorMsg = false;
 		$this->_errorCode = false;
-		
+
 		if($argHostname) { // added by Jorma Tuomainen 
-			if (empty($argDatabasename)) $argDatabasename = $argHostname;
+			if (empty($argDatabasename)) {
+				$argDatabasename = $argHostname;
+			}
 			else {
 				if(strpos($argHostname,":")) {
 					$argHostinfo=explode(":",$argHostname);
-				   	$argHostname=$argHostinfo[0];
+					$argHostname=$argHostinfo[0];
 					$argHostport=$argHostinfo[1];
-			 	} else {
+				} else {
 					$argHostport = empty($this->port)?  "1521" : $this->port;
-	   			}
-				
+				}
+
+				if (strncasecmp($argDatabasename,'SID=',4) == 0) {
+					$argDatabasename = substr($argDatabasename,4);
+					$this->connectSID = true;
+				}
+
 				if ($this->connectSID) {
 					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
@@ -207,43 +254,43 @@ function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mo
 					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
 			}
 		}
-				
- 		//if ($argHostname) print "
Connect: 1st argument should be left blank for $this->databaseType
";
+
+		//if ($argHostname) print "
Connect: 1st argument should be left blank for $this->databaseType
";
 		if ($mode==1) {
-			$this->_connectionID = ($this->charSet) ? 
-				OCIPLogon($argUsername,$argPassword, $argDatabasename)
-				:
-				OCIPLogon($argUsername,$argPassword, $argDatabasename, $this->charSet)
-				;
-			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
+			$this->_connectionID = ($this->charSet)
+				? oci_pconnect($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				: oci_pconnect($argUsername,$argPassword, $argDatabasename);
+			if ($this->_connectionID && $this->autoRollback)  {
+				oci_rollback($this->_connectionID);
+			}
 		} else if ($mode==2) {
-			$this->_connectionID = ($this->charSet) ? 
-				OCINLogon($argUsername,$argPassword, $argDatabasename)
-				:
-				OCINLogon($argUsername,$argPassword, $argDatabasename, $this->charSet);
-				
+			$this->_connectionID = ($this->charSet)
+				? oci_new_connect($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				: oci_new_connect($argUsername,$argPassword, $argDatabasename);
 		} else {
-			$this->_connectionID = ($this->charSet) ? 
-				OCILogon($argUsername,$argPassword, $argDatabasename)
-				:
-				OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet);
+			$this->_connectionID = ($this->charSet)
+				? oci_connect($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				: oci_connect($argUsername,$argPassword, $argDatabasename);
 		}
-		if (!$this->_connectionID) return false;
+		if (!$this->_connectionID) {
+			return false;
+		}
+
 		if ($this->_initdate) {
 			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
 		}
-		
-		// looks like: 
+
+		// looks like:
 		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
-		// $vers = OCIServerVersion($this->_connectionID);
+		// $vers = oci_server_version($this->_connectionID);
 		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
 		return true;
-   	}
-	
+	}
+
 	function ServerInfo()
 	{
 		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
-		$arr['description'] = @OCIServerVersion($this->_connectionID);
+		$arr['description'] = @oci_server_version($this->_connectionID);
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
@@ -252,90 +299,175 @@ function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
 	}
-	
+
 	// returns true or false
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
 	}
-	
+
 	function _affectedrows()
 	{
-		if (is_resource($this->_stmt)) return @OCIRowCount($this->_stmt);
+		if (is_resource($this->_stmt)) {
+			return @oci_num_rows($this->_stmt);
+		}
 		return 0;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " NVL($field, $ifNull) "; // if Oracle
 	}
-	
+
+	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)
+	function DBDate($d,$isfld=false)
 	{
-		if (empty($d) && $d !== 0) return 'null';
-		
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
+		if (empty($d) && $d !== 0) {
+			return 'null';
+		}
+
+		if ($isfld) {
+			$d = _adodb_safedate($d);
+			return 'TO_DATE('.$d.",'".$this->dateformat."')";
+		}
+
+		if (is_string($d)) {
+			$d = ADORecordSet::UnixDate($d);
+		}
+
+		if (is_object($d)) {
+			$ds = $d->format($this->fmtDate);
+		}
+		else {
+			$ds = adodb_date($this->fmtDate,$d);
+		}
+
+		return "TO_DATE(".$ds.",'".$this->dateformat."')";
 	}
 
 	function BindDate($d)
 	{
 		$d = ADOConnection::DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
+		if (strncmp($d, "'", 1)) {
+			return $d;
+		}
+
+		return substr($d, 1, strlen($d)-2);
 	}
-	
-	function BindTimeStamp($d)
+
+	function BindTimeStamp($ts)
 	{
-		$d = ADOConnection::DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
+		if (empty($ts) && $ts !== 0) {
+			return 'null';
+		}
+		if (is_string($ts)) {
+			$ts = ADORecordSet::UnixTimeStamp($ts);
+		}
+
+		if (is_object($ts)) {
+			$tss = $ts->format("'Y-m-d H:i:s'");
+		}
+		else {
+			$tss = adodb_date("'Y-m-d H:i:s'",$ts);
+		}
+
+		return $tss;
 	}
-	
+
 	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
+	function DBTimeStamp($ts,$isfld=false)
 	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+		if (empty($ts) && $ts !== 0) {
+			return 'null';
+		}
+		if ($isfld) {
+			return 'TO_DATE(substr('.$ts.",1,19),'RRRR-MM-DD, HH24:MI:SS')";
+		}
+		if (is_string($ts)) {
+			$ts = ADORecordSet::UnixTimeStamp($ts);
+		}
+
+		if (is_object($ts)) {
+			$tss = $ts->format("'Y-m-d H:i:s'");
+		}
+		else {
+			$tss = date("'Y-m-d H:i:s'",$ts);
+		}
+
+		return 'TO_DATE('.$tss.",'RRRR-MM-DD, HH24:MI:SS')";
 	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore') 
+
+	function RowLock($tables,$where,$col='1 as adodbignore')
 	{
-		if ($this->autoCommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
+		if ($this->autoCommit) {
+			$this->BeginTrans();
+		}
+		return $this->GetOne("select $col from $tables where $where for update");
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtoupper($mask));
 			$this->metaTablesSQL .= " AND upper(table_name) like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	// Mark Newnham 
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+
+	// Mark Newnham
+	function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
+		// save old fetch mode
+		global $ADODB_FETCH_MODE;
 
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
 
 		// get index details
 		$table = strtoupper($table);
@@ -343,131 +475,183 @@ function &MetaIndexes ($table, $primary = FALSE, $owner=false)
 		// get Primary index
 		$primary_key = '';
 
-		$false = false;
 		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
-		if ($row = $rs->FetchRow())
-		   $primary_key = $row[1]; //constraint_name
+		if (!is_object($rs)) {
+			if (isset($savem)) {
+				$this->SetFetchMode($savem);
+			}
+			$ADODB_FETCH_MODE = $save;
+			return false;
+		}
+
+		if ($row = $rs->FetchRow()) {
+			$primary_key = $row[1]; //constraint_name
+		}
 
 		if ($primary==TRUE && $primary_key=='') {
-			 if (isset($savem)) 
-                $this->SetFetchMode($savem);
+			if (isset($savem)) {
+				$this->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
-			return $false; //There is no primary key
+			return false; //There is no primary key
 		}
 
-        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
+		$rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
+
 
-		
-        if (!is_object($rs)) {
-			if (isset($savem)) 
+		if (!is_object($rs)) {
+			if (isset($savem)) {
 				$this->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
+			return false;
+		}
 
 		$indexes = array ();
-        // parse index data into array
+		// parse index data into array
 
-        while ($row = $rs->FetchRow()) {
-			if ($primary && $row[0] != $primary_key) continue;
-            if (!isset($indexes[$row[0]])) {
+		while ($row = $rs->FetchRow()) {
+			if ($primary && $row[0] != $primary_key) {
+				continue;
+			}
+			if (!isset($indexes[$row[0]])) {
 				$indexes[$row[0]] = array(
-				   'unique' => ($row[1] == 'UNIQUE'),
-				   'columns' => array()
+					'unique' => ($row[1] == 'UNIQUE'),
+					'columns' => array()
 				);
-            }
-            $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
-        }
+			}
+			$indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
+		}
 
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index ) {
-            ksort ($indexes[$index]['columns']);
-        }
+		// sort columns by order in the index
+		foreach ( array_keys ($indexes) as $index ) {
+			ksort ($indexes[$index]['columns']);
+		}
 
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
-        return $indexes;
+		return $indexes;
 	}
-	
+
 	function BeginTrans()
-	{	
-		if ($this->transOff) return true;
+	{
+		if ($this->transOff) {
+			return true;
+		}
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 		$this->_commit = OCI_DEFAULT;
-		
-		if ($this->_transmode) $this->Execute("SET TRANSACTION ".$this->_transmode);
-		return true;
+
+		if ($this->_transmode) {
+			$ok = $this->Execute("SET TRANSACTION ".$this->_transmode);
+		}
+		else {
+			$ok = true;
+		}
+
+		return $ok ? true : false;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIcommit($this->_connectionID);
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) {
+			return true;
+		}
+		if (!$ok) {
+			return $this->RollbackTrans();
+		}
+
+		if ($this->transCnt) {
+			$this->transCnt -= 1;
+		}
+		$ret = oci_commit($this->_connectionID);
 		$this->_commit = OCI_COMMIT_ON_SUCCESS;
 		$this->autoCommit = true;
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIrollback($this->_connectionID);
+		if ($this->transOff) {
+			return true;
+		}
+		if ($this->transCnt) {
+			$this->transCnt -= 1;
+		}
+		$ret = oci_rollback($this->_connectionID);
 		$this->_commit = OCI_COMMIT_ON_SUCCESS;
 		$this->autoCommit = true;
 		return $ret;
 	}
-	
-	
-	function SelectDB($dbName) 
+
+
+	function SelectDB($dbName)
 	{
 		return false;
 	}
 
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
+		if ($this->_errorMsg !== false) {
+			return $this->_errorMsg;
+		}
 
-		if (is_resource($this->_stmt)) $arr = @OCIerror($this->_stmt);
+		if (is_resource($this->_stmt)) {
+			$arr = @oci_error($this->_stmt);
+		}
 		if (empty($arr)) {
-			$arr = @OCIerror($this->_connectionID);
-			if ($arr === false) $arr = @OCIError();
-			if ($arr === false) return '';
+			if (is_resource($this->_connectionID)) {
+				$arr = @oci_error($this->_connectionID);
+			}
+			else {
+				$arr = @oci_error();
+			}
+			if ($arr === false) {
+				return '';
+			}
 		}
 		$this->_errorMsg = $arr['message'];
 		$this->_errorCode = $arr['code'];
 		return $this->_errorMsg;
 	}
 
-	function ErrorNo() 
+	function ErrorNo()
 	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
-		
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
+		if ($this->_errorCode !== false) {
+			return $this->_errorCode;
+		}
+
+		if (is_resource($this->_stmt)) {
+			$arr = @oci_error($this->_stmt);
+		}
 		if (empty($arr)) {
-			$arr = @OCIError($this->_connectionID);
-			if ($arr == false) $arr = @OCIError();
-			if ($arr == false) return '';
+			$arr = @oci_error($this->_connectionID);
+			if ($arr == false) {
+				$arr = @oci_error();
+			}
+			if ($arr == false) {
+				return '';
+			}
 		}
-		
+
 		$this->_errorMsg = $arr['message'];
 		$this->_errorCode = $arr['code'];
-		
+
 		return $arr['code'];
 	}
-	
-	// Format date column in sql string given an input format that understands Y M D
+
+	/**
+	 * Format date column in sql string given an input format that understands Y M D
+	 */
 	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
+	{
+		if (!$col) {
+			$col = $this->sysTimeStamp;
+		}
 		$s = 'TO_CHAR('.$col.",'";
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
@@ -480,11 +664,11 @@ function SQLDate($fmt, $col=false)
 			case 'q':
 				$s .= 'Q';
 				break;
-				
+
 			case 'M':
 				$s .= 'Mon';
 				break;
-				
+
 			case 'm':
 				$s .= 'MM';
 				break;
@@ -492,219 +676,270 @@ function SQLDate($fmt, $col=false)
 			case 'd':
 				$s .= 'DD';
 				break;
-			
+
 			case 'H':
 				$s.= 'HH24';
 				break;
-				
+
 			case 'h':
 				$s .= 'HH';
 				break;
-				
+
 			case 'i':
 				$s .= 'MI';
 				break;
-			
+
 			case 's':
 				$s .= 'SS';
 				break;
-			
+
 			case 'a':
 			case 'A':
 				$s .= 'AM';
 				break;
-				
+
 			case 'w':
 				$s .= 'D';
 				break;
-				
+
 			case 'l':
 				$s .= 'DAY';
 				break;
-				
-			 case 'W':
+
+			case 'W':
 				$s .= 'WW';
 				break;
-				
+
 			default:
-			// handle escape characters...
+				// handle escape characters...
 				if ($ch == '\\') {
 					$i++;
 					$ch = substr($fmt,$i,1);
 				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
-				
+				if (strpos('-/.:;, ',$ch) !== false) {
+					$s .= $ch;
+				}
+				else {
+					$s .= '"'.$ch.'"';
+				}
+
 			}
 		}
 		return $s. "')";
 	}
-	
-	
-	/*
-	This algorithm makes use of
-	
-	a. FIRST_ROWS hint
-	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
-	that is, minimum resource usage to return the first row. Results will be returned 
-	as soon as they are identified. 
-
-	b. Uses rownum tricks to obtain only the required rows from a given offset.
-	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
-	 This idea by Tomas V V Cox.
-	 
-	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
-	 out this function then, and the slower SelectLimit() in the base class will be used.
-	*/
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+
+	function GetRandRow($sql, $arr = false)
 	{
+		$sql = "SELECT * FROM ($sql ORDER BY dbms_random.value) WHERE rownum = 1";
+
+		return $this->GetRow($sql,$arr);
+	}
+
+	/**
+	 * This algorithm makes use of
+	 *
+	 * a. FIRST_ROWS hint
+	 * The FIRST_ROWS hint explicitly chooses the approach to optimize response
+	 * time, that is, minimum resource usage to return the first row. Results
+	 * will be returned as soon as they are identified.
+	 *
+	 * b. Uses rownum tricks to obtain only the required rows from a given offset.
+	 * As this uses complicated sql statements, we only use this if $offset >= 100.
+	 * This idea by Tomas V V Cox.
+	 *
+	 * This implementation does not appear to work with oracle 8.0.5 or earlier.
+	 * Comment out this function then, and the slower SelectLimit() in the base
+	 * class will be used.
+	 *
+	 * Note: FIRST_ROWS hinting is only used if $sql is a string; when
+	 * processing a prepared statement's handle, no hinting is performed.
+	 */
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		$nrows = (int) $nrows;
+		$offset = (int) $offset;
+		// Since the methods used to limit the number of returned rows rely
+		// on modifying the provided SQL query, we can't work with prepared
+		// statements so we just extract the SQL string.
+		if(is_array($sql)) {
+			$sql = $sql[0];
+		}
+
 		// seems that oracle only supports 1 hint comment in 8i
 		if ($this->firstrows) {
-			if (strpos($sql,'/*+') !== false)
-				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-			else
-				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		}
-		
-		if ($offset < $this->selectOffsetAlg1) {
-			if ($nrows > 0) {	
-				if ($offset > 0) $nrows += $offset;
-				//$inputarr['adodb_rownum'] = $nrows;
-				if ($this->databaseType == 'oci8po') {
-					$sql = "select * from (".$sql.") where rownum <= ?";
-				} else {
-					$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
-				} 
+			if ($nrows > 500 && $nrows < 1000) {
+				$hint = "FIRST_ROWS($nrows)";
+			}
+			else {
+				$hint = 'FIRST_ROWS';
+			}
+
+			if (strpos($sql,'/*+') !== false) {
+				$sql = str_replace('/*+ ',"/*+$hint ",$sql);
+			}
+			else {
+				$sql = preg_replace('/^[ \t\n]*select/i',"SELECT /*+$hint*/",$sql);
+			}
+			$hint = "/*+ $hint */";
+		} else {
+			$hint = '';
+		}
+
+		if ($offset == -1 || ($offset < $this->selectOffsetAlg1 && 0 < $nrows && $nrows < 1000)) {
+			if ($nrows > 0) {
+				if ($offset > 0) {
+					$nrows += $offset;
+				}
+				$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
 				$inputarr['adodb_offset'] = $nrows;
 				$nrows = -1;
 			}
 			// note that $nrows = 0 still has to work ==> no rows returned
 
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			return $rs;
-			
+			return ADOConnection::SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
 		} else {
-			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
-			
-			 // Let Oracle return the name of the columns
+			// Algorithm by Tomas V V Cox, from PEAR DB oci8.php
+
+			// Let Oracle return the name of the columns
 			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
-			 
-			$false = false;
+
 			if (! $stmt_arr = $this->Prepare($q_fields)) {
-				return $false;
+				return false;
 			}
 			$stmt = $stmt_arr[1];
-			 
-			 if (is_array($inputarr)) {
-			 	foreach($inputarr as $k => $v) {
+
+			if (is_array($inputarr)) {
+				foreach($inputarr as $k => $v) {
+					$i=0;
+					if ($this->databaseType == 'oci8po') {
+						$bv_name = ":".$i++;
+					} else {
+						$bv_name = ":".$k;
+					}
 					if (is_array($v)) {
-						if (sizeof($v) == 2) // suggested by g.giunta@libero.
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-						else
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+						// suggested by g.giunta@libero.
+						if (sizeof($v) == 2) {
+							oci_bind_by_name($stmt,$bv_name,$inputarr[$k][0],$v[1]);
+						}
+						else {
+							oci_bind_by_name($stmt,$bv_name,$inputarr[$k][0],$v[1],$v[2]);
+						}
 					} else {
 						$len = -1;
-						if ($v === ' ') $len = 1;
-						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
+						if ($v === ' ') {
+							$len = 1;
+						}
+						if (isset($bindarr)) {	// is prepared sql, so no need to oci_bind_by_name again
 							$bindarr[$k] = $v;
 						} else { 				// dynamic sql, so rebind every time
-							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+							oci_bind_by_name($stmt,$bv_name,$inputarr[$k],$len);
 						}
 					}
 				}
 			}
-			
-			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
-				 OCIFreeStatement($stmt); 
-				 return $false;
-			 }
-			 
-			 $ncols = OCINumCols($stmt);
-			 for ( $i = 1; $i <= $ncols; $i++ ) {
-				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
-			 }
-			 $result = false;
-			
-			 OCIFreeStatement($stmt); 
-			 $fields = implode(',', $cols);
-			 $nrows += $offset;
-			 $offset += 1; // in Oracle rownum starts at 1
-			
-			if ($this->databaseType == 'oci8po') {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= ?".
-					  ") WHERE adodb_rownum >= ?";
-				} else {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= :adodb_nrows".
-					  ") WHERE adodb_rownum >= :adodb_offset";
-				} 
-				$inputarr['adodb_nrows'] = $nrows;
-				$inputarr['adodb_offset'] = $offset;
-				
-			if ($secs2cache>0) $rs =& $this->CacheExecute($secs2cache, $sql,$inputarr);
-			else $rs =& $this->Execute($sql,$inputarr);
+
+			if (!oci_execute($stmt, OCI_DEFAULT)) {
+				oci_free_statement($stmt);
+				return false;
+			}
+
+			$ncols = oci_num_fields($stmt);
+			for ( $i = 1; $i <= $ncols; $i++ ) {
+				$cols[] = '"'.oci_field_name($stmt, $i).'"';
+			}
+			$result = false;
+
+			oci_free_statement($stmt);
+			$fields = implode(',', $cols);
+			if ($nrows <= 0) {
+				$nrows = 999999999999;
+			}
+			else {
+				$nrows += $offset;
+			}
+			$offset += 1; // in Oracle rownum starts at 1
+
+			$sql = "SELECT $hint $fields FROM".
+				"(SELECT rownum as adodb_rownum, $fields FROM".
+				" ($sql) WHERE rownum <= :adodb_nrows".
+				") WHERE adodb_rownum >= :adodb_offset";
+			$inputarr['adodb_nrows'] = $nrows;
+			$inputarr['adodb_offset'] = $offset;
+
+			if ($secs2cache > 0) {
+				$rs = $this->CacheExecute($secs2cache, $sql,$inputarr);
+			}
+			else {
+				$rs = $this->Execute($sql, $inputarr);
+			}
 			return $rs;
 		}
-	
 	}
-	
-	/**
-	* Usage:
-	* Store BLOBs and CLOBs
-	*
-	* Example: to store $var in a blob
-	*
-	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
-	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
-	*
-	*  to get length of LOB:
-	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
-	*
-	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
-	* under oracle 8.1.7.0. Run:
-	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-	* before UpdateBlob() then...
-	*/
 
+	/**
+	 * Usage:
+	 * Store BLOBs and CLOBs
+	 *
+	 * Example: to store $var in a blob
+	 *    $conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
+	 *    $conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
+	 *
+	 * $blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
+	 *
+	 * to get length of LOB:
+	 *    select DBMS_LOB.GETLENGTH(ablob) from TABLE
+	 *
+	 * If you are using CURSOR_SHARING = force, it appears this will case a segfault
+	 * under oracle 8.1.7.0. Run:
+	 *    $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+	 * before UpdateBlob() then...
+	 */
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
-		
+
 		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
-		
+
 		switch(strtoupper($blobtype)) {
 		default: ADOConnection::outp("UpdateBlob: Unknown blobtype=$blobtype"); return false;
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
-		
-		if ($this->databaseType == 'oci8po') 
+
+		if ($this->databaseType == 'oci8po')
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
+		else
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
+
+		$desc = oci_new_descriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+		if ($this->session_sharing_force_blob) {
+			$this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+		}
 		$commit = $this->autoCommit;
-		if ($commit) $this->BeginTrans();
+		if ($commit) {
+			$this->BeginTrans();
+		}
 		$rs = $this->_Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->save($val);
+		if ($rez = !empty($rs)) {
+			$desc->save($val);
+		}
 		$desc->free();
-		if ($commit) $this->CommitTrans();
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
-		
-		if ($rez) $rs->Close();
+		if ($commit) {
+			$this->CommitTrans();
+		}
+		if ($this->session_sharing_force_blob) {
+			$this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
+		}
+
+		if ($rez) {
+			$rs->Close();
+		}
 		return $rez;
 	}
-	
+
 	/**
-	* Usage:  store file pointed to by $var in a blob
-	*/
+	 * Usage:  store file pointed to by $val in a blob
+	 */
 	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		switch(strtoupper($blobtype)) {
@@ -712,107 +947,174 @@ function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
-		
-		if ($this->databaseType == 'oci8po') 
+
+		if ($this->databaseType == 'oci8po')
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
+		else
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
+
+		$desc = oci_new_descriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
-		
+
 		$this->BeginTrans();
 		$rs = ADODB_oci8::Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->savefile($val);
+		if ($rez = !empty($rs)) {
+			$desc->savefile($val);
+		}
 		$desc->free();
 		$this->CommitTrans();
-		
-		if ($rez) $rs->Close();
+
+		if ($rez) {
+			$rs->Close();
+		}
 		return $rez;
 	}
 
-		/**
-	 * Execute SQL 
+	/**
+	 * Execute SQL
 	 *
 	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
 	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
 	 * @return 		RecordSet or false
 	 */
-	function &Execute($sql,$inputarr=false) 
+	function Execute($sql,$inputarr=false)
 	{
 		if ($this->fnExecute) {
 			$fn = $this->fnExecute;
-			$ret =& $fn($this,$sql,$inputarr);
-			if (isset($ret)) return $ret;
+			$ret = $fn($this,$sql,$inputarr);
+			if (isset($ret)) {
+				return $ret;
+			}
 		}
-		if ($inputarr) {
-			#if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
+		if ($inputarr !== false) {
+			if (!is_array($inputarr)) {
+				$inputarr = array($inputarr);
+			}
+
 			$element0 = reset($inputarr);
-			
-			# is_object check because oci8 descriptors can be passed in
-			if (is_array($element0) && !is_object(reset($element0))) {
-				if (is_string($sql))
-					$stmt = $this->Prepare($sql);
-				else
-					$stmt = $sql;
-					
-				foreach($inputarr as $arr) {
-					$ret =& $this->_Execute($stmt,$arr);
-					if (!$ret) return $ret;
+			$array2d =  $this->bulkBind && is_array($element0) && !is_object(reset($element0));
+
+			# see PHPLens Issue No: 18786
+			if ($array2d || !$this->_bindInputArray) {
+
+				# is_object check because oci8 descriptors can be passed in
+				if ($array2d && $this->_bindInputArray) {
+					if (is_string($sql)) {
+						$stmt = $this->Prepare($sql);
+					} else {
+						$stmt = $sql;
+					}
+
+					foreach($inputarr as $arr) {
+						$ret = $this->_Execute($stmt,$arr);
+						if (!$ret) {
+							return $ret;
+						}
+					}
+					return $ret;
+				} else {
+					$sqlarr = explode(':', $sql);
+					$sql = '';
+					$lastnomatch = -2;
+					#var_dump($sqlarr);echo "
";var_dump($inputarr);echo"
";
+					foreach($sqlarr as $k => $str) {
+						if ($k == 0) {
+							$sql = $str;
+							continue;
+						}
+						// we need $lastnomatch because of the following datetime,
+						// eg. '10:10:01', which causes code to think that there is bind param :10 and :1
+						$ok = preg_match('/^([0-9]*)/', $str, $arr);
+
+						if (!$ok) {
+							$sql .= $str;
+						} else {
+							$at = $arr[1];
+							if (isset($inputarr[$at]) || is_null($inputarr[$at])) {
+								if ((strlen($at) == strlen($str) && $k < sizeof($arr)-1)) {
+									$sql .= ':'.$str;
+									$lastnomatch = $k;
+								} else if ($lastnomatch == $k-1) {
+									$sql .= ':'.$str;
+								} else {
+									if (is_null($inputarr[$at])) {
+										$sql .= 'null';
+									}
+									else {
+										$sql .= $this->qstr($inputarr[$at]);
+									}
+									$sql .= substr($str, strlen($at));
+								}
+							} else {
+								$sql .= ':'.$str;
+							}
+						}
+					}
+					$inputarr = false;
 				}
-			} else {
-				$ret =& $this->_Execute($sql,$inputarr);
 			}
-			
+			$ret = $this->_Execute($sql,$inputarr);
+
 		} else {
-			$ret =& $this->_Execute($sql,false);
+			$ret = $this->_Execute($sql,false);
 		}
 
 		return $ret;
 	}
-	
+
 	/*
-		Example of usage:
-		
-		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
+	 * Example of usage:
+	 *    $stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
 	*/
 	function Prepare($sql,$cursor=false)
 	{
 	static $BINDNUM = 0;
-	
-		$stmt = OCIParse($this->_connectionID,$sql);
 
-		if (!$stmt) return false;
+		$stmt = oci_parse($this->_connectionID,$sql);
+
+		if (!$stmt) {
+			$this->_errorMsg = false;
+			$this->_errorCode = false;
+			$arr = @oci_error($this->_connectionID);
+			if ($arr === false) {
+				return false;
+			}
+
+			$this->_errorMsg = $arr['message'];
+			$this->_errorCode = $arr['code'];
+			return false;
+		}
 
 		$BINDNUM += 1;
-		
-		$sttype = @OCIStatementType($stmt);
+
+		$sttype = @oci_statement_type($stmt);
 		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
-			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
+			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? oci_new_cursor($this->_connectionID) : false);
 		}
 		return array($sql,$stmt,0,$BINDNUM);
 	}
-	
+
 	/*
-		Call an oracle stored procedure and returns a cursor variable as a recordset. 
+		Call an oracle stored procedure and returns a cursor variable as a recordset.
 		Concept by Robert Tuttle robert@ud.com
-		
+
 		Example:
 			Note: we return a cursor variable in :RS2
 			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
-			
+
 			$rs = $db->ExecuteCursor(
-				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
+				"BEGIN :RS2 = adodb.getdata(:VAR1); END;",
 				'RS2',
 				array('VAR1' => 'Mr Bean'));
-			
+
 	*/
-	function &ExecuteCursor($sql,$cursorName='rs',$params=false)
+	function ExecuteCursor($sql,$cursorName='rs',$params=false)
 	{
-		if (is_array($sql)) $stmt = $sql;
-		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
-	
+		if (is_array($sql)) {
+			$stmt = $sql;
+		}
+		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate oci_new_cursor
+
 		if (is_array($stmt) && sizeof($stmt) >= 5) {
 			$hasref = true;
 			$ignoreCur = false;
@@ -824,73 +1126,82 @@ function &ExecuteCursor($sql,$cursorName='rs',$params=false)
 			}
 		} else
 			$hasref = false;
-			
-		$rs =& $this->Execute($stmt);
+
+		$rs = $this->Execute($stmt);
 		if ($rs) {
-			if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
-			else if ($hasref) $rs->_refcursor = $stmt[4];
+			if ($rs->databaseType == 'array') {
+				oci_free_cursor($stmt[4]);
+			}
+			elseif ($hasref) {
+				$rs->_refcursor = $stmt[4];
+			}
 		}
 		return $rs;
 	}
-	
-	/*
-		Bind a variable -- very, very fast for executing repeated statements in oracle. 
-		Better than using
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
-					array($p1,$p2,$p3));
-			}
-		
-		Usage:
-			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
-			$DB->Bind($stmt, $p1);
-			$DB->Bind($stmt, $p2);
-			$DB->Bind($stmt, $p3);
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$DB->Execute($stmt);
-			}
-			
-		Some timings:		
-			** Test table has 3 cols, and 1 index. Test to insert 1000 records
-			Time 0.6081s (1644.60 inserts/sec) with direct OCIParse/OCIExecute
-			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
-			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
-			
-		Now if PHP only had batch/bulk updating like Java or PL/SQL...
-	
-		Note that the order of parameters differs from OCIBindByName,
-		because we default the names to :0, :1, :2
-	*/
+
+	/**
+	 * Bind a variable -- very, very fast for executing repeated statements in oracle.
+	 *
+	 * Better than using
+	 *    for ($i = 0; $i < $max; $i++) {
+	 *        $p1 = ?; $p2 = ?; $p3 = ?;
+	 *        $this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", array($p1,$p2,$p3));
+	 *    }
+	 *
+	 * Usage:
+	 *    $stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
+	 *    $DB->Bind($stmt, $p1);
+	 *    $DB->Bind($stmt, $p2);
+	 *    $DB->Bind($stmt, $p3);
+	 *    for ($i = 0; $i < $max; $i++) {
+	 *        $p1 = ?; $p2 = ?; $p3 = ?;
+	 *        $DB->Execute($stmt);
+	 *    }
+	 *
+	 * Some timings to insert 1000 records, test table has 3 cols, and 1 index.
+	 * - Time 0.6081s (1644.60 inserts/sec) with direct oci_parse/oci_execute
+	 * - Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
+	 * - Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
+	 *
+	 * Now if PHP only had batch/bulk updating like Java or PL/SQL...
+	 *
+	 * Note that the order of parameters differs from oci_bind_by_name,
+	 * because we default the names to :0, :1, :2
+	 */
 	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
 	{
-		
-		if (!is_array($stmt)) return false;
-        
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
-        }
-        
+
+		if (!is_array($stmt)) {
+			return false;
+		}
+
+		if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) {
+			return oci_bind_by_name($stmt[1],":".$name,$stmt[4],$size,$type);
+		}
+
 		if ($name == false) {
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
+			if ($type !== false) {
+				$rez = oci_bind_by_name($stmt[1],":".$stmt[2],$var,$size,$type);
+			}
+			else {
+				$rez = oci_bind_by_name($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
+			}
 			$stmt[2] += 1;
 		} else if (oci_lob_desc($type)) {
 			if ($this->debug) {
 				ADOConnection::outp("Bind: name = $name");
 			}
-            //we have to create a new Descriptor here
+			//we have to create a new Descriptor here
 			$numlob = count($this->_refLOBs);
-        	$this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
+			$this->_refLOBs[$numlob]['LOB'] = oci_new_descriptor($this->_connectionID, oci_lob_desc($type));
 			$this->_refLOBs[$numlob]['TYPE'] = $isOutput;
-			
-			$tmp = &$this->_refLOBs[$numlob]['LOB'];
-	        $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
+
+			$tmp = $this->_refLOBs[$numlob]['LOB'];
+			$rez = oci_bind_by_name($stmt[1], ":".$name, $tmp, -1, $type);
 			if ($this->debug) {
 				ADOConnection::outp("Bind: descriptor has been allocated, var (".$name.") binded");
 			}
-			
+
 			// if type is input then write data to lob now
 			if ($isOutput == false) {
 				$var = $this->BlobEncode($var);
@@ -904,36 +1215,40 @@ function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
 			}
 			$rez = $tmp;
 		} else {
-			if ($this->debug) 
+			if ($this->debug)
 				ADOConnection::outp("Bind: name = $name");
-			
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
+
+			if ($type !== false) {
+				$rez = oci_bind_by_name($stmt[1],":".$name,$var,$size,$type);
+			}
+			else {
+				$rez = oci_bind_by_name($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
+			}
 		}
-		
+
 		return $rez;
 	}
-	
-	function Param($name,$type=false)
+
+	function Param($name,$type='C')
 	{
 		return ':'.$name;
 	}
-	
-	/* 
-	Usage:
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group');
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See OCIBindByName documentation at php.net.
+
+	/**
+	 * Usage:
+	 *    $stmt = $db->Prepare('select * from table where id =:myid and group=:group');
+	 *    $db->Parameter($stmt,$id,'myid');
+	 *    $db->Parameter($stmt,$group,'group');
+	 *    $db->Execute($stmt);
+	 *
+	 * @param $stmt Statement returned by Prepare() or PrepareSP().
+	 * @param $var PHP variable to bind to
+	 * @param $name Name of stored procedure variable name to bind to.
+	 * @param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
+	 * @param [$maxLen] Holds an maximum length of the variable.
+	 * @param [$type] The data type of $var. Legal values depend on driver.
+	 *
+	 * @link http://php.net/oci_bind_by_name
 	*/
 	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
 	{
@@ -944,80 +1259,97 @@ function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
 			}
 			return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
 	}
-	
-	/*
-	returns query ID if successful, otherwise false
-	this version supports:
-	
-	   1. $db->execute('select * from table');
-	   
-	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->execute($prepared_statement, array(1,2,3));
-		  
-	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-	   
-	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
-		  $db->execute($stmt);
-	*/ 
-	function _query($sql,$inputarr)
+
+	/**
+	 * returns query ID if successful, otherwise false
+	 * this version supports:
+	 *
+	 * 1. $db->execute('select * from table');
+	 *
+	 * 2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+	 *    $db->execute($prepared_statement, array(1,2,3));
+	 *
+	 * 3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
+	 *
+	 * 4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+	 *    $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3);
+	 *    $db->execute($stmt);
+	 */
+	function _query($sql,$inputarr=false)
 	{
 		if (is_array($sql)) { // is prepared sql
 			$stmt = $sql[1];
-			
-			// we try to bind to permanent array, so that OCIBindByName is persistent
+
+			// we try to bind to permanent array, so that oci_bind_by_name is persistent
 			// and carried out once only - note that max array element size is 4000 chars
 			if (is_array($inputarr)) {
 				$bindpos = $sql[3];
 				if (isset($this->_bind[$bindpos])) {
 				// all tied up already
-					$bindarr = &$this->_bind[$bindpos];
+					$bindarr = $this->_bind[$bindpos];
 				} else {
 				// one statement to bind them all
 					$bindarr = array();
 					foreach($inputarr as $k => $v) {
 						$bindarr[$k] = $v;
-						OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
+						oci_bind_by_name($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
 					}
-					$this->_bind[$bindpos] = &$bindarr;
+					$this->_bind[$bindpos] = $bindarr;
 				}
 			}
 		} else {
-			$stmt=OCIParse($this->_connectionID,$sql);
+			$stmt=oci_parse($this->_connectionID,$sql);
 		}
-			
+
 		$this->_stmt = $stmt;
-		if (!$stmt) return false;
-	
-		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
-			
+		if (!$stmt) {
+			return false;
+		}
+
+		if (defined('ADODB_PREFETCH_ROWS')) {
+			@oci_set_prefetch($stmt,ADODB_PREFETCH_ROWS);
+		}
+
 		if (is_array($inputarr)) {
 			foreach($inputarr as $k => $v) {
 				if (is_array($v)) {
-					if (sizeof($v) == 2) // suggested by g.giunta@libero.
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-					else
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					
-					if ($this->debug==99) echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'
';
+					// suggested by g.giunta@libero.
+					if (sizeof($v) == 2) {
+						oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1]);
+					}
+					else {
+						oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+					}
+
+					if ($this->debug==99) {
+						if (is_object($v[0])) {
+							echo "name=:$k",' len='.$v[1],' type='.$v[2],'
';
+						}
+						else {
+							echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'
';
+						}
+
+					}
 				} else {
 					$len = -1;
-					if ($v === ' ') $len = 1;
-					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
+					if ($v === ' ') {
+						$len = 1;
+					}
+					if (isset($bindarr)) {	// is prepared sql, so no need to oci_bind_by_name again
 						$bindarr[$k] = $v;
 					} else { 				// dynamic sql, so rebind every time
-						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+						oci_bind_by_name($stmt,":$k",$inputarr[$k],$len);
 					}
 				}
 			}
 		}
-		
-        $this->_errorMsg = false;
+
+		$this->_errorMsg = false;
 		$this->_errorCode = false;
-		if (OCIExecute($stmt,$this->_commit)) {
-//OCIInternalDebug(1);			
+		if (oci_execute($stmt,$this->_commit)) {
+
 			if (count($this -> _refLOBs) > 0) {
-		
+
 				foreach ($this -> _refLOBs as $key => $value) {
 					if ($this -> _refLOBs[$key]['TYPE'] == true) {
 						$tmp = $this -> _refLOBs[$key]['LOB'] -> load();
@@ -1027,68 +1359,101 @@ function _query($sql,$inputarr)
 						//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
 						$this -> _refLOBs[$key]['VAR'] = $tmp;
 					} else {
-                        $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
+						$this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
 						$this -> _refLOBs[$key]['LOB']->free();
 						unset($this -> _refLOBs[$key]);
-                        if ($this->debug) {
+						if ($this->debug) {
 							ADOConnection::outp("IN LOB: LOB has been saved. 
");
 						}
-                    }					
+					}
 				}
 			}
-		
-            switch (@OCIStatementType($stmt)) {
-                case "SELECT":
+
+			switch (@oci_statement_type($stmt)) {
+				case "SELECT":
 					return $stmt;
-				
+
 				case 'DECLARE':
-                case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
+				case "BEGIN":
+					if (is_array($sql) && !empty($sql[4])) {
 						$cursor = $sql[4];
 						if (is_resource($cursor)) {
-							$ok = OCIExecute($cursor);	
-	                        return $cursor;
+							$ok = oci_execute($cursor);
+							return $cursor;
 						}
 						return $stmt;
-                    } else {
+					} else {
 						if (is_resource($stmt)) {
-							OCIFreeStatement($stmt);
+							oci_free_statement($stmt);
 							return true;
 						}
-                        return $stmt;
-                    }
-                    break;
-                default :
-					// ociclose -- no because it could be used in a LOB?
-                    return true;
-            }
+						return $stmt;
+					}
+					break;
+				default :
+
+					return true;
+			}
+		}
+		return false;
+	}
+
+	// From Oracle Whitepaper: PHP Scalability and High Availability
+	function IsConnectionError($err)
+	{
+		switch($err) {
+			case 378: /* buffer pool param incorrect */
+			case 602: /* core dump */
+			case 603: /* fatal error */
+			case 609: /* attach failed */
+			case 1012: /* not logged in */
+			case 1033: /* init or shutdown in progress */
+			case 1043: /* Oracle not available */
+			case 1089: /* immediate shutdown in progress */
+			case 1090: /* shutdown in progress */
+			case 1092: /* instance terminated */
+			case 3113: /* disconnect */
+			case 3114: /* not connected */
+			case 3122: /* closing window */
+			case 3135: /* lost contact */
+			case 12153: /* TNS: not connected */
+			case 27146: /* fatal or instance terminated */
+			case 28511: /* Lost RPC */
+			return true;
 		}
 		return false;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
-		if (!$this->_connectionID) return;
-		
-		if (!$this->autoCommit) OCIRollback($this->_connectionID);
+		if (!$this->_connectionID) {
+			return;
+		}
+
+
+		if (!$this->autoCommit) {
+			oci_rollback($this->_connectionID);
+		}
 		if (count($this->_refLOBs) > 0) {
 			foreach ($this ->_refLOBs as $key => $value) {
 				$this->_refLOBs[$key]['LOB']->free();
 				unset($this->_refLOBs[$key]);
 			}
 		}
-		OCILogoff($this->_connectionID);
-		
+		oci_close($this->_connectionID);
+
 		$this->_stmt = false;
 		$this->_connectionID = false;
 	}
-	
+
 	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
 	{
-		if ($internalKey) return array('ROWID');
-		
-	// tested with oracle 8.1.7
+		if ($internalKey) {
+			return array('ROWID');
+		}
+
+		// tested with oracle 8.1.7
 		$table = strtoupper($table);
 		if ($owner) {
 			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
@@ -1106,9 +1471,9 @@ function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
 	$owner_clause
 	AND (a.constraint_name = b.constraint_name)";
 
- 		$rs = $this->Execute($sql);
+		$rs = $this->Execute($sql);
 		if ($rs && !$rs->EOF) {
-			$arr =& $rs->GetArray();
+			$arr = $rs->GetArray();
 			$a = array();
 			foreach($arr as $v) {
 				$a[] = reset($v);
@@ -1117,12 +1482,21 @@ function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
 		}
 		else return false;
 	}
-	
-	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
-	function MetaForeignKeys($table, $owner=false)
+
+	/**
+	 * returns assoc array where keys are tables, and values are foreign keys
+	 *
+	 * @param	str		$table
+	 * @param	str		$owner	[optional][default=NULL]
+	 * @param	bool	$upper	[optional][discarded]
+	 * @return	mixed[]			Array of foreign key information
+	 *
+	 * @link http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
+	 */
+	function MetaForeignKeys($table, $owner=false, $upper=false)
 	{
-	global $ADODB_FETCH_MODE;
-	
+		global $ADODB_FETCH_MODE;
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
@@ -1131,15 +1505,15 @@ function MetaForeignKeys($table, $owner=false)
 			$tabp = 'user_';
 		} else
 			$tabp = 'all_';
-			
+
 		$owner = ' and owner='.$this->qstr(strtoupper($owner));
-		
-		$sql = 
-"select constraint_name,r_owner,r_constraint_name 
+
+		$sql =
+"select constraint_name,r_owner,r_constraint_name
 	from {$tabp}constraints
 	where constraint_type = 'R' and table_name = $table $owner";
-		
-		$constraints =& $this->GetArray($sql);
+
+		$constraints = $this->GetArray($sql);
 		$arr = false;
 		foreach($constraints as $constr) {
 			$cons = $this->qstr($constr[0]);
@@ -1147,62 +1521,56 @@ function MetaForeignKeys($table, $owner=false)
 			$rcons = $this->qstr($constr[2]);
 			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
 			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
-			
-			if ($cols && $tabcol) 
+
+			if ($cols && $tabcol)
 				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
 					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
 				}
 		}
 		$ADODB_FETCH_MODE = $save;
-		
+
 		return $arr;
 	}
 
-	
+
 	function CharMax()
 	{
 		return 4000;
 	}
-	
+
 	function TextMax()
 	{
 		return 4000;
 	}
-	
+
 	/**
-	 * Quotes a string.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
+	 * 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  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)
-	{	
-		//$nofixquotes=false;
-	
-		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
-		if (!$magic_quotes) {	
-			if ($this->replaceQuote[0] == '\\'){
-				$s = str_replace('\\','\\\\',$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		$s = str_replace('\\\\','\\',$s);
-		return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		
+	function qStr($s, $magic_quotes=false)
+	{
+		if ($this->noNullStrings && strlen($s) == 0) {
+			$s = ' ';
+		}
+		if ($this->replaceQuote[0] == '\\'){
+			$s = str_replace('\\','\\\\',$s);
+		}
+		return  "'" . str_replace("'", $this->replaceQuote, $s) . "'";
 	}
-	
+
 }
 
 /*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
+	Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 class ADORecordset_oci8 extends ADORecordSet {
@@ -1210,48 +1578,63 @@ class ADORecordset_oci8 extends ADORecordSet {
 	var $databaseType = 'oci8';
 	var $bind=false;
 	var $_fieldobjs;
-	
-	//var $_arr = false;
-		
-	function ADORecordset_oci8($queryID,$mode=false)
+
+	function __construct($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default:
-		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		switch ($mode) {
+			case ADODB_FETCH_ASSOC:
+				$this->fetchMode = OCI_ASSOC;
+				break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:
+				$this->fetchMode = OCI_NUM + OCI_ASSOC;
+				break;
+			case ADODB_FETCH_NUM:
+			default:
+				$this->fetchMode = OCI_NUM;
+				break;
 		}
-		
+		$this->fetchMode += OCI_RETURN_NULLS + OCI_RETURN_LOBS;
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;
 	}
 
+	/**
+	* Overrides the core destructor method as that causes problems here
+	*
+	* @return void
+	*/
+	function __destruct() {}
 
 	function Init()
 	{
-		if ($this->_inited) return;
-		
+		if ($this->_inited) {
+			return;
+		}
+
 		$this->_inited = true;
 		if ($this->_queryID) {
-			
+
 			$this->_currentRow = 0;
 			@$this->_initrs();
-			$this->EOF = !$this->_fetch();
-			
+			if ($this->_numOfFields) {
+				$this->EOF = !$this->_fetch();
+			}
+			else $this->EOF = true;
+
 			/*
 			// based on idea by Gaetano Giunta to detect unusual oracle errors
-			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
-			$err = OCIError($this->_queryID);
-			if ($err && $this->connection->debug) ADOConnection::outp($err);
+			// see PHPLens Issue No: 6771
+			$err = oci_error($this->_queryID);
+			if ($err && $this->connection->debug) {
+				ADOConnection::outp($err);
+			}
 			*/
-			
+
 			if (!is_array($this->fields)) {
 				$this->_numOfRows = 0;
 				$this->fields = array();
@@ -1263,11 +1646,11 @@ function Init()
 			$this->EOF = true;
 		}
 	}
-	
+
 	function _initrs()
 	{
 		$this->_numOfRows = -1;
-		$this->_numOfFields = OCInumcols($this->_queryID);
+		$this->_numOfFields = oci_num_fields($this->_queryID);
 		if ($this->_numOfFields>0) {
 			$this->_fieldobjs = array();
 			$max = $this->_numOfFields;
@@ -1275,55 +1658,56 @@ function _initrs()
 		}
 	}
 
-	  /*		Returns: an object containing field information.
-			  Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			  fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			  fetchField() is retrieved.		*/
-
-	function &_FetchField($fieldOffset = -1)
+	/**
+	 * 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;
 		$fieldOffset += 1;
-		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
-		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-	 	if ($fld->type == 'NUMBER') {
-	 		$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($p != 0 && $sc == 0) $fld->type = 'INT';
-			//echo " $this->name ($p.$sc) ";
-	 	}
+		$fld->name =oci_field_name($this->_queryID, $fieldOffset);
+		if (ADODB_ASSOC_CASE == ADODB_ASSOC_CASE_LOWER) {
+			$fld->name = strtolower($fld->name);
+		}
+		$fld->type = oci_field_type($this->_queryID, $fieldOffset);
+		$fld->max_length = oci_field_size($this->_queryID, $fieldOffset);
+
+		switch($fld->type) {
+			case 'NUMBER':
+				$p = oci_field_precision($this->_queryID, $fieldOffset);
+				$sc = oci_field_scale($this->_queryID, $fieldOffset);
+				if ($p != 0 && $sc == 0) {
+					$fld->type = 'INT';
+				}
+				$fld->scale = $p;
+				break;
+
+			case 'CLOB':
+			case 'NCLOB':
+			case 'BLOB':
+				$fld->max_length = -1;
+				break;
+		}
 		return $fld;
 	}
-	
-	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
-	function &FetchField($fieldOffset = -1)
+
+	/* For some reason, oci_field_name fails when called after _initrs() so we cache it */
+	function FetchField($fieldOffset = -1)
 	{
 		return $this->_fieldobjs[$fieldOffset];
 	}
-	
-	
-	/*
-	// 10% speedup to move MoveNext to child class
-	function _MoveNext() 
-	{
-	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
-		
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
-			return true;
-		$this->EOF = true;
-		
-		return false;
-	}	*/
-	
-	
+
+
 	function MoveNext()
 	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+		if ($this->fields = @oci_fetch_array($this->_queryID,$this->fetchMode)) {
 			$this->_currentRow += 1;
+			$this->_updatefields();
 			return true;
 		}
 		if (!$this->EOF) {
@@ -1332,64 +1716,37 @@ function MoveNext()
 		}
 		return false;
 	}
-	
-	/*
-	# does not work as first record is retrieved in _initrs(), so is not included in GetArray()
-	function &GetArray($nRows = -1) 
+
+	// Optimize SelectLimit() by using oci_fetch()
+	function GetArrayLimit($nrows,$offset=-1)
 	{
-	global $ADODB_OCI8_GETARRAY;
-	
-		if (true ||  !empty($ADODB_OCI8_GETARRAY)) {
-			# does not support $ADODB_ANSI_PADDING_OFF
-	
-			//OCI_RETURN_NULLS and OCI_RETURN_LOBS is set by OCIfetchstatement
-			switch($this->adodbFetchMode) {
-			case ADODB_FETCH_NUM:
-			
-				$ncols = @OCIfetchstatement($this->_queryID, $results, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
-				$results = array_merge(array($this->fields),$results);
-				return $results;
-				
-			case ADODB_FETCH_ASSOC: 
-				if (ADODB_ASSOC_CASE != 2 || $this->databaseType != 'oci8') break;
-				
-				$ncols = @OCIfetchstatement($this->_queryID, $assoc, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW);
-				$results =& array_merge(array($this->fields),$assoc);
-				return $results;
-			
-			default:
-				break;
+		if ($offset <= 0) {
+			$arr = $this->GetArray($nrows);
+			return $arr;
+		}
+		$arr = array();
+		for ($i=1; $i < $offset; $i++) {
+			if (!@oci_fetch($this->_queryID)) {
+				return $arr;
 			}
 		}
-			
-		$results =& ADORecordSet::GetArray($nRows);
-		return $results;
-		
-	} */
-	
-	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$arr =& $this->GetArray($nrows);
+
+		if (!$this->fields = @oci_fetch_array($this->_queryID,$this->fetchMode)) {
 			return $arr;
 		}
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) return array();
-			
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return array();
+		$this->_updatefields();
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
 
-	
-	/* Use associative array to get fields array */
+
+	// Use associative array to get fields array
 	function Fields($colname)
 	{
 		if (!$this->bind) {
@@ -1399,10 +1756,9 @@ function Fields($colname)
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
+
+		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
 
 
 	function _seek($row)
@@ -1410,93 +1766,95 @@ function _seek($row)
 		return false;
 	}
 
-	function _fetch() 
+	function _fetch()
 	{
-		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-	}
+		$this->fields = @oci_fetch_array($this->_queryID,$this->fetchMode);
+		$this->_updatefields();
 
-	/*		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 $this->fields;
+	}
 
-	function _close() 
+	/**
+	 * close() only needs to be called if you are worried about using too much
+	 * memory while your script is running. All associated result memory for the
+	 * specified result identifier will automatically be freed.
+	 */
+	function _close()
 	{
-		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
+		if ($this->connection->_stmt === $this->_queryID) {
+			$this->connection->_stmt = false;
+		}
 		if (!empty($this->_refcursor)) {
-			OCIFreeCursor($this->_refcursor);
+			oci_free_cursor($this->_refcursor);
 			$this->_refcursor = false;
 		}
-		@OCIFreeStatement($this->_queryID);
- 		$this->_queryID = false;
-		
+		if (is_resource($this->_queryID))
+		   @oci_free_statement($this->_queryID);
+		$this->_queryID = false;
 	}
 
-	function MetaType($t,$len=-1)
+	/**
+	 * not the fastest implementation - quick and dirty - jlim
+	 * for best performance, use the actual $rs->MetaType().
+	 *
+	 * @param	mixed	$t
+	 * @param	int		$len		[optional] Length of blobsize
+	 * @param	bool	$fieldobj	[optional][discarded]
+	 * @return	str					The metatype of the field
+	 */
+	function MetaType($t, $len=-1, $fieldobj=false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
+
 		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
+		case 'VARCHAR':
+		case 'VARCHAR2':
 		case 'CHAR':
 		case 'VARBINARY':
 		case 'BINARY':
 		case 'NCHAR':
 		case 'NVARCHAR':
 		case 'NVARCHAR2':
-				 if (isset($this) && $len <= $this->blobSize) return 'C';
-		
+			if ($len <= $this->blobSize) {
+				return 'C';
+			}
+
 		case 'NCLOB':
 		case 'LONG':
 		case 'LONG VARCHAR':
 		case 'CLOB':
 		return 'X';
-		
+
 		case 'LONG RAW':
 		case 'LONG VARBINARY':
 		case 'BLOB':
 			return 'B';
-		
-		case 'DATE': 
+
+		case 'DATE':
 			return  ($this->connection->datetime) ? 'T' : 'D';
-		
-		
+
+
 		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'SMALLINT':
-		case 'INTEGER': 
+		case 'INTEGER':
 			return 'I';
-			
-		default: return 'N';
+
+		default:
+			return ADODB_DEFAULT_METATYPE;
 		}
 	}
 }
 
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
-	function ADORecordSet_ext_oci8($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->_queryID = $queryID;
-	}
-	
+class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {
+
 	function MoveNext()
 	{
 		return adodb_movenext($this);
 	}
 }
-?>
diff --git a/adodb/drivers/adodb-oci805.inc.php b/adodb/drivers/adodb-oci805.inc.php
index b96690e..0195828 100644
--- a/adodb/drivers/adodb-oci805.inc.php
+++ b/adodb/drivers/adodb-oci805.inc.php
@@ -1,16 +1,27 @@
 ADODB_oci8();
-	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		// seems that oracle only supports 1 hint comment in 8i
 		if (strpos($sql,'/*+') !== false)
 			$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
 		else
 			$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		
-		/* 
-			The following is only available from 8.1.5 because order by in inline views not 
+
+		/*
+			The following is only available from 8.1.5 because order by in inline views not
 			available before then...
 			http://www.jlcomp.demon.co.uk/faq/top_sql.html
-		if ($nrows > 0) {	
+		if ($nrows > 0) {
 			if ($offset > 0) $nrows += $offset;
 			$sql = "select * from ($sql) where rownum <= $nrows";
 			$nrows = -1;
@@ -49,11 +55,6 @@ function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	}
 }
 
-class ADORecordset_oci805 extends ADORecordset_oci8 {	
+class ADORecordset_oci805 extends ADORecordset_oci8 {
 	var $databaseType = "oci805";
-	function ADORecordset_oci805($id,$mode=false)
-	{
-		$this->ADORecordset_oci8($id,$mode);
-	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-oci8po.inc.php b/adodb/drivers/adodb-oci8po.inc.php
index 3e0e33a..50630ca 100644
--- a/adodb/drivers/adodb-oci8po.inc.php
+++ b/adodb/drivers/adodb-oci8po.inc.php
@@ -1,21 +1,28 @@
 
-
-   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();
@@ -27,47 +34,135 @@ class ADODB_oci8po extends ADODB_oci8 {
 	var $dataProvider = 'oci8';
 	var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
 	var $metaTablesSQL = "select lower(table_name),table_type from cat where table_type in ('TABLE','VIEW')";
-	
-	function ADODB_oci8po()
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		# oci8po does not support adodb extension: adodb_movenext()
-	}
-	
-	function Param($name)
+
+	function Param($name,$type='C')
 	{
 		return '?';
 	}
-	
+
 	function Prepare($sql,$cursor=false)
 	{
 		$sqlarr = explode('?',$sql);
 		$sql = $sqlarr[0];
 		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
 			$sql .=  ':'.($i-1) . $sqlarr[$i];
-		} 
+		}
 		return ADODB_oci8::Prepare($sql,$cursor);
 	}
-	
+
+	function Execute($sql,$inputarr=false)
+	{
+		return ADOConnection::Execute($sql,$inputarr);
+	}
+
+	/**
+	 * The optimizations performed by ADODB_oci8::SelectLimit() are not
+	 * compatible with the oci8po driver, so we rely on the slower method
+	 * from the base class.
+	 * We can't properly handle prepared statements either due to preprocessing
+	 * of query parameters, so we treat them as regular SQL statements.
+	 */
+	function SelectLimit($sql, $nrows=-1, $offset=-1, $inputarr=false, $secs2cache=0)
+	{
+		if(is_array($sql)) {
+//			$sql = $sql[0];
+		}
+		return ADOConnection::SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
+	}
+
 	// emulate handling of parameters ? ?, replacing with :bind0 :bind1
-	function _query($sql,$inputarr)
+	function _query($sql,$inputarr=false)
 	{
 		if (is_array($inputarr)) {
 			$i = 0;
 			if (is_array($sql)) {
 				foreach($inputarr as $v) {
 					$arr['bind'.$i++] = $v;
-				} 
-			} else {
-				$sqlarr = explode('?',$sql);
-				$sql = $sqlarr[0];
-				foreach($inputarr as $k => $v) {
-					$sql .=  ":$k" . $sqlarr[++$i];
 				}
+			} else {
+				$sql = $this->extractBinds($sql,$inputarr);
 			}
 		}
 		return ADODB_oci8::_query($sql,$inputarr);
 	}
+	
+	/**
+	* Replaces compatibility bind markers with oracle ones and returns a
+	* valid sql statement
+	*
+	* This replaces a regexp based section of code that has been subject
+	* 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
+	*/	
+	private function extractBinds($sql,$inputarr)
+	{
+		$inString  = false;
+		$escaped   = 0;
+		$sqlLength = strlen($sql) - 1;
+		$newSql    = '';
+		$bindCount = 0;
+		
+		/*
+		* inputarr is the passed in bind list, which is associative, but
+		* we only want the keys here
+		*/
+		$inputKeys = array_keys($inputarr);
+		
+		
+		for ($i=0;$i<=$sqlLength;$i++)
+		{
+			/*
+			* find the next character of the string
+			*/
+			$c = $sql[$i];
+
+			if ($c == "'" && !$inString && $escaped==0)
+				/*
+				* Found the start of a string inside the statement
+				*/
+				$inString = true;
+			elseif ($c == "\\" && $escaped==0)
+				/*
+				* The next character will be escaped
+				*/
+				$escaped = 1;
+			elseif ($c == "'" && $inString && $escaped==0)
+				/*
+				* We found the end of the string
+				*/
+				$inString = false;
+			
+			if ($escaped == 2)
+				$escaped = 0;
+
+			if ($escaped==0 && !$inString && $c == '?')
+				/*
+				* We found a bind symbol, replace it with the oracle equivalent
+				*/
+				$newSql .= ':' . $inputKeys[$bindCount++];
+			else
+				/*
+				* Add the current character the pile
+				*/
+				$newSql .= $c;
+			
+			if ($escaped == 1)
+				/*
+				* We have just found an escape character, make sure we ignore the
+				* next one that comes along, it might be a ' character
+				*/
+				$escaped = 2;
+		}
+		
+		return $newSql;
+			
+	}
 }
 
 /*--------------------------------------------------------------------------------------
@@ -77,16 +172,11 @@ function _query($sql,$inputarr)
 class ADORecordset_oci8po extends ADORecordset_oci8 {
 
 	var $databaseType = 'oci8po';
-	
-	function ADORecordset_oci8po($queryID,$mode=false)
-	{
-		$this->ADORecordset_oci8($queryID,$mode);
-	}
 
 	function Fields($colname)
 	{
 		if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -96,44 +186,37 @@ function Fields($colname)
 		}
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	// lowercase field names...
-	function &_FetchField($fieldOffset = -1)
-	{
-		 $fld = new ADOFieldObject;
- 		 $fieldOffset += 1;
-		 $fld->name = strtolower(OCIcolumnname($this->_queryID, $fieldOffset));
-		 $fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-		 $fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-		 if ($fld->type == 'NUMBER') {
-		 	//$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($sc == 0) $fld->type = 'INT';
-		 }
-		 return $fld;
-	}
-	/*
-	function MoveNext()
+	function _FetchField($fieldOffset = -1)
 	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
+		$fld = new ADOFieldObject;
+		$fieldOffset += 1;
+		$fld->name = OCIcolumnname($this->_queryID, $fieldOffset);
+		if (ADODB_ASSOC_CASE == ADODB_ASSOC_CASE_LOWER) {
+			$fld->name = strtolower($fld->name);
 		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
+		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
+		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
+		if ($fld->type == 'NUMBER') {
+			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
+			if ($sc == 0) {
+				$fld->type = 'INT';
+			}
 		}
-		return false;
-	}*/
+		return $fld;
+	}
 
 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	function MoveNext()
 	{
-		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+		$ret = @oci_fetch_array($this->_queryID,$this->fetchMode);
+		if($ret !== false) {
 		global $ADODB_ANSI_PADDING_OFF;
+			$this->fields = $ret;
 			$this->_currentRow++;
-			
-			if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+			$this->_updatefields();
+
 			if (!empty($ADODB_ANSI_PADDING_OFF)) {
 				foreach($this->fields as $k => $v) {
 					if (is_string($v)) $this->fields[$k] = rtrim($v);
@@ -146,72 +229,53 @@ function MoveNext()
 			$this->_currentRow++;
 		}
 		return false;
-	}	
-	
+	}
+
 	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function &GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$arr = $this->GetArray($nrows);
 			return $arr;
 		}
-		for ($i=1; $i < $offset; $i++) 
+		for ($i=1; $i < $offset; $i++)
 			if (!@OCIFetch($this->_queryID)) {
 				$arr = array();
 				return $arr;
 			}
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+		$ret = @oci_fetch_array($this->_queryID,$this->fetchMode);
+		if ($ret === false) {
 			$arr = array();
 			return $arr;
 		}
-		if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+		$this->fields = $ret;
+		$this->_updatefields();
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
 
-	// Create associative array
-	function _updatefields()
+	function _fetch()
 	{
-		if (ADODB_ASSOC_CASE == 2) return; // native
-	
-		$arr = array();
-		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
-		foreach($this->fields as $k => $v) {
-			if (is_integer($k)) $arr[$k] = $v;
-			else {
-				if ($lowercase)
-					$arr[strtolower($k)] = $v;
-				else
-					$arr[strtoupper($k)] = $v;
-			}
-		}
-		$this->fields = $arr;
-	}
-	
-	function _fetch() 
-	{
-		$ret = @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-		if ($ret) {
 		global $ADODB_ANSI_PADDING_OFF;
-	
-				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-				if (!empty($ADODB_ANSI_PADDING_OFF)) {
-					foreach($this->fields as $k => $v) {
-						if (is_string($v)) $this->fields[$k] = rtrim($v);
-					}
+
+		$ret = @oci_fetch_array($this->_queryID,$this->fetchMode);
+		if ($ret) {
+			$this->fields = $ret;
+			$this->_updatefields();
+
+			if (!empty($ADODB_ANSI_PADDING_OFF)) {
+				foreach($this->fields as $k => $v) {
+					if (is_string($v)) $this->fields[$k] = rtrim($v);
 				}
+			}
 		}
-		return $ret;
+		return $ret !== false;
 	}
-	
-}
 
-
-?>
\ No newline at end of file
+}
diff --git a/adodb/drivers/adodb-oci8quercus.inc.php b/adodb/drivers/adodb-oci8quercus.inc.php
new file mode 100644
index 0000000..f9312c9
--- /dev/null
+++ b/adodb/drivers/adodb-oci8quercus.inc.php
@@ -0,0 +1,80 @@
+name = oci_field_name($this->_queryID, $fieldOffset);
+			$fld->type = oci_field_type($this->_queryID, $fieldOffset);
+			$fld->max_length = oci_field_size($this->_queryID, $fieldOffset);
+
+			//if ($fld->name == 'VAL6_NUM_12_4') $fld->type = 'NUMBER';
+			switch($fld->type) {
+				case 'string': $fld->type = 'VARCHAR'; break;
+				case 'real': $fld->type = 'NUMBER'; break;
+			}
+		} else {
+			$fieldOffset += 1;
+			$fld->name = oci_field_name($this->_queryID, $fieldOffset);
+			$fld->type = oci_field_type($this->_queryID, $fieldOffset);
+			$fld->max_length = oci_field_size($this->_queryID, $fieldOffset);
+		}
+	 	switch($fld->type) {
+		case 'NUMBER':
+	 		$p = oci_field_precision($this->_queryID, $fieldOffset);
+			$sc = oci_field_scale($this->_queryID, $fieldOffset);
+			if ($p != 0 && $sc == 0) $fld->type = 'INT';
+			$fld->scale = $p;
+			break;
+
+	 	case 'CLOB':
+		case 'NCLOB':
+		case 'BLOB':
+			$fld->max_length = -1;
+			break;
+		}
+
+		return $fld;
+	}
+
+}
diff --git a/adodb/drivers/adodb-odbc.inc.php b/adodb/drivers/adodb-odbc.inc.php
index 40ee8cf..a9705e2 100644
--- a/adodb/drivers/adodb-odbc.inc.php
+++ b/adodb/drivers/adodb-odbc.inc.php
@@ -1,26 +1,47 @@
 _haserrorfunctions = ADODB_PHPVER >= 0x4050;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}
-	
+	/*
+	 * Tells the metaColumns feature whether to return actual or meta type
+	 */
+	public $metaColumnsReturnType = METACOLUMNS_RETURNS_ACTUAL;
+
+	function __construct() {}
+
 		// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
-	global $php_errormsg;
-		
 		if (!function_exists('odbc_connect')) return null;
-		
-		if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') {
-			ADOConnection::outp("For odbc Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
+
+		if (!empty($argDatabasename) && stristr($argDSN, 'Database=') === false) {
+			$argDSN = trim($argDSN);
+			$endDSN = substr($argDSN, strlen($argDSN) - 1);
+			if ($endDSN != ';') $argDSN .= ';';
+			$argDSN .= 'Database='.$argDatabasename;
 		}
-		if (isset($php_errormsg)) $php_errormsg = '';
+
+		$last_php_error = $this->resetLastError();
 		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
 		else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+		$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)
 	{
-	global $php_errormsg;
-	
 		if (!function_exists('odbc_connect')) return null;
-		
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+
+		$last_php_error = $this->resetLastError();
+		$this->_errorMsg = '';
 		if ($this->debug && $argDatabasename) {
 			ADOConnection::outp("For odbc PConnect(), $argDatabasename is not used. Place dsn in 1st parameter.");
 		}
 	//	print "dsn=$argDSN u=$argUsername p=$argPassword
"; flush();
 		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
 		else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
-		
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+
+		$this->_errorMsg = $this->getChangedErrorMsg($last_php_error);
 		if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		return $this->_connectionID != false;
 	}
 
-	
+
 	function ServerInfo()
 	{
-	
-		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
+
+		if (!empty($this->host)) {
 			$dsn = strtoupper($this->host);
 			$first = true;
 			$found = false;
-			
+
 			if (!function_exists('odbc_data_source')) return false;
-			
+
 			while(true) {
-				
+
 				$rez = @odbc_data_source($this->_connectionID,
 					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
 				$first = false;
@@ -108,7 +128,7 @@ function ServerInfo()
 					$found = true;
 					break;
 				}
-			} 
+			}
 			if (!$found) return ADOConnection::ServerInfo();
 			if (!isset($rez['version'])) $rez['version'] = '';
 			return $rez;
@@ -117,7 +137,7 @@ function ServerInfo()
 		}
 	}
 
-	
+
 	function CreateSequence($seqname='adodbseq',$start=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
@@ -126,22 +146,22 @@ function CreateSequence($seqname='adodbseq',$start=1)
 		$start -= 1;
 		return $this->Execute("insert into $seqname values($start)");
 	}
-	
+
 	var $_dropSeqSQL = 'drop table %s';
-	function DropSequence($seqname)
+	function DropSequence($seqname = 'adodbseq')
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 		$MAXLOOPS = 100;
@@ -149,18 +169,24 @@ function GenID($seq='adodbseq',$start=1)
 		while (--$MAXLOOPS>=0) {
 			$num = $this->GetOne("select id from $seq");
 			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));
 				$start -= 1;
 				$num = '0';
 				$ok = $this->Execute("insert into $seq values($start)");
 				if (!$ok) return false;
-			} 
+			}
 			$this->Execute("update $seq set id=id+1 where id=$num");
-			
+
 			if ($this->affected_rows() > 0) {
 				$num += 1;
 				$this->genID = $num;
 				return $num;
+			} elseif ($this->affected_rows() == 0) {
+				// some drivers do not return a valid value => try with another method
+				$value = $this->GetOne("select id from $seq");
+				if ($value == $num + 1) {
+					return $value;
+				}
 			}
 		}
 		if ($fn = $this->raiseErrorFn) {
@@ -172,46 +198,41 @@ 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->_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) {
+			// 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;
 	}
-	
-	
+
+
 
 	function BeginTrans()
-	{	
+	{
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->_autocommit = false;
 		return odbc_autocommit($this->_connectionID,false);
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
@@ -219,21 +240,21 @@ function CommitTrans($ok=true)
 		odbc_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
 		$ret = odbc_rollback($this->_connectionID);
 		odbc_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
-	function MetaPrimaryKeys($table)
+
+	function MetaPrimaryKeys($table,$owner=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
@@ -241,18 +262,17 @@ function MetaPrimaryKeys($table)
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = @odbc_primarykeys($this->_connectionID,'',$schema,$table);
-		
+
 		if (!$qid) {
 			$ADODB_FETCH_MODE = $savem;
 			return false;
 		}
 		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return false;
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
+
+		$arr = $rs->GetArray();
 		$rs->Close();
 		//print_r($arr);
 		$arr2 = array();
@@ -261,39 +281,38 @@ function MetaPrimaryKeys($table)
 		}
 		return $arr2;
 	}
-	
-	
-	
-	function &MetaTables($ttype=false)
+
+
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = odbc_tables($this->_connectionID);
-		
+
 		$rs = new ADORecordSet_odbc($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
+
+		$arr = $rs->GetArray();
 		//print_r($arr);
-		
+
 		$rs->Close();
 		$arr2 = array();
-		
+
 		if ($ttype) {
 			$isview = strncmp($ttype,'V',1) === 0;
 		}
 		for ($i=0; $i < sizeof($arr); $i++) {
 			if (!$arr[$i][2]) continue;
 			$type = $arr[$i][3];
-			if ($ttype) { 
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
 				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
@@ -301,7 +320,7 @@ function &MetaTables($ttype=false)
 		}
 		return $arr2;
 	}
-	
+
 /*
 See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
 / SQL data type codes /
@@ -333,7 +352,7 @@ function &MetaTables($ttype=false)
 	function ODBCTypes($t)
 	{
 		switch ((integer)$t) {
-		case 1:	
+		case 1:
 		case 12:
 		case 0:
 		case -95:
@@ -344,52 +363,51 @@ function ODBCTypes($t)
 			return 'X';
 		case -4: //image
 			return 'B';
-				
-		case 9:	
+
+		case 9:
 		case 91:
 			return 'D';
-		
+
 		case 10:
 		case 11:
 		case 92:
 		case 93:
 			return 'T';
-			
+
 		case 4:
 		case 5:
 		case -6:
 			return 'I';
-			
+
 		case -11: // uniqidentifier
 			return 'R';
 		case -7: //bit
 			return 'L';
-		
+
 		default:
 			return 'N';
 		}
 	}
-	
-	function &MetaColumns($table)
+
+	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
+
+		/*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);		
+			$rs = new ADORecordSet_odbc($qid2);
 			$ADODB_FETCH_MODE = $savem;
 			if (!$rs) return false;
-			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 			$rs->_fetch();
-			
+
 			while (!$rs->EOF) {
 				if ($table == strtoupper($rs->fields[2])) {
 					$q = $rs->fields[0];
@@ -399,38 +417,37 @@ function &MetaColumns($table)
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			
+
 			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
 		} */
-		
+
 		switch ($this->databaseType) {
 		case 'access':
 		case 'vfp':
 			$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
 			break;
-		
-		
+
+
 		case 'db2':
             $colname = "%";
             $qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
             break;
-			
+
 		default:
 			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
 			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
 			break;
 		}
 		if (empty($qid)) return $false;
-		
-		$rs =& new ADORecordSet_odbc($qid);
+
+		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return $false;
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
 		$rs->_fetch();
-		
+
 		$retarr = array();
-		
+
 		/*
 		$rs->fields indices
 		0 TABLE_QUALIFIER
@@ -451,32 +468,41 @@ function &MetaColumns($table)
 			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
 				if ($fld->type == 'C' or $fld->type == 'X') {
-					if ($this->databaseType == 'access') 
+					if ($this->databaseType == 'access')
 						$fld->max_length = $rs->fields[6];
 					else if ($rs->fields[4] <= -95) // UNICODE
 						$fld->max_length = $rs->fields[7]/2;
 					else
 						$fld->max_length = $rs->fields[7];
-				} else 
+				} else
 					$fld->max_length = $rs->fields[7];
 				$fld->not_null = !empty($rs->fields[10]);
 				$fld->scale = $rs->fields[8];
-				$retarr[strtoupper($fld->name)] = $fld;	
+				$retarr[strtoupper($fld->name)] = $fld;
 			} else if (sizeof($retarr)>0)
 				break;
 			$rs->MoveNext();
 		}
 		$rs->Close(); //-- crashes 4.03pl1 -- why?
-		
+
 		if (empty($retarr)) $retarr = false;
 		return $retarr;
 	}
-	
+
 	function Prepare($sql)
 	{
 		if (! $this->_bindInputArray) return $sql; // no binding
@@ -489,46 +515,41 @@ function Prepare($sql)
 	}
 
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
-	GLOBAL $php_errormsg;
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_error = '';
-		
+		$last_php_error = $this->resetLastError();
+		$this->_errorMsg = '';
+
 		if ($inputarr) {
 			if (is_array($sql)) {
 				$stmtid = $sql[1];
 			} else {
 				$stmtid = odbc_prepare($this->_connectionID,$sql);
-	
+
 				if ($stmtid == false) {
-					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+					$this->_errorMsg = $this->getChangedErrorMsg($last_php_error);
 					return 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;
 			}
-		
+
 		} else if (is_array($sql)) {
 			$stmtid = $sql[1];
 			if (!odbc_execute($stmtid)) {
 				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
+				$this->_errorMsg = odbc_errormsg();
+				$this->_errorCode = odbc_error();
 				return false;
 			}
 		} else
 			$stmtid = odbc_exec($this->_connectionID,$sql);
-		
+
 		$this->_lastAffectedRows = 0;
 		if ($stmtid) {
 			if (@odbc_num_fields($stmtid) == 0) {
@@ -539,18 +560,12 @@ function _query($sql,$inputarr=false)
 				odbc_binmode($stmtid,$this->binmode);
 				odbc_longreadlen($stmtid,$this->maxblobsize);
 			}
-			
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = '';
-				$this->_errorCode = 0;
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+
+			$this->_errorMsg = '';
+			$this->_errorCode = 0;
 		} else {
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = odbc_errormsg();
-				$this->_errorCode = odbc_error();
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+			$this->_errorMsg = odbc_errormsg();
+			$this->_errorCode = odbc_error();
 		}
 		return $stmtid;
 	}
@@ -558,9 +573,9 @@ function _query($sql,$inputarr=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');
 	*/
@@ -568,7 +583,7 @@ function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -581,44 +596,43 @@ function _affectedrows()
 	{
 		return $this->_lastAffectedRows;
 	}
-	
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_odbc extends ADORecordSet {	
-	
+class ADORecordSet_odbc extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "odbc";		
+	var $databaseType = "odbc";
 	var $dataProvider = "odbc";
 	var $useFetchArray;
-	var $_has_stupid_odbc_fetch_api_change;
-	
-	function ADORecordSet_odbc($id,$mode=false)
+
+	function __construct($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $id;
-		
+
 		// the following is required for mysql odbc driver in 4.3.1 -- why?
 		$this->EOF = false;
 		$this->_currentRow = -1;
-		//$this->ADORecordSet($id);
+		//parent::__construct($id);
 	}
 
 
 	// returns the field object
-	function &FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
-		
+
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$o->name = @odbc_field_name($this->_queryID,$off);
 		$o->type = @odbc_field_type($this->_queryID,$off);
@@ -627,7 +641,7 @@ function &FetchField($fieldOffset = -1)
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -642,8 +656,8 @@ function Fields($colname)
 
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
-		
+
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
@@ -652,87 +666,69 @@ 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)
 	{
 		return false;
 	}
-	
+
 	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function &GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
-			$rs =& $this->GetArray($nrows);
+			$rs = $this->GetArray($nrows);
 			return $rs;
 		}
 		$savem = $this->fetchMode;
 		$this->fetchMode = ADODB_FETCH_NUM;
 		$this->Move($offset);
 		$this->fetchMode = $savem;
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+			$this->fields = $this->GetRowAssoc();
 		}
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
-	function MoveNext() 
+
+
+	function MoveNext()
 	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
+		if ($this->_numOfRows != 0 && !$this->EOF) {
 			$this->_currentRow++;
-			
-			if ($this->_has_stupid_odbc_fetch_api_change)
-				$rez = @odbc_fetch_into($this->_queryID,$this->fields);
-			else {
-				$row = 0;
-				$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
-			}
-			if ($rez) {
-				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-					$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				}
+			if( $this->_fetch() ) {
 				return true;
 			}
 		}
 		$this->fields = false;
 		$this->EOF = true;
 		return false;
-	}	
-	
+	}
+
 	function _fetch()
 	{
-
-		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);
-		}
+		$this->fields = false;
+		$rez = @odbc_fetch_into($this->_queryID,$this->fields);
 		if ($rez) {
 			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-				$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+				$this->fields = $this->GetRowAssoc();
 			}
 			return true;
 		}
-		$this->fields = false;
 		return false;
 	}
-	
-	function _close() 
+
+	function _close()
 	{
-		return @odbc_free_result($this->_queryID);		
+		return @odbc_free_result($this->_queryID);
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbc_db2.inc.php b/adodb/drivers/adodb-odbc_db2.inc.php
index 463aa65..8f0e60c 100644
--- a/adodb/drivers/adodb-odbc_db2.inc.php
+++ b/adodb/drivers/adodb-odbc_db2.inc.php
@@ -1,107 +1,40 @@
 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);
 
 class ADODB_ODBC_DB2 extends ADODB_odbc {
-	var $databaseType = "db2";	
+	var $databaseType = "db2";
 	var $concat_operator = '||';
 	var $sysTime = 'CURRENT TIME';
 	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	// The complete string representation of a timestamp has the form 
+	// The complete string representation of a timestamp has the form
 	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
 	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
 	var $ansiOuter = true;
@@ -109,18 +42,18 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
 	var $_bindInputArray = true;
 	 var $hasInsertID = true;
 	var $rsPrefix = 'ADORecordset_odbc_';
-	
-	function ADODB_DB2()
+
+	function __construct()
 	{
 		if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
-		$this->ADODB_odbc();
+		parent::__construct();
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " COALESCE($field, $ifNull) "; // if DB2 UDB
 	}
-	
+
 	function ServerInfo()
 	{
 		//odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
@@ -128,54 +61,53 @@ function ServerInfo()
 		//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
 		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
 	}
-	
-	function _insertid()
+
+	protected function _insertID($table = '', $column = '')
 	{
 		return $this->GetOne($this->identitySQL);
 	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore')
+
+	function RowLock($tables,$where,$col='1 as adodbignore')
 	{
 		if ($this->_autocommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
+		return $this->GetOne("select $col from $tables where $where for update");
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
+
+	function MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = odbc_tables($this->_connectionID, "", $qschema, $qtable, "");
-		
+
 		$rs = new ADORecordSet_odbc($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
+
+		$arr = $rs->GetArray();
 		//print_r($arr);
-		
+
 		$rs->Close();
 		$arr2 = array();
-		
+
 		if ($ttype) {
 			$isview = strncmp($ttype,'V',1) === 0;
 		}
 		for ($i=0; $i < sizeof($arr); $i++) {
-		
+
 			if (!$arr[$i][2]) continue;
 			if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
-			
+
 			$type = $arr[$i][3];
-			
+
 			if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2];
-			
-			if ($ttype) { 
+
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
 				} else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
@@ -184,7 +116,7 @@ function &MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
 		return $arr2;
 	}
 
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+	function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
         // save old fetch mode
         global $ADODB_FETCH_MODE;
@@ -197,11 +129,11 @@ function &MetaIndexes ($table, $primary = FALSE, $owner=false)
 		// get index details
 		$table = strtoupper($table);
 		$SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'";
-        if ($primary) 
+        if ($primary)
 			$SQL.= " AND UNIQUERULE='P'";
 		$rs = $this->Execute($SQL);
         if (!is_object($rs)) {
-			if (isset($savem)) 
+			if (isset($savem))
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
             return $false;
@@ -216,20 +148,20 @@ function &MetaIndexes ($table, $primary = FALSE, $owner=false)
 			$cols = ltrim($row[2],'+');
 			$indexes[$row[0]]['columns'] = explode('+', $cols);
         }
-		if (isset($savem)) { 
+		if (isset($savem)) {
             $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
         return $indexes;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 	// use right() and replace() ?
 		if (!$col) $col = $this->sysDate;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '||';
@@ -251,7 +183,7 @@ function SQLDate($fmt, $col=false)
 				break;
 			case 'H':
 			case 'h':
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
 				else $s .= "''";
 				break;
 			case 'i':
@@ -275,39 +207,34 @@ function SQLDate($fmt, $col=false)
 			}
 		}
 		return $s;
-	} 
- 
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
+	}
+
+
+	function SelectLimit($sql, $nrows = -1, $offset = -1, $inputArr = false, $secs2cache = 0)
 	{
 		$nrows = (integer) $nrows;
 		if ($offset <= 0) {
 		// could also use " OPTIMIZE FOR $nrows ROWS "
 			if ($nrows >= 0) $sql .=  " FETCH FIRST $nrows ROWS ONLY ";
-			$rs =& $this->Execute($sql,$inputArr);
+			$rs = $this->Execute($sql,$inputArr);
 		} else {
 			if ($offset > 0 && $nrows < 0);
 			else {
 				$nrows += $offset;
 				$sql .=  " FETCH FIRST $nrows ROWS ONLY ";
 			}
-			$rs =& ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
+			$rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
 		}
-		
+
 		return $rs;
 	}
-	
+
 };
- 
 
-class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
-	
-	var $databaseType = "db2";		
-	
-	function ADORecordSet_db2($id,$mode=false)
-	{
-		$this->ADORecordSet_odbc($id,$mode);
-	}
+
+class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {
+
+	var $databaseType = "db2";
 
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
@@ -316,53 +243,52 @@ function MetaType($t,$len=-1,$fieldobj=false)
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		switch (strtoupper($t)) {
 		case 'VARCHAR':
 		case 'CHAR':
 		case 'CHARACTER':
 		case 'C':
 			if ($len <= $this->blobSize) return 'C';
-		
+
 		case 'LONGCHAR':
 		case 'TEXT':
 		case 'CLOB':
 		case 'DBCLOB': // double-byte
 		case 'X':
 			return 'X';
-		
+
 		case 'BLOB':
 		case 'GRAPHIC':
 		case 'VARGRAPHIC':
 			return 'B';
-			
+
 		case 'DATE':
 		case 'D':
 			return 'D';
-		
+
 		case 'TIME':
 		case 'TIMESTAMP':
 		case 'T':
 			return 'T';
-		
-		//case 'BOOLEAN': 
+
+		//case 'BOOLEAN':
 		//case 'BIT':
 		//	return 'L';
-			
+
 		//case 'COUNTER':
 		//	return 'R';
-			
+
 		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'SMALLINT':
 		case 'I':
 			return 'I';
-			
-		default: return 'N';
+
+		default: return ADODB_DEFAULT_METATYPE;
 		}
 	}
 }
 
 } //define
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbc_mssql.inc.php b/adodb/drivers/adodb-odbc_mssql.inc.php
index 65e8bea..37185aa 100644
--- a/adodb/drivers/adodb-odbc_mssql.inc.php
+++ b/adodb/drivers/adodb-odbc_mssql.inc.php
@@ -1,32 +1,44 @@
  'master'";
 	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE'))";
-	var $metaColumnsSQL = "select c.name,t.name,c.length from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
+	var $metaColumnsSQL = # xtype==61 is datetime
+	"select c.name,t.name,c.length,c.isnullable, c.status,
+		(case when c.xusertype=61 then 0 else c.xprec end),
+		(case when c.xusertype=61 then 0 else c.xscale end)
+		from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
 	var $hasTop = 'top';		// support mssql/interbase SELECT TOP 10 * FROM TABLE
 	var $sysDate = 'GetDate()';
 	var $sysTimeStamp = 'GetDate()';
@@ -35,16 +47,10 @@ class  ADODB_odbc_mssql extends ADODB_odbc {
 	var $substr = 'substring';
 	var $length = 'len';
 	var $ansiOuter = true; // for mssql7 or later
-	var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # for mssql 2000
+	var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
 	var $hasInsertID = true;
-	var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON, 
+	var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON,
 														  # concatenating a null value with a string yields a NULL result
-	
-	function ADODB_odbc_mssql()
-	{
-		$this->ADODB_odbc();
-		//$this->curmode = SQL_CUR_USE_ODBC;	
-	}
 
 	// crashes php...
 	function ServerInfo()
@@ -60,31 +66,31 @@ function ServerInfo()
 		return $arr;
 	}
 
-	function IfNull( $field, $ifNull ) 
+	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 
+	// Returns the last IDENTITY value inserted into an IDENTITY column in
+	// the same scope. A scope is a module -- a stored procedure, trigger,
+	// function, or batch. Thus, two statements are in the same scope if
 	// they are in the same stored procedure, function, or batch.
 			return $this->GetOne($this->identitySQL);
 	}
-	
-	
+
+
 	function MetaForeignKeys($table, $owner=false, $upper=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
+
+		$sql =
 "select object_name(constid) as constraint_name,
 	col_name(fkeyid, fkey) as column_name,
 	object_name(rkeyid) as referenced_table_name,
@@ -92,20 +98,20 @@ function MetaForeignKeys($table, $owner=false, $upper=false)
 from sysforeignkeys
 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;
-		
+
 		$arr = false;
 		foreach($constraints as $constr) {
 			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3];
 		}
 		if (!$arr) return false;
-		
+
 		$arr2 = false;
-		
+
 		foreach($arr as $k => $v) {
 			foreach($v as $a => $b) {
 				if ($upper) $a = strtoupper($a);
@@ -114,35 +120,127 @@ function MetaForeignKeys($table, $owner=false, $upper=false)
 		}
 		return $arr2;
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
-		if ($mask) {$this->debug=1;
+		if ($mask) {//$this->debug=1;
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr($mask);
 			$this->metaTablesSQL .= " AND name like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	function &MetaColumns($table)
+
+	function MetaColumns($table, $normalize=true)
 	{
-		$arr = ADOConnection::MetaColumns($table);
-		return $arr;
+
+		$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->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 MetaIndexes($table,$primary=false, $owner=false)
+	{
+		$table = $this->qstr($table);
+
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
+			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
+			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
+			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
+			ORDER BY O.name, I.Name, K.keyno";
+
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+        	$savem = $this->SetFetchMode(FALSE);
+        }
+
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+        	$this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        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;
 	}
-	
-	function _query($sql,$inputarr)
+
+	function _query($sql,$inputarr=false)
 	{
 		if (is_string($sql)) $sql = str_replace('||','+',$sql);
 		return ADODB_odbc::_query($sql,$inputarr);
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -152,51 +250,53 @@ function SetTransactionMode( $transaction_mode )
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
+
 	// "Stein-Aksel Basma" 
 	// tested with MSSQL 2000
-	function &MetaPrimaryKeys($table)
+	function MetaPrimaryKeys($table, $owner = false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = '';
 		$this->_findschema($table,$schema);
 		//if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-	
+		if ($schema) $schema = "and k.table_catalog like '$schema%'";
+
 		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
+		information_schema.table_constraints tc
 		where tc.constraint_name = k.constraint_name and tc.constraint_type =
 		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		$a = $this->GetCol($sql);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if ($a && sizeof($a)>0) return $a;
 		$false = false;
-		return $false;	  
+		return $false;
 	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
+		$nrows = (int) $nrows;
+		$offset = (int) $offset;
 		if ($nrows > 0 && $offset <= 0) {
 			$sql = preg_replace(
 				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-			$rs =& $this->Execute($sql,$inputarr);
+			$rs = $this->Execute($sql,$inputarr);
 		} else
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			
+			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+
 		return $rs;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '+';
@@ -223,11 +323,11 @@ function SQLDate($fmt, $col=false)
 			case 'h':
 				$s .= "substring(convert(char(14),$col,0),13,2)";
 				break;
-			
+
 			case 'H':
 				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
 				break;
-				
+
 			case 'i':
 				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
 				break;
@@ -238,7 +338,7 @@ function SQLDate($fmt, $col=false)
 			case 'A':
 				$s .= "substring(convert(char(19),$col,0),18,2)";
 				break;
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -251,15 +351,89 @@ function SQLDate($fmt, $col=false)
 		return $s;
 	}
 
-} 
- 
-class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
-	
-	var $databaseType = 'odbc_mssql';
-	
-	function ADORecordSet_odbc_mssql($id,$mode=false)
+	/**
+	* 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 $this->ADORecordSet_odbc($id,$mode);
-	}	
+		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';
+
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbc_mssql2012.inc.php b/adodb/drivers/adodb-odbc_mssql2012.inc.php
new file mode 100644
index 0000000..79fa325
--- /dev/null
+++ b/adodb/drivers/adodb-odbc_mssql2012.inc.php
@@ -0,0 +1,37 @@
+ADODB_odbc();
-	}
-		
-	function &MetaTables() 
+
+	function MetaTables($ttype = false, $showSchema = false, $mask = false)
 	{
 		$false = false;
 		$rs = $this->Execute($this->metaTablesSQL);
@@ -49,13 +53,13 @@ function &MetaTables()
 		$rs->Close();
 		return $arr2;
 	}
-	
-	function &MetaColumns($table) 
+
+	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		if ($rs === false) {	
+		if ($rs === false) {
 			$false = false;
 			return $false;
 		}
@@ -65,26 +69,24 @@ function &MetaColumns($table)
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
-			
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		return $retarr;	
+		return $retarr;
 	}
 
 	// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
-	global $php_errormsg;
-	
-		$php_errormsg = '';
+		$last_php_error = $this->resetLastError();
 		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
-		$this->_errorMsg = $php_errormsg;
-		
+		$this->_errorMsg = $this->getChangedErrorMsg($last_php_error);
+
 		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
 		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
 		return $this->_connectionID != false;
@@ -92,24 +94,18 @@ function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	// returns true or false
 	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
-	global $php_errormsg;
-		$php_errormsg = '';
+		$last_php_error = $this->resetLastError();
 		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
-		$this->_errorMsg = $php_errormsg;
-		
+		$this->_errorMsg = $this->getChangedErrorMsg($last_php_error);
+
 		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
 		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
 		return $this->_connectionID != false;
 	}
-} 
- 
-class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
-	
+}
+
+class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {
+
 	var $databaseType = 'odbc_oracle';
-	
-	function ADORecordSet_odbc_oracle($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
+
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbtp.inc.php b/adodb/drivers/adodb-odbtp.inc.php
index 9925ba8..bd167a1 100644
--- a/adodb/drivers/adodb-odbtp.inc.php
+++ b/adodb/drivers/adodb-odbtp.inc.php
@@ -1,13 +1,26 @@
 
+/**
+ * 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();
@@ -33,10 +46,6 @@ class ADODB_odbtp extends ADOConnection{
 	var $_canPrepareSP = false;
 	var $_dontPoolDBC = true;
 
-	function ADODB_odbtp()
-	{
-	}
-
 	function ServerInfo()
 	{
 		return array('description' => @odbtp_get_attr( ODB_ATTR_DBMSNAME, $this->_connectionID),
@@ -45,17 +54,40 @@ function ServerInfo()
 
 	function ErrorMsg()
 	{
+		if ($this->_errorMsg !== false) return $this->_errorMsg;
 		if (empty($this->_connectionID)) return @odbtp_last_error();
 		return @odbtp_last_error($this->_connectionID);
 	}
 
 	function ErrorNo()
 	{
+		if ($this->_errorCode !== false) return $this->_errorCode;
 		if (empty($this->_connectionID)) return @odbtp_last_error_state();
 			return @odbtp_last_error_state($this->_connectionID);
 	}
+/*
+	function DBDate($d,$isfld=false)
+	{
+		if (empty($d) && $d !== 0) return 'null';
+		if ($isfld) return "convert(date, $d, 120)";
+
+		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+		$d = adodb_date($this->fmtDate,$d);
+		return "convert(date, $d, 120)";
+	}
 
-	function _insertid()
+	function DBTimeStamp($d,$isfld=false)
+	{
+		if (empty($d) && $d !== 0) return 'null';
+		if ($isfld) return "convert(datetime, $d, 120)";
+
+		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+		$d = adodb_date($this->fmtDate,$d);
+		return "convert(datetime, $d, 120)";
+	}
+*/
+
+	protected function _insertID($table = '', $column = '')
 	{
 	// SCOPE_IDENTITY()
 	// Returns the last IDENTITY value inserted into an IDENTITY column in
@@ -97,7 +129,7 @@ function CreateSequence($seqname='adodbseq',$start=1)
 		return $this->Execute("insert into adodb_seq values('$seqname',$start)");
 	}
 
-	function DropSequence($seqname)
+	function DropSequence($seqname = 'adodbseq')
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
@@ -149,13 +181,17 @@ function GenID($seq='adodbseq',$start=1)
 	//if uid & pwd can be separate
     function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
 	{
-		$this->_connectionID = @odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
-		odbtp_convert_datetime($this->_connectionID,true);
-		
+		if ($argPassword && stripos($UserOrDSN,'DRIVER=') !== false) {
+			$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN.';PWD='.$argPassword);
+		} else
+			$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
 		if ($this->_connectionID === false) {
 			$this->_errorMsg = $this->ErrorMsg() ;
 			return false;
 		}
+
+		odbtp_convert_datetime($this->_connectionID,true);
+
 		if ($this->_dontPoolDBC) {
 			if (function_exists('odbtp_dont_pool_dbc'))
 				@odbtp_dont_pool_dbc($this->_connectionID);
@@ -166,7 +202,7 @@ function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase
 		$this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, $this->_connectionID);
 		$dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, $this->_connectionID));
 		$this->odbc_name = $dbms;
-		
+
 		// Account for inconsistent DBMS names
 		if( $this->odbc_driver == ODB_DRIVER_ORACLE )
 			$dbms = 'oracle';
@@ -191,7 +227,7 @@ function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase
 				$this->_canSelectDb = true;
 				$this->substr = "substring";
 				$this->length = 'len';
-				$this->identitySQL = 'select @@IDENTITY';
+				$this->identitySQL = 'select SCOPE_IDENTITY()';
 				$this->metaDatabasesSQL = "select name from master..sysdatabases where name <> 'master'";
 				$this->_canPrepareSP = true;
 				break;
@@ -217,6 +253,7 @@ function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase
 				$this->replaceQuote = "'+chr(39)+'";
 				$this->true = '.T.';
 				$this->false = '.F.';
+
 				break;
 			case 'oracle':
 				$this->databaseType = 'odbtp_oci8';
@@ -238,7 +275,7 @@ function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase
 				$this->rightOuter = '=*';
 				$this->hasInsertID = true;
 				$this->hasTransactions = true;
-				$this->identitySQL = 'select @@IDENTITY';
+				$this->identitySQL = 'select SCOPE_IDENTITY()';
 				break;
 			default:
 				$this->databaseType = 'odbtp';
@@ -270,17 +307,17 @@ function SelectDB($dbName)
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		return true;
 	}
-	
-	function &MetaTables($ttype='',$showSchema=false,$mask=false)
+
+	function MetaTables($ttype='',$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
 
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
-		$arr =& $this->GetArray("||SQLTables||||$ttype");
-		
+
+		$arr = $this->GetArray("||SQLTables||||$ttype");
+
 		if (isset($savefm)) $this->SetFetchMode($savefm);
 		$ADODB_FETCH_MODE = $savem;
 
@@ -288,12 +325,12 @@ function &MetaTables($ttype='',$showSchema=false,$mask=false)
 		for ($i=0; $i < sizeof($arr); $i++) {
 			if ($arr[$i][3] == 'SYSTEM TABLE' )	continue;
 			if ($arr[$i][2])
-				$arr2[] = $showSchema ? $arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
+				$arr2[] = $showSchema && $arr[$i][1]? $arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
 		}
 		return $arr2;
 	}
-	
-	function &MetaColumns($table,$upper=true)
+
+	function MetaColumns($table,$upper=true)
 	{
 	global $ADODB_FETCH_MODE;
 
@@ -304,9 +341,9 @@ function &MetaColumns($table,$upper=true)
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute( "||SQLColumns||$schema|$table" );
-		
+
 		if (isset($savefm)) $this->SetFetchMode($savefm);
 		$ADODB_FETCH_MODE = $savem;
 
@@ -324,10 +361,11 @@ function &MetaColumns($table,$upper=true)
 				$fld->max_length = $rs->fields[6];
     			$fld->not_null = !empty($rs->fields[9]);
  				$fld->scale = $rs->fields[7];
- 				if (!is_null($rs->fields[12])) {
- 					$fld->has_default = true;
- 					$fld->default_value = $rs->fields[12];
-				}
+				if (isset($rs->fields[12])) // vfp does not have field 12
+	 				if (!is_null($rs->fields[12])) {
+	 					$fld->has_default = true;
+	 					$fld->default_value = $rs->fields[12];
+					}
 				$retarr[strtoupper($fld->name)] = $fld;
 			} else if (!empty($retarr))
 				break;
@@ -338,13 +376,13 @@ function &MetaColumns($table,$upper=true)
 		return $retarr;
 	}
 
-	function &MetaPrimaryKeys($table, $owner='')
+	function MetaPrimaryKeys($table, $owner='')
 	{
 	global $ADODB_FETCH_MODE;
 
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$arr =& $this->GetArray("||SQLPrimaryKeys||$owner|$table");
+		$arr = $this->GetArray("||SQLPrimaryKeys||$owner|$table");
 		$ADODB_FETCH_MODE = $savem;
 
 		//print_r($arr);
@@ -355,13 +393,13 @@ function &MetaPrimaryKeys($table, $owner='')
 		return $arr2;
 	}
 
-	function &MetaForeignKeys($table, $owner='', $upper=false)
+	function MetaForeignKeys($table, $owner='', $upper=false)
 	{
 	global $ADODB_FETCH_MODE;
 
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$constraints =& $this->GetArray("||SQLForeignKeys|||||$owner|$table");
+		$constraints = $this->GetArray("||SQLForeignKeys|||||$owner|$table");
 		$ADODB_FETCH_MODE = $savem;
 
 		$arr = false;
@@ -373,7 +411,7 @@ function &MetaForeignKeys($table, $owner='', $upper=false)
 			$false = false;
 			return $false;
 		}
-		
+
 		$arr2 = array();
 
 		foreach($arr as $k => $v) {
@@ -421,19 +459,23 @@ function RollbackTrans()
 		return $ret;
 	}
 
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		// TOP requires ORDER BY for Visual FoxPro
 		if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
 			if (!preg_match('/ORDER[ \t\r\n]+BY/is',$sql)) $sql .= ' ORDER BY 1';
 		}
-		$ret =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
 
 	function Prepare($sql)
 	{
 		if (! $this->_bindInputArray) return $sql; // no binding
+
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+
 		$stmt = @odbtp_prepare($sql,$this->_connectionID);
 		if (!$stmt) {
 		//	print "Prepare Error for ($sql) ".$this->ErrorMsg()."
";
@@ -442,10 +484,13 @@ function Prepare($sql)
 		return array($sql,$stmt,false);
 	}
 
-	function PrepareSP($sql)
+	function PrepareSP($sql, $param = true)
 	{
 		if (!$this->_canPrepareSP) return $sql; // Can't prepare procedures
 
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+
 		$stmt = @odbtp_prepare_proc($sql,$this->_connectionID);
 		if (!$stmt) return false;
 		return array($sql,$stmt);
@@ -508,6 +553,56 @@ function UpdateBlob($table,$column,$val,$where,$blobtype='image')
 		return @odbtp_execute( $stmt ) != false;
 	}
 
+	function MetaIndexes($table,$primary=false, $owner=false)
+	{
+		switch ( $this->odbc_driver) {
+			case ODB_DRIVER_MSSQL:
+				return $this->MetaIndexes_mssql($table, $primary);
+			default:
+				return array();
+		}
+	}
+
+	function MetaIndexes_mssql($table,$primary=false, $owner = false)
+	{
+		$table = strtolower($this->qstr($table));
+
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno,
+			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid
+			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
+			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND lower(O.Name) = $table
+			ORDER BY O.name, I.Name, K.keyno";
+
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+        	$savem = $this->SetFetchMode(FALSE);
+        }
+
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+        	$this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        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;
+	}
+
 	function IfNull( $field, $ifNull )
 	{
 		switch( $this->odbc_driver ) {
@@ -521,23 +616,35 @@ function IfNull( $field, $ifNull )
 
 	function _query($sql,$inputarr=false)
 	{
-	global $php_errormsg;
-	
+		$last_php_error = $this->resetLastError();
+		$this->_errorMsg = false;
+		$this->_errorCode = false;
+
  		if ($inputarr) {
 			if (is_array($sql)) {
 				$stmtid = $sql[1];
 			} else {
 				$stmtid = @odbtp_prepare($sql,$this->_connectionID);
 				if ($stmtid == false) {
-					$this->_errorMsg = $php_errormsg;
+					$this->_errorMsg = $this->getChangedErrorMsg($last_php_error);
 					return false;
 				}
 			}
 			$num_params = @odbtp_num_params( $stmtid );
+			/*
 			for( $param = 1; $param <= $num_params; $param++ ) {
 				@odbtp_input( $stmtid, $param );
 				@odbtp_set( $stmtid, $param, $inputarr[$param-1] );
+			}*/
+
+			$param = 1;
+			foreach($inputarr as $v) {
+				@odbtp_input( $stmtid, $param );
+				@odbtp_set( $stmtid, $param, $v );
+				$param += 1;
+				if ($param > $num_params) break;
 			}
+
 			if (!@odbtp_execute($stmtid) ) {
 				return false;
 			}
@@ -547,7 +654,7 @@ function _query($sql,$inputarr=false)
 				return false;
 			}
 		} else {
-			$stmtid = @odbtp_query($sql,$this->_connectionID);
+			$stmtid = odbtp_query($sql,$this->_connectionID);
    		}
 		$this->_lastAffectedRows = 0;
 		if ($stmtid) {
@@ -569,14 +676,14 @@ class ADORecordSet_odbtp extends ADORecordSet {
 	var $databaseType = 'odbtp';
 	var $canSeek = true;
 
-	function ADORecordSet_odbtp($queryID,$mode=false)
+	function __construct($queryID,$mode=false)
 	{
 		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		$this->ADORecordSet($queryID);
+		parent::__construct($queryID);
 	}
 
 	function _initrs()
@@ -599,7 +706,7 @@ function _initrs()
 		}
 	}
 
-	function &FetchField($fieldOffset = 0)
+	function FetchField($fieldOffset = 0)
 	{
 		$off=$fieldOffset; // offsets begin at 0
 		$o= new ADOFieldObject();
@@ -642,6 +749,12 @@ function _fetch_odbtp($type=0)
             default:
 				$this->fields = @odbtp_fetch_array($this->_queryID, $type);
 		}
+		if ($this->databaseType = 'odbtp_vfp') {
+			if ($this->fields)
+			foreach($this->fields as $k => $v) {
+				if (strncmp($v,'1899-12-30',10) == 0) $this->fields[$k] = '';
+			}
+		}
 		return is_array($this->fields);
 	}
 
@@ -686,49 +799,28 @@ class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_mssql';
 
-	function ADORecordSet_odbtp_mssql($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
 }
 
 class ADORecordSet_odbtp_access extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_access';
 
-	function ADORecordSet_odbtp_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
 }
 
 class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_vfp';
 
-	function ADORecordSet_odbtp_vfp($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
 }
 
 class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_oci8';
 
-	function ADORecordSet_odbtp_oci8($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
 }
 
 class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
 
 	var $databaseType = 'odbtp_sybase';
 
-	function ADORecordSet_odbtp_sybase($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
 }
-?>
diff --git a/adodb/drivers/adodb-odbtp_unicode.inc.php b/adodb/drivers/adodb-odbtp_unicode.inc.php
index 320d194..190c3ab 100644
--- a/adodb/drivers/adodb-odbtp_unicode.inc.php
+++ b/adodb/drivers/adodb-odbtp_unicode.inc.php
@@ -1,39 +1,41 @@
 
+/**
+ * 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 {
 	var $databaseType = 'odbtp';
 	var $_useUnicodeSQL = true;
-
-	function ADODB_odbtp_unicode()
-	{
-		$this->ADODB_odbtp();
-	}
 }
-?>
diff --git a/adodb/drivers/adodb-oracle.inc.php b/adodb/drivers/adodb-oracle.inc.php
index 5564b3e..1a2735b 100644
--- a/adodb/drivers/adodb-oracle.inc.php
+++ b/adodb/drivers/adodb-oracle.inc.php
@@ -1,16 +1,25 @@
 fmtDate,$d).",'YYYY-MM-DD')";
+		if (is_object($d)) $ds = $d->format($this->fmtDate);
+		else $ds = adodb_date($this->fmtDate,$d);
+		return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
 	}
-	
+
 	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
+	function DBTimeStamp($ts, $isfld = false)
 	{
 
-		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+		if (is_object($ts)) $ds = $ts->format($this->fmtDate);
+		else $ds = adodb_date($this->fmtTimeStamp,$ts);
+		return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
-	
-	
+
+
 	function BindDate($d)
 	{
 		$d = ADOConnection::DBDate($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
+
 	function BindTimeStamp($d)
 	{
 		$d = ADOConnection::DBTimeStamp($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
 
-	
+
+
 	function BeginTrans()
-	{	  
+	{
 		 $this->autoCommit = false;
 		 ora_commitoff($this->_connectionID);
 		 return true;
 	}
 
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		   if (!$ok) return $this->RollbackTrans();
 		   $ret = ora_commit($this->_connectionID);
 		   ora_commiton($this->_connectionID);
 		   return $ret;
 	}
 
-	
+
 	function RollbackTrans()
 	{
 		$ret = ora_rollback($this->_connectionID);
@@ -91,8 +100,8 @@ function RollbackTrans()
 
 
 	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
-	function ErrorMsg() 
- 	{   
+	function ErrorMsg()
+ 	{
         if ($this->_errorMsg !== false) return $this->_errorMsg;
 
         if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
@@ -100,8 +109,8 @@ function ErrorMsg()
 		return $this->_errorMsg;
 	}
 
- 
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_errorCode !== false) return $this->_errorCode;
 
@@ -110,17 +119,17 @@ function ErrorNo()
         return $this->_errorCode;
 	}
 
-	
+
 
 		// returns true or false
 		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
 		{
 			if (!function_exists('ora_plogon')) return null;
-				
+
             //  Reset error messages before connecting
             $this->_errorMsg = false;
 		    $this->_errorCode = false;
-        
+
             // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
             // the oracle home to the host name of remote DB?
 //			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
@@ -150,7 +159,7 @@ function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $m
 			if ($argDatabasename) $argUsername .= "@$argDatabasename";
 
 		//if ($argHostname) print "
Connect: 1st argument should be left blank for $this->databaseType
";
-			if ($mode = 1)
+			if ($mode == 1)
 				$this->_connectionID = ora_plogon($argUsername,$argPassword);
 			else
 				$this->_connectionID = ora_logon($argUsername,$argPassword);
@@ -180,7 +189,7 @@ function _query($sql,$inputarr=false)
 		    $this->_errorCode = false;
 
 			$curs = ora_open($this->_connectionID);
-		 
+
 		 	if ($curs === false) return false;
 			$this->_curs = $curs;
 			if (!ora_parse($curs,$sql)) return false;
@@ -189,7 +198,7 @@ function _query($sql,$inputarr=false)
             // that we can obtain ONLY from the cursor (and not from the connection)
             $this->_errorCode = @ora_errorcode($curs);
             $this->_errorMsg = @ora_error($curs);
-            //             
+            // 
 		 	@ora_close($curs);
 			return false;
 		}
@@ -215,17 +224,17 @@ class ADORecordset_oracle extends ADORecordSet {
 	var $databaseType = "oracle";
 	var $bind = false;
 
-	function ADORecordset_oracle($queryID,$mode=false)
+	function __construct($queryID,$mode=false)
 	{
-		
-		if ($mode === false) { 
+
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $queryID;
-	
+
 		$this->_inited = true;
 		$this->fields = array();
 		if ($queryID) {
@@ -237,7 +246,7 @@ function ADORecordset_oracle($queryID,$mode=false)
 			$this->_numOfFields = 0;
 			$this->EOF = true;
 		}
-		
+
 		return $this->_queryID;
 	}
 
@@ -248,7 +257,7 @@ function ADORecordset_oracle($queryID,$mode=false)
 			   fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
 			   fetchField() is retrieved.		*/
 
-	   function &FetchField($fieldOffset = -1)
+	   function FetchField($fieldOffset = -1)
 	   {
 			$fld = new ADOFieldObject;
 			$fld->name = ora_columnname($this->_queryID, $fieldOffset);
@@ -267,10 +276,10 @@ function Fields($colname)
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
    function _initrs()
    {
 		   $this->_numOfRows = -1;
@@ -286,27 +295,27 @@ function _seek($row)
    function _fetch($ignore_fields=false) {
 // should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
 		if ($this->fetchMode & ADODB_FETCH_ASSOC)
-			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
-   		else 
-			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS);
+			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
+   		else
+			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
    }
 
    /*		close() only needs to be called if you are worried about using too much memory while your script
 		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
 
-   function _close() 
+   function _close()
 {
 		   return @ora_close($this->_queryID);
    }
 
-	function MetaType($t,$len=-1)
+	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		switch (strtoupper($t)) {
 		case 'VARCHAR':
 		case 'VARCHAR2':
@@ -322,17 +331,16 @@ function MetaType($t,$len=-1)
 		case 'LONG VARBINARY':
 		case 'BLOB':
 				return 'B';
-		
+
 		case 'DATE': return 'D';
-		
+
 		//case 'T': return 'T';
-		
+
 		case 'BIT': return 'L';
-		case 'INT': 
+		case 'INT':
 		case 'SMALLINT':
 		case 'INTEGER': return 'I';
 		default: return 'N';
 		}
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-pdo.inc.php b/adodb/drivers/adodb-pdo.inc.php
index 93e758d..0933bf1 100644
--- a/adodb/drivers/adodb-pdo.inc.php
+++ b/adodb/drivers/adodb-pdo.inc.php
@@ -1,19 +1,24 @@
 _bindInputArray = true;
-		#$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
-	}
-	
-	function ServerInfo()
-	{
-		return ADOConnection::ServerInfo();
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-	{
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-	
-	function MetaTables()
-	{
-		return false;
-	}
-	
-	function MetaColumns()
-	{
-		return false;
-	}
-}
+/*----------------------------------------------------------------------------*/
 
 
 class ADODB_pdo extends ADOConnection {
-	var $databaseType = "pdo";	
+	var $databaseType = "pdo";
 	var $dataProvider = "pdo";
 	var $fmtDate = "'Y-m-d'";
 	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $hasAffectedRows = true;
-	var $_bindInputArray = true;	
+	var $_bindInputArray = true;
+	var $_genIDSQL;
 	var $_genSeqSQL = "create table %s (id integer)";
+	var $_dropSeqSQL;
 	var $_autocommit = true;
-	var $_haserrorfunctions = true;
 	var $_lastAffectedRows = 0;
-	
+
 	var $_errormsg = false;
 	var $_errorno = false;
-	
+
 	var $dsnType = '';
 	var $stmt = false;
-	
-	function ADODB_pdo()
-	{
-	}
-	
+	var $_driver;
+
+	/*
+	* Describe parameters passed directly to the PDO driver
+	*
+	* @example $db->pdoOptions = [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION];
+	*/
+	public $pdoParameters = array();
+
 	function _UpdatePDO()
 	{
-		$d = &$this->_driver;
+		$d = $this->_driver;
 		$this->fmtDate = $d->fmtDate;
 		$this->fmtTimeStamp = $d->fmtTimeStamp;
 		$this->replaceQuote = $d->replaceQuote;
@@ -133,21 +104,33 @@ 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;
+		$this->_genSeqSQL = $d->_genSeqSQL;
+		$this->_dropSeqSQL = $d->_dropSeqSQL;
+
 		$d->_init($this);
 	}
-	
+
 	function Time()
 	{
-		if (!empty($this->_driver->_hasdual)) $sql = "select $this->sysTimeStamp from dual";
-		else $sql = "select $this->sysTimeStamp";
-		
-		$rs =& $this->_Execute($sql);
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+		if (!empty($this->_driver->_hasdual)) {
+			$sql = "select $this->sysTimeStamp from dual";
+		}
+		else {
+			$sql = "select $this->sysTimeStamp";
+		}
+
+		$rs = $this->_Execute($sql);
+		if ($rs && !$rs->EOF) {
+			return $this->UnixTimeStamp(reset($rs->fields));
+		}
+
 		return false;
 	}
-	
+
 	// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist=false)
 	{
@@ -155,10 +138,31 @@ function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persis
 		$this->dsnType = substr($argDSN,0,$at);
 
 		if ($argDatabasename) {
-			$argDSN .= ';dbname='.$argDatabasename;
+			switch($this->dsnType){
+				case 'sqlsrv':
+					$argDSN .= ';database='.$argDatabasename;
+					break;
+				case 'mssql':
+				case 'mysql':
+				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;
@@ -166,194 +170,423 @@ function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persis
 			$this->_errormsg = 'Connection attempt failed: '.$e->getMessage();
 			return false;
 		}
-		
+
 		if ($this->_connectionID) {
 			switch(ADODB_ASSOC_CASE){
-			case 0: $m = PDO::CASE_LOWER; break;
-			case 1: $m = PDO::CASE_UPPER; break;
-			default:
-			case 2: $m = PDO::CASE_NATURAL; break;
+				case ADODB_ASSOC_CASE_LOWER:
+					$m = PDO::CASE_LOWER;
+					break;
+				case ADODB_ASSOC_CASE_UPPER:
+					$m = PDO::CASE_UPPER;
+					break;
+				default:
+				case ADODB_ASSOC_CASE_NATIVE:
+					$m = PDO::CASE_NATURAL;
+					break;
 			}
-			
+
 			//$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) {
-			case 'oci':
-			case 'mysql':
-			case 'pgsql':
-			case 'mssql':
-				include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
-				break;
+				case 'mssql':
+				case 'mysql':
+				case 'oci':
+				case 'pgsql':
+				case 'sqlite':
+				case 'sqlsrv':
+				case 'firebird':
+				case 'dblib':
+					include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
+					break;
 			}
-			if (class_exists($class))
+			if (class_exists($class)) {
 				$this->_driver = new $class();
-			else
+			}
+			else {
 				$this->_driver = new ADODB_pdo_base();
-			
+			}
+
 			$this->_driver->_connectionID = $this->_connectionID;
 			$this->_UpdatePDO();
+			$this->_driver->database = $this->database;
 			return true;
 		}
 		$this->_driver = new ADODB_pdo_base();
 		return false;
 	}
-	
+
+	function Concat()
+	{
+		$args = func_get_args();
+		if(method_exists($this->_driver, 'Concat')) {
+			return call_user_func_array(array($this->_driver, 'Concat'), $args);
+		}
+
+		return call_user_func_array('parent::Concat', $args);
+	}
+
 	// returns true or false
 	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argDSN, $argUsername, $argPassword, $argDatabasename, true);
 	}
-	
+
 	/*------------------------------------------------------------------------------*/
-	
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{	
+
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
 		$save = $this->_driver->fetchMode;
 		$this->_driver->fetchMode = $this->fetchMode;
-	 	$this->_driver->debug = $this->debug;
+		$this->_driver->debug = $this->debug;
 		$ret = $this->_driver->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		$this->_driver->fetchMode = $save;
 		return $ret;
 	}
-	
-	
+
+
 	function ServerInfo()
 	{
 		return $this->_driver->ServerInfo();
 	}
-	
+
 	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		return $this->_driver->MetaTables($ttype,$showSchema,$mask);
 	}
-	
+
 	function MetaColumns($table,$normalize=true)
 	{
 		return $this->_driver->MetaColumns($table,$normalize);
 	}
-	
+
+	public function metaIndexes($table,$normalize=true)
+	{
+		if (method_exists($this->_driver,'metaIndexes'))
+			return $this->_driver->metaIndexes($table,$normalize);
+	}
+
+	/**
+	 * 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];
-		if ($type) $obj->bindParam($name,$var,$type,$maxLen);
-		else $obj->bindParam($name, $var);
+		if ($type) {
+			$obj->bindParam($name, $var, $type, $maxLen);
+		}
+		else {
+			$obj->bindParam($name, $var);
+		}
 	}
-	
-	
+
+	function OffsetDate($dayFraction,$date=false)
+	{
+		return $this->_driver->OffsetDate($dayFraction,$date);
+	}
+
+	function SelectDB($dbName)
+	{
+		return $this->_driver->SelectDB($dbName);
+	}
+
+	function SQLDate($fmt, $col=false)
+	{
+		return $this->_driver->SQLDate($fmt, $col);
+	}
+
 	function ErrorMsg()
 	{
-		if ($this->_errormsg !== false) return $this->_errormsg;
-		if (!empty($this->_stmt)) $arr = $this->_stmt->errorInfo();
-		else if (!empty($this->_connectionID)) $arr = $this->_connectionID->errorInfo();
-		else return 'No Connection Established';
-		
-		
+		if ($this->_errormsg !== false) {
+			return $this->_errormsg;
+		}
+		if (!empty($this->_stmt)) {
+			$arr = $this->_stmt->errorInfo();
+		}
+		else if (!empty($this->_connectionID)) {
+			$arr = $this->_connectionID->errorInfo();
+		}
+		else {
+			return 'No Connection Established';
+		}
+
 		if ($arr) {
-		 	if (sizeof($arr)<2) return '';
-			if ((integer)$arr[1]) return $arr[2];
-			else return '';
-		} else return '-1';
+			if (sizeof($arr)<2) {
+				return '';
+			}
+			if ((integer)$arr[0]) {
+				return $arr[2];
+			}
+			else {
+				return '';
+			}
+		}
+		else {
+			return '-1';
+		}
 	}
-	
+
 
 	function ErrorNo()
 	{
-		if ($this->_errorno !== false) return $this->_errorno;
-		if (!empty($this->_stmt)) $err = $this->_stmt->errorCode();
+		if ($this->_errorno !== false) {
+			return $this->_errorno;
+		}
+		if (!empty($this->_stmt)) {
+			$err = $this->_stmt->errorCode();
+		}
 		else if (!empty($this->_connectionID)) {
 			$arr = $this->_connectionID->errorInfo();
-			if (isset($arr[0])) $err = $arr[0];
-			else $err = -1;
-		} else
+			if (isset($arr[0])) {
+				$err = $arr[0];
+			}
+			else {
+				$err = -1;
+			}
+		} else {
 			return 0;
-			
-		if ($err == '00000') return 0; // allows empty check
+		}
+
+		if ($err == '00000') {
+			return 0; // allows empty check
+		}
 		return $err;
 	}
 
-	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+	/**
+	 * @param bool $auto_commit
+	 * @return void
+	 */
+	function SetAutoCommit($auto_commit)
+	{
+		if(method_exists($this->_driver, 'SetAutoCommit')) {
+			$this->_driver->SetAutoCommit($auto_commit);
+		}
+	}
+
+	function SetTransactionMode($transaction_mode)
+	{
+		if(method_exists($this->_driver, 'SetTransactionMode')) {
+			return $this->_driver->SetTransactionMode($transaction_mode);
+		}
+
+		return parent::SetTransactionMode($transaction_mode);
+	}
+
+	function beginTrans()
+	{
+		if(method_exists($this->_driver, 'beginTrans')) {
+			return $this->_driver->beginTrans();
+		}
+
+		if (!$this->hasTransactions) {
+			return false;
+		}
+		if ($this->transOff) {
+			return true;
+		}
 		$this->transCnt += 1;
 		$this->_autocommit = false;
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,false);
+		$this->SetAutoCommit(false);
+
 		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;
+
+	function commitTrans($ok=true)
+	{
+
+		if(method_exists($this->_driver, 'commitTrans')) {
+			return $this->_driver->commitTrans($ok);
+		}
+
+		if (!$this->hasTransactions) {
+			return false;
+		}
+		if ($this->transOff) {
+			return true;
+		}
+		if (!$ok) {
+			return $this->rollbackTrans();
+		}
+		if ($this->transCnt) {
+			$this->transCnt -= 1;
+		}
 		$this->_autocommit = true;
-		
+
 		$ret = $this->_connectionID->commit();
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
+		$this->SetAutoCommit(true);
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
+		if(method_exists($this->_driver, 'RollbackTrans')) {
+			return $this->_driver->RollbackTrans();
+		}
+
+		if (!$this->hasTransactions) {
+			return false;
+		}
+		if ($this->transOff) {
+			return true;
+		}
+		if ($this->transCnt) {
+			$this->transCnt -= 1;
+		}
 		$this->_autocommit = true;
-		
+
 		$ret = $this->_connectionID->rollback();
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
+		$this->SetAutoCommit(true);
 		return $ret;
 	}
-	
+
 	function Prepare($sql)
 	{
 		$this->_stmt = $this->_connectionID->prepare($sql);
-		if ($this->_stmt) return array($sql,$this->_stmt);
-		
+		if ($this->_stmt) {
+			return array($sql,$this->_stmt);
+		}
+
 		return false;
 	}
-	
+
 	function PrepareStmt($sql)
 	{
 		$stmt = $this->_connectionID->prepare($sql);
-		if (!$stmt) return false;
+		if (!$stmt) {
+			return false;
+		}
 		$obj = new ADOPDOStatement($stmt,$this);
 		return $obj;
 	}
-	
-	
+
+	public function createSequence($seqname='adodbseq',$startID=1)
+	{
+		if(method_exists($this->_driver, 'createSequence')) {
+			return $this->_driver->createSequence($seqname, $startID);
+		}
+
+		return parent::CreateSequence($seqname, $startID);
+	}
+
+	function DropSequence($seqname='adodbseq')
+	{
+		if(method_exists($this->_driver, 'DropSequence')) {
+			return $this->_driver->DropSequence($seqname);
+		}
+
+		return parent::DropSequence($seqname);
+	}
+
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		if(method_exists($this->_driver, 'GenID')) {
+			return $this->_driver->GenID($seqname, $startID);
+		}
+
+		return parent::GenID($seqname, $startID);
+	}
+
+
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
+		$ok = false;
 		if (is_array($sql)) {
 			$stmt = $sql[1];
 		} else {
 			$stmt = $this->_connectionID->prepare($sql);
 		}
-		#adodb_backtrace();
-		#var_dump($this->_bindInputArray);
+
 		if ($stmt) {
-			$this->_driver->debug = $this->debug;
-			if ($inputarr) $ok = $stmt->execute($inputarr);
-			else $ok = $stmt->execute();
-		} 
-		
-		
+			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 {
+				$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];
@@ -378,26 +611,82 @@ 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 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)
+	{
+		if ($this->_connectionID) {
+			return $this->_connectionID->quote($s);
+		}
+		return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
+	}
+
+}
+
+class ADODB_pdo_base extends ADODB_pdo {
+
+	var $sysDate = "'?'";
+	var $sysTimeStamp = "'?'";
+
+
+	function _init($parentDriver)
+	{
+		$parentDriver->_bindInputArray = true;
+		#$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
+	}
+
+	function ServerInfo()
+	{
+		return ADOConnection::ServerInfo();
+	}
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
+		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		return $ret;
+	}
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
+		return false;
+	}
+
+	function MetaColumns($table,$normalize=true)
+	{
+		return false;
+	}
 }
 
 class ADOPDOStatement {
 
-	var $databaseType = "pdo";		
+	var $databaseType = "pdo";
 	var $dataProvider = "pdo";
 	var $_stmt;
 	var $_connectionID;
-	
-	function ADOPDOStatement($stmt,$connection)
+
+	function __construct($stmt,$connection)
 	{
 		$this->_stmt = $stmt;
 		$this->_connectionID = $connection;
 	}
-	
+
 	function Execute($inputArr=false)
 	{
 		$savestmt = $this->_connectionID->_stmt;
@@ -405,55 +694,73 @@ function Execute($inputArr=false)
 		$this->_connectionID->_stmt = $savestmt;
 		return $rs;
 	}
-	
+
 	function InParameter(&$var,$name,$maxLen=4000,$type=false)
 	{
 
-		if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
-		else $this->_stmt->bindParam($name, $var);
+		if ($type) {
+			$this->_stmt->bindParam($name,$var,$type,$maxLen);
+		}
+		else {
+			$this->_stmt->bindParam($name, $var);
+		}
 	}
-	
+
 	function Affected_Rows()
 	{
 		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
 	}
-	
+
 	function ErrorMsg()
 	{
-		if ($this->_stmt) $arr = $this->_stmt->errorInfo();
-		else $arr = $this->_connectionID->errorInfo();
+		if ($this->_stmt) {
+			$arr = $this->_stmt->errorInfo();
+		}
+		else {
+			$arr = $this->_connectionID->errorInfo();
+		}
 
 		if (is_array($arr)) {
-			if ((integer) $arr[0] && isset($arr[2])) return $arr[2];
-			else return '';
-		} else return '-1';
+			if ((integer) $arr[0] && isset($arr[2])) {
+				return $arr[2];
+			}
+			else {
+				return '';
+			}
+		} else {
+			return '-1';
+		}
 	}
-	
+
 	function NumCols()
 	{
 		return ($this->_stmt) ? $this->_stmt->columnCount() : 0;
 	}
-	
+
 	function ErrorNo()
 	{
-		if ($this->_stmt) return $this->_stmt->errorCode();
-		else return $this->_connectionID->errorInfo();
+		if ($this->_stmt) {
+			return $this->_stmt->errorCode();
+		}
+		else {
+			return $this->_connectionID->errorInfo();
+		}
 	}
 }
 
 /*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
+	Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_pdo extends ADORecordSet {	
-	
+class ADORecordSet_pdo extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "pdo";		
+	var $databaseType = "pdo";
 	var $dataProvider = "pdo";
-	
-	function ADORecordSet_pdo($id,$mode=false)
+
+	function __construct($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -461,22 +768,26 @@ function ADORecordSet_pdo($id,$mode=false)
 		switch($mode) {
 		case ADODB_FETCH_NUM: $mode = PDO::FETCH_NUM; break;
 		case ADODB_FETCH_ASSOC:  $mode = PDO::FETCH_ASSOC; break;
-		
-		case ADODB_FETCH_BOTH: 
+
+		case ADODB_FETCH_BOTH:
 		default: $mode = PDO::FETCH_BOTH; break;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $id;
-		$this->ADORecordSet($id);
+		parent::__construct($id);
 	}
 
-	
+
 	function Init()
 	{
-		if ($this->_inited) return;
+		if ($this->_inited) {
+			return;
+		}
 		$this->_inited = true;
-		if ($this->_queryID) @$this->_initrs();
+		if ($this->_queryID) {
+			@$this->_initrs();
+		}
 		else {
 			$this->_numOfRows = 0;
 			$this->_numOfFields = 0;
@@ -490,21 +801,23 @@ function Init()
 			$this->EOF = true;
 		}
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		$this->_numOfRows = ($ADODB_COUNTRECS) ? @$this->_queryID->rowCount() : -1;
-		if (!$this->_numOfRows) $this->_numOfRows = -1;
+		if (!$this->_numOfRows) {
+			$this->_numOfRows = -1;
+		}
 		$this->_numOfFields = $this->_queryID->columnCount();
 	}
 
 	// returns the field object
-	function &FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
 		if (!$arr) {
@@ -517,38 +830,62 @@ function &FetchField($fieldOffset = -1)
 		}
 		//adodb_pr($arr);
 		$o->name = $arr['name'];
-		if (isset($arr['native_type'])) $o->type = $arr['native_type'];
-		else $o->type = adodb_pdo_type($arr['pdo_type']);
+		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")
+		{
+		    $o->type = $arr['native_type'];
+		}
+		else
+		{
+		     $o->type = adodb_pdo_type($arr['pdo_type']);
+		}
+
 		$o->max_length = $arr['len'];
 		$o->precision = $arr['precision'];
-		
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+
+		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 _seek($row)
 	{
 		return false;
 	}
-	
+
 	function _fetch()
 	{
-		if (!$this->_queryID) return false;
-		
+		if (!$this->_queryID) {
+			return false;
+		}
+
 		$this->fields = $this->_queryID->fetch($this->fetchMode);
 		return !empty($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 		$this->_queryID = false;
 	}
-	
+
 	function Fields($colname)
 	{
-		if ($this->adodbFetchMode != ADODB_FETCH_NUM) return @$this->fields[$colname];
-		
+		if ($this->adodbFetchMode != ADODB_FETCH_NUM) {
+			return @$this->fields[$colname];
+		}
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -556,9 +893,9 @@ function Fields($colname)
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
+		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
 }
 
-?>
\ No newline at end of file
+class ADORecordSet_array_pdo extends ADORecordSet_array {}
diff --git a/adodb/drivers/adodb-pdo_dblib.inc.php b/adodb/drivers/adodb-pdo_dblib.inc.php
new file mode 100644
index 0000000..aae561b
--- /dev/null
+++ b/adodb/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/adodb/drivers/adodb-pdo_firebird.inc.php b/adodb/drivers/adodb-pdo_firebird.inc.php
new file mode 100644
index 0000000..0ee5e02
--- /dev/null
+++ b/adodb/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/adodb/drivers/adodb-pdo_mssql.inc.php b/adodb/drivers/adodb-pdo_mssql.inc.php
index c97b74f..ef63b65 100644
--- a/adodb/drivers/adodb-pdo_mssql.inc.php
+++ b/adodb/drivers/adodb-pdo_mssql.inc.php
@@ -1,42 +1,51 @@
 hasTransactions = false; ## <<< BUG IN PDO mssql driver
 		$parentDriver->_bindInputArray = false;
 		$parentDriver->hasInsertID = true;
 	}
-	
+
 	function ServerInfo()
 	{
 		return ADOConnection::ServerInfo();
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -46,16 +55,15 @@ function SetTransactionMode( $transaction_mode )
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
-	function MetaTables()
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		return false;
 	}
-	
-	function MetaColumns()
+
+	function MetaColumns($table,$normalize=true)
 	{
 		return false;
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-pdo_mysql.inc.php b/adodb/drivers/adodb-pdo_mysql.inc.php
index e4ec766..c881245 100644
--- a/adodb/drivers/adodb-pdo_mysql.inc.php
+++ b/adodb/drivers/adodb-pdo_mysql.inc.php
@@ -1,80 +1,188 @@
 hasTransactions = false;
-		$parentDriver->_bindInputArray = false;
+		#$parentDriver->_bindInputArray = false;
 		$parentDriver->hasInsertID = true;
-		$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
+		$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 	}
-	
-		// dayFraction is a day in floating point
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		
+
+	// dayFraction is a day in floating point
+	function OffsetDate($dayFraction, $date=false)
+	{
+		if (!$date) {
+			$date = $this->sysDate;
+		}
+
 		$fraction = $dayFraction * 24 * 3600;
-		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
+		return $date . ' + INTERVAL ' .	$fraction . ' SECOND';
 //		return "from_unixtime(unix_timestamp($date)+$fraction)";
 	}
 	
+	/**
+	 * 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;
+
+		$false = false;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->setFetchMode(FALSE);
+		}
+
+		// get index details
+		$rs = $this->execute(sprintf('SHOW INDEXES FROM %s',$table));
+
+		// restore fetchmode
+		if (isset($savem)) {
+			$this->setFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		if (!is_object($rs)) {
+			return $false;
+		}
+
+		$indexes = array ();
+
+		// parse index data into array
+		while ($row = $rs->fetchRow()) {
+			if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+				continue;
+			}
+
+			if (!isset($indexes[$row[2]])) {
+				$indexes[$row[2]] = array(
+					'unique' => ($row[1] == 0),
+					'columns' => array()
+				);
+			}
+
+			$indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
+		}
+
+		// sort columns by order in the index
+		foreach ( array_keys ($indexes) as $index )
+		{
+			ksort ($indexes[$index]['columns']);
+		}
+
+		return $indexes;
+	}
+
+	function Concat()
+	{
+		$s = '';
+		$arr = func_get_args();
+
+		// suggestion by andrew005#mnogo.ru
+		$s = implode(',', $arr);
+		if (strlen($s) > 0) {
+			return "CONCAT($s)";
+		}
+		return '';
+	}
+
 	function ServerInfo()
 	{
-		$arr['description'] = ADOConnection::GetOne("select version()");
+		$arr['description'] = ADOConnection::GetOne('select version()');
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	function MetaTables($ttype=false, $showSchema=false, $mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
+			$this->metaTablesSQL .= $this->qstr($showSchema);
+		} else {
+			$this->metaTablesSQL .= 'schema()';
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
 			$this->metaTablesSQL .= " like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+		$ret = ADOConnection::MetaTables($ttype, $showSchema);
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+    /**
+     * @param bool $auto_commit
+     * @return void
+     */
+    function SetAutoCommit($auto_commit)
+    {
+        $this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT, $auto_commit);
+    }
+
+	function SetTransactionMode($transaction_mode)
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
 			$this->Execute('SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
 			return;
 		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+		if (!stristr($transaction_mode, 'isolation')) {
+			$transaction_mode = 'ISOLATION LEVEL ' . $transaction_mode;
+		}
+		$this->Execute('SET SESSION TRANSACTION ' . $transaction_mode);
 	}
-	
- 	function &MetaColumns($table) 
+
+	function MetaColumns($table, $normalize=true)
 	{
-		$this->_findschema($table,$schema);
+		$this->_findschema($table, $schema);
 		if ($schema) {
 			$dbName = $this->database;
 			$this->SelectDB($schema);
@@ -82,41 +190,45 @@ function &MetaColumns($table)
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
+		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);
+
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs)) {
 			$false = false;
 			return $false;
 		}
-			
+
 		$retarr = array();
 		while (!$rs->EOF){
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
-			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
+			if (preg_match('/^(.+)\((\d+),(\d+)/', $type, $query_array)) {
 				$fld->type = $query_array[1];
 				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
 				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
-			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
+			} elseif (preg_match('/^(.+)\((\d+)/', $type, $query_array)) {
 				$fld->type = $query_array[1];
 				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
+			} elseif (preg_match('/^(enum)\((.*)\)$/i', $type, $query_array)) {
 				$fld->type = $query_array[1];
-				$arr = explode(",",$query_array[2]);
+				$arr = explode(',', $query_array[2]);
 				$fld->enums = $arr;
-				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
+				$zlen = max(array_map('strlen', $arr)) - 2; // PHP >= 4.0.6
 				$fld->max_length = ($zlen > 0) ? $zlen : 1;
 			} else {
 				$fld->type = $type;
@@ -125,9 +237,9 @@ function &MetaColumns($table)
 			$fld->not_null = ($rs->fields[2] != 'YES');
 			$fld->primary_key = ($rs->fields[3] == 'PRI');
 			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-			$fld->binary = (strpos($type,'blob') !== false);
-			$fld->unsigned = (strpos($type,'unsigned') !== false);
-				
+			$fld->binary = (strpos($type, 'blob') !== false);
+			$fld->unsigned = (strpos($type, 'unsigned') !== false);
+
 			if (!$fld->binary) {
 				$d = $rs->fields[4];
 				if ($d != '' && $d != 'NULL') {
@@ -137,32 +249,175 @@ function &MetaColumns($table)
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
 				$retarr[strtoupper($fld->name)] = $fld;
 			}
-				$rs->MoveNext();
-			}
-		
-			$rs->Close();
-			return $retarr;	
+			$rs->MoveNext();
+		}
+
+		$rs->Close();
+		return $retarr;
 	}
-		
-	
+
+	// returns true or false
+	function SelectDB($dbName)
+	{
+		$this->database = $dbName;
+		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+		$try = $this->Execute('use ' . $dbName);
+		return ($try !== false);
+	}
+
 	// 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) ? "$offset," : '';
-		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
-		if ($secs)
-			$rs =& $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
-		else
-			$rs =& $this->Execute($sql." LIMIT $offsetStr$nrows",$inputarr);
+		// jason judge, see PHPLens Issue No: 9220
+		if ($nrows < 0) {
+			$nrows = '18446744073709551615';
+		}
+
+		if ($secs) {
+			$rs = $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows", $inputarr);
+		} else {
+			$rs = $this->Execute($sql . " LIMIT $offsetStr$nrows", $inputarr);
+		}
 		return $rs;
 	}
+
+	function SQLDate($fmt, $col=false)
+	{
+		if (!$col) {
+			$col = $this->sysTimeStamp;
+		}
+		$s = 'DATE_FORMAT(' . $col . ",'";
+		$concat = false;
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+
+				default:
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt, $i, 1);
+					}
+					// FALL THROUGH
+				case '-':
+				case '/':
+					$s .= $ch;
+					break;
+
+				case 'Y':
+				case 'y':
+					$s .= '%Y';
+					break;
+
+				case 'M':
+					$s .= '%b';
+					break;
+
+				case 'm':
+					$s .= '%m';
+					break;
+
+				case 'D':
+				case 'd':
+					$s .= '%d';
+					break;
+
+				case 'Q':
+				case 'q':
+					$s .= "'),Quarter($col)";
+
+					if ($len > $i+1) {
+						$s .= ",DATE_FORMAT($col,'";
+					} else {
+						$s .= ",('";
+					}
+					$concat = true;
+					break;
+
+				case 'H':
+					$s .= '%H';
+					break;
+
+				case 'h':
+					$s .= '%I';
+					break;
+
+				case 'i':
+					$s .= '%i';
+					break;
+
+				case 's':
+					$s .= '%s';
+					break;
+
+				case 'a':
+				case 'A':
+					$s .= '%p';
+					break;
+
+				case 'w':
+					$s .= '%w';
+					break;
+
+				case 'W':
+					$s .= '%U';
+					break;
+
+				case 'l':
+					$s .= '%W';
+					break;
+			}
+		}
+		$s .= "')";
+		if ($concat) {
+			$s = "CONCAT($s)";
+		}
+		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));
+	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-pdo_oci.inc.php b/adodb/drivers/adodb-pdo_oci.inc.php
index 66c32b7..9a05ee6 100644
--- a/adodb/drivers/adodb-pdo_oci.inc.php
+++ b/adodb/drivers/adodb-pdo_oci.inc.php
@@ -1,14 +1,23 @@
 _bindInputArray = true;
@@ -31,33 +40,33 @@ function _init($parentDriver)
 			$parentDriver->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
 		}
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtoupper($mask));
 			$this->metaTablesSQL .= " AND table_name like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	function &MetaColumns($table) 
+
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = false;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!$rs) {
@@ -73,21 +82,28 @@ function &MetaColumns($table)
 			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
 				$fld->type ='INT';
 	     		$fld->max_length = $rs->fields[4];
-	    	}	
+	    	}
 		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
 			return  $false;
-		else 
+		else
 			return $retarr;
 	}
-}
 
-?>
\ No newline at end of file
+    /**
+     * @param bool $auto_commit
+     * @return void
+     */
+    function SetAutoCommit($auto_commit)
+    {
+        $this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT, $auto_commit);
+    }
+}
diff --git a/adodb/drivers/adodb-pdo_pgsql.inc.php b/adodb/drivers/adodb-pdo_pgsql.inc.php
index 5367da4..0212d4f 100644
--- a/adodb/drivers/adodb-pdo_pgsql.inc.php
+++ b/adodb/drivers/adodb-pdo_pgsql.inc.php
@@ -1,46 +1,56 @@
  0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
 
 	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
 WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
+ and c.relnamespace=n.oid and n.nspname='%s'
+	and a.attname not like '....%%' AND a.attnum > 0
 	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
+
 	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key
 	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
+
 	var $hasAffectedRows = true;
 	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
+	// below suggested by Freek Dijkstra
 	var $true = 't';		// string that represents TRUE for a database
 	var $false = 'f';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -53,41 +63,43 @@ class ADODB_pdo_pgsql extends ADODB_pdo {
 	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
 	var $random = 'random()';		/// random function
 	var $concat_operator='||';
-	
+
 	function _init($parentDriver)
 	{
-	
+
 		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO pgsql driver
 		$parentDriver->hasInsertID = true;
 		$parentDriver->_nestedSQL = true;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
-		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
-		 if ($secs2cache)
-		  	$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-		 else
-		  	$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
+		$nrows = (int) $nrows;
+		$offset = (int) $offset;
+		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
+		if ($secs2cache)
+			$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		else
+			$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+
 		return $rs;
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$info = $this->ServerInfo();
 		if ($info['version'] >= 7.3) {
 	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
+	union
         select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
 		}
 		if ($mask) {
@@ -95,59 +107,59 @@ function &MetaTables($ttype=false,$showSchema=false,$mask=false)
 			$mask = $this->qstr(strtolower($mask));
 			if ($info['version']>=7.3)
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
+ union
 select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
 			else
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
+select tablename,'T' from pg_tables where tablename like $mask
+ union
 select viewname,'V' from pg_views where viewname like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	function &MetaColumns($table,$normalize=true) 
+
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$schema = false;
 		$this->_findschema($table,$schema);
-		
+
 		if ($normalize) $table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		if ($schema) $rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+
+		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
+		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) {
 			$false = false;
 			return $false;
 		}
 		if (!empty($this->metaKeySQL)) {
 			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
+			// Of course, a modified version of the metaColumnsSQL query using a
+			// LEFT JOIN would have been much more elegant, but postgres does
 			// not support OUTER JOINS. So here is the clumsy way.
-			
+
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
+
 			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
 			// fetch all result in once for performance.
-			$keys =& $rskey->GetArray();
+			$keys = $rskey->GetArray();
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			$rskey->Close();
 			unset($rskey);
 		}
@@ -159,7 +171,7 @@ function &MetaColumns($table,$normalize=true)
 			$rsdef = $this->Execute($sql);
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			if ($rsdef) {
 				while (!$rsdef->EOF) {
 					$num = $rsdef->fields['num'];
@@ -177,9 +189,9 @@ function &MetaColumns($table,$normalize=true)
 			}
 			unset($rsdef);
 		}
-	
+
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
@@ -201,30 +213,88 @@ function &MetaColumns($table,$normalize=true)
 			if ($rs->fields[4] == $this->true) {
 				$fld->not_null = true;
 			}
-			
+
 			// Freek
 			if (is_array($keys)) {
 				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true)
 						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true)
 						$fld->unique = true; // What name is more compatible?
 				}
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr)) {
 			$false = false;
 			return $false;
-		} else return $retarr;	
-		
+		} else return $retarr;
+
 	}
 
-}
+	function BeginTrans()
+	{
+		if (!$this->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/adodb/drivers/adodb-pdo_sqlite.inc.php b/adodb/drivers/adodb-pdo_sqlite.inc.php
new file mode 100644
index 0000000..b62ca35
--- /dev/null
+++ b/adodb/drivers/adodb-pdo_sqlite.inc.php
@@ -0,0 +1,212 @@
+
+ * @author Sid Dunayer 
+ */
+
+class ADODB_pdo_sqlite extends ADODB_pdo {
+	var $metaTablesSQL   = "SELECT name FROM sqlite_master WHERE type='table'";
+	var $sysDate         = 'current_date';
+	var $sysTimeStamp    = 'current_timestamp';
+	var $nameQuote       = '`';
+	var $replaceQuote    = "''";
+	var $hasGenID        = true;
+	var $_genIDSQL       = "UPDATE %s SET id=id+1 WHERE id=%s";
+	var $_genSeqSQL      = "CREATE TABLE %s (id integer)";
+	var $_genSeqCountSQL = 'SELECT COUNT(*) FROM %s';
+	var $_genSeq2SQL     = 'INSERT INTO %s VALUES(%s)';
+	var $_dropSeqSQL     = 'DROP TABLE %s';
+	var $concat_operator = '||';
+    var $pdoDriver       = false;
+	var $random='abs(random())';
+
+	function _init($parentDriver)
+	{
+		$this->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;
+	}
+
+	function ServerInfo()
+	{
+		$parent = $this->pdoDriver;
+		@($ver = array_pop($parent->GetCol("SELECT sqlite_version()")));
+		@($enc = array_pop($parent->GetCol("PRAGMA encoding")));
+
+		$arr['version']     = $ver;
+		$arr['description'] = 'SQLite ';
+		$arr['encoding']    = $enc;
+
+		return $arr;
+	}
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
+		$nrows = (int) $nrows;
+		$offset = (int) $offset;
+		$parent = $this->pdoDriver;
+		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
+		if ($secs2cache)
+			$rs = $parent->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		else
+			$rs = $parent->Execute($sql."$limitStr$offsetStr",$inputarr);
+
+		return $rs;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		$parent = $this->pdoDriver;
+		// if you have to modify the parameter below, your database is overloaded,
+		// or you need to implement generation of id's yourself!
+		$MAXLOOPS = 100;
+		while (--$MAXLOOPS>=0) {
+			@($num = array_pop($parent->GetCol("SELECT id FROM {$seq}")));
+			if ($num === false || !is_numeric($num)) {
+				@$parent->Execute(sprintf($this->_genSeqSQL ,$seq));
+				$start -= 1;
+				$num = '0';
+				$cnt = $parent->GetOne(sprintf($this->_genSeqCountSQL,$seq));
+				if (!$cnt) {
+					$ok = $parent->Execute(sprintf($this->_genSeq2SQL,$seq,$start));
+				}
+				if (!$ok) return false;
+			}
+			$parent->Execute(sprintf($this->_genIDSQL,$seq,$num));
+
+			if ($parent->affected_rows() > 0) {
+                	        $num += 1;
+                		$parent->genID = intval($num);
+                		return intval($num);
+			}
+		}
+		if ($fn = $parent->raiseErrorFn) {
+			$fn($parent->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
+		}
+		return false;
+	}
+
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		$parent = $this->pdoDriver;
+		$ok = $parent->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		$start -= 1;
+		return $parent->Execute("insert into $seqname values($start)");
+	}
+
+	function SetTransactionMode($transaction_mode)
+	{
+		$parent = $this->pdoDriver;
+		$parent->_transmode = strtoupper($transaction_mode);
+	}
+
+	function BeginTrans()
+	{
+		$parent = $this->pdoDriver;
+		if ($parent->transOff) return true;
+		$parent->transCnt += 1;
+		$parent->_autocommit = false;
+		return $parent->Execute("BEGIN {$parent->_transmode}");
+	}
+
+	function CommitTrans($ok=true)
+	{
+		$parent = $this->pdoDriver;
+		if ($parent->transOff) return true;
+		if (!$ok) return $parent->RollbackTrans();
+		if ($parent->transCnt) $parent->transCnt -= 1;
+		$parent->_autocommit = true;
+
+		$ret = $parent->Execute('COMMIT');
+		return $ret;
+	}
+
+	function RollbackTrans()
+	{
+		$parent = $this->pdoDriver;
+		if ($parent->transOff) return true;
+		if ($parent->transCnt) $parent->transCnt -= 1;
+		$parent->_autocommit = true;
+
+		$ret = $parent->Execute('ROLLBACK');
+		return $ret;
+	}
+
+
+    // mark newnham
+	function MetaColumns($tab,$normalize=true)
+	{
+	  global $ADODB_FETCH_MODE;
+
+	  $parent = $this->pdoDriver;
+	  $false = false;
+	  $save = $ADODB_FETCH_MODE;
+	  $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	  if ($parent->fetchMode !== false) $savem = $parent->SetFetchMode(false);
+	  $rs = $parent->Execute("PRAGMA table_info('$tab')");
+	  if (isset($savem)) $parent->SetFetchMode($savem);
+	  if (!$rs) {
+	    $ADODB_FETCH_MODE = $save;
+	    return $false;
+	  }
+	  $arr = array();
+	  while ($r = $rs->FetchRow()) {
+	    $type = explode('(',$r['type']);
+	    $size = '';
+	    if (sizeof($type)==2)
+	    $size = trim($type[1],')');
+	    $fn = strtoupper($r['name']);
+	    $fld = new ADOFieldObject;
+	    $fld->name = $r['name'];
+	    $fld->type = $type[0];
+	    $fld->max_length = $size;
+	    $fld->not_null = $r['notnull'];
+	    $fld->primary_key = $r['pk'];
+	    $fld->default_value = $r['dflt_value'];
+	    $fld->scale = 0;
+	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;
+	    else $arr[strtoupper($fld->name)] = $fld;
+	  }
+	  $rs->Close();
+	  $ADODB_FETCH_MODE = $save;
+	  return $arr;
+	}
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
+		$parent = $this->pdoDriver;
+
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(strtoupper($mask));
+			$this->metaTablesSQL .= " AND name LIKE $mask";
+		}
+
+		$ret = $parent->GetCol($this->metaTablesSQL);
+
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+   }
+}
diff --git a/adodb/drivers/adodb-pdo_sqlsrv.inc.php b/adodb/drivers/adodb-pdo_sqlsrv.inc.php
new file mode 100644
index 0000000..ed73f3a
--- /dev/null
+++ b/adodb/drivers/adodb-pdo_sqlsrv.inc.php
@@ -0,0 +1,181 @@
+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)
+	{
+		return false;
+	}
+
+	function MetaTables($ttype = false, $showSchema = false, $mask = false)
+	{
+		return false;
+	}
+
+	function SelectLimit($sql, $nrows = -1, $offset = -1, $inputarr = false, $secs2cache = 0)
+	{
+		$ret = ADOConnection::SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
+		return $ret;
+	}
+
+	function ServerInfo()
+	{
+		return ADOConnection::ServerInfo();
+	}
+}
+
+class ADORecordSet_pdo_sqlsrv extends ADORecordSet_pdo
+{
+
+	public $databaseType = "pdo_sqlsrv";
+
+	/**
+	 * returns the field object
+	 *
+	 * @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;
+	}
+}
+
+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/adodb/drivers/adodb-postgres.inc.php b/adodb/drivers/adodb-postgres.inc.php
index 42535db..070ac1c 100644
--- a/adodb/drivers/adodb-postgres.inc.php
+++ b/adodb/drivers/adodb-postgres.inc.php
@@ -1,14 +1,25 @@
 
\ No newline at end of file
+/**
+ * ADOdb PostgreSQL driver
+ *
+ * NOTE: Since ADOdb 3.31, this file is no longer used, and the "postgres"
+ * driver is remapped to the latest available postgres version. Maintaining
+ * multiple postgres drivers is no easy job, so hopefully this will ensure
+ * greater consistency and fewer bugs.
+ *
+ * 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
+ */
diff --git a/adodb/drivers/adodb-postgres64.inc.php b/adodb/drivers/adodb-postgres64.inc.php
index 9ca6e77..9128467 100644
--- a/adodb/drivers/adodb-postgres64.inc.php
+++ b/adodb/drivers/adodb-postgres64.inc.php
@@ -1,46 +1,23 @@
 
-					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();
@@ -50,7 +27,7 @@ function adodb_addslashes($s)
 	$len = strlen($s);
 	if ($len == 0) return "''";
 	if (strncmp($s,"'",1) === 0 && substr($s,$len-1) == "'") return $s; // already quoted
-	
+
 	return "'".addslashes($s)."'";
 }
 
@@ -59,38 +36,41 @@ class ADODB_postgres64 extends ADOConnection{
 	var $dataProvider = 'postgres';
 	var $hasInsertID = true;
 	var $_resultid = false;
-  	var $concat_operator='||';
+	var $concat_operator='||';
 	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
-    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
-	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
+	var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
+		and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
+			'sql_packages', 'sql_sizing', 'sql_sizing_profiles')
+	union
+		select viewname,'V' from pg_views where viewname not like 'pg\_%'";
 	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
 	var $isoDates = true; // accepts dates in ISO format
 	var $sysDate = "CURRENT_DATE";
 	var $sysTimeStamp = "CURRENT_TIMESTAMP";
 	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-		FROM pg_class c, pg_attribute a,pg_type t 
+	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum
+		FROM pg_class c, pg_attribute a,pg_type t
 		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
-AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+		AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
 
 	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
-	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
+		FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
+		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
+		and c.relnamespace=n.oid and n.nspname='%s'
+		and a.attname not like '....%%' AND a.attnum > 0
+		AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+
 	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
-	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key
+		FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a
+		WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid
+		AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum)
+		AND a.attrelid = bc.oid AND bc.relname = '%s'";
+
 	var $hasAffectedRows = true;
 	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
+	// below suggested by Freek Dijkstra
 	var $true = 'TRUE';		// string that represents TRUE for a database
 	var $false = 'FALSE';		// string that represents FALSE for a database
 	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
@@ -104,161 +84,196 @@ class ADODB_postgres64 extends ADOConnection{
 	var $random = 'random()';		/// random function
 	var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
 							// http://bugs.php.net/bug.php?id=25404
-							
+
+	var $uniqueIisR = true;
 	var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
 	var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
-	
-	// The last (fmtTimeStamp is not entirely correct: 
-	// PostgreSQL also has support for time zones, 
-	// and writes these time in this format: "2001-03-01 18:59:26+02". 
-	// There is no code for the "+02" time zone information, so I just left that out. 
-	// I'm not familiar enough with both ADODB as well as Postgres 
+
+	/** @var int $_pnum Number of the last assigned query parameter {@see param()} */
+	var $_pnum = 0;
+
+	// The last (fmtTimeStamp is not entirely correct:
+	// PostgreSQL also has support for time zones,
+	// and writes these time in this format: "2001-03-01 18:59:26+02".
+	// There is no code for the "+02" time zone information, so I just left that out.
+	// I'm not familiar enough with both ADODB as well as Postgres
 	// to know what the concequences are. The other values are correct (wheren't in 0.94)
-	// -- Freek Dijkstra 
+	// -- Freek Dijkstra
 
-	function ADODB_postgres64() 
+	/**
+	 * 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]
-	}
-	
-	function ServerInfo()
-	{
-		if (isset($this->version)) return $this->version;
-		
-		$arr['description'] = $this->GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		$this->version = $arr;
-		return $arr;
+		if (empty($this->version['version'])) {
+			// We don't have a connection, so we can't retrieve server info
+			if (!$this->_connectionID) {
+				return false;
+			}
+
+			$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()');
+		}
+
+		return $this->version;
 	}
 
-	function IfNull( $field, $ifNull ) 
+	function IfNull( $field, $ifNull )
 	{
-		return " coalesce($field, $ifNull) "; 
+		return " coalesce($field, $ifNull) ";
 	}
 
 	// get the last id - never tested
 	function pg_insert_id($tablename,$fieldname)
 	{
-		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
+		$result=pg_query($this->_connectionID, 'SELECT last_value FROM '. $tablename .'_'. $fieldname .'_seq');
 		if ($result) {
 			$arr = @pg_fetch_row($result,0);
-			pg_freeresult($result);
+			pg_free_result($result);
 			if (isset($arr[0])) return $arr[0];
 		}
 		return false;
 	}
-	
-/* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
-Using a OID as a unique identifier is not generally wise. 
-Unless you are very careful, you might end up with a tuple having 
-a different OID if a database must be reloaded. */
-	function _insertid($table,$column)
+
+	/**
+	 * Warning from http://www.php.net/manual/function.pg-getlastoid.php:
+	 * Using a OID as a unique identifier is not generally wise.
+	 * Unless you are very careful, you might end up with a tuple having
+	 * a different OID if a database must be reloaded.
+	 *
+	 * @inheritDoc
+	 */
+	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);
 	}
 
-// I get this error with PHP before 4.0.6 - jlim
-// Warning: This compilation does not support pg_cmdtuples() in adodb-postgres.inc.php on line 44
-   function _affectedrows()
-   {
-   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-	   	return pg_cmdtuples($this->_resultid);
-   }
-   
-	
-		// returns true/false
+	function _affectedrows()
+	{
+		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
+		return pg_affected_rows($this->_resultid);
+	}
+
+
+	/**
+	 * @return true/false
+	 */
 	function BeginTrans()
 	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
+		return pg_query($this->_connectionID, 'begin '.$this->_transmode);
 	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore') 
+
+	function RowLock($tables,$where,$col='1 as adodbignore')
 	{
 		if (!$this->transCnt) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
+		return $this->GetOne("select $col from $tables where $where for update");
 	}
 
-	// returns true/false. 
-	function CommitTrans($ok=true) 
-	{ 
+	// returns true/false.
+	function CommitTrans($ok=true)
+	{
 		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
-		
+
 		$this->transCnt -= 1;
-		return @pg_Exec($this->_connectionID, "commit");
+		return pg_query($this->_connectionID, 'commit');
 	}
-	
+
 	// returns true/false
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
 		$this->transCnt -= 1;
-		return @pg_Exec($this->_connectionID, "rollback");
+		return pg_query($this->_connectionID, 'rollback');
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$info = $this->ServerInfo();
 		if ($info['version'] >= 7.3) {
-	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
+		$this->metaTablesSQL = "
+			select table_name,'T' from information_schema.tables where table_schema not in ( 'pg_catalog','information_schema')
+			union
+			select table_name,'V' from information_schema.views where table_schema not in ( 'pg_catalog','information_schema') ";
 		}
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtolower($mask));
 			if ($info['version']>=7.3)
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
-select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
+					select table_name,'T' from information_schema.tables where table_name like $mask and table_schema not in ( 'pg_catalog','information_schema')
+					union
+					select table_name,'V' from information_schema.views where table_name like $mask and table_schema not in ( 'pg_catalog','information_schema') ";
 			else
 				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
-select viewname,'V' from pg_views where viewname like $mask";
+					select tablename,'T' from pg_tables where tablename like $mask
+					union
+					select viewname,'V' from pg_views where viewname like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+
 		if ($mask) {
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
-	
-	
-	// if magic quotes disabled, use pg_escape_string()
-	function qstr($s,$magic_quotes=false)
+
+
+	/**
+	 * 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 (!$magic_quotes) {
-			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';
+		}
+
+		if ($this->_connectionID) {
+			return "'" . pg_escape_string($this->_connectionID, $s) . "'";
+		} else {
+			return "'" . pg_escape_string($s) . "'";
 		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
 	}
-	
-	
-	
+
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'TO_CHAR('.$col.",'";
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
@@ -271,11 +286,11 @@ function SQLDate($fmt, $col=false)
 			case 'q':
 				$s .= 'Q';
 				break;
-				
+
 			case 'M':
 				$s .= 'Mon';
 				break;
-				
+
 			case 'm':
 				$s .= 'MM';
 				break;
@@ -283,37 +298,37 @@ function SQLDate($fmt, $col=false)
 			case 'd':
 				$s .= 'DD';
 				break;
-			
+
 			case 'H':
 				$s.= 'HH24';
 				break;
-				
+
 			case 'h':
 				$s .= 'HH';
 				break;
-				
+
 			case 'i':
 				$s .= 'MI';
 				break;
-			
+
 			case 's':
 				$s .= 'SS';
 				break;
-			
+
 			case 'a':
 			case 'A':
 				$s .= 'AM';
 				break;
-				
+
 			case 'w':
 				$s .= 'D';
 				break;
-			
+
 			case 'l':
 				$s .= 'DAY';
 				break;
-			
-			 case 'W':
+
+			case 'W':
 				$s .= 'WW';
 				break;
 
@@ -325,44 +340,44 @@ function SQLDate($fmt, $col=false)
 				}
 				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
 				else $s .= '"'.$ch.'"';
-				
+
 			}
 		}
 		return $s. "')";
 	}
-	
-	
-	
-	/* 
-	* Load a Large Object from a file 
-	* - the procedure stores the object id in the table and imports the object using 
-	* postgres proprietary blob handling routines 
+
+
+
+	/*
+	* Load a Large Object from a file
+	* - the procedure stores the object id in the table and imports the object using
+	* postgres proprietary blob handling routines
 	*
 	* contributed by Mattia Rossi mattia@technologist.com
 	* modified for safe mode by juraj chlebec
-	*/ 
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		pg_exec ($this->_connectionID, "begin"); 
-		
+	*/
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	{
+		pg_query($this->_connectionID, 'begin');
+
 		$fd = fopen($path,'r');
 		$contents = fread($fd,filesize($path));
 		fclose($fd);
-		
+
 		$oid = pg_lo_create($this->_connectionID);
 		$handle = pg_lo_open($this->_connectionID, $oid, 'w');
 		pg_lo_write($handle, $contents);
 		pg_lo_close($handle);
-		
-		// $oid = pg_lo_import ($path); 
-		pg_exec($this->_connectionID, "commit"); 
-		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
-		$rez = !empty($rs); 
-		return $rez; 
-	} 
-	
+
+		// $oid = pg_lo_import ($path);
+		pg_query($this->_connectionID, 'commit');
+		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype);
+		$rez = !empty($rs);
+		return $rez;
+	}
+
 	/*
-	* Deletes/Unlinks a Blob from the database, otherwise it 
+	* Deletes/Unlinks a Blob from the database, otherwise it
 	* will be left behind
 	*
 	* Returns TRUE on success or FALSE on failure.
@@ -371,22 +386,22 @@ function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
 	*/
 	function BlobDelete( $blob )
 	{
-		pg_exec ($this->_connectionID, "begin");
+		pg_query($this->_connectionID, 'begin');
 		$result = @pg_lo_unlink($blob);
-		pg_exec ($this->_connectionID, "commit");
+		pg_query($this->_connectionID, 'commit');
 		return( $result );
 	}
 
 	/*
-		Hueristic - not guaranteed to work.
+		Heuristic - not guaranteed to work.
 	*/
 	function GuessOID($oid)
 	{
 		if (strlen($oid)>16) return false;
 		return is_numeric($oid);
 	}
-	
-	/* 
+
+	/*
 	* If an OID is detected, then we use pg_lo_* to open the oid file and read the
 	* real blob from the db using the oid supplied as a parameter. If you are storing
 	* blobs using bytea, we autodetect and process it so this function is not needed.
@@ -397,105 +412,118 @@ function GuessOID($oid)
 	*
 	* Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
 	* added maxsize parameter, which defaults to $db->maxblobsize if not defined.
-	*/ 
-	function BlobDecode($blob,$maxsize=false,$hastrans=true) 
+	*/
+	function BlobDecode($blob,$maxsize=false,$hastrans=true)
 	{
 		if (!$this->GuessOID($blob)) return $blob;
-		
-		if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
-		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
+
+		if ($hastrans) pg_query($this->_connectionID,'begin');
+		$fd = @pg_lo_open($this->_connectionID,$blob,'r');
 		if ($fd === false) {
-			if ($hastrans) @pg_exec($this->_connectionID,"commit");
+			if ($hastrans) pg_query($this->_connectionID,'commit');
 			return $blob;
 		}
 		if (!$maxsize) $maxsize = $this->maxblobsize;
-		$realblob = @pg_loread($fd,$maxsize); 
-		@pg_loclose($fd); 
-		if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
+		$realblob = @pg_lo_read($fd,$maxsize);
+		@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 >= 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
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
-	
 		if ($blobtype == 'CLOB') {
-    		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
+			return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
 		}
 		// do not use bind params which uses qstr(), as blobencode() already quotes data
 		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
 	}
-	
+
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
 		else if (strncmp($date,"'",1) == 0) {
 			$len = strlen($date);
 			if (10 <= $len && $len <= 12) $date = 'date '.$date;
 			else $date = 'timestamp '.$date;
 		}
-		return "($date+interval'$dayFraction days')";
+
+
+		return "($date+interval'".($dayFraction * 1440)." minutes')";
+		#return "($date+interval'$dayFraction days')";
+	}
+
+	/**
+	 * Generate the SQL to retrieve MetaColumns data
+	 * @param string $table Table name
+	 * @param string $schema Schema name (can be blank)
+	 * @return string SQL statement to execute
+	 */
+	protected function _generateMetaColumnsSQL($table, $schema)
+	{
+		if ($schema) {
+			return sprintf($this->metaColumnsSQL1, $table, $table, $schema);
+		}
+		else {
+			return sprintf($this->metaColumnsSQL, $table, $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
-	function &MetaColumns($table,$normalize=true) 
+	// see PHPLens Issue No: 14018 for more info
+	function MetaColumns($table,$normalize=true)
 	{
-	global $ADODB_FETCH_MODE;
-	
+		global $ADODB_FETCH_MODE;
+
 		$schema = false;
 		$false = false;
 		$this->_findschema($table,$schema);
-		
+
 		if ($normalize) $table = strtolower($table);
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		if ($schema) $rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+
+		$rs = $this->Execute($this->_generateMetaColumnsSQL($table, $schema));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if ($rs === false) {
 			return $false;
 		}
 		if (!empty($this->metaKeySQL)) {
 			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
+			// Of course, a modified version of the metaColumnsSQL query using a
+			// LEFT JOIN would have been much more elegant, but postgres does
 			// not support OUTER JOINS. So here is the clumsy way.
-			
+
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
+
 			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
 			// fetch all result in once for performance.
-			$keys =& $rskey->GetArray();
+			$keys = $rskey->GetArray();
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			$rskey->Close();
 			unset($rskey);
 		}
@@ -507,7 +535,7 @@ function &MetaColumns($table,$normalize=true)
 			$rsdef = $this->Execute($sql);
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-			
+
 			if ($rsdef) {
 				while (!$rsdef->EOF) {
 					$num = $rsdef->fields['num'];
@@ -525,15 +553,15 @@ function &MetaColumns($table,$normalize=true)
 			}
 			unset($rsdef);
 		}
-	
+
 		$retarr = array();
-		while (!$rs->EOF) { 	
+		while (!$rs->EOF) {
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
 			$fld->attnum = $rs->fields[6];
-			
+
 			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
 			if ($fld->max_length <= 0) $fld->max_length = -1;
 			if ($fld->type == 'numeric') {
@@ -549,93 +577,110 @@ function &MetaColumns($table,$normalize=true)
 
 			//Freek
 			$fld->not_null = $rs->fields[4] == 't';
-			
-			
+
+
 			// Freek
 			if (is_array($keys)) {
 				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't') 
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't')
 						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't') 
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't')
 						$fld->unique = true; // What name is more compatible?
 				}
 			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
 			return  $false;
 		else
-			return $retarr;	
-		
+			return $retarr;
+
 	}
 
-	  function &MetaIndexes ($table, $primary = FALSE)
-      {
-         global $ADODB_FETCH_MODE;
-                
-				$schema = false;
-				$this->_findschema($table,$schema);
-
-				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
-					$sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
-FROM pg_catalog.pg_class c 
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-	,pg_namespace n 
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\'';
-				} else {
-	                $sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
-FROM pg_catalog.pg_class c
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
-    			}
-				            
-                if ($primary == FALSE) {
-                	$sql .= ' AND i.indisprimary=false;';
-                }
-                
-                $save = $ADODB_FETCH_MODE;
-                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                if ($this->fetchMode !== FALSE) {
-                        $savem = $this->SetFetchMode(FALSE);
-                }
-                
-                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
-                if (isset($savem)) {
-                        $this->SetFetchMode($savem);
-                }
-                $ADODB_FETCH_MODE = $save;
-
-                if (!is_object($rs)) {
-                	$false = false;
-					return $false;
-                }
-				
-                $col_names = $this->MetaColumnNames($table,true,true); 
-				//3rd param is use attnum, 
-				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
-                $indexes = array();
-                while ($row = $rs->FetchRow()) {
-                        $columns = array();
-                        foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col];
-                        }
-                        
-                        $indexes[$row[0]] = array(
-                                'unique' => ($row[1] == 't'),
-                                'columns' => $columns
-                        );
-                }
-                return $indexes;
-        }
+	function param($name, $type='C')
+	{
+		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;
+	}
+
+	function MetaIndexes ($table, $primary = FALSE, $owner = false)
+	{
+		global $ADODB_FETCH_MODE;
+
+		$schema = false;
+		$this->_findschema($table,$schema);
+
+		if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
+			$sql = '
+				SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+				FROM pg_catalog.pg_class c
+				JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+				JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+					,pg_namespace n
+				WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))
+				and c.relnamespace=c2.relnamespace
+				and c.relnamespace=n.oid
+				and n.nspname=\'%s\'';
+		} else {
+			$sql = '
+				SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+				FROM pg_catalog.pg_class c
+				JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+				JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+				WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
+		}
+
+		if ($primary == FALSE) {
+			$sql .= ' AND i.indisprimary=false;';
+		}
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
+
+		$rs = $this->Execute(sprintf($sql,$table,$table,$schema));
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+
+		if (!is_object($rs)) {
+			$false = false;
+			return $false;
+		}
+
+		$col_names = $this->MetaColumnNames($table,true,true);
+		// 3rd param is use attnum,
+		// see https://sourceforge.net/p/adodb/bugs/45/
+		$indexes = array();
+		while ($row = $rs->FetchRow()) {
+			$columns = array();
+			foreach (explode(' ', $row[2]) as $col) {
+				$columns[] = $col_names[$col];
+			}
+
+			$indexes[$row[0]] = array(
+				'unique' => ($row[1] == 't'),
+				'columns' => $columns
+			);
+		}
+		return $indexes;
+	}
 
 	// returns true or false
 	//
@@ -644,53 +689,70 @@ function &MetaIndexes ($table, $primary = FALSE)
 	// 	$db->Connect('host1','user1','secret');
 	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
 	{
-		
 		if (!function_exists('pg_connect')) return null;
-		
+
 		$this->_errorMsg = false;
-		
+
 		if ($user || $pwd || $db) {
 			$user = adodb_addslashes($user);
 			$pwd = adodb_addslashes($pwd);
 			if (strlen($db) == 0) $db = 'template1';
 			$db = adodb_addslashes($db);
-		   	if ($str)  {
-			 	$host = split(":", $str);
+			if ($str)  {
+				$host = explode(":", $str);
 				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
 				else $str = '';
 				if (isset($host[1])) $str .= " port=$host[1]";
 				else if (!empty($this->port)) $str .= " port=".$this->port;
 			}
-		   		if ($user) $str .= " user=".$user;
-		   		if ($pwd)  $str .= " password=".$pwd;
-				if ($db)   $str .= " dbname=".$db;
+			if ($user) $str .= " user=".$user;
+			if ($pwd)  $str .= " password=".$pwd;
+			if ($db)   $str .= " dbname=".$db;
 		}
 
 		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
-		
+
 		if ($ctype === 1) { // persistent
 			$this->_connectionID = pg_pconnect($str);
 		} else {
 			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
-			static $ncnt;
-			
+				static $ncnt;
+
 				if (empty($ncnt)) $ncnt = 1;
 				else $ncnt += 1;
-				
+
 				$str .= str_repeat(' ',$ncnt);
 			}
 			$this->_connectionID = pg_connect($str);
 		}
 		if ($this->_connectionID === false) return false;
 		$this->Execute("set datestyle='ISO'");
+
+		$info = $this->ServerInfo(false);
+
+		if (version_compare($info['version'], '7.1', '>=')) {
+			$this->_nestedSQL = true;
+		}
+
+		# PostgreSQL 9.0 changed the default output for bytea from 'escape' to 'hex'
+		# PHP does not handle 'hex' properly ('x74657374' is returned as 't657374')
+		# https://bugs.php.net/bug.php?id=59831 states this is in fact not a bug,
+		# so we manually set bytea_output
+		if (!empty($this->connection->noBlobs)
+			&& version_compare($info['version'], '9.0', '>=')
+			&& version_compare($info['client'], '9.2', '<')
+		) {
+			$this->Execute('set bytea_output=escape');
+		}
+
 		return true;
 	}
-	
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
 	{
-	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
 	}
-	 
+
 	// returns true or false
 	//
 	// examples:
@@ -700,28 +762,26 @@ function _pconnect($str,$user='',$pwd='',$db='')
 	{
 		return $this->_connect($str,$user,$pwd,$db,1);
 	}
-	
+
 
 	// returns queryID or false
-	function _query($sql,$inputarr)
+	function _query($sql,$inputarr=false)
 	{
+		$this->_pnum = 0;
 		$this->_errorMsg = false;
 		if ($inputarr) {
 		/*
 			It appears that PREPARE/EXECUTE is slower for many queries.
-			
+
 			For query executed 1000 times:
-			"select id,firstname,lastname from adoxyz 
+			"select id,firstname,lastname from adoxyz
 				where firstname not like ? and lastname not like ? and id = ?"
-				
+
 			with plan = 1.51861286163 secs
 			no plan =   1.26903700829 secs
-
-			
-
 		*/
 			$plan = 'P'.md5($sql);
-				
+
 			$execp = '';
 			foreach($inputarr as $v) {
 				if ($execp) $execp .= ',';
@@ -731,12 +791,12 @@ function _query($sql,$inputarr)
 					$execp .= $v;
 				}
 			}
-			
+
 			if ($execp) $exsql = "EXECUTE $plan ($execp)";
 			else $exsql = "EXECUTE $plan";
-			
-			
-			$rez = @pg_exec($this->_connectionID,$exsql);
+
+
+			$rez = @pg_execute($this->_connectionID,$exsql);
 			if (!$rez) {
 			# Perhaps plan does not exist? Prepare/compile plan.
 				$params = '';
@@ -758,62 +818,65 @@ function _query($sql,$inputarr)
 					$sql .= $v.' $'.$i;
 					$i++;
 				}
-				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
+				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);
 				//adodb_pr($s);
-				pg_exec($this->_connectionID,$s);
+				$rez = pg_execute($this->_connectionID,$s);
 				//echo $this->ErrorMsg();
 			}
-			
-			$rez = pg_exec($this->_connectionID,$exsql);
+			if ($rez)
+				$rez = pg_execute($this->_connectionID,$exsql);
 		} else {
 			//adodb_backtrace();
-			$rez = pg_exec($this->_connectionID,$sql);
+			$rez = pg_query($this->_connectionID,$sql);
 		}
 		// check if no data returned, then no need to create real recordset
-		if ($rez && pg_numfields($rez) <= 0) {
+		if ($rez && pg_num_fields($rez) <= 0) {
 			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
-				pg_freeresult($this->_resultid);
+				pg_free_result($this->_resultid);
 			}
 			$this->_resultid = $rez;
 			return true;
 		}
-		
+
 		return $rez;
 	}
-	
+
 	function _errconnect()
 	{
 		if (defined('DB_ERROR_CONNECT_FAILED')) return DB_ERROR_CONNECT_FAILED;
 		else return 'Database connection failed';
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-		if (ADODB_PHPVER >= 0x4300) {
-			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;
 	}
-	
+
 	function ErrorNo()
 	{
 		$e = $this->ErrorMsg();
 		if (strlen($e)) {
 			return ADOConnection::MetaError($e);
-		 }
-		 return 0;
+		}
+		return 0;
 	}
 
 	// returns true or false
@@ -821,15 +884,15 @@ function _close()
 	{
 		if ($this->transCnt) $this->RollbackTrans();
 		if ($this->_resultid) {
-			@pg_freeresult($this->_resultid);
+			@pg_free_result($this->_resultid);
 			$this->_resultid = false;
 		}
 		@pg_close($this->_connectionID);
 		$this->_connectionID = false;
 		return true;
 	}
-	
-	
+
+
 	/*
 	* Maximum size of C field
 	*/
@@ -837,7 +900,7 @@ function CharMax()
 	{
 		return 1000000000;  // should be 1 Gb?
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
@@ -845,21 +908,22 @@ function TextMax()
 	{
 		return 1000000000; // should be 1 Gb?
 	}
-	
-		
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
+	Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 class ADORecordSet_postgres64 extends ADORecordSet{
 	var $_blobArr;
 	var $databaseType = "postgres64";
 	var $canSeek = true;
-	function ADORecordSet_postgres64($queryID,$mode=false) 
+
+	function __construct($queryID, $mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -867,44 +931,49 @@ function ADORecordSet_postgres64($queryID,$mode=false)
 		{
 		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
 		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
+
 		case ADODB_FETCH_DEFAULT:
 		case ADODB_FETCH_BOTH:
 		default: $this->fetchMode = PGSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
+
+		// Parent's constructor
+		parent::__construct($queryID);
 	}
-	
-	function &GetRowAssoc($upper=true)
+
+	function GetRowAssoc($upper = ADODB_ASSOC_CASE)
 	{
-		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
-		$row =& ADORecordSet::GetRowAssoc($upper);
+		if ($this->fetchMode == PGSQL_ASSOC && $upper == ADODB_ASSOC_CASE_LOWER) {
+			return $this->fields;
+		}
+		$row = ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
 
-	function _initrs()
+	function _initRS()
 	{
-	global $ADODB_COUNTRECS;
+		global $ADODB_COUNTRECS;
 		$qid = $this->_queryID;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
-		$this->_numOfFields = @pg_numfields($qid);
-		
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_num_rows($qid):-1;
+		$this->_numOfFields = @pg_num_fields($qid);
+
 		// cache types for blob decode check
-		// apparently pg_fieldtype actually performs an sql query on the database to get the type.
+		// apparently pg_field_type actually performs an sql query on the database to get the type.
 		if (empty($this->connection->noBlobs))
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
-			if (pg_fieldtype($qid,$i) == 'bytea') {
-				$this->_blobArr[$i] = pg_fieldname($qid,$i);
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
+			if (pg_field_type($qid,$i) == 'bytea') {
+				$this->_blobArr[$i] = pg_field_name($qid,$i);
 			}
 		}
 	}
 
-		/* 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();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -912,31 +981,32 @@ function Fields($colname)
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
+		return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
-	function &FetchField($off = 0) 
+	function fetchField($fieldOffset = 0)
 	{
 		// offsets begin at 0
-		
-		$o= new ADOFieldObject();
-		$o->name = @pg_fieldname($this->_queryID,$off);
-		$o->type = @pg_fieldtype($this->_queryID,$off);
-		$o->max_length = @pg_fieldsize($this->_queryID,$off);
-		return $o;	
+
+		$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;
 	}
 
 	function _seek($row)
 	{
 		return @pg_fetch_row($this->_queryID,$row);
 	}
-	
+
 	function _decode($blob)
 	{
-		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
-		return $realblob;	
+		if ($blob === NULL) return NULL;
+//		eval('$realblob="'.str_replace(array('"','$'),array('\"','\$'),$blob).'";');
+		return pg_unescape_bytea($blob);
 	}
-	
+
 	function _fixblobs()
 	{
 		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
@@ -950,9 +1020,9 @@ function _fixblobs()
 			}
 		}
 	}
-	
+
 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
@@ -967,24 +1037,29 @@ function MoveNext()
 			$this->EOF = true;
 		}
 		return false;
-	}		
-	
+	}
+
 	function _fetch()
 	{
-				
+
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
+			return false;
 
 		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
+
 		if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-			
+
 		return (is_array($this->fields));
 	}
 
-	function _close() 
-	{ 
-		return @pg_freeresult($this->_queryID);
+	function _close()
+	{
+		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)
@@ -1001,54 +1076,54 @@ function MetaType($t,$len=-1,$fieldobj=false)
 				case 'CHARACTER':
 				case 'VARCHAR':
 				case 'NAME':
-		   		case 'BPCHAR':
+				case 'BPCHAR':
 				case '_VARCHAR':
+				case 'CIDR':
 				case 'INET':
 				case 'MACADDR':
 					if ($len <= $this->blobSize) return 'C';
-				
+
 				case 'TEXT':
 					return 'X';
-		
+
 				case 'IMAGE': // user defined type
 				case 'BLOB': // user defined type
 				case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
 				case 'VARBIT':
 				case 'BYTEA':
 					return 'B';
-				
+
 				case 'BOOL':
 				case 'BOOLEAN':
 					return 'L';
-				
+
 				case 'DATE':
 					return 'D';
-				
-				
+
+
 				case 'TIMESTAMP WITHOUT TIME ZONE':
 				case 'TIME':
 				case 'DATETIME':
 				case 'TIMESTAMP':
 				case 'TIMESTAMPTZ':
 					return 'T';
-				
-				case 'SMALLINT': 
-				case 'BIGINT': 
-				case 'INTEGER': 
-				case 'INT8': 
+
+				case 'SMALLINT':
+				case 'BIGINT':
+				case 'INTEGER':
+				case 'INT8':
 				case 'INT4':
 				case 'INT2':
 					if (isset($fieldobj) &&
-				empty($fieldobj->primary_key) && empty($fieldobj->unique)) return 'I';
-				
+				empty($fieldobj->primary_key) && (!$this->connection->uniqueIisR || empty($fieldobj->unique))) return 'I';
+
 				case 'OID':
 				case 'SERIAL':
 					return 'R';
-				
-				 default:
-				 	return 'N';
+
+				default:
+					return ADODB_DEFAULT_METATYPE;
 			}
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-postgres7.inc.php b/adodb/drivers/adodb-postgres7.inc.php
index 6856a66..59174f6 100644
--- a/adodb/drivers/adodb-postgres7.inc.php
+++ b/adodb/drivers/adodb-postgres7.inc.php
@@ -1,15 +1,23 @@
  0
+			AND a.attrelid = c.oid
+		ORDER BY
+			a.attnum";
+
+	// used when schema defined
+	var $metaColumnsSQL1 = "
+		SELECT
+			a.attname,
+			CASE
+				WHEN x.sequence_name != ''
+				THEN 'SERIAL'
+				ELSE t.typname
+			END AS typname,
+			a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
+		FROM
+			pg_class c,
+			pg_namespace n,
+			pg_attribute a
+		JOIN pg_type t ON a.atttypid = t.oid
+		LEFT JOIN (
+			SELECT
+				c.relname as sequence_name,
+				c1.relname as related_table,
+				a.attname as related_column
+			FROM pg_class c
+			JOIN pg_depend d ON d.objid = c.oid
+			LEFT JOIN pg_class c1 ON d.refobjid = c1.oid
+			LEFT JOIN pg_attribute a ON (d.refobjid, d.refobjsubid) = (a.attrelid, a.attnum)
+			WHERE c.relkind = 'S' AND c1.relname = '%s'
+		) x ON x.related_column= a.attname
+		WHERE
+			c.relkind in ('r','v')
+			AND (c.relname='%s' or c.relname = lower('%s'))
+			AND c.relnamespace=n.oid and n.nspname='%s'
+			AND a.attname not like '....%%'
+			AND a.attnum > 0
+			AND a.atttypid = t.oid
+			AND a.attrelid = c.oid
+		ORDER BY a.attnum";
+
+
+	function __construct()
 	{
-		$this->ADODB_postgres64();
-		if (ADODB_ASSOC_CASE !== 2) {
+		parent::__construct();
+		if (ADODB_ASSOC_CASE !== ADODB_ASSOC_CASE_NATIVE) {
 			$this->rsPrefix .= 'assoc_';
 		}
-		$this->_bindInputArray = PHP_VERSION >= 5.1;
-		
-		$info = $this->ServerInfo();
-		$this->pgVersion = (float) substr($info['version'],0,3);
-		if ($this->pgVersion >= 7.1) { // good till version 999
-			$this->_nestedSQL = true;
-		}
+		$this->_bindInputArray = true;
 	}
 
-	
-	// the following should be compat with postgresql 7.2, 
+
+	// the following should be compat with postgresql 7.2,
 	// which makes obsolete the LIMIT limit,offset syntax
-	 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	 {
-		 $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : '';
-		 $limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
-		 if ($secs2cache)
-		  	$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-		 else
-		  	$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
+		$nrows = (int) $nrows;
+		$offset = (int) $offset;
+		$offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : '';
+		$limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
+		if ($secs2cache)
+			$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		else
+			$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+
 		return $rs;
-	 }
- 	/*
- 	function Prepare($sql)
+	}
+
+	/*
+	function Prepare($sql)
 	{
 		$info = $this->ServerInfo();
 		if ($info['version']>=7.3) {
@@ -60,11 +136,77 @@ function Prepare($sql)
 		}
 		return $sql;
 	}
- 	*/
+	*/
+
+	/**
+	 * Generate the SQL to retrieve MetaColumns data
+	 * @param string $table Table name
+	 * @param string $schema Schema name (can be blank)
+	 * @return string SQL statement to execute
+	 */
+	protected function _generateMetaColumnsSQL($table, $schema)
+	{
+		if ($schema) {
+			return sprintf($this->metaColumnsSQL1, $table, $table, $table, $schema);
+		}
+		else {
+			return sprintf($this->metaColumnsSQL, $table, $table, $schema);
+		}
+	}
+
+	/**
+	 * @returns assoc array where keys are tables, and values are foreign keys
+	 */
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+		# Regex isolates the 2 terms between parenthesis using subexpressions
+		$regex = '^.*\((.*)\).*\((.*)\).*$';
+		$sql="
+			SELECT
+				lookup_table,
+				regexp_replace(consrc, '$regex', '\\2') AS lookup_field,
+				dep_table,
+				regexp_replace(consrc, '$regex', '\\1') AS dep_field
+			FROM (
+				SELECT
+					pg_get_constraintdef(c.oid) AS consrc,
+					t.relname AS dep_table,
+					ft.relname AS lookup_table
+				FROM pg_constraint c
+				JOIN pg_class t ON (t.oid = c.conrelid)
+				JOIN pg_class ft ON (ft.oid = c.confrelid)
+				JOIN pg_namespace nft ON (nft.oid = ft.relnamespace)
+				LEFT JOIN pg_description ds ON (ds.objoid = c.oid)
+				JOIN pg_namespace n ON (n.oid = t.relnamespace)
+				WHERE c.contype = 'f'::\"char\"
+				ORDER BY t.relname, n.nspname, c.conname, c.oid
+				) constraints
+			WHERE
+				dep_table='".strtolower($table)."'
+			ORDER BY
+				lookup_table,
+				dep_table,
+				dep_field";
+		$rs = $this->Execute($sql);
+
+		if (!$rs || $rs->EOF) return false;
+
+		$a = array();
+		while (!$rs->EOF) {
+			if ($upper) {
+				$a[strtoupper($rs->Fields('lookup_table'))][] = strtoupper(str_replace('"','',$rs->Fields('dep_field').'='.$rs->Fields('lookup_field')));
+			} else {
+				$a[$rs->Fields('lookup_table')][] = str_replace('"','',$rs->Fields('dep_field').'='.$rs->Fields('lookup_field'));
+			}
+			$rs->MoveNext();
+		}
 
+		return $a;
+
+	}
 
 	// from  Edward Jaramilla, improved version - works on pg 7.4
-	function MetaForeignKeys($table, $owner=false, $upper=false)
+	function _old_MetaForeignKeys($table, $owner=false, $upper=false)
 	{
 		$sql = 'SELECT t.tgargs as args
 		FROM
@@ -77,32 +219,34 @@ function MetaForeignKeys($table, $owner=false, $upper=false)
 		c.relname = \''.strtolower($table).'\'
 		ORDER BY
 			t.tgrelid';
-		
-		$rs =& $this->Execute($sql);
-		
+
+		$rs = $this->Execute($sql);
+
 		if (!$rs || $rs->EOF) return false;
-		
-		$arr =& $rs->GetArray();
+
+		$arr = $rs->GetArray();
 		$a = array();
 		foreach($arr as $v) {
 			$data = explode(chr(0), $v['args']);
 			$size = count($data)-1; //-1 because the last node is empty
 			for($i = 4; $i < $size; $i++) {
-				if ($upper) 
+				if ($upper)
 					$a[strtoupper($data[2])][] = strtoupper($data[$i].'='.$data[++$i]);
-				else 
+				else
 					$a[$data[2]][] = $data[$i].'='.$data[++$i];
 			}
 		}
 		return $a;
 	}
 
-	function _query($sql,$inputarr)
+	function _query($sql,$inputarr=false)
 	{
 		if (! $this->_bindInputArray) {
 			// We don't have native support for parameterized queries, so let's emulate it at the parent
 			return ADODB_postgres64::_query($sql, $inputarr);
 		}
+
+		$this->_pnum = 0;
 		$this->_errorMsg = false;
 		// -- added Cristiano da Cunha Duarte
 		if ($inputarr) {
@@ -115,76 +259,83 @@ function _query($sql,$inputarr)
 				else $sql .= $v.' $'.$i;
 				$i++;
 			}
-			
+
 			$rez = pg_query_params($this->_connectionID,$sql, $inputarr);
 		} else {
 			$rez = pg_query($this->_connectionID,$sql);
 		}
 		// check if no data returned, then no need to create real recordset
-		if ($rez && pg_numfields($rez) <= 0) {
+		if ($rez && pg_num_fields($rez) <= 0) {
 			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
-				pg_freeresult($this->_resultid);
+				pg_free_result($this->_resultid);
 			}
 			$this->_resultid = $rez;
 			return true;
-		}		
+		}
 		return $rez;
 	}
-	
- 	 // this is a set of functions for managing client encoding - very important if the encodings
-	// of your database and your output target (i.e. HTML) don't match
-	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
-	// 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;
 	}
 
 }
-	
+
 /*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
+	Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
 
 	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_postgres7($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
-	}
-	
-	 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
+
+	// 10% speedup to move MoveNext to child class
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
 			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
 				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
+
 				if (is_array($this->fields)) {
 					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
 					return true;
@@ -194,77 +345,52 @@ function MoveNext()
 			$this->EOF = true;
 		}
 		return false;
-	}		
+	}
 
 }
 
 class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
 
 	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
-	}
-	
+
+
 	function _fetch()
 	{
-		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
+		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0) {
+			return false;
+		}
 
 		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
+
 		if ($this->fields) {
 			if (isset($this->_blobArr)) $this->_fixblobs();
 			$this->_updatefields();
 		}
-			
+
 		return (is_array($this->fields));
 	}
-	
-		// Create associative array
-	function _updatefields()
-	{
-		if (ADODB_ASSOC_CASE == 2) return; // native
-	
-		$arr = array();
-		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
-		foreach($this->fields as $k => $v) {
-			if (is_integer($k)) $arr[$k] = $v;
-			else {
-				if ($lowercase)
-					$arr[strtolower($k)] = $v;
-				else
-					$arr[strtoupper($k)] = $v;
-			}
-		}
-		$this->fields = $arr;
-	}
-	
-	function MoveNext() 
+
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
 			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
 				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
+
 				if (is_array($this->fields)) {
 					if ($this->fields) {
 						if (isset($this->_blobArr)) $this->_fixblobs();
-					
+
 						$this->_updatefields();
 					}
 					return true;
 				}
 			}
-			
-			
+
+
 			$this->fields = false;
 			$this->EOF = true;
 		}
 		return false;
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-postgres8.inc.php b/adodb/drivers/adodb-postgres8.inc.php
index a82fe41..37c2aae 100644
--- a/adodb/drivers/adodb-postgres8.inc.php
+++ b/adodb/drivers/adodb-postgres8.inc.php
@@ -1,12 +1,64 @@
 
\ No newline at end of file
+/**
+ * ADOdb PostgreSQL 8 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();
+
+include_once(ADODB_DIR."/drivers/adodb-postgres7.inc.php");
+
+class ADODB_postgres8 extends ADODB_postgres7
+{
+	var $databaseType = 'postgres8';
+
+	// From PostgreSQL 8.0 onwards, the adsrc column used in earlier versions to
+	// retrieve the default value is obsolete and should not be used (see #562).
+	var $metaDefaultsSQL = "SELECT d.adnum as num, pg_get_expr(d.adbin, d.adrelid) as def
+		FROM pg_attrdef d, pg_class c
+		WHERE d.adrelid=c.oid AND c.relname='%s'
+		ORDER BY d.adnum";
+
+	/**
+	 * Retrieve last inserted ID
+	 * Don't use OIDs, since as per {@link http://php.net/function.pg-last-oid php manual }
+	 * they won't be there in Postgres 8.1
+	 * (and they're not what the application wants back, anyway).
+	 * @param string $table
+	 * @param string $column
+	 * @return int last inserted ID for given table/column, or the most recently
+	 *             returned one if $table or $column are empty
+	 */
+	protected function _insertID($table = '', $column = '')
+	{
+		return empty($table) || empty($column)
+			? $this->GetOne("SELECT lastval()")
+			: $this->GetOne("SELECT currval(pg_get_serial_sequence('$table', '$column'))");
+	}
+}
+
+class ADORecordSet_postgres8 extends ADORecordSet_postgres7
+{
+	var $databaseType = "postgres8";
+}
+
+class ADORecordSet_assoc_postgres8 extends ADORecordSet_assoc_postgres7
+{
+	var $databaseType = "postgres8";
+}
diff --git a/adodb/drivers/adodb-postgres9.inc.php b/adodb/drivers/adodb-postgres9.inc.php
new file mode 100644
index 0000000..fb9c678
--- /dev/null
+++ b/adodb/drivers/adodb-postgres9.inc.php
@@ -0,0 +1,40 @@
+ADORecordset($id,$mode);
-		}
-	};
+	define("_ADODB_PROXY_LAYER", 1 );
+	include_once(ADODB_DIR."/drivers/adodb-csv.inc.php");
+
+class ADODB_proxy extends ADODB_csv {
+	var $databaseType = 'proxy';
+	var $databaseProvider = 'csv';
+}
+
+class ADORecordset_proxy extends ADORecordset_csv {
+	var $databaseType = "proxy";
+}
+
 } // define
-	
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-sapdb.inc.php b/adodb/drivers/adodb-sapdb.inc.php
index ef90d6c..34eb4a5 100644
--- a/adodb/drivers/adodb-sapdb.inc.php
+++ b/adodb/drivers/adodb-sapdb.inc.php
@@ -1,28 +1,35 @@
 curmode = SQL_CUR_USE_ODBC;
-		$this->ADODB_odbc();
-	}
-	
+
 	function ServerInfo()
 	{
 		$info = ADODB_odbc::ServerInfo();
@@ -46,14 +47,14 @@ function ServerInfo()
 		return $info;
 	}
 
-	function MetaPrimaryKeys($table)
+	function MetaPrimaryKeys($table, $owner = false)
 	{
 		$table = $this->Quote(strtoupper($table));
 
 		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
 	}
-		
- 	function &MetaIndexes ($table, $primary = FALSE)
+
+	function MetaIndexes ($table, $primary = FALSE, $owner = false)
 	{
 		$table = $this->Quote(strtoupper($table));
 
@@ -63,45 +64,45 @@ function &MetaIndexes ($table, $primary = FALSE)
 
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return 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;
+
+		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)
+
+	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();
 		foreach($this->GetAll("SELECT COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER BY pos") as $column)
 		{
@@ -130,55 +131,50 @@ function &MetaColumns ($table)
 					}
 				}
 			}
-			$retarr[$fld->name] = $fld;	
+			$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;
 	}
-	
-	function MetaColumnNames($table)
+
+	function MetaColumnNames($table, $numIndexes = false, $useattnum = false)
 	{
 		$table = $this->Quote(strtoupper($table));
 
 		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table ORDER BY pos");
 	}
-	
+
 	// unlike it seems, this depends on the db-session and works in a multiuser environment
-	function _insertid($table,$column)
+	protected function _insertID($table = '', $column = '')
 	{
 		return empty($table) ? False : $this->GetOne("SELECT $table.CURRVAL FROM DUAL");
 	}
 
 	/*
 		SelectLimit implementation problems:
-	
-	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
-	 	which is not ideal...
-		
-	  		select * from table where rowno < 10 order by 1
-	  
-	  	This means that we have to use the adoconnection base class SelectLimit when
-	  	there is an "order by".
-		
+
+		The following will return random 10 rows as order by performed after "WHERE rowno<10"
+		which is not ideal...
+
+			select * from table where rowno < 10 order by 1
+
+		This means that we have to use the adoconnection base class SelectLimit when
+		there is an "order by".
+
 		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
 	 */
-	
+
 };
- 
 
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {	
-	
-	var $databaseType = "sapdb";		
-	
-	function ADORecordSet_sapdb($id,$mode=false)
-	{
-		$this->ADORecordSet_odbc($id,$mode);
-	}
+
+class ADORecordSet_sapdb extends ADORecordSet_odbc {
+
+	var $databaseType = "sapdb";
+
 }
 
 } //define
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-sqlanywhere.inc.php b/adodb/drivers/adodb-sqlanywhere.inc.php
index 813963f..88897af 100644
--- a/adodb/drivers/adodb-sqlanywhere.inc.php
+++ b/adodb/drivers/adodb-sqlanywhere.inc.php
@@ -1,70 +1,45 @@
 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;
-	
-	function ADODB_sqlanywhere()
+ class ADODB_sqlanywhere extends ADODB_odbc
+ {
+	 var $databaseType = "sqlanywhere";
+	 var $hasInsertID = true;
+
+	protected function _insertID($table = '', $column = '')
 	{
-		$this->ADODB_odbc();
+		 return $this->GetOne('select @@identity');
 	}
 
-	 function _insertid() {
-  	   return $this->GetOne('select @@identity');
-	 }
-
   function create_blobvar($blobVarName) {
    $this->Execute("create variable $blobVarName long binary");
    return;
@@ -152,18 +127,12 @@ function UpdateBlob($table,$column,&$val,$where,$blobtype='BLOB')
   }
  }; //class
 
- class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
+ class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {
 
-  var $databaseType = "sqlanywhere";		
-
- function ADORecordSet_sqlanywhere($id,$mode=false)
- {
-  $this->ADORecordSet_odbc($id,$mode);
- }
+  var $databaseType = "sqlanywhere";
 
 
  }; //class
 
 
 } //define
-?>
diff --git a/adodb/drivers/adodb-sqlite.inc.php b/adodb/drivers/adodb-sqlite.inc.php
index 8ff556e..0711f1d 100644
--- a/adodb/drivers/adodb-sqlite.inc.php
+++ b/adodb/drivers/adodb-sqlite.inc.php
@@ -1,49 +1,45 @@
 fmtDate)."'";
-	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
-	}
-  }*/
-	
+
 	function ServerInfo()
 	{
 		$arr['version'] = sqlite_libversion();
@@ -51,130 +47,166 @@ function ServerInfo()
 		$arr['encoding'] = sqlite_libencoding();
 		return $arr;
 	}
-	
+
 	function BeginTrans()
-	{	  
-		 if ($this->transOff) return true; 
-		 $ret = $this->Execute("BEGIN TRANSACTION");
-		 $this->transCnt += 1;
-		 return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
+	{
+		if ($this->transOff) {
+			return true;
+		}
+		$ret = $this->Execute("BEGIN TRANSACTION");
+		$this->transCnt += 1;
+		return true;
+	}
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) {
+			return true;
+		}
+		if (!$ok) {
+			return $this->RollbackTrans();
+		}
 		$ret = $this->Execute("COMMIT");
-		if ($this->transCnt>0)$this->transCnt -= 1;
+		if ($this->transCnt > 0) {
+			$this->transCnt -= 1;
+		}
 		return !empty($ret);
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) {
+			return true;
+		}
 		$ret = $this->Execute("ROLLBACK");
-		if ($this->transCnt>0)$this->transCnt -= 1;
+		if ($this->transCnt > 0) {
+			$this->transCnt -= 1;
+		}
 		return !empty($ret);
 	}
-	
+
 	// mark newnham
-	function &MetaColumns($tab)
+	function MetaColumns($table, $normalize=true)
 	{
-	  global $ADODB_FETCH_MODE;
-	  $false = false;
-	  $save = $ADODB_FETCH_MODE;
-	  $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	  if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-	  $rs = $this->Execute("PRAGMA table_info('$tab')");
-	  if (isset($savem)) $this->SetFetchMode($savem);
-	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
-	    return $false;
-	  }
-	  $arr = array();
-	  while ($r = $rs->FetchRow()) {
-	    $type = explode('(',$r['type']);
-	    $size = '';
-	    if (sizeof($type)==2)
-	    $size = trim($type[1],')');
-	    $fn = strtoupper($r['name']);
-	    $fld = new ADOFieldObject;
-	    $fld->name = $r['name'];
-	    $fld->type = $type[0];
-	    $fld->max_length = $size;
-	    $fld->not_null = $r['notnull'];
-	    $fld->default_value = $r['dflt_value'];
-	    $fld->scale = 0;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
-	    else $arr[strtoupper($fld->name)] = $fld;
-	  }
-	  $rs->Close();
-	  $ADODB_FETCH_MODE = $save;
-	  return $arr;
-	}
-	
+		global $ADODB_FETCH_MODE;
+		$false = false;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		if ($this->fetchMode !== false) {
+			$savem = $this->SetFetchMode(false);
+		}
+		$rs = $this->Execute("PRAGMA table_info('$table')");
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		if (!$rs) {
+			$ADODB_FETCH_MODE = $save;
+			return $false;
+		}
+		$arr = array();
+		while ($r = $rs->FetchRow()) {
+			$type = explode('(',$r['type']);
+			$size = '';
+			if (sizeof($type)==2) {
+				$size = trim($type[1],')');
+			}
+			$fn = strtoupper($r['name']);
+			$fld = new ADOFieldObject;
+			$fld->name = $r['name'];
+			$fld->type = $type[0];
+			$fld->max_length = $size;
+			$fld->not_null = $r['notnull'];
+			$fld->default_value = $r['dflt_value'];
+			$fld->scale = 0;
+			if (isset($r['pk']) && $r['pk']) {
+				$fld->primary_key=1;
+			}
+			if ($save == ADODB_FETCH_NUM) {
+				$arr[] = $fld;
+			} else {
+				$arr[strtoupper($fld->name)] = $fld;
+			}
+		}
+		$rs->Close();
+		$ADODB_FETCH_MODE = $save;
+		return $arr;
+	}
+
 	function _init($parentDriver)
 	{
-	
 		$parentDriver->hasTransactions = false;
 		$parentDriver->hasInsertID = true;
 	}
 
-	function _insertid()
+	protected function _insertID($table = '', $column = '')
 	{
 		return sqlite_last_insert_rowid($this->_connectionID);
 	}
-	
+
 	function _affectedrows()
 	{
-        return sqlite_changes($this->_connectionID);
-    }
-	
-	function ErrorMsg() 
+		return sqlite_changes($this->_connectionID);
+	}
+
+	function ErrorMsg()
  	{
-		if ($this->_logsql) return $this->_errorMsg;
+		if ($this->_logsql) {
+			return $this->_errorMsg;
+		}
 		return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) : '';
 	}
- 
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		return $this->_errorNo;
 	}
-	
+
 	function SQLDate($fmt, $col=false)
 	{
 		$fmt = $this->qstr($fmt);
 		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
 	}
-	
-	
+
+
 	function _createFunctions()
 	{
 		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
 		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
 	}
-	
+
 
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		if (!function_exists('sqlite_open')) return null;
-		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
+		if (!function_exists('sqlite_open')) {
+			return null;
+		}
+		if (empty($argHostname) && $argDatabasename) {
+			$argHostname = $argDatabasename;
+		}
+
 		$this->_connectionID = sqlite_open($argHostname);
-		if ($this->_connectionID === false) return false;
+		if ($this->_connectionID === false) {
+			return false;
+		}
 		$this->_createFunctions();
 		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		if (!function_exists('sqlite_open')) return null;
-		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
+		if (!function_exists('sqlite_open')) {
+			return null;
+		}
+		if (empty($argHostname) && $argDatabasename) {
+			$argHostname = $argDatabasename;
+		}
+
 		$this->_connectionID = sqlite_popen($argHostname);
-		if ($this->_connectionID === false) return false;
+		if ($this->_connectionID === false) {
+			return false;
+		}
 		$this->_createFunctions();
 		return true;
 	}
@@ -186,32 +218,40 @@ function _query($sql,$inputarr=false)
 		if (!$rez) {
 			$this->_errorNo = sqlite_last_error($this->_connectionID);
 		}
-		
+		// If no data was returned, we don't need to create a real recordset
+		// Note: this code is untested, as I don't have a sqlite2 setup available
+		elseif (sqlite_num_fields($rez) == 0) {
+			$rez = true;
+		}
+
 		return $rez;
 	}
-	
-	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;
 		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
 		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
-	  	if ($secs2cache)
-	   		$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-	  	else
-	   		$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-			
+		if ($secs2cache) {
+			$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		} else {
+			$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+		}
+
 		return $rs;
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	var $_genSeqSQL = "create table %s (id integer)";
-	
+
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 		$MAXLOOPS = 100;
@@ -219,14 +259,16 @@ function GenID($seq='adodbseq',$start=1)
 		while (--$MAXLOOPS>=0) {
 			@($num = $this->GetOne("select id from $seq"));
 			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));
 				$start -= 1;
 				$num = '0';
 				$ok = $this->Execute("insert into $seq values($start)");
-				if (!$ok) return false;
-			} 
+				if (!$ok) {
+					return false;
+				}
+			}
 			$this->Execute("update $seq set id=id+1 where id=$num");
-			
+
 			if ($this->affected_rows() > 0) {
 				$num += 1;
 				$this->genID = $num;
@@ -241,76 +283,142 @@ function GenID($seq='adodbseq',$start=1)
 
 	function CreateSequence($seqname='adodbseq',$start=1)
 	{
-		if (empty($this->_genSeqSQL)) return false;
+		if (empty($this->_genSeqSQL)) {
+			return false;
+		}
 		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
+		if (!$ok) {
+			return false;
+		}
 		$start -= 1;
 		return $this->Execute("insert into $seqname values($start)");
 	}
-	
+
 	var $_dropSeqSQL = 'drop table %s';
-	function DropSequence($seqname)
+	function DropSequence($seqname = 'adodbseq')
 	{
-		if (empty($this->_dropSeqSQL)) return false;
+		if (empty($this->_dropSeqSQL)) {
+			return false;
+		}
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
 		return @sqlite_close($this->_connectionID);
 	}
 
-	function &MetaIndexes($table, $primary = FALSE, $owner=false)
+	function MetaIndexes($table, $primary = FALSE, $owner = false)
 	{
 		$false = 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);
-        }
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		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);
-        if (!is_object($rs)) {
-			if (isset($savem)) 
+		$rs = $this->Execute($SQL);
+		if (!is_object($rs)) {
+			if (isset($savem)) {
 				$this->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
+			return $false;
+		}
 
 		$indexes = array ();
 		while ($row = $rs->FetchRow()) {
-			if ($primary && preg_match("/primary/i",$row[1]) == 0) continue;
-            if (!isset($indexes[$row[0]])) {
-
-			$indexes[$row[0]] = array(
-				   'unique' => preg_match("/unique/i",$row[1]),
-				   'columns' => array());
+			if ($primary && preg_match("/primary/i",$row[1]) == 0) {
+				continue;
+			}
+			if (!isset($indexes[$row[0]])) {
+				$indexes[$row[0]] = array(
+					'unique' => preg_match("/unique/i",$row[1]),
+					'columns' => array()
+				);
 			}
 			/**
-			  * There must be a more elegant way of doing this,
-			  * the index elements appear in the SQL statement
-			  * in cols[1] between parentheses
-			  * e.g CREATE UNIQUE INDEX ware_0 ON warehouse (org,warehouse)
-			  */
+			 * There must be a more elegant way of doing this,
+			 * 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;
 		}
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
-        return $indexes;
+		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;
+	}
 }
 
 /*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
+		Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 class ADORecordset_sqlite extends ADORecordSet {
@@ -318,22 +426,28 @@ class ADORecordset_sqlite extends ADORecordSet {
 	var $databaseType = "sqlite";
 	var $bind = false;
 
-	function ADORecordset_sqlite($queryID,$mode=false)
+	function __construct($queryID,$mode=false)
 	{
-		
-		if ($mode === false) { 
+
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		switch($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
-		default: $this->fetchMode = SQLITE_BOTH; break;
+			case ADODB_FETCH_NUM:
+				$this->fetchMode = SQLITE_NUM;
+				break;
+			case ADODB_FETCH_ASSOC:
+				$this->fetchMode = SQLITE_ASSOC;
+				break;
+			default:
+				$this->fetchMode = SQLITE_BOTH;
+				break;
 		}
 		$this->adodbFetchMode = $mode;
-		
+
 		$this->_queryID = $queryID;
-	
+
 		$this->_inited = true;
 		$this->fields = array();
 		if ($queryID) {
@@ -345,12 +459,12 @@ function ADORecordset_sqlite($queryID,$mode=false)
 			$this->_numOfFields = 0;
 			$this->EOF = true;
 		}
-		
+
 		return $this->_queryID;
 	}
 
 
-	function &FetchField($fieldOffset = -1)
+	function FetchField($fieldOffset = -1)
 	{
 		$fld = new ADOFieldObject;
 		$fld->name = sqlite_field_name($this->_queryID, $fieldOffset);
@@ -358,16 +472,18 @@ function &FetchField($fieldOffset = -1)
 		$fld->max_length = -1;
 		return $fld;
 	}
-	
-   function _initrs()
-   {
+
+	function _initrs()
+	{
 		$this->_numOfRows = @sqlite_num_rows($this->_queryID);
 		$this->_numOfFields = @sqlite_num_fields($this->_queryID);
-   }
+	}
 
 	function Fields($colname)
 	{
-		if ($this->fetchMode != SQLITE_NUM) return $this->fields[$colname];
+		if ($this->fetchMode != SQLITE_NUM) {
+			return $this->fields[$colname];
+		}
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -375,24 +491,23 @@ function Fields($colname)
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
+
+		return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+	function _seek($row)
+	{
+		return sqlite_seek($this->_queryID, $row);
 	}
-	
-   function _seek($row)
-   {
-   		return sqlite_seek($this->_queryID, $row);
-   }
 
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
 		$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
 		return !empty($this->fields);
 	}
-	
-	function _close() 
+
+	function _close()
 	{
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-sqlite3.inc.php b/adodb/drivers/adodb-sqlite3.inc.php
new file mode 100644
index 0000000..548727d
--- /dev/null
+++ b/adodb/drivers/adodb-sqlite3.inc.php
@@ -0,0 +1,700 @@
+transOff) {
+			return true;
+		}
+		$ret = $this->Execute("BEGIN TRANSACTION");
+		$this->transCnt += 1;
+		return true;
+	}
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) {
+			return true;
+		}
+		if (!$ok) {
+			return $this->RollbackTrans();
+		}
+		$ret = $this->Execute("COMMIT");
+		if ($this->transCnt > 0) {
+			$this->transCnt -= 1;
+		}
+		return !empty($ret);
+	}
+
+	function RollbackTrans()
+	{
+		if ($this->transOff) {
+			return true;
+		}
+		$ret = $this->Execute("ROLLBACK");
+		if ($this->transCnt > 0) {
+			$this->transCnt -= 1;
+		}
+		return !empty($ret);
+	}
+
+	function metaType($t,$len=-1,$fieldobj=false)
+	{
+
+		if (is_object($t))
+		{
+			$fieldobj = $t;
+			$t = $fieldobj->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)
+	{
+		global $ADODB_FETCH_MODE;
+		$false = false;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		if ($this->fetchMode !== false) {
+			$savem = $this->SetFetchMode(false);
+		}
+		$rs = $this->Execute("PRAGMA table_info('$table')");
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		if (!$rs) {
+			$ADODB_FETCH_MODE = $save;
+			return $false;
+		}
+		$arr = array();
+		while ($r = $rs->FetchRow()) {
+			$type = explode('(',$r['type']);
+			$size = '';
+			if (sizeof($type)==2) {
+				$size = trim($type[1],')');
+			}
+			$fn = strtoupper($r['name']);
+			$fld = new ADOFieldObject;
+			$fld->name = $r['name'];
+			$fld->type = $type[0];
+			$fld->max_length = $size;
+			$fld->not_null = $r['notnull'];
+			$fld->default_value = $r['dflt_value'];
+			$fld->scale = 0;
+			if (isset($r['pk']) && $r['pk']) {
+				$fld->primary_key=1;
+			}
+			if ($save == ADODB_FETCH_NUM) {
+				$arr[] = $fld;
+			} else {
+				$arr[strtoupper($fld->name)] = $fld;
+			}
+		}
+		$rs->Close();
+		$ADODB_FETCH_MODE = $save;
+		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;
+	}
+
+	protected function _insertID($table = '', $column = '')
+	{
+		return $this->_connectionID->lastInsertRowID();
+	}
+
+	function _affectedrows()
+	{
+		return $this->_connectionID->changes();
+	}
+
+	function ErrorMsg()
+ 	{
+		if ($this->_logsql) {
+			return $this->_errorMsg;
+		}
+		return ($this->_errorNo) ? $this->ErrorNo() : ''; //**tochange?
+	}
+
+	function ErrorNo()
+	{
+		return $this->_connectionID->lastErrorCode(); //**tochange??
+	}
+
+	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);
+		$this->_connectionID->createFunction('adodb_date2', 'adodb_date2', 2);
+	}
+
+
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (empty($argHostname) && $argDatabasename) {
+			$argHostname = $argDatabasename;
+		}
+		$this->_connectionID = new SQLite3($argHostname);
+		$this->_createFunctions();
+
+		return true;
+	}
+
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		// There's no permanent connect in SQLite3
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+	}
+
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr=false)
+	{
+		$rez = $this->_connectionID->query($sql);
+		if ($rez === false) {
+			$this->_errorNo = $this->_connectionID->lastErrorCode();
+		}
+		// If no data was returned, we don't need to create a real recordset
+		elseif ($rez->numColumns() == 0) {
+			$rez->finalize();
+			$rez = true;
+		}
+
+		return $rez;
+	}
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
+		$nrows = (int) $nrows;
+		$offset = (int) $offset;
+		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
+		if ($secs2cache) {
+			$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		} else {
+			$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+		}
+
+		return $rs;
+	}
+
+	/*
+		This algorithm is not very efficient, but works even if table locking
+		is not available.
+
+		Will return false if unable to generate an ID after $MAXLOOPS attempts.
+	*/
+	var $_genSeqSQL = "create table %s (id integer)";
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		// if you have to modify the parameter below, your database is overloaded,
+		// or you need to implement generation of id's yourself!
+		$MAXLOOPS = 100;
+		//$this->debug=1;
+		while (--$MAXLOOPS>=0) {
+			@($num = $this->GetOne("select id from $seq"));
+			if ($num === false) {
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));
+				$start -= 1;
+				$num = '0';
+				$ok = $this->Execute("insert into $seq values($start)");
+				if (!$ok) {
+					return false;
+				}
+			}
+			$this->Execute("update $seq set id=id+1 where id=$num");
+
+			if ($this->affected_rows() > 0) {
+				$num += 1;
+				$this->genID = $num;
+				return $num;
+			}
+		}
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
+		}
+		return false;
+	}
+
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		if (empty($this->_genSeqSQL)) {
+			return false;
+		}
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) {
+			return false;
+		}
+		$start -= 1;
+		return $this->Execute("insert into $seqname values($start)");
+	}
+
+	var $_dropSeqSQL = 'drop table %s';
+	function DropSequence($seqname = 'adodbseq')
+	{
+		if (empty($this->_dropSeqSQL)) {
+			return false;
+		}
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+
+	// returns true or false
+	function _close()
+	{
+		return $this->_connectionID->close();
+	}
+
+	function metaIndexes($table, $primary = FALSE, $owner = false)
+	{
+		$false = 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);
+		}
+
+		$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);
+			}
+			$ADODB_FETCH_MODE = $save;
+			return $false;
+		}
+
+		$indexes = array ();
+
+		while ($row = $rs->FetchRow())
+		{
+
+			if (!isset($indexes[$row[0]])) {
+				$indexes[$row[0]] = array(
+					'unique' => preg_match("/unique/i",$row[1]),
+					'columns' => array()
+				);
+			}
+			/**
+			 * The index elements appear in the SQL statement
+			 * in cols[1] between parentheses
+			 * e.g CREATE UNIQUE INDEX ware_0 ON warehouse (org,warehouse)
+			 */
+			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;
+	}
+
+}
+
+/*--------------------------------------------------------------------------------------
+		Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_sqlite3 extends ADORecordSet {
+
+	var $databaseType = "sqlite3";
+	var $bind = false;
+
+	function __construct($queryID,$mode=false)
+	{
+
+		if ($mode === false) {
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch($mode) {
+			case ADODB_FETCH_NUM:
+				$this->fetchMode = SQLITE3_NUM;
+				break;
+			case ADODB_FETCH_ASSOC:
+				$this->fetchMode = SQLITE3_ASSOC;
+				break;
+			default:
+				$this->fetchMode = SQLITE3_BOTH;
+				break;
+		}
+		$this->adodbFetchMode = $mode;
+
+		$this->_queryID = $queryID;
+
+		$this->_inited = true;
+		$this->fields = array();
+		if ($queryID) {
+			$this->_currentRow = 0;
+			$this->EOF = !$this->_fetch();
+			@$this->_initrs();
+		} else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+
+		return $this->_queryID;
+	}
+
+
+	function FetchField($fieldOffset = -1)
+	{
+		$fld = new ADOFieldObject;
+		$fld->name = $this->_queryID->columnName($fieldOffset);
+		$fld->type = 'VARCHAR';
+		$fld->max_length = -1;
+		return $fld;
+	}
+
+	function _initrs()
+	{
+		$this->_numOfFields = $this->_queryID->numColumns();
+
+	}
+
+	function Fields($colname)
+	{
+		if ($this->fetchMode != SQLITE3_NUM) {
+			return $this->fields[$colname];
+		}
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+
+		return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+	function _seek($row)
+	{
+		// sqlite3 does not implement seek
+		if ($this->debug) {
+			ADOConnection::outp("SQLite3 does not implement seek");
+		}
+		return false;
+	}
+
+	function _fetch($ignore_fields=false)
+	{
+		$this->fields = $this->_queryID->fetchArray($this->fetchMode);
+		return !empty($this->fields);
+	}
+
+	function _close()
+	{
+	}
+
+}
diff --git a/adodb/drivers/adodb-sqlitepo.inc.php b/adodb/drivers/adodb-sqlitepo.inc.php
index 29c8abe..cb69ff9 100644
--- a/adodb/drivers/adodb-sqlitepo.inc.php
+++ b/adodb/drivers/adodb-sqlitepo.inc.php
@@ -1,21 +1,31 @@
 
+ */
 
 if (!defined('ADODB_DIR')) die();
 
@@ -23,11 +33,6 @@
 
 class ADODB_sqlitepo extends ADODB_sqlite {
    var $databaseType = 'sqlitepo';
-
-   function ADODB_sqlitepo()
-   {
-      $this->ADODB_sqlite();
-   }
 }
 
 /*--------------------------------------------------------------------------------------
@@ -38,11 +43,6 @@ class ADORecordset_sqlitepo extends ADORecordset_sqlite {
 
    var $databaseType = 'sqlitepo';
 
-   function ADORecordset_sqlitepo($queryID,$mode=false)
-   {
-      $this->ADORecordset_sqlite($queryID,$mode);
-   }
-   
    // Modified to strip table names from returned fields
    function _fetch($ignore_fields=false)
    {
@@ -59,4 +59,3 @@ function _fetch($ignore_fields=false)
       return !empty($this->fields);
    }
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-sybase.inc.php b/adodb/drivers/adodb-sybase.inc.php
index 8276334..b8db074 100644
--- a/adodb/drivers/adodb-sybase.inc.php
+++ b/adodb/drivers/adodb-sybase.inc.php
@@ -1,25 +1,30 @@
 
+ */
+
  // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB_sybase extends ADOConnection {
-	var $databaseType = "sybase";	
+	var $databaseType = "sybase";
 	var $dataProvider = 'sybase';
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $fmtDate = "'Y-m-d'";
@@ -30,53 +35,55 @@ class ADODB_sybase extends ADOConnection {
 	// see http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
 	var $metaColumnsSQL = "SELECT c.column_name, c.column_type, c.width FROM syscolumn c, systable t WHERE t.table_name='%s' AND c.table_id=t.table_id AND t.table_type='BASE'";
 	/*
-	"select c.name,t.name,c.length from 
-	syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id 
+	"select c.name,t.name,c.length from
+	syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id
 	where o.name='%s'";
 	*/
-	var $concat_operator = '+'; 
+	var $concat_operator = '+';
 	var $arrayClass = 'ADORecordSet_array_sybase';
 	var $sysDate = 'GetDate()';
 	var $leftOuter = '*=';
 	var $rightOuter = '=*';
-	
-	function ADODB_sybase() 
-	{			
-	}
- 
-	// might require begintrans -- committrans
-	function _insertid()
+
+	var $port;
+
+	/**
+	 * might require begintrans -- committrans
+	 * @inheritDoc
+	 */
+	protected function _insertID($table = '', $column = '')
 	{
 		return $this->GetOne('select @@identity');
 	}
+
 	  // might require begintrans -- committrans
 	function _affectedrows()
 	{
-	   return $this->GetOne('select @@rowcount');
+		return $this->GetOne('select @@rowcount');
 	}
 
-			  
+
 	function BeginTrans()
-	{	
-	
+	{
+
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		   
+
 		$this->Execute('BEGIN TRAN');
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if ($this->transOff) return true;
-		
+
 		if (!$ok) return $this->RollbackTrans();
-	
+
 		$this->transCnt -= 1;
 		$this->Execute('COMMIT TRAN');
 		return true;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
@@ -84,37 +91,39 @@ function RollbackTrans()
 		$this->Execute('ROLLBACK TRAN');
 		return true;
 	}
-	
+
 	// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
-	function RowLock($tables,$where,$flds='top 1 null as ignore') 
+	function RowLock($tables,$where,$col='top 1 null as ignore')
 	{
 		if (!$this->_hastrans) $this->BeginTrans();
 		$tables = str_replace(',',' HOLDLOCK,',$tables);
-		return $this->GetOne("select $flds from $tables HOLDLOCK where $where");
-		
-	}	
-		
-	function SelectDB($dbName) 
+		return $this->GetOne("select $col from $tables HOLDLOCK where $where");
+
+	}
+
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
 		if ($this->_connectionID) {
-			return @sybase_select_db($dbName);		
+			return @sybase_select_db($dbName);
 		}
-		else return false;	
+		else return false;
 	}
 
 	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/	
+		Note: This function is NOT available for Microsoft SQL Server.	*/
+
 
-	
 	function ErrorMsg()
 	{
 		if ($this->_logsql) return $this->_errorMsg;
 		if (function_exists('sybase_get_last_message'))
 			$this->_errorMsg = sybase_get_last_message();
-		else
-			$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : 'SYBASE error messages not supported on this platform';
+		else {
+			$this->_errorMsg = 'SYBASE error messages not supported on this platform';
+		}
+
 		return $this->_errorMsg;
 	}
 
@@ -122,154 +131,175 @@ function ErrorMsg()
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sybase_connect')) return null;
-		
-		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
+
+		// Sybase connection on custom port
+		if ($this->port) {
+			$argHostname .= ':' . $this->port;
+		}
+
+		if ($this->charSet) {
+			$this->_connectionID = @sybase_connect($argHostname,$argUsername,$argPassword, $this->charSet);
+		} else {
+			$this->_connectionID = @sybase_connect($argHostname,$argUsername,$argPassword);
+		}
+
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('sybase_connect')) return null;
-		
-		$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
+
+		// Sybase connection on custom port
+		if ($this->port) {
+			$argHostname .= ':' . $this->port;
+		}
+
+		if ($this->charSet) {
+			$this->_connectionID = @sybase_pconnect($argHostname,$argUsername,$argPassword, $this->charSet);
+		} else {
+			$this->_connectionID = @sybase_pconnect($argHostname,$argUsername,$argPassword);
+		}
+
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
+	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);
 	}
-	
+
 	// See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		if ($secs2cache > 0) {// we do not cache rowcount, so we have to load entire recordset
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 			return $rs;
 		}
-		
+
 		$nrows = (integer) $nrows;
 		$offset = (integer) $offset;
-		
+
 		$cnt = ($nrows >= 0) ? $nrows : 999999999;
 		if ($offset > 0 && $cnt) $cnt += $offset;
-		
-		$this->Execute("set rowcount $cnt"); 
-		$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
+
+		$this->Execute("set rowcount $cnt");
+		$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
 		$this->Execute("set rowcount 0");
-		
+
 		return $rs;
 	}
 
 	// returns true or false
 	function _close()
-	{ 
+	{
 		return @sybase_close($this->_connectionID);
 	}
-	
-	function UnixDate($v)
+
+	static function UnixDate($v)
 	{
 		return ADORecordSet_array_sybase::UnixDate($v);
 	}
-	
-	function UnixTimeStamp($v)
+
+	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}	
-	
-	
+	}
+
+
 
 	# Added 2003-10-05 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    // Format date column in sql string given an input format that understands Y M D
-    function SQLDate($fmt, $col=false)
-    {
-        if (!$col) $col = $this->sysTimeStamp;
-        $s = '';
-
-        $len = strlen($fmt);
-        for ($i=0; $i < $len; $i++) {
-            if ($s) $s .= '+';
-            $ch = $fmt[$i];
-            switch($ch) {
-            case 'Y':
-            case 'y':
-                $s .= "datename(yy,$col)";
-                break;
-            case 'M':
-                $s .= "convert(char(3),$col,0)";
-                break;
-            case 'm':
-                $s .= "replace(str(month($col),2),' ','0')";
-                break;
-            case 'Q':
-            case 'q':
-                $s .= "datename(qq,$col)";
-                break;
-            case 'D':
-            case 'd':
-                $s .= "replace(str(datepart(dd,$col),2),' ','0')";
-                break;
-            case 'h':
-                $s .= "substring(convert(char(14),$col,0),13,2)";
-                break;
-
-            case 'H':
-                $s .= "replace(str(datepart(hh,$col),2),' ','0')";
-                break;
-
-            case 'i':
-                $s .= "replace(str(datepart(mi,$col),2),' ','0')";
-                break;
-            case 's':
-                $s .= "replace(str(datepart(ss,$col),2),' ','0')";
-                break;
-            case 'a':
-            case 'A':
-                $s .= "substring(convert(char(19),$col,0),18,2)";
-                break;
-
-            default:
-                if ($ch == '\\') {
-                    $i++;
-                    $ch = substr($fmt,$i,1);
-                }
-                $s .= $this->qstr($ch);
-                break;
-            }
-        }
-        return $s;
-    }
-	
+	# Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
+	# to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = '';
+
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '+';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "datename(yy,$col)";
+				break;
+			case 'M':
+				$s .= "convert(char(3),$col,0)";
+				break;
+			case 'm':
+				$s .= "str_replace(str(month($col),2),' ','0')";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "datename(qq,$col)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "str_replace(str(datepart(dd,$col),2),' ','0')";
+				break;
+			case 'h':
+				$s .= "substring(convert(char(14),$col,0),13,2)";
+				break;
+
+			case 'H':
+				$s .= "str_replace(str(datepart(hh,$col),2),' ','0')";
+				break;
+
+			case 'i':
+				$s .= "str_replace(str(datepart(mi,$col),2),' ','0')";
+				break;
+			case 's':
+				$s .= "str_replace(str(datepart(ss,$col),2),' ','0')";
+				break;
+			case 'a':
+			case 'A':
+				$s .= "substring(convert(char(19),$col,0),18,2)";
+				break;
+
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+
 	# Added 2003-10-07 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    function MetaPrimaryKeys($table)
-    {
-        $sql = "SELECT c.column_name " .
-               "FROM syscolumn c, systable t " .
-               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
-               "AND t.table_type='BASE' " .
-               "AND c.pkey = 'Y' " .
-               "ORDER BY c.column_id";
-
-        $a = $this->GetCol($sql);
-        if ($a && sizeof($a)>0) return $a;
-        return false;
-    }
+	# Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
+	# to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
+	function MetaPrimaryKeys($table, $owner = false)
+	{
+		$sql = "SELECT c.column_name " .
+			   "FROM syscolumn c, systable t " .
+			   "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
+			   "AND t.table_type='BASE' " .
+			   "AND c.pkey = 'Y' " .
+			   "ORDER BY c.column_id";
+
+		$a = $this->GetCol($sql);
+		if ($a && sizeof($a)>0) return $a;
+		return false;
+	}
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
@@ -278,29 +308,29 @@ function MetaPrimaryKeys($table)
 	'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
 	'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
 
-class ADORecordset_sybase extends ADORecordSet {	
+class ADORecordset_sybase extends ADORecordSet {
 
 	var $databaseType = "sybase";
 	var $canSeek = true;
 	// _mths works only in non-localised system
-	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
+	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
 
-	function ADORecordset_sybase($id,$mode=false)
+	function __construct($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
 		else $this->fetchMode = $mode;
-		$this->ADORecordSet($id,$mode);
+		parent::__construct($id);
 	}
-	
-	/*	Returns: an object containing field information. 
+
+	/*	Returns: an object containing field information.
 		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
 		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
 		fetchField() is retrieved.	*/
-	function &FetchField($fieldOffset = -1) 
+	function FetchField($fieldOffset = -1)
 	{
 		if ($fieldOffset != -1) {
 			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
@@ -312,27 +342,28 @@ function &FetchField($fieldOffset = -1)
 		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
 		return $o;
 	}
-	
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
 		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
 		$this->_numOfFields = @sybase_num_fields($this->_queryID);
 	}
-	
-	function _seek($row) 
+
+	function _seek($row)
 	{
 		return @sybase_data_seek($this->_queryID, $row);
-	}		
+	}
 
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
 		if ($this->fetchMode == ADODB_FETCH_NUM) {
 			$this->fields = @sybase_fetch_row($this->_queryID);
 		} else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-			$this->fields = @sybase_fetch_row($this->_queryID);
+			$this->fields = @sybase_fetch_assoc($this->_queryID);
+
 			if (is_array($this->fields)) {
-				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+				$this->fields = $this->GetRowAssoc();
 				return true;
 			}
 			return false;
@@ -345,62 +376,58 @@ function _fetch($ignore_fields=false)
 
 		return false;
 	}
-	
+
 	/*	close() only needs to be called if you are worried about using too much memory while your script
 		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
 	function _close() {
-		return @sybase_free_result($this->_queryID);		
+		return @sybase_free_result($this->_queryID);
 	}
-	
+
 	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
+	static function UnixDate($v)
 	{
 		return ADORecordSet_array_sybase::UnixDate($v);
 	}
-	
-	function UnixTimeStamp($v)
+
+	static function UnixTimeStamp($v)
 	{
 		return ADORecordSet_array_sybase::UnixTimeStamp($v);
 	}
 }
 
 class ADORecordSet_array_sybase extends ADORecordSet_array {
-	function ADORecordSet_array_sybase($id=-1)
-	{
-		$this->ADORecordSet_array($id);
-	}
-	
-		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
+
+	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
 	{
 	global $ADODB_sybase_mths;
-	
+
 		//Dec 30 2000 12:00AM
-		if (!ereg( "([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})"
+		if (!preg_match( "/([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})/"
 			,$v, $rr)) return parent::UnixDate($v);
-			
+
 		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 		$themth = substr(strtoupper($rr[1]),0,3);
 		$themth = $ADODB_sybase_mths[$themth];
 		if ($themth <= 0) return false;
 		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
+		return  adodb_mktime(0,0,0,$themth,$rr[2],$rr[3]);
 	}
-	
-	function UnixTimeStamp($v)
+
+	static function UnixTimeStamp($v)
 	{
 	global $ADODB_sybase_mths;
 		//11.02.2001 Toni Tunkkari toni.tunkkari@finebyte.com
 		//Changed [0-9] to [0-9 ] in day conversion
-		if (!ereg( "([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})"
+		if (!preg_match( "/([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})/"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
+
 		$themth = substr(strtoupper($rr[1]),0,3);
 		$themth = $ADODB_sybase_mths[$themth];
 		if ($themth <= 0) return false;
-		
+
 		switch (strtoupper($rr[6])) {
 		case 'P':
 			if ($rr[4]<12) $rr[4] += 12;
@@ -412,7 +439,6 @@ function UnixTimeStamp($v)
 			break;
 		}
 		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
+		return  adodb_mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
 	}
 }
-?>
diff --git a/adodb/drivers/adodb-sybase_ase.inc.php b/adodb/drivers/adodb-sybase_ase.inc.php
index 6a26c55..d301ba9 100644
--- a/adodb/drivers/adodb-sybase_ase.inc.php
+++ b/adodb/drivers/adodb-sybase_ase.inc.php
@@ -1,49 +1,54 @@
 
+ */
 
 require_once ADODB_DIR."/drivers/adodb-sybase.inc.php";
 
 class ADODB_sybase_ase extends ADODB_sybase {
  	var $databaseType = "sybase_ase";
-	
+
 	 var $metaTablesSQL="SELECT sysobjects.name FROM sysobjects, sysusers WHERE sysobjects.type='U' AND sysobjects.uid = sysusers.uid";
 	 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 ADODB_sybase_ase()
-	{
-	}
-	
 	// split the Views, Tables and procedures.
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false)
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$false = false;
 		if ($this->metaTablesSQL) {
 			// complicated state saving by the need for backward compat
-			
+
 			if ($ttype == 'VIEWS'){
 						$sql = str_replace('U', 'V', $this->metaTablesSQL);
 			}elseif (false === $ttype){
 						$sql = str_replace('U',"U' OR type='V", $this->metaTablesSQL);
-			}else{ // TABLES OR ANY OTHER 
+			}else{ // TABLES OR ANY OTHER
 						$sql = $this->metaTablesSQL;
 			}
 			$rs = $this->Execute($sql);
-			
+
 			if ($rs === false || !method_exists($rs, 'GetArray')){
 					return $false;
 			}
-			$arr =& $rs->GetArray();
+			$arr = $rs->GetArray();
 
 			$arr2 = array();
 			foreach($arr as $key=>$value){
@@ -71,17 +76,17 @@ function MetaDatabases()
 	}
 
 	// fix a bug which prevent the metaColumns query to be executed for Sybase ASE
-	function &MetaColumns($table,$upper=false) 
+	function MetaColumns($table,$upper=false)
 	{
 		$false = false;
 		if (!empty($this->metaColumnsSQL)) {
-		
+
 			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
 			if ($rs === false) return $false;
 
 			$retarr = array();
 			while (!$rs->EOF) {
-				$fld =& new ADOFieldObject();
+				$fld = new ADOFieldObject();
 				$fld->name = $rs->Fields('field_name');
 				$fld->type = $rs->Fields('type');
 				$fld->max_length = $rs->Fields('width');
@@ -89,11 +94,11 @@ function &MetaColumns($table,$upper=false)
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return $false;
 	}
-	
+
 	function getProcedureList($schema)
 	{
 			return false;
@@ -104,16 +109,10 @@ function ErrorMsg()
 		if (!function_exists('sybase_connect')){
 				return 'Your PHP doesn\'t contain the Sybase connection module!';
 		}
-		return parent::ErrorMsg();	
+		return parent::ErrorMsg();
 	}
 }
 
 class adorecordset_sybase_ase extends ADORecordset_sybase {
-var $databaseType = "sybase_ase";
-function ADORecordset_sybase_ase($id,$mode=false)
-	{
-		$this->ADORecordSet_sybase($id,$mode);
-	}
-	
+	var $databaseType = "sybase_ase";
 }
-?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-text.inc.php b/adodb/drivers/adodb-text.inc.php
new file mode 100644
index 0000000..77ad06a
--- /dev/null
+++ b/adodb/drivers/adodb-text.inc.php
@@ -0,0 +1,341 @@
+ $b[0]) ? -1 : 1;
+}
+class ADODB_text extends ADOConnection {
+	var $databaseType = 'text';
+
+	var $_origarray; // original data
+	var $_types;
+	var $_proberows = 8;
+	var $_colnames;
+	var $_skiprow1=false;
+	var $readOnly = true;
+	var $hasTransactions = false;
+
+	var $_rezarray;
+	var $_reznames;
+	var $_reztypes;
+
+	function RSRecordCount()
+	{
+		if (!empty($this->_rezarray)) return sizeof($this->_rezarray);
+
+		return sizeof($this->_origarray);
+	}
+
+	function _affectedrows()
+	{
+			return false;
+	}
+
+		// returns true or false
+	function PConnect(&$array, $types = false, $colnames = false)
+	{
+		return $this->Connect($array, $types, $colnames);
+	}
+		// returns true or false
+	function Connect(&$array, $types = false, $colnames = false)
+	{
+		if (is_string($array) and $array === 'iluvphplens') return 'me2';
+
+		if (!$array) {
+			$this->_origarray = false;
+			return true;
+		}
+		$row = $array[0];
+		$cols = sizeof($row);
+
+
+		if ($colnames) $this->_colnames = $colnames;
+		else {
+			$this->_colnames = $array[0];
+			$this->_skiprow1 = true;
+		}
+		if (!$types) {
+		// probe and guess the type
+			$types = array();
+			$firstrow = true;
+			if ($this->_proberows > sizeof($array)) $max = sizeof($array);
+			else $max = $this->_proberows;
+			for ($j=($this->_skiprow1)?1:0;$j < $max; $j++) {
+				$row = $array[$j];
+				if (!$row) break;
+				$i = -1;
+				foreach($row as $v) {
+					$i += 1;
+					//print " ($i ".$types[$i]. "$v) ";
+					$v = trim($v);
+	 				if (!preg_match('/^[+-]{0,1}[0-9\.]+$/',$v)) {
+						$types[$i] = 'C'; // once C, always C
+						continue;
+					}
+					if (isset($types[$i]) && $types[$i]=='C') continue;
+					if ($firstrow) {
+					// If empty string, we presume is character
+					// test for integer for 1st row only
+					// after that it is up to testing other rows to prove
+					// that it is not an integer
+						if (strlen($v) == 0) $types[0] = 'C';
+						if (strpos($v,'.') !== false) $types[0] = 'N';
+						else  $types[$i] = 'I';
+						continue;
+					}
+
+					if (strpos($v,'.') !== false) $types[$i] = 'N';
+
+				}
+				$firstrow = false;
+			}
+		}
+		//print_r($types);
+		$this->_origarray = $array;
+		$this->_types = $types;
+		return true;
+	}
+
+
+
+	// returns queryID or false
+	// We presume that the select statement is on the same table (what else?),
+	// with the only difference being the order by.
+	//You can filter by using $eval and each clause is stored in $arr .eg. $arr[1] == 'name'
+	// also supports SELECT [DISTINCT] COL FROM ... -- only 1 col supported
+	function _query($sql,$input_arr,$eval=false)
+	{
+		if ($this->_origarray === false) return false;
+
+		$eval = $this->evalAll;
+		$usql = strtoupper(trim($sql));
+		$usql = preg_replace("/[\t\n\r]/",' ',$usql);
+		$usql = preg_replace('/ *BY/i',' BY',strtoupper($usql));
+
+		$eregword ='([A-Z_0-9]*)';
+		//print "
 $sql $eval ";
+		if ($eval) {
+			$i = 0;
+			foreach($this->_colnames as $n) {
+				$n = strtoupper(trim($n));
+				$eval = str_replace("\$$n","\$arr[$i]",$eval);
+
+				$i += 1;
+			}
+
+			$i = 0;
+			$eval = "\$rez=($eval);";
+			//print "
Eval string = $eval 
";
+			$where_arr = array();
+
+			reset($this->_origarray);
+			foreach ($this->_origarray as $arr) {
+
+				if ($i == 0 && $this->_skiprow1)
+					$where_arr[] = $arr;
+				else {
+					eval($eval);
+					//print " $i: result=$rez arr[0]={$arr[0]} arr[1]={$arr[1]} 
\n ";
+					if ($rez) $where_arr[] = $arr;
+				}
+				$i += 1;
+			}
+			$this->_rezarray = $where_arr;
+		}else
+			$where_arr = $this->_origarray;
+
+		// THIS PROJECTION CODE ONLY WORKS FOR 1 COLUMN,
+		// OTHERWISE IT RETURNS ALL COLUMNS
+		if (substr($usql,0,7) == 'SELECT ') {
+			$at = strpos($usql,' FROM ');
+			$sel = trim(substr($usql,7,$at-7));
+
+			$distinct = false;
+			if (substr($sel,0,8) == 'DISTINCT') {
+				$distinct = true;
+				$sel = trim(substr($sel,8,$at));
+			}
+
+			// $sel holds the selection clause, comma delimited
+			// currently we only project if one column is involved
+			// this is to support popups in PHPLens
+			if (strpos(',',$sel)===false) {
+				$colarr = array();
+
+				preg_match("/$eregword/",$sel,$colarr);
+				$col = $colarr[1];
+				$i = 0;
+				$n = '';
+				reset($this->_colnames);
+				foreach ($this->_colnames as $n) {
+
+					if ($col == strtoupper(trim($n))) break;
+					$i += 1;
+				}
+
+				if ($n && $col) {
+					$distarr = array();
+					$projarray = array();
+					$projtypes = array($this->_types[$i]);
+					$projnames = array($n);
+
+					foreach ($where_arr as $a) {
+						if ($i == 0 && $this->_skiprow1) {
+							$projarray[] = array($n);
+							continue;
+						}
+
+						if ($distinct) {
+							$v = strtoupper($a[$i]);
+							if (! $distarr[$v]) {
+								$projarray[] = array($a[$i]);
+								$distarr[$v] = 1;
+							}
+						} else
+							$projarray[] = array($a[$i]);
+
+					} //foreach
+					//print_r($projarray);
+				}
+			} // check 1 column in projection
+		}  // is SELECT
+
+		if (empty($projarray)) {
+			$projtypes = $this->_types;
+			$projarray = $where_arr;
+			$projnames = $this->_colnames;
+		}
+		$this->_rezarray = $projarray;
+		$this->_reztypes = $projtypes;
+		$this->_reznames = $projnames;
+
+
+		$pos = strpos($usql,' ORDER BY ');
+		if ($pos === false) return $this;
+		$orderby = trim(substr($usql,$pos+10));
+
+		preg_match("/$eregword/",$orderby,$arr);
+		if (sizeof($arr) < 2) return $this; // actually invalid sql
+		$col = $arr[1];
+		$at = (integer) $col;
+		if ($at == 0) {
+			$i = 0;
+			reset($projnames);
+			foreach ($projnames as $n) {
+				if (strtoupper(trim($n)) == $col) {
+					$at = $i+1;
+					break;
+				}
+				$i += 1;
+			}
+		}
+
+		if ($at <= 0 || $at > sizeof($projarray[0])) return $this; // cannot find sort column
+		$at -= 1;
+
+		// generate sort array consisting of (sortval1, row index1) (sortval2, row index2)...
+		$sorta = array();
+		$t = $projtypes[$at];
+		$num = ($t == 'I' || $t == 'N');
+		for ($i=($this->_skiprow1)?1:0, $max = sizeof($projarray); $i < $max; $i++) {
+			$row = $projarray[$i];
+			$val = ($num)?(float)$row[$at]:$row[$at];
+			$sorta[]=array($val,$i);
+		}
+
+		// check for desc sort
+		$orderby = substr($orderby,strlen($col)+1);
+		$arr = array();
+		preg_match('/([A-Z_0-9]*)/i',$orderby,$arr);
+
+		if (trim($arr[1]) == 'DESC') $sortf = 'adodb_cmpr';
+		else $sortf = 'adodb_cmp';
+
+		// hasta la sorta babe
+		usort($sorta, $sortf);
+
+		// rearrange original array
+		$arr2 = array();
+		if ($this->_skiprow1) $arr2[] = $projarray[0];
+		foreach($sorta as $v) {
+			$arr2[] = $projarray[$v[1]];
+		}
+
+		$this->_rezarray = $arr2;
+		return $this;
+	}
+
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
+	{
+			return '';
+	}
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
+	{
+		return 0;
+	}
+
+	// returns true or false
+	function _close()
+	{
+	}
+
+
+}
+
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+
+class ADORecordSet_text extends ADORecordSet_array
+{
+
+	var $databaseType = "text";
+
+	function __construct( $conn,$mode=false)
+	{
+		parent::__construct();
+		$this->InitArray($conn->_rezarray,$conn->_reztypes,$conn->_reznames);
+		$conn->_rezarray = false;
+	}
+
+} // class ADORecordSet_text
+
+
+} // defined
diff --git a/adodb/drivers/adodb-vfp.inc.php b/adodb/drivers/adodb-vfp.inc.php
index 5c3f1df..bb43516 100644
--- a/adodb/drivers/adodb-vfp.inc.php
+++ b/adodb/drivers/adodb-vfp.inc.php
@@ -1,26 +1,36 @@
 ADODB_odbc();
-	}
-	
+
 	function Time()
 	{
 		return time();
 	}
-	
+
 	function BeginTrans() { return false;}
-	
+
 	// quote string to be sent back to database
 	function qstr($s,$nofixquotes=false)
 	{
@@ -53,31 +58,26 @@ function qstr($s,$nofixquotes=false)
 		return "'".$s."'";
 	}
 
-	
+
 	// TOP requires ORDER BY for VFP
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		$this->hasTop = preg_match('/ORDER[ \t\r\n]+BY/is',$sql) ? 'top' : false;
 		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 		return $ret;
 	}
-	
+
 
 
 };
- 
 
-class  ADORecordSet_vfp extends ADORecordSet_odbc {	
-	
-	var $databaseType = "vfp";		
 
-	
-	function ADORecordSet_vfp($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
+class  ADORecordSet_vfp extends ADORecordSet_odbc {
+
+	var $databaseType = "vfp";
 
-	function MetaType($t,$len=-1)
+
+	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
@@ -89,19 +89,18 @@ function MetaType($t,$len=-1)
 			if ($len <= $this->blobSize) return 'C';
 		case 'M':
 			return 'X';
-			 
+
 		case 'D': return 'D';
-		
+
 		case 'T': return 'T';
-		
+
 		case 'L': return 'L';
-		
+
 		case 'I': return 'I';
-		
-		default: return 'N';
+
+		default: return ADODB_DEFAULT_METATYPE;
 		}
 	}
 }
 
 } //define
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-ar.inc.php b/adodb/lang/adodb-ar.inc.php
index dd0f830..920c994 100644
--- a/adodb/lang/adodb-ar.inc.php
+++ b/adodb/lang/adodb-ar.inc.php
@@ -1,34 +1,52 @@
 
+/**
+ * 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			=> 'ÎŘĂ ŰíŃ ăÍĎĎ',
-	    DB_ERROR_ALREADY_EXISTS	=> 'ăćĚćĎ ăÓČŢÇ',
-	    DB_ERROR_CANNOT_CREATE	=> 'áÇ íăßä ĹäÔÇÁ',
-	    DB_ERROR_CANNOT_DELETE	=> 'áÇ íăßä ÍĐÝ',
-	    DB_ERROR_CANNOT_DROP	=> 'áÇ íăßä ÍĐÝ',
-	    DB_ERROR_CONSTRAINT 	=> 'ÚăáíÉ ĹĎÎÇá ăăäćÚÉ',
-	    DB_ERROR_DIVZERO		=> 'ÚăáíÉ ÇáĘŢÓíă Úáě ŐÝŃ',
-	    DB_ERROR_INVALID		=> 'ŰíŃ ŐÍíÍ',
-	    DB_ERROR_INVALID_DATE	=> 'ŐíŰÉ ćŢĘ Ăć ĘÇŃíÎ ŰíŃ ŐÍíÍÉ',
-	    DB_ERROR_INVALID_NUMBER	=> 'ŐíŰÉ ŃŢă ŰíŃ ŐÍíÍÉ',
-	    DB_ERROR_MISMATCH		=> 'ŰíŃ ăĘŘÇČŢ',
-	    DB_ERROR_NODBSELECTED	=> 'áă íĘă ĹÎĘíÇŃ ŢÇÚĎÉ ÇáČíÇäÇĘ ČÚĎ',
-	    DB_ERROR_NOSUCHFIELD	=> 'áíÓ ĺäÇáß ÍŢá ČĺĐÇ ÇáÇÓă',
-	    DB_ERROR_NOSUCHTABLE	=> 'áíÓ ĺäÇáß ĚĎćá ČĺĐÇ ÇáÇÓă',
-	    DB_ERROR_NOT_CAPABLE	=> 'ŢÇÚĎÉ ÇáČíÇäÇĘ ÇáăŃĘČŘ ČĺÇ ŰíŃ ŢÇĎŃÉ',
-	    DB_ERROR_NOT_FOUND		=> 'áă íĘă ĹíĚÇĎĺ',
-	    DB_ERROR_NOT_LOCKED 	=> 'ŰíŃ ăŢÝćá',
-	    DB_ERROR_SYNTAX		=> 'ÎŘĂ Ýí ÇáŐíŰÉ',
-	    DB_ERROR_UNSUPPORTED	=> 'ŰíŃ ăĎÚćă',
-	    DB_ERROR_VALUE_COUNT_ON_ROW => 'ÚĎĎ ÇáŢíă Ýí ÇáÓĚá',
-	    DB_ERROR_INVALID_DSN	=> 'DSN ŰíŃ ŐÍíÍ',
-	    DB_ERROR_CONNECT_FAILED	=> 'ÝÔá ÚăáíÉ ÇáĹĘŐÇá',
-	    0			       => 'áíÓ ĺäÇáß ĂÎŘÇÁ', // DB_OK
-	    DB_ERROR_NEED_MORE_DATA	=> 'ÇáČíÇäÇĘ ÇáăŇćĎÉ ŰíŃ ßÇÝíÉ',
-	    DB_ERROR_EXTENSION_NOT_FOUND=> 'áă íĘă ĹíĚÇĎ ÇáĹÖÇÝÉ ÇáăĘÚáŢÉ',
-	    DB_ERROR_NOSUCHDB		=> 'áíÓ ĺäÇáß ŢÇÚĎÉ ČíÇäÇĘ ČĺĐÇ ÇáÇÓă',
-	    DB_ERROR_ACCESS_VIOLATION	=> 'ÓăÇÍíÇĘ ŰíŃ ßÇÝíÉ'
+	    DB_ERROR			=> 'خطأ غير محدد',
+	    DB_ERROR_ALREADY_EXISTS	=> 'Ů…ŮجŮŘŻ مسبقا',
+	    DB_ERROR_CANNOT_CREATE	=> 'لا ŮŠŮ…Ůن إنشاء',
+	    DB_ERROR_CANNOT_DELETE	=> 'لا ŮŠŮ…Ůن Ř­Ř°Ů',
+	    DB_ERROR_CANNOT_DROP	=> 'لا ŮŠŮ…Ůن Ř­Ř°Ů',
+	    DB_ERROR_CONSTRAINT 	=> 'عملية إدخال ممنŮعة',
+	    DB_ERROR_DIVZERO		=> 'عملية التقسيم على صŮر',
+	    DB_ERROR_INVALID		=> 'غير صحيح',
+	    DB_ERROR_INVALID_DATE	=> 'صيغة ŮŮ‚ŘŞ أ٠تاريخ غير صحيحة',
+	    DB_ERROR_INVALID_NUMBER	=> 'صيغة رقم غير صحيحة',
+	    DB_ERROR_MISMATCH		=> 'غير متطابق',
+	    DB_ERROR_NODBSELECTED	=> 'لم يتم إختيار قاعدة البيانات بعد',
+	    DB_ERROR_NOSUCHFIELD	=> 'ليس هنال٠حقل بهذا الاسم',
+	    DB_ERROR_NOSUCHTABLE	=> 'Ů„ŮŠŘł هنال٠جدŮŮ„ بهذا الاسم',
+	    DB_ERROR_NOT_CAPABLE	=> 'قاعدة البيانات المرتبط بها غير قادرة',
+	    DB_ERROR_NOT_FOUND		=> 'لم يتم إيجاده',
+	    DB_ERROR_NOT_LOCKED 	=> 'غير Ů…Ů‚ŮŮŮ„',
+	    DB_ERROR_SYNTAX		=> 'خطأ ŮŮŠ الصيغة',
+	    DB_ERROR_UNSUPPORTED	=> 'غير Ů…ŘŻŘąŮŮ…',
+	    DB_ERROR_VALUE_COUNT_ON_ROW => 'عدد القيم ŮŮŠ السجل',
+	    DB_ERROR_INVALID_DSN	=> 'DSN غير صحيح',
+	    DB_ERROR_CONNECT_FAILED	=> 'ŮŘ´Ů„ عملية الإتصال',
+	    0			       => 'ليس هنال٠أخطاء', // DB_OK
+	    DB_ERROR_NEED_MORE_DATA	=> 'البيانات المزŮŘŻŘ© غير ŮاŮŮŠŘ©',
+	    DB_ERROR_EXTENSION_NOT_FOUND=> 'Ů„Ů… ŮŠŘŞŮ… إيجاد الإضاŮŘ© المتعلقة',
+	    DB_ERROR_NOSUCHDB		=> 'ليس هنال٠قاعدة بيانات بهذا الاسم',
+	    DB_ERROR_ACCESS_VIOLATION	=> 'سماحيات غير ŮاŮŮŠŘ©'
 );
-?>
-		
diff --git a/adodb/lang/adodb-bg.inc.php b/adodb/lang/adodb-bg.inc.php
index 4fb1dc0..bbfd92f 100644
--- a/adodb/lang/adodb-bg.inc.php
+++ b/adodb/lang/adodb-bg.inc.php
@@ -1,38 +1,52 @@
 
-*/
+/**
+ * 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',
-            DB_ERROR                    => 'íĺčçâĺńňíŕ ăđĺřęŕ',
-            DB_ERROR_ALREADY_EXISTS     => 'âĺ÷ĺ ńúůĺńňâóâŕ',
-            DB_ERROR_CANNOT_CREATE      => 'íĺ ěîćĺ äŕ áúäĺ ńúçäŕäĺíŕ',
-            DB_ERROR_CANNOT_DELETE      => 'íĺ ěîćĺ äŕ áúäĺ čçňđčňŕ',
-            DB_ERROR_CANNOT_DROP        => 'íĺ ěîćĺ äŕ áúäĺ óíčůîćĺíŕ',
-            DB_ERROR_CONSTRAINT         => 'íŕđóřĺíî óńëîâčĺ',
-            DB_ERROR_DIVZERO            => 'äĺëĺíčĺ íŕ íóëŕ',
-            DB_ERROR_INVALID            => 'íĺďđŕâčëíî',
-            DB_ERROR_INVALID_DATE       => 'íĺęîđĺęňíŕ äŕňŕ čëč ÷ŕń',
-            DB_ERROR_INVALID_NUMBER     => 'íĺâŕëčäĺí íîěĺđ',
-            DB_ERROR_MISMATCH           => 'ďîăđĺříŕ óďîňđĺáŕ',
-            DB_ERROR_NODBSELECTED       => 'íĺ ĺ čçáđŕíŕ áŕçŕ äŕííč',
-            DB_ERROR_NOSUCHFIELD        => 'íĺńúůĺńňâóâŕůî ďîëĺ',
-            DB_ERROR_NOSUCHTABLE        => 'íĺńúůĺńňâóâŕůŕ ňŕáëčöŕ',
+            'LANG'                      => 'bg',
+            DB_ERROR                    => 'неизвеŃтна греŃка',
+            DB_ERROR_ALREADY_EXISTS     => 'вече ŃъщеŃтвŃва',
+            DB_ERROR_CANNOT_CREATE      => 'не може Đ´Đ° бъде Ńъздадена',
+            DB_ERROR_CANNOT_DELETE      => 'не може да бъде изтрита',
+            DB_ERROR_CANNOT_DROP        => 'не може Đ´Đ° бъде Ńнищожена',
+            DB_ERROR_CONSTRAINT         => 'нарŃŃено ŃŃловие',
+            DB_ERROR_DIVZERO            => 'деление на Đ˝Ńла',
+            DB_ERROR_INVALID            => 'неправилно',
+            DB_ERROR_INVALID_DATE       => 'некоректна Đ´Đ°Ń‚Đ° или чаŃ',
+            DB_ERROR_INVALID_NUMBER     => 'невалиден номер',
+            DB_ERROR_MISMATCH           => 'погреŃна Ńпотреба',
+            DB_ERROR_NODBSELECTED       => 'не е избрана база данни',
+            DB_ERROR_NOSUCHFIELD        => 'неŃъщеŃтвŃващо поле',
+            DB_ERROR_NOSUCHTABLE        => 'неŃъщеŃтвŃваща таблица',
             DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'íĺ ĺ íŕěĺđĺíŕ',
-            DB_ERROR_NOT_LOCKED         => 'íĺ ĺ çŕęëţ÷ĺíŕ',
-            DB_ERROR_SYNTAX             => 'ăđĺřĺí ńčíňŕęńčń',
-            DB_ERROR_UNSUPPORTED        => 'íĺ ńĺ ďîääúđćŕ',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'íĺęîđĺęňĺí áđîé ęîëîíč â đĺäŕ',
-            DB_ERROR_INVALID_DSN        => 'íĺâŕëčäĺí DSN',
-            DB_ERROR_CONNECT_FAILED     => 'âđúçęŕňŕ íĺ ěîćĺ äŕ áúäĺ îńúůĺńňâĺíŕ',
-            0	                        => 'í˙ěŕ ăđĺřęč', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ďđĺäîńňŕâĺíčňĺ äŕííč ńŕ íĺäîńňŕňú÷íč',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'đŕçřčđĺíčĺňî íĺ ĺ íŕěĺđĺíî',
-            DB_ERROR_NOSUCHDB           => 'íĺńúůĺńňâóâŕůŕ áŕçŕ äŕííč',
-            DB_ERROR_ACCESS_VIOLATION   => 'í˙ěŕňĺ äîńňŕňú÷íî ďđŕâŕ'
+            DB_ERROR_NOT_FOUND          => 'не е намерена',
+            DB_ERROR_NOT_LOCKED         => 'не е заключена',
+            DB_ERROR_SYNTAX             => 'греŃен ŃинтакŃиŃ',
+            DB_ERROR_UNSUPPORTED        => 'не Ńе поддържа',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'некоректен брой колони в реда',
+            DB_ERROR_INVALID_DSN        => 'невалиден DSN',
+            DB_ERROR_CONNECT_FAILED     => 'връзката не може Đ´Đ° бъде ĐľŃъщеŃтвена',
+            0	                        => 'няма греŃки', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'предоŃтавените данни ŃĐ° недоŃтатъчни',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'разŃирението не е намерено',
+            DB_ERROR_NOSUCHDB           => 'неŃъщеŃтвŃваща база данни',
+            DB_ERROR_ACCESS_VIOLATION   => 'нямате Đ´ĐľŃтатъчно права'
 );
-?>
-		
\ No newline at end of file
diff --git a/adodb/lang/adodb-bgutf8.inc.php b/adodb/lang/adodb-bgutf8.inc.php
deleted file mode 100644
index 6f3a417..0000000
--- a/adodb/lang/adodb-bgutf8.inc.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
-*/
-
-$ADODB_LANG_ARRAY = array (
-            'LANG'                      => 'bgutf8',
-            DB_ERROR                    => 'неизвеŃтна греŃка',
-            DB_ERROR_ALREADY_EXISTS     => 'вече ŃъщеŃтвŃва',
-            DB_ERROR_CANNOT_CREATE      => 'не може Đ´Đ° бъде Ńъздадена',
-            DB_ERROR_CANNOT_DELETE      => 'не може да бъде изтрита',
-            DB_ERROR_CANNOT_DROP        => 'не може Đ´Đ° бъде Ńнищожена',
-            DB_ERROR_CONSTRAINT         => 'нарŃŃено ŃŃловие',
-            DB_ERROR_DIVZERO            => 'деление на Đ˝Ńла',
-            DB_ERROR_INVALID            => 'неправилно',
-            DB_ERROR_INVALID_DATE       => 'некоректна Đ´Đ°Ń‚Đ° или чаŃ',
-            DB_ERROR_INVALID_NUMBER     => 'невалиден номер',
-            DB_ERROR_MISMATCH           => 'погреŃна Ńпотреба',
-            DB_ERROR_NODBSELECTED       => 'не е избрана база данни',
-            DB_ERROR_NOSUCHFIELD        => 'неŃъщеŃтвŃващо поле',
-            DB_ERROR_NOSUCHTABLE        => 'неŃъщеŃтвŃваща таблица',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'не е намерена',
-            DB_ERROR_NOT_LOCKED         => 'не е заключена',
-            DB_ERROR_SYNTAX             => 'греŃен ŃинтакŃиŃ',
-            DB_ERROR_UNSUPPORTED        => 'не Ńе поддържа',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'некоректен брой колони в реда',
-            DB_ERROR_INVALID_DSN        => 'невалиден DSN',
-            DB_ERROR_CONNECT_FAILED     => 'връзката не може Đ´Đ° бъде ĐľŃъщеŃтвена',
-            0	                        => 'няма греŃки', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'предоŃтавените данни ŃĐ° недоŃтатъчни',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'разŃирението не е намерено',
-            DB_ERROR_NOSUCHDB           => 'неŃъщеŃтвŃваща база данни',
-            DB_ERROR_ACCESS_VIOLATION   => 'нямате Đ´ĐľŃтатъчно права'
-);
-?>
-		
\ No newline at end of file
diff --git a/adodb/lang/adodb-ca.inc.php b/adodb/lang/adodb-ca.inc.php
index 081f632..4b04688 100644
--- a/adodb/lang/adodb-ca.inc.php
+++ b/adodb/lang/adodb-ca.inc.php
@@ -1,6 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'ca',
             DB_ERROR                    => 'error desconegut',
@@ -8,28 +27,26 @@
             DB_ERROR_CANNOT_CREATE      => 'no es pot crear',
             DB_ERROR_CANNOT_DELETE      => 'no es pot esborrar',
             DB_ERROR_CANNOT_DROP        => 'no es pot eliminar',
-            DB_ERROR_CONSTRAINT         => 'violació de constraint',
-            DB_ERROR_DIVZERO            => 'divisió per zero',
-            DB_ERROR_INVALID            => 'no és vŕlid',
-            DB_ERROR_INVALID_DATE       => 'la data o l\'hora no són vŕlides',
-            DB_ERROR_INVALID_NUMBER     => 'el nombre no és vŕlid',
-            DB_ERROR_MISMATCH           => 'no hi ha coincidčncia',
+            DB_ERROR_CONSTRAINT         => 'violaciĂł de constraint',
+            DB_ERROR_DIVZERO            => 'divisiĂł per zero',
+            DB_ERROR_INVALID            => 'no Ă©s vĂ lid',
+            DB_ERROR_INVALID_DATE       => 'la data o l\'hora no sĂłn vĂ lides',
+            DB_ERROR_INVALID_NUMBER     => 'el nombre no Ă©s vĂ lid',
+            DB_ERROR_MISMATCH           => 'no hi ha coincidència',
             DB_ERROR_NODBSELECTED       => 'cap base de dades seleccionada',
             DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
             DB_ERROR_NOSUCHTABLE        => 'taula inexistent',
-            DB_ERROR_NOT_CAPABLE        => 'l\'execució secundŕria de DB no pot',
+            DB_ERROR_NOT_CAPABLE        => 'l\'execuciĂł secundĂ ria de DB no pot',
             DB_ERROR_NOT_FOUND          => 'no trobat',
             DB_ERROR_NOT_LOCKED         => 'no blocat',
             DB_ERROR_SYNTAX             => 'error de sintaxi',
             DB_ERROR_UNSUPPORTED        => 'no suportat',
             DB_ERROR_VALUE_COUNT_ON_ROW => 'el nombre de columnes no coincideix amb el nombre de valors en la fila',
-            DB_ERROR_INVALID_DSN        => 'el DSN no és vŕlid',
-            DB_ERROR_CONNECT_FAILED     => 'connexió fallida',
+            DB_ERROR_INVALID_DSN        => 'el DSN no Ă©s vĂ lid',
+            DB_ERROR_CONNECT_FAILED     => 'connexiĂł fallida',
             0	                       => 'cap error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'les dades subministrades són insuficients',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensió no trobada',
+            DB_ERROR_NEED_MORE_DATA     => 'les dades subministrades sĂłn insuficients',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensiĂł no trobada',
             DB_ERROR_NOSUCHDB           => 'base de dades inexistent',
             DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficients'
 );
-?>
-		
\ No newline at end of file
diff --git a/adodb/lang/adodb-cn.inc.php b/adodb/lang/adodb-cn.inc.php
index 44d5f49..512ffb8 100644
--- a/adodb/lang/adodb-cn.inc.php
+++ b/adodb/lang/adodb-cn.inc.php
@@ -1,35 +1,52 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'cn',
-            DB_ERROR                    => 'δ֪´íÎó',
-            DB_ERROR_ALREADY_EXISTS     => 'ŇŃľ­´ćÔÚ',
-            DB_ERROR_CANNOT_CREATE      => '˛»ÄÜ´´˝¨',
-            DB_ERROR_CANNOT_DELETE      => '˛»ÄÜÉľłý',
-            DB_ERROR_CANNOT_DROP        => '˛»ÄܶŞĆú',
-            DB_ERROR_CONSTRAINT         => 'ÔĽĘřĎŢÖĆ',
-            DB_ERROR_DIVZERO            => '±»0łý',
-            DB_ERROR_INVALID            => 'ÎŢЧ',
-            DB_ERROR_INVALID_DATE       => 'ÎŢЧµÄČŐĆÚ»ňŐßʱĽä',
-            DB_ERROR_INVALID_NUMBER     => 'ÎŢЧµÄĘý×Ö',
-            DB_ERROR_MISMATCH           => '˛»ĆĄĹä',
-            DB_ERROR_NODBSELECTED       => 'Ă»ÓĐĘýľÝżâ±»ŃˇÔń',
-            DB_ERROR_NOSUCHFIELD        => 'Ă»ÓĐĎŕÓ¦µÄ×Ö¶Î',
-            DB_ERROR_NOSUCHTABLE        => 'Ă»ÓĐĎŕÓ¦µÄ±í',
-            DB_ERROR_NOT_CAPABLE        => 'ĘýľÝżâşǫ́˛»ĽćČÝ',
-            DB_ERROR_NOT_FOUND          => 'Ă»ÓĐ·˘ĎÖ',
-            DB_ERROR_NOT_LOCKED         => 'Ă»Óб»Ëř¶¨',
-            DB_ERROR_SYNTAX             => 'Óď·¨´íÎó',
-            DB_ERROR_UNSUPPORTED        => '˛»Ö§łÖ',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'ÔÚĐĐÉĎŔŰĽĆÖµ',
-            DB_ERROR_INVALID_DSN        => 'ÎŢЧµÄĘýľÝÔ´ (DSN)',
-            DB_ERROR_CONNECT_FAILED     => 'Á¬˝Óʧ°Ü',
-            0	                       => 'Ă»ÓĐ´íÎó', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'Ěáą©µÄĘýľÝ˛»ÄÜ·űşĎŇŞÇó',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'Ŕ©ŐąĂ»Óб»·˘ĎÖ',
-            DB_ERROR_NOSUCHDB           => 'Ă»ÓĐĎŕÓ¦µÄĘýľÝżâ',
-            DB_ERROR_ACCESS_VIOLATION   => 'Ă»ÓĐşĎĘʵÄȨĎŢ'
+            DB_ERROR                    => '未知错误',
+            DB_ERROR_ALREADY_EXISTS     => '已经ĺ­ĺś¨',
+            DB_ERROR_CANNOT_CREATE      => '不č˝ĺ›ĺ»ş',
+            DB_ERROR_CANNOT_DELETE      => '不č˝ĺ é™¤',
+            DB_ERROR_CANNOT_DROP        => '不č˝ä¸˘ĺĽ',
+            DB_ERROR_CONSTRAINT         => '约束é™ĺ¶',
+            DB_ERROR_DIVZERO            => '被0除',
+            DB_ERROR_INVALID            => 'ć— ć•',
+            DB_ERROR_INVALID_DATE       => 'ć— ć•çš„ć—Ąćśźć–者时间',
+            DB_ERROR_INVALID_NUMBER     => 'ć— ć•çš„ć•°ĺ­—',
+            DB_ERROR_MISMATCH           => '不匹配',
+            DB_ERROR_NODBSELECTED       => '没有数据库被选择',
+            DB_ERROR_NOSUCHFIELD        => '没有相应的字段',
+            DB_ERROR_NOSUCHTABLE        => '没有相应的表',
+            DB_ERROR_NOT_CAPABLE        => '数据库ĺŽĺŹ°ä¸Ťĺ…Ľĺ®ą',
+            DB_ERROR_NOT_FOUND          => '没有发现',
+            DB_ERROR_NOT_LOCKED         => '没有被é”定',
+            DB_ERROR_SYNTAX             => '语法错误',
+            DB_ERROR_UNSUPPORTED        => '不支ćŚ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => '在行上累计值',
+            DB_ERROR_INVALID_DSN        => 'ć— ć•çš„ć•°ćŤ®ćş (DSN)',
+            DB_ERROR_CONNECT_FAILED     => '连接失败',
+            0	                       => '没有错误', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ćŹäľ›çš„数据不č˝ç¬¦ĺč¦ć±‚',
+            DB_ERROR_EXTENSION_NOT_FOUND=> '扩展没有被发现',
+            DB_ERROR_NOSUCHDB           => '没有相应的数据库',
+            DB_ERROR_ACCESS_VIOLATION   => '没有ĺ适的ćťé™'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-cz.inc.php b/adodb/lang/adodb-cz.inc.php
index 1f5c08a..eb2fb2e 100644
--- a/adodb/lang/adodb-cz.inc.php
+++ b/adodb/lang/adodb-cz.inc.php
@@ -1,40 +1,52 @@
 
+/**
+ * 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',
-            DB_ERROR                    => 'neznámá chyba',
+            DB_ERROR                    => 'neznámá chyba',
             DB_ERROR_ALREADY_EXISTS     => 'ji? existuje',
             DB_ERROR_CANNOT_CREATE      => 'nelze vytvo?it',
             DB_ERROR_CANNOT_DELETE      => 'nelze smazat',
             DB_ERROR_CANNOT_DROP        => 'nelze odstranit',
-            DB_ERROR_CONSTRAINT         => 'poru?ení omezující podmínky',
-            DB_ERROR_DIVZERO            => 'd?lení nulou',
-            DB_ERROR_INVALID            => 'neplatné',
-            DB_ERROR_INVALID_DATE       => 'neplatné datum nebo ?as',
-            DB_ERROR_INVALID_NUMBER     => 'neplatné ?íslo',
-            DB_ERROR_MISMATCH           => 'nesouhlasí',
-            DB_ERROR_NODBSELECTED       => '?ádná databáze není vybrána',
+            DB_ERROR_CONSTRAINT         => 'poru?enĂ­ omezujĂ­cĂ­ podmĂ­nky',
+            DB_ERROR_DIVZERO            => 'd?lenĂ­ nulou',
+            DB_ERROR_INVALID            => 'neplatné',
+            DB_ERROR_INVALID_DATE       => 'neplatné datum nebo ?as',
+            DB_ERROR_INVALID_NUMBER     => 'neplatné ?íslo',
+            DB_ERROR_MISMATCH           => 'nesouhlasĂ­',
+            DB_ERROR_NODBSELECTED       => '?ádná databáze není vybrána',
             DB_ERROR_NOSUCHFIELD        => 'pole nenalezeno',
             DB_ERROR_NOSUCHTABLE        => 'tabulka nenalezena',
-            DB_ERROR_NOT_CAPABLE        => 'nepodporováno',
+            DB_ERROR_NOT_CAPABLE        => 'nepodporováno',
             DB_ERROR_NOT_FOUND          => 'nenalezeno',
             DB_ERROR_NOT_LOCKED         => 'nezam?eno',
-            DB_ERROR_SYNTAX             => 'syntaktická chyba',
-            DB_ERROR_UNSUPPORTED        => 'nepodporováno',
+            DB_ERROR_SYNTAX             => 'syntaktická chyba',
+            DB_ERROR_UNSUPPORTED        => 'nepodporováno',
             DB_ERROR_VALUE_COUNT_ON_ROW => '',
-            DB_ERROR_INVALID_DSN        => 'neplatné DSN',
-            DB_ERROR_CONNECT_FAILED     => 'p?ipojení selhalo',
+            DB_ERROR_INVALID_DSN        => 'neplatné DSN',
+            DB_ERROR_CONNECT_FAILED     => 'p?ipojenĂ­ selhalo',
             0	                        => 'bez chyb', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'málo zdrojových dat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'roz?í?ení nenalezeno',
-            DB_ERROR_NOSUCHDB           => 'databáze neexistuje',
-            DB_ERROR_ACCESS_VIOLATION   => 'nedostate?ná práva'
+            DB_ERROR_NEED_MORE_DATA     => 'málo zdrojových dat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'roz?Ă­?enĂ­ nenalezeno',
+            DB_ERROR_NOSUCHDB           => 'databáze neexistuje',
+            DB_ERROR_ACCESS_VIOLATION   => 'nedostate?ná práva'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-da.inc.php b/adodb/lang/adodb-da.inc.php
index ca0e72d..e4c655b 100644
--- a/adodb/lang/adodb-da.inc.php
+++ b/adodb/lang/adodb-da.inc.php
@@ -1,5 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
   	    'LANG'                      => 'da',
             DB_ERROR                    => 'ukendt fejl',
@@ -7,7 +27,7 @@
             DB_ERROR_CANNOT_CREATE      => 'kan ikke oprette',
             DB_ERROR_CANNOT_DELETE      => 'kan ikke slette',
             DB_ERROR_CANNOT_DROP        => 'kan ikke droppe',
-            DB_ERROR_CONSTRAINT         => 'begrænsning krænket',
+            DB_ERROR_CONSTRAINT         => 'begrænsning krænket',
             DB_ERROR_DIVZERO            => 'division med nul',
             DB_ERROR_INVALID            => 'ugyldig',
             DB_ERROR_INVALID_DATE       => 'ugyldig dato eller klokkeslet',
@@ -18,16 +38,15 @@
             DB_ERROR_NOSUCHTABLE        => 'tabel findes ikke',
             DB_ERROR_NOT_CAPABLE        => 'DB backend opgav',
             DB_ERROR_NOT_FOUND          => 'ikke fundet',
-            DB_ERROR_NOT_LOCKED         => 'ikke låst',
+            DB_ERROR_NOT_LOCKED         => 'ikke lĂĄst',
             DB_ERROR_SYNTAX             => 'syntaksfejl',
-            DB_ERROR_UNSUPPORTED        => 'ikke understøttet',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'resulterende antal felter svarer ikke til forespørgslens antal felter',
+            DB_ERROR_UNSUPPORTED        => 'ikke understøttet',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'resulterende antal felter svarer ikke til forespørgslens antal felter',
             DB_ERROR_INVALID_DSN        => 'ugyldig DSN',
             DB_ERROR_CONNECT_FAILED     => 'tilslutning mislykkedes',
             0	                        => 'ingen fejl', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'utilstrækkelige data angivet',
+            DB_ERROR_NEED_MORE_DATA     => 'utilstrækkelige data angivet',
             DB_ERROR_EXTENSION_NOT_FOUND=> 'udvidelse ikke fundet',
             DB_ERROR_NOSUCHDB           => 'database ikke fundet',
-            DB_ERROR_ACCESS_VIOLATION   => 'utilstrækkelige rettigheder'
+            DB_ERROR_ACCESS_VIOLATION   => 'utilstrækkelige rettigheder'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-de.inc.php b/adodb/lang/adodb-de.inc.php
index 44c57e9..a02dd72 100644
--- a/adodb/lang/adodb-de.inc.php
+++ b/adodb/lang/adodb-de.inc.php
@@ -1,33 +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'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-en.inc.php b/adodb/lang/adodb-en.inc.php
index ed1b8f1..74c4ea0 100644
--- a/adodb/lang/adodb-en.inc.php
+++ b/adodb/lang/adodb-en.inc.php
@@ -1,4 +1,23 @@
  'en',
@@ -28,7 +47,8 @@
             DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
             DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
             DB_ERROR_NOSUCHDB           => 'no such database',
-            DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions'
+            DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions',
+            DB_ERROR_DEADLOCK           => 'deadlock detected',
+            DB_ERROR_STATEMENT_TIMEOUT  => 'statement timeout',
+            DB_ERROR_SERIALIZATION_FAILURE => 'could not serialize access'
 );
-?>
-		
\ No newline at end of file
diff --git a/adodb/lang/adodb-esperanto.inc.php b/adodb/lang/adodb-eo.inc.php
similarity index 59%
rename from adodb/lang/adodb-esperanto.inc.php
rename to adodb/lang/adodb-eo.inc.php
index 16ca00e..107a3b3 100644
--- a/adodb/lang/adodb-esperanto.inc.php
+++ b/adodb/lang/adodb-eo.inc.php
@@ -1,6 +1,24 @@
 
+ */
 
 $ADODB_LANG_ARRAY = array (
              'LANG'                      => 'eo',
@@ -9,7 +27,7 @@
             DB_ERROR_CANNOT_CREATE      => 'maleblas krei',
             DB_ERROR_CANNOT_DELETE      => 'maleblas elimini',
             DB_ERROR_CANNOT_DROP        => 'maleblas elimini (drop)',
-            DB_ERROR_CONSTRAINT         => 'rompo de kondicxoj de provo',
+            DB_ERROR_CONSTRAINT         => 'rompo de kondiĉoj de provo',
             DB_ERROR_DIVZERO            => 'divido per 0 (nul)',
             DB_ERROR_INVALID            => 'malregule',
             DB_ERROR_INVALID_DATE       => 'malregula dato kaj tempo',
@@ -26,10 +44,9 @@
             DB_ERROR_VALUE_COUNT_ON_ROW => 'nombrilo de valoroj en linio',
             DB_ERROR_INVALID_DSN        => 'malregula DSN-o',
             DB_ERROR_CONNECT_FAILED     => 'konekto malsukcesa',
-            0                               => 'cxio bone', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ne suficxe da datumo',
+            0                               => 'ĉio bone', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ne sufiĉe da datumo',
             DB_ERROR_EXTENSION_NOT_FOUND=> 'etendo ne trovita',
             DB_ERROR_NOSUCHDB           => 'datumbazo ne ekzistas',
-            DB_ERROR_ACCESS_VIOLATION   => 'ne suficxe da rajto por atingo'
+            DB_ERROR_ACCESS_VIOLATION   => 'ne sufiĉe da rajto por atingo'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-es.inc.php b/adodb/lang/adodb-es.inc.php
index 1e0afbb..bcb0cce 100644
--- a/adodb/lang/adodb-es.inc.php
+++ b/adodb/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',
@@ -30,4 +50,3 @@
             DB_ERROR_NOSUCHDB           => 'base de datos no encontrada',
             DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficientes'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-fa.inc.php b/adodb/lang/adodb-fa.inc.php
new file mode 100644
index 0000000..84f17bd
--- /dev/null
+++ b/adodb/lang/adodb-fa.inc.php
@@ -0,0 +1,52 @@
+
+ */
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'fa',
+            DB_ERROR                    => 'خطای ناشناخته',
+            DB_ERROR_ALREADY_EXISTS     => 'ŮجŮŘŻ دارد',
+            DB_ERROR_CANNOT_CREATE      => 'امکان create ŮجŮŘŻ ندارد',
+            DB_ERROR_CANNOT_DELETE      => 'امکان Ř­Ř°Ů ŮجŮŘŻ ندارد',
+            DB_ERROR_CANNOT_DROP        => 'امکان drop ŮجŮŘŻ ندارد',
+            DB_ERROR_CONSTRAINT         => 'نقض شرط',
+            DB_ERROR_DIVZERO            => 'تقسیم بر صŮر',
+            DB_ERROR_INVALID            => 'نامعتبر',
+            DB_ERROR_INVALID_DATE       => 'زمان یا تاریخ نامعتبر',
+            DB_ERROR_INVALID_NUMBER     => 'عدد نامعتبر',
+            DB_ERROR_MISMATCH           => 'عدم مطابقت',
+            DB_ERROR_NODBSELECTED       => 'بانک اطلاعاتی انتخاب نشده است',
+            DB_ERROR_NOSUCHFIELD        => 'چنین ستŮنی ŮجŮŘŻ ندارد',
+            DB_ERROR_NOSUCHTABLE        => 'چنین جدŮŮ„ŰŚ ŮجŮŘŻ ندارد',
+            DB_ERROR_NOT_CAPABLE        => 'backend بانک اطلاعاتی قادر نیست',
+            DB_ERROR_NOT_FOUND          => 'پیدا نشد',
+            DB_ERROR_NOT_LOCKED         => 'Ů‚ŮŮ„ نشده',
+            DB_ERROR_SYNTAX             => 'خطای دستŮری',
+            DB_ERROR_UNSUPPORTED        => 'پشتیبانی نمی Ř´ŮŘŻ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'شمارش مقادیر رŮŰŚ ردیŮ',
+            DB_ERROR_INVALID_DSN        => 'DSN نامعتبر',
+            DB_ERROR_CONNECT_FAILED     => 'ارتباط برقرار نشد',
+            0	                       => 'بدŮن خطا', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'داده ناکاŮŰŚ است',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension پیدا نشد',
+            DB_ERROR_NOSUCHDB           => 'چنین بانک اطلاعاتی ŮجŮŘŻ ندارد',
+            DB_ERROR_ACCESS_VIOLATION   => 'Ř­Ů‚ دسترسی ناکاŮŰŚ'
+);
diff --git a/adodb/lang/adodb-fr.inc.php b/adodb/lang/adodb-fr.inc.php
index 11127cd..b010d1e 100644
--- a/adodb/lang/adodb-fr.inc.php
+++ b/adodb/lang/adodb-fr.inc.php
@@ -1,33 +1,51 @@
  'fr',
 	DB_ERROR                    => 'erreur inconnue',
-	DB_ERROR_ALREADY_EXISTS     => 'existe déjà',
-	DB_ERROR_CANNOT_CREATE      => 'crétion impossible',
+	DB_ERROR_ALREADY_EXISTS     => 'existe déjà',
+	DB_ERROR_CANNOT_CREATE      => 'création impossible',
 	DB_ERROR_CANNOT_DELETE      => 'effacement impossible',
 	DB_ERROR_CANNOT_DROP        => 'suppression impossible',
 	DB_ERROR_CONSTRAINT         => 'violation de contrainte',
-	DB_ERROR_DIVZERO            => 'division par zéro',
+	DB_ERROR_DIVZERO            => 'division par zéro',
 	DB_ERROR_INVALID            => 'invalide',
 	DB_ERROR_INVALID_DATE       => 'date ou heure invalide',
 	DB_ERROR_INVALID_NUMBER     => 'nombre invalide',
 	DB_ERROR_MISMATCH           => 'erreur de concordance',
-	DB_ERROR_NODBSELECTED       => 'pas de base de donnéessélectionnée',
+	DB_ERROR_NODBSELECTED       => 'pas de base de données sélectionnée',
 	DB_ERROR_NOSUCHFIELD        => 'nom de colonne invalide',
 	DB_ERROR_NOSUCHTABLE        => 'table ou vue inexistante',
-	DB_ERROR_NOT_CAPABLE        => 'fonction optionnelle non installée',
-	DB_ERROR_NOT_FOUND          => 'pas trouvé',
-	DB_ERROR_NOT_LOCKED         => 'non verrouillé',
+	DB_ERROR_NOT_CAPABLE        => 'fonction optionnelle non installée',
+	DB_ERROR_NOT_FOUND          => 'pas trouvé',
+	DB_ERROR_NOT_LOCKED         => 'non verrouillé',
 	DB_ERROR_SYNTAX             => 'erreur de syntaxe',
-	DB_ERROR_UNSUPPORTED        => 'non supporté',
-	DB_ERROR_VALUE_COUNT_ON_ROW => 'valeur insérée trop grande pour colonne',
+	DB_ERROR_UNSUPPORTED        => 'non supporté',
+	DB_ERROR_VALUE_COUNT_ON_ROW => 'valeur insérée trop grande pour colonne',
 	DB_ERROR_INVALID_DSN        => 'DSN invalide',
-	DB_ERROR_CONNECT_FAILED     => 'échec à la connexion',
+	DB_ERROR_CONNECT_FAILED     => 'Ă©chec Ă  la connexion',
 	0                        => "pas d'erreur", // DB_OK
-	DB_ERROR_NEED_MORE_DATA     => 'données fournies insuffisantes',
-	DB_ERROR_EXTENSION_NOT_FOUND=> 'extension non trouvée',
-	DB_ERROR_NOSUCHDB           => 'base de données inconnue',
+	DB_ERROR_NEED_MORE_DATA     => 'données fournies insuffisantes',
+	DB_ERROR_EXTENSION_NOT_FOUND=> 'extension non trouvée',
+	DB_ERROR_NOSUCHDB           => 'base de données inconnue',
 	DB_ERROR_ACCESS_VIOLATION   => 'droits insuffisants'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-hu.inc.php b/adodb/lang/adodb-hu.inc.php
index d6f0ef8..5a73827 100644
--- a/adodb/lang/adodb-hu.inc.php
+++ b/adodb/lang/adodb-hu.inc.php
@@ -1,34 +1,52 @@
 
+/**
+ * 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',
-            DB_ERROR_ALREADY_EXISTS     => 'már létezik',
-            DB_ERROR_CANNOT_CREATE      => 'nem sikerült létrehozni',
-            DB_ERROR_CANNOT_DELETE      => 'nem sikerült törölni',
-            DB_ERROR_CANNOT_DROP        => 'nem sikerült eldobni',
-            DB_ERROR_CONSTRAINT         => 'szabályok megszegése',
-            DB_ERROR_DIVZERO            => 'osztás nullával',
-            DB_ERROR_INVALID            => 'érvénytelen',
-            DB_ERROR_INVALID_DATE       => 'érvénytelen dátum vagy idő',
-            DB_ERROR_INVALID_NUMBER     => 'érvénytelen szám',
-            DB_ERROR_MISMATCH           => 'nem megfelelő',
-            DB_ERROR_NODBSELECTED       => 'nincs kiválasztott adatbázis',
-            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mező',
-            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen tábla',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend nem támogatja',
-            DB_ERROR_NOT_FOUND          => 'nem található',
-            DB_ERROR_NOT_LOCKED         => 'nincs lezárva',
+            DB_ERROR_ALREADY_EXISTS     => 'már létezik',
+            DB_ERROR_CANNOT_CREATE      => 'nem sikerült létrehozni',
+            DB_ERROR_CANNOT_DELETE      => 'nem sikerült törölni',
+            DB_ERROR_CANNOT_DROP        => 'nem sikerĂĽlt eldobni',
+            DB_ERROR_CONSTRAINT         => 'szabályok megszegése',
+            DB_ERROR_DIVZERO            => 'osztás nullával',
+            DB_ERROR_INVALID            => 'érvénytelen',
+            DB_ERROR_INVALID_DATE       => 'érvénytelen dátum vagy idő',
+            DB_ERROR_INVALID_NUMBER     => 'érvénytelen szám',
+            DB_ERROR_MISMATCH           => 'nem megfelelő',
+            DB_ERROR_NODBSELECTED       => 'nincs kiválasztott adatbázis',
+            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mező',
+            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen tábla',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend nem támogatja',
+            DB_ERROR_NOT_FOUND          => 'nem található',
+            DB_ERROR_NOT_LOCKED         => 'nincs lezárva',
             DB_ERROR_SYNTAX             => 'szintaktikai hiba',
-            DB_ERROR_UNSUPPORTED        => 'nem támogatott',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron végzett érték számlálás',
-            DB_ERROR_INVALID_DSN        => 'hibás DSN',
-            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakozás',
+            DB_ERROR_UNSUPPORTED        => 'nem támogatott',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron végzett érték számlálás',
+            DB_ERROR_INVALID_DSN        => 'hibás DSN',
+            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakozás',
             0	                       => 'nincs hiba', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'túl kevés az adat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'bővítmény nem található',
-            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatbázis',
-            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosultság'
+            DB_ERROR_NEED_MORE_DATA     => 'túl kevés az adat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'bővítmény nem található',
+            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatbázis',
+            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosultság'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-id.inc.php b/adodb/lang/adodb-id.inc.php
new file mode 100644
index 0000000..abd38ee
--- /dev/null
+++ b/adodb/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/adodb/lang/adodb-it.inc.php b/adodb/lang/adodb-it.inc.php
index ac5cc5a..a651630 100644
--- a/adodb/lang/adodb-it.inc.php
+++ b/adodb/lang/adodb-it.inc.php
@@ -1,10 +1,29 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'it',
             DB_ERROR                    => 'errore sconosciuto',
-            DB_ERROR_ALREADY_EXISTS     => 'esiste già',
+            DB_ERROR_ALREADY_EXISTS     => 'esiste giĂ ',
             DB_ERROR_CANNOT_CREATE      => 'non posso creare',
             DB_ERROR_CANNOT_DELETE      => 'non posso cancellare',
             DB_ERROR_CANNOT_DROP        => 'non posso eliminare',
@@ -31,4 +50,3 @@
             DB_ERROR_NOSUCHDB           => 'database non trovato',
             DB_ERROR_ACCESS_VIOLATION   => 'permessi insufficienti'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-nl.inc.php b/adodb/lang/adodb-nl.inc.php
index abe77b5..8a89819 100644
--- a/adodb/lang/adodb-nl.inc.php
+++ b/adodb/lang/adodb-nl.inc.php
@@ -1,5 +1,25 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'nl',
             DB_ERROR                    => 'onbekende fout',
@@ -30,4 +50,3 @@
             DB_ERROR_NOSUCHDB           => 'onbekende database',
             DB_ERROR_ACCESS_VIOLATION   => 'onvoldoende rechten'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-oc.inc.php b/adodb/lang/adodb-oc.inc.php
new file mode 100644
index 0000000..3481e79
--- /dev/null
+++ b/adodb/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/adodb/lang/adodb-pl.inc.php b/adodb/lang/adodb-pl.inc.php
index aee5bfd..f855153 100644
--- a/adodb/lang/adodb-pl.inc.php
+++ b/adodb/lang/adodb-pl.inc.php
@@ -1,36 +1,52 @@
 
+/**
+ * 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',
-            DB_ERROR                    => 'niezidentyfikowany bł±d',
-            DB_ERROR_ALREADY_EXISTS     => 'już istniej±',
-            DB_ERROR_CANNOT_CREATE      => 'nie można stworzyć',
-            DB_ERROR_CANNOT_DELETE      => 'nie można usun±ć',
-            DB_ERROR_CANNOT_DROP        => 'nie można porzucić',
-            DB_ERROR_CONSTRAINT         => 'pogwałcenie uprawnień',
+            DB_ERROR                    => 'niezidentyfikowany błąd',
+            DB_ERROR_ALREADY_EXISTS     => 'juĹĽ istniejÄ…',
+            DB_ERROR_CANNOT_CREATE      => 'nie można stworzyć',
+            DB_ERROR_CANNOT_DELETE      => 'nie można usunąć',
+            DB_ERROR_CANNOT_DROP        => 'nie można porzucić',
+            DB_ERROR_CONSTRAINT         => 'pogwałcenie uprawnień',
             DB_ERROR_DIVZERO            => 'dzielenie przez zero',
-            DB_ERROR_INVALID            => 'błędny',
-            DB_ERROR_INVALID_DATE       => 'błędna godzina lub data',
-            DB_ERROR_INVALID_NUMBER     => 'błędny numer',
+            DB_ERROR_INVALID            => 'błędny',
+            DB_ERROR_INVALID_DATE       => 'błędna godzina lub data',
+            DB_ERROR_INVALID_NUMBER     => 'błędny numer',
             DB_ERROR_MISMATCH           => 'niedopasowanie',
-            DB_ERROR_NODBSELECTED       => 'baza danych nie została wybrana',
+            DB_ERROR_NODBSELECTED       => 'baza danych nie została wybrana',
             DB_ERROR_NOSUCHFIELD        => 'nie znaleziono pola',
             DB_ERROR_NOSUCHTABLE        => 'nie znaleziono tabeli',
             DB_ERROR_NOT_CAPABLE        => 'nie zdolny',
             DB_ERROR_NOT_FOUND          => 'nie znaleziono',
-            DB_ERROR_NOT_LOCKED         => 'nie zakmnięty',
-            DB_ERROR_SYNTAX             => 'bł±d składni',
-            DB_ERROR_UNSUPPORTED        => 'nie obsługuje',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'warto¶ć liczona w szeregu',
-            DB_ERROR_INVALID_DSN        => 'błędny DSN',
-            DB_ERROR_CONNECT_FAILED     => 'poł±czenie nie zostało zrealizowane',
-            0	                       => 'brak błędów', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilo¶ć informacji',
+            DB_ERROR_NOT_LOCKED         => 'nie zakmnięty',
+            DB_ERROR_SYNTAX             => 'błąd składni',
+            DB_ERROR_UNSUPPORTED        => 'nie obsługuje',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'wartość liczona w szeregu',
+            DB_ERROR_INVALID_DSN        => 'błędny DSN',
+            DB_ERROR_CONNECT_FAILED     => 'połączenie nie zostało zrealizowane',
+            0	                       => 'brak błędów', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilość informacji',
             DB_ERROR_EXTENSION_NOT_FOUND=> 'nie znaleziono rozszerzenia',
             DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
             DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
 );
-?>
-		
\ No newline at end of file
diff --git a/adodb/lang/adodb-pt-br.inc.php b/adodb/lang/adodb-pt-br.inc.php
index 320cce8..b6c0d1c 100644
--- a/adodb/lang/adodb-pt-br.inc.php
+++ b/adodb/lang/adodb-pt-br.inc.php
@@ -1,35 +1,53 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'pt-br',
             DB_ERROR                    => 'erro desconhecido',
-            DB_ERROR_ALREADY_EXISTS     => 'já existe',
-            DB_ERROR_CANNOT_CREATE      => 'impossível criar',
-            DB_ERROR_CANNOT_DELETE      => 'impossível excluír',
-            DB_ERROR_CANNOT_DROP        => 'impossível remover',
-            DB_ERROR_CONSTRAINT         => 'violaçăo do confinamente',
-            DB_ERROR_DIVZERO            => 'divisăo por zero',
-            DB_ERROR_INVALID            => 'inválido',
-            DB_ERROR_INVALID_DATE       => 'data ou hora inválida',
-            DB_ERROR_INVALID_NUMBER     => 'número inválido',
+            DB_ERROR_ALREADY_EXISTS     => 'já existe',
+            DB_ERROR_CANNOT_CREATE      => 'impossĂ­vel criar',
+            DB_ERROR_CANNOT_DELETE      => 'impossĂ­vel excluĂ­r',
+            DB_ERROR_CANNOT_DROP        => 'impossĂ­vel remover',
+            DB_ERROR_CONSTRAINT         => 'violação do confinamente',
+            DB_ERROR_DIVZERO            => 'divisĂŁo por zero',
+            DB_ERROR_INVALID            => 'inválido',
+            DB_ERROR_INVALID_DATE       => 'data ou hora inválida',
+            DB_ERROR_INVALID_NUMBER     => 'número inválido',
             DB_ERROR_MISMATCH           => 'erro',
             DB_ERROR_NODBSELECTED       => 'nenhum banco de dados selecionado',
-            DB_ERROR_NOSUCHFIELD        => 'campo inválido',
+            DB_ERROR_NOSUCHFIELD        => 'campo inválido',
             DB_ERROR_NOSUCHTABLE        => 'tabela inexistente',
-            DB_ERROR_NOT_CAPABLE        => 'capacidade inválida para este BD',
-            DB_ERROR_NOT_FOUND          => 'năo encontrado',
-            DB_ERROR_NOT_LOCKED         => 'năo bloqueado',
+            DB_ERROR_NOT_CAPABLE        => 'capacidade inválida para este BD',
+            DB_ERROR_NOT_FOUND          => 'nĂŁo encontrado',
+            DB_ERROR_NOT_LOCKED         => 'nĂŁo bloqueado',
             DB_ERROR_SYNTAX             => 'erro de sintaxe',
-            DB_ERROR_UNSUPPORTED        => 
-'năo suportado',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'a quantidade de colunas năo corresponde ao de valores',
-            DB_ERROR_INVALID_DSN        => 'DSN inválido',
-            DB_ERROR_CONNECT_FAILED     => 'falha na conexăo',
+            DB_ERROR_UNSUPPORTED        =>
+'nĂŁo suportado',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'a quantidade de colunas nĂŁo corresponde ao de valores',
+            DB_ERROR_INVALID_DSN        => 'DSN inválido',
+            DB_ERROR_CONNECT_FAILED     => 'falha na conexĂŁo',
             0				=> 'sem erro', // DB_OK
             DB_ERROR_NEED_MORE_DATA     => 'dados insuficientes',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensăo năo encontrada',
-            DB_ERROR_NOSUCHDB           => 'banco de dados năo encontrado',
-            DB_ERROR_ACCESS_VIOLATION   => 'permissăo insuficiente'
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensĂŁo nĂŁo encontrada',
+            DB_ERROR_NOSUCHDB           => 'banco de dados nĂŁo encontrado',
+            DB_ERROR_ACCESS_VIOLATION   => 'permissĂŁo insuficiente'
 );
-?>
diff --git a/adodb/lang/adodb-ro.inc.php b/adodb/lang/adodb-ro.inc.php
index 7c9aa52..011c016 100644
--- a/adodb/lang/adodb-ro.inc.php
+++ b/adodb/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',
@@ -32,5 +50,3 @@
             DB_ERROR_NOSUCHDB           => 'nu exista baza de date',
             DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
 );
-?>
-
diff --git a/adodb/lang/adodb-ru.inc.php b/adodb/lang/adodb-ru.inc.php
new file mode 100644
index 0000000..a311784
--- /dev/null
+++ b/adodb/lang/adodb-ru.inc.php
@@ -0,0 +1,52 @@
+
+ */
+
+$ADODB_LANG_ARRAY = array (
+             'LANG'                      => 'ru',
+            DB_ERROR                    => 'неизвеŃтная ĐľŃибка',
+            DB_ERROR_ALREADY_EXISTS     => 'Ńже ŃŃщеŃтвŃет',
+            DB_ERROR_CANNOT_CREATE      => 'невозможно Ńоздать',
+            DB_ERROR_CANNOT_DELETE      => 'невозможно Ńдалить',
+            DB_ERROR_CANNOT_DROP        => 'невозможно Ńдалить (drop)',
+            DB_ERROR_CONSTRAINT         => 'нарŃŃение ŃŃловий проверки',
+            DB_ERROR_DIVZERO            => 'деление на 0',
+            DB_ERROR_INVALID            => 'неправильно',
+            DB_ERROR_INVALID_DATE       => 'некорректная дата или время',
+            DB_ERROR_INVALID_NUMBER     => 'некорректное чиŃло',
+            DB_ERROR_MISMATCH           => 'ĐľŃибка',
+            DB_ERROR_NODBSELECTED       => 'БД не выбрана',
+            DB_ERROR_NOSUCHFIELD        => 'не ŃŃщеŃтвŃет поле',
+            DB_ERROR_NOSUCHTABLE        => 'не ŃŃщеŃтвŃет таблица',
+            DB_ERROR_NOT_CAPABLE        => 'СУБД не в ŃĐľŃтоянии',
+            DB_ERROR_NOT_FOUND          => 'не найдено',
+            DB_ERROR_NOT_LOCKED         => 'не заблокировано',
+            DB_ERROR_SYNTAX             => 'ŃинтакŃичеŃкая ĐľŃибка',
+            DB_ERROR_UNSUPPORTED        => 'не поддерживаетŃŃŹ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'Ńчетчик значений в Ńтроке',
+            DB_ERROR_INVALID_DSN        => 'неправильная DSN',
+            DB_ERROR_CONNECT_FAILED     => 'Ńоединение неŃŃпеŃно',
+            0                               => 'нет ĐľŃибки', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'предоŃтавлено недоŃтаточно данных',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'раŃŃирение не найдено',
+            DB_ERROR_NOSUCHDB           => 'не ŃŃщеŃтвŃет Đ‘Đ”',
+            DB_ERROR_ACCESS_VIOLATION   => 'недоŃтаточно прав Đ´ĐľŃŃ‚Ńпа'
+);
diff --git a/adodb/lang/adodb-ru1251.inc.php b/adodb/lang/adodb-ru1251.inc.php
deleted file mode 100644
index e273f42..0000000
--- a/adodb/lang/adodb-ru1251.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 'ru1251',
-            DB_ERROR                    => 'íĺčçâĺńňíŕ˙ îřčáęŕ',
-            DB_ERROR_ALREADY_EXISTS     => 'óćĺ ńóůĺńňâóĺň',
-            DB_ERROR_CANNOT_CREATE      => 'íĺâîçěîćíî ńîçäŕňü',
-            DB_ERROR_CANNOT_DELETE      => 'íĺâîçěîćíî óäŕëčňü',
-            DB_ERROR_CANNOT_DROP        => 'íĺâîçěîćíî óäŕëčňü (drop)',
-            DB_ERROR_CONSTRAINT         => 'íŕđóřĺíčĺ óńëîâčé ďđîâĺđęč',
-            DB_ERROR_DIVZERO            => 'äĺëĺíčĺ íŕ 0',
-            DB_ERROR_INVALID            => 'íĺďđŕâčëüíî',
-            DB_ERROR_INVALID_DATE       => 'íĺęîđđĺęňíŕ˙ äŕňŕ čëč âđĺě˙',
-            DB_ERROR_INVALID_NUMBER     => 'íĺęîđđĺęňíîĺ ÷čńëî',
-            DB_ERROR_MISMATCH           => 'îřčáęŕ',
-            DB_ERROR_NODBSELECTED       => 'ÁÄ íĺ âűáđŕíŕ',
-            DB_ERROR_NOSUCHFIELD        => 'íĺ ńóůĺńňâóĺň ďîëĺ',
-            DB_ERROR_NOSUCHTABLE        => 'íĺ ńóůĺńňâóĺň ňŕáëčöŕ',
-            DB_ERROR_NOT_CAPABLE        => 'ŃÓÁÄ íĺ â ńîńňî˙íčč',
-            DB_ERROR_NOT_FOUND          => 'íĺ íŕéäĺíî',
-            DB_ERROR_NOT_LOCKED         => 'íĺ çŕáëîęčđîâŕíî',
-            DB_ERROR_SYNTAX             => 'ńčíňŕęńč÷ĺńęŕ˙ îřčáęŕ',
-            DB_ERROR_UNSUPPORTED        => 'íĺ ďîääĺđćčâŕĺňń˙',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'ń÷ĺň÷čę çíŕ÷ĺíčé â ńňđîęĺ',
-            DB_ERROR_INVALID_DSN        => 'íĺďđŕâčëüíŕ˙ DSN',
-            DB_ERROR_CONNECT_FAILED     => 'ńîĺäčíĺíčĺ íĺóńďĺříî',
-            0                               => 'íĺň îřčáęč', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ďđĺäîńňŕâëĺíî íĺäîńňŕňî÷íî äŕííűő',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'đŕńřčđĺíčĺ íĺ íŕéäĺíî',
-            DB_ERROR_NOSUCHDB           => 'íĺ ńóůĺńňâóĺň ÁÄ',
-            DB_ERROR_ACCESS_VIOLATION   => 'íĺäîńňŕňî÷íî ďđŕâ äîńňóďŕ'
-);
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-sv.inc.php b/adodb/lang/adodb-sv.inc.php
index 64a5b4b..72e2430 100644
--- a/adodb/lang/adodb-sv.inc.php
+++ b/adodb/lang/adodb-sv.inc.php
@@ -1,33 +1,52 @@
 
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'en',
-            DB_ERROR                    => 'Okänt fel',
+            DB_ERROR                    => 'Okänt fel',
             DB_ERROR_ALREADY_EXISTS     => 'finns redan',
             DB_ERROR_CANNOT_CREATE      => 'kan inte skapa',
             DB_ERROR_CANNOT_DELETE      => 'kan inte ta bort',
-            DB_ERROR_CANNOT_DROP        => 'kan inte släppa',
-            DB_ERROR_CONSTRAINT         => 'begränsning kränkt',
+            DB_ERROR_CANNOT_DROP        => 'kan inte släppa',
+            DB_ERROR_CONSTRAINT         => 'begränsning kränkt',
             DB_ERROR_DIVZERO            => 'division med noll',
             DB_ERROR_INVALID            => 'ogiltig',
             DB_ERROR_INVALID_DATE       => 'ogiltigt datum eller tid',
             DB_ERROR_INVALID_NUMBER     => 'ogiltigt tal',
             DB_ERROR_MISMATCH           => 'felaktig matchning',
             DB_ERROR_NODBSELECTED       => 'ingen databas vald',
-            DB_ERROR_NOSUCHFIELD        => 'inget sĺdant fält',
-            DB_ERROR_NOSUCHTABLE        => 'ingen sĺdan tabell',
+            DB_ERROR_NOSUCHFIELD        => 'inget sådant fält',
+            DB_ERROR_NOSUCHTABLE        => 'ingen sĂĄdan tabell',
             DB_ERROR_NOT_CAPABLE        => 'DB backend klarar det inte',
             DB_ERROR_NOT_FOUND          => 'finns inte',
-            DB_ERROR_NOT_LOCKED         => 'inte lĺst',
+            DB_ERROR_NOT_LOCKED         => 'inte lĂĄst',
             DB_ERROR_SYNTAX             => 'syntaxfel',
-            DB_ERROR_UNSUPPORTED        => 'stöds ej',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'värde räknat pĺ rad',
+            DB_ERROR_UNSUPPORTED        => 'stöds ej',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'värde räknat på rad',
             DB_ERROR_INVALID_DSN        => 'ogiltig DSN',
             DB_ERROR_CONNECT_FAILED     => 'anslutning misslyckades',
             0	                       => 'inget fel', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'otillräckligt med data angivet',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'utökning hittades ej',
-            DB_ERROR_NOSUCHDB           => 'ingen sĺdan databas',
-            DB_ERROR_ACCESS_VIOLATION   => 'otillräckliga rättigheter'
+            DB_ERROR_NEED_MORE_DATA     => 'otillräckligt med data angivet',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'utökning hittades ej',
+            DB_ERROR_NOSUCHDB           => 'ingen sĂĄdan databas',
+            DB_ERROR_ACCESS_VIOLATION   => 'otillräckliga rättigheter'
 );
-?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-th.inc.php b/adodb/lang/adodb-th.inc.php
new file mode 100644
index 0000000..354acca
--- /dev/null
+++ b/adodb/lang/adodb-th.inc.php
@@ -0,0 +1,52 @@
+
+ */
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'						=> 'th',
+			DB_ERROR					=> 'error ไมŕąŕ¸Łŕ¸ąŕą‰ŕ¸Şŕ¸˛ŕą€ŕ¸«ŕ¸•ŕ¸¸',
+			DB_ERROR_ALREADY_EXISTS		=> 'มี�?ล้ว',
+			DB_ERROR_CANNOT_CREATE		=> 'สร้างไมŕąŕą„ด้',
+			DB_ERROR_CANNOT_DELETE		=> 'ลบไมŕąŕą„ด้',
+			DB_ERROR_CANNOT_DROP		=> 'drop ไมŕąŕą„ด้',
+			DB_ERROR_CONSTRAINT			=> 'constraint violation',
+			DB_ERROR_DIVZERO			=> 'หา�?ด้วยสู�?',
+			DB_ERROR_INVALID			=> 'ไม๠valid',
+			DB_ERROR_INVALID_DATE		=> 'วันที๠เวลา ไม๠valid',
+			DB_ERROR_INVALID_NUMBER		=> 'เลขไม๠valid',
+			DB_ERROR_MISMATCH			=> 'mismatch',
+			DB_ERROR_NODBSELECTED		=> 'ไมŕąŕą„ด้เลือ�?ďż˝?านข้อมูล',
+			DB_ERROR_NOSUCHFIELD		=> 'ไมŕąŕ¸ˇŕ¸µŕ¸źŕ¸µŕ¸Ąŕ¸”์นี้',
+			DB_ERROR_NOSUCHTABLE		=> 'ไมŕąŕ¸ˇŕ¸µŕ¸•ŕ¸˛ŕ¸Łŕ¸˛ŕ¸‡ŕ¸™ŕ¸µŕą‰',
+			DB_ERROR_NOT_CAPABLE		=> 'DB backend not capable',
+			DB_ERROR_NOT_FOUND			=> 'ไมŕąŕ¸žŕ¸š',
+			DB_ERROR_NOT_LOCKED			=> 'ไมŕąŕą„ด้ล๊อ�?',
+			DB_ERROR_SYNTAX				=> 'ผิด syntax',
+			DB_ERROR_UNSUPPORTED		=> 'ไม๠support',
+			DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+			DB_ERROR_INVALID_DSN		=> 'invalid DSN',
+			DB_ERROR_CONNECT_FAILED		=> 'ไมŕąŕ¸Şŕ¸˛ŕ¸ˇŕ¸˛ŕ¸Łŕ¸– connect',
+			0							=> 'no error',
+			DB_ERROR_NEED_MORE_DATA		=> 'ข้อมูลไมŕąŕą€ŕ¸žŕ¸µŕ¸˘ŕ¸‡ŕ¸žŕ¸­',
+			DB_ERROR_EXTENSION_NOT_FOUND=> 'ไมŕąŕ¸žŕ¸š extension',
+			DB_ERROR_NOSUCHDB			=> 'ไมŕąŕ¸ˇŕ¸µŕ¸‚้อมูลนี้',
+			DB_ERROR_ACCESS_VIOLATION	=> 'permissions ไมŕąŕ¸žŕ¸­'
+);
diff --git a/adodb/lang/adodb-uk.inc.php b/adodb/lang/adodb-uk.inc.php
new file mode 100644
index 0000000..e54a967
--- /dev/null
+++ b/adodb/lang/adodb-uk.inc.php
@@ -0,0 +1,52 @@
+
+ */
+
+$ADODB_LANG_ARRAY = array (
+             'LANG'                      => 'uk',
+            DB_ERROR                    => 'невідома помилка',
+            DB_ERROR_ALREADY_EXISTS     => 'вже Ń–ŃĐ˝ŃŃ”',
+            DB_ERROR_CANNOT_CREATE      => 'неможливо Ńтворити',
+            DB_ERROR_CANNOT_DELETE      => 'неможливо видалити',
+            DB_ERROR_CANNOT_DROP        => 'неможливо знищити (drop)',
+            DB_ERROR_CONSTRAINT         => 'порŃŃення Ńмов перевірки',
+            DB_ERROR_DIVZERO            => 'ділення на 0',
+            DB_ERROR_INVALID            => 'неправильно',
+            DB_ERROR_INVALID_DATE       => 'неправильна Đ´Đ°Ń‚Đ° чи чаŃ',
+            DB_ERROR_INVALID_NUMBER     => 'неправильне чиŃло',
+            DB_ERROR_MISMATCH           => 'помилка',
+            DB_ERROR_NODBSELECTED       => 'не вибрано БД',
+            DB_ERROR_NOSUCHFIELD        => 'не Ń–ŃĐ˝ŃŃ” поле',
+            DB_ERROR_NOSUCHTABLE        => 'не Ń–ŃĐ˝ŃŃ” таблиця',
+            DB_ERROR_NOT_CAPABLE        => 'СУБД не в Ńтані',
+            DB_ERROR_NOT_FOUND          => 'не знайдено',
+            DB_ERROR_NOT_LOCKED         => 'не заблоковано',
+            DB_ERROR_SYNTAX             => 'ŃинтакŃична помилка',
+            DB_ERROR_UNSUPPORTED        => 'не підтримŃєтьŃŃŹ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'рахівник значень в Ńтрічці',
+            DB_ERROR_INVALID_DSN        => 'неправильна DSN',
+            DB_ERROR_CONNECT_FAILED     => 'Đ·\'єднання неŃŃпіŃне',
+            0                               => 'вŃе гаразд', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'надано недоŃтатньо даних',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'розŃирення не знайдено',
+            DB_ERROR_NOSUCHDB           => 'не Ń–ŃĐ˝ŃŃ” Đ‘Đ”',
+            DB_ERROR_ACCESS_VIOLATION   => 'недоŃтатньо прав Đ´ĐľŃŃ‚Ńпа'
+);
diff --git a/adodb/lang/adodb-uk1251.inc.php b/adodb/lang/adodb-uk1251.inc.php
deleted file mode 100644
index 9fa32ed..0000000
--- a/adodb/lang/adodb-uk1251.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 'uk1251',
-            DB_ERROR                    => 'íĺâłäîěŕ ďîěčëęŕ',
-            DB_ERROR_ALREADY_EXISTS     => 'âćĺ łńíóş',
-            DB_ERROR_CANNOT_CREATE      => 'íĺěîćëčâî ńňâîđčňč',
-            DB_ERROR_CANNOT_DELETE      => 'íĺěîćëčâî âčäŕëčňč',
-            DB_ERROR_CANNOT_DROP        => 'íĺěîćëčâî çíčůčňč (drop)',
-            DB_ERROR_CONSTRAINT         => 'ďîđóřĺíí˙ óěîâ ďĺđĺâłđęč',
-            DB_ERROR_DIVZERO            => 'äłëĺíí˙ íŕ 0',
-            DB_ERROR_INVALID            => 'íĺďđŕâčëüíî',
-            DB_ERROR_INVALID_DATE       => 'íĺďđŕâčëüíŕ äŕňŕ ÷č ÷ŕń',
-            DB_ERROR_INVALID_NUMBER     => 'íĺďđŕâčëüíĺ ÷čńëî',
-            DB_ERROR_MISMATCH           => 'ďîěčëęŕ',
-            DB_ERROR_NODBSELECTED       => 'íĺ âčáđŕíî ÁÄ',
-            DB_ERROR_NOSUCHFIELD        => 'íĺ łńíóş ďîëĺ',
-            DB_ERROR_NOSUCHTABLE        => 'íĺ łńíóş ňŕáëčö˙',
-            DB_ERROR_NOT_CAPABLE        => 'ŃÓÁÄ íĺ â ńňŕíł',
-            DB_ERROR_NOT_FOUND          => 'íĺ çíŕéäĺíî',
-            DB_ERROR_NOT_LOCKED         => 'íĺ çŕáëîęîâŕíî',
-            DB_ERROR_SYNTAX             => 'ńčíňŕęńč÷íŕ ďîěčëęŕ',
-            DB_ERROR_UNSUPPORTED        => 'íĺ ďłäňđčěóşňüń˙',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'đŕőłâíčę çíŕ÷ĺíü â ńňđł÷öł',
-            DB_ERROR_INVALID_DSN        => 'íĺďđŕâčëüíŕ DSN',
-            DB_ERROR_CONNECT_FAILED     => 'ç\'şäíŕíí˙ íĺóńďłříĺ',
-            0                               => 'âńĺ ăŕđŕçä', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'íŕäŕíî íĺäîńňŕňíüî äŕíčő',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'đîçřčđĺíí˙ íĺ çíŕéäĺíî',
-            DB_ERROR_NOSUCHDB           => 'íĺ łńíóş ÁÄ',
-            DB_ERROR_ACCESS_VIOLATION   => 'íĺäîńňŕňíüî ďđŕâ äîńňóďŕ'
-);
-?>
diff --git a/adodb/license.txt b/adodb/license.txt
deleted file mode 100644
index 9821fcb..0000000
--- a/adodb/license.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-ADOdb is dual licensed using BSD and LGPL. 
-
-In plain English, you do not need to distribute your application  in source code form, nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license.
-
-For more info about ADOdb, visit http://adodb.sourceforge.net/
-
-BSD Style-License
-=================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list 
-of conditions and the following disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list 
-of conditions and the following disclaimer in the documentation and/or other materials 
-provided with the distribution. 
-
-Neither the name of the John Lim nor the names of its contributors may be used to 
-endorse or promote products derived from this software without specific prior written 
-permission. 
-
-DISCLAIMER:
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-==========================================================
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999 
- 
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
- 
- 
-Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
-
-
-a) The modified work must itself be a software library. 
-b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
-c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
-d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
-(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
-
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
-
-
-a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
-b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
-c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
-d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
-e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
-
-
-a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
-b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
-
-NO WARRANTY 
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-
-
-END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/adodb/pear/Auth/Container/ADOdb.php b/adodb/pear/Auth/Container/ADOdb.php
new file mode 100644
index 0000000..807da9d
--- /dev/null
+++ b/adodb/pear/Auth/Container/ADOdb.php
@@ -0,0 +1,406 @@
+
+ * @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
+{
+
+    /**
+     * Additional options for the storage container
+     * @var array
+     */
+    var $options = array();
+
+    /**
+     * DB object
+     * @var object
+     */
+    var $db = null;
+    var $dsn = '';
+
+    /**
+     * User that is currently selected from the DB.
+     * @var string
+     */
+    var $activeUser = '';
+
+    // {{{ Constructor
+
+    /**
+     * Constructor of the container class
+     *
+     * 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
+     */
+    function __construct($dsn)
+    {
+        $this->_setDefaults();
+
+        if (is_array($dsn)) {
+            $this->_parseOptions($dsn);
+
+            if (empty($this->options['dsn'])) {
+                PEAR::raiseError('No connection parameters specified!');
+            }
+        } else {
+        	// Extract db_type from dsn string.
+            $this->options['dsn'] = $dsn;
+        }
+    }
+
+    // }}}
+    // {{{ _connect()
+
+    /**
+     * Connect to database by using the given DSN string
+     *
+     * @access private
+     * @param  string DSN string
+     * @return mixed  Object on error, otherwise bool
+     */
+     function _connect($dsn)
+    {
+        if (is_string($dsn) || is_array($dsn)) {
+        	if(!$this->db) {
+	        	$this->db = ADONewConnection($dsn);
+	    		if( $err = ADODB_Pear_error() ) {
+	   	    		return PEAR::raiseError($err);
+	    		}
+        	}
+
+        } else {
+            return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
+                                    41,
+                                    PEAR_ERROR_RETURN,
+                                    null,
+                                    null
+                                    );
+        }
+
+        if(!$this->db) {
+        	return PEAR::raiseError(ADODB_Pear_error());
+        } else {
+        	return true;
+        }
+    }
+
+    // }}}
+    // {{{ _prepare()
+
+    /**
+     * Prepare database connection
+     *
+     * This function checks if we have already opened a connection to
+     * the database. If that's not the case, a new connection is opened.
+     *
+     * @access private
+     * @return mixed True or a DB error object.
+     */
+    function _prepare()
+    {
+    	if(!$this->db) {
+    		$res = $this->_connect($this->options['dsn']);
+    	}
+        return true;
+    }
+
+    // }}}
+    // {{{ query()
+
+    /**
+     * Prepare query to the database
+     *
+     * This function checks if we have already opened a connection to
+     * the database. If that's not the case, a new connection is opened.
+     * After that the query is passed to the database.
+     *
+     * @access public
+     * @param  string Query string
+     * @return mixed  a DB_result object or DB_OK on success, a DB
+     *                or PEAR error on failure
+     */
+    function query($query)
+    {
+        $err = $this->_prepare();
+        if ($err !== true) {
+            return $err;
+        }
+        return $this->db->query($query);
+    }
+
+    // }}}
+    // {{{ _setDefaults()
+
+    /**
+     * Set some default options
+     *
+     * @access private
+     * @return void
+     */
+    function _setDefaults()
+    {
+    	$this->options['db_type']	= 'mysql';
+        $this->options['table']       = 'auth';
+        $this->options['usernamecol'] = 'username';
+        $this->options['passwordcol'] = 'password';
+        $this->options['dsn']         = '';
+        $this->options['db_fields']   = '';
+        $this->options['cryptType']   = 'md5';
+    }
+
+    // }}}
+    // {{{ _parseOptions()
+
+    /**
+     * Parse options passed to the container class
+     *
+     * @access private
+     * @param  array
+     */
+    function _parseOptions($array)
+    {
+        foreach ($array as $key => $value) {
+            if (isset($this->options[$key])) {
+                $this->options[$key] = $value;
+            }
+        }
+
+        /* Include additional fields if they exist */
+        if(!empty($this->options['db_fields'])){
+            if(is_array($this->options['db_fields'])){
+                $this->options['db_fields'] = join(', ', $this->options['db_fields']);
+            }
+            $this->options['db_fields'] = ', '.$this->options['db_fields'];
+        }
+    }
+
+    // }}}
+    // {{{ fetchData()
+
+    /**
+     * Get user information from database
+     *
+     * This function uses the given username to fetch
+     * the corresponding login data from the database
+     * table. If an account that matches the passed username
+     * and password is found, the function returns true.
+     * Otherwise it returns false.
+     *
+     * @param   string Username
+     * @param   string Password
+     * @return  mixed  Error object or boolean
+     */
+    function fetchData($username, $password)
+    {
+        // Prepare for a database query
+        $err = $this->_prepare();
+        if ($err !== true) {
+            return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
+
+        // Find if db_fields contains a *, i so assume all col are selected
+        if(strstr($this->options['db_fields'], '*')){
+            $sql_from = "*";
+        }
+        else{
+            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+        }
+
+        $query = "SELECT ".$sql_from.
+                " FROM ".$this->options['table'].
+                " WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
+
+        $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+        $rset = $this->db->Execute( $query );
+        $res = $rset->fetchRow();
+
+        if (DB::isError($res)) {
+            return PEAR::raiseError($res->getMessage(), $res->getCode());
+        }
+        if (!is_array($res)) {
+            $this->activeUser = '';
+            return false;
+        }
+        if ($this->verifyPassword(trim($password, "\r\n"),
+                                  trim($res[$this->options['passwordcol']], "\r\n"),
+                                  $this->options['cryptType'])) {
+            // Store additional field values in the session
+            foreach ($res as $key => $value) {
+                if ($key == $this->options['passwordcol'] ||
+                    $key == $this->options['usernamecol']) {
+                    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 sense
+                if(is_object($this->_auth_obj)){
+                    $this->_auth_obj->setAuthData($key, $value);
+                } else {
+                    Auth::setAuthData($key, $value);
+                }
+            }
+
+            return true;
+        }
+
+        $this->activeUser = $res[$this->options['usernamecol']];
+        return false;
+    }
+
+    // }}}
+    // {{{ listUsers()
+
+    function listUsers()
+    {
+        $err = $this->_prepare();
+        if ($err !== true) {
+            return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
+
+        $retVal = array();
+
+        // Find if db_fileds contains a *, i so assume all col are selected
+        if(strstr($this->options['db_fields'], '*')){
+            $sql_from = "*";
+        }
+        else{
+            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+        }
+
+        $query = sprintf("SELECT %s FROM %s",
+                         $sql_from,
+                         $this->options['table']
+                         );
+        $res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
+
+        if (DB::isError($res)) {
+            return PEAR::raiseError($res->getMessage(), $res->getCode());
+        } else {
+            foreach ($res as $user) {
+                $user['username'] = $user[$this->options['usernamecol']];
+                $retVal[] = $user;
+            }
+        }
+        return $retVal;
+    }
+
+    // }}}
+    // {{{ addUser()
+
+    /**
+     * Add user to the storage container
+     *
+     * @access public
+     * @param  string Username
+     * @param  string Password
+     * @param  mixed  Additional information that are stored in the DB
+     *
+     * @return mixed True on success, otherwise error object
+     */
+    function addUser($username, $password, $additional = "")
+    {
+        if (function_exists($this->options['cryptType'])) {
+            $cryptFunction = $this->options['cryptType'];
+        } else {
+            $cryptFunction = 'md5';
+        }
+
+        $additional_key   = '';
+        $additional_value = '';
+
+        if (is_array($additional)) {
+            foreach ($additional as $key => $value) {
+                $additional_key .= ', ' . $key;
+                $additional_value .= ", '" . $value . "'";
+            }
+        }
+
+        $query = sprintf("INSERT INTO %s (%s, %s%s) VALUES ('%s', '%s'%s)",
+                         $this->options['table'],
+                         $this->options['usernamecol'],
+                         $this->options['passwordcol'],
+                         $additional_key,
+                         $username,
+                         $cryptFunction($password),
+                         $additional_value
+                         );
+
+        $res = $this->query($query);
+
+        if (DB::isError($res)) {
+           return PEAR::raiseError($res->getMessage(), $res->getCode());
+        } else {
+          return true;
+        }
+    }
+
+    // }}}
+    // {{{ removeUser()
+
+    /**
+     * Remove user from the storage container
+     *
+     * @access public
+     * @param  string Username
+     *
+     * @return mixed True on success, otherwise error object
+     */
+    function removeUser($username)
+    {
+        $query = sprintf("DELETE FROM %s WHERE %s = '%s'",
+                         $this->options['table'],
+                         $this->options['usernamecol'],
+                         $username
+                         );
+
+        $res = $this->query($query);
+
+        if (DB::isError($res)) {
+           return PEAR::raiseError($res->getMessage(), $res->getCode());
+        } else {
+          return true;
+        }
+    }
+
+    // }}}
+}
+
+function showDbg( $string ) {
+	print "
+-- $string
";
+}
+function dump( $var, $str, $vardump = false ) {
+	print "
$str
";
+	( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
+	print "
";
+}
diff --git a/adodb/pear/auth_adodb_example.php b/adodb/pear/auth_adodb_example.php
new file mode 100644
index 0000000..77af939
--- /dev/null
+++ b/adodb/pear/auth_adodb_example.php
@@ -0,0 +1,46 @@
+
+    
+    
+    
+    
+    
+ $dsn, 'table' => 'auth', 'cryptType' => 'none',
+                'usernamecol' => 'username', 'passwordcol' => 'password');
+$a = new Auth("ADOdb", $params, "loginFunction");
+$a->start();
+
+if ($a->getAuth()) {
+    echo "Success";
+    // * The output of your site goes here.
+}
diff --git a/adodb/pear/readme.Auth.txt b/adodb/pear/readme.Auth.txt
new file mode 100644
index 0000000..f5b162c
--- /dev/null
+++ b/adodb/pear/readme.Auth.txt
@@ -0,0 +1,20 @@
+From: Rich Tango-Lowy (richtl#arscognita.com)
+Date: Sat, May 29, 2004 11:20 am
+
+OK, I hacked out an ADOdb container for PEAR-Auth. The error handling's
+a bit of a mess, but all the methods work.
+
+Copy ADOdb.php to your pear/Auth/Container/ directory.
+
+Use the ADOdb container exactly as you would the DB
+container, but specify 'ADOdb' instead of 'DB':
+
+$dsn = "mysql://myuser:mypass@localhost/authdb";
+$a = new Auth("ADOdb", $dsn, "loginFunction");
+
+
+-------------------
+
+John Lim adds:
+
+See http://pear.php.net/manual/en/package.authentication.php
diff --git a/adodb/perf/perf-db2.inc.php b/adodb/perf/perf-db2.inc.php
index 45deb9b..fc05219 100644
--- a/adodb/perf/perf-db2.inc.php
+++ b/adodb/perf/perf-db2.inc.php
@@ -1,16 +1,23 @@
  array('RATIO',
-			"SELECT 
-				case when sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0 
-				else 100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)) end 
+			"SELECT
+				case when sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0
+				else 100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)) end
 				FROM TABLE(SNAPSHOT_APPL('',-2)) as t",
 			'=WarnCacheRatio'),
-			
+
 	'Data Cache',
 		'data cache buffers' => array('DATAC',
 		'select sum(npages) from SYSCAT.BUFFERPOOLS',
@@ -56,11 +63,11 @@ class perf_db2 extends adodb_perf{
 	);
 
 
-	function perf_db2(&$conn)
+	function __construct(&$conn)
 	{
-		$this->conn =& $conn;
+		$this->conn = $conn;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
 		$save = $this->conn->LogSQL(false);
@@ -85,18 +92,22 @@ function Explain($sql,$partial=false)
 		$s = ob_get_contents();
 		ob_end_clean();
 		$this->conn->LogSQL($save);
-		
+
 		$s .= $this->Tracer($sql);
 		return $s;
 	}
-	
-	
-	function Tables()
+
+	/**
+	 *  Gets a list of tables
+	 *
+	 * @param int $throwaway discarded variable to match the parent method
+	 * @return string The formatted table list
+	 */
+	function Tables($throwaway=0)
 	{
 		$rs = $this->conn->Execute("select tabschema,tabname,card as rows,
-			npages pages_used,fpages pages_allocated, tbspace tablespace  
+			npages pages_used,fpages pages_allocated, tbspace tablespace
 			from syscat.tables where tabschema not in ('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
 		return rs2html($rs,false,false,false,false);
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/perf/perf-informix.inc.php b/adodb/perf/perf-informix.inc.php
index 7d1e3ad..88802bc 100644
--- a/adodb/perf/perf-informix.inc.php
+++ b/adodb/perf/perf-informix.inc.php
@@ -1,16 +1,23 @@
  array('RATIOH',
@@ -47,24 +54,23 @@ class perf_informix extends adodb_perf{
 		'data reads' => array('IO',
 		"select value from sysmaster:sysprofile where name='pagreads'",
 		'Page reads'),
-		
+
 		'data writes' => array('IO',
 		"select value from sysmaster:sysprofile where name='pagwrites'",
 		'Page writes'),
-	
+
 	'Connections',
 		'current connections' => array('SESS',
 		'select count(*) from sysmaster:syssessions',
 		'Number of sessions'),
-	
+
 	false
-	
+
 	);
-	
-	function perf_informix(&$conn)
+
+	function __construct(&$conn)
 	{
-		$this->conn =& $conn;
+		$this->conn = $conn;
 	}
 
 }
-?>
diff --git a/adodb/perf/perf-mssql.inc.php b/adodb/perf/perf-mssql.inc.php
index 4d18a58..5d83203 100644
--- a/adodb/perf/perf-mssql.inc.php
+++ b/adodb/perf/perf-mssql.inc.php
@@ -1,17 +1,23 @@
  array('RATIO',
@@ -46,7 +52,7 @@ class perf_mssql extends adodb_perf{
 		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
 		'data writes' => array('IO',
 		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
-			
+
 	'Data Cache',
 		'data cache size' => array('DATAC',
 		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
@@ -63,20 +69,20 @@ class perf_mssql extends adodb_perf{
 
 		false
 	);
-	
-	
-	function perf_mssql(&$conn)
+
+
+	function __construct(&$conn)
 	{
 		if ($conn->dataProvider == 'odbc') {
 			$this->sql1 = 'sql1';
 			//$this->explain = false;
 		}
-		$this->conn =& $conn;
+		$this->conn = $conn;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
-		
+
 		$save = $this->conn->LogSQL(false);
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
@@ -88,18 +94,18 @@ function Explain($sql,$partial=false)
 				}
 			}
 		}
-		
+
 		$s = '
Explain: '.htmlspecialchars($sql).'
';
 		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
 		$sql = str_replace('?',"''",$sql);
 		global $ADODB_FETCH_MODE;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$rs =& $this->conn->Execute($sql);
+		$rs = $this->conn->Execute($sql);
 		//adodb_printr($rs);
 		$ADODB_FETCH_MODE = $save;
-		if ($rs) {
+		if ($rs && !$rs->EOF) {
 			$rs->MoveNext();
 			$s .= '';
 			while (!$rs->EOF) {
@@ -107,20 +113,20 @@ function Explain($sql,$partial=false)
 				$rs->MoveNext();
 			}
 			$s .= '
 Rows IO CPU     Plan
';
-			
+
 			$rs->NextRecordSet();
 		}
-		
+
 		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
 		$this->conn->LogSQL($save);
 		$s .= $this->Tracer($sql);
 		return $s;
 	}
-	
+
 	function Tables()
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		//$this->conn->debug=1;
@@ -142,23 +148,21 @@ function Tables()
 		$ADODB_FETCH_MODE = $save;
 		return $s.'';
 	}
-	
+
 	function sp_who()
 	{
 		$arr = $this->conn->GetArray('sp_who');
 		return sizeof($arr);
 	}
-	
+
 	function HealthCheck($cli=false)
 	{
-		
+
 		$this->conn->Execute('dbcc traceon(3604)');
 		$html =  adodb_perf::HealthCheck($cli);
 		$this->conn->Execute('dbcc traceoff(3604)');
 		return $html;
 	}
-	
-	
-}
 
-?>
\ No newline at end of file
+
+}
diff --git a/adodb/perf/perf-mssqlnative.inc.php b/adodb/perf/perf-mssqlnative.inc.php
new file mode 100644
index 0000000..c2c90fc
--- /dev/null
+++ b/adodb/perf/perf-mssqlnative.inc.php
@@ -0,0 +1,168 @@
+ array('RATIO',
+			"select round((a.cntr_value*100.0)/b.cntr_value,2) from master.dbo.sysperfinfo a, master.dbo.sysperfinfo b where a.counter_name = 'Buffer cache hit ratio' and b.counter_name='Buffer cache hit ratio base'",
+			'=WarnCacheRatio'),
+		'prepared sql hit ratio' => array('RATIO',
+			array('dbcc cachestats','Prepared',1,100),
+			''),
+		'adhoc sql hit ratio' => array('RATIO',
+			array('dbcc cachestats','Adhoc',1,100),
+			''),
+	'IO',
+		'data reads' => array('IO',
+		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
+		'data writes' => array('IO',
+		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
+
+	'Data Cache',
+		'data cache size' => array('DATAC',
+		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
+			'' ),
+		'data cache blocksize' => array('DATAC',
+			"select 8192",'page size'),
+	'Connections',
+		'current connections' => array('SESS',
+			'=sp_who',
+			''),
+		'max connections' => array('SESS',
+			"SELECT @@MAX_CONNECTIONS",
+			''),
+
+		false
+	);
+
+
+	function __construct(&$conn)
+	{
+		if ($conn->dataProvider == 'odbc') {
+			$this->sql1 = 'sql1';
+			//$this->explain = false;
+		}
+		$this->conn =& $conn;
+	}
+
+	function Explain($sql,$partial=false)
+	{
+
+		$save = $this->conn->LogSQL(false);
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+
+		$s = '
Explain: '.htmlspecialchars($sql).'
';
+		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
+		$sql = str_replace('?',"''",$sql);
+		global $ADODB_FETCH_MODE;
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$rs =& $this->conn->Execute($sql);
+		//adodb_printr($rs);
+		$ADODB_FETCH_MODE = $save;
+		if ($rs) {
+			$rs->MoveNext();
+			$s .= '';
+			while (!$rs->EOF) {
+				$s .= '\n"; ## NOTE CORRUPT  tag is intentional!!!!
+				$rs->MoveNext();
+			}
+			$s .= '
 Rows IO CPU     Plan
'.round($rs->fields[8],1).''.round($rs->fields[9],3).''.round($rs->fields[10],3).'
'.htmlspecialchars($rs->fields[0])."
';
+
+			$rs->NextRecordSet();
+		}
+
+		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
+		$this->conn->LogSQL($save);
+		$s .= $this->Tracer($sql);
+		return $s;
+	}
+
+	function Tables($orderby='1')
+	{
+	global $ADODB_FETCH_MODE;
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		//$this->conn->debug=1;
+		$s = '';
+		$rs1 = $this->conn->Execute("select distinct name from sysobjects where xtype='U'");
+		if ($rs1) {
+			while (!$rs1->EOF) {
+				$tab = $rs1->fields[0];
+				$tabq = $this->conn->qstr($tab);
+				$rs2 = $this->conn->Execute("sp_spaceused $tabq");
+				if ($rs2) {
+					$s .= '';
+					$rs2->Close();
+				}
+				$rs1->MoveNext();
+			}
+			$rs1->Close();
+		}
+		$ADODB_FETCH_MODE = $save;
+		return $s.'
tablenamesize_in_kindex sizereserved size
'.$tab.''.$rs2->fields[3].''.$rs2->fields[4].''.$rs2->fields[2].'
';
+	}
+
+	function sp_who()
+	{
+		$arr = $this->conn->GetArray('sp_who');
+		return sizeof($arr);
+	}
+
+	function HealthCheck($cli=false)
+	{
+
+		$this->conn->Execute('dbcc traceon(3604)');
+		$html =  adodb_perf::HealthCheck($cli);
+		$this->conn->Execute('dbcc traceoff(3604)');
+		return $html;
+	}
+
+
+}
diff --git a/adodb/perf/perf-mysql.inc.php b/adodb/perf/perf-mysql.inc.php
index bac1d27..dae4422 100644
--- a/adodb/perf/perf-mysql.inc.php
+++ b/adodb/perf/perf-mysql.inc.php
@@ -1,24 +1,31 @@
  array('RATIO',
@@ -49,7 +56,7 @@ class perf_mysql extends adodb_perf{
 		'data writes' => array('IO',
 			'=GetWrites',
 			'Number of inserts/updates/deletes * coef (Key_writes is not accurate)'),
-		
+
 	'Data Cache',
 		'MyISAM data cache size' => array('DATAC',
 			array("show variables", 'key_buffer_size'),
@@ -70,25 +77,25 @@ class perf_mysql extends adodb_perf{
 		'table cache' => array('CACHE',
 			array("show variables", 'table_cache'),
 			'Number of tables to keep open'),
-	'Connections',	
+	'Connections',
 		'current connections' => array('SESS',
 			array('show status','Threads_connected'),
 			''),
 		'max connections' => array( 'SESS',
 			array("show variables",'max_connections'),
 			''),
-	
+
 		false
 	);
-	
-	function perf_mysql(&$conn)
+
+	function __construct(&$conn)
 	{
-		$this->conn =& $conn;
+		$this->conn = $conn;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
-		
+
 		if (strtoupper(substr(trim($sql),0,6)) !== 'SELECT') return '
Unable to EXPLAIN non-select statement
';
 		$save = $this->conn->LogSQL(false);
 		if ($partial) {
@@ -102,12 +109,12 @@ function Explain($sql,$partial=false)
 			}
 		}
 		$sql = str_replace('?',"''",$sql);
-		
+
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
 			$sql = $this->conn->GetOne("select sql1 from adodb_logsql where sql1 like $sqlq");
 		}
-		
+
 		$s = '
Explain: '.htmlspecialchars($sql).'
';
 		$rs = $this->conn->Execute('EXPLAIN '.$sql);
 		$s .= rs2html($rs,false,false,false,false);
@@ -115,95 +122,101 @@ function Explain($sql,$partial=false)
 		$s .= $this->Tracer($sql);
 		return $s;
 	}
-	
-	function Tables()
+
+	/**
+	 * Returns a list of table statuses.
+	 * 
+	 * @param  string  $orderby  Unused (compatibility with parent method)
+	 * @return string A formatted set of recordsets
+	 */
+	function tables($orderby='1')
 	{
 		if (!$this->tablesSQL) return false;
-		
+
 		$rs = $this->conn->Execute($this->tablesSQL);
 		if (!$rs) return false;
-		
+
 		$html = rs2html($rs,false,false,false,false);
 		return $html;
 	}
-	
+
 	function GetReads()
 	{
 	global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$rs = $this->conn->Execute('show status');
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$rs) return 0;
 		$val = 0;
 		while (!$rs->EOF) {
 			switch($rs->fields[0]) {
-			case 'Com_select': 
+			case 'Com_select':
 				$val = $rs->fields[1];
 				$rs->Close();
 				return $val;
 			}
 			$rs->MoveNext();
-		} 
-		
+		}
+
 		$rs->Close();
-		
+
 		return $val;
 	}
-	
+
 	function GetWrites()
 	{
 	global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$rs = $this->conn->Execute('show status');
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$rs) return 0;
 		$val = 0.0;
 		while (!$rs->EOF) {
 			switch($rs->fields[0]) {
-			case 'Com_insert': 
+			case 'Com_insert':
 				$val += $rs->fields[1]; break;
-			case 'Com_delete': 
+			case 'Com_delete':
 				$val += $rs->fields[1]; break;
-			case 'Com_update': 
+			case 'Com_update':
 				$val += $rs->fields[1]/2;
 				$rs->Close();
 				return $val;
 			}
 			$rs->MoveNext();
-		} 
-		
+		}
+
 		$rs->Close();
-		
+
 		return $val;
 	}
-	
+
 	function FindDBHitRatio()
 	{
 		// first find out type of table
 		//$this->conn->debug=1;
-		
+
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$rs = $this->conn->Execute('show table status');
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$rs) return '';
 		$type = strtoupper($rs->fields[1]);
 		$rs->Close();
@@ -216,29 +229,29 @@ function FindDBHitRatio()
 		default:
 			return $type.' not supported';
 		}
-		
+
 	}
-	
+
 	function GetQHitRatio()
 	{
 		//Total number of queries = Qcache_inserts + Qcache_hits + Qcache_not_cached
 		$hits = $this->_DBParameter(array("show status","Qcache_hits"));
 		$total = $this->_DBParameter(array("show status","Qcache_inserts"));
 		$total += $this->_DBParameter(array("show status","Qcache_not_cached"));
-		
+
 		$total += $hits;
 		if ($total) return round(($hits*100)/$total,2);
 		return 0;
 	}
-	
+
 	/*
 		Use session variable to store Hit percentage, because MySQL
 		does not remember last value of SHOW INNODB STATUS hit ratio
-		
+
 		# 1st query to SHOW INNODB STATUS
 		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
 		Buffer pool hit rate 1000 / 1000
-		
+
 		# 2nd query to SHOW INNODB STATUS
 		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
 		No buffer pool activity since the last printout
@@ -246,16 +259,16 @@ function GetQHitRatio()
 	function GetInnoDBHitRatio()
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
-		$rs = $this->conn->Execute('show innodb status');
-		
+
+		$rs = $this->conn->Execute('show engine innodb status');
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$rs || $rs->EOF) return 0;
 		$stat = $rs->fields[0];
 		$rs->Close();
@@ -271,45 +284,42 @@ function GetInnoDBHitRatio()
 		}
 		return 0;
 	}
-	
+
 	function GetKeyHitRatio()
 	{
 		$hits = $this->_DBParameter(array("show status","Key_read_requests"));
 		$reqs = $this->_DBParameter(array("show status","Key_reads"));
 		if ($reqs == 0) return 0;
-		
+
 		return round(($hits/($reqs+$hits))*100,2);
 	}
-	
-    // start hack 
+
+    // start hack
     var $optimizeTableLow = 'CHECK TABLE %s FAST QUICK';
     var $optimizeTableHigh = 'OPTIMIZE TABLE %s';
-    
-    /** 
+
+    /**
      * @see adodb_perf#optimizeTable
      */
-     function optimizeTable( $table, $mode = ADODB_OPT_LOW) 
+     function optimizeTable( $table, $mode = ADODB_OPT_LOW)
      {
         if ( !is_string( $table)) return false;
-        
+
         $conn = $this->conn;
         if ( !$conn) return false;
-        
+
         $sql = '';
         switch( $mode) {
             case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
             case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
-            default : 
-            {
-                // May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0)
+            default :
+                // 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);
-        
+
         return $conn->Execute( $sql) !== false;
      }
-    // end hack 
+    // end hack
 }
-?>
\ No newline at end of file
diff --git a/adodb/perf/perf-oci8.inc.php b/adodb/perf/perf-oci8.inc.php
index 4b84549..c11b261 100644
--- a/adodb/perf/perf-oci8.inc.php
+++ b/adodb/perf/perf-oci8.inc.php
@@ -1,26 +1,37 @@
  array('RATIOH',
-			"select round((1-(phy.value / (cur.value + con.value)))*100,2) 
+			"select round((1-(phy.value / (cur.value + con.value)))*100,2)
 			from v\$sysstat cur, v\$sysstat con, v\$sysstat phy
 			where cur.name = 'db block gets' and
 			      con.name = 'consistent gets' and
 			      phy.name = 'physical reads'",
 			'=WarnCacheRatio'),
-		
+
 		'sql cache hit ratio' => array( 'RATIOH',
 			'select round(100*(sum(pins)-sum(reloads))/sum(pins),2)  from v$librarycache',
 			'increase shared_pool_size if too ratio low'),
-			
+
 		'datadict cache hit ratio' => array('RATIOH',
-		"select      
-           round((1 - (sum(getmisses) / (sum(gets) +          
+		"select
+           round((1 - (sum(getmisses) / (sum(gets) +
    		 sum(getmisses))))*100,2)
 		from  v\$rowcache",
 		'increase shared_pool_size if too ratio low'),
-		
+
 		'memory sort ratio' => array('RATIOH',
-		"SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE), 
+		"SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE),
        0,1,(a.VALUE + b.VALUE)),2)
-FROM   v\$sysstat a, 
+FROM   v\$sysstat a,
        v\$sysstat b
 WHERE  a.name = 'sorts (disk)'
 AND    b.name = 'sorts (memory)'",
@@ -63,20 +74,37 @@ class perf_oci8 extends ADODB_perf{
 	'IO',
 		'data reads' => array('IO',
 		"select value from v\$sysstat where name='physical reads'"),
-	
+
 	'data writes' => array('IO',
 		"select value from v\$sysstat where name='physical writes'"),
-	
+
 	'Data Cache',
+
 		'data cache buffers' => array( 'DATAC',
-		"select a.value/b.value  from v\$parameter a, v\$parameter b 
+		"select a.value/b.value  from v\$parameter a, v\$parameter b
 			where a.name = 'db_cache_size' and b.name= 'db_block_size'",
 			'Number of cache buffers. Tune db_cache_size if the data cache hit ratio is too low.'),
 		'data cache blocksize' => array('DATAC',
 			"select value from v\$parameter where name='db_block_size'",
-			'' ),			
+			'' ),
+
 	'Memory Pools',
-		'data cache size' => array('DATAC',
+		'Mem Max Target (11g+)' => array( 'DATAC',
+		"select value from v\$parameter where name = 'memory_max_target'",
+			'The memory_max_size is the maximum value to which memory_target can be set.' ),
+	'Memory target (11g+)' => array( 'DATAC',
+		"select value from v\$parameter where name = 'memory_target'",
+			'If memory_target is defined then SGA and PGA targets are consolidated into one memory_target.' ),
+		'SGA Max Size' => array( 'DATAC',
+		"select nvl(value,0)/1024.0/1024 || 'M' from v\$parameter where name = 'sga_max_size'",
+			'The sga_max_size is the maximum value to which sga_target can be set.' ),
+	'SGA target' => array( 'DATAC',
+		"select nvl(value,0)/1024.0/1024 || 'M'  from v\$parameter where name = 'sga_target'",
+			'If sga_target is defined then data cache, shared, java and large pool size can be 0. This is because all these pools are consolidated into one sga_target.' ),
+	'PGA aggr target' => array( 'DATAC',
+		"select nvl(value,0)/1024.0/1024 || 'M' from v\$parameter where name = 'pga_aggregate_target'",
+			'If pga_aggregate_target is defined then this is the maximum memory that can be allocated for cursor operations such as sorts, group by, joins, merges. When in doubt, set it to 20% of sga_target.' ),
+	'data cache size' => array('DATAC',
 			"select value from v\$parameter where name = 'db_cache_size'",
 			'db_cache_size' ),
 		'shared pool size' => array('DATAC',
@@ -89,11 +117,8 @@ class perf_oci8 extends ADODB_perf{
 			"select value from v\$parameter where name='large_pool_size'",
 			'this pool is for large mem allocations (not because it is larger than shared pool), for MTS sessions, parallel queries, io buffers (large_pool_size) ' ),
 
-		'pga buffer size' => array('CACHE',			
-			"select value from v\$parameter where name='pga_aggregate_target'",
-			'program global area is private memory for sorting, and hash and bitmap merges - since oracle 9i (pga_aggregate_target)' ),
+		'dynamic memory usage' => array('CACHE', "select '-' from dual", '=DynMemoryUsage'),
 
-		
 		'Connections',
 		'current connections' => array('SESS',
 			'select count(*) from sys.v_$session where username is not null',
@@ -102,20 +127,20 @@ class perf_oci8 extends ADODB_perf{
 			"select value from v\$parameter where name='sessions'",
 			''),
 
-	'Memory Utilization',		
+	'Memory Utilization',
 		'data cache utilization ratio' => array('RATIOU',
 			"select round((1-bytes/sgasize)*100, 2)
 			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
 			where name = 'free memory' and pool = 'shared pool'",
 		'Percentage of data cache actually in use - should be over 85%'),
-		
+
 		'shared pool utilization ratio' => array('RATIOU',
-		'select round((sga.bytes/p.value)*100,2)
+		'select round((sga.bytes/case when p.value=0 then sga.bytes else to_number(p.value) end)*100,2)
 		from v$sgastat sga, v$parameter p
 		where sga.name = \'free memory\' and sga.pool = \'shared pool\'
 		and p.name = \'shared_pool_size\'',
 		'Percentage of shared pool actually used - too low is bad, too high is worse'),
-		
+
 		'large pool utilization ratio' => array('RATIOU',
 			"select round((1-bytes/sgasize)*100, 2)
 			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
@@ -125,13 +150,13 @@ class perf_oci8 extends ADODB_perf{
 			"select value from v\$parameter where name='sort_area_size'",
 			'max in-mem sort_area_size (per query), uses memory in pga' ),
 
-		'pga usage at peak' => array('RATIOU',
-		'=PGA','Mb utilization at peak transactions (requires Oracle 9i+)'),
+		/*'pga usage at peak' => array('RATIOU',
+		'=PGA','Mb utilization at peak transactions (requires Oracle 9i+)'),*/
 	'Transactions',
 		'rollback segments' => array('ROLLBACK',
 			"select count(*) from sys.v_\$rollstat",
 			''),
-	
+
 		'peak transactions' => array('ROLLBACK',
 			"select max_utilization  tx_hwm
     		from sys.v_\$resource_limit
@@ -140,7 +165,7 @@ class perf_oci8 extends ADODB_perf{
 		'max transactions' => array('ROLLBACK',
 			"select value from v\$parameter where name = 'transactions'",
 			'max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)'),
-	'Parameters',	
+	'Parameters',
 		'cursor sharing' => array('CURSOR',
 			"select value from v\$parameter where name = 'cursor_sharing'",
 			'Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See cursor_sharing.'),
@@ -156,62 +181,203 @@ class perf_oci8 extends ADODB_perf{
 		'random page cost' => array('COST',
 			"select value from v\$parameter where name = 'optimizer_index_cost_adj'",
 			'=WarnPageCost'),
-		
+	'Waits',
+		'Recent wait events' => array('WAITS','select \'Top 5 events\' from dual','=TopRecentWaits'),
+//		'Historical wait SQL' => array('WAITS','select \'Last 2 days\' from dual','=TopHistoricalWaits'), -- requires AWR license
+	'Backup',
+		'Achivelog Mode' => array('BACKUP', 'select log_mode from v$database', '=LogMode'),
+
+		'DBID' => array('BACKUP','select dbid from v$database','Primary key of database, used for recovery with an RMAN Recovery Catalog'),
+		'Archive Log Dest' => array('BACKUP', "SELECT NVL(v1.value,v2.value)
+FROM v\$parameter v1, v\$parameter v2 WHERE v1.name='log_archive_dest' AND v2.name='log_archive_dest_10'", ''),
+
+		'Flashback Area' => array('BACKUP', "select nvl(value,'Flashback Area not used') from v\$parameter where name=lower('DB_RECOVERY_FILE_DEST')", 'Flashback area is a folder where all backup data and logs can be stored and managed by Oracle. If Error: message displayed, then it is not in use.'),
+
+		'Flashback Usage' => array('BACKUP', "select nvl('-','Flashback Area not used') from v\$parameter where name=lower('DB_RECOVERY_FILE_DEST')", '=FlashUsage', 'Flashback area usage.'),
+
+		'Control File Keep Time' => array('BACKUP', "select value from v\$parameter where name='control_file_record_keep_time'",'No of days to keep RMAN info in control file.  Recommended set to x2 or x3 times the frequency of your full backup.'),
+		'Recent RMAN Jobs' => array('BACKUP', "select '-' from dual", "=RMAN"),
+
+		//		'Control File Keep Time' => array('BACKUP', "select value from v\$parameter where name='control_file_record_keep_time'",'No of days to keep RMAN info in control file. I recommend it be set to x2 or x3 times the frequency of your full backup.'),
+      'Storage', 'Tablespaces' => array('TABLESPACE', "select '-' from dual", "=TableSpace"),
 		false
-		
+
 	);
-	
-	
-	function perf_oci8(&$conn)
+
+
+	function __construct(&$conn)
 	{
-		$savelog = $conn->LogSQL(false);	
+	global $gSQLBlockRows;
+
+		$gSQLBlockRows = 1000;
+		$savelog = $conn->LogSQL(false);
 		$this->version = $conn->ServerInfo();
-		$conn->LogSQL($savelog);	
-		$this->conn =& $conn;
+		$conn->LogSQL($savelog);
+		$this->conn = $conn;
+	}
+
+	function LogMode()
+	{
+		$mode = $this->conn->GetOne("select log_mode from v\$database");
+
+		if ($mode == 'ARCHIVELOG') return 'To turn off archivelog:

+	

+        SQLPLUS> connect sys as sysdba;
+        SQLPLUS> shutdown immediate;
+
+        SQLPLUS> startup mount exclusive;
+        SQLPLUS> alter database noarchivelog;
+        SQLPLUS> alter database open;
+
';
+
+		return 'To turn on archivelog:

+	

+        SQLPLUS> connect sys as sysdba;
+        SQLPLUS> shutdown immediate;
+
+        SQLPLUS> startup mount exclusive;
+        SQLPLUS> alter database archivelog;
+        SQLPLUS> archive log start;
+        SQLPLUS> alter database open;
+
';
+	}
+
+	function TopRecentWaits()
+	{
+
+		$rs = $this->conn->Execute("select * from (
+		select event, round(100*time_waited/(select sum(time_waited) from v\$system_event where wait_class <> 'Idle'),1) \"% Wait\",
+    total_waits,time_waited, average_wait,wait_class from v\$system_event where wait_class <> 'Idle' order by 2 desc
+	) where rownum <=5");
+
+		$ret = rs2html($rs,false,false,false,false);
+		return " 
".$ret." 
";
+
+	}
+
+	function TopHistoricalWaits()
+	{
+		$days = 2;
+
+		$rs = $this->conn->Execute("select * from (   SELECT
+         b.wait_class,B.NAME,
+        round(sum(wait_time+TIME_WAITED)/1000000) waitsecs,
+        parsing_schema_name,
+        C.SQL_TEXT, a.sql_id
+FROM    V\$ACTIVE_SESSION_HISTORY A
+        join V\$EVENT_NAME B  on  A.EVENT# = B.EVENT#
+       join V\$SQLAREA C  on  A.SQL_ID = C.SQL_ID
+WHERE   A.SAMPLE_TIME BETWEEN sysdate-$days and sysdate
+       and parsing_schema_name not in ('SYS','SYSMAN','DBSNMP','SYSTEM')
+GROUP BY b.wait_class,parsing_schema_name,C.SQL_TEXT, B.NAME,A.sql_id
+order by 3 desc) where rownum <=10");
+
+		$ret = rs2html($rs,false,false,false,false);
+		return " 
".$ret." 
";
+
+	}
+
+	function TableSpace()
+	{
+
+		$rs = $this->conn->Execute(
+	"select tablespace_name,round(sum(bytes)/1024/1024) as Used_MB,round(sum(maxbytes)/1024/1024) as Max_MB, round(sum(bytes)/sum(maxbytes),4) * 100 as PCT
+	from dba_data_files
+   group by tablespace_name order by 2 desc");
+
+		$ret = "
Tablespace".rs2html($rs,false,false,false,false);
+
+		$rs = $this->conn->Execute("select * from dba_data_files order by tablespace_name, 1");
+		$ret .= "
Datafile".rs2html($rs,false,false,false,false);
+
+		return " 
".$ret." 
";
+	}
+
+	function RMAN()
+	{
+		$rs = $this->conn->Execute("select * from (select start_time, end_time, operation, status, mbytes_processed, output_device_type
+			from V\$RMAN_STATUS order by start_time desc) where rownum <=10");
+
+		$ret = rs2html($rs,false,false,false,false);
+		return " 
".$ret." 
";
+
+	}
+
+	function DynMemoryUsage()
+	{
+		if (@$this->version['version'] >= 11) {
+			$rs = $this->conn->Execute("select component, current_size/1024./1024 as \"CurrSize (M)\" from  V\$MEMORY_DYNAMIC_COMPONENTS");
+
+		} else
+			$rs = $this->conn->Execute("select name, round(bytes/1024./1024,2) as \"CurrSize (M)\" from  V\$sgainfo");
+
+
+		$ret = rs2html($rs,false,false,false,false);
+		return " 
".$ret." 
";
+	}
+
+	function FlashUsage()
+	{
+        $rs = $this->conn->Execute("select * from  V\$FLASH_RECOVERY_AREA_USAGE");
+		$ret = rs2html($rs,false,false,false,false);
+		return " 
".$ret." 
";
 	}
-	
+
 	function WarnPageCost($val)
 	{
-		if ($val == 100) $s = 'Too High. ';
+		if ($val == 100 && $this->version['version'] < 10) $s = 'Too High. ';
 		else $s = '';
-		
+
 		return $s.'Recommended is 20-50 for TP, and 50 for data warehouses. Default is 100. See optimizer_index_cost_adj. ';
 	}
-	
+
 	function WarnIndexCost($val)
 	{
-		if ($val == 0) $s = 'Too Low. ';
+		if ($val == 0 && $this->version['version'] < 10) $s = 'Too Low. ';
 		else $s = '';
-		
+
 		return $s.'Percentage of indexed data blocks expected in the cache.
-			Recommended is 20 (fast disk array) to 50 (slower hard disks). Default is 0.
+			Recommended is 20 (fast disk array) to 30 (slower hard disks). Default is 0.
 			 See optimizer_index_caching.';
 		}
-	
+
 	function PGA()
 	{
-		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
-		
-		$rs = $this->conn->Execute("select a.mb,a.targ as pga_size_pct,a.pct from 
-	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
-	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
-	   	   from v\$pga_target_advice) a left join
-	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
-	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
-	   	   from v\$pga_target_advice) b on 
-	  a.r = b.r+1 where 
-  		b.pct < 100");
-		if (!$rs) return "Only in 9i or later";
-		$rs->Close();
-		if ($rs->EOF) return "PGA could be too big";
-		
-		return reset($rs->fields);
+
+		//if ($this->version['version'] < 9) return 'Oracle 9i or later required';
+	}
+
+	function PGA_Advice()
+	{
+		$t = "
PGA Advice Estimate
";
+		if ($this->version['version'] < 9) return $t.'Oracle 9i or later required';
+
+		$rs = $this->conn->Execute('select a.MB,
+			case when a.targ = 1 then \'<<= Current \'
+			when a.targ < 1  or a.pct <= b.pct then null
+			else
+			\'- BETTER than Current by \'||round(a.pct/b.pct*100-100,2)||\'%\' end as "Percent Improved",
+	a.targ as  "PGA Size Factor",a.pct "% Perf"
+	from
+       (select round(pga_target_for_estimate/1024.0/1024.0,0) MB,
+              pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r
+              from v$pga_target_advice) a left join
+       (select round(pga_target_for_estimate/1024.0/1024.0,0) MB,
+              pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r
+              from v$pga_target_advice) b on
+      a.r = b.r+1 where
+          b.pct < 100');
+		if (!$rs) return $t."Only in 9i or later";
+	//	$rs->Close();
+		if ($rs->EOF) return $t."PGA could be too big";
+
+		return $t.rs2html($rs,false,false,true,false);
 	}
-	
-	function Explain($sql,$partial=false) 
+
+	function Explain($sql,$partial=false)
 	{
 		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
+		$rs = $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
 		if (!$rs) {
 			echo "
Missing PLAN_TABLE

 
@@ -244,13 +410,13 @@ function Explain($sql,$partial=false)
 
";
 			return false;
 		}
-		
+
 		$rs->Close();
 	//	$this->conn->debug=1;
-	
+
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
 			if ($arr) {
 				foreach($arr as $row) {
 					$sql = reset($row);
@@ -258,13 +424,13 @@ function Explain($sql,$partial=false)
 				}
 			}
 		}
-		
-		$s = "
Explain: ".htmlspecialchars($sql)."
";	
-		
+
+		$s = "
Explain: ".htmlspecialchars($sql)."
";
+
 		$this->conn->BeginTrans();
 		$id = "ADODB ".microtime();
 
-		$rs =& $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
+		$rs = $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
 		$m = $this->conn->ErrorMsg();
 		if ($m) {
 			$this->conn->RollbackTrans();
@@ -272,51 +438,53 @@ function Explain($sql,$partial=false)
 			$s .= "
$m
";
 			return $s;
 		}
-		$rs =& $this->conn->Execute("
-		select 
-  '
'||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'
'  as Operation, 
+		$rs = $this->conn->Execute("
+		select
+  '
'||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'
'  as Operation,
   object_name,COST,CARDINALITY,bytes
-		FROM plan_table 
-START WITH id = 0  and STATEMENT_ID='$id'  
+		FROM plan_table
+START WITH id = 0  and STATEMENT_ID='$id'
 CONNECT BY prior id=parent_id and statement_id='$id'");
-		
+
 		$s .= rs2html($rs,false,false,false,false);
 		$this->conn->RollbackTrans();
 		$this->conn->LogSQL($savelog);
 		$s .= $this->Tracer($sql,$partial);
 		return $s;
 	}
-	
-	
+
 	function CheckMemory()
 	{
 		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
-		
-		 $rs =& $this->conn->Execute("
-select  a.size_for_estimate as cache_mb_estimate,
-	case when a.size_factor=1 then 
-   		'<<= current'
-	 when a.estd_physical_read_factor-b.estd_physical_read_factor > 0 and a.estd_physical_read_factor<1 then
-		'- BETTER - '
-	else ' ' end as currsize, 
-   a.estd_physical_read_factor-b.estd_physical_read_factor as best_when_0
-   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r from v\$db_cache_advice) a , 
-   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r from v\$db_cache_advice) b where a.r = b.r-1");
+
+		 $rs = $this->conn->Execute("
+select  a.name Buffer_Pool, b.size_for_estimate as cache_mb_estimate,
+	case when b.size_factor=1 then
+   		'<<= Current'
+	 when a.estd_physical_read_factor-b.estd_physical_read_factor > 0.001 and b.estd_physical_read_factor<1 then
+		'- BETTER than current by ' || round((1-b.estd_physical_read_factor)/b.estd_physical_read_factor*100,2) || '%'
+	else ' ' end as RATING,
+   b.estd_physical_read_factor \"Phys. Reads Factor\",
+   round((a.estd_physical_read_factor-b.estd_physical_read_factor)/b.estd_physical_read_factor*100,2) as \"% Improve\"
+   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r,name from v\$db_cache_advice order by name,1) a ,
+   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r,name from v\$db_cache_advice order by name,1) b
+   where a.r = b.r-1 and a.name = b.name
+  ");
 		if (!$rs) return false;
-		
+
 		/*
 		The v$db_cache_advice utility show the marginal changes in physical data block reads for different sizes of db_cache_size
 		*/
-		$s = "
Data Cache Estimate
";
+		$s = "
Data Cache Advice Estimate
";
 		if ($rs->EOF) {
 			$s .= "
Cache that is 50% of current size is still too big
";
 		} else {
-			$s .= "Ideal size of Data Cache is when \"best_when_0\" changes from a positive number and becomes zero.";
+			$s .= "Ideal size of Data Cache is when %BETTER gets close to zero.";
 			$s .= rs2html($rs,false,false,false,false);
 		}
-		return $s;
+		return $s.$this->PGA_Advice();
 	}
-	
+
 	/*
 		Generate html for suspicious/expensive sql
 	*/
@@ -339,18 +507,18 @@ function tohtml(&$rs,$type)
 						$prefix = '';
 						$suffix = '';
 					}
-					
+
 					$s .=  "\n".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'';
 				}
 				$sql = $rs->fields[2];
-				$check = $rs->fields[0].'::'.$rs->fields[1];			
+				$check = $rs->fields[0].'::'.$rs->fields[1];
 			} else
 				$sql .= $rs->fields[2];
 			if (substr($sql,strlen($sql)-1) == "\0") $sql = substr($sql,0,strlen($sql)-1);
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		
+
 		$carr = explode('::',$check);
 		$prefix = "';
 		$suffix = '';
@@ -359,11 +527,11 @@ function tohtml(&$rs,$type)
 			$suffix = '';
 		}
 		$s .=  "\n".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'';
-					
+
 		return $s."\n\n";
 	}
-	
-	// code thanks to Ixora. 
+
+	// code thanks to Ixora.
 	// http://www.ixora.com.au/scripts/query_opt.htm
 	// requires oracle 8.1.7 or later
 	function SuspiciousSQL($numsql=10)
@@ -374,7 +542,7 @@ function SuspiciousSQL($numsql=10)
   s.executions  executes,
   p.sql_text
 from
-  ( 
+  (
     select
       address,
       buffer_gets,
@@ -382,7 +550,7 @@ function SuspiciousSQL($numsql=10)
       pct,
       rank() over (order by buffer_gets desc)  ranking
     from
-      ( 
+      (
 	select
 	  address,
 	  buffer_gets,
@@ -410,30 +578,34 @@ function SuspiciousSQL($numsql=10)
 		}
 
 		if (isset($_GET['sql'])) return $this->_SuspiciousSQL($numsql);
-		
+
 		$s = '';
+		$timer = time();
 		$s .= $this->_SuspiciousSQL($numsql);
+		$timer = time() - $timer;
+
+		if ($timer > $this->noShowIxora) return $s;
 		$s .= '
';
-		
+
 		$save = $ADODB_CACHE_MODE;
 		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->SelectLimit($sql);
+		$rs = $this->conn->SelectLimit($sql);
 		$this->conn->LogSQL($savelog);
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_CACHE_MODE = $save;
 		if ($rs) {
 			$s .= "\n
Ixora Suspicious SQL
";
 			$s .= $this->tohtml($rs,'expsixora');
 		}
-		
+
 		return $s;
 	}
-	
-	// code thanks to Ixora. 
+
+	// code thanks to Ixora.
 	// http://www.ixora.com.au/scripts/query_opt.htm
 	// requires oracle 8.1.7 or later
 	function ExpensiveSQL($numsql = 10)
@@ -444,7 +616,7 @@ function ExpensiveSQL($numsql = 10)
   s.executions  executes,
   p.sql_text
 from
-  ( 
+  (
     select
       address,
       disk_reads,
@@ -475,35 +647,62 @@ function ExpensiveSQL($numsql = 10)
 ";
 		global $ADODB_CACHE_MODE;
   		if (isset($_GET['expeixora']) && isset($_GET['sql'])) {
-			$partial = empty($_GET['part']);	
+			$partial = empty($_GET['part']);
 			echo "".$this->Explain($_GET['sql'],$partial)."\n";
 		}
 		if (isset($_GET['sql'])) {
 			 $var = $this->_ExpensiveSQL($numsql);
 			 return $var;
 		}
-		
-		$s = '';		
+
+		$s = '';
+		$timer = time();
 		$s .= $this->_ExpensiveSQL($numsql);
+		$timer = time() - $timer;
+		if ($timer > $this->noShowIxora) return $s;
+
 		$s .= '
';
 		$save = $ADODB_CACHE_MODE;
 		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
+
 		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->Execute($sql);
+		$rs = $this->conn->Execute($sql);
 		$this->conn->LogSQL($savelog);
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_CACHE_MODE = $save;
-		
+
 		if ($rs) {
 			$s .= "\n
Ixora Expensive SQL
";
 			$s .= $this->tohtml($rs,'expeixora');
 		}
-	
+
 		return $s;
 	}
-	
+
+	function clearsql()
+	{
+		$perf_table = adodb_perf::table();
+	// using the naive "delete from $perf_table where created<".$this->conn->sysTimeStamp will cause the table to lock, possibly
+	// for a long time
+		$sql =
+"DECLARE cnt pls_integer;
+BEGIN
+	cnt := 0;
+	FOR rec IN (SELECT ROWID AS rr FROM $perf_table WHERE createdconn->Execute($sql);
+	}
+
 }
-?>
\ No newline at end of file
diff --git a/adodb/perf/perf-postgres.inc.php b/adodb/perf/perf-postgres.inc.php
index af5bbbe..315c17f 100644
--- a/adodb/perf/perf-postgres.inc.php
+++ b/adodb/perf/perf-postgres.inc.php
@@ -1,17 +1,23 @@
  array('RATIO',
@@ -86,16 +92,43 @@ class perf_postgres extends adodb_perf{
 			'Cost of doing a seek (default=4). See random_page_cost'),
 		false
 	);
-	
-	function perf_postgres(&$conn)
+
+	function __construct(&$conn)
+	{
+		$this->conn = $conn;
+	}
+
+	var $optimizeTableLow  = 'VACUUM %s';
+	var $optimizeTableHigh = 'VACUUM ANALYZE %s';
+
+/**
+ * @see adodb_perf#optimizeTable
+ */
+
+	function optimizeTable($table, $mode = ADODB_OPT_LOW)
 	{
-		$this->conn =& $conn;
+	    if(! is_string($table)) return false;
+
+	    $conn = $this->conn;
+	    if (! $conn) return false;
+
+	    $sql = '';
+	    switch($mode) {
+	        case ADODB_OPT_LOW : $sql = $this->optimizeTableLow;  break;
+	        case ADODB_OPT_HIGH: $sql = $this->optimizeTableHigh; break;
+	        default            :
+	            ADOConnection::outp(sprintf("
%s: '%s' using of undefined mode '%s'
", __CLASS__, 'optimizeTable', $mode));
+	            return false;
+	    }
+	    $sql = sprintf($sql, $table);
+
+	    return $conn->Execute($sql) !== false;
 	}
-	
+
 	function Explain($sql,$partial=false)
 	{
 		$save = $this->conn->LogSQL(false);
-		
+
 		if ($partial) {
 			$sqlq = $this->conn->qstr($sql.'%');
 			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
@@ -121,4 +154,3 @@ function Explain($sql,$partial=false)
 		return $s;
 	}
 }
-?>
\ No newline at end of file
diff --git a/adodb/phpdoc b/adodb/phpdoc
new file mode 100644
index 0000000..d4cb73a
--- /dev/null
+++ b/adodb/phpdoc
@@ -0,0 +1,20 @@
+databaseType,'access') !== false; 
+
+	$iif = strpos($db->databaseType,'access') !== false;
 		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
-	
+
 	//$hidecnt = false;
-	
+
  	if ($where) $where = "\nWHERE $where";
 	if (!is_array($colfield)) $colarr = $db->GetCol("select distinct $colfield from $tables $where order by 1");
 	if (!$aggfield) $hidecnt = false;
-	
+
 	$sel = "$rowfields, ";
 	if (is_array($colfield)) {
 		foreach ($colfield as $k => $v) {
 			$k = trim($k);
 			if (!$hidecnt) {
-				$sel .= $iif ? 
+				$sel .= $iif ?
 					"\n\t$aggfn(IIF($v,1,0)) AS \"$k\", "
 					:
 					"\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
@@ -59,7 +68,7 @@ function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
 					:
 					"\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
 			}
-		} 
+		}
 	} else {
 		foreach ($colarr as $v) {
 			if (!is_numeric($v)) $vq = $db->qstr($v);
@@ -84,20 +93,20 @@ function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
 	}
 	if ($aggfield && $aggfield != '1'){
 		$agg = "$aggfn($aggfield)";
-		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";		
+		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";
 	}
-	
+
 	if ($showcount)
 		$sel .= "\n\tSUM(1) as Total";
 	else
 		$sel = substr($sel,0,strlen($sel)-2);
-	
-	
+
+
 	// Strip aliases
 	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
-	
+
 	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
-	
+
 	return $sql;
  }
 
@@ -109,7 +118,7 @@ function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
 # Query the main "product" table
 # Set the rows to CompanyName and QuantityPerUnit
 # and the columns to the Categories
-# and define the joins to link to lookup tables 
+# and define the joins to link to lookup tables
 # "categories" and "suppliers"
 #
 
@@ -117,27 +126,27 @@ function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
  	$gDB,  											# adodb connection
  	'products p ,categories c ,suppliers s',  		# tables
 	'CompanyName,QuantityPerUnit',					# row fields
-	'CategoryName',									# column fields 
+	'CategoryName',									# column fields
 	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
 );
  print "
$sql";
  $rs = $gDB->Execute($sql);
  rs2html($rs);
- 
+
 /*
 Generated SQL:
 
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
-	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
-	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
-	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products", 
-	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
-	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
-	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
+SELECT CompanyName,QuantityPerUnit,
+	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages",
+	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments",
+	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections",
+	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products",
+	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals",
+	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry",
+	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce",
+	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood",
+	SUM(1) as Total
+FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID
 GROUP BY CompanyName,QuantityPerUnit
 */
 //=====================================================================
@@ -147,7 +156,7 @@ function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
 # Query the main "product" table
 # Set the rows to CompanyName and QuantityPerUnit
 # and the columns to the UnitsInStock for diiferent ranges
-# and define the joins to link to lookup tables 
+# and define the joins to link to lookup tables
 # "categories" and "suppliers"
 #
  $sql = PivotTableSQL(
@@ -155,7 +164,7 @@ function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
  	'products p ,categories c ,suppliers s',	# tables
 	'CompanyName,QuantityPerUnit',				# row fields
 												# column ranges
-array(										
+array(
 ' 0 ' => 'UnitsInStock <= 0',
 "1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
 "6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
@@ -171,17 +180,16 @@ function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
  rs2html($rs);
  /*
  Generated SQL:
- 
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ", 
-	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5", 
-	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10", 
-	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
+
+SELECT CompanyName,QuantityPerUnit,
+	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ",
+	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5",
+	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10",
+	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15",
 	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 16+",
-	SUM(UnitsInStock) AS "Sum UnitsInStock", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
+	SUM(UnitsInStock) AS "Sum UnitsInStock",
+	SUM(1) as Total
+FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID
 GROUP BY CompanyName,QuantityPerUnit
  */
 }
-?>
\ No newline at end of file
diff --git a/adodb/readme.txt b/adodb/readme.txt
deleted file mode 100644
index 009b94c..0000000
--- a/adodb/readme.txt
+++ /dev/null
@@ -1,62 +0,0 @@
->> ADODB Library for PHP4
-
-(c) 2000-2004 John Lim (jlim@natsoft.com.my)
-
-Released under both BSD and GNU Lesser GPL library license. 
-This means you can use it in proprietary products.
- 
- 
->> Introduction
-
-PHP's database access functions are not standardised. This creates a 
-need for a database class library to hide the differences between the 
-different databases (encapsulate the differences) so we can easily 
-switch databases.
-
-We currently support MySQL, Interbase, Sybase, PostgreSQL, Oracle, 
-Microsoft SQL server,  Foxpro ODBC, Access ODBC, Informix, DB2,
-Sybase SQL Anywhere, generic ODBC and Microsoft's ADO. 
-
-We hope more people will contribute drivers to support other databases.
-
-
->> Documentation and Examples
-
-Refer to the adodb/docs directory for full documentation and examples. 
-There is also a  tutorial tute.htm that contrasts ADODB code with 
-mysql code.
-
-
->>> Files
-Adodb.inc.php is the main file. You need to include only this file.
-
-Adodb-*.inc.php are the database specific driver code.
-
-Test.php contains a list of test commands to exercise the class library.
-
-Adodb-session.php is the PHP4 session handling code.
-
-Testdatabases.inc.php contains the list of databases to apply the tests on.
-
-Benchmark.php is a simple benchmark to test the throughput of a simple SELECT 
-statement for databases described in testdatabases.inc.php. The benchmark
-tables are created in test.php.
-
-readme.htm is the main documentation.
-
-tute.htm is the tutorial.
-
-
->> More Info
-
-For more information, including installation see readme.htm
-or visit
-           http://adodb.sourceforge.net/
-
-
->> Feature Requests and Bug Reports
-
-Email to jlim@natsoft.com.my 
-
-
- 
\ No newline at end of file
diff --git a/adodb/replicate/adodb-replicate.inc.php b/adodb/replicate/adodb-replicate.inc.php
new file mode 100644
index 0000000..f8d6c14
--- /dev/null
+++ b/adodb/replicate/adodb-replicate.inc.php
@@ -0,0 +1,1177 @@
+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)
+ *
+ * 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
+ */
+
+define('ADODB_REPLICATE',1.2);
+
+include_once(ADODB_DIR.'/adodb-datadict.inc.php');
+
+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/adodb/replicate/replicate-steps.php b/adodb/replicate/replicate-steps.php
new file mode 100644
index 0000000..fca719d
--- /dev/null
+++ b/adodb/replicate/replicate-steps.php
@@ -0,0 +1,156 @@
+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/adodb/replicate/test-tnb.php b/adodb/replicate/test-tnb.php
new file mode 100644
index 0000000..6be1107
--- /dev/null
+++ b/adodb/replicate/test-tnb.php
@@ -0,0 +1,440 @@
+ 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/adodb/rsfilter.inc.php b/adodb/rsfilter.inc.php
index 3313004..34c5311 100644
--- a/adodb/rsfilter.inc.php
+++ b/adodb/rsfilter.inc.php
@@ -1,29 +1,36 @@
 databaseType != 'array') {
 		if (!$rs->connection) return false;
-		
-		$rs = &$rs->connection->_rs2rs($rs);
+
+		$rs = $rs->connection->_rs2rs($rs);
 	}
 	$rows = $rs->RecordCount();
 	for ($i=0; $i < $rows; $i++) {
@@ -49,13 +56,12 @@ function &RSFilter($rs,$fn)
       } else {
 			$fn($rs->_array[$i],$rs);
       }
-	  
+
 	}
 	if (!$rs->EOF) {
 		$rs->_currentRow = 0;
 		$rs->fields = $rs->_array[0];
 	}
-	
+
 	return $rs;
 }
-?>
\ No newline at end of file
diff --git a/adodb/scripts/.gitignore b/adodb/scripts/.gitignore
new file mode 100644
index 0000000..43d2318
--- /dev/null
+++ b/adodb/scripts/.gitignore
@@ -0,0 +1,5 @@
+# ADOdb scripts config file
+/env.yml
+
+# Python byte code
+*.pyc
diff --git a/adodb/scripts/buildrelease.py b/adodb/scripts/buildrelease.py
new file mode 100644
index 0000000..cba40e6
--- /dev/null
+++ b/adodb/scripts/buildrelease.py
@@ -0,0 +1,285 @@
+#!/usr/bin/env -S python3 -u
+"""
+ADOdb release build script
+
+- Create release tag if it does not exist
+- Copy release files to target directory
+- Generate zip/tar balls
+
+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 2013 Damien Regad, Mark Newnham and the ADOdb community
+@author Damien Regad
+"""
+
+import errno
+import getopt
+import re
+import os
+from os import path
+import shutil
+import subprocess
+import sys
+import tempfile
+
+import updateversion
+
+
+# ADOdb Repository reference
+origin_repo = "https://github.com/ADOdb/ADOdb.git"
+release_branch = "master"
+release_prefix = "adodb"
+
+# Directories and files to exclude from release tarballs
+# For consistency, this should match the list in .gitattributes
+exclude_list = (".git*",
+                ".mailmap",
+                "replicate",
+                "scripts",
+                "tests",
+                "cute_icons_for_site",
+                ".idea",
+                )
+
+# Command-line options
+options = "hb:dfk"
+long_options = ["help", "branch=", "debug", "fresh", "keep"]
+
+# Global flags
+debug_mode = False
+fresh_clone = False
+cleanup = True
+
+
+def usage():
+    """
+    Print script's command-line arguments help.
+    """
+    print('''Usage: {} [options] version release_path
+
+    Parameters:
+        version                 ADOdb version to bundle (e.g. v5.19)
+        release_path            Where to save the release tarballs
+
+    Options:
+        -h | --help             Show this usage message
+
+        -b | --branch   Use specified branch (defaults to '{}' 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)
+'''.format(
+        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 subprocess.CalledProcessError:
+            pass
+
+    # Checkout release branch
+    subprocess.call("git checkout {}".format(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",
+            text=True,
+            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 as 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.rsplit('.', 1)[0]
+
+    # -------------------------------------------------------------------------
+    # Start the build
+    #
+    global release_prefix
+
+    print("Building ADOdb release {} into '{}'\n".format(
+        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 {} {}".format(origin_repo, repo_path),
+            shell=True
+        )
+        os.chdir(repo_path)
+    else:
+        # Git repo's root directory
+        repo_path = updateversion.git_root()
+        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 subprocess.CalledProcessError:
+            print("ERROR: there are uncommitted changes in the repository")
+            sys.exit(3)
+
+        # Update the repository
+        if not debug_mode:
+            print("Updating repository in '{}'".format(os.getcwd()))
+            try:
+                subprocess.check_output("git fetch", shell=True)
+            except subprocess.CalledProcessError:
+                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 subprocess.CalledProcessError:
+        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 '{}'".format(release_tmp_dir))
+    retry = True
+    while True:
+        try:
+            shutil.copytree(
+                repo_path,
+                release_tmp_dir,
+                ignore=shutil.ignore_patterns(*exclude_list)
+            )
+            break
+        except OSError as err:
+            # First try and file exists, try to delete dir
+            if retry and err.errno == errno.EEXIST:
+                print("WARNING: Directory '{}' exists, delete it and retry"
+                      .format(release_tmp_dir))
+                shutil.rmtree(release_tmp_dir)
+                retry = False
+                continue
+            else:
+                # We already tried to delete or some other error occurred
+                raise
+
+    # Create tarballs
+    print("Creating release tarballs...")
+    release_name = release_prefix + '-' + version
+
+    os.chdir(release_path)
+    print("- tar")
+    subprocess.call(
+        "tar -czf {}.tar.gz {}".format(release_name, release_files),
+        shell=True
+    )
+    print("- zip")
+    subprocess.call(
+        "zip -rq {}.zip {}".format(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("- '{}' (repo clone)".format(repo_path))
+        print("- '{}' (release temp dir)".format(release_tmp_dir))
+        print("Delete them manually when they are no longer needed.")
+
+    # Done
+    print("\nADOdb release {} build complete, files saved in '{}'.".format(
+        version,
+        release_path
+    ))
+    print("Don't forget to generate a README file with the changelog")
+
+# end main()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/adodb/scripts/env.yml.sample b/adodb/scripts/env.yml.sample
new file mode 100644
index 0000000..fce3840
--- /dev/null
+++ b/adodb/scripts/env.yml.sample
@@ -0,0 +1,7 @@
+# ADOdb maintenance scripts configuration file
+# Rename this file to 'env.yml' and update variables below as appropriate.
+
+# SourceForge API key
+# Get it from https://sourceforge.net/auth/preferences/
+# under "Releases API Key"
+api_key:
diff --git a/adodb/scripts/fix-static-docs.php b/adodb/scripts/fix-static-docs.php
new file mode 100644
index 0000000..c4159dd
--- /dev/null
+++ b/adodb/scripts/fix-static-docs.php
@@ -0,0 +1,232 @@
+ 1)
+	{
+		$dSlash .= array_shift($dList) . '/';
+		if (!is_dir($dSlash))
+			mkdir($dSlash);
+	}
+	if (!is_file($f))
+		continue;
+	if (substr($f,-4) <> 'html')
+	{
+		/*
+		* An image or something else, copy unmodified
+		*/
+		copy ($f,$r);
+		continue;
+	}
+		
+	$prepend = str_repeat('../',$depth);
+	
+	$doc = new DOMDocument();
+	@$doc->loadHTMLFile($f);
+	
+	/*
+	* Remove Page Tools Group
+	*/
+	$xpath = new DOMXPath($doc);
+		
+	/*
+	* Remove Top Menu Tools Group, and add a link to the ADOdb site
+	*/
+	$nodes = $xpath->query("//div[@class='tools group']");
+	foreach($nodes as $node) {
+		$pn = $node->parentNode;
+		$pn->removeChild($node);
+		$newChild = $doc->createElement('div','');
+		$newDiv = $pn->appendChild($newChild);
+		$newDiv->setAttribute('style','text-align:right');
+		$newChild = $doc->createElement('a','ADOdb Web Site');
+		$newA = $newDiv->appendChild($newChild);
+		$newA->setAttribute('href','https://adodb.org');
+    }
+	
+	/*
+	* Remove Trace
+	*/
+	$nodes = $xpath->query("//div[@class='breadcrumbs']");
+	foreach($nodes as $node) {
+		$node->parentNode->removeChild($node);
+    }
+	
+	/*
+	* Remove Side Menu Tools Group
+	*/
+	$nodes = $xpath->query("//div[@id='dokuwiki__pagetools']");
+	foreach($nodes as $node) {
+		$node->parentNode->removeChild($node);
+    }
+	
+	/*
+	* Fix main links
+	*/
+	$nodes = $xpath->query("//a[@class='wikilink1']");
+	foreach($nodes as $node) {
+		$n =  $node->getAttribute('title');
+		$p = $prepend . str_replace(':','/',$n) . '.html';
+		$node->setAttribute('href', $p);
+    }
+	
+	/*
+	* Fix In Page links
+	*/
+	$nodes = $xpath->query("//a[@class='wikilink2']");
+	foreach($nodes as $node) {
+		$n =  $node->getAttribute('title');
+		$p = $prepend . str_replace(':','/',$n) . '.html';
+		$node->setAttribute('href', $p);
+    }
+	
+	/*
+	* Make Graphic point to first page. This will break if the image size
+	* ever changes.
+	*/
+	$corePage = $prepend . '/index.html';
+	$nodes = $xpath->query("//img[@width='176']");
+	foreach($nodes as $node) {
+		$node->parentNode->setAttribute('href', $corePage);
+    }
+	
+	/*
+	* Change title of page
+	*/
+	$nodes = $xpath->query("//title");
+	foreach($nodes as $node) {
+		
+		
+		$docTitle = implode(':',$titleList);
+		$docTitle = str_replace('.html','',$docTitle);
+		$pn = $node->parentNode; 
+		$pn->removeChild($node);
+		$newChild = $doc->createElement('title',$docTitle);
+		$pn->appendChild($newChild);
+		
+    }
+		
+	$doc->saveHTMLFile($r);
+	
+    echo  $r, "\n"; 
+}
+/*
+* Now remove the original index and replace it with the hardcopy documentation one
+*/
+unlink ('documentation/index.html');
+rename('documentation/adodb_index.html','documentation/index.html');
+
+/*
+* We could add in an auto zip and upload here, but this is a good place to
+* stop and check the output
+*/
diff --git a/adodb/scripts/updateversion.py b/adodb/scripts/updateversion.py
new file mode 100644
index 0000000..5590f37
--- /dev/null
+++ b/adodb/scripts/updateversion.py
@@ -0,0 +1,487 @@
+#!/usr/bin/env -S python3 -u
+"""
+ADOdb version update script.
+
+Updates the version number, and release date in all php and html files
+
+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 2014 Damien Regad, Mark Newnham and the ADOdb community
+@author Damien Regad
+"""
+
+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_abrc = r"(alpha|beta|rc)(\.([0-9]+))?"
+_version_prerelease = r"(-?({0}|{1}))?".format(_version_dev, _version_abrc)
+_version_base = r"[Vv]?([0-9]\.[0-9]+)(\.([0-9]+))?"
+_version_regex = _version_base + _version_prerelease
+_release_date_regex = r"(Unreleased|[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 script's command-line arguments help.
+    """
+    print('''Usage: {0} 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
+'''.format(
+        path.basename(__file__)
+    ))
+# end usage()
+
+
+def version_is_dev(version):
+    """
+    Return true if version is a development release.
+    """
+    return version.endswith(_version_dev)
+
+
+def version_is_prerelease(version):
+    """
+    Return true if version is alpha, beta or release-candidate.
+    """
+    return re.search(_version_abrc, version) is not None
+
+
+def version_is_patch(version):
+    """
+    Return true if version is a patch release (i.e. X.Y.Z with Z > 0).
+    """
+    return (re.search('^' + _version_base + '$', version) is not None
+            and not version.endswith('.0'))
+
+
+def version_parse(version):
+    """
+    Breakdown the version into groups (Z and -dev are optional).
+
+    Groups:
+      - 1:(X.Y)
+      - 2:(.Z)
+      - 3:(Z)
+      - 4:(-dev or -alpha/beta/rc.N)
+      - 8: N
+    """
+    return re.match(r'^{0}$'.format(_version_regex), version)
+
+
+def version_check(version):
+    """
+    Check that the given version is valid, exit 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
+    elif version_is_prerelease(version):
+        vnorm += '-' + vparse.group(5)
+        # If no alpha/beta/rc version number specified, assume 1
+        if not vparse.group(8):
+            vnorm += ".1"
+
+    return vnorm
+
+
+def get_release_date(version):
+    """
+    Return the release date in YYYY-MM-DD format, or 'Unreleased' for
+    development releases.
+    """
+    # Development release
+    if version_is_dev(version):
+        return "Unreleased"
+    else:
+        return date.today().strftime("%Y-%m-%d")
+
+
+def git_root():
+    """
+    Return the git repository's root (top-level) directory.
+    """
+    return subprocess.check_output(
+        'git rev-parse --show-toplevel',
+        text=True,
+        shell=True
+        ).rstrip()
+
+
+def sed_script(version):
+    """
+    Build sed script to update version information in source files.
+    """
+    # Version number and release date
+    script = r"s/{0}\s+{1}/v{2}  {3}/".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$', f, re.IGNORECASE)
+            ]
+        for fname in files:
+            dirlist.append(path.join(root, fname))
+
+    return dirlist
+
+
+def sed_run(script, files):
+    """
+    Run sed.
+    """
+    subprocess.call(
+        "sed -r -i '{0}' {1} ".format(script, files),
+        shell=True
+    )
+
+
+def tag_name(version):
+    """
+    Return tag name (vX.Y.Z)
+    """
+    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 '{0}' already exists".format(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):
+    """
+    Create the tag for the specified version.
+
+    Returns True if tag created.
+    """
+    print("Creating release tag '{0}'".format(tag_name(version)))
+    result = subprocess.call(
+        "git tag --sign --message '{0}' {1}".format(
+            "ADOdb version {0} released {1}".format(
+                version,
+                get_release_date(version)
+            ),
+            tag_name(version)
+        ),
+        shell=True
+    )
+    return result == 0
+
+
+def section_exists(filename, version, print_message=True):
+    """
+    Check given file for existing section with specified version.
+    """
+    for i, line in enumerate(open(filename)):
+        if re.search(r'^## \[?' + version + r']', line):
+            if print_message:
+                print("  Existing section for v{0} found,"
+                      .format(version), end=" ")
+            return True
+    return False
+
+
+class UnsupportedPreviousVersion(Exception):
+    pass
+
+
+class NoPreviousVersion(Exception):
+    pass
+
+
+def version_get_previous(version):
+    """
+    Returns the previous version number.
+
+    In pre-release scenarios, it would be complex to figure out what the
+    previous version is, so it is not worth the effort to implement as
+    this is a rare usage scenario; we just raise an exception in this case.
+    - 'UnsupportedPreviousVersion' when attempting facing pre-release
+      scenarios (rc -> beta -> alpha)
+    - 'NoPreviousVersion' when processing major version or .1 pre-releases
+      (can't handle e.g. alpha.0)
+    """
+    vprev = version.split('.')
+    item = len(vprev) - 1
+
+    while item > 0:
+        try:
+            val = int(vprev[item])
+        except ValueError:
+            raise UnsupportedPreviousVersion(
+                "Retrieving pre-release's previous version is not supported")
+        if val > 0:
+            vprev[item] = str(val - 1)
+            break
+        item -= 1
+
+    # Unhandled scenarios:
+    # - major version number (item == 0)
+    # - .0 pre-release
+    if (item == 0
+            or version_is_prerelease(version) and vprev[item] == '0'):
+        raise NoPreviousVersion
+
+    return '.'.join(vprev)
+
+
+def update_changelog(version):
+    """
+    Update the release date in the Change Log.
+    """
+    print("Updating Changelog")
+
+    # Version number without '-dev' suffix
+    vparse = version_parse(version)
+    version_release = vparse.group(1) + vparse.group(2)
+
+    # Make sure previous version exists in changelog, ignore .0 pre-releases
+    try:
+        if version_is_dev(version):
+            version_previous = version_get_previous(version_release)
+        else:
+            version_previous = version_get_previous(version)
+        if not section_exists(_changelog_file, version_previous, False):
+            raise ValueError(
+                "ERROR: previous version {0} does not exist in changelog"
+                .format(version_previous)
+                )
+    except NoPreviousVersion:
+        if version_is_prerelease(version):
+            version_previous = version_release
+        else:
+            version_previous = False
+
+    # If version exists, update the release date
+    if section_exists(_changelog_file, version):
+        print('updating release date')
+        script = r"s/^## \[{0}] .*$/## [{1}] - {2}/".format(
+            version.replace('.', r'\.'),
+            version,
+            get_release_date(version)
+            )
+    else:
+        # If it's a .0 release, treat it as dev
+        if (not version_is_patch(version)
+                and not version_is_prerelease(version)
+                and not version_is_dev(version)):
+            version += '-' + _version_dev
+
+        # If development release already exists, nothing to do
+        if (version_is_dev(version)
+                and section_exists(_changelog_file, version_release)):
+            print("nothing to do")
+            return
+
+        print("  Inserting new section for v{0}".format(version))
+
+        # Prerelease section is inserted after the main version's,
+        # otherwise we insert the new section before it.
+        section_template = r"## \[{0}] - {1}"
+        if version_is_prerelease(version):
+            version_section = section_template.format(
+                version,
+                get_release_date(version)
+                )
+            version_section = "\\0\\n\\n" + version_section
+        else:
+            version_section = section_template.format(
+                version_release,
+                get_release_date(version)
+                )
+            version_section += "\\n\\n\\0"
+
+        if version_previous:
+            # Adjust previous version number (remove patch component)
+            version_previous = version_parse(version_previous).group(1)
+            script = r"1,/^## \[({0}|{2})/s/^## \[({0}|{2}).*$/{1}/".format(
+                version_previous,
+                version_section,
+                version_release
+                )
+
+        # We don't have a previous version, insert before the first section
+        else:
+            print("No previous version")
+            script = "1,/^## /s/^## .*$/{0}/".format(version_section)
+
+    sed_run(script, _changelog_file)
+
+    print("  WARNING: review '{0}' to ensure added section is correct".format(
+        _changelog_file
+        ))
+
+# 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")
+    sed_run(sed_script(version), " ".join(sed_filelist()))
+    print("Version set to {0}".format(version))
+
+    if do_commit:
+        # Commit changes
+        print("Committing")
+        commit_ok = subprocess.call(
+            "git commit --all --message '{0}'".format(
+                "Bump version to {0}".format(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 {0}')
+ - run this script again
+'''.format(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 as 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])
+
+    # Change to Git repo's root directory
+    os.chdir(git_root())
+
+    # Let's do it
+    version_set(version, do_commit, do_tag)
+# end main()
+
+
+if sys.version_info < (3, 7):
+    print("ERROR: Python 3.7 or later is required")
+    sys.exit(1)
+if __name__ == "__main__":
+    main()
diff --git a/adodb/scripts/uploadrelease.py b/adodb/scripts/uploadrelease.py
new file mode 100644
index 0000000..7d801ee
--- /dev/null
+++ b/adodb/scripts/uploadrelease.py
@@ -0,0 +1,332 @@
+#!/usr/bin/env -S python3 -u
+"""
+ADOdb release upload script.
+
+Uploads release zip/tarball files generated by buildrelease.py to SourceForge.
+
+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 2014 Damien Regad, Mark Newnham and the ADOdb community
+@author Damien Regad
+"""
+
+from distutils.version import LooseVersion
+import getopt
+import getpass
+import glob
+import json
+import os
+from os import path
+import re
+import requests
+import subprocess
+import sys
+import yaml
+
+
+# Directories and files to exclude from release tarballs
+# for debugging, set to a local dir e.g. "localhost:/tmp/sf-adodb/"
+
+sf_files = "frs.sourceforge.net:/home/frs/project/adodb/"
+
+# SourceForge Release API base URL
+# https://sourceforge.net/p/forge/documentation/Using%20the%20Release%20API/
+sf_api_url = 'https://sourceforge.net/projects/adodb/files/{}/'
+
+# rsync command template
+rsync_cmd = "rsync -vP --rsh ssh {opt} {src} {usr}@{dst}"
+
+# Command-line options
+options = "hu:ns"
+long_options = ["help", "user=", "dry-run", "skip-upload"]
+
+# Global flags
+dry_run = False
+api_key = ''
+username = getpass.getuser()
+release_path = ''
+skip_upload = False
+
+
+def usage():
+    """
+    Print script's command-line arguments help.
+    """
+    print('''Usage: {} [options] username [release_path]
+
+    This script will upload the files in the given directory (or the
+    current one if unspecified) to SourceForge.
+
+    Parameters:
+        release_path            Location of the release files to upload,
+                                see buildrelease.py to generate them.
+                                Defaults to current directory.
+
+    Options:
+        -h | --help             Show this usage message
+        -u | --user       SourceForge account (defaults to current user)
+        -s | --skip-upload      Do not upload the release files (allows only
+                                updating previously uploaded files information)
+        -n | --dry-run          Do not upload or update sourceforge
+'''.format(
+        path.basename(__file__)
+    ))
+# end usage()
+
+
+def call_rsync(usr, opt, src, dst):
+    """
+    Call rsync to upload files with given parameters.
+
+    :param usr: ssh username
+    :param opt: options
+    :param src: source directory
+    :param dst: target directory
+    """
+    global dry_run
+
+    command = rsync_cmd.format(usr=usr, opt=opt, src=src, dst=dst)
+
+    # Create directory if it does not exist
+    dst_split = dst.rsplit(':')
+    host = dst_split[0]
+    dst = dst_split[1]
+    mkdir = 'ssh {usr}@{host} mkdir -p {dst}'.format(
+        usr=usr,
+        host=host,
+        dst=dst
+    )
+
+    if dry_run:
+        print(mkdir)
+        print(command)
+    else:
+        subprocess.call(mkdir, shell=True)
+        subprocess.call(command, shell=True)
+
+
+def get_release_version():
+    """
+    Return the version number (X.Y.Z) from the zip file to upload,
+    excluding the SemVer suffix.
+    """
+    try:
+        zipfile = glob.glob('adodb-*.zip')[0]
+    except IndexError:
+        print("ERROR: release zip file not found in '{}'".format(release_path))
+        sys.exit(1)
+
+    try:
+        version = re.search(
+            r"^adodb-([\d]+\.[\d]+\.[\d]+)(-(alpha|beta|rc)\.[\d]+)?\.zip$",
+            zipfile
+            ).group(1)
+    except AttributeError:
+        print('''ERROR: unable to extract version number from '{}'
+       Only 3 groups of digits separated by periods are allowed'''
+              .format(zipfile))
+        sys.exit(1)
+
+    return version
+
+
+def sourceforge_target_dir(version):
+    """
+    Return the SourceForge target directory.
+
+    This is relative to the root defined in sf_files global variable:
+    basedir/subdir, with
+    - basedir:
+      - for ADOdb version 5: adodb-php5-only
+      - for newer versions:  adodbX (where X is the major version number)
+    - subdir:
+      - if version >= 5.21: adodb-X.Y
+      - for older versions: adodb-XYZ-for-php5
+    """
+    major_version = int(version.rsplit('.')[0])
+
+    # Base directory
+    if major_version == 5:
+        directory = 'adodb-php5-only/'
+    else:
+        directory = 'adodb{}/'.format(major_version)
+
+    # Keep only X.Y (discard patch number and pre-release suffix)
+    short_version = version.split('-')[0].rsplit('.', 1)[0]
+
+    if LooseVersion(version) >= LooseVersion('5.21'):
+        directory += "adodb-" + short_version
+    else:
+        directory += "adodb-{}-for-php5".format(short_version.replace('.', ''))
+
+    return directory
+
+
+def load_env():
+    """
+    Load environment from env.yml config file.
+    """
+    global api_key
+
+    # Load the config file
+    env_file = path.join(path.dirname(path.abspath(__file__)), 'env.yml')
+    try:
+        stream = open(env_file, 'r')
+        y = yaml.safe_load(stream)
+    except IOError:
+        print("ERROR: Environment file {} not found".format(env_file))
+        sys.exit(3)
+    except yaml.parser.ParserError as e:
+        print("ERROR: Invalid Environment file")
+        print(e)
+        sys.exit(3)
+
+    api_key = y['api_key']
+
+
+def process_command_line():
+    """
+    Retrieve command-line options and set global variables accordingly.
+    """
+    global dry_run, username, release_path, skip_upload
+
+    # Get command-line options
+    try:
+        opts, args = getopt.gnu_getopt(sys.argv[1:], options, long_options)
+    except getopt.GetoptError as err:
+        print(str(err))
+        usage()
+        sys.exit(2)
+
+    # Default values for flags
+    username = getpass.getuser()
+
+    for opt, val in opts:
+        if opt in ("-h", "--help"):
+            usage()
+            sys.exit(0)
+
+        elif opt in ("-u", "--user"):
+            username = val
+
+        elif opt in ("-s", "--skip-upload"):
+            skip_upload = True
+
+        elif opt in ("-n", "--dry-run"):
+            print("Dry-run mode - files will not be uploaded or modified")
+            dry_run = True
+
+    # Mandatory parameters
+    # (none)
+
+    # Change to release directory, current if not specified
+    try:
+        release_path = args[0]
+        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("  Files:  " + ', '.join(glob.glob('*')))
+    print()
+    call_rsync(
+        username,
+        "",
+        path.join(release_path, "*"),
+        target
+    )
+    print()
+
+
+def set_sourceforge_file_info():
+    global api_key, dry_run
+
+    print("Updating uploaded files information")
+
+    base_url = sf_api_url.format(
+        sourceforge_target_dir(get_release_version())
+        )
+    headers = {'Accept': 'application/json"'}
+
+    # Loop through uploaded files
+    for file in glob.glob('adodb-*'):
+        print("  " + file)
+
+        # Determine defaults based on file extension
+        ext = path.splitext(file)[1]
+        if ext == '.zip':
+            defaults = ['windows']
+        elif ext == '.gz':
+            defaults = ['linux', 'mac', 'bsd', 'solaris', 'others']
+        else:
+            print("WARNING: Unknown extension for file", file)
+            continue
+
+        # SourceForge API request
+        url = path.join(base_url, file)
+        payload = {
+            'default': defaults,
+            'api_key': api_key
+            }
+        if dry_run:
+            req = requests.Request('PUT', url, headers=headers, params=payload)
+            r = req.prepare()
+            print("    Calling SourceForge Release API:", r.url)
+        else:
+            req = requests.put(url, headers=headers, params=payload)
+
+            # Print results
+            if req.status_code == requests.codes.ok:
+                result = json.loads(req.text)['result']
+                print("    Download default for:", result['x_sf']['default'])
+            else:
+                if req.status_code == requests.codes.unauthorized:
+                    err = "access denied"
+                else:
+                    err = "SourceForge API call failed"
+                print("ERROR: {} - check API key".format(err))
+                break
+
+
+def main():
+    # Start upload process
+    print("ADOdb release upload script")
+
+    load_env()
+    process_command_line()
+
+    global skip_upload
+    if skip_upload:
+        print("Skipping upload of release files")
+    else:
+        upload_release_files()
+
+    set_sourceforge_file_info()
+
+# end main()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/adodb/server.php b/adodb/server.php
index 157da62..76e757f 100644
--- a/adodb/server.php
+++ b/adodb/server.php
@@ -1,29 +1,47 @@
 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'];
-	
+
 if (isset($_REQUEST['nrows'])) {
 	$nrows = $_REQUEST['nrows'];
 	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else 
-	$rs = $conn->Execute($sql);
-if ($rs){ 
+	$rs = $conn->selectLimit($sql,$nrows,$offset);
+} else
+	$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());
-
-?>
\ No newline at end of file
+	err($conn->errorNo(). $sep .$conn->errorMsg());
diff --git a/adodb/session/adodb-compress-bzip2.php b/adodb/session/adodb-compress-bzip2.php
index 107fdf8..17ad99f 100644
--- a/adodb/session/adodb-compress-bzip2.php
+++ b/adodb/session/adodb-compress-bzip2.php
@@ -1,22 +1,32 @@
 
+ */
 
 if (!function_exists('bzcompress')) {
 	trigger_error('bzip2 functions are not available', E_USER_ERROR);
 	return 0;
 }
 
-/*
-*/
+/**
+ */
 class ADODB_Compress_Bzip2 {
 	/**
 	 */
@@ -39,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;
 	}
 
@@ -53,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;
 	}
 
@@ -67,13 +77,13 @@ function getMinLength() {
 	/**
 	 */
 	function setMinLength($min_length) {
-		assert('$min_length >= 0');
+		assert($min_length >= 0);
 		$this->_min_length = (int) $min_length;
 	}
 
 	/**
 	 */
-	function ADODB_Compress_Bzip2($block_size = null, $work_level = null, $min_length = null) {
+	function __construct($block_size = null, $work_level = null, $min_length = null) {
 		if (!is_null($block_size)) {
 			$this->setBlockSize($block_size);
 		}
@@ -114,5 +124,3 @@ function read($data, $key) {
 }
 
 return 1;
-
-?>
diff --git a/adodb/session/adodb-compress-gzip.php b/adodb/session/adodb-compress-gzip.php
index 2db7eff..bbaf6c6 100644
--- a/adodb/session/adodb-compress-gzip.php
+++ b/adodb/session/adodb-compress-gzip.php
@@ -1,15 +1,23 @@
 = 0');
-		assert('$level <= 9');
+		assert($level >= 0);
+		assert($level <= 9);
 		$this->_level = (int) $level;
 	}
 
@@ -50,13 +58,13 @@ function getMinLength() {
 	/**
 	 */
 	function setMinLength($min_length) {
-		assert('$min_length >= 0');
+		assert($min_length >= 0);
 		$this->_min_length = (int) $min_length;
 	}
 
 	/**
 	 */
-	function ADODB_Compress_Gzip($level = null, $min_length = null) {
+	function __construct($level = null, $min_length = null) {
 		if (!is_null($level)) {
 			$this->setLevel($level);
 		}
@@ -89,5 +97,3 @@ function read($data, $key) {
 }
 
 return 1;
-
-?>
\ No newline at end of file
diff --git a/adodb/session/adodb-cryptsession.php b/adodb/session/adodb-cryptsession.php
index 5dcfef5..0880532 100644
--- a/adodb/session/adodb-cryptsession.php
+++ b/adodb/session/adodb-cryptsession.php
@@ -1,20 +1,25 @@
 
\ No newline at end of file
diff --git a/adodb/session/adodb-cryptsession2.php b/adodb/session/adodb-cryptsession2.php
index ac2355f..f3e95a1 100644
--- a/adodb/session/adodb-cryptsession2.php
+++ b/adodb/session/adodb-cryptsession2.php
@@ -1,20 +1,25 @@
 
\ No newline at end of file
diff --git a/adodb/session/adodb-encrypt-mcrypt.php b/adodb/session/adodb-encrypt-mcrypt.php
index 8ae9e2c..bec9ff2 100644
--- a/adodb/session/adodb-encrypt-mcrypt.php
+++ b/adodb/session/adodb-encrypt-mcrypt.php
@@ -1,15 +1,23 @@
 
diff --git a/adodb/session/adodb-encrypt-md5.php b/adodb/session/adodb-encrypt-md5.php
index 22c037f..7ae9b56 100644
--- a/adodb/session/adodb-encrypt-md5.php
+++ b/adodb/session/adodb-encrypt-md5.php
@@ -1,14 +1,23 @@
 encrypt($data, $key);
 	}
 
 	/**
 	 */
 	function read($data, $key) {
-		$md5crypt =& new MD5Crypt();
+		$md5crypt = new MD5Crypt();
 		return $md5crypt->decrypt($data, $key);
 	}
 
 }
 
 return 1;
-
-?>
\ No newline at end of file
diff --git a/adodb/session/adodb-encrypt-secret.php b/adodb/session/adodb-encrypt-secret.php
index ac26dbc..2c29f7a 100644
--- a/adodb/session/adodb-encrypt-secret.php
+++ b/adodb/session/adodb-encrypt-secret.php
@@ -1,14 +1,23 @@
 
diff --git a/adodb/session/adodb-encrypt-sha1.php b/adodb/session/adodb-encrypt-sha1.php
index c876002..0aa38c8 100644
--- a/adodb/session/adodb-encrypt-sha1.php
+++ b/adodb/session/adodb-encrypt-sha1.php
@@ -1,26 +1,40 @@
 encrypt($data, $key);
 
 	}
 
 
-	function read($data, $key) 
+	function read($data, $key)
 	{
-		$sha1crypt =& new SHA1Crypt();
+		$sha1crypt = new SHA1Crypt();
 		return $sha1crypt->decrypt($data, $key);
 
 	}
@@ -29,4 +43,3 @@ function read($data, $key)
 
 
 return 1;
-?>
\ No newline at end of file
diff --git a/adodb/session/adodb-sess.txt b/adodb/session/adodb-sess.txt
index c6c7685..1e9a8aa 100644
--- a/adodb/session/adodb-sess.txt
+++ b/adodb/session/adodb-sess.txt
@@ -58,10 +58,10 @@ Originally, the user had to call adodb_sess_open().
 	Postgres
 	SAP
 
-* filter(): Used to support multiple, simulataneous encryption/compression
+* filter(): Used to support multiple, simultaneous encryption/compression
 schemes.
 
-* Debug support is improved thru _rsdump() function, which is called after
+* Debug support is improved through _rsdump() function, which is called after
 every database call.
 
 ------------
@@ -120,7 +120,7 @@ next release of ADODB.
 
 If so, I will modify the current documentation to detail the new
 functionality.  To that end, what file(s) contain the documentation?  Please
-send them to me if they are not publically available.
+send them to me if they are not publicly available.
 
 Also, if there is *anything* in the code that you like to see changed, let
 me know.
diff --git a/adodb/session/adodb-session-clob.php b/adodb/session/adodb-session-clob.php
index 3643a71..8c5e9fb 100644
--- a/adodb/session/adodb-session-clob.php
+++ b/adodb/session/adodb-session-clob.php
@@ -1,24 +1,27 @@
 
\ No newline at end of file
diff --git a/adodb/session/adodb-session-clob2.php b/adodb/session/adodb-session-clob2.php
index 9ba6505..babfa42 100644
--- a/adodb/session/adodb-session-clob2.php
+++ b/adodb/session/adodb-session-clob2.php
@@ -1,24 +1,28 @@
 
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session2.php';
 }
 ADODB_Session::clob('CLOB');
-
-?>
\ No newline at end of file
diff --git a/adodb/session/adodb-session.php b/adodb/session/adodb-session.php
index 964adbb..9e71623 100644
--- a/adodb/session/adodb-session.php
+++ b/adodb/session/adodb-session.php
@@ -1,14 +1,24 @@
 
+ */
 
 /*
 	You may want to rename the 'data' field to 'session_data' as
@@ -34,16 +44,16 @@
 define('ADODB_SESSION', dirname(__FILE__));
 
 
-/* 
-	Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821 
-	
-	From Kerr Schere, to unserialize session data stored via ADOdb. 
-	1. Pull the session data from the db and loop through it. 
-	2. Inside the loop, you will need to urldecode the data column. 
+/*
+	Unserialize session data manually. See 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.
+	2. Inside the loop, you will need to urldecode the data column.
 	3. After urldecode, run the serialized string through this function:
 
 */
-function adodb_unserialize( $serialized_string ) 
+function adodb_unserialize( $serialized_string )
 {
 	$variables = array( );
 	$a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
@@ -54,12 +64,12 @@ 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() 
+function adodb_session_regenerate_id()
 {
-	$conn =& ADODB_Session::_conn();
+	$conn = ADODB_Session::_conn();
 	if (!$conn) return false;
 
 	$old_id = session_id();
@@ -68,26 +78,26 @@ 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();
-	$ok =& $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
-	
+	$ok = $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
+
 	/* it is possible that the update statement fails due to a collision */
 	if (!$ok) {
 		session_id($old_id);
 		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;
 	}
-	
+
 	return true;
 }
 
 /*
     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
 */
@@ -95,7 +105,7 @@ function adodb_session_create_table($schemaFile=null,$conn = null)
 {
     // set default values
     if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema.xml';
-    if ($conn===null) $conn =& ADODB_Session::_conn();
+    if ($conn===null) $conn = ADODB_Session::_conn();
 
 	if (!$conn) return 0;
 
@@ -111,13 +121,13 @@ class ADODB_Session {
 	/////////////////////
 	// getter/setter methods
 	/////////////////////
-	
+
 	/*
-	
+
 	function Lock($lock=null)
 	{
 	static $_lock = false;
-	
+
 		if (!is_null($lock)) $_lock = $lock;
 		return $lock;
 	}
@@ -219,7 +229,7 @@ function database($database = null) {
 
 	/*!
 	*/
-	function persist($persist = null) 
+	function persist($persist = null)
 	{
 		static $_persist = true;
 
@@ -421,7 +431,7 @@ function encryptionKey($encryption_key = null) {
 
 	/*!
 	*/
-	function &_conn($conn=null) {
+	function _conn($conn=null) {
 		return $GLOBALS['ADODB_SESS_CONN'];
 	}
 
@@ -440,7 +450,6 @@ function _crc($crc = null) {
 	/*!
 	*/
 	function _init() {
-		session_module_name('user');
 		session_set_save_handler(
 			array('ADODB_Session', 'open'),
 			array('ADODB_Session', 'close'),
@@ -463,7 +472,7 @@ function _sessionKey() {
 	/*!
 	*/
 	function _dumprs($rs) {
-		$conn	=& ADODB_Session::_conn();
+		$conn	= ADODB_Session::_conn();
 		$debug	= ADODB_Session::debug();
 
 		if (!$conn) {
@@ -492,7 +501,7 @@ function _dumprs($rs) {
 	/////////////////////
 	// public methods
 	/////////////////////
-	
+
 	function config($driver, $host, $user, $password, $database=false,$options=false)
 	{
 		ADODB_Session::driver($driver);
@@ -500,9 +509,9 @@ function config($driver, $host, $user, $password, $database=false,$options=false
 		ADODB_Session::user($user);
 		ADODB_Session::password($password);
 		ADODB_Session::database($database);
-		
+
 		if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
-		
+
 		if (isset($options['table'])) ADODB_Session::table($options['table']);
 		if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
 		if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
@@ -513,9 +522,9 @@ function config($driver, $host, $user, $password, $database=false,$options=false
 
 		If $conn already exists, reuse that connection
 	*/
-	function open($save_path, $session_name, $persist = null) 
+	function open($save_path, $session_name, $persist = null)
 	{
-		$conn =& ADODB_Session::_conn();
+		$conn = ADODB_Session::_conn();
 
 		if ($conn) {
 			return true;
@@ -539,7 +548,7 @@ function open($save_path, $session_name, $persist = null)
 #		assert('$driver');
 #		assert('$host');
 
-		$conn =& ADONewConnection($driver);
+		$conn = ADONewConnection($driver);
 
 		if ($debug) {
 			$conn->debug = true;
@@ -557,10 +566,10 @@ function open($save_path, $session_name, $persist = null)
 			$ok = $conn->Connect($host, $user, $password, $database);
 		}
 
-		if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
+		if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
 		else
 			ADOConnection::outp('
Session: connection failed
', false);
-		
+
 
 		return $ok;
 	}
@@ -568,10 +577,10 @@ function open($save_path, $session_name, $persist = null)
 	/*!
 		Close the connection
 	*/
-	function close() 
+	function close()
 	{
 /*
-		$conn =& ADODB_Session::_conn();
+		$conn = ADODB_Session::_conn();
 		if ($conn) $conn->Close();
 */
 		return true;
@@ -580,9 +589,9 @@ function close()
 	/*
 		Slurp in the session variables and return the serialized string
 	*/
-	function read($key) 
+	function read($key)
 	{
-		$conn	=& ADODB_Session::_conn();
+		$conn	= ADODB_Session::_conn();
 		$data	= ADODB_Session::dataFieldName();
 		$filter	= ADODB_Session::filter();
 		$table	= ADODB_Session::table();
@@ -595,16 +604,16 @@ function read($key)
 
 		$qkey = $conn->quote($key);
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-	
+
 		$sql = "SELECT $data FROM $table WHERE sesskey = $binary $qkey AND expiry >= " . time();
-		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
-		  developer has commited elsewhere... :(
+		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if
+		  developer has committed elsewhere... :(
 		 */
 		#if (ADODB_Session::Lock())
-		#	$rs =& $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
+		#	$rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
 		#else
-		
-			$rs =& $conn->Execute($sql);
+
+			$rs = $conn->Execute($sql);
 		//ADODB_Session::_dumprs($rs);
 		if ($rs) {
 			if ($rs->EOF) {
@@ -634,14 +643,14 @@ function read($key)
 
 		If the data has not been modified since the last read(), we do not write.
 	*/
-	function write($key, $val) 
+	function write($key, $val)
 	{
 	global $ADODB_SESSION_READONLY;
-	
+
 		if (!empty($ADODB_SESSION_READONLY)) return;
-		
+
 		$clob			= ADODB_Session::clob();
-		$conn			=& ADODB_Session::_conn();
+		$conn			= ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
 		$data			= ADODB_Session::dataFieldName();
 		$debug			= ADODB_Session::debug();
@@ -650,12 +659,12 @@ function write($key, $val)
 		$filter			= ADODB_Session::filter();
 		$lifetime		= ADODB_Session::lifetime();
 		$table			= ADODB_Session::table();
-	
+
 		if (!$conn) {
 			return false;
 		}
 		$qkey = $conn->qstr($key);
-	
+
 		//assert('$table');
 
 		$expiry = time() + $lifetime;
@@ -666,9 +675,9 @@ function write($key, $val)
 		// now we only update expiry date, thx to sebastian thom in adodb 2.32
 		if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
 			if ($debug) {
-				echo '
Session: Only updating date - crc32 not changed
';
+				ADOConnection::outp( '
Session: Only updating date - crc32 not changed
');
 			}
-			
+
 			$expirevar = '';
 			if ($expire_notify) {
 				$var = reset($expire_notify);
@@ -677,10 +686,10 @@ function write($key, $val)
 					$expirevar = $$var;
 				}
 			}
-			
-			
+
+
 			$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
-			$rs =& $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
+			$rs = $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
 			return true;
 		}
 		$val = rawurlencode($val);
@@ -700,9 +709,9 @@ function write($key, $val)
 		}
 
 		if (!$clob) {	// no lobs, simply use replace()
-			$arr[$data] = $conn->qstr($val);
+			$arr[$data] = $val;
 			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
-			
+
 		} else {
 			// what value shall we insert/update for lob row?
 			switch ($driver) {
@@ -719,26 +728,26 @@ function write($key, $val)
 					$lob_value = 'null';
 					break;
 			}
-			
+
 			$conn->StartTrans();
 			$expiryref = $conn->qstr($arr['expireref']);
 			// do we insert or update? => as for sesskey
-			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
+			$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
 			if ($rs && reset($rs->fields) > 0) {
 				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value, expireref=$expiryref WHERE  sesskey = $qkey";
 			} else {
 				$sql = "INSERT INTO $table (expiry, $data, sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
 			}
 			if ($rs)$rs->Close();
-			
+
 
 			$err = '';
-			$rs1 =& $conn->Execute($sql);
+			$rs1 = $conn->Execute($sql);
 			if (!$rs1) $err = $conn->ErrorMsg()."\n";
-			
-			$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
+
+			$rs2 = $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
 			if (!$rs2) $err .= $conn->ErrorMsg()."\n";
-			
+
 			$rs = ($rs && $rs2) ? true : false;
 			$conn->CompleteTrans();
 		}
@@ -751,7 +760,7 @@ function write($key, $val)
 			// properly unless select statement executed in Win2000
 			if ($conn->databaseType == 'access') {
 				$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
-				$rs =& $conn->Execute($sql);
+				$rs = $conn->Execute($sql);
 				ADODB_Session::_dumprs($rs);
 				if ($rs) {
 					$rs->Close();
@@ -767,7 +776,7 @@ function write($key, $val)
 	/*!
 	*/
 	function destroy($key) {
-		$conn			=& ADODB_Session::_conn();
+		$conn			= ADODB_Session::_conn();
 		$table			= ADODB_Session::table();
 		$expire_notify	= ADODB_Session::expireNotify();
 
@@ -785,7 +794,7 @@ function destroy($key) {
 			$fn = next($expire_notify);
 			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
 			$sql = "SELECT expireref, sesskey FROM $table WHERE $binary sesskey = $qkey";
-			$rs =& $conn->Execute($sql);
+			$rs = $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
 			$conn->SetFetchMode($savem);
 			if (!$rs) {
@@ -802,7 +811,7 @@ function destroy($key) {
 		}
 
 		$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
-		$rs =& $conn->Execute($sql);
+		$rs = $conn->Execute($sql);
 		ADODB_Session::_dumprs($rs);
 
 		return $rs ? true : false;
@@ -810,9 +819,9 @@ function destroy($key) {
 
 	/*!
 	*/
-	function gc($maxlifetime) 
+	function gc($maxlifetime)
 	{
-		$conn			=& ADODB_Session::_conn();
+		$conn			= ADODB_Session::_conn();
 		$debug			= ADODB_Session::debug();
 		$expire_notify	= ADODB_Session::expireNotify();
 		$optimize		= ADODB_Session::optimize();
@@ -832,7 +841,7 @@ function gc($maxlifetime)
 			$fn = next($expire_notify);
 			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
 			$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time";
-			$rs =& $conn->Execute($sql);
+			$rs = $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
 			$conn->SetFetchMode($savem);
 			if ($rs) {
@@ -846,21 +855,21 @@ function gc($maxlifetime)
 					$rs->MoveNext();
 				}
 				$rs->Close();
-				
+
 				$conn->CompleteTrans();
 			}
 		} else {
-		
+
 			if (1) {
 				$sql = "SELECT sesskey FROM $table WHERE expiry < $time";
-				$arr =& $conn->GetAll($sql);
+				$arr = $conn->GetAll($sql);
 				foreach ($arr as $row) {
 					$sql2 = "DELETE FROM $table WHERE sesskey=".$conn->Param('0');
-					$conn->Execute($sql2,array($row[0]));
+					$conn->Execute($sql2,array(reset($row)));
 				}
 			} else {
 				$sql = "DELETE FROM $table WHERE expiry < $time";
-				$rs =& $conn->Execute($sql);
+				$rs = $conn->Execute($sql);
 				ADODB_Session::_dumprs($rs);
 				if ($rs) $rs->Close();
 			}
@@ -893,7 +902,7 @@ function gc($maxlifetime)
 			}
 			$sql .= " FROM $table";
 
-			$rs =& $conn->SelectLimit($sql, 1);
+			$rs = $conn->SelectLimit($sql, 1);
 			if ($rs && !$rs->EOF) {
 				$dbts = reset($rs->fields);
 				$rs->Close();
@@ -920,15 +929,13 @@ 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);
 }
-
-?>
\ No newline at end of file
diff --git a/adodb/session/adodb-session2.php b/adodb/session/adodb-session2.php
index 43396d5..bf64b41 100644
--- a/adodb/session/adodb-session2.php
+++ b/adodb/session/adodb-session2.php
@@ -1,59 +1,23 @@
 Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
-	
+	$ok = $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
+
 	/* it is possible that the update statement fails due to a collision */
 	if (!$ok) {
 		session_id($old_id);
 		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;
 	}
-	
+
 	return true;
 }
 
 /*
     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
 */
@@ -125,7 +89,7 @@ function adodb_session_create_table($schemaFile=null,$conn = null)
 {
     // set default values
     if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema2.xml';
-    if ($conn===null) $conn =& ADODB_Session::_conn();
+    if ($conn===null) $conn = ADODB_Session::_conn();
 
 	if (!$conn) return 0;
 
@@ -141,22 +105,22 @@ class ADODB_Session {
 	/////////////////////
 	// getter/setter methods
 	/////////////////////
-	
+
 	/*
-	
+
 	function Lock($lock=null)
 	{
 	static $_lock = false;
-	
+
 		if (!is_null($lock)) $_lock = $lock;
 		return $lock;
 	}
 	*/
 	/*!
 	*/
-	function driver($driver = null) 
+	static function driver($driver = null)
 	{
-		static $_driver = 'mysql';
+		static $_driver = 'mysqli';
 		static $set = false;
 
 		if (!is_null($driver)) {
@@ -174,7 +138,7 @@ function driver($driver = null)
 
 	/*!
 	*/
-	function host($host = null) {
+	static function host($host = null) {
 		static $_host = 'localhost';
 		static $set = false;
 
@@ -193,7 +157,7 @@ function host($host = null) {
 
 	/*!
 	*/
-	function user($user = null) 
+	static function user($user = null)
 	{
 		static $_user = 'root';
 		static $set = false;
@@ -213,7 +177,7 @@ function user($user = null)
 
 	/*!
 	*/
-	function password($password = null) 
+	static function password($password = null)
 	{
 		static $_password = '';
 		static $set = false;
@@ -233,11 +197,11 @@ function password($password = null)
 
 	/*!
 	*/
-	function database($database = null) 
+	static function database($database = null)
 	{
 		static $_database = '';
 		static $set = false;
-		
+
 		if (!is_null($database)) {
 			$_database = trim($database);
 			$set = true;
@@ -252,7 +216,7 @@ function database($database = null)
 
 	/*!
 	*/
-	function persist($persist = null) 
+	static function persist($persist = null)
 	{
 		static $_persist = true;
 
@@ -265,7 +229,7 @@ function persist($persist = null)
 
 	/*!
 	*/
-	function lifetime($lifetime = null) 
+	static function lifetime($lifetime = null)
 	{
 		static $_lifetime;
 		static $set = false;
@@ -293,7 +257,7 @@ function lifetime($lifetime = null)
 
 	/*!
 	*/
-	function debug($debug = null) 
+	static function debug($debug = null)
 	{
 		static $_debug = false;
 		static $set = false;
@@ -303,7 +267,7 @@ function debug($debug = null)
 
 			$conn = ADODB_Session::_conn();
 			if ($conn) {
-				$conn->debug = $_debug;
+				#$conn->debug = $_debug;
 			}
 			$set = true;
 		} elseif (!$set) {
@@ -318,7 +282,7 @@ function debug($debug = null)
 
 	/*!
 	*/
-	function expireNotify($expire_notify = null) 
+	static function expireNotify($expire_notify = null)
 	{
 		static $_expire_notify;
 		static $set = false;
@@ -338,7 +302,7 @@ function expireNotify($expire_notify = null)
 
 	/*!
 	*/
-	function table($table = null) 
+	static function table($table = null)
 	{
 		static $_table = 'sessions2';
 		static $set = false;
@@ -358,7 +322,7 @@ function table($table = null)
 
 	/*!
 	*/
-	function optimize($optimize = null) 
+	static function optimize($optimize = null)
 	{
 		static $_optimize = false;
 		static $set = false;
@@ -378,15 +342,15 @@ function optimize($optimize = null)
 
 	/*!
 	*/
-	function syncSeconds($sync_seconds = null) {
+	static function syncSeconds($sync_seconds = null) {
 		//echo ("
WARNING: ADODB_SESSION::syncSeconds is longer used, please remove this function for your code
");
-		
+
 		return 0;
 	}
 
 	/*!
 	*/
-	function clob($clob = null) {
+	static function clob($clob = null) {
 		static $_clob = false;
 		static $set = false;
 
@@ -405,14 +369,14 @@ function clob($clob = null) {
 
 	/*!
 	*/
-	function dataFieldName($data_field_name = null) {
+	static function dataFieldName($data_field_name = null) {
 		//echo ("
WARNING: ADODB_SESSION::dataFieldName() is longer used, please remove this function for your code
");
 		return '';
 	}
 
 	/*!
 	*/
-	function filter($filter = null) {
+	static function filter($filter = null) {
 		static $_filter = array();
 
 		if (!is_null($filter)) {
@@ -427,7 +391,7 @@ function filter($filter = null) {
 
 	/*!
 	*/
-	function encryptionKey($encryption_key = null) {
+	static function encryptionKey($encryption_key = null) {
 		static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
 
 		if (!is_null($encryption_key)) {
@@ -443,13 +407,13 @@ function encryptionKey($encryption_key = null) {
 
 	/*!
 	*/
-	function &_conn($conn=null) {
-		return $GLOBALS['ADODB_SESS_CONN'];
+	static function _conn($conn=null) {
+		return isset($GLOBALS['ADODB_SESS_CONN']) ? $GLOBALS['ADODB_SESS_CONN'] : false;
 	}
 
 	/*!
 	*/
-	function _crc($crc = null) {
+	static function _crc($crc = null) {
 		static $_crc = false;
 
 		if (!is_null($crc)) {
@@ -461,8 +425,7 @@ function _crc($crc = null) {
 
 	/*!
 	*/
-	function _init() {
-		session_module_name('user');
+	static function _init() {
 		session_set_save_handler(
 			array('ADODB_Session', 'open'),
 			array('ADODB_Session', 'close'),
@@ -476,7 +439,7 @@ function _init() {
 
 	/*!
 	*/
-	function _sessionKey() {
+	static function _sessionKey() {
 		// use this function to create the encryption key for crypted sessions
 		// crypt the used key, ADODB_Session::encryptionKey() as key and session_id() as salt
 		return crypt(ADODB_Session::encryptionKey(), session_id());
@@ -484,8 +447,8 @@ function _sessionKey() {
 
 	/*!
 	*/
-	function _dumprs($rs) {
-		$conn	=& ADODB_Session::_conn();
+	static function _dumprs(&$rs) {
+		$conn	= ADODB_Session::_conn();
 		$debug	= ADODB_Session::debug();
 
 		if (!$conn) {
@@ -506,25 +469,27 @@ function _dumprs($rs) {
 		if (!is_object($rs)) {
 			return;
 		}
+		$rs = $conn->_rs2rs($rs);
 
 		require_once ADODB_SESSION.'/../tohtml.inc.php';
 		rs2html($rs);
+		$rs->MoveFirst();
 	}
 
 	/////////////////////
 	// public methods
 	/////////////////////
-	
-	function config($driver, $host, $user, $password, $database=false,$options=false)
+
+	static function config($driver, $host, $user, $password, $database=false,$options=false)
 	{
 		ADODB_Session::driver($driver);
 		ADODB_Session::host($host);
 		ADODB_Session::user($user);
 		ADODB_Session::password($password);
 		ADODB_Session::database($database);
-		
-		if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
-		
+
+		if (strncmp($driver, 'oci8', 4) == 0) $options['lob'] = 'CLOB';
+
 		if (isset($options['table'])) ADODB_Session::table($options['table']);
 		if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
 		if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
@@ -535,9 +500,9 @@ function config($driver, $host, $user, $password, $database=false,$options=false
 
 		If $conn already exists, reuse that connection
 	*/
-	function open($save_path, $session_name, $persist = null) 
+	static function open($save_path, $session_name, $persist = null)
 	{
-		$conn =& ADODB_Session::_conn();
+		$conn = ADODB_Session::_conn();
 
 		if ($conn) {
 			return true;
@@ -560,29 +525,48 @@ function open($save_path, $session_name, $persist = null)
 #		assert('$database');
 #		assert('$driver');
 #		assert('$host');
+		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($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($dsn,$user,$password);
+			}
+		}else{
+			$conn = ADONewConnection($driver);
+			if ($debug) {
+				$conn->debug = true;
+				ADOConnection::outp( " driver=$driver user=$user db=$database ");
+			}
 
-		$conn =& ADONewConnection($driver);
-
-		if ($debug) {
-			$conn->debug = true;		
-			ADOConnection::outp( " driver=$driver user=$user db=$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;
+			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 = $conn->Connect($host, $user, $password, $database);
 		}
 
-		if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
+
+		if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
 		else
 			ADOConnection::outp('
Session: connection failed
', false);
-		
+
 
 		return $ok;
 	}
@@ -590,10 +574,10 @@ function open($save_path, $session_name, $persist = null)
 	/*!
 		Close the connection
 	*/
-	function close() 
+	static function close()
 	{
 /*
-		$conn =& ADODB_Session::_conn();
+		$conn = ADODB_Session::_conn();
 		if ($conn) $conn->Close();
 */
 		return true;
@@ -602,9 +586,9 @@ function close()
 	/*
 		Slurp in the session variables and return the serialized string
 	*/
-	function read($key) 
+	static function read($key)
 	{
-		$conn	=& ADODB_Session::_conn();
+		$conn	= ADODB_Session::_conn();
 		$filter	= ADODB_Session::filter();
 		$table	= ADODB_Session::table();
 
@@ -614,18 +598,19 @@ function read($key)
 
 		//assert('$table');
 
-		$qkey = $conn->quote($key);
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-	
-		$sql = "SELECT sessdata FROM $table WHERE sesskey = $binary $qkey 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... :(
+
+		global $ADODB_SESSION_SELECT_FIELDS;
+		if (!isset($ADODB_SESSION_SELECT_FIELDS)) $ADODB_SESSION_SELECT_FIELDS = 'sessdata';
+		$sql = "SELECT $ADODB_SESSION_SELECT_FIELDS FROM $table WHERE sesskey = $binary ".$conn->Param(0)." AND expiry >= " . $conn->sysTimeStamp;
+
+		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if
+		  developer has committed elsewhere... :(
 		 */
 		#if (ADODB_Session::Lock())
-		#	$rs =& $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), sessdata);
+		#	$rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), sessdata);
 		#else
-		
-			$rs =& $conn->Execute($sql);
+			$rs = $conn->Execute($sql, array($key));
 		//ADODB_Session::_dumprs($rs);
 		if ($rs) {
 			if ($rs->EOF) {
@@ -655,14 +640,14 @@ function read($key)
 
 		If the data has not been modified since the last read(), we do not write.
 	*/
-	function write($key, $val) 
+	static function write($key, $oval)
 	{
 	global $ADODB_SESSION_READONLY;
-	
+
 		if (!empty($ADODB_SESSION_READONLY)) return;
-		
+
 		$clob			= ADODB_Session::clob();
-		$conn			=& ADODB_Session::_conn();
+		$conn			= ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
 		$debug			= ADODB_Session::debug();
 		$driver			= ADODB_Session::driver();
@@ -670,13 +655,13 @@ function write($key, $val)
 		$filter			= ADODB_Session::filter();
 		$lifetime		= ADODB_Session::lifetime();
 		$table			= ADODB_Session::table();
-	
+
 		if (!$conn) {
 			return false;
 		}
-	
+		if ($debug) $conn->debug = 1;
 		$sysTimeStamp = $conn->sysTimeStamp;
-		
+
 		//assert('$table');
 
 		$expiry = $conn->OffsetDate($lifetime/(24*3600),$sysTimeStamp);
@@ -685,11 +670,11 @@ function write($key, $val)
 
 		// crc32 optimization since adodb 2.1
 		// now we only update expiry date, thx to sebastian thom in adodb 2.32
-		if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
+		if ($crc !== '00' && $crc !== false && $crc == (strlen($oval) . crc32($oval))) {
 			if ($debug) {
 				echo '
Session: Only updating date - crc32 not changed
';
 			}
-			
+
 			$expirevar = '';
 			if ($expire_notify) {
 				$var = reset($expire_notify);
@@ -698,13 +683,13 @@ function write($key, $val)
 					$expirevar = $$var;
 				}
 			}
-			
-			
+
+
 			$sql = "UPDATE $table SET expiry = $expiry ,expireref=".$conn->Param('0').", modified = $sysTimeStamp WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= $sysTimeStamp";
-			$rs =& $conn->Execute($sql,array($expirevar,$key));
+			$rs = $conn->Execute($sql,array($expirevar,$key));
 			return true;
 		}
-		$val = rawurlencode($val);
+		$val = rawurlencode($oval);
 		foreach ($filter as $f) {
 			if (is_object($f)) {
 				$val = $f->write($val, ADODB_Session::_sessionKey());
@@ -718,60 +703,48 @@ function write($key, $val)
 			if (isset($$var)) {
 				$expireref = $$var;
 			}
-		} 
+		}
 
 		if (!$clob) {	// no lobs, simply use replace()
-			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
+			$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
 			if ($rs) $rs->Close();
-					
+
 			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry=$expiry, sessdata=".$conn->Param(0).", expireref= ".$conn->Param(1).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('2');
-				
+				$sql = "UPDATE $table SET expiry=$expiry, sessdata=".$conn->Param(0).", expireref= ".$conn->Param(1).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param(2);
+
 			} else {
-				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified) 
+				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified)
 					VALUES ($expiry,".$conn->Param('0').", ". $conn->Param('1').", ".$conn->Param('2').", $sysTimeStamp, $sysTimeStamp)";
 			}
-			
-	
-			$rs =& $conn->Execute($sql,array($val,$expireref,$key));
-			
+
+
+			$rs = $conn->Execute($sql,array($val,$expireref,$key));
+
 		} else {
 			// what value shall we insert/update for lob row?
-			switch ($driver) {
-				// empty_clob or empty_lob for oracle dbs
-				case 'oracle':
-				case 'oci8':
-				case 'oci8po':
-				case 'oci805':
-					$lob_value = sprintf('empty_%s()', strtolower($clob));
-					break;
-
-				// null for all other
-				default:
-					$lob_value = 'null';
-					break;
-			}
-			
+			if (strncmp($driver, 'oci8', 4) == 0) $lob_value = sprintf('empty_%s()', strtolower($clob));
+			else $lob_value = 'null';
+
 			$conn->StartTrans();
-			
-			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
-			if ($rs) $rs->Close();
-					
+
+			$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
+
 			if ($rs && reset($rs->fields) > 0) {
 				$sql = "UPDATE $table SET expiry=$expiry, sessdata=$lob_value, expireref= ".$conn->Param(0).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('1');
-				
+
 			} else {
-				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified) 
+				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified)
 					VALUES ($expiry,$lob_value, ". $conn->Param('0').", ".$conn->Param('1').", $sysTimeStamp, $sysTimeStamp)";
 			}
-			
-			$rs =& $conn->Execute($sql,array($expireref,$key));
-			
+
+			$rs = $conn->Execute($sql,array($expireref,$key));
+
 			$qkey = $conn->qstr($key);
-			$rs2 =& $conn->UpdateBlob($table, 'sessdata', $val, " sesskey=$qkey", strtoupper($clob));
-			$rs = $conn->CompleteTrans();
-			
-			
+			$rs2 = $conn->UpdateBlob($table, 'sessdata', $val, " sesskey=$qkey", strtoupper($clob));
+			if ($debug) echo "
",htmlspecialchars($oval), "
";
+			$rs = @$conn->CompleteTrans();
+
+
 		}
 
 		if (!$rs) {
@@ -782,7 +755,7 @@ function write($key, $val)
 			// properly unless select statement executed in Win2000
 			if ($conn->databaseType == 'access') {
 				$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
-				$rs =& $conn->Execute($sql);
+				$rs = $conn->Execute($sql);
 				ADODB_Session::_dumprs($rs);
 				if ($rs) {
 					$rs->Close();
@@ -797,26 +770,27 @@ function write($key, $val)
 
 	/*!
 	*/
-	function destroy($key) {
-		$conn			=& ADODB_Session::_conn();
+	static function destroy($key) {
+		$conn			= ADODB_Session::_conn();
 		$table			= ADODB_Session::table();
 		$expire_notify	= ADODB_Session::expireNotify();
 
 		if (!$conn) {
 			return false;
 		}
-
+		$debug			= ADODB_Session::debug();
+		if ($debug) $conn->debug = 1;
 		//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);
 			$fn = next($expire_notify);
 			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
 			$sql = "SELECT expireref, sesskey FROM $table WHERE $binary sesskey = $qkey";
-			$rs =& $conn->Execute($sql);
+			$rs = $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
 			$conn->SetFetchMode($savem);
 			if (!$rs) {
@@ -833,8 +807,7 @@ function destroy($key) {
 		}
 
 		$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
-		$rs =& $conn->Execute($sql);
-		ADODB_Session::_dumprs($rs);
+		$rs = $conn->Execute($sql);
 		if ($rs) {
 			$rs->Close();
 		}
@@ -844,9 +817,9 @@ function destroy($key) {
 
 	/*!
 	*/
-	function gc($maxlifetime) 
+	static function gc($maxlifetime)
 	{
-		$conn			=& ADODB_Session::_conn();
+		$conn			= ADODB_Session::_conn();
 		$debug			= ADODB_Session::debug();
 		$expire_notify	= ADODB_Session::expireNotify();
 		$optimize		= ADODB_Session::optimize();
@@ -856,53 +829,56 @@ function gc($maxlifetime)
 			return false;
 		}
 
+
+		$debug			= ADODB_Session::debug();
+		if ($debug) {
+			$conn->debug = 1;
+			$COMMITNUM = 2;
+		} else {
+			$COMMITNUM = 20;
+		}
+
 		//assert('$table');
 
-		$time = $conn->sysTimeStamp;
+		$time = $conn->OffsetDate(-$maxlifetime/24/3600,$conn->sysTimeStamp);
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
 
 		if ($expire_notify) {
 			reset($expire_notify);
 			$fn = next($expire_notify);
-			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
-			$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time";
-			$rs =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs);
-			$conn->SetFetchMode($savem);
-			if ($rs) {
-				$conn->StartTrans();
-				$keys = array();
-				while (!$rs->EOF) {
-					$ref = $rs->fields[0];
-					$key = $rs->fields[1];
-					$fn($ref, $key);
-					$del = $conn->Execute("DELETE FROM $table WHERE sesskey=".$conn->Param('0'),array($key));
-					$rs->MoveNext();
-				}
-				$rs->Close();
-				
-				$conn->CompleteTrans();
-			}
 		} else {
-		
-			if (0) {
-				$sql = "SELECT sesskey FROM $table WHERE expiry < $time";
-				$arr =& $conn->GetAll($sql);
-				foreach ($arr as $row) {
-					$sql2 = "DELETE FROM $table WHERE sesskey=".$conn->Param('0');
-					$conn->Execute($sql2,array($row[0]));
+			$fn = false;
+		}
+
+		$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
+		$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time ORDER BY 2"; # add order by to prevent deadlock
+		$rs = $conn->SelectLimit($sql,1000);
+		if ($debug) ADODB_Session::_dumprs($rs);
+		$conn->SetFetchMode($savem);
+		if ($rs) {
+			$tr = $conn->hasTransactions;
+			if ($tr) $conn->BeginTrans();
+			$keys = array();
+			$ccnt = 0;
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				if ($fn) $fn($ref, $key);
+				$del = $conn->Execute("DELETE FROM $table WHERE sesskey=".$conn->Param('0'),array($key));
+				$rs->MoveNext();
+				$ccnt += 1;
+				if ($tr && $ccnt % $COMMITNUM == 0) {
+					if ($debug) echo "Commit
\n";
+					$conn->CommitTrans();
+					$conn->BeginTrans();
 				}
-			} else {
-				$sql = "DELETE FROM $table WHERE expiry < $time";
-				$rs =& $conn->Execute($sql);
-				ADODB_Session::_dumprs($rs);
-				if ($rs) $rs->Close();
-			}
-			if ($debug) {
-				ADOConnection::outp("
Garbage Collection: $sql
");
 			}
+			$rs->Close();
+
+			if ($tr) $conn->CommitTrans();
 		}
 
+
 		// suggested by Cameron, "GaM3R" 
 		if ($optimize) {
 			$driver = ADODB_Session::driver();
@@ -918,7 +894,7 @@ function gc($maxlifetime)
 			}
 		}
 
-		
+
 		return true;
 	}
 }
@@ -927,15 +903,13 @@ 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);
 }
-
-?>
\ No newline at end of file
diff --git a/adodb/session/crypt.inc.php b/adodb/session/crypt.inc.php
index 41cb06a..82121e3 100644
--- a/adodb/session/crypt.inc.php
+++ b/adodb/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)
 		{
@@ -16,7 +36,6 @@ function keyED($txt,$encrypt_key)
 
 		function Encrypt($txt,$key)
 		{
-				srand((double)microtime()*1000000);
 				$encrypt_key = md5(rand(0,32000));
 				$ctr=0;
 				$tmp = "";
@@ -45,7 +64,6 @@ function Decrypt($txt,$key)
 		function RandPass()
 		{
 				$randomPassword = "";
-				srand((double)microtime()*1000000);
 				for($i=0;$i<8;$i++)
 				{
 						$randnumber = rand(48,120);
@@ -64,7 +82,6 @@ function RandPass()
 
 
 class SHA1Crypt{
-
 		function keyED($txt,$encrypt_key)
 		{
 
@@ -81,12 +98,9 @@ function keyED($txt,$encrypt_key)
 
 		}
 
-
-
 		function Encrypt($txt,$key)
 		{
 
-				srand((double)microtime()*1000000);
 				$encrypt_key = sha1(rand(0,32000));
 				$ctr=0;
 				$tmp = "";
@@ -136,8 +150,6 @@ function Decrypt($txt,$key)
 		function RandPass()
 		{
 				$randomPassword = "";
-				srand((double)microtime()*1000000);
-
 				for($i=0;$i<8;$i++)
 				{
 
@@ -158,4 +170,3 @@ function RandPass()
 
 
 }
-?>
\ No newline at end of file
diff --git a/adodb/session/old/adodb-cryptsession.php b/adodb/session/old/adodb-cryptsession.php
new file mode 100644
index 0000000..6616de3
--- /dev/null
+++ b/adodb/session/old/adodb-cryptsession.php
@@ -0,0 +1,331 @@
+";
+
+
+ Installation
+ ============
+ 1. Create a new database in MySQL or Access "sessions" like
+so:
+
+  create table sessions (
+	   SESSKEY char(32) not null,
+	   EXPIRY int(11) unsigned not null,
+	   EXPIREREF varchar(64),
+	   DATA CLOB,
+	  primary key (sesskey)
+  );
+
+  2. Then define the following parameters. You can either modify
+     this file, or define them before this file is included:
+
+  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+	$ADODB_SESSION_CONNECT='server to connect to';
+	$ADODB_SESSION_USER ='user';
+	$ADODB_SESSION_PWD ='password';
+	$ADODB_SESSION_DB ='database';
+	$ADODB_SESSION_TBL = 'sessions'
+
+  3. Recommended is PHP 4.0.2 or later. There are documented
+session bugs in earlier versions of PHP.
+
+*/
+
+
+include_once('crypt.inc.php');
+
+if (!defined('_ADODB_LAYER')) {
+	include (dirname(__FILE__).'/adodb.inc.php');
+}
+
+ /* if database time and system time is difference is greater than this, then give warning */
+ define('ADODB_SESSION_SYNCH_SECS',60);
+
+if (!defined('ADODB_SESSION')) {
+
+ define('ADODB_SESSION',1);
+
+GLOBAL 	$ADODB_SESSION_CONNECT,
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_LIFE,
+	$ADODB_SESS_DEBUG,
+	$ADODB_SESS_INSERT,
+	$ADODB_SESSION_EXPIRE_NOTIFY,
+	$ADODB_SESSION_TBL;
+
+	//$ADODB_SESS_DEBUG = true;
+
+	/* SET THE FOLLOWING PARAMETERS */
+if (empty($ADODB_SESSION_DRIVER)) {
+	$ADODB_SESSION_DRIVER='mysql';
+	$ADODB_SESSION_CONNECT='localhost';
+	$ADODB_SESSION_USER ='root';
+	$ADODB_SESSION_PWD ='';
+	$ADODB_SESSION_DB ='xphplens_2';
+}
+
+if (empty($ADODB_SESSION_TBL)){
+	$ADODB_SESSION_TBL = 'sessions';
+}
+
+if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
+	$ADODB_SESSION_EXPIRE_NOTIFY = false;
+}
+
+function ADODB_Session_Key()
+{
+$ADODB_CRYPT_KEY = 'CRYPTED ADODB SESSIONS ROCK!';
+
+	/* USE THIS FUNCTION TO CREATE THE ENCRYPTION KEY FOR CRYPTED SESSIONS	*/
+	/* Crypt the used key, $ADODB_CRYPT_KEY as key and session_ID as SALT	*/
+	return crypt($ADODB_CRYPT_KEY, session_ID());
+}
+
+$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
+if ($ADODB_SESS_LIFE <= 1) {
+	// bug in PHP 4.0.3 pl 1  -- how about other versions?
+	//print "
Session Error: PHP.INI setting session.gc_maxlifetimenot set: $ADODB_SESS_LIFE
";
+	$ADODB_SESS_LIFE=1440;
+}
+
+function adodb_sess_open($save_path, $session_name)
+{
+GLOBAL 	$ADODB_SESSION_CONNECT,
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_DEBUG;
+
+	$ADODB_SESS_INSERT = false;
+
+	if (isset($ADODB_SESS_CONN)) return true;
+
+	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
+	if (!empty($ADODB_SESS_DEBUG)) {
+		$ADODB_SESS_CONN->debug = true;
+		print" conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ";
+	}
+	return $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+
+}
+
+function adodb_sess_close()
+{
+global $ADODB_SESS_CONN;
+
+	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
+	return true;
+}
+
+function adodb_sess_read($key)
+{
+$Crypt = new MD5Crypt;
+global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
+	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
+	if ($rs) {
+		if ($rs->EOF) {
+			$ADODB_SESS_INSERT = true;
+			$v = '';
+		} else {
+			// Decrypt session data
+			$v = rawurldecode($Crypt->Decrypt(reset($rs->fields), ADODB_Session_Key()));
+		}
+		$rs->Close();
+		return $v;
+	}
+	else $ADODB_SESS_INSERT = true;
+
+	return '';
+}
+
+function adodb_sess_write($key, $val)
+{
+$Crypt = new MD5Crypt;
+	global $ADODB_SESS_INSERT,$ADODB_SESS_CONN, $ADODB_SESS_LIFE, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	$expiry = time() + $ADODB_SESS_LIFE;
+
+	// encrypt session data..
+	$val = $Crypt->Encrypt(rawurlencode($val), ADODB_Session_Key());
+
+	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		global $$var;
+		$arr['expireref'] = $$var;
+	}
+	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,
+	    $arr,
+    	'sesskey',$autoQuote = true);
+
+	if (!$rs) {
+		ADOConnection::outp( '
+-- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'
',false);
+	} else {
+		// bug in access driver (could be odbc?) means that info is not 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'");
+	}
+	return isset($rs);
+}
+
+function adodb_sess_destroy($key)
+{
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$ADODB_SESS_CONN->CommitTrans();
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+	}
+	return $rs ? true : false;
+}
+
+
+function adodb_sess_gc($maxlifetime) {
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY,$ADODB_SESS_DEBUG;
+
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$t = time();
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				//$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$rs->Close();
+
+			$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+			$ADODB_SESS_CONN->CommitTrans();
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
+		$ADODB_SESS_CONN->Execute($qry);
+	}
+
+	// suggested by Cameron, "GaM3R" 
+	if (defined('ADODB_SESSION_OPTIMIZE'))
+	{
+	global $ADODB_SESSION_DRIVER;
+
+		switch( $ADODB_SESSION_DRIVER ) {
+			case 'mysql':
+			case 'mysqlt':
+				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
+				break;
+			case 'postgresql':
+			case 'postgresql7':
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
+				break;
+		}
+	}
+
+	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
+	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
+
+	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
+	if ($rs && !$rs->EOF) {
+
+		$dbts = reset($rs->fields);
+		$rs->Close();
+		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
+		$t = time();
+		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
+			$msg =
+			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
+			error_log($msg);
+			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- $msg
");
+		}
+	}
+
+	return true;
+}
+
+session_set_save_handler(
+	"adodb_sess_open",
+	"adodb_sess_close",
+	"adodb_sess_read",
+	"adodb_sess_write",
+	"adodb_sess_destroy",
+	"adodb_sess_gc");
+}
+
+/*  TEST SCRIPT -- UNCOMMENT */
+/*
+if (0) {
+
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	print "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
";
+}
+*/
diff --git a/adodb/session/old/adodb-session-clob.php b/adodb/session/old/adodb-session-clob.php
new file mode 100644
index 0000000..864fdfd
--- /dev/null
+++ b/adodb/session/old/adodb-session-clob.php
@@ -0,0 +1,457 @@
+";
+
+To force non-persistent connections, call adodb_session_open first before session_start():
+
+	include('adodb.inc.php');
+	include('adodb-session.php');
+	adodb_session_open(false,false,false);
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	print "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
";
+
+
+ Installation
+ ============
+ 1. Create this table in your database (syntax might vary depending on your db):
+
+  create table sessions (
+	   SESSKEY char(32) not null,
+	   EXPIRY int(11) unsigned not null,
+	   EXPIREREF varchar(64),
+	   DATA CLOB,
+	  primary key (sesskey)
+  );
+
+
+  2. Then define the following parameters in this file:
+  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+	$ADODB_SESSION_CONNECT='server to connect to';
+	$ADODB_SESSION_USER ='user';
+	$ADODB_SESSION_PWD ='password';
+	$ADODB_SESSION_DB ='database';
+	$ADODB_SESSION_TBL = 'sessions'
+	$ADODB_SESSION_USE_LOBS = false; (or, if you wanna use CLOBS (= 'CLOB') or ( = 'BLOB')
+
+  3. Recommended is PHP 4.1.0 or later. There are documented
+	 session bugs in earlier versions of PHP.
+
+  4. If you want to receive notifications when a session expires, then
+  	 you can tag a session with an EXPIREREF, and before the session
+	 record is deleted, we can call a function that will pass the EXPIREREF
+	 as the first parameter, and the session key as the second parameter.
+
+	 To do this, define a notification function, say NotifyFn:
+
+	 	function NotifyFn($expireref, $sesskey)
+	 	{
+	 	}
+
+	 Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
+	 This is an array with 2 elements, the first being the name of the variable
+	 you would like to store in the EXPIREREF field, and the 2nd is the
+	 notification function's name.
+
+	 In this example, we want to be notified when a user's session
+	 has expired, so we store the user id in the global variable $USERID,
+	 store this value in the EXPIREREF field:
+
+	 	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+
+	Then when the NotifyFn is called, we are passed the $USERID as the first
+	parameter, eg. NotifyFn($userid, $sesskey).
+*/
+
+if (!defined('_ADODB_LAYER')) {
+	include (dirname(__FILE__).'/adodb.inc.php');
+}
+
+if (!defined('ADODB_SESSION')) {
+
+ define('ADODB_SESSION',1);
+
+ /* if database time and system time is difference is greater than this, then give warning */
+ define('ADODB_SESSION_SYNCH_SECS',60);
+
+/****************************************************************************************\
+	Global definitions
+\****************************************************************************************/
+GLOBAL 	$ADODB_SESSION_CONNECT,
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_LIFE,
+	$ADODB_SESS_DEBUG,
+	$ADODB_SESSION_EXPIRE_NOTIFY,
+	$ADODB_SESSION_CRC,
+	$ADODB_SESSION_USE_LOBS,
+	$ADODB_SESSION_TBL;
+
+	if (!isset($ADODB_SESSION_USE_LOBS)) $ADODB_SESSION_USE_LOBS = 'CLOB';
+
+	$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
+	if ($ADODB_SESS_LIFE <= 1) {
+	 // bug in PHP 4.0.3 pl 1  -- how about other versions?
+	 //print "
Session Error: PHP.INI setting session.gc_maxlifetimenot set: $ADODB_SESS_LIFE
";
+	 	$ADODB_SESS_LIFE=1440;
+	}
+	$ADODB_SESSION_CRC = false;
+	//$ADODB_SESS_DEBUG = true;
+
+	//////////////////////////////////
+	/* SET THE FOLLOWING PARAMETERS */
+	//////////////////////////////////
+
+	if (empty($ADODB_SESSION_DRIVER)) {
+		$ADODB_SESSION_DRIVER='mysql';
+		$ADODB_SESSION_CONNECT='localhost';
+		$ADODB_SESSION_USER ='root';
+		$ADODB_SESSION_PWD ='';
+		$ADODB_SESSION_DB ='xphplens_2';
+	}
+
+	if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
+		$ADODB_SESSION_EXPIRE_NOTIFY = false;
+	}
+	//  Made table name configurable - by David Johnson djohnson@inpro.net
+	if (empty($ADODB_SESSION_TBL)){
+		$ADODB_SESSION_TBL = 'sessions';
+	}
+
+
+	// defaulting $ADODB_SESSION_USE_LOBS
+	if (!isset($ADODB_SESSION_USE_LOBS) || empty($ADODB_SESSION_USE_LOBS)) {
+		$ADODB_SESSION_USE_LOBS = false;
+	}
+
+	/*
+	$ADODB_SESS['driver'] = $ADODB_SESSION_DRIVER;
+	$ADODB_SESS['connect'] = $ADODB_SESSION_CONNECT;
+	$ADODB_SESS['user'] = $ADODB_SESSION_USER;
+	$ADODB_SESS['pwd'] = $ADODB_SESSION_PWD;
+	$ADODB_SESS['db'] = $ADODB_SESSION_DB;
+	$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
+	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
+
+	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
+	$ADODB_SESS['table'] = $ADODB_SESS_TBL;
+	*/
+
+/****************************************************************************************\
+	Create the connection to the database.
+
+	If $ADODB_SESS_CONN already exists, reuse that connection
+\****************************************************************************************/
+function adodb_sess_open($save_path, $session_name,$persist=true)
+{
+GLOBAL $ADODB_SESS_CONN;
+	if (isset($ADODB_SESS_CONN)) return true;
+
+GLOBAL 	$ADODB_SESSION_CONNECT,
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_DEBUG;
+
+	// cannot use & below - do not know why...
+	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
+	if (!empty($ADODB_SESS_DEBUG)) {
+		$ADODB_SESS_CONN->debug = true;
+		ADOConnection::outp( " conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ");
+	}
+	if ($persist) $ok = $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+
+	if (!$ok) ADOConnection::outp( "
+-- Session: connection failed
",false);
+}
+
+/****************************************************************************************\
+	Close the connection
+\****************************************************************************************/
+function adodb_sess_close()
+{
+global $ADODB_SESS_CONN;
+
+	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
+	return true;
+}
+
+/****************************************************************************************\
+	Slurp in the session variables and return the serialized string
+\****************************************************************************************/
+function adodb_sess_read($key)
+{
+global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
+
+	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
+	if ($rs) {
+		if ($rs->EOF) {
+			$v = '';
+		} else
+			$v = rawurldecode(reset($rs->fields));
+
+		$rs->Close();
+
+		// new optimization adodb 2.1
+		$ADODB_SESSION_CRC = strlen($v).crc32($v);
+
+		return $v;
+	}
+
+	return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
+}
+
+/****************************************************************************************\
+	Write the serialized data to a database.
+
+	If the data has not been modified since adodb_sess_read(), we do not write.
+\****************************************************************************************/
+function adodb_sess_write($key, $val)
+{
+	global
+		$ADODB_SESS_CONN,
+		$ADODB_SESS_LIFE,
+		$ADODB_SESSION_TBL,
+		$ADODB_SESS_DEBUG,
+		$ADODB_SESSION_CRC,
+		$ADODB_SESSION_EXPIRE_NOTIFY,
+		$ADODB_SESSION_DRIVER,			// added
+		$ADODB_SESSION_USE_LOBS;		// added
+
+	$expiry = time() + $ADODB_SESS_LIFE;
+
+	// crc32 optimization since adodb 2.1
+	// now we only update expiry date, thx to sebastian thom in adodb 2.32
+	if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
+		if ($ADODB_SESS_DEBUG) echo "
+-- Session: Only updating date - crc32 not changed
";
+		$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+		return true;
+	}
+	$val = rawurlencode($val);
+
+	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		global $$var;
+		$arr['expireref'] = $$var;
+	}
+
+
+	if ($ADODB_SESSION_USE_LOBS === false) {	// no lobs, simply use replace()
+		$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr, 'sesskey',$autoQuote = true);
+		if (!$rs) {
+			$err = $ADODB_SESS_CONN->ErrorMsg();
+		}
+	} else {
+		// what value shall we insert/update for lob row?
+		switch ($ADODB_SESSION_DRIVER) {
+			// empty_clob or empty_lob for oracle dbs
+			case "oracle":
+			case "oci8":
+			case "oci8po":
+			case "oci805":
+				$lob_value = sprintf("empty_%s()", strtolower($ADODB_SESSION_USE_LOBS));
+				break;
+
+			// null for all other
+			default:
+				$lob_value = "null";
+				break;
+		}
+
+		// do we insert or update? => as for sesskey
+		$res = $ADODB_SESS_CONN->Execute("select count(*) as cnt from $ADODB_SESSION_TBL where sesskey = '$key'");
+		if ($res && reset($res->fields) > 0) {
+			$qry = sprintf("update %s set expiry = %d, data = %s where sesskey = '%s'", $ADODB_SESSION_TBL, $expiry, $lob_value, $key);
+		} else {
+			// insert
+			$qry = sprintf("insert into %s (sesskey, expiry, data) values ('%s', %d, %s)", $ADODB_SESSION_TBL, $key, $expiry, $lob_value);
+		}
+
+		$err = "";
+		$rs1 = $ADODB_SESS_CONN->Execute($qry);
+		if (!$rs1) {
+			$err .= $ADODB_SESS_CONN->ErrorMsg()."\n";
+		}
+		$rs2 = $ADODB_SESS_CONN->UpdateBlob($ADODB_SESSION_TBL, 'data', $val, "sesskey='$key'", strtoupper($ADODB_SESSION_USE_LOBS));
+		if (!$rs2) {
+			$err .= $ADODB_SESS_CONN->ErrorMsg()."\n";
+		}
+		$rs = ($rs1 && $rs2) ? true : false;
+	}
+
+	if (!$rs) {
+		ADOConnection::outp( '
+-- Session Replace: '.nl2br($err).'
',false);
+	}  else {
+		// 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'");
+	}
+	return !empty($rs);
+}
+
+function adodb_sess_destroy($key)
+{
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$ADODB_SESS_CONN->CommitTrans();
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+	}
+	return $rs ? true : false;
+}
+
+function adodb_sess_gc($maxlifetime)
+{
+	global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$t = time();
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$rs->Close();
+
+			//$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+			$ADODB_SESS_CONN->CommitTrans();
+
+		}
+	} else {
+		$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time());
+
+		if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- Garbage Collection: $qry
");
+	}
+	// suggested by Cameron, "GaM3R" 
+	if (defined('ADODB_SESSION_OPTIMIZE')) {
+	global $ADODB_SESSION_DRIVER;
+
+		switch( $ADODB_SESSION_DRIVER ) {
+			case 'mysql':
+			case 'mysqlt':
+				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
+				break;
+			case 'postgresql':
+			case 'postgresql7':
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
+				break;
+		}
+		if (!empty($opt_qry)) {
+			$ADODB_SESS_CONN->Execute($opt_qry);
+		}
+	}
+	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
+	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
+
+	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
+	if ($rs && !$rs->EOF) {
+
+		$dbts = reset($rs->fields);
+		$rs->Close();
+		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
+		$t = time();
+		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
+			$msg =
+			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
+			error_log($msg);
+			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- $msg
");
+		}
+	}
+
+	return true;
+}
+
+session_set_save_handler(
+	"adodb_sess_open",
+	"adodb_sess_close",
+	"adodb_sess_read",
+	"adodb_sess_write",
+	"adodb_sess_destroy",
+	"adodb_sess_gc");
+}
+
+/*  TEST SCRIPT -- UNCOMMENT */
+
+if (0) {
+
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	ADOConnection::outp( "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
",false);
+}
diff --git a/adodb/session/old/adodb-session.php b/adodb/session/old/adodb-session.php
new file mode 100644
index 0000000..5fd43ab
--- /dev/null
+++ b/adodb/session/old/adodb-session.php
@@ -0,0 +1,449 @@
+";
+
+To force non-persistent connections, call adodb_session_open first before session_start():
+
+	include('adodb.inc.php');
+	include('adodb-session.php');
+	adodb_sess_open(false,false,false);
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	print "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
";
+
+
+ Installation
+ ============
+ 1. Create this table in your database (syntax might vary depending on your db):
+
+  create table sessions (
+	   SESSKEY char(32) not null,
+	   EXPIRY int(11) unsigned not null,
+	   EXPIREREF varchar(64),
+	   DATA text not null,
+	  primary key (sesskey)
+  );
+
+  For oracle:
+    create table sessions (
+	   SESSKEY char(32) not null,
+	   EXPIRY DECIMAL(16)  not null,
+	   EXPIREREF varchar(64),
+	   DATA varchar(4000) not null,
+	  primary key (sesskey)
+  );
+
+
+  2. Then define the following parameters. You can either modify
+     this file, or define them before this file is included:
+
+  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+	$ADODB_SESSION_CONNECT='server to connect to';
+	$ADODB_SESSION_USER ='user';
+	$ADODB_SESSION_PWD ='password';
+	$ADODB_SESSION_DB ='database';
+	$ADODB_SESSION_TBL = 'sessions'
+
+  3. Recommended is PHP 4.1.0 or later. There are documented
+	 session bugs in earlier versions of PHP.
+
+  4. If you want to receive notifications when a session expires, then
+  	 you can tag a session with an EXPIREREF, and before the session
+	 record is deleted, we can call a function that will pass the EXPIREREF
+	 as the first parameter, and the session key as the second parameter.
+
+	 To do this, define a notification function, say NotifyFn:
+
+	 	function NotifyFn($expireref, $sesskey)
+	 	{
+	 	}
+
+	 Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
+	 This is an array with 2 elements, the first being the name of the variable
+	 you would like to store in the EXPIREREF field, and the 2nd is the
+	 notification function's name.
+
+	 In this example, we want to be notified when a user's session
+	 has expired, so we store the user id in the global variable $USERID,
+	 store this value in the EXPIREREF field:
+
+	 	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+
+	Then when the NotifyFn is called, we are passed the $USERID as the first
+	parameter, eg. NotifyFn($userid, $sesskey).
+*/
+
+if (!defined('_ADODB_LAYER')) {
+	include (dirname(__FILE__).'/adodb.inc.php');
+}
+
+if (!defined('ADODB_SESSION')) {
+
+ define('ADODB_SESSION',1);
+
+ /* if database time and system time is difference is greater than this, then give warning */
+ define('ADODB_SESSION_SYNCH_SECS',60);
+
+ /*
+	Thanks Joe Li. See PHPLens Issue No: 11487&x=1
+*/
+function adodb_session_regenerate_id()
+{
+	$conn = ADODB_Session::_conn();
+	if (!$conn) return false;
+
+	$old_id = session_id();
+	if (function_exists('session_regenerate_id')) {
+		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']);
+		//@session_start();
+	}
+	$new_id = session_id();
+	$ok = $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
+
+	/* it is possible that the update statement fails due to a collision */
+	if (!$ok) {
+		session_id($old_id);
+		if (empty($ck)) $ck = session_get_cookie_params();
+		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
+		return false;
+	}
+
+	return true;
+}
+
+/****************************************************************************************\
+	Global definitions
+\****************************************************************************************/
+GLOBAL 	$ADODB_SESSION_CONNECT,
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_LIFE,
+	$ADODB_SESS_DEBUG,
+	$ADODB_SESSION_EXPIRE_NOTIFY,
+	$ADODB_SESSION_CRC,
+	$ADODB_SESSION_TBL;
+
+
+	$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
+	if ($ADODB_SESS_LIFE <= 1) {
+	 // bug in PHP 4.0.3 pl 1  -- how about other versions?
+	 //print "
Session Error: PHP.INI setting session.gc_maxlifetimenot set: $ADODB_SESS_LIFE
";
+	 	$ADODB_SESS_LIFE=1440;
+	}
+	$ADODB_SESSION_CRC = false;
+	//$ADODB_SESS_DEBUG = true;
+
+	//////////////////////////////////
+	/* SET THE FOLLOWING PARAMETERS */
+	//////////////////////////////////
+
+	if (empty($ADODB_SESSION_DRIVER)) {
+		$ADODB_SESSION_DRIVER='mysql';
+		$ADODB_SESSION_CONNECT='localhost';
+		$ADODB_SESSION_USER ='root';
+		$ADODB_SESSION_PWD ='';
+		$ADODB_SESSION_DB ='xphplens_2';
+	}
+
+	if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
+		$ADODB_SESSION_EXPIRE_NOTIFY = false;
+	}
+	//  Made table name configurable - by David Johnson djohnson@inpro.net
+	if (empty($ADODB_SESSION_TBL)){
+		$ADODB_SESSION_TBL = 'sessions';
+	}
+
+	/*
+	$ADODB_SESS['driver'] = $ADODB_SESSION_DRIVER;
+	$ADODB_SESS['connect'] = $ADODB_SESSION_CONNECT;
+	$ADODB_SESS['user'] = $ADODB_SESSION_USER;
+	$ADODB_SESS['pwd'] = $ADODB_SESSION_PWD;
+	$ADODB_SESS['db'] = $ADODB_SESSION_DB;
+	$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
+	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
+
+	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
+	$ADODB_SESS['table'] = $ADODB_SESS_TBL;
+	*/
+
+/****************************************************************************************\
+	Create the connection to the database.
+
+	If $ADODB_SESS_CONN already exists, reuse that connection
+\****************************************************************************************/
+function adodb_sess_open($save_path, $session_name,$persist=true)
+{
+GLOBAL $ADODB_SESS_CONN;
+	if (isset($ADODB_SESS_CONN)) return true;
+
+GLOBAL 	$ADODB_SESSION_CONNECT,
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_DEBUG;
+
+	// cannot use & below - do not know why...
+	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
+	if (!empty($ADODB_SESS_DEBUG)) {
+		$ADODB_SESS_CONN->debug = true;
+		ADOConnection::outp( " conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ");
+	}
+	if ($persist) $ok = $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+
+	if (!$ok) ADOConnection::outp( "
+-- Session: connection failed
",false);
+}
+
+/****************************************************************************************\
+	Close the connection
+\****************************************************************************************/
+function adodb_sess_close()
+{
+global $ADODB_SESS_CONN;
+
+	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
+	return true;
+}
+
+/****************************************************************************************\
+	Slurp in the session variables and return the serialized string
+\****************************************************************************************/
+function adodb_sess_read($key)
+{
+global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
+
+	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
+	if ($rs) {
+		if ($rs->EOF) {
+			$v = '';
+		} else
+			$v = rawurldecode(reset($rs->fields));
+
+		$rs->Close();
+
+		// new optimization adodb 2.1
+		$ADODB_SESSION_CRC = strlen($v).crc32($v);
+
+		return $v;
+	}
+
+	return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
+}
+
+/****************************************************************************************\
+	Write the serialized data to a database.
+
+	If the data has not been modified since adodb_sess_read(), we do not write.
+\****************************************************************************************/
+function adodb_sess_write($key, $val)
+{
+	global
+		$ADODB_SESS_CONN,
+		$ADODB_SESS_LIFE,
+		$ADODB_SESSION_TBL,
+		$ADODB_SESS_DEBUG,
+		$ADODB_SESSION_CRC,
+		$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	$expiry = time() + $ADODB_SESS_LIFE;
+
+	// crc32 optimization since adodb 2.1
+	// now we only update expiry date, thx to sebastian thom in adodb 2.32
+	if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
+		if ($ADODB_SESS_DEBUG) echo "
+-- Session: Only updating date - crc32 not changed
";
+		$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+		return true;
+	}
+	$val = rawurlencode($val);
+
+	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		global $$var;
+		$arr['expireref'] = $$var;
+	}
+	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr,
+    	'sesskey',$autoQuote = true);
+
+	if (!$rs) {
+		ADOConnection::outp( '
+-- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'
',false);
+	}  else {
+		// bug in access driver (could be odbc?) means that info is not 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'");
+	}
+	return !empty($rs);
+}
+
+function adodb_sess_destroy($key)
+{
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$ADODB_SESS_CONN->CommitTrans();
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+	}
+	return $rs ? true : false;
+}
+
+function adodb_sess_gc($maxlifetime)
+{
+	global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$t = time();
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$rs->Close();
+
+			$ADODB_SESS_CONN->CommitTrans();
+
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
+		$ADODB_SESS_CONN->Execute($qry);
+
+		if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- Garbage Collection: $qry
");
+	}
+	// suggested by Cameron, "GaM3R" 
+	if (defined('ADODB_SESSION_OPTIMIZE')) {
+	global $ADODB_SESSION_DRIVER;
+
+		switch( $ADODB_SESSION_DRIVER ) {
+			case 'mysql':
+			case 'mysqlt':
+				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
+				break;
+			case 'postgresql':
+			case 'postgresql7':
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
+				break;
+		}
+		if (!empty($opt_qry)) {
+			$ADODB_SESS_CONN->Execute($opt_qry);
+		}
+	}
+	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
+	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
+
+	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
+	if ($rs && !$rs->EOF) {
+
+		$dbts = reset($rs->fields);
+		$rs->Close();
+		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
+		$t = time();
+
+		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
+
+			$msg =
+			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
+			error_log($msg);
+			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- $msg
");
+		}
+	}
+
+	return true;
+}
+
+session_set_save_handler(
+	"adodb_sess_open",
+	"adodb_sess_close",
+	"adodb_sess_read",
+	"adodb_sess_write",
+	"adodb_sess_destroy",
+	"adodb_sess_gc");
+}
+
+/*  TEST SCRIPT -- UNCOMMENT */
+
+if (0) {
+
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	ADOConnection::outp( "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
",false);
+}
diff --git a/adodb/session/old/crypt.inc.php b/adodb/session/old/crypt.inc.php
new file mode 100644
index 0000000..089e24a
--- /dev/null
+++ b/adodb/session/old/crypt.inc.php
@@ -0,0 +1,83 @@
+
+ */
+
+class MD5Crypt{
+		function keyED($txt,$encrypt_key)
+		{
+				$encrypt_key = md5($encrypt_key);
+				$ctr=0;
+				$tmp = "";
+				for ($i=0;$ikeyED($tmp,$key));
+		}
+
+		function Decrypt($txt,$key)
+		{
+				$txt = $this->keyED(base64_decode($txt),$key);
+				$tmp = "";
+				for ($i=0;$i= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
+						{
+								$randnumber = rand(48,120);
+						}
+
+						$randomPassword .= chr($randnumber);
+				}
+				return $randomPassword;
+		}
+
+}
diff --git a/adodb/session/session_schema.xml b/adodb/session/session_schema.xml
index 3c61ff6..c1f7531 100644
--- a/adodb/session/session_schema.xml
+++ b/adodb/session/session_schema.xml
@@ -1,14 +1,14 @@
 
 
   
-    table for ADOdb session-management
+    table for ADOdb session-management
       session key
       
       
     
- 
+
     
       
       
diff --git a/adodb/session/session_schema2.xml b/adodb/session/session_schema2.xml
index c2804ed..89cb4f2 100644
--- a/adodb/session/session_schema2.xml
+++ b/adodb/session/session_schema2.xml
@@ -1,26 +1,26 @@
 
 
   

 
     

-    table for ADOdb session-management
+    table for ADOdb session-management
       session key
       
       
     
- 
 
-	
+
+
     
       
       
     
-	
+
 	 	
 	     
       
     
-	
+
 	 	
 	     
       
@@ -30,7 +30,7 @@
       
     
 
-    
+    
       
       
     
diff --git a/adodb/tests/LibTest.php b/adodb/tests/LibTest.php
new file mode 100644
index 0000000..2f02e00
--- /dev/null
+++ b/adodb/tests/LibTest.php
@@ -0,0 +1,72 @@
+db = ADONewConnection('mysqli');
+	}
+
+	/**
+	 * Test for {@see _adodb_quote_fieldname()}
+	 *
+	 * @dataProvider quoteProvider
+	 */
+	public function testQuoteFieldNames($method, $field, $expected)
+	{
+		global $ADODB_QUOTE_FIELDNAMES;
+		$ADODB_QUOTE_FIELDNAMES = $method;
+		$this->assertSame($expected, _adodb_quote_fieldname($this->db, $field));
+	}
+
+	/**
+	 * Data provider for {@see testQuoteFieldNames()}
+	 * @return array
+	 */
+	public function quoteProvider()
+	{
+		return [
+			'No quoting, single-word field name' => [false, 'Field', 'FIELD'],
+			'No quoting, field name with space' => [false, 'Field Name', '`FIELD NAME`'],
+			'Quoting `true`' => [true, 'Field', '`FIELD`'],
+			'Quoting `UPPER`' => ['UPPER', 'Field', '`FIELD`'],
+			'Quoting `LOWER`' => ['LOWER', 'Field', '`field`'],
+			'Quoting `NATIVE`' => ['NATIVE', 'Field', '`Field`'],
+			'Quoting `BRACKETS`' => ['BRACKETS', 'Field', '[FIELD]'],
+			'Unknown value defaults to UPPER' => ['XXX', 'Field', '`FIELD`'],
+		];
+	}
+
+}
diff --git a/adodb/tests/benchmark.php b/adodb/tests/benchmark.php
new file mode 100644
index 0000000..5799031
--- /dev/null
+++ b/adodb/tests/benchmark.php
@@ -0,0 +1,95 @@
+
+
+    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/adodb/tests/client.php b/adodb/tests/client.php
new file mode 100644
index 0000000..8452da4
--- /dev/null
+++ b/adodb/tests/client.php
@@ -0,0 +1,208 @@
+
+
+';
+ 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/adodb/tests/pdo.php b/adodb/tests/pdo.php
new file mode 100644
index 0000000..b1b5452
--- /dev/null
+++ b/adodb/tests/pdo.php
@@ -0,0 +1,111 @@
+";
+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/adodb/tests/test-active-record.php b/adodb/tests/test-active-record.php
new file mode 100644
index 0000000..081527e
--- /dev/null
+++ b/adodb/tests/test-active-record.php
@@ -0,0 +1,156 @@
+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/adodb/tests/test-active-recs2.php b/adodb/tests/test-active-recs2.php
new file mode 100644
index 0000000..a9fcbc0
--- /dev/null
+++ b/adodb/tests/test-active-recs2.php
@@ -0,0 +1,96 @@
+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/adodb/tests/test-active-relations.php b/adodb/tests/test-active-relations.php
new file mode 100644
index 0000000..bb01375
--- /dev/null
+++ b/adodb/tests/test-active-relations.php
@@ -0,0 +1,104 @@
+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/adodb/tests/test-active-relationsx.php b/adodb/tests/test-active-relationsx.php
new file mode 100644
index 0000000..4d3a80d
--- /dev/null
+++ b/adodb/tests/test-active-relationsx.php
@@ -0,0 +1,438 @@
+\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/adodb/tests/test-datadict.php b/adodb/tests/test-datadict.php
new file mode 100644
index 0000000..5caea25
--- /dev/null
+++ b/adodb/tests/test-datadict.php
@@ -0,0 +1,258 @@
+$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/adodb/tests/test-perf.php b/adodb/tests/test-perf.php
new file mode 100644
index 0000000..4c83c17
--- /dev/null
+++ b/adodb/tests/test-perf.php
@@ -0,0 +1,67 @@
+ $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/adodb/tests/test-pgblob.php b/adodb/tests/test-pgblob.php
new file mode 100644
index 0000000..4c8bd16
--- /dev/null
+++ b/adodb/tests/test-pgblob.php
@@ -0,0 +1,105 @@
+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/adodb/tests/test-php5.php b/adodb/tests/test-php5.php
new file mode 100644
index 0000000..6d8758b
--- /dev/null
+++ b/adodb/tests/test-php5.php
@@ -0,0 +1,125 @@
+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/adodb/tests/test-xmlschema.php b/adodb/tests/test-xmlschema.php
new file mode 100644
index 0000000..e2d6dba
--- /dev/null
+++ b/adodb/tests/test-xmlschema.php
@@ -0,0 +1,70 @@
+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/adodb/tests/test.php b/adodb/tests/test.php
new file mode 100644
index 0000000..fb23980
--- /dev/null
+++ b/adodb/tests/test.php
@@ -0,0 +1,1781 @@
+$msg
";
+	flush();
+}
+
+function CheckWS($conn)
+{
+	include_once('../session/adodb-session.php');
+	if (defined('CHECKWSFAIL')){ echo " TESTING $conn ";flush();}
+	$db = ADONewConnection($conn);
+	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();
+	print "
ADODB Version: $ADODB_vers";
+	print "
Host: $db->host";
+	print "
Database: $db->database";
+	print "
PHP: $phpv
";
+
+	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);
+
+	#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 - committing
";
+		}
+	}
+	flush();
+	$saved = $db->debug;
+	$db->debug=1;
+	$cnt = _adodb_S($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 ($db->dataProvider == 'odbtp') {
+		$db->databaseType = 'odbtp';
+	}
+	$conn = NewADOConnection($db->databaseType);
+	$conn->raiseErrorFn = 'adodb_test_err';
+	$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/adodb/tests/test2.php b/adodb/tests/test2.php
new file mode 100644
index 0000000..fd288dc
--- /dev/null
+++ b/adodb/tests/test2.php
@@ -0,0 +1,42 @@
+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/adodb/tests/test3.php b/adodb/tests/test3.php
new file mode 100644
index 0000000..38c5285
--- /dev/null
+++ b/adodb/tests/test3.php
@@ -0,0 +1,53 @@
+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/adodb/tests/test4.php b/adodb/tests/test4.php
new file mode 100644
index 0000000..cdaf527
--- /dev/null
+++ b/adodb/tests/test4.php
@@ -0,0 +1,147 @@
+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');
+
+$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/adodb/tests/test5.php b/adodb/tests/test5.php
new file mode 100644
index 0000000..15327d1
--- /dev/null
+++ b/adodb/tests/test5.php
@@ -0,0 +1,53 @@
+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/adodb/tests/test_mssqlnative.php b/adodb/tests/test_mssqlnative.php
new file mode 100644
index 0000000..9a4221f
--- /dev/null
+++ b/adodb/tests/test_mssqlnative.php
@@ -0,0 +1,150 @@
+\n".$Msg;
+}
+function DieTrace($Msg){
+  die("
\n".$Msg);
+}
+
+
+define('ADODB_ASSOC_CASE',0);
+$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+$db = ADONewConnection("mssqlnative");  // create a connection
+$db->Connect('127.0.0.1','adodb','natsoft','northwind') or die('Fail');
+
+//==========================
+// This code tests GenId
+//==========================
+function TestGenID() {
+  global $db;
+  $PrevDebug=$db->debug;  $db->debug=false; // Hide debug if present as Drop can cause errors
+  $db->Execute("drop sequence MySequence1;
+drop sequence MySequence2;
+drop sequence MySequence3;
+drop table MySequence1Emul;
+drop table MySequence2Emul;
+drop table MySequence3Emul;
+");
+  $db->debug=$PrevDebug; // Restore debug Initial State
+
+  $ID1a=$db->GenID("MySequence1");
+  $ID2a=$db->GenID("MySequence2");
+  $ID1b=$db->GenID("MySequence1");
+  $ID2b=$db->GenID("MySequence2");
+  Trace("ID1a=$ID1a,ID1b=$ID1b, ID2a=$ID2a,ID2b=$ID2b");
+  if(intval($ID1a)+1!==intval($ID1b)) DieTrace(sprintf("ERROR : Second value obtains by MySequence1 should be %d but is %d",$ID1a+1,$ID1b));
+
+  $db->CreateSequence("MySequence3",100);
+  $ID2b=$db->GenID("MySequence3");
+  if(intval($ID2b)!==100) DieTrace(sprintf("ERROR : Value from MySequence3 should be 100 but is %d",$ID2b));
+
+  $db->mssql_version=10; // Force to simulate Pre 2012 (without sequence) behavior
+  $ID1a=$db->GenID("MySequence1Emul");
+  $ID2a=$db->GenID("MySequence2Emul");
+  $ID1b=$db->GenID("MySequence1Emul");
+  $ID2b=$db->GenID("MySequence2Emul");
+  echo "ID1a=$ID1a,ID1b=$ID1b, ID2a=$ID2a,ID2b=$ID2b 
\n";
+  if(intval($ID1a+1)!==intval($ID1b)) DieTrace(sprintf("ERROR : Second value obtains by MySequence1Emul should be %d but is %d",$ID1a+1,$ID1b));
+
+  $db->CreateSequence("MySequence3Emul",100);
+  $ID2b=$db->GenID("MySequence3Emul");
+  if(intval($ID2b)!==100) DieTrace(sprintf("ERROR : Value from MySequence3Emul should be 100 but is %d",$ID2b));
+  } //TestGenID()
+
+//==========================
+// This code tests SQLDate
+//==========================
+function TestSQLDate()
+{
+  global $db;
+  $res = $db->GetRow("select testdate,"
+    . $db->SQLDate("d/m/Y", "testdate") . " FR4,"
+    . $db->SQLDate("d/m/y", "testdate") . " FR4b,"
+    . $db->SQLDate("d/m/Y", "NULL") . " nullFR4,"
+    . $db->SQLDate("m/d/Y", "testdate") . " US4,"
+    . $db->SQLDate("m/d/y", "testdate") . " US4b,"
+    . $db->SQLDate("m-d-Y", "testdate") . " USD4,"
+    . $db->SQLDate("m-d-y", "testdate") . " USD4b,"
+    . $db->SQLDate("Y.m.d", "testdate") . " ANSI4,"
+    . $db->SQLDate("d.m.Y", "testdate") . " GE4,"
+    . $db->SQLDate("d.m.y", "testdate") . " GE4b,"
+    . $db->SQLDate("d-m-Y", "testdate") . " IT4,"
+    . $db->SQLDate("d-m-y", "testdate") . " IT4b,"
+    . $db->SQLDate("Y/m/d", "testdate") . " Japan4,"
+    . $db->SQLDate("y/m/d", "testdate") . " Japan4b,"
+    . $db->SQLDate("H:i:s", "testdate") . " timeonly,"
+    . $db->SQLDate("d m Y", "testdate") . " Space4,"  // Is done by former method
+    . $db->SQLDate("d m Y", "NULL") . " nullSpace4,"
+    . $db->SQLDate("m-d-Y", "testdatesmall") . " nowUSdash4,"
+    . "null from (select convert(datetime,'2016-12-17 18:55:30.590' ,121) testdate,
+        convert(datetime,'2016-01-01 18:55:30.590' ,121) testdatesmall,null nulldate) q "
+  );
+  $TestRes=array(
+    "fr4"=>"17/12/2016",
+    "fr4b"=>"17/12/2016",
+    "nullfr4"=>null,
+    "us4"=>"12/17/2016",
+    "us4b"=>"12/17/2016",
+    "ansi4"=>"2016.12.17",
+    "ge4"=>"17.12.2016",
+    "ge4b"=>"17.12.2016",
+    "it4"=>"17-12-2016",
+    "it4b"=>"17-12-2016",
+    "japan4"=>"2016/12/17",
+    "japan4b"=>"2016/12/17",
+    "space4"=>"17 12 2016",
+    "nullspace4"=>null,
+    "timeonly"=>"18:55:30",
+  );
+  var_dump($res);
+  foreach($TestRes as $k=>$v)
+    if($v!==$res[$k])
+      DieTrace(sprintf("ERROR : Expected for '%s' is '%s', but got '%s'",$k,$v,$res[$k]));
+} //TestSQLDate()
+
+//==========================
+// This code is the tests RUNNER
+//==========================
+$db->debug=true;
+// $ToTest Contains * or the name of the test function to RUN
+$ToTest="*";
+//$ToTest="TestSQLDate";
+
+// Here the generic test runner, will launch all functions of the current file beginning by "test", should not be changed use $ToTest
+$functions = get_defined_functions();
+$functions = $functions['user'];
+foreach( $functions as $f) {
+  $refFunc = new ReflectionFunction($f);
+  if(($refFunc->getFileName()==__FILE__)&&(substr($f,0,4)=='test'))
+    if(($ToTest=='*')||(strtolower($ToTest)==$f))
+    {
+      Trace("-------- Launch Test : $f ------------------");
+      $f();
+    }
+}
+
+Trace("=========== End of tests Without Error. ===================");
\ No newline at end of file
diff --git a/adodb/tests/test_rs_array.php b/adodb/tests/test_rs_array.php
new file mode 100644
index 0000000..75848c0
--- /dev/null
+++ b/adodb/tests/test_rs_array.php
@@ -0,0 +1,65 @@
+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/adodb/tests/testcache.php b/adodb/tests/testcache.php
new file mode 100644
index 0000000..bf8676b
--- /dev/null
+++ b/adodb/tests/testcache.php
@@ -0,0 +1,38 @@
+
+
+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/adodb/tests/testdatabases.inc.php b/adodb/tests/testdatabases.inc.php
new file mode 100644
index 0000000..8c6358a
--- /dev/null
+++ b/adodb/tests/testdatabases.inc.php
@@ -0,0 +1,475 @@
+
+
+

+

+> 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
+
+
+	$server = 'localhost';
+	$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...
";
+	$server = 'localhost';
+	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...
";
+	$server = 'localhost';
+	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...
";
+	$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)) {
+	$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();
+	}
+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 -- through 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/adodb/tests/testgenid.php b/adodb/tests/testgenid.php
new file mode 100644
index 0000000..3a8a973
--- /dev/null
+++ b/adodb/tests/testgenid.php
@@ -0,0 +1,52 @@
+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/adodb/tests/testmssql.php b/adodb/tests/testmssql.php
new file mode 100644
index 0000000..fa8570b
--- /dev/null
+++ b/adodb/tests/testmssql.php
@@ -0,0 +1,81 @@
+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/adodb/tests/testoci8.php b/adodb/tests/testoci8.php
new file mode 100644
index 0000000..81cf185
--- /dev/null
+++ b/adodb/tests/testoci8.php
@@ -0,0 +1,93 @@
+
+
+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/adodb/tests/testoci8cursor.php b/adodb/tests/testoci8cursor.php
new file mode 100644
index 0000000..9dcf8ca
--- /dev/null
+++ b/adodb/tests/testoci8cursor.php
@@ -0,0 +1,116 @@
+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/adodb/tests/testpaging.php b/adodb/tests/testpaging.php
new file mode 100644
index 0000000..956d748
--- /dev/null
+++ b/adodb/tests/testpaging.php
@@ -0,0 +1,95 @@
+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/adodb/tests/testpear.php b/adodb/tests/testpear.php
new file mode 100644
index 0000000..5949abe
--- /dev/null
+++ b/adodb/tests/testpear.php
@@ -0,0 +1,43 @@
+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/adodb/tests/testsessions.php b/adodb/tests/testsessions.php
new file mode 100644
index 0000000..2eca41b
--- /dev/null
+++ b/adodb/tests/testsessions.php
@@ -0,0 +1,107 @@
+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/adodb/tests/time.php b/adodb/tests/time.php
new file mode 100644
index 0000000..8760ccd
--- /dev/null
+++ b/adodb/tests/time.php
@@ -0,0 +1,35 @@
+
+" );
+echo( "Converted: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
diff --git a/adodb/tests/tmssql.php b/adodb/tests/tmssql.php
new file mode 100644
index 0000000..6b85551
--- /dev/null
+++ b/adodb/tests/tmssql.php
@@ -0,0 +1,98 @@
+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/adodb/tests/xmlschema.xml b/adodb/tests/xmlschema.xml
new file mode 100644
index 0000000..ea48ae2
--- /dev/null
+++ b/adodb/tests/xmlschema.xml
@@ -0,0 +1,33 @@
+
+
+  
+    
+      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/adodb/toexport.inc.php b/adodb/toexport.inc.php
index b3dd6ef..66bbf54 100644
--- a/adodb/toexport.inc.php
+++ b/adodb/toexport.inc.php
@@ -1,17 +1,11 @@
 FieldTypesArray();
 		reset($fieldTypes);
-		while(list(,$o) = each($fieldTypes)) {
-			
-			$v = $o->name;
+		$i = 0;
+		$elements = array();
+		foreach ($fieldTypes as $o) {
+
+			$v = ($o) ? $o->name : 'Field'.($i++);
 			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
 			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
 			$elements[] = $v;
-			
+
 		}
 		$s .= implode($sep, $elements).$NEWLINE;
 	}
 	$hasNumIndex = isset($rs->fields[0]);
-	
+
 	$line = 0;
 	$max = $rs->FieldCount();
-	
+
 	while (!$rs->EOF) {
 		$elements = array();
 		$i = 0;
-		
+
 		if ($hasNumIndex) {
 			for ($j=0; $j < $max; $j++) {
 				$v = $rs->fields[$j];
@@ -99,7 +111,7 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote =
 				else $v = 'Object';
 				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
 				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
-				
+
 				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
 				else $elements[] = $v;
 			}
@@ -107,7 +119,7 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote =
 			foreach($rs->fields as $v) {
 				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
 				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
-				
+
 				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
 				else $elements[] = $v;
 			}
@@ -121,13 +133,12 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote =
 			$s = '';
 		}
 	}
-	
+
 	if ($fp) {
 		if ($fp === true) echo $s;
 		else fwrite($fp,$s);
 		$s = '';
 	}
-	
+
 	return $s;
 }
-?>
\ No newline at end of file
diff --git a/adodb/tohtml.inc.php b/adodb/tohtml.inc.php
index 784fbe1..e92c8b4 100644
--- a/adodb/tohtml.inc.php
+++ b/adodb/tohtml.inc.php
@@ -1,13 +1,30 @@
-
-*/ 
-  
+ $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;
 
@@ -15,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)
@@ -47,17 +56,17 @@ function rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true
 		printf(ADODB_BAD_RS,'rs2html');
 		return false;
 	}
-	
+
 	if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
 	//else $docnt = true;
 	$typearr = array();
 	$ncols = $rs->FieldCount();
 	$hdr = "\n\n";
-	for ($i=0; $i < $ncols; $i++) {	
+	for ($i=0; $i < $ncols; $i++) {
 		$field = $rs->FetchField($i);
 		if ($field) {
 			if ($zheaderarray) $fname = $zheaderarray[$i];
-			else $fname = htmlspecialchars($field->name);	
+			else $fname = htmlspecialchars($field->name);
 			$typearr[$i] = $rs->MetaType($field->type,$field->max_length);
  			//print " $field->name $field->type $typearr[$i] ";
 		} else {
@@ -70,38 +79,44 @@ function rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true
 	$hdr .= "\n";
 	if ($echo) print $hdr."\n\n";
 	else $html = $hdr;
-	
+
 	// smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...
 	$numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || isset($rs->fields[2]);
 	while (!$rs->EOF) {
-		
+
 		$s .= "\n";
-		
+
 		for ($i=0; $i < $ncols; $i++) {
 			if ($i===0) $v=($numoffset) ? $rs->fields[0] : reset($rs->fields);
 			else $v = ($numoffset) ? $rs->fields[$i] : next($rs->fields);
-			
+
 			$type = $typearr[$i];
 			switch($type) {
 			case 'D':
-				if (empty($v)) $s .= "\n";
-				else if (!strpos($v,':')) {
-					$s .= "	\n";
+				if (strpos($v,':') !== false);
+				else {
+					if (empty($v)) {
+					$s .= "\n";
+					} else {
+						$s .= "	\n";
+					}
+					break;
 				}
-				break;
 			case 'T':
 				if (empty($v)) $s .= "\n";
-				else $s .= "	\n";
+				else $s .= "	\n";
 			break;
-			
+
 			case 'N':
 				if (abs(abs($v) - round($v,0)) < 0.00000001)
 					$v = round($v);
 				else
 					$v = round($v,$ADODB_ROUND);
 			case 'I':
-				$s .= "	\n";
-			   	
+				$vv = stripslashes((trim($v)));
+				if (strlen($vv) == 0) $vv .= ' ';
+				$s .= "	\n";
+
 			break;
 			/*
 			case 'B':
@@ -128,11 +143,11 @@ function mime_content_type ($file) {
 				$v = trim($v);
 				if (strlen($v) == 0) $v = ' ';
 				$s .= "	\n";
-			  
+
 			}
 		} // for
 		$s .= "\n\n";
-			  
+
 		$rows += 1;
 		if ($rows >= $gSQLMaxRows) {
 			$rows = "
Truncated at $gSQLMaxRows
";
@@ -140,10 +155,10 @@ function mime_content_type ($file) {
 		} // switch
 
 		$rs->MoveNext();
-	
+
 	// additional EOF check to prevent a widow header
 		if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
-	
+
 		//if (connection_aborted()) break;// not needed as PHP aborts script, unlike ASP
 			if ($echo) print $s . "
   ".$rs->UserDate($v,"D d, M Y") ."    ".$rs->UserDate($v,"D d, M Y") ."   ".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ." ".$rs->UserTimeStamp($v,"D d, M Y, H:i:s") ."".stripslashes((trim($v))) ." ".$vv ."". str_replace("\n",'
',stripslashes($v)) ."
\n\n";
 			else $html .= $s ."\n\n";
@@ -153,17 +168,17 @@ function mime_content_type ($file) {
 
 	if ($echo) print $s."\n\n";
 	else $html .= $s."\n\n";
-	
+
 	if ($docnt) if ($echo) print "
".$rows." Rows
";
-	
+
 	return ($echo) ? $rows : $html;
  }
- 
+
 // pass in 2 dimensional array
 function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
 {
 	if (!$ztabhtml) $ztabhtml = 'BORDER=1';
-	
+
 	$s = "";//';print_r($arr);
 
 	if ($zheaderarray) {
@@ -173,11 +188,11 @@ function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
 		}
 		$s .= "\n";
 	}
-	
+
 	for ($i=0; $i
\ No newline at end of file
diff --git a/adodb/xmlschema.dtd b/adodb/xmlschema.dtd
index 4a055da..2d0b579 100644
--- a/adodb/xmlschema.dtd
+++ b/adodb/xmlschema.dtd
@@ -3,7 +3,7 @@
 
 
 
-
 
 
diff --git a/adodb/xmlschema03.dtd b/adodb/xmlschema03.dtd
index a7c8864..351ea44 100644
--- a/adodb/xmlschema03.dtd
+++ b/adodb/xmlschema03.dtd
@@ -1,43 +1,53 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/adodb/xsl/convert-0.1-0.2.xsl b/adodb/xsl/convert-0.1-0.2.xsl
new file mode 100644
index 0000000..5b2e3ce
--- /dev/null
+++ b/adodb/xsl/convert-0.1-0.2.xsl
@@ -0,0 +1,205 @@
+
+
+	
+
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+
+		
+			0.2
+
+			
+		
+	
+
+	
+	
+		
+
+		
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+			
+
+			
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/convert-0.1-0.3.xsl b/adodb/xsl/convert-0.1-0.3.xsl
new file mode 100644
index 0000000..3202dce
--- /dev/null
+++ b/adodb/xsl/convert-0.1-0.3.xsl
@@ -0,0 +1,221 @@
+
+
+	
+
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+
+		
+			0.3
+
+			
+		
+	
+
+	
+	
+		
+
+		
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+			
+
+			
+				
+			
+
+			
+				
+				
+					
+				
+				
+					
+						
+					
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/convert-0.2-0.1.xsl b/adodb/xsl/convert-0.2-0.1.xsl
new file mode 100644
index 0000000..6398e3e
--- /dev/null
+++ b/adodb/xsl/convert-0.2-0.1.xsl
@@ -0,0 +1,207 @@
+
+
+	
+
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+
+		
+			0.1
+
+			
+		
+	
+
+	
+	
+		
+
+		
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+
+			
+
+		
+
+		
+	
+
+	
+	
+		
+			
+			
+
+			
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+			
+
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/convert-0.2-0.3.xsl b/adodb/xsl/convert-0.2-0.3.xsl
new file mode 100644
index 0000000..9e1f2ae
--- /dev/null
+++ b/adodb/xsl/convert-0.2-0.3.xsl
@@ -0,0 +1,281 @@
+
+
+	
+
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+
+		
+			0.3
+
+			
+		
+	
+
+	
+	
+		
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+
+			
+
+			
+
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+			
+
+			
+				
+			
+
+			
+				
+					
+						
+					
+				
+				
+					
+				
+				
+					
+						
+					
+					
+				
+				
+					
+					
+						
+					
+				
+			
+
+			
+
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+
+			
+				
+			
+
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+				
+			
+
+			
+				
+			
+
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
+	
+	
+		
+			
+				
+			
+
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/remove-0.2.xsl b/adodb/xsl/remove-0.2.xsl
new file mode 100644
index 0000000..c82c3ad
--- /dev/null
+++ b/adodb/xsl/remove-0.2.xsl
@@ -0,0 +1,54 @@
+
+
+	
+
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+
+		
+Uninstallation Schema
+
+
+		
+			0.2
+
+			
+				
+			
+		
+	
+
+	
+	
+		
+			
+				
+
+				
+					
+				
+
+				
+					
+				
+
+				
+
+				
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/remove-0.3.xsl b/adodb/xsl/remove-0.3.xsl
new file mode 100644
index 0000000..4b1cd02
--- /dev/null
+++ b/adodb/xsl/remove-0.3.xsl
@@ -0,0 +1,54 @@
+
+
+	
+
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+
+		
+Uninstallation Schema
+
+
+		
+			0.3
+
+			
+				
+			
+		
+	
+
+	
+	
+		
+			
+				
+
+				
+					
+				
+
+				
+					
+				
+
+				
+
+				
+			
+		
+	
+
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/gacl.class.php b/gacl.class.php
index 4cdc4a6..47f23d2 100644
--- a/gacl.class.php
+++ b/gacl.class.php
@@ -1,5 +1,5 @@
 = 0) {
+		// PHP-Version 7.2 oder hoeher
+		if (is_countable($array_or_countable)) {
+			return count($array_or_countable, $mode);
+		} elseif ($array_or_countable === null) {
+			return 0;
+		}
+		return 1;
+	} else {
+		return count($array_or_countable, $mode);
+	}
+}
+
 /**
 * phpGACL main class
 *
@@ -57,8 +72,7 @@ class gacl {
 	--- Private properties ---
 	*/
 	/** @var boolean Enables Debug output if true */
-	var $_debug = FALSE;
-
+	var $_debug = FALSE; // replaced by DEBUG in line 150
 	/*
 	--- Database configuration. ---
 	*/
@@ -105,9 +119,9 @@ class gacl {
 
 	/**
 	 * Constructor
-	 * @param array An arry of options to oeverride the class defaults
+	 * @param array An arry of options to override the class defaults
 	 */
-	function gacl($options = NULL) {
+	function __construct($options = NULL) {
 
 		$available_options = array('db','debug','items_per_page','max_select_box_items','max_search_return_items','db_table_prefix','db_type','db_host','db_user','db_password','db_name','caching','force_cache_expire','cache_dir','cache_expire_time');
 
@@ -148,6 +162,7 @@ function gacl($options = NULL) {
 			$this->db->PConnect($this->_db_host, $this->_db_user, $this->_db_password, $this->_db_name);
 		}
 		$this->db->debug = $this->_debug;
+		$this->db->debug = (DEBUG > 2);
 
 		if ( $this->_caching == TRUE ) {
 			if (!class_exists('Hashed_Cache_Lite')) {
@@ -451,7 +466,7 @@ function acl_query($aco_section_value, $aco_value, $aro_section_value, $aro_valu
 				return FALSE;
 			}
 
-			$row =& $rs->FetchRow();
+			$row = $rs->FetchRow();
 
 			/*
 			 * Return ACL ID. This is the key to "hooking" extras like pricing assigned to ACLs etc... Very useful.
@@ -468,7 +483,7 @@ function acl_query($aco_section_value, $aco_value, $aro_section_value, $aro_valu
 					$allow = FALSE;
 				}
 
-				$retarr = array('acl_id' => &$row[0], 'return_value' => &$row[2], 'allow' => $allow);
+				$retarr = array('acl_id' => $row[0], 'return_value' => $row[2], 'allow' => $allow);
 			} else {
 				// Permission denied.
 				$retarr = array('acl_id' => NULL, 'return_value' => NULL, 'allow' => FALSE);
diff --git a/gacl.ini.php b/gacl.ini.php
index 5ffbe3a..650d595 100644
--- a/gacl.ini.php
+++ b/gacl.ini.php
@@ -1,4 +1,4 @@
-; 
+; 
 ;
 ; *WARNING* 
 ;
diff --git a/gacl_api.class.php b/gacl_api.class.php
index 14283a8..8cb13a8 100644
--- a/gacl_api.class.php
+++ b/gacl_api.class.php
@@ -214,7 +214,7 @@ function consolidated_edit_acl($aco_section_value, $aco_value, $aro_section_valu
 		}
 
 		//showarray($acl_ids);
-		$acl_ids_count = count($acl_ids);
+		$acl_ids_count = phpgacl_legacy_count($acl_ids);
 
 		//If acl_id's turns up more then one ACL, lets remove the ARO from all of them in hopes to
 		//eliminate any conflicts.
@@ -237,7 +237,7 @@ function consolidated_edit_acl($aco_section_value, $aco_value, $aro_section_valu
 
 		//At this point there should be no conflicting ACLs, searching for an existing ACL with the new values.
 		$new_acl_ids = $this->search_acl($aco_section_value, $aco_value, FALSE, FALSE, NULL, NULL, NULL, NULL, $return_value);
-		$new_acl_count = count($new_acl_ids);
+		$new_acl_count = phpgacl_legacy_count($new_acl_ids);
 		//showarray($new_acl_ids);
 
 		if (is_array($new_acl_ids)) {
@@ -258,7 +258,7 @@ function consolidated_edit_acl($aco_section_value, $aco_value, $aro_section_valu
 		}
 
 		//showarray($acl_ids);
-		$acl_ids_count = count($acl_ids);
+		$acl_ids_count = phpgacl_legacy_count($acl_ids);
 
 		if (is_array($acl_ids) AND $acl_ids_count == 1) {
 			$this->debug_text("add_consolidated_acl(): Appending specified ARO to existing ACL.");
@@ -398,7 +398,7 @@ function search_acl($aco_section_value=NULL, $aco_value=NULL, $aro_section_value
 			}
 		}
 
-		if (count($where_query) > 0) {
+		if (phpgacl_legacy_count($where_query) > 0) {
 			$query .= '
 				WHERE		'. implode (' AND ', $where_query);
 		}
@@ -434,12 +434,12 @@ function append_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NU
 		$acl_array = &$this->get_acl($acl_id);
 
 		//Append each object type seperately.
-		if (is_array($aro_array) AND count($aro_array) > 0) {
+		if (is_array($aro_array) AND phpgacl_legacy_count($aro_array) > 0) {
 			$this->debug_text("append_acl(): Appending ARO's");
 
-			while (list($aro_section_value,$aro_value_array) = @each($aro_array)) {
+			foreach($aro_array as $aro_section_value=>$aro_value_array) {
 				foreach ($aro_value_array as $aro_value) {
-					if ( count($acl_array['aro'][$aro_section_value]) != 0 ) {
+					if ( phpgacl_legacy_count($acl_array['aro'][$aro_section_value]) != 0 ) {
 						if (!in_array($aro_value, $acl_array['aro'][$aro_section_value])) {
 							$this->debug_text("append_acl(): ARO Section Value: $aro_section_value ARO VALUE: $aro_value");
 							$acl_array['aro'][$aro_section_value][] = $aro_value;
@@ -455,10 +455,10 @@ function append_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NU
 			}
 		}
 
-		if (is_array($aro_group_ids) AND count($aro_group_ids) > 0) {
+		if (is_array($aro_group_ids) AND phpgacl_legacy_count($aro_group_ids) > 0) {
 			$this->debug_text("append_acl(): Appending ARO_GROUP_ID's");
 
-			while (list(,$aro_group_id) = @each($aro_group_ids)) {
+			foreach($aro_group_ids as $aro_group_id) {
 				if (!is_array($acl_array['aro_groups']) OR !in_array($aro_group_id, $acl_array['aro_groups'])) {
 					$this->debug_text("append_acl(): ARO Group ID: $aro_group_id");
 					$acl_array['aro_groups'][] = $aro_group_id;
@@ -469,10 +469,10 @@ function append_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NU
 			}
 		}
 
-		if (is_array($axo_array) AND count($axo_array) > 0) {
+		if (is_array($axo_array) AND phpgacl_legacy_count($axo_array) > 0) {
 			$this->debug_text("append_acl(): Appending AXO's");
 
-			while (list($axo_section_value,$axo_value_array) = @each($axo_array)) {
+			foreach($axo_array as $axo_section_value=>$axo_value_array) {
 				foreach ($axo_value_array as $axo_value) {
 					if (!in_array($axo_value, $acl_array['axo'][$axo_section_value])) {
 						$this->debug_text("append_acl(): AXO Section Value: $axo_section_value AXO VALUE: $axo_value");
@@ -486,9 +486,9 @@ function append_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NU
 			}
 		}
 
-		if (is_array($axo_group_ids) AND count($axo_group_ids) > 0) {
+		if (is_array($axo_group_ids) AND phpgacl_legacy_count($axo_group_ids) > 0) {
 			$this->debug_text("append_acl(): Appending AXO_GROUP_ID's");
-			while (list(,$axo_group_id) = @each($axo_group_ids)) {
+			foreach($axo_group_ids as $axo_group_id) {
 				if (!is_array($acl_array['axo_groups']) OR !in_array($axo_group_id, $acl_array['axo_groups'])) {
 					$this->debug_text("append_acl(): AXO Group ID: $axo_group_id");
 					$acl_array['axo_groups'][] = $axo_group_id;
@@ -499,10 +499,10 @@ function append_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NU
 			}
 		}
 
-		if (is_array($aco_array) AND count($aco_array) > 0) {
+		if (is_array($aco_array) AND phpgacl_legacy_count($aco_array) > 0) {
 			$this->debug_text("append_acl(): Appending ACO's");
 
-			while (list($aco_section_value,$aco_value_array) = @each($aco_array)) {
+			foreach($aco_array as $aco_section_value=>$aco_value_array) {
 				foreach ($aco_value_array as $aco_value) {
 					if (!in_array($aco_value, $acl_array['aco'][$aco_section_value])) {
 						$this->debug_text("append_acl(): ACO Section Value: $aco_section_value ACO VALUE: $aco_value");
@@ -555,15 +555,15 @@ function shift_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NUL
 
 		//showarray($acl_array);
 		//Remove each object type seperately.
-		if (is_array($aro_array) AND count($aro_array) > 0) {
+		if (is_array($aro_array) AND phpgacl_legacy_count($aro_array) > 0) {
 			$this->debug_text("shift_acl(): Removing ARO's");
 
-			while (list($aro_section_value,$aro_value_array) = @each($aro_array)) {
+			foreach($aro_array as $aro_section_value=>$aro_value_array) {
 				foreach ($aro_value_array as $aro_value) {
 					$this->debug_text("shift_acl(): ARO Section Value: $aro_section_value ARO VALUE: $aro_value");
 
 					//Only search if aro array contains data.
-					if ( count($acl_array['aro'][$aro_section_value]) != 0 ) {
+					if ( phpgacl_legacy_count($acl_array['aro'][$aro_section_value]) != 0 ) {
 						$aro_key = array_search($aro_value, $acl_array['aro'][$aro_section_value]);
 
 						if ($aro_key !== FALSE) {
@@ -579,10 +579,10 @@ function shift_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NUL
 			}
 		}
 
-		if (is_array($aro_group_ids) AND count($aro_group_ids) > 0) {
+		if (is_array($aro_group_ids) AND phpgacl_legacy_count($aro_group_ids) > 0) {
 			$this->debug_text("shift_acl(): Removing ARO_GROUP_ID's");
 
-			while (list(,$aro_group_id) = @each($aro_group_ids)) {
+			foreach($aro_group_ids as $aro_group_id) {
 				$this->debug_text("shift_acl(): ARO Group ID: $aro_group_id");
 				$aro_group_key = array_search($aro_group_id, $acl_array['aro_groups']);
 
@@ -596,10 +596,10 @@ function shift_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NUL
 			}
 		}
 
-		if (is_array($axo_array) AND count($axo_array) > 0) {
+		if (is_array($axo_array) AND phpgacl_legacy_count($axo_array) > 0) {
 			$this->debug_text("shift_acl(): Removing AXO's");
 
-			while (list($axo_section_value,$axo_value_array) = @each($axo_array)) {
+			foreach($axo_array as $axo_section_value=>$axo_value_array) {
 				foreach ($axo_value_array as $axo_value) {
 					$this->debug_text("shift_acl(): AXO Section Value: $axo_section_value AXO VALUE: $axo_value");
 					$axo_key = array_search($axo_value, $acl_array['axo'][$axo_section_value]);
@@ -615,10 +615,10 @@ function shift_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NUL
 			}
 		}
 
-		if (is_array($axo_group_ids) AND count($axo_group_ids) > 0) {
+		if (is_array($axo_group_ids) AND phpgacl_legacy_count($axo_group_ids) > 0) {
 			$this->debug_text("shift_acl(): Removing AXO_GROUP_ID's");
 
-			while (list(,$axo_group_id) = @each($axo_group_ids)) {
+			foreach($axo_group_ids as $axo_group_id) {
 				$this->debug_text("shift_acl(): AXO Group ID: $axo_group_id");
 				$axo_group_key = array_search($axo_group_id, $acl_array['axo_groups']);
 
@@ -632,10 +632,10 @@ function shift_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NUL
 			}
 		}
 
-		if (is_array($aco_array) AND count($aco_array) > 0) {
+		if (is_array($aco_array) AND phpgacl_legacy_count($aco_array) > 0) {
 			$this->debug_text("shift_acl(): Removing ACO's");
 
-			while (list($aco_section_value,$aco_value_array) = @each($aco_array)) {
+			foreach($aco_array as $aco_section_value=>$aco_value_array) {
 				foreach ($aco_value_array as $aco_value) {
 					$this->debug_text("shift_acl(): ACO Section Value: $aco_section_value ACO VALUE: $aco_value");
 					$aco_key = array_search($aco_value, $acl_array['aco'][$aco_section_value]);
@@ -659,8 +659,8 @@ function shift_acl($acl_id, $aro_array=NULL, $aro_group_ids=NULL, $axo_array=NUL
 			if ( $this->count_all($acl_array['aco']) == 0
 					OR ( $this->count_all($acl_array['aro']) == 0
 						AND ( $this->count_all($acl_array['axo']) == 0 OR $acl_array['axo'] == FALSE)
-						AND (count($acl_array['aro_groups']) == 0 OR $acl_array['aro_groups'] == FALSE)
-						AND (count($acl_array['axo_groups']) == 0 OR $acl_array['axo_groups'] == FALSE)
+						AND (phpgacl_legacy_count($acl_array['aro_groups']) == 0 OR $acl_array['aro_groups'] == FALSE)
+						AND (phpgacl_legacy_count($acl_array['axo_groups']) == 0 OR $acl_array['axo_groups'] == FALSE)
 						) ) {
 				$this->debug_text("shift_acl(): No ACOs or ( AROs AND AXOs AND ARO Groups AND AXO Groups) left assigned to this ACL (ID: $acl_id), deleting ACL.");
 
@@ -725,7 +725,7 @@ function get_acl($acl_id) {
 		$rows = $rs->GetRows();
 
 		$retarr['aco'] = array();
-		while (list(,$row) = @each($rows)) {
+		foreach($rows as $row) {
 			list($section_value, $value, $section, $aco) = $row;
 			$this->debug_text("Section Value: $section_value Value: $value Section: $section ACO: $aco");
 
@@ -741,7 +741,7 @@ function get_acl($acl_id) {
 		$rows = $rs->GetRows();
 
 		$retarr['aro'] = array();
-		while (list(,$row) = @each($rows)) {
+		foreach($rows as $row) {
 			list($section_value, $value, $section, $aro) = $row;
 			$this->debug_text("Section Value: $section_value Value: $value Section: $section ARO: $aro");
 
@@ -757,7 +757,7 @@ function get_acl($acl_id) {
 		$rows = $rs->GetRows();
 
 		$retarr['axo'] = array();
-		while (list(,$row) = @each($rows)) {
+		foreach($rows as $row) {
 			list($section_value, $value, $section, $axo) = $row;
 			$this->debug_text("Section Value: $section_value Value: $value Section: $section AXO: $axo");
 
@@ -853,7 +853,7 @@ function is_conflicting_acl($aco_array, $aro_array, $aro_group_ids=NULL, $axo_ar
 				//$where_query['ar1'] = 'ar.acl_id=a.id';
 				$where_query['ar2'] = '(ar.section_value='. $this->db->quote($aro_section_value) .' AND ar.value IN (\''. implode ('\',\'', $aro_value_array) .'\'))';
 
-				if (is_array($axo_array) AND count($axo_array) > 0) {
+				if (is_array($axo_array) AND phpgacl_legacy_count($axo_array) > 0) {
 					foreach ($axo_array as $axo_section_value => $axo_value_array) {
 						$this->debug_text("is_conflicting_acl(): AXO Section Value: $axo_section_value AXO VALUE: $axo_value_array");
 
@@ -880,7 +880,7 @@ function is_conflicting_acl($aco_array, $aro_array, $aro_group_ids=NULL, $axo_ar
 								$conflict_result = array_diff($conflict_result, $ignore_acl_ids);
 							}
 
-							if (count($conflict_result) > 0) {
+							if (phpgacl_legacy_count($conflict_result) > 0) {
 								$conflicting_acls_str = implode(',', $conflict_result);
 								$this->debug_text("is_conflicting_acl(): Conflict FOUND!!! ACL_IDS: ($conflicting_acls_str)");
 								return TRUE;
@@ -902,7 +902,7 @@ function is_conflicting_acl($aco_array, $aro_array, $aro_group_ids=NULL, $axo_ar
 							$conflict_result = array_diff($conflict_result, $ignore_acl_ids);
 						}
 
-						if (count($conflict_result) > 0) {
+						if (phpgacl_legacy_count($conflict_result) > 0) {
 							$conflicting_acls_str = implode(',', $conflict_result);
 							$this->debug_text("is_conflicting_acl(): Conflict FOUND!!! ACL_IDS: ($conflicting_acls_str)");
 							return TRUE;
@@ -940,12 +940,12 @@ function add_acl($aco_array, $aro_array, $aro_group_ids=NULL, $axo_array=NULL, $
 
 		$this->debug_text("add_acl():");
 
-		if (count($aco_array) == 0) {
+		if (phpgacl_legacy_count($aco_array) == 0) {
 			$this->debug_text("Must select at least one Access Control Object");
 			return false;
 		}
 
-		if (count($aro_array) == 0 AND count($aro_group_ids) == 0) {
+		if (phpgacl_legacy_count($aro_array) == 0 AND phpgacl_legacy_count($aro_group_ids) == 0) {
 			$this->debug_text("Must select at least one Access Request Object or Group");
 			return false;
 		}
@@ -1176,12 +1176,12 @@ function edit_acl($acl_id, $aco_array, $aro_array, $aro_group_ids=NULL, $axo_arr
 			$this->debug_text("edit_acl(): Must specify a single ACL_ID to edit");
 			return false;
 		}
-		if (count($aco_array) == 0) {
+		if (phpgacl_legacy_count($aco_array) == 0) {
 			$this->debug_text("edit_acl(): Must select at least one Access Control Object");
 			return false;
 		}
 
-		if (count($aro_array) == 0 AND count($aro_group_ids) == 0) {
+		if (phpgacl_legacy_count($aro_array) == 0 AND phpgacl_legacy_count($aro_group_ids) == 0) {
 			$this->debug_text("edit_acl(): Must select at least one Access Request Object or Group");
 			return false;
 		}
@@ -1334,7 +1334,7 @@ function format_groups($sorted_groups, $type='TEXT', $root_id=0, $level=0, $form
 
 		//$this->showarray($formatted_groups);
 
-		//while (list($id,$name) = @each($sorted_groups[$root_id])) {
+		//foreach($sorted_groups[$root_id] as $id=>$name) {
 		if (isset($sorted_groups[$root_id])) {
 			//$last_id = end( array_keys($sorted_groups[$root_id]));
 			//PHP5 compatibility
@@ -1389,7 +1389,7 @@ function format_groups($sorted_groups, $type='TEXT', $root_id=0, $level=0, $form
 				 * Recurse if we can.
 				 */
 
-				//if (isset($sorted_groups[$id]) AND count($sorted_groups[$id]) > 0) {
+				//if (isset($sorted_groups[$id]) AND phpgacl_legacy_count($sorted_groups[$id]) > 0) {
 				if (isset($sorted_groups[$id]) ) {
 					//$this->debug_text("format_groups(): Recursing! Level: $level");
 					$formatted_groups = $this->format_groups($sorted_groups, $type, $id, $next, $formatted_groups);
@@ -2354,7 +2354,7 @@ function del_group($group_id, $reparent_children=TRUE, $group_type='ARO') {
 		switch (TRUE) {
 			// there are no child groups, just delete group
 			case !is_array($children_ids):
-			case count($children_ids) == 0:
+			case phpgacl_legacy_count($children_ids) == 0:
 				// remove acl maps
 				$query = 'DELETE FROM '. $groups_map_table .' WHERE group_id='. $group_id;
 				$rs = $this->db->Execute($query);
@@ -3313,7 +3313,7 @@ function del_object($object_id, $object_type=NULL, $erase=FALSE) {
 
 					// Get rid of $object_id map referencing erased objects
 					$query = "DELETE FROM $object_map_table WHERE section_value='$section_value' AND value='$value'";
-					$rs = $this->db->Execute($query);
+					$this->db->Execute($query);
 
 					if (!is_object($rs)) {
 						$this->debug_db('edit_object');
@@ -3381,7 +3381,7 @@ function del_object($object_id, $object_type=NULL, $erase=FALSE) {
 		if ( ( isset($acl_ids) AND !empty($acl_ids) ) OR ( isset($groups_ids) AND !empty($groups_ids) ) ) {
 			// The Object is referenced somewhere (group or acl), can't delete it
 
-			$this->debug_text("del_object(): Can't delete the object as it is being referenced by GROUPs (".@implode($groups_ids).") or ACLs (".@implode($acl_ids,",").")");
+			$this->debug_text("del_object(): Can't delete the object as it is being referenced by GROUPs (".@implode($groups_ids).") or ACLs (".@implode(",", $acl_ids).")");
 			$this->db->RollBackTrans();
 			return false;
 		} else {
@@ -3838,7 +3838,7 @@ function get_section_data($section_value, $object_type=NULL) {
 			return false;
 		}
 
-		$query = 'SELECT id, value, order_value, name, hidden FROM '. $table .' WHERE value = \''. $section_value .'\'';
+		$query = "SELECT id, value, order_value, name, hidden FROM '. $table .' WHERE value='$section_value'";
 		$row = $this->db->GetRow($query);
 
 		if ($row) {
diff --git a/profiler.inc b/profiler.inc
index a9c9032..8e13d46 100644
--- a/profiler.inc
+++ b/profiler.inc
@@ -132,7 +132,7 @@ class Profiler {
             echo"============================================================================\n";
             print( "Calls                    Time  Routine\n");
             echo"-----------------------------------------------------------------------------\n";
-            while (list ($key, $val) = each ($this->description)) {
+            foreach($this->description as $key=>$val) {
                 $t = $this->elapsedTime($key);
                 $total = $this->running[$key];
                 $count = $this->count[$key];
@@ -177,7 +177,7 @@ class Profiler {
     *
     */
     function getMicroTime(){
-        $tmp=split(" ",microtime());
+        $tmp=explode(" ",microtime());
         $rt=$tmp[0]+$tmp[1];
         return $rt;
     }
diff --git a/soap/nusoap.php b/soap/nusoap.php
index d75ca8e..b543626 100644
--- a/soap/nusoap.php
+++ b/soap/nusoap.php
@@ -1402,7 +1402,7 @@ function send($data, $timeout=0) {
 		if($this->encoding != '' && function_exists('gzdeflate')){
 			$this->outgoing_payload .= "Accept-Encoding: $this->encoding\r\n".
 			"Connection: close\r\n";
-			set_magic_quotes_runtime(0);
+			 if(function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0);
 		}
 		// set soapaction
 		if($this->useSOAPAction){
@@ -1568,7 +1568,7 @@ function sendHTTPS($data, $timeout=0) {
 			if(function_exists('gzdeflate')){
 				$encoding_headers = "Accept-Encoding: $this->encoding\r\n".
 				"Connection: close\r\n";
-				set_magic_quotes_runtime(0);
+				 if(function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0);
 			}
 		}
 		
@@ -3694,7 +3694,7 @@ function soapclient($endpoint,$wsdl = false){
 			
 			// instantiate wsdl object and parse wsdl file
 			$this->debug('instantiating wsdl class with doc: '.$endpoint);
-			$this->wsdl =& new wsdl($this->wsdlFile,$this->proxyhost,$this->proxyport);
+			$this->wsdl = new wsdl($this->wsdlFile,$this->proxyhost,$this->proxyport);
 			$this->debug("wsdl debug: \n".$this->wsdl->debug_str);
 			$this->wsdl->debug_str = '';
 			// catch errors
diff --git a/soap/server.php b/soap/server.php
index bfe131c..e8eff87 100644
--- a/soap/server.php
+++ b/soap/server.php
@@ -29,5 +29,8 @@ function test($text) {
 	return $text;
 }
 
+if ( !isset( $HTTP_RAW_POST_DATA ) ){
+	// TODO: , php://input should be used instead of $HTTP_RAW_POST_DATA
+	$HTTP_RAW_POST_DATA =file_get_contents( 'php://input' );
+}
 $s->service($HTTP_RAW_POST_DATA);
-?>
diff --git a/test_suite/phpunit/phpunit.php b/test_suite/phpunit/phpunit.php
index d21bb74..b337d11 100644
--- a/test_suite/phpunit/phpunit.php
+++ b/test_suite/phpunit/phpunit.php
@@ -5,7 +5,7 @@
 // Written by Fred Yankowski 
 //            OntoSys, Inc  
 //
-// $Id$
+// $Id: phpunit.php 212 2003-10-07 02:12:56Z ipso $
 
 // Copyright (c) 2000 Fred Yankowski
 
@@ -118,8 +118,8 @@ function assertRegexp($regexp, $actual, $message=false) {
 
   function assertEqualsMultilineStrings($string0, $string1,
   $message="") {
-    $lines0 = split("\n",$string0);
-    $lines1 = split("\n",$string1);
+    $lines0 = explode("\n",$string0);
+    $lines1 = explode("\n",$string1);
     if (sizeof($lines0) != sizeof($lines1)) {
       $this->failNotEquals(sizeof($lines0)." line(s)",
                            sizeof($lines1)." line(s)", "expected", $message);
@@ -201,7 +201,7 @@ function run($testResult=0) {
     if (! $testResult)
       $testResult = $this->_createResult();
     $this->fResult = $testResult;
-    $testResult->run(&$this);
+    $testResult->run($this);
     $this->fResult = 0;
     return $testResult;
   }
@@ -264,19 +264,19 @@ function fail($message=0) {
     //printf("TestCase::fail(%s)
\n", ($message) ? $message : '');
     /* JUnit throws AssertionFailedError here.  We just record the
        failure and carry on */
-    $this->fExceptions[] = new Exception(&$message, 'FAILURE');
+    $this->fExceptions[] = new Exception($message, 'FAILURE');
   }
 
   function error($message) {
     /* report error that requires correction in the test script
        itself, or (heaven forbid) in this testing infrastructure */
-    $this->fExceptions[] = new Exception(&$message, 'ERROR');
+    $this->fExceptions[] = new Exception($message, 'ERROR');
     $this->fResult->stop();	// [does not work]
   }
 
   function failed() {
       reset($this->fExceptions);
-      while (list($key, $exception) = each($this->fExceptions)) {
+      foreach($this->fExceptions as $key=>$exception) {
 	  if ($exception->type == 'FAILURE')
 	      return true;
       }
@@ -284,7 +284,7 @@ function failed() {
   }
   function errored() {
       reset($this->fExceptions);
-      while (list($key, $exception) = each($this->fExceptions)) {
+      foreach($this->fExceptions as $key=>$exception) {
 	  if ($exception->type == 'ERROR')
 	      return true;
       }
@@ -337,7 +337,7 @@ function TestSuite($classname=false) {
       // PHP4 introspection, submitted by Dylan Kuhn
 
       $names = get_class_methods($classname);
-      while (list($key, $method) = @each($names)) {
+      foreach($names as $key=>$method) {
         if (preg_match('/^test/', $method)) {
           $test = new $classname($method);
           if (strcasecmp($method, $classname) == 0 || is_subclass_of($test, $method)) {
@@ -357,7 +357,7 @@ function TestSuite($classname=false) {
     else {  // PHP3
       $dummy = new $classname("dummy");
       $names = (array) $dummy;
-      while (list($key, $value) = each($names)) {
+      foreach($names as $key=>$value) {
         $type = gettype($value);
         if ($type == "user function" && preg_match('/^test/', $key)
         && $key != "testcase") {  
@@ -376,10 +376,10 @@ function run(&$testResult) {
     /* Run all TestCases and TestSuites comprising this TestSuite,
        accumulating results in the given TestResult object. */
     reset($this->fTests);
-    while (list($na, $test) = each($this->fTests)) {
+    foreach($this->fTests as $na=>$test) {
       if ($testResult->shouldStop())
 	break;
-      $test->run(&$testResult);
+      $test->run($testResult);
     }
   }
 
@@ -388,7 +388,7 @@ function countTestCases() {
        in any constituent TestSuites) */
     $count = 0;
     reset($fTests);
-    while (list($na, $test_case) = each($this->fTests)) {
+    foreach($this->fTests as $na=>$test_case) {
       $count += $test_case->countTestCases();
     }
     return $count;
@@ -436,11 +436,11 @@ function _endTest($test) /* protected */ {
   }
 
   function addError($test, $exception) {
-      $this->fErrors[] = new TestFailure(&$test, &$exception);
+      $this->fErrors[] = new TestFailure($test, $exception);
   }
 
   function addFailure($test, $exception) {
-      $this->fFailures[] = new TestFailure(&$test, &$exception);
+      $this->fFailures[] = new TestFailure($test, $exception);
   }
 
   function getFailures() {
@@ -457,7 +457,7 @@ function run($test) {
     /* this is where JUnit would catch AssertionFailedError */
     $exceptions = $test->getExceptions();
     reset($exceptions);
-    while (list($key, $exception) = each($exceptions)) {
+    foreach($exceptions as $key=>$exception) {
 	if ($exception->type == 'ERROR')
 	    $this->addError($test, $exception);
 	else if ($exception->type == 'FAILURE')
@@ -517,13 +517,13 @@ function report() {
 	print("
Failures
");
 	print("
    \n");
 	$failures = $this->getFailures();
-	while (list($i, $failure) = each($failures)) {
+	foreach($failures as $i=>$failure) {
 	    $failedTestName = $failure->getTestName();
 	    printf("
  1. %s\n", $failedTestName);
 
 	    $exceptions = $failure->getExceptions();
 	    print("
      ");
-	    while (list($na, $exception) = each($exceptions))
+	    foreach($exceptions as $na=>$exception)
 		printf("
    • %s\n", $exception->getMessage());
 	    print("
    ");
 	}
@@ -534,7 +534,7 @@ function report() {
 	print("
    Errors
    ");
 	print("
      \n");
 	reset($this->fErrors);
-	while (list($i, $error) = each($this->fErrors)) {
+	foreach($this->fErrors as $i=>$error) {
 	    $erroredTestName = $error->getTestName();
 	    printf("
    1. %s\n", $failedTestName);
 
@@ -594,13 +594,13 @@ function report() {
 	echo "
      Failure Details
      ";
     print("
        \n");
     $failures = $this->getFailures();
-    while (list($i, $failure) = each($failures)) {
+    foreach($failures as $i=>$failure) {
       $failedTestName = $failure->getTestName();
       printf("
      1. %s\n", $failedTestName);
 
       $exceptions = $failure->getExceptions();
       print("
          ");
-      while (list($na, $exception) = each($exceptions))
+      foreach($exceptions as $na=>$exception)
 	printf("
        • %s\n", $exception->getMessage());
       print("
        ");
     }