From 9ab4fc9d1314599ecc29fc07d1d57dc55b6d00c2 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Tue, 9 May 2017 12:34:19 +0530
Subject: [PATCH] Adodb library updated to 5.20
---
libraries/adodb/LICENSE.md | 496 ++
libraries/adodb/README.md | 109 +
libraries/adodb/adodb-active-record.inc.php | 955 +++-
libraries/adodb/adodb-active-recordx.inc.php | 1497 ++++++
libraries/adodb/adodb-csvlib.inc.php | 135 +-
libraries/adodb/adodb-datadict.inc.php | 583 +-
libraries/adodb/adodb-error.inc.php | 89 +-
libraries/adodb/adodb-errorhandler.inc.php | 9 +-
libraries/adodb/adodb-errorpear.inc.php | 38 +-
libraries/adodb/adodb-exceptions.inc.php | 27 +-
libraries/adodb/adodb-iterator.inc.php | 83 +-
libraries/adodb/adodb-lib.inc.php | 681 ++-
libraries/adodb/adodb-memcache.lib.inc.php | 190 +
libraries/adodb/adodb-pager.inc.php | 131 +-
libraries/adodb/adodb-pear.inc.php | 48 +-
libraries/adodb/adodb-perf.inc.php | 513 +-
libraries/adodb/adodb-php4.inc.php | 12 +-
libraries/adodb/adodb-time.inc.php | 705 ++-
libraries/adodb/adodb-xmlschema.inc.php | 737 ++-
libraries/adodb/adodb-xmlschema03.inc.php | 749 +--
libraries/adodb/adodb.inc.php | 4738 ++++++++++-------
libraries/adodb/composer.json | 37 +
libraries/adodb/contrib/toxmlrpc.inc.php | 84 +-
libraries/adodb/cute_icons_for_site/adodb.gif | Bin 0 -> 1091 bytes
.../adodb/cute_icons_for_site/adodb2.gif | Bin 0 -> 1458 bytes
.../adodb/datadict/datadict-access.inc.php | 54 +-
libraries/adodb/datadict/datadict-db2.inc.php | 66 +-
.../adodb/datadict/datadict-firebird.inc.php | 72 +-
.../adodb/datadict/datadict-generic.inc.php | 66 +-
.../adodb/datadict/datadict-ibase.inc.php | 44 +-
.../adodb/datadict/datadict-informix.inc.php | 49 +-
.../adodb/datadict/datadict-mssql.inc.php | 221 +-
.../datadict/datadict-mssqlnative.inc.php | 369 ++
.../adodb/datadict/datadict-mysql.inc.php | 88 +-
.../adodb/datadict/datadict-oci8.inc.php | 154 +-
.../adodb/datadict/datadict-postgres.inc.php | 223 +-
.../adodb/datadict/datadict-sapdb.inc.php | 47 +-
.../adodb/datadict/datadict-sqlite.inc.php | 90 +
.../adodb/datadict/datadict-sybase.inc.php | 188 +-
libraries/adodb/docs/README.md | 17 +
libraries/adodb/docs/adodb.gif | Bin 0 -> 1091 bytes
libraries/adodb/docs/adodb2.gif | Bin 0 -> 1458 bytes
libraries/adodb/docs/changelog.md | 491 ++
libraries/adodb/docs/changelog_v2.x.md | 531 ++
libraries/adodb/docs/changelog_v3.x.md | 242 +
libraries/adodb/docs/changelog_v4+5.md | 109 +
libraries/adodb/docs/changelog_v4.x.md | 722 +++
libraries/adodb/drivers/adodb-access.inc.php | 64 +-
libraries/adodb/drivers/adodb-ado.inc.php | 266 +-
libraries/adodb/drivers/adodb-ado5.inc.php | 308 +-
.../adodb/drivers/adodb-ado_access.inc.php | 50 +-
.../adodb/drivers/adodb-ado_mssql.inc.php | 87 +-
libraries/adodb/drivers/adodb-ads.inc.php | 784 +++
.../adodb/drivers/adodb-borland_ibase.inc.php | 62 +-
libraries/adodb/drivers/adodb-csv.inc.php | 112 +-
libraries/adodb/drivers/adodb-db2.inc.php | 513 +-
libraries/adodb/drivers/adodb-db2oci.inc.php | 226 +
libraries/adodb/drivers/adodb-db2ora.inc.php | 86 +
libraries/adodb/drivers/adodb-fbsql.inc.php | 149 +-
.../adodb/drivers/adodb-firebird.inc.php | 66 +-
libraries/adodb/drivers/adodb-ibase.inc.php | 683 +--
.../adodb/drivers/adodb-informix.inc.php | 13 +-
.../adodb/drivers/adodb-informix72.inc.php | 134 +-
libraries/adodb/drivers/adodb-ldap.inc.php | 520 +-
libraries/adodb/drivers/adodb-mssql.inc.php | 659 ++-
libraries/adodb/drivers/adodb-mssql_n.inc.php | 249 +
.../adodb/drivers/adodb-mssqlnative.inc.php | 1197 +++++
libraries/adodb/drivers/adodb-mssqlpo.inc.php | 24 +-
libraries/adodb/drivers/adodb-mysql.inc.php | 674 ++-
libraries/adodb/drivers/adodb-mysqli.inc.php | 1211 +++--
libraries/adodb/drivers/adodb-mysqlpo.inc.php | 128 +
libraries/adodb/drivers/adodb-mysqlt.inc.php | 106 +-
libraries/adodb/drivers/adodb-netezza.inc.php | 87 +-
libraries/adodb/drivers/adodb-oci8.inc.php | 1847 ++++---
libraries/adodb/drivers/adodb-oci805.inc.php | 40 +-
libraries/adodb/drivers/adodb-oci8po.inc.php | 192 +-
.../adodb/drivers/adodb-oci8quercus.inc.php | 89 +
libraries/adodb/drivers/adodb-odbc.inc.php | 326 +-
.../adodb/drivers/adodb-odbc_db2.inc.php | 151 +-
.../adodb/drivers/adodb-odbc_mssql.inc.php | 252 +-
.../adodb/drivers/adodb-odbc_oracle.inc.php | 74 +-
libraries/adodb/drivers/adodb-odbtp.inc.php | 198 +-
.../adodb/drivers/adodb-odbtp_unicode.inc.php | 10 +-
libraries/adodb/drivers/adodb-oracle.inc.php | 117 +-
libraries/adodb/drivers/adodb-pdo.inc.php | 669 ++-
.../adodb/drivers/adodb-pdo_mssql.inc.php | 37 +-
.../adodb/drivers/adodb-pdo_mysql.inc.php | 269 +-
libraries/adodb/drivers/adodb-pdo_oci.inc.php | 48 +-
.../adodb/drivers/adodb-pdo_pgsql.inc.php | 123 +-
.../adodb/drivers/adodb-pdo_sqlite.inc.php | 204 +
.../adodb/drivers/adodb-pdo_sqlsrv.inc.php | 49 +
.../adodb/drivers/adodb-postgres.inc.php | 12 +-
.../adodb/drivers/adodb-postgres64.inc.php | 798 +--
.../adodb/drivers/adodb-postgres7.inc.php | 314 +-
.../adodb/drivers/adodb-postgres8.inc.php | 50 +-
.../adodb/drivers/adodb-postgres9.inc.php | 32 +
libraries/adodb/drivers/adodb-proxy.inc.php | 24 +-
libraries/adodb/drivers/adodb-sapdb.inc.php | 73 +-
.../adodb/drivers/adodb-sqlanywhere.inc.php | 30 +-
libraries/adodb/drivers/adodb-sqlite.inc.php | 381 +-
libraries/adodb/drivers/adodb-sqlite3.inc.php | 438 ++
.../adodb/drivers/adodb-sqlitepo.inc.php | 22 +-
libraries/adodb/drivers/adodb-sybase.inc.php | 387 +-
.../adodb/drivers/adodb-sybase_ase.inc.php | 51 +-
libraries/adodb/drivers/adodb-vfp.inc.php | 62 +-
libraries/adodb/lang/adodb-ar.inc.php | 56 +-
libraries/adodb/lang/adodb-bg.inc.php | 58 +-
libraries/adodb/lang/adodb-bgutf8.inc.php | 38 -
libraries/adodb/lang/adodb-ca.inc.php | 24 +-
libraries/adodb/lang/adodb-cn.inc.php | 56 +-
libraries/adodb/lang/adodb-cz.inc.php | 41 +-
libraries/adodb/lang/adodb-da.inc.php | 13 +-
libraries/adodb/lang/adodb-de.inc.php | 25 +-
libraries/adodb/lang/adodb-en.inc.php | 7 +-
...odb-esperanto.inc.php => adodb-eo.inc.php} | 11 +-
libraries/adodb/lang/adodb-es.inc.php | 1 -
libraries/adodb/lang/adodb-fa.inc.php | 34 +
libraries/adodb/lang/adodb-fr.inc.php | 27 +-
libraries/adodb/lang/adodb-hu.inc.php | 51 +-
libraries/adodb/lang/adodb-it.inc.php | 5 +-
libraries/adodb/lang/adodb-nl.inc.php | 1 -
libraries/adodb/lang/adodb-pl.inc.php | 38 +-
libraries/adodb/lang/adodb-pt-br.inc.php | 43 +-
libraries/adodb/lang/adodb-ro.inc.php | 2 -
libraries/adodb/lang/adodb-ru.inc.php | 34 +
libraries/adodb/lang/adodb-ru1251.inc.php | 35 -
libraries/adodb/lang/adodb-sv.inc.php | 25 +-
libraries/adodb/lang/adodb-th.inc.php | 32 +
libraries/adodb/lang/adodb-uk.inc.php | 34 +
libraries/adodb/lang/adodb-uk1251.inc.php | 35 -
libraries/adodb/pear/Auth/Container/ADOdb.php | 53 +-
libraries/adodb/pear/auth_adodb_example.php | 25 +
libraries/adodb/pear/readme.Auth.txt | 20 +
libraries/adodb/perf/perf-db2.inc.php | 52 +-
libraries/adodb/perf/perf-informix.inc.php | 39 +-
libraries/adodb/perf/perf-mssql.inc.php | 64 +-
libraries/adodb/perf/perf-mssqlnative.inc.php | 164 +
libraries/adodb/perf/perf-mysql.inc.php | 145 +-
libraries/adodb/perf/perf-oci8.inc.php | 456 +-
libraries/adodb/perf/perf-postgres.inc.php | 72 +-
libraries/adodb/pivottable.inc.php | 99 +-
libraries/adodb/rsfilter.inc.php | 35 +-
libraries/adodb/server.php | 48 +-
.../adodb/session/adodb-compress-bzip2.php | 10 +-
.../adodb/session/adodb-compress-gzip.php | 10 +-
.../adodb/session/adodb-cryptsession.php | 13 +-
.../adodb/session/adodb-cryptsession2.php | 27 +
.../adodb/session/adodb-encrypt-mcrypt.php | 10 +-
libraries/adodb/session/adodb-encrypt-md5.php | 12 +-
.../adodb/session/adodb-encrypt-secret.php | 8 +-
.../adodb/session/adodb-encrypt-sha1.php | 9 +-
libraries/adodb/session/adodb-sess.txt | 131 +
.../adodb/session/adodb-session-clob.php | 13 +-
.../adodb/session/adodb-session-clob2.php | 24 +
libraries/adodb/session/adodb-session.php | 194 +-
libraries/adodb/session/adodb-session2.php | 939 ++++
.../adodb/session/adodb-sessions.mysql.sql | 16 +
.../session/adodb-sessions.oracle.clob.sql | 15 +
.../adodb/session/adodb-sessions.oracle.sql | 16 +
libraries/adodb/session/crypt.inc.php | 4 -
.../adodb/session/old/adodb-cryptsession.php | 95 +-
.../adodb/session/old/adodb-session-clob.php | 142 +-
libraries/adodb/session/old/adodb-session.php | 164 +-
libraries/adodb/session/old/crypt.inc.php | 1 -
libraries/adodb/session/session_schema.xml | 26 +
libraries/adodb/session/session_schema2.xml | 38 +
libraries/adodb/toexport.inc.php | 43 +-
libraries/adodb/tohtml.inc.php | 76 +-
libraries/adodb/xmlschema.dtd | 39 +
libraries/adodb/xmlschema03.dtd | 43 +
libraries/adodb/xsl/convert-0.1-0.2.xsl | 70 +-
libraries/adodb/xsl/convert-0.1-0.3.xsl | 72 +-
libraries/adodb/xsl/convert-0.2-0.1.xsl | 72 +-
libraries/adodb/xsl/convert-0.2-0.3.xsl | 98 +-
libraries/adodb/xsl/remove-0.2.xsl | 20 +-
libraries/adodb/xsl/remove-0.3.xsl | 20 +-
176 files changed, 25504 insertions(+), 11280 deletions(-)
create mode 100644 libraries/adodb/LICENSE.md
create mode 100644 libraries/adodb/README.md
create mode 100644 libraries/adodb/adodb-active-recordx.inc.php
create mode 100644 libraries/adodb/adodb-memcache.lib.inc.php
create mode 100644 libraries/adodb/composer.json
create mode 100644 libraries/adodb/cute_icons_for_site/adodb.gif
create mode 100644 libraries/adodb/cute_icons_for_site/adodb2.gif
create mode 100644 libraries/adodb/datadict/datadict-mssqlnative.inc.php
create mode 100644 libraries/adodb/datadict/datadict-sqlite.inc.php
create mode 100644 libraries/adodb/docs/README.md
create mode 100644 libraries/adodb/docs/adodb.gif
create mode 100644 libraries/adodb/docs/adodb2.gif
create mode 100644 libraries/adodb/docs/changelog.md
create mode 100644 libraries/adodb/docs/changelog_v2.x.md
create mode 100644 libraries/adodb/docs/changelog_v3.x.md
create mode 100644 libraries/adodb/docs/changelog_v4+5.md
create mode 100644 libraries/adodb/docs/changelog_v4.x.md
create mode 100644 libraries/adodb/drivers/adodb-ads.inc.php
create mode 100644 libraries/adodb/drivers/adodb-db2oci.inc.php
create mode 100644 libraries/adodb/drivers/adodb-db2ora.inc.php
create mode 100644 libraries/adodb/drivers/adodb-mssql_n.inc.php
create mode 100644 libraries/adodb/drivers/adodb-mssqlnative.inc.php
create mode 100644 libraries/adodb/drivers/adodb-mysqlpo.inc.php
create mode 100644 libraries/adodb/drivers/adodb-oci8quercus.inc.php
create mode 100644 libraries/adodb/drivers/adodb-pdo_sqlite.inc.php
create mode 100644 libraries/adodb/drivers/adodb-pdo_sqlsrv.inc.php
create mode 100644 libraries/adodb/drivers/adodb-postgres9.inc.php
create mode 100644 libraries/adodb/drivers/adodb-sqlite3.inc.php
delete mode 100644 libraries/adodb/lang/adodb-bgutf8.inc.php
rename libraries/adodb/lang/{adodb-esperanto.inc.php => adodb-eo.inc.php} (85%)
create mode 100644 libraries/adodb/lang/adodb-fa.inc.php
create mode 100644 libraries/adodb/lang/adodb-ru.inc.php
delete mode 100644 libraries/adodb/lang/adodb-ru1251.inc.php
create mode 100644 libraries/adodb/lang/adodb-th.inc.php
create mode 100644 libraries/adodb/lang/adodb-uk.inc.php
delete mode 100644 libraries/adodb/lang/adodb-uk1251.inc.php
create mode 100644 libraries/adodb/pear/auth_adodb_example.php
create mode 100644 libraries/adodb/pear/readme.Auth.txt
create mode 100644 libraries/adodb/perf/perf-mssqlnative.inc.php
create mode 100644 libraries/adodb/session/adodb-cryptsession2.php
create mode 100644 libraries/adodb/session/adodb-sess.txt
create mode 100644 libraries/adodb/session/adodb-session-clob2.php
create mode 100644 libraries/adodb/session/adodb-session2.php
create mode 100644 libraries/adodb/session/adodb-sessions.mysql.sql
create mode 100644 libraries/adodb/session/adodb-sessions.oracle.clob.sql
create mode 100644 libraries/adodb/session/adodb-sessions.oracle.sql
create mode 100644 libraries/adodb/session/session_schema.xml
create mode 100644 libraries/adodb/session/session_schema2.xml
create mode 100644 libraries/adodb/xmlschema.dtd
create mode 100644 libraries/adodb/xmlschema03.dtd
diff --git a/libraries/adodb/LICENSE.md b/libraries/adodb/LICENSE.md
new file mode 100644
index 000000000..b8191587b
--- /dev/null
+++ b/libraries/adodb/LICENSE.md
@@ -0,0 +1,496 @@
+ADOdb License
+=============
+
+ADOdb is dual licensed under 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 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/libraries/adodb/README.md b/libraries/adodb/README.md
new file mode 100644
index 000000000..958cca56f
--- /dev/null
+++ b/libraries/adodb/README.md
@@ -0,0 +1,109 @@
+ADOdb Library for PHP5
+======================
+
+[](https://gitter.im/adodb/adodb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[](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
+
+Released under both [BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license)
+and [GNU Lesser GPL library 2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license)
+licenses.
+This means you can use it in proprietary products;
+see [License](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md) for details.
+
+Home page: http://adodb.org/
+
+> **WARNING: known issue with Associative Fetch Mode in ADOdb v5.19
+-- PLEASE UPGRADE TO v5.20 !**
+> When fetching data in Associative mode (i.e. when `$ADODB_FETCH_MODE` is
+> set to *ADODB_FETCH_ASSOC*), recordsets do not return any data (empty strings)
+> when using some database drivers. The problem has been reported on MSSQL,
+> Interbase and Foxpro, but possibly affects other drivers as well; all drivers
+> derived from the above are also impacted.
+> For further details, please refer to [Issue #20](https://github.com/ADOdb/ADOdb/issues/20).
+
+
+Introduction
+============
+
+PHP's database access functions are not standardized. This creates a
+need for a database class library to hide the differences between the
+different databases (encapsulate the differences) so we can easily
+switch databases.
+
+The library currently supports MySQL, Interbase, Sybase, PostgreSQL, Oracle,
+Microsoft SQL server, Foxpro ODBC, Access ODBC, Informix, DB2,
+Sybase SQL Anywhere, generic ODBC and Microsoft's ADO.
+
+We hope more people will contribute drivers to support other databases.
+
+
+Installation
+============
+
+Unpack all the files into a directory accessible by your web server.
+
+To test, try modifying some of the tutorial examples.
+Make sure you customize the connection settings correctly.
+
+You can debug using:
+
+``` php
+<?php
+include('adodb/adodb.inc.php');
+
+$db = ADONewConnection($driver); # eg. 'mysql' or 'oci8'
+$db->debug = true;
+$db->Connect($server, $user, $password, $database);
+$rs = $db->Execute('select * from some_small_table');
+print "<pre>";
+print_r($rs->GetRows());
+print "</pre>";
+```
+
+
+Documentation and Examples
+==========================
+
+Refer to the [ADOdb website](http://adodb.org/) for library documentation and examples. The documentation can also be [downloaded for offline viewing](https://sourceforge.net/projects/adodb/files/Documentation/).
+
+- [Main documentation](http://adodb.org/dokuwiki/doku.php?id=v5:userguide:userguide_index): Query, update and insert records using a portable API.
+- [Data dictionary](http://adodb.org/dokuwiki/doku.php?id=v5:dictionary:dictionary_index) describes how to create database tables and indexes in a portable manner.
+- [Database performance monitoring](http://adodb.org/dokuwiki/doku.php?id=v5:performance:performance_index) allows you to perform health checks, tune and monitor your database.
+- [Database-backed sessions](http://adodb.org/dokuwiki/doku.php?id=v5:session:session_index).
+
+There is also a [tutorial](http://adodb.org/dokuwiki/doku.php?id=v5:userguide:mysql_tutorial) that contrasts ADOdb code with PHP native MySQL code.
+
+
+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 old [ADOdb forums](http://phplens.com/lens/lensforum/topics.php?id=4) on phplens.com
+- the [SourceForge tickets section](http://sourceforge.net/p/adodb/_list/tickets)
+
+However, please note that they are not actively monitored and should
+only be used as reference.
diff --git a/libraries/adodb/adodb-active-record.inc.php b/libraries/adodb/adodb-active-record.inc.php
index 40e370896..a7f0adf7f 100644
--- a/libraries/adodb/adodb-active-record.inc.php
+++ b/libraries/adodb/adodb-active-record.inc.php
@@ -1,27 +1,34 @@
<?php
/*
-@version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Latest version is available at http://adodb.sourceforge.net
-
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Active Record implementation. Superset of Zend Framework's.
-
- Version 0.04
-
- See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
+
+ Version 0.92
+
+ See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
for info on Ruby on Rails Active Record implementation
*/
+
global $_ADODB_ACTIVE_DBS;
global $ADODB_ACTIVE_CACHESECS; // set to true to enable caching of metadata such as field info
+global $ACTIVE_RECORD_SAFETY; // set to false to disable safety checks
+global $ADODB_ACTIVE_DEFVALS; // use default values of table definition when creating new active record.
// array of ADODB_Active_DB's, indexed by ADODB_Active_Record->_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 +40,49 @@ 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
+// http://phplens.com/lens/lensforum/msgs.php?id=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;
+ if (PHP_VERSION >= 5) {
+ if ($d->db === $db) {
+ return $k;
+ }
+ } else {
+ if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) {
+ return $k;
+ }
+ }
}
-
+
$obj = new ADODB_Active_DB();
- $obj->db =& $db;
+ $obj->db = $db;
$obj->tables = array();
-
- $_ADODB_ACTIVE_DBS[] = $obj;
-
+
+ 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
+ static $_quoteNames = false;
+
+ 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,98 +90,333 @@ 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;
-
+
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_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) {
@@ -162,11 +425,22 @@ class ADODB_Active_Record {
}
$activetab = new ADODB_Active_Table();
$activetab->name = $table;
-
-
+
+ $save = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+ if ($db->fetchMode !== false) {
+ $savem = $db->SetFetchMode(false);
+ }
+
$cols = $db->MetaColumns($table);
+
+ if (isset($savem)) {
+ $db->SetFetchMode($savem);
+ }
+ $ADODB_FETCH_MODE = $save;
+
if (!$cols) {
- $this->Error("Invalid table name: $table",'UpdateActiveTable');
+ $this->Error("Invalid table name: $table",'UpdateActiveTable');
return false;
}
$fld = reset($cols);
@@ -174,186 +448,289 @@ class ADODB_Active_Record {
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:
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 1:
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;
+ $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] = ($name);
+ $keys[$name] = $cols[$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(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)) {
+ # <AP>
+ $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;
+ # </AP>
+ }
+ else
+ $keys = array_keys($row);
+
+ # <AP>
+ 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;
+
+ # </AP>
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) {
// this might not work reliably in multi-user environment
return $db->GetOne("select max(".$fieldname.") from ".$this->_table);
}
return $val;
}
-
+
// quote data in where clause
function doquote(&$db, $val,$t)
{
switch($t) {
+ case 'L':
+ if (strpos($db->databaseType,'postgres') !== false) {
+ return $db->qstr($val);
+ }
case 'D':
case '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;
}
@@ -362,13 +739,13 @@ class ADODB_Active_Record {
break;
}
}
-
+
// generate where clause for an UPDATE/SELECT
function GenWhere(&$db, &$table)
{
$keys = $table->keys;
$parr = array();
-
+
foreach($keys as $k) {
$f = $table->flds[$k];
if ($f) {
@@ -377,57 +754,131 @@ class ADODB_Active_Record {
}
return implode(' and ', $parr);
}
-
-
+
+
+ function _QName($n,$db=false)
+ {
+ if (!ADODB_Active_Record::$_quoteNames) {
+ return $n;
+ }
+ if (!$db) {
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
+ }
+ return $db->nameQuote.$n.$db->nameQuote;
+ }
+
//------------------------------------------------------------ Public functions below
-
- function Load($where,$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 = "select * from ".$this->_table;
+
+ if($where) {
+ $qry .= ' WHERE '.$where;
+ }
+ if ($lock) {
+ $qry .= $this->lockMode;
+ }
+
+ $row = $db->GetRow($qry,$bindarr);
+
+ if (isset($savem)) {
+ $db->SetFetchMode($savem);
+ }
+ $ADODB_FETCH_MODE = $save;
+
return $this->Set($row);
}
-
+
+ function LoadLocked($where=null, $bindarr=false)
+ {
+ $this->Load($where,$bindarr,true);
+ }
+
+ # useful for multiple record inserts
+ # see http://phplens.com/lens/lensforum/msgs.php?id=17795
+ function Reset()
+ {
+ $this->_where=null;
+ $this->_saved = false;
+ $this->_lasterr = false;
+ $this->_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)) {
- if (isset($fld->not_null) && $fld->not_null) {
- if (isset($fld->default_value) && strlen($fld->default_value)) continue;
- else $this->Error("Cannot insert null into $name","Insert");
- }
- }*/
-
- $valarr[] = $val;
- $names[] = $name;
- $valstr[] = $db->Param($cnt);
- $cnt += 1;
+ if(!is_array($val) || !is_null($val) || !array_key_exists($name, $table->keys)) {
+ $valarr[] = $val;
+ $names[] = $this->_QName($name,$db);
+ $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;
@@ -442,45 +893,58 @@ class ADODB_Active_Record {
$this->$k = $this->LastInsertID($db,$k);
}
}
-
+
$this->_original = $valarr;
return !empty($ok);
}
-
+
function Delete()
{
- $db =& $this->DB(); if (!$db) return false;
- $table =& $this->TableInfo();
-
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
+ $table = $this->TableInfo();
+
$where = $this->GenWhere($db,$table);
$sql = 'DELETE FROM '.$this->_table.' WHERE '.$where;
- $db->Execute($sql);
+ $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;
@@ -488,23 +952,32 @@ class ADODB_Active_Record {
}
}*/
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)
+
+ 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)
+ }
+ elseif ($ADODB_ASSOC_CASE == 1) {
+ foreach($pkey as $k => $v) {
$pkey[$k] = strtoupper($v);
-
+ }
+ }
+
$ok = $db->Replace($this->_table,$arr,$pkey);
if ($ok) {
$this->_saved = true; // 1= update 2=insert
@@ -521,25 +994,28 @@ class ADODB_Active_Record {
$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;
@@ -548,48 +1024,119 @@ class ADODB_Active_Record {
$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 ( $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->_QName($name,$db).'='.$db->Param($cnt);
$cnt += 1;
}
-
-
- if (!$cnt) return -1;
+
+
+ if (!$cnt) {
+ return -1;
+ }
+
$sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$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);
}
-
+
};
-?>
\ 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 developpers.
+ $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/libraries/adodb/adodb-active-recordx.inc.php b/libraries/adodb/adodb-active-recordx.inc.php
new file mode 100644
index 000000000..7f553f1e0
--- /dev/null
+++ b/libraries/adodb/adodb-active-recordx.inc.php
@@ -0,0 +1,1497 @@
+<?php
+/*
+
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Latest version is available at http://adodb.sourceforge.net
+
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+
+ Active Record implementation. Superset of Zend Framework's.
+
+ This is "Active Record eXtended" to support JOIN, WORK and LAZY mode by Chris Ravenscroft chris#voilaweb.com
+
+ Version 0.9
+
+ See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
+ for info on Ruby on Rails Active Record implementation
+*/
+
+
+ // CFR: Active Records Definitions
+define('ADODB_JOIN_AR', 0x01);
+define('ADODB_WORK_AR', 0x02);
+define('ADODB_LAZY_AR', 0x03);
+
+
+global $_ADODB_ACTIVE_DBS;
+global $ADODB_ACTIVE_CACHESECS; // set to true to enable caching of metadata such as field info
+global $ACTIVE_RECORD_SAFETY; // set to false to disable safety checks
+global $ADODB_ACTIVE_DEFVALS; // use default values of table definition when creating new active record.
+
+// array of ADODB_Active_DB's, indexed by ADODB_Active_Record->_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 (PHP_VERSION >= 5) {
+ if ($d->db === $db) {
+ return $k;
+ }
+ } else {
+ if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) {
+ return $k;
+ }
+ }
+ }
+
+ $obj = new ADODB_Active_DB();
+ $obj->db = $db;
+ $obj->tables = array();
+
+ $_ADODB_ACTIVE_DBS[] = $obj;
+
+ return sizeof($_ADODB_ACTIVE_DBS)-1;
+}
+
+
+class ADODB_Active_Record {
+ static $_changeNames = true; // dynamically pluralize table names
+ static $_foreignSuffix = '_id'; //
+ 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_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
+
+ if ($db == false && is_object($pkeyarr)) {
+ $db = $pkeyarr;
+ $pkeyarr = false;
+ }
+
+ if($table) {
+ // table argument exists. It is expected to be
+ // 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_ASSOC_CASE,$_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 0:
+ 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 1:
+ foreach($cols as $name => $fldobj) {
+ $name = strtoupper($name);
+
+ if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
+ $this->$name = $fldobj->default_value;
+ }
+ else {
+ $this->$name = null;
+ }
+ $attr[$name] = $fldobj;
+ }
+
+ foreach($pkeys as $k => $name) {
+ $keys[strtoupper($name)] = strtoupper($name);
+ }
+ 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(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) {
+ # <AP>
+ $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;
+ }
+ # </AP>
+ }
+ else {
+ $keys = array_keys($row);
+ }
+
+ # <AP>
+ 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;
+ }
+ }
+ }
+ # </AP>
+
+ 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()
+ {
+ global $ADODB_ASSOC_CASE;
+
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
+ $table = $this->TableInfo();
+
+ $pkey = $table->keys;
+
+ foreach($table->flds as $name=>$fld) {
+ $val = $this->$name;
+ /*
+ 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 == 0) {
+ 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(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 developpers.
+ $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/libraries/adodb/adodb-csvlib.inc.php b/libraries/adodb/adodb-csvlib.inc.php
index 77ad6f942..bfd8d9b87 100644
--- a/libraries/adodb/adodb-csvlib.inc.php
+++ b/libraries/adodb/adodb-csvlib.inc.php
@@ -6,19 +6,21 @@ if (!defined('ADODB_DIR')) die();
global $ADODB_INCLUDED_CSV;
$ADODB_INCLUDED_CSV = 1;
-/*
+/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Library for CSV serialization. This is used by the csv/proxy driver and is the
- CacheExecute() serialization format.
-
+
+ Library for CSV serialization. This is used by the csv/proxy driver and is the
+ CacheExecute() serialization format.
+
==== NOTE ====
Format documented at http://php.weblogs.com/ADODB_CSV
==============
@@ -34,63 +36,64 @@ $ADODB_INCLUDED_CSV = 1;
function _rs2serialize(&$rs,$conn=false,$sql='')
{
$max = ($rs) ? $rs->FieldCount() : 0;
-
+
if ($sql) $sql = urlencode($sql);
// metadata setup
-
+
if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete
if (is_object($conn)) {
$sql .= ','.$conn->Affected_Rows();
$sql .= ','.$conn->Insert_ID();
} else
$sql .= ',,';
-
+
$text = "====-1,0,$sql\n";
return $text;
}
$tt = ($rs->timeCreated) ? $rs->timeCreated : time();
-
+
## changed format from ====0 to ====1
$line = "====1,$tt,$sql\n";
-
+
if ($rs->databaseType == 'array') {
- $rows =& $rs->_array;
+ $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,
+* 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 +105,7 @@ $ADODB_INCLUDED_CSV = 1;
@flock($fp, LOCK_SH);
$arr = array();
$ttl = 0;
-
+
if ($meta = fgetcsv($fp, 32000, ",")) {
// check if error message
if (strncmp($meta[0],'****',4) === 0) {
@@ -112,10 +115,10 @@ $ADODB_INCLUDED_CSV = 1;
}
// check for meta data
// $meta[0] is -1 means return an empty recordset
- // $meta[1] contains a time
-
+ // $meta[1] contains a time
+
if (strncmp($meta[0], '====',4) === 0) {
-
+
if ($meta[0] == "====-1") {
if (sizeof($meta) < 5) {
$err = "Corrupt first line for format -1";
@@ -123,12 +126,12 @@ $ADODB_INCLUDED_CSV = 1;
return $false;
}
fclose($fp);
-
+
if ($timeout > 0) {
$err = " Illegal Timeout $timeout ";
return $false;
}
-
+
$rs = new $rsclass($val=true);
$rs->fields = array();
$rs->timeCreated = $meta[1];
@@ -136,9 +139,9 @@ $ADODB_INCLUDED_CSV = 1;
$rs->_numOfFields = 0;
$rs->sql = urldecode($meta[2]);
$rs->affectedrows = (integer)$meta[3];
- $rs->insertid = $meta[4];
+ $rs->insertid = $meta[4];
return $rs;
- }
+ }
# Under high volume loads, we want only 1 thread/process to _write_file
# so that we don't have 50 processes queueing to write the same data.
# We use probabilistic timeout, ahead of time.
@@ -148,7 +151,7 @@ $ADODB_INCLUDED_CSV = 1;
# -1 sec after timeout give processes 1/4 chance of timing out
# +0 sec after timeout, give processes 100% chance of timing out
if (sizeof($meta) > 1) {
- if($timeout >0){
+ if($timeout >0){
$tdiff = (integer)( $meta[1]+$timeout - time());
if ($tdiff <= 2) {
switch($tdiff) {
@@ -160,7 +163,7 @@ $ADODB_INCLUDED_CSV = 1;
return $false;
}
break;
- case 2:
+ case 2:
if ((rand() & 15) == 0) {
fclose($fp);
$err = "Timeout 2";
@@ -174,12 +177,12 @@ $ADODB_INCLUDED_CSV = 1;
return $false;
}
break;
- default:
+ default:
fclose($fp);
$err = "Timeout 0";
return $false;
} // switch
-
+
} // if check flush cache
}// (timeout>0)
$ttl = $meta[1];
@@ -189,7 +192,7 @@ $ADODB_INCLUDED_CSV = 1;
if ($meta[0] === '====1') {
// slurp in the data
$MAXSIZE = 128000;
-
+
$text = fread($fp,$MAXSIZE);
if (strlen($text)) {
while ($txt = fread($fp,$MAXSIZE)) {
@@ -205,7 +208,7 @@ $ADODB_INCLUDED_CSV = 1;
}
return $rs;
}
-
+
$meta = false;
$meta = fgetcsv($fp, 32000, ",");
if (!$meta) {
@@ -235,15 +238,15 @@ $ADODB_INCLUDED_CSV = 1;
$err = "Recordset had unexpected EOF 2";
return $false;
}
-
+
// slurp in the data
$MAXSIZE = 128000;
-
+
$text = '';
while ($txt = fread($fp,$MAXSIZE)) {
$text .= $txt;
}
-
+
fclose($fp);
@$arr = unserialize($text);
//var_dump($arr);
@@ -257,17 +260,18 @@ $ADODB_INCLUDED_CSV = 1;
$rs->InitArrayFields($arr,$flds);
return $rs;
}
-
+
/**
* Save a file $filename and its $contents (normally for caching) with file locking
+ * Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked)
*/
function adodb_write_file($filename, $contents,$debug=false)
- {
+ {
# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
# So to simulate locking, we assume that rename is an atomic operation.
- # First we delete $filename, then we create a $tempfile write to it and
- # rename to the desired $filename. If the rename works, then we successfully
+ # First we delete $filename, then we create a $tempfile write to it and
+ # rename to the desired $filename. If the rename works, then we successfully
# modified the file exclusively.
# What a stupid need - having to simulate locking.
# Risks:
@@ -277,36 +281,39 @@ $ADODB_INCLUDED_CSV = 1;
# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and cache updated
if (strncmp(PHP_OS,'WIN',3) === 0) {
// skip the decimal place
- $mtime = substr(str_replace(' ','_',microtime()),2);
+ $mtime = substr(str_replace(' ','_',microtime()),2);
// getmypid() actually returns 0 on Win98 - never mind!
$tmpname = $filename.uniqid($mtime).getmypid();
- if (!($fd = @fopen($tmpname,'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<br>\n");
$ok = false;
}
-
+
return $ok;
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-datadict.inc.php b/libraries/adodb/adodb-datadict.inc.php
index 9fa2765c5..b15a80e66 100644
--- a/libraries/adodb/adodb-datadict.inc.php
+++ b/libraries/adodb/adodb-datadict.inc.php
@@ -1,15 +1,17 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
DOCUMENTATION:
-
+
See adodb/tests/test-datadict.php for docs and examples.
*/
@@ -42,13 +44,13 @@ if (!function_exists('ctype_alnum')) {
/**
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='_.-')
@@ -62,7 +64,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 +79,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 +111,9 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
}
} else
$tokarr[] = $ch;
-
+
}else {
-
+
if ($ch == '(') $endquote = ')';
else $endquote = $ch;
$quoted = true;
@@ -120,27 +122,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,7 +158,7 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
$pos += 1;
}
if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
-
+
return $tokens;
}
@@ -165,7 +167,7 @@ class ADODB_DataDict {
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';
@@ -180,75 +182,184 @@ class ADODB_DataDict {
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)
{
return false;
}
-
+
function SetCommentSQL($table,$col,$cmt)
{
return false;
}
-
+
function MetaTables()
{
if (!$this->connection->IsConnected()) return array();
return $this->connection->MetaTables();
}
-
+
function MetaColumns($tab, $upper=true, $schema=false)
{
if (!$this->connection->IsConnected()) return array();
return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
}
-
+
function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
{
if (!$this->connection->IsConnected()) return array();
return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
}
-
+
function MetaIndexes($table, $primary = false, $owner = false)
{
if (!$this->connection->IsConnected()) return array();
return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
}
-
+
function MetaType($t,$len=-1,$fieldobj=false)
{
- 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 'N';
+ }
+ return $this->connection->MetaType($t,$len,$fieldobj);
}
-
+
function NameQuote($name = NULL,$allowBrackets=false)
{
if (!is_string($name)) {
return FALSE;
}
-
+
$name = trim($name);
-
+
if ( !is_object($this->connection) ) {
return $name;
}
-
+
$quote = $this->connection->nameQuote;
-
+
// if name is of the form `name`, quote it
if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
return $quote . $matches[1] . $quote;
}
-
+
// if name contains special characters, quote it
$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
-
+
if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
return $quote . $name . $quote;
}
-
+
return $name;
}
-
+
function TableName($name)
{
if ( $this->schema ) {
@@ -256,71 +367,63 @@ class ADODB_DataDict {
}
return $this->NameQuote($name);
}
-
+
// Executes the sql array returned by GetTableSQL and GetIndexSQL
function ExecuteSQLArray($sql, $continueOnError = true)
{
- global $log;
$rez = 2;
- $conn = &$this->connection;
+ $conn = $this->connection;
$saved = $conn->debug;
foreach($sql as $line) {
-
+
if ($this->debug) $conn->debug = true;
- $log->debug($line);
$ok = $conn->Execute($line);
$conn->debug = $saved;
if (!$ok) {
- $log->fatal("Table Creation Error: Query Failed");
- $log->fatal(" ");
- if ($this->debug)
- {
- $log->fatal("InstallError: ".$conn->ErrorMsg());
- 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)
{
return $meta;
}
-
+
function CreateDatabase($dbname,$options=false)
{
$options = $this->_Options($options);
$sql = array();
-
+
$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
if (isset($options[$this->upperName]))
$s .= ' '.$options[$this->upperName];
-
+
$sql[] = $s;
return $sql;
}
-
+
/*
Generates the SQL to create index. Returns an array of sql strings.
*/
@@ -329,37 +432,45 @@ class ADODB_DataDict {
if (!is_array($flds)) {
$flds = explode(',',$flds);
}
-
+
foreach($flds as $key => $fld) {
# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
}
-
+
return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
}
-
+
function DropIndexSQL ($idxname, $tabname = NULL)
{
return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
}
-
+
function SetSchema($schema)
{
$this->schema = $schema;
}
-
+
function AddColumnSQL($tabname, $flds)
{
$tabname = $this->TableName ($tabname);
$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
*
@@ -375,14 +486,23 @@ class ADODB_DataDict {
{
$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
*
@@ -397,13 +517,15 @@ class ADODB_DataDict {
{
$tabname = $this->TableName ($tabname);
if ($flds) {
- list($lines,$pkey) = $this->_GenFields($flds);
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+ // genfields can return FALSE at times
+ if ($lines == null) $lines = array();
list(,$first) = each($lines);
- list(,$column_def) = split("[\t ]+",$first,2);
+ list(,$column_def) = preg_split("/[\t ]+/",$first,2);
}
return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
}
-
+
/**
* Drop one column
*
@@ -426,36 +548,52 @@ class ADODB_DataDict {
}
return $sql;
}
-
+
function DropTableSQL($tabname)
{
return array (sprintf($this->dropTable, $this->TableName($tabname)));
}
-
+
function RenameTableSQL($tabname,$newname)
{
return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
- }
-
- /*
+ }
+
+ /**
Generate the SQL to create table. Returns an array of sql strings.
*/
- function CreateTableSQL($tabname, $flds, $tableoptions=false)
+ function CreateTableSQL($tabname, $flds, $tableoptions=array())
{
- if (!$tableoptions) $tableoptions = array();
-
- list($lines,$pkey) = $this->_GenFields($flds, true);
-
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds, true);
+ // genfields can return FALSE at times
+ if ($lines == null) $lines = array();
+
$taboptions = $this->_Options($tableoptions);
$tabname = $this->TableName ($tabname);
$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
-
+
+ // 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)
{
if (is_string($flds)) {
@@ -468,8 +606,11 @@ class ADODB_DataDict {
$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:
@@ -479,16 +620,31 @@ class ADODB_DataDict {
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);
-
+
$fname = false;
$fdefault = false;
$fautoinc = false;
@@ -502,20 +658,22 @@ class ADODB_DataDict {
$fconstraint = false;
$fnotnull = false;
$funsigned = false;
-
+ $findex = '';
+ $funiqueindex = false;
+
//-----------------
// Parse attributes
foreach($fld as $attr => $v) {
if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
-
+
switch($attr) {
case '0':
case 'NAME': $fname = $v; break;
case '1':
case 'TYPE': $ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
-
- case 'SIZE':
+
+ case 'SIZE':
$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
if ($dotat === false) $fsize = $v;
else {
@@ -527,7 +685,8 @@ class ADODB_DataDict {
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;
@@ -535,35 +694,59 @@ class ADODB_DataDict {
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;
} //switch
} // foreach $fld
-
+
//--------------------
// VALIDATE FIELD INFO
if (!strlen($fname)) {
if ($this->debug) ADOConnection::outp("Undefined NAME");
return false;
}
-
+
$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
$fname = $this->NameQuote($fname);
-
+
if (!strlen($ftype)) {
if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
return false;
} else {
$ftype = strtoupper($ftype);
}
-
+
$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
-
+
if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
-
+
if ($fprimary) $pkey[] = $fname;
-
+
// some databases do not allow blobs to have defaults
if ($ty == 'X') $fdefault = false;
-
+
+ // build list of indexes
+ if ($findex != '') {
+ if (array_key_exists($findex, $idxs)) {
+ $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) {
@@ -578,24 +761,47 @@ class ADODB_DataDict {
} 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);
-
+
+ // 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
@@ -609,56 +815,56 @@ class ADODB_DataDict {
}
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)
{
$sql = array();
-
+
if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
$sql[] = sprintf ($this->dropIndex, $idxname);
if ( isset($idxoptions['DROP']) )
return $sql;
}
-
+
if ( empty ($flds) ) {
return $sql;
}
-
+
$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-
+
$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-
+
if ( isset($idxoptions[$this->upperName]) )
$s .= $idxoptions[$this->upperName];
-
+
if ( is_array($flds) )
$flds = implode(', ',$flds);
$s .= '(' . $flds . ')';
$sql[] = $s;
-
+
return $sql;
}
-
+
function _DropAutoIncrement($tabname)
{
return false;
}
-
+
function _TableSQL($tabname,$lines,$pkey,$tableoptions)
{
$sql = array();
-
+
if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
$sql[] = sprintf($this->dropTable,$tabname);
if ($this->autoIncrement) {
@@ -675,20 +881,20 @@ class ADODB_DataDict {
$s .= ",\n PRIMARY KEY (";
$s .= implode(", ",$pkey).")";
}
- if (isset($tableoptions['CONSTRAINTS']))
+ if (isset($tableoptions['CONSTRAINTS']))
$s .= "\n".$tableoptions['CONSTRAINTS'];
-
- if (isset($tableoptions[$this->upperName.'_CONSTRAINTS']))
+
+ if (isset($tableoptions[$this->upperName.'_CONSTRAINTS']))
$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
-
+
$s .= "\n)";
if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
$sql[] = $s;
-
+
return $sql;
}
-
- /*
+
+ /**
GENERATE TRIGGERS IF NEEDED
used when table has auto-incrementing field that is emulated using triggers
*/
@@ -696,8 +902,8 @@ class ADODB_DataDict {
{
return array();
}
-
- /*
+
+ /**
Sanitize options, so that array elements with no keys are promoted to keys
*/
function _Options($opts)
@@ -710,34 +916,49 @@ class ADODB_DataDict {
}
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 ]" <florian.buzin#easywe.de>
-
+
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, $forceAlter = false) // GS Fix for constraint impl - forceAlter
+ function ChangeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFlds=false)
{
global $ADODB_FETCH_MODE;
-
+
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
-
+
// check table exists
$save_handler = $this->connection->raiseErrorFn;
$this->connection->raiseErrorFn = '';
$cols = $this->MetaColumns($tablename);
$this->connection->raiseErrorFn = $save_handler;
-
+
if (isset($savem)) $this->connection->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
-
- if ( $forceAlter == false && empty($cols)) { // GS Fix for constraint impl
+
+ 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.
@@ -750,71 +971,63 @@ class ADODB_DataDict {
$obj = $cols[$k];
if (isset($obj->not_null) && $obj->not_null)
$v = str_replace('NOT NULL','',$v);
+ if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT']))
+ $v = str_replace('AUTOINCREMENT','',$v);
$c = $cols[$k];
$ml = $c->max_length;
$mt = $this->MetaType($c->type,$ml);
+
+ if (isset($c->scale)) $sc = $c->scale;
+ else $sc = 99; // always force change if scale not known.
+
+ if ($sc == -1) $sc = false;
+ list($fsize, $fprec) = $this->_getSizePrec($v['SIZE']);
+
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);
+ 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,',');
-
+
// 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("<h3>%s cannot be changed to %s currently</h3>", $flds[0][0], $flds[0][1]));
+ #echo "<h3>$this->alterCol cannot be changed to $flds currently</h3>";
+ continue;
+ }
$sql[] = $alter . $this->alterCol . ' ' . $v;
} else {
$sql[] = $alter . $this->addCol . ' ' . $v;
}
}
- // GS Fix for constraint impl -- start
- if($forceAlter == false) return $sql;
- $sqlarray = array();
-
- $alter .= implode(",\n", $sql);
- if (sizeof($pkey)>0) {
- $alter .= ",\n PRIMARY KEY (";
- $alter .= implode(", ",$pkey).")";
+ if ($dropOldFlds) {
+ foreach ( $cols as $id => $v )
+ if ( !isset($lines[$id]) )
+ $sql[] = $alter . $this->dropCol . ' ' . $v->name;
}
-
- if (isset($tableoptions['CONSTRAINTS']))
- $alter .= "\n".$tableoptions['CONSTRAINTS'];
-
- if (isset($tableoptions[$this->upperName.'_CONSTRAINTS']))
- $alter .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
-
- if (isset($tableoptions[$this->upperName])) $alter .= $tableoptions[$this->upperName];
- $sqlarray[] = $alter;
-
-
- $taboptions = $this->_Options($tableoptions);
- $tsql = $this->_Triggers($this->TableName($tablename),$taboptions);
- foreach($tsql as $s) $sqlarray[] = $s;
-
- // GS Fix for constraint impl -- end
-
- return $sqlarray;
-
-
+ return $sql;
}
} // class
-?>
diff --git a/libraries/adodb/adodb-error.inc.php b/libraries/adodb/adodb-error.inc.php
index 74d028f7c..d42a06a83 100644
--- a/libraries/adodb/adodb-error.inc.php
+++ b/libraries/adodb/adodb-error.inc.php
@@ -1,12 +1,14 @@
<?php
-/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+/**
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
*
* Set tabs to 4 for best viewing.
- *
+ *
* The following code is adapted from the PEAR DB error handling code.
* Portions (c)1997-2002 The PHP Group.
*/
@@ -41,6 +43,9 @@ if (!defined("DB_ERROR_SYNTAX")) {
define("DB_ERROR_EXTENSION_NOT_FOUND",-25);
define("DB_ERROR_NOSUCHDB", -25);
define("DB_ERROR_ACCESS_VIOLATION", -26);
+ define("DB_ERROR_DEADLOCK", -27);
+ define("DB_ERROR_STATEMENT_TIMEOUT", -28);
+ define("DB_ERROR_SERIALIZATION_FAILURE", -29);
}
function adodb_errormsg($value)
@@ -59,27 +64,27 @@ function adodb_error($provider,$dbType,$errno)
{
//var_dump($errno);
if (is_numeric($errno) && $errno == 0) return 0;
- switch($provider) {
+ switch($provider) {
case 'mysql': $map = adodb_error_mysql(); break;
-
+
case 'oracle':
case 'oci8': $map = adodb_error_oci8(); break;
-
+
case 'ibase': $map = adodb_error_ibase(); break;
-
+
case 'odbc': $map = adodb_error_odbc(); break;
-
+
case 'mssql':
case 'sybase': $map = adodb_error_mssql(); break;
-
+
case 'informix': $map = adodb_error_ifx(); break;
-
+
case 'postgres': return adodb_error_pg($errno); break;
-
+
case 'sqlite': return $map = adodb_error_sqlite(); break;
default:
return DB_ERROR;
- }
+ }
//print_r($map);
//var_dump($errno);
if (isset($map[$errno])) return $map[$errno];
@@ -91,27 +96,30 @@ function adodb_error($provider,$dbType,$errno)
function adodb_error_pg($errormsg)
{
if (is_numeric($errormsg)) return (integer) $errormsg;
- 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.*/' => 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;
+ while (list($regexp,$code) = each($error_regexps)) {
+ if (preg_match("/$regexp/mi", $errormsg)) {
+ return $code;
+ }
+ }
+ // Fall back to DB_ERROR if there was no mapping.
+ return DB_ERROR;
}
-
+
function adodb_error_odbc()
{
static $MAP = array(
@@ -169,7 +177,7 @@ static $MAP = array(
-923 => DB_ERROR_CONNECT_FAILED,
-924 => DB_ERROR_CONNECT_FAILED
);
-
+
return $MAP;
}
@@ -187,7 +195,7 @@ static $MAP = array(
'-1210' => DB_ERROR_INVALID_DATE,
'-1212' => DB_ERROR_INVALID_DATE
);
-
+
return $MAP;
}
@@ -206,7 +214,7 @@ static $MAP = array(
2291 => DB_ERROR_CONSTRAINT,
2449 => DB_ERROR_CONSTRAINT
);
-
+
return $MAP;
}
@@ -216,7 +224,7 @@ static $MAP = array(
208 => DB_ERROR_NOSUCHTABLE,
2601 => DB_ERROR_ALREADY_EXISTS
);
-
+
return $MAP;
}
@@ -225,7 +233,7 @@ function adodb_error_sqlite()
static $MAP = array(
1 => DB_ERROR_SYNTAX
);
-
+
return $MAP;
}
@@ -252,7 +260,6 @@ static $MAP = array(
2002 => DB_ERROR_CONNECT_FAILED,
2005 => DB_ERROR_CONNECT_FAILED
);
-
+
return $MAP;
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-errorhandler.inc.php b/libraries/adodb/adodb-errorhandler.inc.php
index 60e140f02..7f36ba1ee 100644
--- a/libraries/adodb/adodb-errorhandler.inc.php
+++ b/libraries/adodb/adodb-errorhandler.inc.php
@@ -1,6 +1,8 @@
<?php
/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
@@ -13,7 +15,7 @@
// added Claudio Bustos clbustos#entelchile.net
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_Handler');
@@ -74,6 +76,5 @@ function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnec
//print "<p>$s</p>";
- trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
+ trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
}
-?>
diff --git a/libraries/adodb/adodb-errorpear.inc.php b/libraries/adodb/adodb-errorpear.inc.php
index 2c6c4ca78..474d6d5ba 100644
--- a/libraries/adodb/adodb-errorpear.inc.php
+++ b/libraries/adodb/adodb-errorpear.inc.php
@@ -1,14 +1,16 @@
<?php
-/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/**
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
*
* Set tabs to 4 for best viewing.
- *
+ *
* Latest version is available at http://php.weblogs.com
- *
+ *
*/
include_once('PEAR.php');
@@ -34,7 +36,7 @@ global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
*
* @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 $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
@@ -42,35 +44,35 @@ global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
{
global $ADODB_Last_PEAR_Error;
-
+
if (error_reporting() == 0) return; // obey @ protocol
switch($fn) {
case 'EXECUTE':
$sql = $p1;
$inputparams = $p2;
-
+
$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
break;
-
+
case 'PCONNECT':
case 'CONNECT':
$host = $p1;
$database = $p2;
-
+
$s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
break;
-
+
default:
$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
break;
}
-
+
$class = ADODB_PEAR_ERROR_CLASS;
$ADODB_Last_PEAR_Error = new $class($s, $errno,
$GLOBALS['_PEAR_default_error_mode'],
- $GLOBALS['_PEAR_default_error_options'],
+ $GLOBALS['_PEAR_default_error_options'],
$errmsg);
-
+
//print "<p>!$s</p>";
}
@@ -78,11 +80,9 @@ global $ADODB_Last_PEAR_Error;
* Returns last PEAR_Error object. This error might be for an error that
* occured 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/libraries/adodb/adodb-exceptions.inc.php b/libraries/adodb/adodb-exceptions.inc.php
index b53d00c62..9c66ac398 100644
--- a/libraries/adodb/adodb-exceptions.inc.php
+++ b/libraries/adodb/adodb-exceptions.inc.php
@@ -1,7 +1,9 @@
<?php
/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
@@ -14,7 +16,7 @@
*/
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
define('ADODB_ERROR_HANDLER','adodb_throw');
class ADODB_Exception extends Exception {
@@ -24,26 +26,26 @@ var $sql = '';
var $params = '';
var $host = '';
var $database = '';
-
+
function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
{
switch($fn) {
case 'EXECUTE':
- $this->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,7 +53,7 @@ var $database = '';
}
$this->fn = $fn;
$this->msg = $errmsg;
-
+
if (!is_numeric($errno)) $errno = -1;
parent::__construct($s,$errno);
}
@@ -71,12 +73,9 @@ var $database = '';
function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
{
global $ADODB_EXCEPTION;
-
+
if (error_reporting() == 0) return; // obey @ protocol
if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION;
else $errfn = 'ADODB_EXCEPTION';
throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection);
}
-
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-iterator.inc.php b/libraries/adodb/adodb-iterator.inc.php
index d90cf9856..cfc067bc8 100644
--- a/libraries/adodb/adodb-iterator.inc.php
+++ b/libraries/adodb/adodb-iterator.inc.php
@@ -1,85 +1,26 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4.
-
- Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with
+
+ Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with
the ADODB_Iterator class.
-
+
$rs = $db->Execute("select * from adoxyz");
foreach($rs as $k => $v) {
echo $k; print_r($v); echo "<br>";
}
-
-
- 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);
- }
-}
+ Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
-?>
\ No newline at end of file
+ Moved to adodb.inc.php to improve performance.
+ */
diff --git a/libraries/adodb/adodb-lib.inc.php b/libraries/adodb/adodb-lib.inc.php
index ee12c1312..60285305f 100644
--- a/libraries/adodb/adodb-lib.inc.php
+++ b/libraries/adodb/adodb-lib.inc.php
@@ -1,23 +1,124 @@
<?php
-
// security - hide paths
if (!defined('ADODB_DIR')) die();
global $ADODB_INCLUDED_LIB;
$ADODB_INCLUDED_LIB = 1;
-/*
- @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
- Less commonly used functions are placed here to reduce size of adodb.inc.php.
-*/
+ Less commonly used functions are placed here to reduce size of adodb.inc.php.
+*/
+
+function adodb_strip_order_by($sql)
+{
+ $rez = preg_match('/(\sORDER\s+BY\s(?:[^)](?!LIMIT))*)/is', $sql, $arr);
+ 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)
+{
+// probe and guess the type
+ $types = array();
+ if ($probe > sizeof($array)) $max = sizeof($array);
+ else $max = $probe;
+
+
+ for ($j=0;$j < $max; $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 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[$i] = 'C';
+ if (strpos($v,'.') !== false) $types[$i] = 'N';
+ else $types[$i] = 'I';
+ continue;
+ }
+
+ if (strpos($v,'.') !== false) $types[$i] = 'N';
+
+ }
+ }
+
+}
+
+function adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs)
+{
+ $oldX = sizeof(reset($arr));
+ $oldY = sizeof($arr);
+
+ if ($hdr) {
+ $startx = 1;
+ $hdr = array('Fields');
+ for ($y = 0; $y < $oldY; $y++) {
+ $hdr[] = $arr[$y][0];
+ }
+ } else
+ $startx = 0;
+
+ for ($x = $startx; $x < $oldX; $x++) {
+ 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.
+// 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)
{
@@ -37,24 +138,27 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
if (count($fieldArray) == 0) return 0;
$first = true;
$uSet = '';
-
+
if (!is_array($keyCol)) {
$keyCol = array($keyCol);
}
foreach($fieldArray as $k => $v) {
- if ($autoQuote && !is_numeric($v) and strncmp($v,"'",1) !== 0 and strcasecmp($v,'null')!=0) {
+ if ($v === null) {
+ $v = 'NULL';
+ $fieldArray[$k] = $v;
+ } else if ($autoQuote && /*!is_numeric($v) /*and strncmp($v,"'",1) !== 0 -- sql injection risk*/ strcasecmp($v,$zthis->null2null)!=0) {
$v = $zthis->qstr($v);
$fieldArray[$k] = $v;
}
if (in_array($k,$keyCol)) continue; // skip UPDATE if is key
-
+
if ($first) {
- $first = false;
+ $first = false;
$uSet = "$k=$v";
} else
$uSet .= ",$k=$v";
}
-
+
$where = false;
foreach ($keyCol as $v) {
if (isset($fieldArray[$v])) {
@@ -62,24 +166,24 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
else $where = $v.'='.$fieldArray[$v];
}
}
-
+
if ($uSet && $where) {
$update = "UPDATE $table SET $uSet WHERE $where";
$rs = $zthis->Execute($update);
-
-
+
+
if ($rs) {
if ($zthis->poorAffectedRows) {
/*
- The Select count(*) wipes out any errors that the update would have returned.
+ The Select count(*) wipes out any errors that the update would have returned.
http://phplens.com/lens/lensforum/msgs.php?id=5696
*/
if ($zthis->ErrorNo()<>0) return 0;
-
+
# affected_rows == 0 if update field values identical to old values
- # for mysql - which is silly.
-
+ # for mysql - which is silly.
+
$cnt = $zthis->GetOne("select count(*) from $table where $where");
if ($cnt > 0) return 1; // record already exists
} else {
@@ -88,22 +192,22 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
} else
return 0;
}
-
+
// print "<p>Error=".$this->ErrorNo().'<p>';
$first = true;
foreach($fieldArray as $k => $v) {
if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col
-
+
if ($first) {
- $first = false;
+ $first = false;
$iCols = "$k";
$iVals = "$v";
} else {
$iCols .= ",$k";
$iVals .= ",$v";
- }
+ }
}
- $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)";
+ $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)";
$rs = $zthis->Execute($insert);
return ($rs) ? 2 : 0;
}
@@ -120,9 +224,9 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
if (!strpos($name,'[]')) $name .= '[]';
} else if ($size) $attr = ' size="'.$size.'"';
else $attr ='';
-
+
$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
- if ($blank1stItem)
+ if ($blank1stItem)
if (is_string($blank1stItem)) {
$barr = explode(':',$blank1stItem);
if (sizeof($barr) == 1) $barr[] = '';
@@ -131,7 +235,7 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
if ($zthis->FieldCount() > 1) $hasvalue=true;
else $compareFields0 = true;
-
+
$value = '';
$optgroup = null;
$firstgroup = true;
@@ -151,12 +255,12 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
$zval2 = rtrim(next($zthis->fields));
}
$selected = ($compareFields0) ? $zval : $zval2;
-
+
$group = '';
if ($fieldsize > 2) {
$group = rtrim($zthis->fields[2]);
}
-
+/*
if ($optgroup != $group) {
$optgroup = $group;
if ($firstgroup) {
@@ -167,26 +271,26 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
$s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
}
}
-
- if ($hasvalue)
+*/
+ if ($hasvalue)
$value = " value='".htmlspecialchars($zval2)."'";
-
+
if (is_array($defstr)) {
-
- if (in_array($selected,$defstr))
+
+ if (in_array($selected,$defstr))
$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
- else
+ else
$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
}
else {
- if (strcasecmp($selected,$defstr)==0)
+ if (strcasecmp($selected,$defstr)==0)
$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
else
$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
}
$zthis->MoveNext();
} // while
-
+
// closing last optgroup
if($optgroup != null) {
$s .= "\n</optgroup>";
@@ -206,9 +310,9 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
if (!strpos($name,'[]')) $name .= '[]';
} else if ($size) $attr = ' size="'.$size.'"';
else $attr ='';
-
+
$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
- if ($blank1stItem)
+ if ($blank1stItem)
if (is_string($blank1stItem)) {
$barr = explode(':',$blank1stItem);
if (sizeof($barr) == 1) $barr[] = '';
@@ -217,7 +321,7 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
if ($zthis->FieldCount() > 1) $hasvalue=true;
else $compareFields0 = true;
-
+
$value = '';
$optgroup = null;
$firstgroup = true;
@@ -237,12 +341,12 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
$zval2 = rtrim(next($zthis->fields));
}
$selected = ($compareFields0) ? $zval : $zval2;
-
+
$group = '';
if (isset($zthis->fields[2])) {
$group = rtrim($zthis->fields[2]);
}
-
+
if ($optgroup != $group) {
$optgroup = $group;
if ($firstgroup) {
@@ -253,26 +357,26 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
$s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
}
}
-
- if ($hasvalue)
+
+ if ($hasvalue)
$value = " value='".htmlspecialchars($zval2)."'";
-
+
if (is_array($defstr)) {
-
- if (in_array($selected,$defstr))
+
+ if (in_array($selected,$defstr))
$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
- else
+ else
$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
}
else {
- if (strcasecmp($selected,$defstr)==0)
+ if (strcasecmp($selected,$defstr)==0)
$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
else
$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
}
$zthis->MoveNext();
} // while
-
+
// closing last optgroup
if($optgroup != null) {
$s .= "\n</optgroup>";
@@ -284,68 +388,60 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
/*
Count the number of records this sql statement will return by using
query rewriting heuristics...
-
+
Does not work with UNIONs, except with postgresql and oracle.
-
+
Usage:
-
+
$conn->Connect(...);
$cnt = _adodb_getcount($conn, $sql);
-
+
*/
-function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
+function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
{
$qryRecs = 0;
-
- if (preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) ||
- preg_match('/\s+GROUP\s+BY\s+/is',$sql) ||
+
+ if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) ||
+ preg_match('/\s+GROUP\s+BY\s+/is',$sql) ||
preg_match('/\s+UNION\s+/is',$sql)) {
+
+ $rewritesql = adodb_strip_order_by($sql);
+
// ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias
// but this is only supported by oracle and postgresql...
if ($zthis->dataProvider == 'oci8') {
-
- $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
-
// Allow Oracle hints to be used for query optimization, Chris Wrye
if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) {
- $rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")";
+ $rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")";
} else
- $rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")";
-
- } else if (strncmp($zthis->databaseType,'postgres',8) == 0) {
-
- $info = $zthis->ServerInfo();
- if (substr($info['version'],0,3) >= 7.1) { // good till version 999
- $rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$sql);
- $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
- }
+ $rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")";
+
+ } else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0) {
+ $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
+ } else {
+ $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)";
}
} else {
// now replace SELECT ... FROM with SELECT COUNT(*) FROM
- $rewritesql = preg_replace(
- '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
-
-
-
- // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails
+ if ( strpos($sql, '_ADODB_COUNT') !== FALSE ) {
+ $rewritesql = preg_replace('/^\s*?SELECT\s+_ADODB_COUNT(.*)_ADODB_COUNT\s/is','SELECT COUNT(*) ',$sql);
+ } else {
+ $rewritesql = preg_replace('/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
+ }
+ // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails
// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
- if (preg_match('/\sORDER\s+BY\s*\(/i',$rewritesql))
- $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
- else
- $rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$rewritesql);
+ $rewritesql = adodb_strip_order_by($rewritesql);
}
-
-
-
+
if (isset($rewritesql) && $rewritesql != $sql) {
- if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[1];
-
+ if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
+
if ($secs2cache) {
// we only use half the time of secs2cache because the count can quickly
// become inaccurate if new records are added
$qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr);
-
+
} else {
$qryRecs = $zthis->GetOne($rewritesql,$inputarr);
}
@@ -353,20 +449,24 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
}
//--------------------------------------------
// query rewrite failed - so try slower way...
-
-
+
+
// strip off unneeded ORDER BY if no UNION
if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
- else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
-
+ else $rewritesql = $rewritesql = adodb_strip_order_by($sql);
+
if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
-
- $rstest = &$zthis->Execute($rewritesql,$inputarr);
- if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
-
+
+ if ($secs2cache) {
+ $rstest = $zthis->CacheExecute($secs2cache,$rewritesql,$inputarr);
+ if (!$rstest) $rstest = $zthis->CacheExecute($secs2cache,$sql,$inputarr);
+ } else {
+ $rstest = $zthis->Execute($rewritesql,$inputarr);
+ if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
+ }
if ($rstest) {
$qryRecs = $rstest->RecordCount();
- if ($qryRecs == -1) {
+ if ($qryRecs == -1) {
global $ADODB_EXTENSION;
// some databases will return -1 on MoveLast() - change to MoveNext()
if ($ADODB_EXTENSION) {
@@ -383,60 +483,59 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
$rstest->Close();
if ($qryRecs == -1) return 0;
}
-
return $qryRecs;
}
/*
Code originally from "Cornel G" <conyg@fx.ro>
- This code might not work with SQL that has UNION in it
-
+ This code might not work with SQL that has UNION in it
+
Also if you are using CachePageExecute(), there is a strong possibility that
data will get out of synch. use CachePageExecute() only with tables that
rarely change.
*/
-function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page,
- $inputarr=false, $secs2cache=0)
+function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page,
+ $inputarr=false, $secs2cache=0)
{
$atfirstpage = false;
$atlastpage = false;
$lastpageno=1;
- // If an invalid nrows is supplied,
+ // If an invalid nrows is supplied,
// we assume a default value of 10 rows per page
if (!isset($nrows) || $nrows <= 0) $nrows = 10;
$qryRecs = false; //count records for no offset
-
+
$qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache);
$lastpageno = (int) ceil($qryRecs / $nrows);
$zthis->_maxRecordCount = $qryRecs;
-
- // ***** Here we check whether $page is the last page or
- // whether we are trying to retrieve
+
+ // ***** Here we check whether $page is the last page or
+ // whether we are trying to retrieve
// a page number greater than the last page number.
if ($page >= $lastpageno) {
$page = $lastpageno;
$atlastpage = true;
}
-
+
// If page number <= 1, then we are at the first page
- if (empty($page) || $page <= 1) {
+ if (empty($page) || $page <= 1) {
$page = 1;
$atfirstpage = true;
}
-
+
// We get the data we want
$offset = $nrows * ($page-1);
- if ($secs2cache > 0)
- $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
- else
- $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
+ if ($secs2cache > 0)
+ $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
+ else
+ $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
+
-
// Before returning the RecordSet, we set the pagination properties we need
if ($rsreturn) {
$rsreturn->_maxRecordCount = $qryRecs;
@@ -449,47 +548,87 @@ function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page,
return $rsreturn;
}
-// Iván Oliva version
-function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0)
+// Iván Oliva version
+function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0)
{
$atfirstpage = false;
$atlastpage = false;
-
- if (!isset($page) || $page <= 1) { // If page number <= 1, then we are at the first page
+
+ if (!isset($page) || $page <= 1) {
+ // If page number <= 1, then we are at the first page
$page = 1;
$atfirstpage = true;
}
- if ($nrows <= 0) $nrows = 10; // If an invalid nrows is supplied, we assume a default value of 10 rows per page
-
- // ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than
- // the last page number.
- $pagecounter = $page + 1;
- $pagecounteroffset = ($pagecounter * $nrows) - $nrows;
- if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr);
- else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache);
- if ($rstest) {
- while ($rstest && $rstest->EOF && $pagecounter>0) {
- $atlastpage = true;
- $pagecounter--;
- $pagecounteroffset = $nrows * ($pagecounter - 1);
- $rstest->Close();
- if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr);
- else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache);
- }
- if ($rstest) $rstest->Close();
+ if ($nrows <= 0) {
+ // If an invalid nrows is supplied, we assume a default value of 10 rows per page
+ $nrows = 10;
}
- if ($atlastpage) { // If we are at the last page or beyond it, we are going to retrieve it
- $page = $pagecounter;
- if ($page == 1) $atfirstpage = true; // We have to do this again in case the last page is the same as the first
- //... page, that is, the recordset has only 1 page.
+
+ $pagecounteroffset = ($page * $nrows) - $nrows;
+
+ // To find out if there are more pages of rows, simply increase the limit or
+ // nrows by 1 and see if that number of records was returned. If it was,
+ // then we know there is at least one more page left, otherwise we are on
+ // the last page. Therefore allow non-Count() paging with single queries
+ // rather than three queries as was done before.
+ $test_nrows = $nrows + 1;
+ if ($secs2cache > 0) {
+ $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr);
+ } else {
+ $rsreturn = $zthis->SelectLimit($sql, $test_nrows, $pagecounteroffset, $inputarr, $secs2cache);
}
-
- // We get the data we want
- $offset = $nrows * ($page-1);
- if ($secs2cache > 0) $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
- else $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
-
+
+ // Now check to see if the number of rows returned was the higher value we asked for or not.
+ if ( $rsreturn->_numOfRows == $test_nrows ) {
+ // Still at least 1 more row, so we are not on last page yet...
+ // Remove the last row from the RS.
+ $rsreturn->_numOfRows = ( $rsreturn->_numOfRows - 1 );
+ } elseif ( $rsreturn->_numOfRows == 0 && $page > 1 ) {
+ // Likely requested a page that doesn't exist, so need to find the last
+ // page and return it. Revert to original method and loop through pages
+ // until we find some data...
+ $pagecounter = $page + 1;
+ $pagecounteroffset = ($pagecounter * $nrows) - $nrows;
+
+ $rstest = $rsreturn;
+ if ($rstest) {
+ while ($rstest && $rstest->EOF && $pagecounter > 0) {
+ $atlastpage = true;
+ $pagecounter--;
+ $pagecounteroffset = $nrows * ($pagecounter - 1);
+ $rstest->Close();
+ if ($secs2cache>0) {
+ $rstest = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr);
+ }
+ else {
+ $rstest = $zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache);
+ }
+ }
+ if ($rstest) $rstest->Close();
+ }
+ if ($atlastpage) {
+ // If we are at the last page or beyond it, we are going to retrieve it
+ $page = $pagecounter;
+ if ($page == 1) {
+ // We have to do this again in case the last page is the same as
+ // the first page, that is, the recordset has only 1 page.
+ $atfirstpage = true;
+ }
+ }
+ // We get the data we want
+ $offset = $nrows * ($page-1);
+ if ($secs2cache > 0) {
+ $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
+ }
+ else {
+ $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
+ }
+ } elseif ( $rsreturn->_numOfRows < $test_nrows ) {
+ // Rows is less than what we asked for, so must be at the last page.
+ $atlastpage = true;
+ }
+
// Before returning the RecordSet, we set the pagination properties we need
if ($rsreturn) {
$rsreturn->rowsPerPage = $nrows;
@@ -502,17 +641,19 @@ function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputar
function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=2)
{
+ global $ADODB_QUOTE_FIELDNAMES;
+
if (!$rs) {
printf(ADODB_BAD_RS,'GetUpdateSQL');
return false;
}
-
+
$fieldUpdatedCount = 0;
$arrFields = _array_change_key_case($arrFields);
$hasnumeric = isset($rs->fields[0]);
$setFields = '';
-
+
// Loop through all of the fields in the recordset
for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
// Get the field from the recordset
@@ -522,19 +663,19 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
// of the fields passed in then process.
$upperfname = strtoupper($field->name);
if (adodb_key_exists($upperfname,$arrFields,$force)) {
-
+
// If the existing field value in the recordset
// is different from the value passed in then
// go ahead and append the field name and new value to
// the update query.
-
+
if ($hasnumeric) $val = $rs->fields[$i];
else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname];
else if (isset($rs->fields[$field->name])) $val = $rs->fields[$field->name];
else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)];
else $val = '';
-
-
+
+
if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) {
// Set the counter for the number of fields that will be updated.
$fieldUpdatedCount++;
@@ -542,23 +683,29 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
// Based on the datatype of the field
// Format the value properly for the database
$type = $rs->MetaType($field->type);
-
+
if ($type == 'null') {
$type = 'C';
}
-
- if (strpos($upperfname,' ') !== false)
- $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
- else
+
+ if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) {
+ switch ($ADODB_QUOTE_FIELDNAMES) {
+ case 'LOWER':
+ $fnameq = $zthis->nameQuote.strtolower($field->name).$zthis->nameQuote;break;
+ case 'NATIVE':
+ $fnameq = $zthis->nameQuote.$field->name.$zthis->nameQuote;break;
+ case 'UPPER':
+ default:
+ $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;break;
+ }
+ } else
$fnameq = $upperfname;
-
-
- // is_null requires php 4.0.4
+
//********************************************************//
if (is_null($arrFields[$upperfname])
|| (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
- || $arrFields[$upperfname] === 'null'
+ || $arrFields[$upperfname] === $zthis->null2null
)
{
switch ($force) {
@@ -571,7 +718,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
//Set null
$setFields .= $field->name . " = null, ";
break;
-
+
case 2:
//Set empty
$arrFields[$upperfname] = "";
@@ -580,7 +727,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
default:
case 3:
//Set the value that was given in array, so you can give both null and empty values
- if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === 'null') {
+ if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) {
$setFields .= $field->name . " = null, ";
} else {
$setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq);
@@ -590,7 +737,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
//********************************************************//
} else {
//we do this so each driver can customize the sql for
- //DB specific column types.
+ //DB specific column types.
//Oracle needs BLOB types to be handled with a returning clause
//postgres has special needs as well
$setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,
@@ -611,7 +758,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
// Get the full where clause excluding the word "WHERE" from
// the existing query.
preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause);
-
+
$discard = false;
// not a good hack, improvements?
if ($whereClause) {
@@ -622,12 +769,12 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976
} else
$whereClause = array(false,false);
-
+
if ($discard)
$whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1]));
-
+
$sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2);
- if (strlen($whereClause[1]) > 0)
+ if (strlen($whereClause[1]) > 0)
$sql .= ' WHERE '.$whereClause[1];
return $sql;
@@ -654,14 +801,15 @@ function adodb_key_exists($key, &$arr,$force=2)
* There is a special case of this function for the oci8 driver.
* The proper way to handle an insert w/ a blob in oracle requires
* a returning clause with bind variables and a descriptor blob.
- *
- *
+ *
+ *
*/
function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2)
{
static $cacheRS = false;
static $cacheSig = 0;
static $cacheCols;
+ global $ADODB_QUOTE_FIELDNAMES;
$tableName = '';
$values = '';
@@ -669,21 +817,21 @@ static $cacheCols;
$recordSet = null;
$arrFields = _array_change_key_case($arrFields);
$fieldInsertedCount = 0;
-
+
if (is_string($rs)) {
//ok we have a table name
//try and get the column info ourself.
- $tableName = $rs;
-
+ $tableName = $rs;
+
//we need an object for the recordSet
//because we have to call MetaType.
//php can't do a $rsclass::MetaType()
$rsclass = $zthis->rsPrefix.$zthis->databaseType;
$recordSet = new $rsclass(-1,$zthis->fetchMode);
- $recordSet->connection = &$zthis;
-
+ $recordSet->connection = $zthis;
+
if (is_string($cacheRS) && $cacheRS == $rs) {
- $columns =& $cacheCols;
+ $columns = $cacheCols;
} else {
$columns = $zthis->MetaColumns( $tableName );
$cacheRS = $tableName;
@@ -691,37 +839,45 @@ static $cacheCols;
}
} else if (is_subclass_of($rs, 'adorecordset')) {
if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS == $rs->insertSig) {
- $columns =& $cacheCols;
+ $columns = $cacheCols;
} else {
- for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
+ for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
$columns[] = $rs->FetchField($i);
$cacheRS = $cacheSig;
$cacheCols = $columns;
$rs->insertSig = $cacheSig++;
}
- $recordSet =& $rs;
-
+ $recordSet = $rs;
+
} else {
printf(ADODB_BAD_RS,'GetInsertSQL');
return false;
}
// Loop through all of the fields in the recordset
- foreach( $columns as $field ) {
+ foreach( $columns as $field ) {
$upperfname = strtoupper($field->name);
if (adodb_key_exists($upperfname,$arrFields,$force)) {
$bad = false;
- if (strpos($upperfname,' ') !== false)
- $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
- else
+ if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) {
+ switch ($ADODB_QUOTE_FIELDNAMES) {
+ case 'LOWER':
+ $fnameq = $zthis->nameQuote.strtolower($field->name).$zthis->nameQuote;break;
+ case 'NATIVE':
+ $fnameq = $zthis->nameQuote.$field->name.$zthis->nameQuote;break;
+ case 'UPPER':
+ default:
+ $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;break;
+ }
+ } else
$fnameq = $upperfname;
-
+
$type = $recordSet->MetaType($field->type);
-
+
/********************************************************/
if (is_null($arrFields[$upperfname])
|| (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
- || $arrFields[$upperfname] === 'null'
+ || $arrFields[$upperfname] === $zthis->null2null
)
{
switch ($force) {
@@ -729,11 +885,11 @@ static $cacheCols;
case 0: // we must always set null if missing
$bad = true;
break;
-
+
case 1:
$values .= "null, ";
break;
-
+
case 2:
//Set empty
$arrFields[$upperfname] = "";
@@ -743,7 +899,7 @@ static $cacheCols;
default:
case 3:
//Set the value that was given in array, so you can give both null and empty values
- if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === 'null') {
+ if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) {
$values .= "null, ";
} else {
$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq);
@@ -754,18 +910,18 @@ static $cacheCols;
/*********************************************************/
} else {
//we do this so each driver can customize the sql for
- //DB specific column types.
+ //DB specific column types.
//Oracle needs BLOB types to be handled with a returning clause
//postgres has special needs as well
$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,
$arrFields, $magicq);
}
-
+
if ($bad) continue;
// Set the counter for the number of fields that will be inserted.
$fieldInsertedCount++;
-
-
+
+
// Get the name of the fields to insert
$fields .= $fnameq . ", ";
}
@@ -774,15 +930,15 @@ static $cacheCols;
// If there were any inserted fields then build the rest of the insert query.
if ($fieldInsertedCount <= 0) return false;
-
+
// Get the table name from the existing query.
if (!$tableName) {
if (!empty($rs->tableName)) $tableName = $rs->tableName;
else if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName))
$tableName = $tableName[1];
- else
+ else
return false;
- }
+ }
// Strip off the comma and space on the end of both the fields
// and their values.
@@ -799,20 +955,20 @@ static $cacheCols;
* the update/sql which is generated by GetInsertSQL and GetUpdateSQL.
* It handles the string construction of 1 column -> sql string based on
* the column type. We want to do 'safe' handling of BLOBs
- *
+ *
* @param string the type of sql we are trying to create
- * 'I' or 'U'.
- * @param string column data type from the db::MetaType() method
+ * 'I' or 'U'.
+ * @param string column data type from the db::MetaType() method
* @param string the column name
* @param array the column value
- *
+ *
* @return string
- *
+ *
*/
-function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq)
+function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq)
{
$sql = '';
-
+
// Based on the datatype of the field
// Format the value properly for the database
switch($type) {
@@ -820,7 +976,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie
//in order to handle Blobs correctly, we need
//to do some magic for Oracle
- //we need to create a new descriptor to handle
+ //we need to create a new descriptor to handle
//this properly
if (!empty($zthis->hasReturningInto)) {
if ($action == 'I') {
@@ -837,7 +993,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie
$sql = 'empty_blob(), ';
} else {
$sql = $fnameq. '=empty_blob(), ';
- }
+ }
} else {
//this is to maintain compatibility
//with older adodb versions.
@@ -853,7 +1009,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie
//to avoid conflicts w/ dupes.
if (!empty($zthis->hasReturningInto)) {
if ($action == 'I') {
- $sql = ':xx'.$fname.'xx, ';
+ $sql = ':xx'.$fname.'xx, ';
} else {
$sql = $fnameq.'=:xx'.$fname.'xx, ';
}
@@ -865,18 +1021,18 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie
//this is to maintain compatibility
//with older adodb versions.
$sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false);
- }
+ }
break;
-
+
default:
$sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false);
break;
}
-
+
return $sql;
-}
-
-function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true)
+}
+
+function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true)
{
if ($recurse) {
@@ -886,10 +1042,10 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields,
break;
case 'oci8':
return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq);
-
+
}
}
-
+
switch($type) {
case "C":
case "X":
@@ -905,17 +1061,28 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields,
$val = $zthis->DBTimeStamp($arrFields[$fname]);
break;
+ case "N":
+ $val = $arrFields[$fname];
+ if (!is_numeric($val)) $val = str_replace(',', '.', (float)$val);
+ break;
+
+ case "I":
+ case "R":
+ $val = $arrFields[$fname];
+ if (!is_numeric($val)) $val = (integer) $val;
+ break;
+
default:
- $val = $arrFields[$fname];
+ $val = str_replace(array("'"," ","("),"",$arrFields[$fname]); // basic sql injection defence
if (empty($val)) $val = '0';
break;
}
if ($action == 'I') return $val . ", ";
-
-
+
+
return $fnameq . "=" . $val . ", ";
-
+
}
@@ -926,7 +1093,8 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr)
if ($inputarr) {
foreach($inputarr as $kk=>$vv) {
if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...';
- $ss .= "($kk=>'$vv') ";
+ if (is_null($vv)) $ss .= "($kk=>null) ";
+ else $ss .= "($kk=>'$vv') ";
}
$ss = "[ $ss ]";
}
@@ -937,7 +1105,7 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr)
*/
// check if running from browser or command-line
$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
-
+
$dbt = $zthis->databaseType;
if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType;
if ($inBrowser) {
@@ -945,55 +1113,70 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr)
$ss = '<code>'.htmlspecialchars($ss).'</code>';
}
if ($zthis->debug === -1)
- ADOConnection::outp( "<br />\n($dbt): ".htmlspecialchars($sqlTxt)." $ss\n<br />\n",false);
- else
- ADOConnection::outp( "<hr />\n($dbt): ".htmlspecialchars($sqlTxt)." $ss\n<hr />\n",false);
+ ADOConnection::outp( "<br>\n($dbt): ".htmlspecialchars($sqlTxt)." $ss\n<br>\n",false);
+ else if ($zthis->debug !== -99)
+ ADOConnection::outp( "<hr>\n($dbt): ".htmlspecialchars($sqlTxt)." $ss\n<hr>\n",false);
} else {
- ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false);
+ $ss = "\n ".$ss;
+ if ($zthis->debug !== -99)
+ ADOConnection::outp("-----<hr>\n($dbt): ".$sqlTxt." $ss\n-----<hr>\n",false);
}
$qID = $zthis->_query($sql,$inputarr);
-
- /*
+
+ /*
Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql
because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion
*/
- if ($zthis->databaseType == 'mssql') {
+ if ($zthis->databaseType == 'mssql') {
// ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6
+
if($emsg = $zthis->ErrorMsg()) {
- if ($err = $zthis->ErrorNo()) ADOConnection::outp($err.': '.$emsg);
+ if ($err = $zthis->ErrorNo()) {
+ if ($zthis->debug === -99)
+ ADOConnection::outp( "<hr>\n($dbt): ".htmlspecialchars($sqlTxt)." $ss\n<hr>\n",false);
+
+ ADOConnection::outp($err.': '.$emsg);
+ }
}
} else if (!$qID) {
+
+ if ($zthis->debug === -99)
+ if ($inBrowser) ADOConnection::outp( "<hr>\n($dbt): ".htmlspecialchars($sqlTxt)." $ss\n<hr>\n",false);
+ else ADOConnection::outp("-----<hr>\n($dbt): ".$sqlTxt."$ss\n-----<hr>\n",false);
+
ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg());
}
-
+
if ($zthis->debug === 99) _adodb_backtrace(true,9999,2);
return $qID;
}
# pretty print the debug_backtrace function
-function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0)
+function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0,$ishtml=null)
{
if (!function_exists('debug_backtrace')) return '';
-
- $html = (isset($_SERVER['HTTP_USER_AGENT']));
+
+ if ($ishtml === null) $html = (isset($_SERVER['HTTP_USER_AGENT']));
+ else $html = $ishtml;
+
$fmt = ($html) ? "</font><font color=#808080 size=-1> %% line %4d, file: <a href=\"file:/%s\">%s</a></font>" : "%% line %4d, file: %s";
$MAXSTRLEN = 128;
$s = ($html) ? '<pre align=left>' : '';
-
+
if (is_array($printOrArr)) $traceArr = $printOrArr;
else $traceArr = debug_backtrace();
array_shift($traceArr);
array_shift($traceArr);
$tabs = sizeof($traceArr)-2;
-
+
foreach ($traceArr as $arr) {
if ($skippy) {$skippy -= 1; continue;}
$levels -= 1;
if ($levels < 0) break;
-
+
$args = array();
for ($i=0; $i < $tabs; $i++) $s .= ($html) ? ' ' : "\t";
$tabs -= 1;
@@ -1007,36 +1190,36 @@ function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0)
else if (is_bool($v)) $args[] = $v ? 'true' : 'false';
else {
$v = (string) @$v;
- $str = htmlspecialchars(substr($v,0,$MAXSTRLEN));
+ $str = htmlspecialchars(str_replace(array("\r","\n"),' ',substr($v,0,$MAXSTRLEN)));
if (strlen($v) > $MAXSTRLEN) $str .= '...';
$args[] = $str;
}
}
$s .= $arr['function'].'('.implode(', ',$args).')';
-
-
+
+
$s .= @sprintf($fmt, $arr['line'],$arr['file'],basename($arr['file']));
-
+
$s .= "\n";
- }
+ }
if ($html) $s .= '</pre>';
if ($printOrArr) print $s;
-
+
return $s;
}
/*
-function _adodb_find_from($sql)
+function _adodb_find_from($sql)
{
$sql = str_replace(array("\n","\r"), ' ', $sql);
$charCount = strlen($sql);
-
+
$inString = false;
$quote = '';
$parentheseCount = 0;
$prevChars = '';
$nextChars = '';
-
+
for($i = 0; $i < $charCount; $i++) {
@@ -1066,5 +1249,3 @@ function _adodb_find_from($sql)
}
}
*/
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-memcache.lib.inc.php b/libraries/adodb/adodb-memcache.lib.inc.php
new file mode 100644
index 000000000..42d2be62e
--- /dev/null
+++ b/libraries/adodb/adodb-memcache.lib.inc.php
@@ -0,0 +1,190 @@
+<?php
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+global $ADODB_INCLUDED_MEMCACHE;
+$ADODB_INCLUDED_MEMCACHE = 1;
+
+global $ADODB_INCLUDED_CSV;
+if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+
+/*
+
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
+ Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+Usage:
+
+$db = NewADOConnection($driver);
+$db->memCache = true; /// should we use memCache instead of caching in files
+$db->memCacheHost = array($ip1, $ip2, $ip3);
+$db->memCachePort = 11211; /// this is default memCache port
+$db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
+
+$db->Connect(...);
+$db->CacheExecute($sql);
+
+ Note the memcache class is shared by all connections, is created during the first call to Connect/PConnect.
+
+ Class instance is stored in $ADODB_CACHE
+*/
+
+ class ADODB_Cache_MemCache {
+ var $createdir = false; // create caching directory structure?
+
+ //-----------------------------
+ // memcache specific variables
+
+ var $hosts; // array of hosts
+ var $port = 11211;
+ var $compress = false; // memcache compression with zlib
+
+ var $_connected = false;
+ var $_memcache = false;
+
+ function __construct(&$obj)
+ {
+ $this->hosts = $obj->memCacheHost;
+ $this->port = $obj->memCachePort;
+ $this->compress = $obj->memCacheCompress;
+ }
+
+ // implement as lazy connection. The connection only occurs on CacheExecute call
+ function connect(&$err)
+ {
+ if (!function_exists('memcache_pconnect')) {
+ $err = 'Memcache module PECL extension not found!';
+ return false;
+ }
+
+ $memcache = new MemCache;
+
+ if (!is_array($this->hosts)) $this->hosts = array($this->hosts);
+
+ $failcnt = 0;
+ foreach($this->hosts as $host) {
+ if (!@$memcache->addServer($host,$this->port,true)) {
+ $failcnt += 1;
+ }
+ }
+ if ($failcnt == sizeof($this->hosts)) {
+ $err = 'Can\'t connect to any memcache server';
+ return false;
+ }
+ $this->_connected = true;
+ $this->_memcache = $memcache;
+ return true;
+ }
+
+ // returns true or false. true if successful save
+ function writecache($filename, $contents, $debug, $secs2cache)
+ {
+ if (!$this->_connected) {
+ $err = '';
+ if (!$this->connect($err) && $debug) ADOConnection::outp($err);
+ }
+ if (!$this->_memcache) return false;
+
+ if (!$this->_memcache->set($filename, $contents, $this->compress ? MEMCACHE_COMPRESSED : 0, $secs2cache)) {
+ if ($debug) ADOConnection::outp(" Failed to save data at the memcached server!<br>\n");
+ return false;
+ }
+
+ return true;
+ }
+
+ // returns a recordset
+ function readcache($filename, &$err, $secs2cache, $rsClass)
+ {
+ $false = false;
+ if (!$this->_connected) $this->connect($err);
+ if (!$this->_memcache) return $false;
+
+ $rs = $this->_memcache->get($filename);
+ if (!$rs) {
+ $err = 'Item with such key doesn\'t exists on the memcached server.';
+ return $false;
+ }
+
+ // hack, should actually use _csv2rs
+ $rs = explode("\n", $rs);
+ unset($rs[0]);
+ $rs = join("\n", $rs);
+ $rs = unserialize($rs);
+ if (! is_object($rs)) {
+ $err = 'Unable to unserialize $rs';
+ return $false;
+ }
+ if ($rs->timeCreated == 0) return $rs; // apparently have been reports that timeCreated was set to 0 somewhere
+
+ $tdiff = intval($rs->timeCreated+$secs2cache - time());
+ if ($tdiff <= 2) {
+ switch($tdiff) {
+ case 2:
+ if ((rand() & 15) == 0) {
+ $err = "Timeout 2";
+ return $false;
+ }
+ break;
+ case 1:
+ if ((rand() & 3) == 0) {
+ $err = "Timeout 1";
+ return $false;
+ }
+ break;
+ default:
+ $err = "Timeout 0";
+ return $false;
+ }
+ }
+ return $rs;
+ }
+
+ function flushall($debug=false)
+ {
+ if (!$this->_connected) {
+ $err = '';
+ if (!$this->connect($err) && $debug) ADOConnection::outp($err);
+ }
+ if (!$this->_memcache) return false;
+
+ $del = $this->_memcache->flush();
+
+ if ($debug)
+ if (!$del) ADOConnection::outp("flushall: failed!<br>\n");
+ else ADOConnection::outp("flushall: succeeded!<br>\n");
+
+ return $del;
+ }
+
+ function flushcache($filename, $debug=false)
+ {
+ if (!$this->_connected) {
+ $err = '';
+ if (!$this->connect($err) && $debug) ADOConnection::outp($err);
+ }
+ if (!$this->_memcache) return false;
+
+ $del = $this->_memcache->delete($filename);
+
+ if ($debug)
+ if (!$del) ADOConnection::outp("flushcache: $key entry doesn't exist on memcached server!<br>\n");
+ else ADOConnection::outp("flushcache: $key entry flushed from memcached server!<br>\n");
+
+ return $del;
+ }
+
+ // not used for memcache
+ function createdir($dir, $hash)
+ {
+ return true;
+ }
+ }
diff --git a/libraries/adodb/adodb-pager.inc.php b/libraries/adodb/adodb-pager.inc.php
index 270c3d8d2..fa77d55c7 100644
--- a/libraries/adodb/adodb-pager.inc.php
+++ b/libraries/adodb/adodb-pager.inc.php
@@ -1,22 +1,24 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
- This class provides recordset pagination with
- First/Prev/Next/Last links.
-
+ This class provides recordset pagination with
+ First/Prev/Next/Last links.
+
Feel free to modify this class for your own use as
- it is very basic. To learn how to use it, see the
+ it is very basic. To learn how to use it, see the
example in adodb/tests/testpaging.php.
-
+
"Pablo Costa" <pablo@cbsp.com.br> implemented Render_PageLinks().
-
- Please note, this class is entirely unsupported,
+
+ Please note, this class is entirely unsupported,
and no free support requests except for bug reports
will be entertained by the author.
@@ -29,10 +31,10 @@ class ADODB_Pager {
var $curr_page; // current page number before Render() called, calculated in constructor
var $rows; // number of rows per page
var $linksPerPage=10; // number of links per page in navigation bar
- var $showPageLinks;
+ var $showPageLinks;
var $gridAttributes = 'width=100% border=1 bgcolor=white';
-
+
// Localize text strings here
var $first = '<code>|<</code>';
var $prev = '<code><<</code>';
@@ -45,39 +47,39 @@ class ADODB_Pager {
var $page = 'Page';
var $linkSelectedColor = 'red';
var $cache = 0; #secs to cache with CachePageExecute()
-
+
//----------------------------------------------
// constructor
//
// $db adodb connection object
// $sql sql statement
- // $id optional id to identify which pager,
- // if you have multiple on 1 page.
+ // $id optional id to identify which pager,
+ // if you have multiple on 1 page.
// $id should be only be [a-z0-9]*
//
- function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
+ function __construct(&$db,$sql,$id = 'adodb', $showPageLinks = false)
{
global $PHP_SELF;
-
+
$curr_page = $id.'_curr_page';
- if (empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
-
+ if (!empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
+
$this->sql = $sql;
$this->id = $id;
$this->db = $db;
$this->showPageLinks = $showPageLinks;
-
- $next_page = $id.'_next_page';
-
+
+ $next_page = $id.'_next_page';
+
if (isset($_GET[$next_page])) {
$_SESSION[$curr_page] = (integer) $_GET[$next_page];
}
if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page
-
+
$this->curr_page = $_SESSION[$curr_page];
-
+
}
-
+
//---------------------------
// Display link to first page
function Render_First($anchor=true)
@@ -85,51 +87,51 @@ class ADODB_Pager {
global $PHP_SELF;
if ($anchor) {
?>
- <a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a>
+ <a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a>
<?php
} else {
print "$this->first ";
}
}
-
+
//--------------------------
// Display link to next page
function render_next($anchor=true)
{
global $PHP_SELF;
-
+
if ($anchor) {
?>
- <a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a>
+ <a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a>
<?php
} else {
print "$this->next ";
}
}
-
+
//------------------
// Link to last page
- //
+ //
// for better performance with large recordsets, you can set
// $this->db->pageExecuteCountRows = false, which disables
// last page counting.
function render_last($anchor=true)
{
global $PHP_SELF;
-
+
if (!$this->db->pageExecuteCountRows) return;
-
+
if ($anchor) {
?>
- <a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a>
+ <a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a>
<?php
} else {
print "$this->last ";
}
}
-
+
//---------------------------------------------------
- // original code by "Pablo Costa" <pablo@cbsp.com.br>
+ // original code by "Pablo Costa" <pablo@cbsp.com.br>
function render_pagelinks()
{
global $PHP_SELF;
@@ -146,21 +148,21 @@ class ADODB_Pager {
$end = $start+$linksperpage-1;
$link = $this->id . "_next_page";
if($end > $pages) $end = $pages;
-
-
+
+
if ($this->startLinks && $start > 1) {
$pos = $start - 1;
$numbers .= "<a href=$PHP_SELF?$link=$pos>$this->startLinks</a> ";
- }
-
+ }
+
for($i=$start; $i <= $end; $i++) {
if ($this->rs->AbsolutePage() == $i)
$numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font> ";
- else
+ else
$numbers .= "<a href=$PHP_SELF?$link=$i>$i</a> ";
-
+
}
- if ($this->moreLinks && $end < $pages)
+ if ($this->moreLinks && $end < $pages)
$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a> ";
print $numbers . ' ';
}
@@ -170,13 +172,13 @@ class ADODB_Pager {
global $PHP_SELF;
if ($anchor) {
?>
- <a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a>
- <?php
+ <a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a>
+ <?php
} else {
print "$this->prev ";
}
}
-
+
//--------------------------------------------------------
// Simply rendering of grid. You should override this for
// better control over the format of the grid
@@ -193,7 +195,7 @@ class ADODB_Pager {
ob_end_clean();
return $s;
}
-
+
//-------------------------------------------------------
// Navigation bar
//
@@ -222,7 +224,7 @@ class ADODB_Pager {
ob_end_clean();
return $s;
}
-
+
//-------------------
// This is the footer
function RenderPageCount()
@@ -233,45 +235,45 @@ class ADODB_Pager {
if ($this->curr_page > $lastPage) $this->curr_page = 1;
return "<font size=-1>$this->page ".$this->curr_page."/".$lastPage."</font>";
}
-
+
//-----------------------------------
// Call this class to draw everything.
function Render($rows=10)
{
global $ADODB_COUNTRECS;
-
+
$this->rows = $rows;
-
+
if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL;
-
+
$savec = $ADODB_COUNTRECS;
if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
if ($this->cache)
- $rs = &$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
+ $rs = $this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
else
- $rs = &$this->db->PageExecute($this->sql,$rows,$this->curr_page);
+ $rs = $this->db->PageExecute($this->sql,$rows,$this->curr_page);
$ADODB_COUNTRECS = $savec;
-
- $this->rs = &$rs;
+
+ $this->rs = $rs;
if (!$rs) {
print "<h3>Query failed: $this->sql</h3>";
return;
}
-
- if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage()))
+
+ if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage()))
$header = $this->RenderNav();
else
$header = " ";
-
+
$grid = $this->RenderGrid();
$footer = $this->RenderPageCount();
-
+
$this->RenderLayout($header,$grid,$footer);
-
+
$rs->Close();
$this->rs = false;
}
-
+
//------------------------------------------------------
// override this to control overall layout and formating
function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige')
@@ -285,6 +287,3 @@ class ADODB_Pager {
"</td></tr></table>";
}
}
-
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-pear.inc.php b/libraries/adodb/adodb-pear.inc.php
index 2d36d68fa..c8f09331b 100644
--- a/libraries/adodb/adodb-pear.inc.php
+++ b/libraries/adodb/adodb-pear.inc.php
@@ -1,12 +1,14 @@
<?php
-/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+/**
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
*
* Set tabs to 4 for best viewing.
- *
+ *
* PEAR DB Emulation Layer for ADODB.
*
* The following code is modelled on PEAR DB code by Stig Bakken <ssb@fast.no> |
@@ -15,7 +17,7 @@
/*
We support:
-
+
DB_Common
---------
query - returns PEAR_Error on error
@@ -27,13 +29,13 @@
quote
nextID
disconnect
-
+
getOne
getAssoc
getRow
getCol
getAll
-
+
DB_Result
---------
numRows - returns -1 if not supported
@@ -42,7 +44,7 @@
fetchRows - does not support passing of fetchmode
free
*/
-
+
define('ADODB_PEAR',dirname(__FILE__));
include_once "PEAR.php";
include_once ADODB_PEAR."/adodb-errorpear.inc.php";
@@ -52,10 +54,6 @@ if (!defined('DB_OK')) {
define("DB_OK", 1);
define("DB_ERROR",-1);
-// autoExecute constants
-define('DB_AUTOQUERY_INSERT', 1);
-define('DB_AUTOQUERY_UPDATE', 2);
-
/**
* This is a special constant that tells DB the user hasn't specified
* any particular get mode, so the default should be used.
@@ -109,11 +107,11 @@ class DB
* error
*/
- function &factory($type)
+ function factory($type)
{
include_once(ADODB_DIR."/drivers/adodb-$type.inc.php");
- $obj = &NewADOConnection($type);
- if (!is_object($obj)) $obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
+ $obj = NewADOConnection($type);
+ if (!is_object($obj)) $obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
return $obj;
}
@@ -136,7 +134,7 @@ class DB
* @see DB::parseDSN
* @see DB::isError
*/
- function &connect($dsn, $options = false)
+ function connect($dsn, $options = false)
{
if (is_array($dsn)) {
$dsninfo = $dsn;
@@ -157,9 +155,9 @@ class DB
@include_once("adodb-$type.inc.php");
}
- @$obj =& NewADOConnection($type);
+ @$obj = NewADOConnection($type);
if (!is_object($obj)) {
- $obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
+ $obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
return $obj;
}
if (is_array($options)) {
@@ -183,10 +181,10 @@ class DB
if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket'];
else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port'];
-
+
if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
else $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
-
+
if (!$ok) $obj = ADODB_PEAR_Error();
return $obj;
}
@@ -211,8 +209,8 @@ class DB
function isError($value)
{
if (!is_object($value)) return false;
- $class = get_class($value);
- return $class == 'pear_error' || is_subclass_of($value, 'pear_error') ||
+ $class = strtolower(get_class($value));
+ return $class == 'pear_error' || is_subclass_of($value, 'pear_error') ||
$class == 'db_error' || is_subclass_of($value, 'db_error');
}
@@ -370,5 +368,3 @@ class DB
return true;
}
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-perf.inc.php b/libraries/adodb/adodb-perf.inc.php
index 73237889a..69218c6e0 100644
--- a/libraries/adodb/adodb-perf.inc.php
+++ b/libraries/adodb/adodb-perf.inc.php
@@ -1,19 +1,21 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Library for basic performance monitoring and tuning.
-
+
My apologies if you see code mixed with presentation. The presentation suits
my needs. If you want to separate code from presentation, be my guest. Patches
are welcome.
-
+
*/
if (!defined('ADODB_DIR')) include_once(dirname(__FILE__).'/adodb.inc.php');
@@ -22,28 +24,32 @@ include_once(ADODB_DIR.'/tohtml.inc.php');
define( 'ADODB_OPT_HIGH', 2);
define( 'ADODB_OPT_LOW', 1);
+global $ADODB_PERF_MIN;
+$ADODB_PERF_MIN = 0.05; // log only if >= minimum number of secs to run
+
+
// returns in K the memory of current process, or 0 if not known
function adodb_getmem()
{
if (function_exists('memory_get_usage'))
return (integer) ((memory_get_usage()+512)/1024);
-
+
$pid = getmypid();
-
+
if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) {
$output = array();
-
- exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output);
+
+ exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output);
return substr($output[5], strpos($output[5], ':') + 1);
- }
-
+ }
+
/* Hopefully UNIX */
exec("ps --pid $pid --no-headers -o%mem,size", $output);
if (sizeof($output) == 0) return 0;
-
+
$memarr = explode(' ',$output[0]);
if (sizeof($memarr)>=2) return (integer) $memarr[1];
-
+
return 0;
}
@@ -53,39 +59,43 @@ function adodb_round($n,$prec)
return number_format($n, $prec, '.', '');
}
-/* return microtime value as a float */
+/* obsolete: return microtime value as a float. Retained for backward compat */
function adodb_microtime()
{
- $t = microtime();
- $t = explode(' ',$t);
- return (float)$t[1]+ (float)$t[0];
+ return microtime(true);
}
/* sql code timing */
-function& adodb_log_sql(&$conn,$sql,$inputarr)
+function adodb_log_sql(&$connx,$sql,$inputarr)
{
-
$perf_table = adodb_perf::table();
- $conn->fnExecute = false;
- $t0 = microtime();
- $rs =& $conn->Execute($sql,$inputarr);
- $t1 = microtime();
+ $connx->fnExecute = false;
+ $a0 = microtime(true);
+ $rs = $connx->Execute($sql,$inputarr);
+ $a1 = microtime(true);
+
+ if (!empty($connx->_logsql) && (empty($connx->_logsqlErrors) || !$rs)) {
+ global $ADODB_LOG_CONN;
+
+ if (!empty($ADODB_LOG_CONN)) {
+ $conn = $ADODB_LOG_CONN;
+ if ($conn->databaseType != $connx->databaseType)
+ $prefix = '/*dbx='.$connx->databaseType .'*/ ';
+ else
+ $prefix = '';
+ } else {
+ $conn = $connx;
+ $prefix = '';
+ }
- if (!empty($conn->_logsql)) {
$conn->_logsql = false; // disable logsql error simulation
$dbT = $conn->databaseType;
-
- $a0 = split(' ',$t0);
- $a0 = (float)$a0[1]+(float)$a0[0];
-
- $a1 = split(' ',$t1);
- $a1 = (float)$a1[1]+(float)$a1[0];
-
+
$time = $a1 - $a0;
-
+
if (!$rs) {
- $errM = $conn->ErrorMsg();
- $errN = $conn->ErrorNo();
+ $errM = $connx->ErrorMsg();
+ $errN = $connx->ErrorNo();
$conn->lastInsID = 0;
$tracer = substr('ERROR: '.htmlspecialchars($errM),0,250);
} else {
@@ -94,20 +104,20 @@ function& adodb_log_sql(&$conn,$sql,$inputarr)
$errN = 0;
$dbg = $conn->debug;
$conn->debug = false;
- if (!is_object($rs) || $rs->dataProvider == 'empty')
+ if (!is_object($rs) || $rs->dataProvider == 'empty')
$conn->_affected = $conn->affected_rows(true);
$conn->lastInsID = @$conn->Insert_ID();
$conn->debug = $dbg;
}
if (isset($_SERVER['HTTP_HOST'])) {
$tracer .= '<br>'.$_SERVER['HTTP_HOST'];
- if (isset($_SERVER['PHP_SELF'])) $tracer .= $_SERVER['PHP_SELF'];
- } else
- if (isset($_SERVER['PHP_SELF'])) $tracer .= '<br>'.$_SERVER['PHP_SELF'];
+ if (isset($_SERVER['PHP_SELF'])) $tracer .= htmlspecialchars($_SERVER['PHP_SELF']);
+ } else
+ if (isset($_SERVER['PHP_SELF'])) $tracer .= '<br>'.htmlspecialchars($_SERVER['PHP_SELF']);
//$tracer .= (string) adodb_backtrace(false);
-
+
$tracer = (string) substr($tracer,0,500);
-
+
if (is_array($inputarr)) {
if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);
else {
@@ -124,19 +134,20 @@ function& adodb_log_sql(&$conn,$sql,$inputarr)
} else {
$params = '';
}
-
+
if (is_array($sql)) $sql = $sql[0];
+ if ($prefix) $sql = $prefix.$sql;
$arr = array('b'=>strlen($sql).'.'.crc32($sql),
'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));
//var_dump($arr);
$saved = $conn->debug;
$conn->debug = 0;
-
+
$d = $conn->sysTimeStamp;
if (empty($d)) $d = date("'Y-m-d H:i:s'");
if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
$isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)";
- } else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || $dbT == 'odbtp') {
+ } else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) {
$timer = $arr['f'];
if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
@@ -144,29 +155,35 @@ function& adodb_log_sql(&$conn,$sql,$inputarr)
$sql2 = $conn->qstr($arr['c']);
$params = $conn->qstr($arr['d']);
$tracer = $conn->qstr($arr['e']);
-
+
$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)";
if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);
$arr = false;
} else {
+ if ($dbT == 'db2') $arr['f'] = (float) $arr['f'];
$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
}
- $ok = $conn->Execute($isql,$arr);
+ global $ADODB_PERF_MIN;
+ if ($errN != 0 || $time >= $ADODB_PERF_MIN) {
+ $ok = $conn->Execute($isql,$arr);
+ } else
+ $ok = true;
+
$conn->debug = $saved;
-
+
if ($ok) {
- $conn->_logsql = true;
+ $conn->_logsql = true;
} else {
$err2 = $conn->ErrorMsg();
$conn->_logsql = true; // enable logsql error simulation
- $perf =& NewPerfMonitor($conn);
+ $perf = NewPerfMonitor($conn);
if ($perf) {
if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr);
} else {
$ok = $conn->Execute("create table $perf_table (
created varchar(50),
- sql0 varchar(250),
+ sql0 varchar(250),
sql1 varchar(4000),
params varchar(3000),
tracer varchar(500),
@@ -177,14 +194,14 @@ function& adodb_log_sql(&$conn,$sql,$inputarr)
$conn->_logsql = false;
}
}
- $conn->_errorMsg = $errM;
- $conn->_errorCode = $errN;
- }
- $conn->fnExecute = 'adodb_log_sql';
+ $connx->_errorMsg = $errM;
+ $connx->_errorCode = $errN;
+ }
+ $connx->fnExecute = 'adodb_log_sql';
return $rs;
}
-
+
/*
The settings data structure is an associative array that database parameter per element.
@@ -192,9 +209,9 @@ Each database parameter element in the array is itself an array consisting of:
0: category code, used to group related db parameters
1: either
- a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'",
+ a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'",
b. array holding sql string and field to look for, e.g. array('show variables','table_cache'),
- c. a string prefixed by =, then a PHP method of the class is invoked,
+ c. a string prefixed by =, then a PHP method of the class is invoked,
e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue',
2: description of the database parameter
*/
@@ -209,12 +226,12 @@ class adodb_perf {
var $cliFormat = "%32s => %s \r\n";
var $sql1 = 'sql1'; // used for casting sql1 to text for mssql
var $explain = true;
- var $helpurl = "<a href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL help</a>";
+ var $helpurl = '<a href="http://adodb.sourceforge.net/docs-adodb.htm#logsql">LogSQL help</a>';
var $createTableSQL = false;
var $maxLength = 2000;
-
- // Sets the tablename to be used
- function table($newtable = false)
+
+ // Sets the tablename to be used
+ static function table($newtable = false)
{
static $_table;
@@ -241,32 +258,51 @@ processes 69293
*/
// Algorithm is taken from
- // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
+ // http://social.technet.microsoft.com/Forums/en-US/winservergen/thread/414b0e1b-499c-411e-8a02-6a12e339c0f1/
if (strncmp(PHP_OS,'WIN',3)==0) {
if (PHP_VERSION == '5.0.0') return false;
if (PHP_VERSION == '5.0.1') return false;
if (PHP_VERSION == '5.0.2') return false;
if (PHP_VERSION == '5.0.3') return false;
if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737
-
- @$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");
- if (!$c) return false;
-
- $info[0] = $c->PercentProcessorTime;
- $info[1] = 0;
- $info[2] = 0;
- $info[3] = $c->TimeStamp_Sys100NS;
- //print_r($info);
+
+ static $FAIL = false;
+ if ($FAIL) return false;
+
+ $objName = "winmgmts:{impersonationLevel=impersonate}!\\\\.\\root\\CIMV2";
+ $myQuery = "SELECT * FROM Win32_PerfFormattedData_PerfOS_Processor WHERE Name = '_Total'";
+
+ try {
+ @$objWMIService = new COM($objName);
+ if (!$objWMIService) {
+ $FAIL = true;
+ return false;
+ }
+
+ $info[0] = -1;
+ $info[1] = 0;
+ $info[2] = 0;
+ $info[3] = 0;
+ foreach($objWMIService->ExecQuery($myQuery) as $objItem) {
+ $info[0] = $objItem->PercentProcessorTime();
+ }
+
+ } catch(Exception $e) {
+ $FAIL = true;
+ echo $e->getMessage();
+ return false;
+ }
+
return $info;
}
-
+
// Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com)
$statfile = '/proc/stat';
if (!file_exists($statfile)) return false;
-
+
$fd = fopen($statfile,"r");
if (!$fd) return false;
-
+
$statinfo = explode("\n",fgets($fd, 1024));
fclose($fd);
foreach($statinfo as $line) {
@@ -277,11 +313,11 @@ processes 69293
return $info;
}
}
-
+
return false;
-
+
}
-
+
/* NOT IMPLEMENTED */
function MemInfo()
{
@@ -309,8 +345,8 @@ SwapFree: 2085664 kB
Committed_AS: 348732 kB
*/
}
-
-
+
+
/*
Remember that this is client load, not db server load!
*/
@@ -319,48 +355,47 @@ Committed_AS: 348732 kB
{
$info = $this->_CPULoad();
if (!$info) return false;
-
- if (empty($this->_lastLoad)) {
- sleep(1);
- $this->_lastLoad = $info;
- $info = $this->_CPULoad();
- }
-
- $last = $this->_lastLoad;
- $this->_lastLoad = $info;
-
- $d_user = $info[0] - $last[0];
- $d_nice = $info[1] - $last[1];
- $d_system = $info[2] - $last[2];
- $d_idle = $info[3] - $last[3];
-
- //printf("Delta - User: %f Nice: %f System: %f Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);
if (strncmp(PHP_OS,'WIN',3)==0) {
- if ($d_idle < 1) $d_idle = 1;
- return 100*(1-$d_user/$d_idle);
+ return (integer) $info[0];
}else {
+ if (empty($this->_lastLoad)) {
+ sleep(1);
+ $this->_lastLoad = $info;
+ $info = $this->_CPULoad();
+ }
+
+ $last = $this->_lastLoad;
+ $this->_lastLoad = $info;
+
+ $d_user = $info[0] - $last[0];
+ $d_nice = $info[1] - $last[1];
+ $d_system = $info[2] - $last[2];
+ $d_idle = $info[3] - $last[3];
+
+ //printf("Delta - User: %f Nice: %f System: %f Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);
+
$total=$d_user+$d_nice+$d_system+$d_idle;
if ($total<1) $total=1;
- return 100*($d_user+$d_nice+$d_system)/$total;
+ return 100*($d_user+$d_nice+$d_system)/$total;
}
}
-
+
function Tracer($sql)
{
$perf_table = adodb_perf::table();
$saveE = $this->conn->fnExecute;
$this->conn->fnExecute = false;
-
+
global $ADODB_FETCH_MODE;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-
+
$sqlq = $this->conn->qstr($sql);
$arr = $this->conn->GetArray(
-"select count(*),tracer
- from $perf_table where sql1=$sqlq
+"select count(*),tracer
+ from $perf_table where sql1=$sqlq
group by tracer
order by 1 desc");
$s = '';
@@ -370,66 +405,66 @@ Committed_AS: 348732 kB
$s .= sprintf("%4d",$k[0]).' '.strip_tags($k[1]).'<br>';
}
}
-
+
if (isset($savem)) $this->conn->SetFetchMode($savem);
$ADODB_CACHE_MODE = $save;
$this->conn->fnExecute = $saveE;
return $s;
}
- /*
+ /*
Explain Plan for $sql.
- If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the
+ If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the
actual sql.
*/
function Explain($sql,$partial=false)
- {
+ {
return false;
}
-
+
function InvalidSQL($numsql = 10)
{
-
+
if (isset($_GET['sql'])) return;
$s = '<h3>Invalid SQL</h3>';
$saveE = $this->conn->fnExecute;
$this->conn->fnExecute = false;
$perf_table = adodb_perf::table();
- $rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
+ $rs = $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
$this->conn->fnExecute = $saveE;
if ($rs) {
$s .= rs2html($rs,false,false,false,false);
} else
return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
-
+
return $s;
}
-
+
/*
This script identifies the longest running SQL
- */
+ */
function _SuspiciousSQL($numsql = 10)
{
global $ADODB_FETCH_MODE;
-
+
$perf_table = adodb_perf::table();
$saveE = $this->conn->fnExecute;
$this->conn->fnExecute = false;
-
+
if (isset($_GET['exps']) && isset($_GET['sql'])) {
$partial = !empty($_GET['part']);
echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
}
-
+
if (isset($_GET['sql'])) return;
$sql1 = $this->sql1;
-
+
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
//$this->conn->debug=1;
- $rs =& $this->conn->SelectLimit(
+ $rs = $this->conn->SelectLimit(
"select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
from $perf_table
where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT')
@@ -439,7 +474,7 @@ Committed_AS: 348732 kB
if (isset($savem)) $this->conn->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
$this->conn->fnExecute = $saveE;
-
+
if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
$s = "<h3>Suspicious SQL</h3>
<font size=1>The following SQL have high average execution times</font><br>
@@ -463,15 +498,15 @@ Committed_AS: 348732 kB
$rs->MoveNext();
}
return $s."</table>";
-
+
}
-
+
function CheckMemory()
{
return '';
}
-
-
+
+
function SuspiciousSQL($numsql=10)
{
return adodb_perf::_SuspiciousSQL($numsql);
@@ -482,33 +517,33 @@ Committed_AS: 348732 kB
return adodb_perf::_ExpensiveSQL($numsql);
}
-
+
/*
- This reports the percentage of load on the instance due to the most
- expensive few SQL statements. Tuning these statements can often
- make huge improvements in overall system performance.
+ This reports the percentage of load on the instance due to the most
+ expensive few SQL statements. Tuning these statements can often
+ make huge improvements in overall system performance.
*/
function _ExpensiveSQL($numsql = 10)
{
global $ADODB_FETCH_MODE;
-
+
$perf_table = adodb_perf::table();
$saveE = $this->conn->fnExecute;
$this->conn->fnExecute = false;
-
+
if (isset($_GET['expe']) && isset($_GET['sql'])) {
$partial = !empty($_GET['part']);
echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
}
-
+
if (isset($_GET['sql'])) return;
-
+
$sql1 = $this->sql1;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-
- $rs =& $this->conn->SelectLimit(
+
+ $rs = $this->conn->SelectLimit(
"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
from $perf_table
where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT')
@@ -543,7 +578,7 @@ Committed_AS: 348732 kB
}
return $s."</table>";
}
-
+
/*
Raw function to return parameter value from $settings.
*/
@@ -553,11 +588,11 @@ Committed_AS: 348732 kB
$sql = $this->settings[$param][1];
return $this->_DBParameter($sql);
}
-
+
/*
Raw function returning array of poll paramters
*/
- function &PollParameters()
+ function PollParameters()
{
$arr[0] = (float)$this->DBParameter('data cache hit ratio');
$arr[1] = (float)$this->DBParameter('data reads');
@@ -565,7 +600,7 @@ Committed_AS: 348732 kB
$arr[3] = (integer) $this->DBParameter('current connections');
return $arr;
}
-
+
/*
Low-level Get Database Parameter
*/
@@ -574,7 +609,7 @@ Committed_AS: 348732 kB
$savelog = $this->conn->LogSQL(false);
if (is_array($sql)) {
global $ADODB_FETCH_MODE;
-
+
$sql1 = $sql[0];
$key = $sql[1];
if (sizeof($sql)>2) $pos = $sql[2];
@@ -585,9 +620,9 @@ Committed_AS: 348732 kB
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-
+
$rs = $this->conn->Execute($sql1);
-
+
if (isset($savem)) $this->conn->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
if ($rs) {
@@ -612,70 +647,78 @@ Committed_AS: 348732 kB
$sql = str_replace('$DATABASE',$this->conn->database,$sql);
$ret = $this->conn->GetOne($sql);
$this->conn->LogSQL($savelog);
-
+
return $ret;
}
}
-
+
/*
Warn if cache ratio falls below threshold. Displayed in "Description" column.
*/
function WarnCacheRatio($val)
{
- if ($val < $this->warnRatio)
+ if ($val < $this->warnRatio)
return '<font color=red><b>Cache ratio should be at least '.$this->warnRatio.'%</b></font>';
else return '';
}
-
+
+ function clearsql()
+ {
+ $perf_table = adodb_perf::table();
+ $this->conn->Execute("delete from $perf_table where created<".$this->conn->sysTimeStamp);
+ }
/***********************************************************************************************/
// HIGH LEVEL UI FUNCTIONS
/***********************************************************************************************/
-
+
function UI($pollsecs=5)
{
-
+ global $ADODB_LOG_CONN;
+
$perf_table = adodb_perf::table();
$conn = $this->conn;
-
+
$app = $conn->host;
if ($conn->host && $conn->database) $app .= ', db=';
$app .= $conn->database;
-
+
if ($app) $app .= ', ';
- $savelog = $this->conn->LogSQL(false);
+ $savelog = $this->conn->LogSQL(false);
$info = $conn->ServerInfo();
if (isset($_GET['clearsql'])) {
- $this->conn->Execute("delete from $perf_table");
+ $this->clearsql();
}
$this->conn->LogSQL($savelog);
-
+
// magic quotes
-
+
if (isset($_GET['sql']) && get_magic_quotes_gpc()) {
$_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']);
}
-
+
if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
else $nsql = $_SESSION['ADODB_PERF_SQL'];
-
+
$app .= $info['description'];
-
-
+
+
if (isset($_GET['do'])) $do = $_GET['do'];
else if (isset($_POST['do'])) $do = $_POST['do'];
else if (isset($_GET['sql'])) $do = 'viewsql';
else $do = 'stats';
-
+
if (isset($_GET['nsql'])) {
if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql'];
}
echo "<title>ADOdb Performance Monitor on $app</title><body bgcolor=white>";
if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";
else $form = "<td> </td>";
-
+
$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 "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
@@ -685,26 +728,29 @@ Committed_AS: 348732 kB
"$form",
"</tr></table>";
-
+
switch ($do) {
default:
case 'stats':
+ if (empty($ADODB_LOG_CONN))
+ echo "<p> <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
echo $this->HealthCheck();
//$this->conn->debug=1;
echo $this->CheckMemory();
break;
case 'poll':
- echo "<iframe width=720 height=80%
- src=\"{$_SERVER['PHP_SELF']}?do=poll2&hidem=1\"></iframe>";
+ $self = htmlspecialchars($_SERVER['PHP_SELF']);
+ echo "<iframe width=720 height=80%
+ src=\"{$self}?do=poll2&hidem=1\"></iframe>";
break;
case 'poll2':
echo "<pre>";
$this->Poll($pollsecs);
break;
-
+
case 'dosql':
if (!$allowsql) break;
-
+
$this->DoSQLForm();
break;
case 'viewsql':
@@ -714,13 +760,13 @@ Committed_AS: 348732 kB
echo($this->ExpensiveSQL($nsql));
echo($this->InvalidSQL($nsql));
break;
- case 'tables':
+ case 'tables':
echo $this->Tables(); break;
}
global $ADODB_vers;
echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
}
-
+
/*
Runs in infinite loop, returning real-time statistics
*/
@@ -730,19 +776,19 @@ Committed_AS: 348732 kB
//$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%';
@@ -751,18 +797,18 @@ Committed_AS: 348732 kB
$oslabel = '';
$osval = '';
}
- if ($cnt % 10 == 0) echo " Time ".$oslabel." Hit% Sess Reads/s Writes/s\n";
+ if ($cnt % 10 == 0) echo " Time ".$oslabel." Hit% Sess Reads/s Writes/s\n";
$cnt += 1;
echo date('H:i:s').' '.$osval."$hits $sess $reads $writes\n";
flush();
-
+
if (connection_aborted()) return;
-
+
sleep($secs);
$arro = $arr;
}
}
-
+
/*
Returns basic health check in a command line interface
*/
@@ -770,48 +816,48 @@ Committed_AS: 348732 kB
{
return $this->HealthCheck(true);
}
-
-
+
+
/*
Returns basic health check as HTML
*/
function HealthCheck($cli=false)
{
$saveE = $this->conn->fnExecute;
- $this->conn->fnExecute = false;
+ $this->conn->fnExecute = false;
if ($cli) $html = '';
else $html = $this->table.'<tr><td colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$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 .= "<tr bgcolor=$this->color><td colspan=3><i>$arr</i> </td></tr>";
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) {
@@ -832,53 +878,52 @@ Committed_AS: 348732 kB
if (strlen($val)==0) $val = ' ';
if ($cli) {
$html .= str_replace(' ','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
-
+
}else {
$html .= "<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
}
}
-
+
if (!$cli) $html .= "</table>\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);
$ok = $this->conn->Execute($sql);
$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 +933,7 @@ Committed_AS: 348732 kB
$rows *= 2;
$_SESSION['phplens_sqlrows'] = $rows;
}
-
+
?>
<form method="POST" action="<?php echo $PHP_SELF ?>">
@@ -907,7 +952,7 @@ Committed_AS: 348732 kB
<?php
if (!isset($_REQUEST['sql'])) return;
-
+
$sql = $this->undomq(trim($sql));
if (substr($sql,strlen($sql)-1) === ';') {
$print = true;
@@ -919,7 +964,7 @@ Committed_AS: 348732 kB
foreach($sqla as $sqls) {
if (!$sqls) continue;
-
+
if ($print) {
print "<p>".htmlspecialchars($sqls)."</p>";
flush();
@@ -945,14 +990,14 @@ Committed_AS: 348732 kB
}
} // foreach
}
-
+
function SplitSQL($sql)
{
$arr = explode(';',$sql);
return $arr;
}
-
- function undomq($m)
+
+ function undomq($m)
{
if (get_magic_quotes_gpc()) {
// undo the damage
@@ -963,13 +1008,13 @@ Committed_AS: 348732 kB
return $m;
}
-
+
/************************************************************************/
-
- /**
+
+ /**
* Reorganise multiple table-indices/statistics/..
* OptimizeMode could be given by last Parameter
- *
+ *
* @example
* <pre>
* optimizeTables( 'tableA');
@@ -980,12 +1025,12 @@ Committed_AS: 348732 kB
* <pre>
* optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
* </pre>
- *
+ *
* @param string table name of the table to optimize
* @param int mode optimization-mode
- * <code>ADODB_OPT_HIGH</code> for full optimization
+ * <code>ADODB_OPT_HIGH</code> for full optimization
* <code>ADODB_OPT_LOW</code> for CPU-less optimization
- * Default is LOW <code>ADODB_OPT_LOW</code>
+ * Default is LOW <code>ADODB_OPT_LOW</code>
* @author Markus Staab
* @return Returns <code>true</code> on success and <code>false</code> on error
*/
@@ -993,52 +1038,52 @@ Committed_AS: 348732 kB
{
$args = func_get_args();
$numArgs = func_num_args();
-
+
if ( $numArgs == 0) return false;
-
- $mode = ADODB_OPT_LOW;
+
+ $mode = ADODB_OPT_LOW;
$lastArg = $args[ $numArgs - 1];
if ( !is_string($lastArg)) {
$mode = $lastArg;
unset( $args[ $numArgs - 1]);
}
-
+
foreach( $args as $table) {
$this->optimizeTable( $table, $mode);
}
}
- /**
+ /**
* Reorganise the table-indices/statistics/.. depending on the given mode.
* Default Implementation throws an error.
- *
+ *
* @param string table name of the table to optimize
* @param int mode optimization-mode
- * <code>ADODB_OPT_HIGH</code> for full optimization
+ * <code>ADODB_OPT_HIGH</code> for full optimization
* <code>ADODB_OPT_LOW</code> for CPU-less optimization
- * Default is LOW <code>ADODB_OPT_LOW</code>
+ * Default is LOW <code>ADODB_OPT_LOW</code>
* @author Markus Staab
* @return Returns <code>true</code> on success and <code>false</code> on error
*/
- function OptimizeTable( $table, $mode = ADODB_OPT_LOW)
+ function OptimizeTable( $table, $mode = ADODB_OPT_LOW)
{
ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
return false;
}
-
- /**
+
+ /**
* Reorganise current database.
- * Default implementation loops over all <code>MetaTables()</code> and
+ * Default implementation loops over all <code>MetaTables()</code> and
* optimize each using <code>optmizeTable()</code>
- *
+ *
* @author Markus Staab
* @return Returns <code>true</code> on success and <code>false</code> on error
*/
- function optimizeDatabase()
+ function optimizeDatabase()
{
$conn = $this->conn;
if ( !$conn) return false;
-
+
$tables = $conn->MetaTables( 'TABLES');
if ( !$tables ) return false;
@@ -1047,10 +1092,8 @@ Committed_AS: 348732 kB
return false;
}
}
-
+
return true;
}
- // end hack
+ // end hack
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-php4.inc.php b/libraries/adodb/adodb-php4.inc.php
index 28e1c8f89..132f25d0a 100644
--- a/libraries/adodb/adodb-php4.inc.php
+++ b/libraries/adodb/adodb-php4.inc.php
@@ -1,16 +1,16 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4.
*/
class ADODB_BASE_RS {
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-time.inc.php b/libraries/adodb/adodb-time.inc.php
index 51f69f76c..4d2016c71 100644
--- a/libraries/adodb/adodb-time.inc.php
+++ b/libraries/adodb/adodb-time.inc.php
@@ -1,36 +1,40 @@
<?php
-/**
+/*
ADOdb Date Library, part of the ADOdb abstraction library
-Download: http://phplens.com/phpeverywhere/
+Download: http://adodb.sourceforge.net/#download
+
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix
-and 1970-2038 on Windows due to integer overflow for dates beyond
-those years. This library overcomes these limitations by replacing the
-native function's signed integers (normally 32-bits) with PHP floating
+Because of this, dates are restricted to the years 1901-2038 on Unix
+and 1970-2038 on Windows due to integer overflow for dates beyond
+those years. This library overcomes these limitations by replacing the
+native function's signed integers (normally 32-bits) with PHP floating
point numbers (normally 64-bits).
Dates from 100 A.D. to 3000 A.D. and later
have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the
-future, but this is a theoretical limit as the computation of that year
+2 => 4 digit year conversion. The maximum is billions of years in the
+future, but this is a theoretical limit as the computation of that year
would take too long with the current implementation of adodb_mktime().
This library replaces native functions as follows:
-<pre>
+<pre>
getdate() with adodb_getdate()
- date() with adodb_date()
+ date() with adodb_date()
gmdate() with adodb_gmdate()
mktime() with adodb_mktime()
gmmktime() with adodb_gmmktime()
strftime() with adodb_strftime()
strftime() with adodb_gmstrftime()
</pre>
-
+
The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT,
-and date() will convert from GMT to local time, but daylight savings is
+of date()'s field formats. Mktime() will convert from local time to GMT,
+and date() will convert from GMT to local time, but daylight savings is
not handled currently.
This library is independant of the rest of ADOdb, and can be used
@@ -39,25 +43,25 @@ as standalone code.
PERFORMANCE
For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside
+possible, and only switches to PHP code when the dates fall outside
the 32-bit signed integer range.
GREGORIAN CORRECTION
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
-October 4, 1582 (Julian) was followed immediately by Friday, October 15,
-1582 (Gregorian).
+Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
+October 4, 1582 (Julian) was followed immediately by Friday, October 15,
+1582 (Gregorian).
Since 0.06, we handle this correctly, so:
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
+adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
== 24 * 3600 (1 day)
=============================================================================
COPYRIGHT
-(c) 2003-2005 John Lim and released under BSD-style license except for code by
+(c) 2003-2014 John Lim and released under BSD-style license except for code by
jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
and originally found at http://www.php.net/manual/en/function.mktime.php
@@ -73,14 +77,17 @@ These should be posted to the ADOdb forums at
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 +97,45 @@ outside the 1901 to 2038 range.
The format fields that adodb_date supports:
<pre>
- 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.
</pre>
Unsupported:
<pre>
- 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
</pre>
@@ -138,7 +145,7 @@ Same as adodb_date, but 2nd parameter accepts iso date, eg.
adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
-
+
** FUNCTION adodb_gmdate($fmt, $timestamp = false)
Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
@@ -163,7 +170,7 @@ Convert a timestamp to a formatted GMT date.
** FUNCTION adodb_strftime($fmt, $timestamp = false)
-Convert a timestamp to a formatted local date. Internally converts $fmt into
+Convert a timestamp to a formatted local date. Internally converts $fmt into
adodb_date format, then echo result.
For best results, you can define the local date format yourself. Define a global
@@ -171,56 +178,56 @@ variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-
+
Supported format codes:
<pre>
- %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
-</pre>
+ %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
+</pre>
Unsupported codes:
<pre>
- %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
</pre>
=============================================================================
@@ -230,10 +237,10 @@ NOTES
Useful url for generating test timestamps:
http://www.4webhelp.net/us/timestamp.php
-Possible future optimizations include
+Possible future optimizations include
-a. Using an algorithm similar to Plauger's in "The Standard C Library"
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
+a. Using an algorithm similar to Plauger's in "The Standard C Library"
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
work outside 32-bit signed range, so i decided not to implement it.
b. Implement daylight savings, which looks awfully complicated, see
@@ -241,11 +248,37 @@ b. Implement daylight savings, which looks awfully complicated, see
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 compatability fixes.
+ * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
+ * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
+ * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but
+ 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 +292,7 @@ Added support for negative months in adodb_mktime().
Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
- 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
+In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
- 17 Nov 2004 0.16
@@ -268,7 +301,7 @@ Removed intval typecast in adodb_mktime() for secs, allowing:
Suggested by Ryan.
- 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
This brings it more in line with mktime (still not identical).
- 23 June 2004 0.14
@@ -286,21 +319,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,11 +342,11 @@ Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
- 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to
+Because of daylight savings problems (some systems apply daylight savings to
January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
- 9 Aug 2003 0.10
-Fixed bug with dates after 2038.
+Fixed bug with dates after 2038.
See http://phplens.com/lens/lensforum/msgs.php?id=6980
- 1 July 2003 0.09
@@ -343,14 +376,14 @@ Day overflow for less than one month's days is supported.
- 28 Jan 2003 0.04
-Gregorian correction handled. In PHP5, we might throw an error if
+Gregorian correction handled. In PHP5, we might throw an error if
mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
- 27 Jan 2003 0.03
Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970.
+Fixed calculation of days since start of year for <1970.
- 27 Jan 2003 0.02
@@ -368,16 +401,18 @@ First implementation.
/*
Version Number
*/
-define('ADODB_DATE_VERSION',0.24);
+define('ADODB_DATE_VERSION',0.35);
+
+$ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
/*
- This code was originally for windows. But apparently this problem happens
+ This code was originally for windows. But apparently this problem happens
also with Linux, RH 7.3 and later!
-
+
glibc-2.2.5-34 and greater has been changed to return -1 for dates <
1970. This used to work. The problem exists with RedHat 7.3 and 8.0
echo (mktime(0, 0, 0, 1, 1, 1960)); // prints -1
-
+
References:
http://bugs.php.net/bug.php?id=20048&edit=2
http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
@@ -387,10 +422,13 @@ if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
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 "<b>$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez</b><br>";
+ if ($h == 0) $h = '00';
+ else if ($h < 10) $h = '0'.$h;
+ if ("$y1-$m-$d $h:00:00" != $rez) {
+ print "<b>$y1 error, expected=$y1-$m-$d $h:00:00, adodb=$rez</b><br>";
return false;
}
return true;
@@ -400,10 +438,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<br>";
+
+ echo "error for $fmt, strftime=$s1, adodb=$s2<br>";
return false;
}
@@ -412,50 +450,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)),"<br>";
+
error_reporting(E_ALL);
print "<h4>Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";
@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 '<pre>';
+ echo 'adodb: ',adodb_date($fmt,$t),'<br>';
+ echo 'php : ',date($fmt,$t),'<br>';
+ echo '</pre>';
+
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).'<br>';
-
+
$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).'<br>';
-
+
$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).'<br>';
-
-
+
+
print "<p>Testing gregorian <=> julian conversion<p>";
$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<br>';
-
+
$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<br>';
-
+
$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<br>';
-
+
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 " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";
-
+
print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";
print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";
-
+
print "<p>Testing overflow<p>";
-
+
$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 <br>';
$t = adodb_mktime(0,0,0,4,33,1971);
@@ -468,7 +518,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).' <br>';
$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 <br>';
-
+
print "Testing 2-digit => 4-digit year conversion<p>";
if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
@@ -477,9 +527,10 @@ function adodb_date_test()
if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
-
+
// Test string formating
print "<p>Testing date formating</p>";
+
$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 +553,12 @@ function adodb_date_test()
break;
}
}
- print "<b>Error date(): $ts<br><pre>
+ print "<b>Error date(): $ts<br><pre>
\"$s1\" (date len=".strlen($s1).")
\"$s2\" (adodb_date len=".strlen($s2).")</b></pre><br>";
$fail = true;
}
-
+
$a1 = getdate($ts);
$a2 = adodb_getdate($ts);
$rez = array_diff($a1,$a2);
@@ -520,7 +571,7 @@ function adodb_date_test()
$fail = true;
}
}
-
+
// Test generation of dates outside 1901-2038
print "<p>Testing random dates between 100 and 4000</p>";
adodb_date_test_date(100,1);
@@ -528,7 +579,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 +590,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 +616,65 @@ function adodb_date_test()
else print "<p><b>Failed</b> :-(</p>";
}
+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 +682,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 +691,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 +714,53 @@ 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;
+global $ADODB_DATETIME_CLASS;
+
+ if (!defined('ADODB_TEST_DATES')) $y = false;
+ else if ($y < 1970 || $y >= 2038) $y = false;
+
+ if ($ADODB_DATETIME_CLASS && $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 +786,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,<br>";
+ echo "$i => $s,<br>";
}
}
adodb_date_gentable();
@@ -707,22 +802,22 @@ echo "<hr />$i ";
$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-
+
function adodb_validdate($y,$m,$d)
{
global $_month_table_normal,$_month_table_leaf;
- if (_adodb_is_leap_year($y)) $marr =& $_month_table_leaf;
- else $marr =& $_month_table_normal;
-
+ if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
+ else $marr = $_month_table_normal;
+
if ($m > 12 || $m < 1) return false;
-
+
if ($d > 31 || $d < 1) return false;
-
+
if ($marr[$m] < $d) return false;
-
+
if ($y < 1000 && $y > 3000) return false;
-
+
return true;
}
@@ -736,22 +831,21 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
static $YRS;
global $_month_table_normal,$_month_table_leaf;
- $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
-
+
+ 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 +887,28 @@ global $_month_table_normal,$_month_table_leaf;
1600 => -11676096000);
if ($is_gmt) $origd = $d;
- // The valid range of a 32bit signed timestamp is typically from
+ // The valid range of a 32bit signed timestamp is typically from
// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
//
-
+
# old algorithm iterates through all years. new algorithm does it in
# 10 year blocks
-
+
/*
# old algo
for ($a = 1970 ; --$a >= 0;) {
$lastd = $d;
-
+
if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
else $d += $d365;
-
+
if ($d >= 0) {
$year = $a;
break;
}
}
*/
-
+
$lastsecs = 0;
$lastyear = 1970;
foreach($YRS as $year => $secs) {
@@ -825,27 +919,27 @@ global $_month_table_normal,$_month_table_leaf;
$lastsecs = $secs;
$lastyear = $year;
}
-
+
$d -= $lastsecs;
if (!isset($a)) $a = $lastyear;
-
+
//echo ' yr=',$a,' ', $d,'.';
-
+
for (; --$a >= 0;) {
$lastd = $d;
-
+
if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
else $d += $d365;
-
+
if ($d >= 0) {
$year = $a;
break;
}
}
/**/
-
+
$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-
+
$d = $lastd;
$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
for ($a = 13 ; --$a > 0;) {
@@ -857,17 +951,17 @@ global $_month_table_normal,$_month_table_leaf;
break;
}
}
-
+
$d = $lastd;
$day = $ndays + ceil(($d+1) / ($_day_power));
$d += ($ndays - $day+1)* $_day_power;
$hour = floor($d/$_hour_power);
-
+
} else {
for ($a = 1970 ;; $a++) {
$lastd = $d;
-
+
if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
else $d -= $d365;
if ($d < 0) {
@@ -892,7 +986,7 @@ global $_month_table_normal,$_month_table_leaf;
$d = $d - ($day-1) * $_day_power;
$hour = floor($d /$_hour_power);
}
-
+
$d -= $hour * $_hour_power;
$min = floor($d/$_min_power);
$secs = $d - $min * $_min_power;
@@ -909,8 +1003,8 @@ global $_month_table_normal,$_month_table_leaf;
'ndays' => $ndays
);
}
-
-
+
+
$dow = adodb_dow($year,$month,$day);
return array(
@@ -927,6 +1021,22 @@ global $_month_table_normal,$_month_table_leaf;
0 => $origd
);
}
+/*
+ if ($isphp5)
+ $dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36);
+ else
+ $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36);
+ break;*/
+function adodb_tz_offset($gmt,$isphp5)
+{
+ $zhrs = abs($gmt)/3600;
+ $hrs = floor($zhrs);
+ if ($isphp5)
+ return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
+ else
+ return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
+}
+
function adodb_gmdate($fmt,$d=false)
{
@@ -937,17 +1047,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);
}
@@ -958,63 +1068,79 @@ function adodb_date2($fmt, $d=false, $is_gmt=false)
function adodb_date($fmt,$d=false,$is_gmt=false)
{
static $daylight;
+global $ADODB_DATETIME_CLASS;
+static $jan1_1971;
+
+
+ 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
+
+ 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':
+ if ($ADODB_DATETIME_CLASS) {
+ $dt = new DateTime();
+ $dt->SetDate($year,$month,$day);
+ $dates .= $dt->Format('T');
+ } else
+ $dates .= date('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,$isphp5);
break;
-
+
case 'Y': $dates .= $year; break;
case 'y': $dates .= substr($year,strlen($year)-2,2); break;
// MONTH
@@ -1031,50 +1157,47 @@ static $daylight;
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,$isphp5);
break;
-
- case 'H':
- if ($hour < 10) $dates .= '0'.$hour;
- else $dates .= $hour;
+
+ case 'H':
+ if ($hour < 10) $dates .= '0'.$hour;
+ else $dates .= $hour;
break;
- case 'h':
- if ($hour > 12) $hh = $hour - 12;
+ case 'h':
+ if ($hour > 12) $hh = $hour - 12;
else {
- if ($hour == 0) $hh = '12';
+ if ($hour == 0) $hh = '12';
else $hh = $hour;
}
-
+
if ($hh < 10) $dates .= '0'.$hh;
else $dates .= $hh;
break;
-
- case 'G':
+
+ case 'G':
$dates .= $hour;
break;
-
+
case 'g':
- if ($hour > 12) $hh = $hour - 12;
+ if ($hour > 12) $hh = $hour - 12;
else {
- if ($hour == 0) $hh = '12';
- else $hh = $hour;
+ if ($hour == 0) $hh = '12';
+ else $hh = $hour;
}
$dates .= $hh;
break;
@@ -1096,7 +1219,7 @@ static $daylight;
default:
$dates .= $fmt[$i]; break;
// ESCAPE
- case "\\":
+ case "\\":
$i++;
if ($i < $max) $dates .= $fmt[$i];
break;
@@ -1106,7 +1229,7 @@ static $daylight;
}
/**
- 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 +1240,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 +1279,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 +1292,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 +1311,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 +1321,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 +1340,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,7 +1368,7 @@ global $ADODB_DATE_LOCALE;
}
}
-
+
if (empty($ADODB_DATE_LOCALE)) {
/*
$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
@@ -1252,11 +1380,11 @@ global $ADODB_DATE_LOCALE;
$sep = substr($dstr,2,1);
$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
$hasAM = strrpos($tstr,'M') !== false;
-
+
$ADODB_DATE_LOCALE = array();
- $ADODB_DATE_LOCALE[] = strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';
+ $ADODB_DATE_LOCALE[] = strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';
$ADODB_DATE_LOCALE[] = ($hasAM) ? 'h:i:s a' : 'H:i:s';
-
+
}
$inpct = false;
$fmtdate = '';
@@ -1269,7 +1397,7 @@ global $ADODB_DATE_LOCALE;
} else
$inpct = true;
} else if ($inpct) {
-
+
$inpct = false;
switch($ch) {
case '0':
@@ -1285,9 +1413,9 @@ global $ADODB_DATE_LOCALE;
case 'E':
case 'O':
/* ignore format modifiers */
- $inpct = true;
+ $inpct = true;
break;
-
+
case 'a': $fmtdate .= 'D'; break;
case 'A': $fmtdate .= 'l'; break;
case 'h':
@@ -1332,6 +1460,3 @@ global $ADODB_DATE_LOCALE;
$ret = adodb_date($fmtdate, $ts, $is_gmt);
return $ret;
}
-
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-xmlschema.inc.php b/libraries/adodb/adodb-xmlschema.inc.php
index 22b76621e..ca5fa5678 100644
--- a/libraries/adodb/adodb-xmlschema.inc.php
+++ b/libraries/adodb/adodb-xmlschema.inc.php
@@ -1,9 +1,9 @@
<?php
// Copyright (c) 2004 ars Cognita Inc., all rights reserved
/* ******************************************************************************
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
*******************************************************************************/
/**
* xmlschema is a class that allows the user to quickly and easily
@@ -17,15 +17,15 @@
* @package axmls
* @tutorial getting_started.pkg
*/
-
-function _file_get_contents($file)
+
+function _file_get_contents($file)
{
if (function_exists('file_get_contents')) return file_get_contents($file);
-
+
$f = fopen($file,'r');
if (!$f) return '';
$t = '';
-
+
while ($s = fread($f,100000)) $t .= $s;
fclose($f);
return $t;
@@ -104,62 +104,61 @@ if( !defined( '_ADODB_LAYER' ) ) {
* @access private
*/
class dbObject {
-
+
/**
* var object Parent
*/
var $parent;
-
+
/**
* var string current element
*/
var $currentElement;
-
+
/**
* NOP
*/
- function dbObject( &$parent, $attributes = NULL ) {
- $this->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 +169,7 @@ class dbObject {
function supportedPlatform( $platform = NULL ) {
return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
}
-
+
/**
* Returns the prefix set by the ranking ancestor of the database object.
*
@@ -180,7 +179,7 @@ class dbObject {
function prefix( $name = '' ) {
return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
}
-
+
/**
* Extracts a field ID from the specified field.
*
@@ -204,79 +203,75 @@ class dbObject {
* @access private
*/
class dbTable extends dbObject {
-
+
/**
* @var string Table name
*/
var $name;
-
+
/**
* @var array Field specifier: Meta-information about each field
*/
var $fields = array();
-
+
/**
* @var array List of table indexes.
*/
var $indexes = array();
-
+
/**
* @var array Table options: Table-level options
*/
var $opts = array();
-
+
/**
* @var string Field index: Keeps track of which field is currently being processed
*/
var $current_field;
-
+
/**
* @var boolean Mark table for destruction
* @access private
*/
var $drop_table;
-
+
/**
* @var boolean Mark field for destruction (not yet implemented)
* @access private
*/
var $drop_field = array();
- var $alter; // GS Fix for constraint impl
-
+
/**
* 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']);
- // GS Fix for constraint impl
- if(isset($attributes['ALTER']))
- {
- $this->alter = $attributes['ALTER'];
- }
}
-
+
/**
- * 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':
@@ -288,7 +283,7 @@ class dbTable extends dbObject {
$fieldType = $attributes['TYPE'];
$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-
+
$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
break;
case 'KEY':
@@ -299,12 +294,12 @@ class dbTable extends dbObject {
break;
case 'DEFAULT':
// Add a field option to the table object
-
+
// Work around ADOdb datadict issue that misinterprets empty strings.
if( $attributes['VALUE'] == '' ) {
$attributes['VALUE'] = " '' ";
}
-
+
$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
break;
case 'DEFDATE':
@@ -316,7 +311,7 @@ class dbTable extends dbObject {
// print_r( array( $tag, $attributes ) );
}
}
-
+
/**
* XML Callback to process CDATA elements
*
@@ -329,18 +324,18 @@ class dbTable extends dbObject {
if( isset( $this->current_field ) ) {
$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
} else {
- $this->addTableOpt('CONSTRAINTS', $cdata ); // GS Fix for constraint impl
+ $this->addTableOpt( $cdata );
}
break;
// Table option
case 'OPT':
- $this->addTableOpt('mysql', $cdata ); // GS Fix for constraint impl
+ $this->addTableOpt( $cdata );
break;
default:
-
+
}
}
-
+
/**
* XML Callback to process end elements
*
@@ -348,7 +343,7 @@ class dbTable extends dbObject {
*/
function _tag_close( &$parser, $tag ) {
$this->currentElement = '';
-
+
switch( strtoupper( $tag ) ) {
case 'TABLE':
$this->parent->addSQL( $this->create( $this->parent ) );
@@ -361,36 +356,36 @@ class dbTable extends dbObject {
}
}
-
+
/**
* 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
@@ -418,31 +413,31 @@ class dbTable extends dbObject {
*/
function addField( $name, $type, $size = NULL, $opts = NULL ) {
$field_id = $this->FieldID( $name );
-
+
// Set the field index so we know where we are
$this->current_field = $field_id;
-
+
// Set the field name (required)
$this->fields[$field_id]['NAME'] = $name;
-
+
// Set the field type (required)
$this->fields[$field_id]['TYPE'] = $type;
-
+
// Set the field size (optional)
if( isset( $size ) ) {
$this->fields[$field_id]['SIZE'] = $size;
}
-
+
// Set the field options
if( isset( $opts ) ) {
$this->fields[$field_id]['OPTS'][] = $opts;
}
}
-
+
/**
* Adds a field option to the current field specifier
*
- * This method adds a field option allowed by the ADOdb datadict
+ * This method adds a field option allowed by the ADOdb datadict
* and appends it to the given field.
*
* @param string $field Field name
@@ -458,7 +453,7 @@ class dbTable extends dbObject {
$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
}
}
-
+
/**
* Adds an option to the table
*
@@ -468,13 +463,14 @@ class dbTable extends dbObject {
* @param string $opt Table option
* @return array Options
*/
- function addTableOpt($key, $opt ) { // GS Fix for constraint impl
- //$this->opts[] = $opt;
- $this->opts[$key] = $opt;
-
+ function addTableOpt( $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
*
@@ -483,28 +479,28 @@ class dbTable extends dbObject {
*/
function create( &$xmls ) {
$sql = array();
-
+
// drop any existing indexes
if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
foreach( $legacy_indexes as $index => $index_details ) {
$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
}
}
-
+
// remove fields to be dropped from table object
foreach( $this->drop_field as $field ) {
unset( $this->fields[$field] );
}
-
+
// if table exists
if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
// drop table
if( $this->drop_table ) {
$sql[] = $xmls->dict->DropTableSQL( $this->name );
-
+
return $sql;
}
-
+
// drop any existing fields not in schema
foreach( $legacy_fields as $field_id => $field ) {
if( !isset( $this->fields[$field_id] ) ) {
@@ -516,27 +512,27 @@ class dbTable extends dbObject {
if( $this->drop_table ) {
return $sql;
}
-
+
$legacy_fields = array();
}
-
+
// Loop through the field specifier array, building the associative array for the field options
$fldarray = array();
-
+
foreach( $this->fields as $field_id => $finfo ) {
// Set an empty size if it isn't supplied
if( !isset( $finfo['SIZE'] ) ) {
$finfo['SIZE'] = '';
}
-
+
// Initialize the field array with the type and size
$fldarray[$field_id] = array(
'NAME' => $finfo['NAME'],
'TYPE' => $finfo['TYPE'],
'SIZE' => $finfo['SIZE']
);
-
- // Loop through the options array and add the field options.
+
+ // Loop through the options array and add the field options.
if( isset( $finfo['OPTS'] ) ) {
foreach( $finfo['OPTS'] as $opt ) {
// Option has an argument.
@@ -550,8 +546,9 @@ class dbTable extends dbObject {
}
}
}
- }
- if( empty( $legacy_fields ) && !isset($this->alter)) { // GS Fix for constraint impl
+ }
+
+ if( empty( $legacy_fields ) ) {
// Create the new table
$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
logMsg( end( $sql ), 'Generated CreateTableSQL' );
@@ -562,7 +559,7 @@ class dbTable extends dbObject {
// Use ChangeTableSQL
case 'ALTER':
logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
- $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts, $this->alter ); // GS Fix for constraint impl
+ $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
break;
case 'REPLACE':
logMsg( 'Doing upgrade REPLACE (testing)' );
@@ -574,18 +571,18 @@ class dbTable extends dbObject {
return array();
}
}
-
+
foreach( $this->indexes as $index ) {
$sql[] = $index->create( $xmls );
}
-
+
if( isset( $this->data ) ) {
$sql[] = $this->data->create( $xmls );
}
-
+
return $sql;
}
-
+
/**
* Marks a field or table for destruction
*/
@@ -616,28 +613,28 @@ class dbTable extends dbObject {
* @access private
*/
class dbIndex extends dbObject {
-
+
/**
* @var string Index name
*/
var $name;
-
+
/**
* @var array Index options: Index-level options
*/
var $opts = array();
-
+
/**
* @var array Indexed fields: Table columns included in this index
*/
var $columns = array();
-
+
/**
* @var boolean Mark index for destruction
* @access private
*/
var $drop = FALSE;
-
+
/**
* Initializes the new dbIndex object.
*
@@ -646,23 +643,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();
@@ -679,7 +676,7 @@ class dbIndex extends dbObject {
// print_r( array( $tag, $attributes ) );
}
}
-
+
/**
* XML Callback to process CDATA elements
*
@@ -694,10 +691,10 @@ class dbIndex extends dbObject {
$this->addField( $cdata );
break;
default:
-
+
}
}
-
+
/**
* XML Callback to process end elements
*
@@ -705,14 +702,14 @@ class dbIndex extends dbObject {
*/
function _tag_close( &$parser, $tag ) {
$this->currentElement = '';
-
+
switch( strtoupper( $tag ) ) {
case 'INDEX':
xml_set_object( $parser, $this->parent );
break;
}
}
-
+
/**
* Adds a field to the index
*
@@ -721,11 +718,11 @@ class dbIndex extends dbObject {
*/
function addField( $name ) {
$this->columns[$this->FieldID( $name )] = $name;
-
+
// Return the field list
return $this->columns;
}
-
+
/**
* Adds options to the index
*
@@ -734,11 +731,11 @@ class dbIndex extends dbObject {
*/
function addIndexOpt( $opt ) {
$this->opts[] = $opt;
-
+
// Return the options list
return $this->opts;
}
-
+
/**
* Generates the SQL that will create the index in the database
*
@@ -749,17 +746,17 @@ class dbIndex extends dbObject {
if( $this->drop ) {
return NULL;
}
-
+
// eliminate any columns that aren't in the table
foreach( $this->columns as $id => $col ) {
if( !isset( $this->parent->fields[$id] ) ) {
unset( $this->columns[$id] );
}
}
-
+
return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
}
-
+
/**
* Marks an index for destruction
*/
@@ -777,11 +774,11 @@ class dbIndex extends dbObject {
* @access private
*/
class dbData extends dbObject {
-
+
var $data = array();
-
+
var $row;
-
+
/**
* Initializes the new dbIndex object.
*
@@ -790,21 +787,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 );
@@ -816,7 +813,7 @@ class dbData extends dbObject {
// print_r( array( $tag, $attributes ) );
}
}
-
+
/**
* XML Callback to process CDATA elements
*
@@ -831,10 +828,10 @@ class dbData extends dbObject {
$this->addData( $cdata );
break;
default:
-
+
}
}
-
+
/**
* XML Callback to process end elements
*
@@ -842,14 +839,14 @@ class dbData extends dbObject {
*/
function _tag_close( &$parser, $tag ) {
$this->currentElement = '';
-
+
switch( strtoupper( $tag ) ) {
case 'DATA':
xml_set_object( $parser, $this->parent );
break;
}
}
-
+
/**
* Adds a field to the index
*
@@ -862,11 +859,11 @@ class dbData extends dbObject {
} else {
$name = count($this->data[$this->row]);
}
-
+
// Set the field index so we know where we are
$this->current_field = $this->FieldID( $name );
}
-
+
/**
* Adds options to the index
*
@@ -877,14 +874,14 @@ class dbData extends dbObject {
if( !isset( $this->data[$this->row] ) ) {
$this->data[$this->row] = array();
}
-
+
if( !isset( $this->data[$this->row][$this->current_field] ) ) {
$this->data[$this->row][$this->current_field] = '';
}
-
+
$this->data[$this->row][$this->current_field] .= $cdata;
}
-
+
/**
* Generates the SQL that will create the index in the database
*
@@ -895,12 +892,12 @@ class dbData extends dbObject {
$table = $xmls->dict->TableName($this->parent->name);
$table_field_count = count($this->parent->fields);
$sql = array();
-
+
// eliminate any columns that aren't in the table
foreach( $this->data as $row ) {
$table_fields = $this->parent->fields;
$fields = array();
-
+
foreach( $row as $field_id => $field_data ) {
if( !array_key_exists( $field_id, $table_fields ) ) {
if( is_numeric( $field_id ) ) {
@@ -909,9 +906,9 @@ class dbData extends dbObject {
continue;
}
}
-
+
$name = $table_fields[$field_id]['NAME'];
-
+
switch( $table_fields[$field_id]['TYPE'] ) {
case 'C':
case 'C2':
@@ -929,15 +926,15 @@ class dbData extends dbObject {
default:
$fields[$name] = $field_data;
}
-
+
unset($table_fields[$field_id]);
}
-
+
// check that at least 1 column is specified
if( empty( $fields ) ) {
continue;
}
-
+
// check that no required columns are missing
if( count( $fields ) < $table_field_count ) {
foreach( $table_fields as $field ) {
@@ -947,10 +944,10 @@ class dbData extends dbObject {
}
}
}
-
+
$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
}
-
+
return $sql;
}
}
@@ -962,43 +959,43 @@ class dbData extends dbObject {
* @access private
*/
class dbQuerySet extends dbObject {
-
+
/**
* @var array List of SQL queries
*/
var $queries = array();
-
+
/**
* @var string String used to build of a query line by line
*/
var $query;
-
+
/**
* @var string Query prefix key
*/
var $prefixKey = '';
-
+
/**
* @var boolean Auto prefix enable (TRUE)
*/
var $prefixMethod = 'AUTO';
-
+
/**
* Initializes the query set.
*
* @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':
@@ -1012,20 +1009,20 @@ class dbQuerySet extends dbObject {
break;
}
}
-
+
/**
- * XML Callback to process start elements. Elements currently
- * processed are: QUERY.
+ * XML Callback to process start elements. Elements currently
+ * processed are: QUERY.
*
* @access private
*/
function _tag_open( &$parser, $tag, $attributes ) {
$this->currentElement = strtoupper( $tag );
-
+
switch( $this->currentElement ) {
case 'QUERY':
// Create a new query in a SQL queryset.
- // Ignore this query set if a platform is specified and it's different than the
+ // Ignore this query set if a platform is specified and it's different than the
// current connection platform.
if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
$this->newQuery();
@@ -1037,7 +1034,7 @@ class dbQuerySet extends dbObject {
// print_r( array( $tag, $attributes ) );
}
}
-
+
/**
* XML Callback to process CDATA elements
*/
@@ -1048,10 +1045,10 @@ class dbQuerySet extends dbObject {
$this->buildQuery( $cdata );
break;
default:
-
+
}
}
-
+
/**
* XML Callback to process end elements
*
@@ -1059,7 +1056,7 @@ class dbQuerySet extends dbObject {
*/
function _tag_close( &$parser, $tag ) {
$this->currentElement = '';
-
+
switch( strtoupper( $tag ) ) {
case 'QUERY':
// Add the finished query to the open query set.
@@ -1071,10 +1068,10 @@ class dbQuerySet extends dbObject {
$this->destroy();
break;
default:
-
+
}
}
-
+
/**
* Re-initializes the query.
*
@@ -1082,10 +1079,10 @@ class dbQuerySet extends dbObject {
*/
function newQuery() {
$this->query = '';
-
+
return TRUE;
}
-
+
/**
* Discards the existing query.
*
@@ -1093,11 +1090,11 @@ class dbQuerySet extends dbObject {
*/
function discardQuery() {
unset( $this->query );
-
+
return TRUE;
}
-
- /**
+
+ /**
* Appends a line to a query that is being built line by line
*
* @param string $data Line of SQL data or NULL to initialize a new query
@@ -1107,12 +1104,12 @@ class dbQuerySet extends dbObject {
if( !isset( $this->query ) OR empty( $sql ) ) {
return FALSE;
}
-
+
$this->query .= $sql;
-
+
return $this->query;
}
-
+
/**
* Adds a completed query to the query list
*
@@ -1122,14 +1119,14 @@ class dbQuerySet extends dbObject {
if( !isset( $this->query ) ) {
return FALSE;
}
-
+
$this->queries[] = $return = trim($this->query);
-
+
unset( $this->query );
-
+
return $return;
}
-
+
/**
* Creates and returns the current query set
*
@@ -1141,16 +1138,16 @@ class dbQuerySet extends dbObject {
switch( $this->prefixMethod ) {
case 'AUTO':
// Enable auto prefix replacement
-
+
// Process object prefix.
// Evaluate SQL statements to prepend prefix to objects
$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-
+
// SELECT statements aren't working yet
#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-
+
case 'MANUAL':
// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
// If prefixKey is not set, we use the default constant XMLS_PREFIX
@@ -1162,14 +1159,14 @@ class dbQuerySet extends dbObject {
$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
}
}
-
+
$this->queries[$id] = trim( $query );
}
-
+
// Return the query set array
return $this->queries;
}
-
+
/**
* Rebuilds the query with the prefix attached to any objects
*
@@ -1182,33 +1179,33 @@ class dbQuerySet extends dbObject {
if( !isset( $prefix ) ) {
return $query;
}
-
+
if( preg_match( $regex, $query, $match ) ) {
$preamble = $match[1];
$postamble = $match[5];
$objectList = explode( ',', $match[3] );
// $prefix = $prefix . '_';
-
+
$prefixedList = '';
-
+
foreach( $objectList as $object ) {
if( $prefixedList !== '' ) {
$prefixedList .= ', ';
}
-
+
$prefixedList .= $prefix . trim( $object );
}
-
+
$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
}
-
+
return $query;
}
}
/**
* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-*
+*
* This class is used to load and parse the XML file, to create an array of SQL statements
* that can be used to build a database, and to build the database using the SQL array.
*
@@ -1220,82 +1217,82 @@ class dbQuerySet extends dbObject {
* @package axmls
*/
class adoSchema {
-
+
/**
* @var array Array containing SQL queries to generate all objects
* @access private
*/
var $sqlArray;
-
+
/**
* @var object ADOdb connection object
* @access private
*/
var $db;
-
+
/**
* @var object ADOdb Data Dictionary
* @access private
*/
var $dict;
-
+
/**
* @var string Current XML element
* @access private
*/
var $currentElement = '';
-
+
/**
* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
* @access private
*/
var $upgrade = '';
-
+
/**
* @var string Optional object prefix
* @access private
*/
var $objectPrefix = '';
-
+
/**
* @var long Original Magic Quotes Runtime value
* @access private
*/
var $mgq;
-
+
/**
* @var long System debug
* @access private
*/
var $debug;
-
+
/**
* @var string Regular expression to find schema version
* @access private
*/
var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-
+
/**
* @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
*
@@ -1305,12 +1302,13 @@ class adoSchema {
*
* @param object $db ADOdb database connection object.
*/
- function adoSchema( &$db ) {
+ function __construct( $db ) {
// Initialize the environment
$this->mgq = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
-
- $this->db =& $db;
+ ini_set("magic_quotes_runtime", 0);
+ #set_magic_quotes_runtime(0);
+
+ $this->db = $db;
$this->debug = $this->db->debug;
$this->dict = NewDataDictionary( $this->db );
$this->sqlArray = array();
@@ -1319,7 +1317,7 @@ class adoSchema {
$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
$this->setUpgradeMethod();
}
-
+
/**
* Sets the method to be used for upgrading an existing database
*
@@ -1340,9 +1338,9 @@ class adoSchema {
if( !is_string( $method ) ) {
return FALSE;
}
-
+
$method = strtoupper( $method );
-
+
// Handle the upgrade methods
switch( $method ) {
case 'ALTER':
@@ -1361,10 +1359,10 @@ class adoSchema {
// Use default if no legitimate method is passed.
$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
}
-
+
return $this->upgrade;
}
-
+
/**
* Enables/disables inline SQL execution.
*
@@ -1382,10 +1380,10 @@ class adoSchema {
if( is_bool( $mode ) ) {
$this->executeInline = $mode;
}
-
+
return $this->executeInline;
}
-
+
/**
* Enables/disables SQL continue on error.
*
@@ -1403,15 +1401,15 @@ class adoSchema {
if( is_bool( $mode ) ) {
$this->continueOnError = $mode;
}
-
+
return $this->continueOnError;
}
-
+
/**
* Loads an XML schema from a file and converts it to SQL.
*
* Call this method to load the specified schema (see the DTD for the proper format) from
- * the filesystem and generate the SQL necessary to create the database described.
+ * the filesystem and generate the SQL necessary to create the database described.
* @see ParseSchemaString()
*
* @param string $file Name of XML schema file.
@@ -1421,11 +1419,11 @@ class adoSchema {
function ParseSchema( $filename, $returnSchema = FALSE ) {
return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
}
-
+
/**
* Loads an XML schema from a file and converts it to SQL.
*
- * Call this method to load the specified schema from a file (see the DTD for the proper format)
+ * Call this method to load the specified schema from a file (see the DTD for the proper format)
* and generate the SQL necessary to create the database described by the schema.
*
* @param string $file Name of XML schema file.
@@ -1441,12 +1439,12 @@ class adoSchema {
// die( 'Unable to open file' );
return FALSE;
}
-
+
// do version detection here
if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
return FALSE;
}
-
+
if ( $returnSchema )
{
$xmlstring = '';
@@ -1455,11 +1453,11 @@ class adoSchema {
}
return $xmlstring;
}
-
+
$this->success = 2;
-
+
$xmlParser = $this->create_parser();
-
+
// Process the file
while( $data = fread( $fp, 4096 ) ) {
if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
@@ -1470,17 +1468,17 @@ class adoSchema {
) );
}
}
-
+
xml_parser_free( $xmlParser );
-
+
return $this->sqlArray;
}
-
+
/**
* Converts an XML schema string to SQL.
*
* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
- * and generate the SQL necessary to create the database described by the schema.
+ * and generate the SQL necessary to create the database described by the schema.
* @see ParseSchema()
*
* @param string $xmlstring XML schema string.
@@ -1491,21 +1489,21 @@ class adoSchema {
if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
return FALSE;
}
-
+
// do version detection here
if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
return FALSE;
}
-
+
if ( $returnSchema )
{
return $xmlstring;
}
-
+
$this->success = 2;
-
+
$xmlParser = $this->create_parser();
-
+
if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
die( sprintf(
"XML error: %s at line %d",
@@ -1513,12 +1511,12 @@ class adoSchema {
xml_get_current_line_number( $xmlParser)
) );
}
-
+
xml_parser_free( $xmlParser );
-
+
return $this->sqlArray;
}
-
+
/**
* Loads an XML schema from a file and converts it to uninstallation SQL.
*
@@ -1533,12 +1531,12 @@ class adoSchema {
function RemoveSchema( $filename, $returnSchema = FALSE ) {
return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
}
-
+
/**
* Converts an XML schema string to uninstallation SQL.
*
* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
- * and generate the SQL necessary to uninstall the database described by the schema.
+ * and generate the SQL necessary to uninstall the database described by the schema.
* @see RemoveSchema()
*
* @param string $schema XML schema string.
@@ -1546,20 +1544,20 @@ class adoSchema {
* @return array Array of SQL queries, ready to execute.
*/
function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-
+
// grab current version
if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
return FALSE;
}
-
+
return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
}
-
+
/**
* Applies the current XML schema to the database (post execution).
*
- * Call this method to apply the current schema (generally created by calling
- * ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
+ * Call this method to apply the current schema (generally created by calling
+ * ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
* and executing other SQL specified in the schema) after parsing.
* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
*
@@ -1572,25 +1570,25 @@ class adoSchema {
if( !is_bool( $continueOnErr ) ) {
$continueOnErr = $this->ContinueOnError();
}
-
+
if( !isset( $sqlArray ) ) {
$sqlArray = $this->sqlArray;
}
-
+
if( !is_array( $sqlArray ) ) {
$this->success = 0;
} else {
$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
}
-
+
return $this->success;
}
-
+
/**
- * Returns the current SQL array.
+ * Returns the current SQL array.
*
- * Call this method to fetch the array of SQL queries resulting from
- * ParseSchema() or ParseSchemaString().
+ * Call this method to fetch the array of SQL queries resulting from
+ * ParseSchema() or ParseSchemaString().
*
* @param string $format Format: HTML, TEXT, or NONE (PHP array)
* @return array Array of SQL statements or FALSE if an error occurs
@@ -1599,7 +1597,7 @@ class adoSchema {
$sqlArray = null;
return $this->getSQL( $format, $sqlArray );
}
-
+
/**
* Saves the current SQL array to the local filesystem as a list of SQL queries.
*
@@ -1607,25 +1605,25 @@ class adoSchema {
* parsed XML schema) to the filesystem.
*
* @param string $filename Path and name where the file should be saved.
- * @return boolean TRUE if save is successful, else FALSE.
+ * @return boolean TRUE if save is successful, else FALSE.
*/
function SaveSQL( $filename = './schema.sql' ) {
-
+
if( !isset( $sqlArray ) ) {
$sqlArray = $this->sqlArray;
}
if( !isset( $sqlArray ) ) {
return FALSE;
}
-
+
$fp = fopen( $filename, "w" );
-
+
foreach( $sqlArray as $key => $query ) {
fwrite( $fp, $query . ";\n" );
}
fclose( $fp );
}
-
+
/**
* Create an xml parser
*
@@ -1633,18 +1631,18 @@ class adoSchema {
*
* @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
*
@@ -1665,9 +1663,9 @@ class adoSchema {
default:
// print_r( array( $tag, $attributes ) );
}
-
+
}
-
+
/**
* XML Callback to process CDATA elements
*
@@ -1675,7 +1673,7 @@ class adoSchema {
*/
function _tag_cdata( &$parser, $cdata ) {
}
-
+
/**
* XML Callback to process end elements
*
@@ -1683,16 +1681,16 @@ class adoSchema {
* @internal
*/
function _tag_close( &$parser, $tag ) {
-
+
}
-
+
/**
* Converts an XML schema string to the specified DTD version.
*
* Call this method to convert a string containing an XML schema to a different AXMLS
- * DTD version. For instance, to convert a schema created for an pre-1.0 version for
- * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
- * parameter is specified, the schema will be converted to the current DTD version.
+ * DTD version. For instance, to convert a schema created for an pre-1.0 version for
+ * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+ * parameter is specified, the schema will be converted to the current DTD version.
* If the newFile parameter is provided, the converted schema will be written to the specified
* file.
* @see ConvertSchemaFile()
@@ -1703,44 +1701,44 @@ class adoSchema {
* @return string Converted XML schema or FALSE if an error occurs.
*/
function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-
+
// grab current version
if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
return FALSE;
}
-
+
if( !isset ($newVersion) ) {
$newVersion = $this->schemaVersion;
}
-
+
if( $version == $newVersion ) {
$result = $schema;
} else {
$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
}
-
+
if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
fwrite( $fp, $result );
fclose( $fp );
}
-
+
return $result;
}
-
+
// compat for pre-4.3 - jlim
function _file_get_contents($path)
{
if (function_exists('file_get_contents')) return file_get_contents($path);
return join('',file($path));
}
-
+
/**
* Converts an XML schema file to the specified DTD version.
*
* Call this method to convert the specified XML schema file to a different AXMLS
- * DTD version. For instance, to convert a schema created for an pre-1.0 version for
- * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
- * parameter is specified, the schema will be converted to the current DTD version.
+ * DTD version. For instance, to convert a schema created for an pre-1.0 version for
+ * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+ * parameter is specified, the schema will be converted to the current DTD version.
* If the newFile parameter is provided, the converted schema will be written to the specified
* file.
* @see ConvertSchemaString()
@@ -1751,19 +1749,19 @@ class adoSchema {
* @return string Converted XML schema or FALSE if an error occurs.
*/
function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-
+
// grab current version
if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
return FALSE;
}
-
+
if( !isset ($newVersion) ) {
$newVersion = $this->schemaVersion;
}
-
+
if( $version == $newVersion ) {
$result = _file_get_contents( $filename );
-
+
// remove unicode BOM if present
if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
$result = substr( $result, 3 );
@@ -1771,36 +1769,36 @@ class adoSchema {
} else {
$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
}
-
+
if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
fwrite( $fp, $result );
fclose( $fp );
}
-
+
return $result;
}
-
+
function TransformSchema( $schema, $xsl, $schematype='string' )
{
// Fail if XSLT extension is not available
if( ! function_exists( 'xslt_create' ) ) {
return FALSE;
}
-
+
$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-
+
// look for xsl
if( !is_readable( $xsl_file ) ) {
return FALSE;
}
-
+
switch( $schematype )
{
case 'file':
if( !is_readable( $schema ) ) {
return FALSE;
}
-
+
$schema = _file_get_contents( $schema );
break;
case 'string':
@@ -1809,26 +1807,26 @@ class adoSchema {
return FALSE;
}
}
-
+
$arguments = array (
'/_xml' => $schema,
'/_xsl' => _file_get_contents( $xsl_file )
);
-
+
// create an XSLT processor
$xh = xslt_create ();
-
+
// set error handler
xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-
+
// process the schema
- $result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
-
+ $result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
+
xslt_free ($xh);
-
+
return $result;
}
-
+
/**
* Processes XSLT transformation errors
*
@@ -1848,7 +1846,7 @@ class adoSchema {
'Error Number' => $errno,
'Level' => $level
);
-
+
switch( $fields['URI'] ) {
case 'arg:/_xml':
$msg['Input'] = 'XML';
@@ -1859,7 +1857,7 @@ class adoSchema {
default:
$msg['Input'] = $fields['URI'];
}
-
+
$msg['Line'] = $fields['line'];
} else {
$msg = array(
@@ -1869,19 +1867,19 @@ class adoSchema {
'Fields' => var_export( $fields, TRUE )
);
}
-
+
$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
. '<table>' . "\n";
-
+
foreach( $msg as $label => $details ) {
$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
}
-
+
$error_details .= '</table>';
-
+
trigger_error( $error_details, E_USER_ERROR );
}
-
+
/**
* Returns the AXMLS Schema Version of the requested XML schema file.
*
@@ -1897,17 +1895,17 @@ class adoSchema {
// die( 'Unable to open file' );
return FALSE;
}
-
+
// Process the file
while( $data = fread( $fp, 4096 ) ) {
if( preg_match( $this->versionRegex, $data, $matches ) ) {
return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
}
}
-
+
return FALSE;
}
-
+
/**
* Returns the AXMLS Schema Version of the provided XML schema string.
*
@@ -1921,125 +1919,125 @@ class adoSchema {
if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
return FALSE;
}
-
+
if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
}
-
+
return FALSE;
}
-
+
/**
* Extracts an XML schema from an existing database.
*
* Call this method to create an XML schema string from an existing database.
* If the data parameter is set to TRUE, AXMLS will include the data from the database
- * in the schema.
+ * in the schema.
*
* @param boolean $data Include data in schema dump
* @return string Generated XML schema
*/
function ExtractSchema( $data = FALSE ) {
$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-
+
$schema = '<?xml version="1.0"?>' . "\n"
. '<schema version="' . $this->schemaVersion . '">' . "\n";
-
+
if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
foreach( $tables as $table ) {
$schema .= ' <table name="' . $table . '">' . "\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[] = '<KEY/>';
} elseif( $details->not_null ) {
$content[] = '<NOTNULL/>';
}
-
+
if( $details->has_default ) {
$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
}
-
+
if( $details->auto_increment ) {
$content[] = '<AUTOINCREMENT/>';
}
-
+
// this stops the creation of 'R' columns,
// AUTOINCREMENT is used to create auto columns
$details->primary_key = 0;
$type = $rs->MetaType( $details );
-
+
$schema .= ' <field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
-
+
if( !empty( $content ) ) {
$schema .= "\n " . implode( "\n ", $content ) . "\n ";
}
-
+
$schema .= '</field>' . "\n";
}
}
-
+
if( is_array( $indexes ) ) {
foreach( $indexes as $index => $details ) {
$schema .= ' <index name="' . $index . '">' . "\n";
-
+
if( $details['unique'] ) {
$schema .= ' <UNIQUE/>' . "\n";
}
-
+
foreach( $details['columns'] as $column ) {
$schema .= ' <col>' . $column . '</col>' . "\n";
}
-
+
$schema .= ' </index>' . "\n";
}
}
-
+
if( $data ) {
$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-
+
if( is_object( $rs ) ) {
$schema .= ' <data>' . "\n";
-
+
while( $row = $rs->FetchRow() ) {
foreach( $row as $key => $val ) {
$row[$key] = htmlentities($val);
}
-
+
$schema .= ' <row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
}
-
+
$schema .= ' </data>' . "\n";
}
}
-
+
$schema .= ' </table>' . "\n";
}
}
-
+
$this->db->SetFetchMode( $old_mode );
-
+
$schema .= '</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.
@@ -2060,17 +2058,17 @@ class adoSchema {
logMsg( 'Invalid prefix: ' . $prefix );
return FALSE;
}
-
+
if( $underscore AND substr( $prefix, -1 ) != '_' ) {
$prefix .= '_';
}
-
+
// prefix valid
logMsg( 'Set prefix: ' . $prefix );
$this->objectPrefix = $prefix;
return TRUE;
}
-
+
/**
* Returns an object name with the current prefix prepended.
*
@@ -2086,11 +2084,11 @@ class adoSchema {
// prepend after quote if used
return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
}
-
+
// No prefix set. Use name provided.
return $name;
}
-
+
/**
* Checks if element references a specific platform
*
@@ -2101,7 +2099,7 @@ class adoSchema {
*/
function supportedPlatform( $platform = NULL ) {
$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-
+
if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
logMsg( "Platform $platform is supported" );
return TRUE;
@@ -2110,7 +2108,7 @@ class adoSchema {
return FALSE;
}
}
-
+
/**
* Clears the array of generated SQL.
*
@@ -2119,7 +2117,7 @@ class adoSchema {
function clearSQL() {
$this->sqlArray = array();
}
-
+
/**
* Adds SQL into the SQL array.
*
@@ -2127,58 +2125,58 @@ class adoSchema {
* @return boolean TRUE if successful, else FALSE.
*
* @access private
- */
+ */
function addSQL( $sql = NULL ) {
if( is_array( $sql ) ) {
foreach( $sql as $line ) {
$this->addSQL( $line );
}
-
+
return TRUE;
}
-
+
if( is_string( $sql ) ) {
$this->sqlArray[] = $sql;
-
+
// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
$saved = $this->db->debug;
$this->db->debug = $this->debug;
$ok = $this->db->Execute( $sql );
$this->db->debug = $saved;
-
+
if( !$ok ) {
if( $this->debug ) {
ADOConnection::outp( $this->db->ErrorMsg() );
}
-
+
$this->success = 1;
}
}
-
+
return TRUE;
}
-
+
return FALSE;
}
-
+
/**
* Gets the SQL array in the specified format.
*
* @param string $format Format
* @return mixed SQL
- *
+ *
* @access private
*/
function getSQL( $format = NULL, $sqlArray = NULL ) {
if( !is_array( $sqlArray ) ) {
$sqlArray = $this->sqlArray;
}
-
+
if( !is_array( $sqlArray ) ) {
return FALSE;
}
-
+
switch( strtolower( $format ) ) {
case 'string':
case 'text':
@@ -2186,10 +2184,10 @@ class adoSchema {
case'html':
return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
}
-
+
return $this->sqlArray;
}
-
+
/**
* Destroys an adoSchema object.
*
@@ -2197,8 +2195,8 @@ class adoSchema {
* @deprecated adoSchema now cleans up automatically.
*/
function Destroy() {
- set_magic_quotes_runtime( $this->mgq );
- unset( $this );
+ ini_set("magic_quotes_runtime", $this->mgq );
+ #set_magic_quotes_runtime( $this->mgq );
}
}
@@ -2210,18 +2208,17 @@ class adoSchema {
function logMsg( $msg, $title = NULL, $force = FALSE ) {
if( XMLS_DEBUG or $force ) {
echo '<pre>';
-
+
if( isset( $title ) ) {
echo '<h3>' . htmlentities( $title ) . '</h3>';
}
-
+
if( is_object( $this ) ) {
echo '[' . get_class( $this ) . '] ';
}
-
+
print_r( $msg );
-
+
echo '</pre>';
}
}
-?>
diff --git a/libraries/adodb/adodb-xmlschema03.inc.php b/libraries/adodb/adodb-xmlschema03.inc.php
index 468f878b3..c1ecb885d 100644
--- a/libraries/adodb/adodb-xmlschema03.inc.php
+++ b/libraries/adodb/adodb-xmlschema03.inc.php
@@ -1,9 +1,9 @@
<?php
// Copyright (c) 2004-2005 ars Cognita Inc., all rights reserved
/* ******************************************************************************
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
*******************************************************************************/
/**
* xmlschema is a class that allows the user to quickly and easily
@@ -17,15 +17,15 @@
* @package axmls
* @tutorial getting_started.pkg
*/
-
-function _file_get_contents($file)
+
+function _file_get_contents($file)
{
if (function_exists('file_get_contents')) return file_get_contents($file);
-
+
$f = fopen($file,'r');
if (!$f) return '';
$t = '';
-
+
while ($s = fread($f,100000)) $t .= $s;
fclose($f);
return $t;
@@ -122,62 +122,61 @@ if( !defined( '_ADODB_LAYER' ) ) {
* @access private
*/
class dbObject {
-
+
/**
* var object Parent
*/
var $parent;
-
+
/**
* var string current element
*/
var $currentElement;
-
+
/**
* NOP
*/
- function dbObject( &$parent, $attributes = NULL ) {
- $this->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.
@@ -188,7 +187,7 @@ class dbObject {
function supportedPlatform( $platform = NULL ) {
return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
}
-
+
/**
* Returns the prefix set by the ranking ancestor of the database object.
*
@@ -198,7 +197,7 @@ class dbObject {
function prefix( $name = '' ) {
return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
}
-
+
/**
* Extracts a field ID from the specified field.
*
@@ -222,80 +221,82 @@ class dbObject {
* @access private
*/
class dbTable extends dbObject {
-
+
/**
* @var string Table name
*/
var $name;
-
+
/**
* @var array Field specifier: Meta-information about each field
*/
var $fields = array();
-
+
/**
* @var array List of table indexes.
*/
var $indexes = array();
-
+
/**
* @var array Table options: Table-level options
*/
var $opts = array();
-
+
/**
* @var string Field index: Keeps track of which field is currently being processed
*/
var $current_field;
-
+
/**
* @var boolean Mark table for destruction
* @access private
*/
var $drop_table;
-
+
/**
* @var boolean Mark field for destruction (not yet implemented)
* @access private
*/
var $drop_field = array();
-
+
/**
* @var array Platform-specific options
* @access private
*/
var $currentPlatform = true;
-
-
+
+
/**
* Iniitializes a new table object.
*
* @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':
@@ -307,7 +308,7 @@ class dbTable extends dbObject {
$fieldType = $attributes['TYPE'];
$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
$fieldOpts = !empty( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-
+
$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
break;
case 'KEY':
@@ -321,12 +322,12 @@ class dbTable extends dbObject {
break;
case 'DEFAULT':
// Add a field option to the table object
-
+
// Work around ADOdb datadict issue that misinterprets empty strings.
if( $attributes['VALUE'] == '' ) {
$attributes['VALUE'] = " '' ";
}
-
+
$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
break;
case 'OPT':
@@ -338,7 +339,7 @@ class dbTable extends dbObject {
// print_r( array( $tag, $attributes ) );
}
}
-
+
/**
* XML Callback to process CDATA elements
*
@@ -363,10 +364,10 @@ class dbTable extends dbObject {
}
break;
default:
-
+
}
}
-
+
/**
* XML Callback to process end elements
*
@@ -374,7 +375,7 @@ class dbTable extends dbObject {
*/
function _tag_close( &$parser, $tag ) {
$this->currentElement = '';
-
+
switch( strtoupper( $tag ) ) {
case 'TABLE':
$this->parent->addSQL( $this->create( $this->parent ) );
@@ -392,36 +393,36 @@ class dbTable extends dbObject {
}
}
-
+
/**
* 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
@@ -449,21 +450,21 @@ class dbTable extends dbObject {
*/
function addField( $name, $type, $size = NULL, $opts = NULL ) {
$field_id = $this->FieldID( $name );
-
+
// Set the field index so we know where we are
$this->current_field = $field_id;
-
+
// Set the field name (required)
$this->fields[$field_id]['NAME'] = $name;
-
+
// Set the field type (required)
$this->fields[$field_id]['TYPE'] = $type;
-
+
// Set the field size (optional)
if( isset( $size ) ) {
$this->fields[$field_id]['SIZE'] = $size;
}
-
+
// Set the field options
if( isset( $opts ) ) {
$this->fields[$field_id]['OPTS'] = array($opts);
@@ -471,11 +472,11 @@ class dbTable extends dbObject {
$this->fields[$field_id]['OPTS'] = array();
}
}
-
+
/**
* Adds a field option to the current field specifier
*
- * This method adds a field option allowed by the ADOdb datadict
+ * This method adds a field option allowed by the ADOdb datadict
* and appends it to the given field.
*
* @param string $field Field name
@@ -493,7 +494,7 @@ class dbTable extends dbObject {
}
}
}
-
+
/**
* Adds an option to the table
*
@@ -504,12 +505,13 @@ class dbTable extends dbObject {
* @return array Options
*/
function addTableOpt( $opt ) {
- if( $this->currentPlatform ) {
- $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
*
@@ -518,28 +520,28 @@ class dbTable extends dbObject {
*/
function create( &$xmls ) {
$sql = array();
-
+
// drop any existing indexes
if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
foreach( $legacy_indexes as $index => $index_details ) {
$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
}
}
-
+
// remove fields to be dropped from table object
foreach( $this->drop_field as $field ) {
unset( $this->fields[$field] );
}
-
+
// if table exists
if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
// drop table
if( $this->drop_table ) {
$sql[] = $xmls->dict->DropTableSQL( $this->name );
-
+
return $sql;
}
-
+
// drop any existing fields not in schema
foreach( $legacy_fields as $field_id => $field ) {
if( !isset( $this->fields[$field_id] ) ) {
@@ -551,27 +553,27 @@ class dbTable extends dbObject {
if( $this->drop_table ) {
return $sql;
}
-
+
$legacy_fields = array();
}
-
+
// Loop through the field specifier array, building the associative array for the field options
$fldarray = array();
-
+
foreach( $this->fields as $field_id => $finfo ) {
// Set an empty size if it isn't supplied
if( !isset( $finfo['SIZE'] ) ) {
$finfo['SIZE'] = '';
}
-
+
// Initialize the field array with the type and size
$fldarray[$field_id] = array(
'NAME' => $finfo['NAME'],
'TYPE' => $finfo['TYPE'],
'SIZE' => $finfo['SIZE']
);
-
- // Loop through the options array and add the field options.
+
+ // Loop through the options array and add the field options.
if( isset( $finfo['OPTS'] ) ) {
foreach( $finfo['OPTS'] as $opt ) {
// Option has an argument.
@@ -586,7 +588,7 @@ class dbTable extends dbObject {
}
}
}
-
+
if( empty( $legacy_fields ) ) {
// Create the new table
$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
@@ -610,18 +612,18 @@ class dbTable extends dbObject {
return array();
}
}
-
+
foreach( $this->indexes as $index ) {
$sql[] = $index->create( $xmls );
}
-
+
if( isset( $this->data ) ) {
$sql[] = $this->data->create( $xmls );
}
-
+
return $sql;
}
-
+
/**
* Marks a field or table for destruction
*/
@@ -652,28 +654,28 @@ class dbTable extends dbObject {
* @access private
*/
class dbIndex extends dbObject {
-
+
/**
* @var string Index name
*/
var $name;
-
+
/**
* @var array Index options: Index-level options
*/
var $opts = array();
-
+
/**
* @var array Indexed fields: Table columns included in this index
*/
var $columns = array();
-
+
/**
* @var boolean Mark index for destruction
* @access private
*/
var $drop = FALSE;
-
+
/**
* Initializes the new dbIndex object.
*
@@ -682,23 +684,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();
@@ -715,7 +717,7 @@ class dbIndex extends dbObject {
// print_r( array( $tag, $attributes ) );
}
}
-
+
/**
* XML Callback to process CDATA elements
*
@@ -730,10 +732,10 @@ class dbIndex extends dbObject {
$this->addField( $cdata );
break;
default:
-
+
}
}
-
+
/**
* XML Callback to process end elements
*
@@ -741,14 +743,14 @@ class dbIndex extends dbObject {
*/
function _tag_close( &$parser, $tag ) {
$this->currentElement = '';
-
+
switch( strtoupper( $tag ) ) {
case 'INDEX':
xml_set_object( $parser, $this->parent );
break;
}
}
-
+
/**
* Adds a field to the index
*
@@ -757,11 +759,11 @@ class dbIndex extends dbObject {
*/
function addField( $name ) {
$this->columns[$this->FieldID( $name )] = $name;
-
+
// Return the field list
return $this->columns;
}
-
+
/**
* Adds options to the index
*
@@ -770,11 +772,11 @@ class dbIndex extends dbObject {
*/
function addIndexOpt( $opt ) {
$this->opts[] = $opt;
-
+
// Return the options list
return $this->opts;
}
-
+
/**
* Generates the SQL that will create the index in the database
*
@@ -785,17 +787,17 @@ class dbIndex extends dbObject {
if( $this->drop ) {
return NULL;
}
-
+
// eliminate any columns that aren't in the table
foreach( $this->columns as $id => $col ) {
if( !isset( $this->parent->fields[$id] ) ) {
unset( $this->columns[$id] );
}
}
-
+
return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
}
-
+
/**
* Marks an index for destruction
*/
@@ -814,11 +816,11 @@ class dbIndex extends dbObject {
* @access private
*/
class dbData extends dbObject {
-
+
var $data = array();
-
+
var $row;
-
+
/**
* Initializes the new dbData object.
*
@@ -827,21 +829,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 ) {
$this->currentElement = strtoupper( $tag );
-
+
switch( $this->currentElement ) {
case 'ROW':
$this->row = count( $this->data );
@@ -853,7 +855,7 @@ class dbData extends dbObject {
// print_r( array( $tag, $attributes ) );
}
}
-
+
/**
* XML Callback to process CDATA elements
*
@@ -868,10 +870,10 @@ class dbData extends dbObject {
$this->addData( $cdata );
break;
default:
-
+
}
}
-
+
/**
* XML Callback to process end elements
*
@@ -879,14 +881,14 @@ class dbData extends dbObject {
*/
function _tag_close( &$parser, $tag ) {
$this->currentElement = '';
-
+
switch( strtoupper( $tag ) ) {
case 'DATA':
xml_set_object( $parser, $this->parent );
break;
}
}
-
+
/**
* Adds a field to the insert
*
@@ -898,20 +900,20 @@ class dbData extends dbObject {
if( !isset( $this->row ) || !isset( $this->data[$this->row] ) ) {
return;
}
-
+
// Set the field index so we know where we are
if( isset( $attributes['NAME'] ) ) {
$this->current_field = $this->FieldID( $attributes['NAME'] );
} else {
$this->current_field = count( $this->data[$this->row] );
}
-
+
// initialise data
if( !isset( $this->data[$this->row][$this->current_field] ) ) {
$this->data[$this->row][$this->current_field] = '';
}
}
-
+
/**
* Adds options to the index
*
@@ -925,7 +927,7 @@ class dbData extends dbObject {
$this->data[$this->row][$this->current_field] .= $cdata;
}
}
-
+
/**
* Generates the SQL that will add/update the data in the database
*
@@ -935,22 +937,22 @@ class dbData extends dbObject {
function create( &$xmls ) {
$table = $xmls->dict->TableName($this->parent->name);
$table_field_count = count($this->parent->fields);
- $tables = $xmls->db->MetaTables();
+ $tables = $xmls->db->MetaTables();
$sql = array();
-
+
$ukeys = $xmls->db->MetaPrimaryKeys( $table );
if( !empty( $this->parent->indexes ) and !empty( $ukeys ) ) {
foreach( $this->parent->indexes as $indexObj ) {
if( !in_array( $indexObj->name, $ukeys ) ) $ukeys[] = $indexObj->name;
}
}
-
+
// eliminate any columns that aren't in the table
foreach( $this->data as $row ) {
$table_fields = $this->parent->fields;
$fields = array();
$rawfields = array(); // Need to keep some of the unprocessed data on hand.
-
+
foreach( $row as $field_id => $field_data ) {
if( !array_key_exists( $field_id, $table_fields ) ) {
if( is_numeric( $field_id ) ) {
@@ -959,9 +961,9 @@ class dbData extends dbObject {
continue;
}
}
-
+
$name = $table_fields[$field_id]['NAME'];
-
+
switch( $table_fields[$field_id]['TYPE'] ) {
case 'I':
case 'I1':
@@ -978,16 +980,16 @@ class dbData extends dbObject {
$fields[$name] = $xmls->db->qstr( $field_data );
$rawfields[$name] = $field_data;
}
-
+
unset($table_fields[$field_id]);
-
+
}
-
+
// check that at least 1 column is specified
if( empty( $fields ) ) {
continue;
}
-
+
// check that no required columns are missing
if( count( $fields ) < $table_field_count ) {
foreach( $table_fields as $field ) {
@@ -996,27 +998,27 @@ class dbData extends dbObject {
}
}
}
-
+
// The rest of this method deals with updating existing data records.
-
+
if( !in_array( $table, $tables ) or ( $mode = $xmls->existingData() ) == XMLS_MODE_INSERT ) {
// Table doesn't yet exist, so it's safe to insert.
logMsg( "$table doesn't exist, inserting or mode is INSERT" );
$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
continue;
}
-
+
// Prepare to test for potential violations. Get primary keys and unique indexes
$mfields = array_merge( $fields, $rawfields );
$keyFields = array_intersect( $ukeys, array_keys( $mfields ) );
-
+
if( empty( $ukeys ) or count( $keyFields ) == 0 ) {
// No unique keys in schema, so safe to insert
logMsg( "Either schema or data has no unique keys, so safe to insert" );
$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
continue;
}
-
+
// Select record containing matching unique keys.
$where = '';
foreach( $ukeys as $key ) {
@@ -1056,43 +1058,43 @@ class dbData extends dbObject {
* @access private
*/
class dbQuerySet extends dbObject {
-
+
/**
* @var array List of SQL queries
*/
var $queries = array();
-
+
/**
* @var string String used to build of a query line by line
*/
var $query;
-
+
/**
* @var string Query prefix key
*/
var $prefixKey = '';
-
+
/**
* @var boolean Auto prefix enable (TRUE)
*/
var $prefixMethod = 'AUTO';
-
+
/**
* Initializes the query set.
*
* @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 +1108,20 @@ class dbQuerySet extends dbObject {
break;
}
}
-
+
/**
- * XML Callback to process start elements. Elements currently
- * processed are: QUERY.
+ * XML Callback to process start elements. Elements currently
+ * processed are: QUERY.
*
* @access private
*/
function _tag_open( &$parser, $tag, $attributes ) {
$this->currentElement = strtoupper( $tag );
-
+
switch( $this->currentElement ) {
case 'QUERY':
// Create a new query in a SQL queryset.
- // Ignore this query set if a platform is specified and it's different than the
+ // Ignore this query set if a platform is specified and it's different than the
// current connection platform.
if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
$this->newQuery();
@@ -1131,7 +1133,7 @@ class dbQuerySet extends dbObject {
// print_r( array( $tag, $attributes ) );
}
}
-
+
/**
* XML Callback to process CDATA elements
*/
@@ -1142,10 +1144,10 @@ class dbQuerySet extends dbObject {
$this->buildQuery( $cdata );
break;
default:
-
+
}
}
-
+
/**
* XML Callback to process end elements
*
@@ -1153,7 +1155,7 @@ class dbQuerySet extends dbObject {
*/
function _tag_close( &$parser, $tag ) {
$this->currentElement = '';
-
+
switch( strtoupper( $tag ) ) {
case 'QUERY':
// Add the finished query to the open query set.
@@ -1165,10 +1167,10 @@ class dbQuerySet extends dbObject {
$this->destroy();
break;
default:
-
+
}
}
-
+
/**
* Re-initializes the query.
*
@@ -1176,10 +1178,10 @@ class dbQuerySet extends dbObject {
*/
function newQuery() {
$this->query = '';
-
+
return TRUE;
}
-
+
/**
* Discards the existing query.
*
@@ -1187,11 +1189,11 @@ class dbQuerySet extends dbObject {
*/
function discardQuery() {
unset( $this->query );
-
+
return TRUE;
}
-
- /**
+
+ /**
* Appends a line to a query that is being built line by line
*
* @param string $data Line of SQL data or NULL to initialize a new query
@@ -1201,12 +1203,12 @@ class dbQuerySet extends dbObject {
if( !isset( $this->query ) OR empty( $sql ) ) {
return FALSE;
}
-
+
$this->query .= $sql;
-
+
return $this->query;
}
-
+
/**
* Adds a completed query to the query list
*
@@ -1216,14 +1218,14 @@ class dbQuerySet extends dbObject {
if( !isset( $this->query ) ) {
return FALSE;
}
-
+
$this->queries[] = $return = trim($this->query);
-
+
unset( $this->query );
-
+
return $return;
}
-
+
/**
* Creates and returns the current query set
*
@@ -1235,16 +1237,16 @@ class dbQuerySet extends dbObject {
switch( $this->prefixMethod ) {
case 'AUTO':
// Enable auto prefix replacement
-
+
// Process object prefix.
// Evaluate SQL statements to prepend prefix to objects
$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-
+
// SELECT statements aren't working yet
#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-
+
case 'MANUAL':
// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
// If prefixKey is not set, we use the default constant XMLS_PREFIX
@@ -1256,14 +1258,14 @@ class dbQuerySet extends dbObject {
$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
}
}
-
+
$this->queries[$id] = trim( $query );
}
-
+
// Return the query set array
return $this->queries;
}
-
+
/**
* Rebuilds the query with the prefix attached to any objects
*
@@ -1276,33 +1278,33 @@ class dbQuerySet extends dbObject {
if( !isset( $prefix ) ) {
return $query;
}
-
+
if( preg_match( $regex, $query, $match ) ) {
$preamble = $match[1];
$postamble = $match[5];
$objectList = explode( ',', $match[3] );
// $prefix = $prefix . '_';
-
+
$prefixedList = '';
-
+
foreach( $objectList as $object ) {
if( $prefixedList !== '' ) {
$prefixedList .= ', ';
}
-
+
$prefixedList .= $prefix . trim( $object );
}
-
+
$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
}
-
+
return $query;
}
}
/**
* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-*
+*
* This class is used to load and parse the XML file, to create an array of SQL statements
* that can be used to build a database, and to build the database using the SQL array.
*
@@ -1314,87 +1316,87 @@ class dbQuerySet extends dbObject {
* @package axmls
*/
class adoSchema {
-
+
/**
* @var array Array containing SQL queries to generate all objects
* @access private
*/
var $sqlArray;
-
+
/**
* @var object ADOdb connection object
* @access private
*/
var $db;
-
+
/**
* @var object ADOdb Data Dictionary
* @access private
*/
var $dict;
-
+
/**
* @var string Current XML element
* @access private
*/
var $currentElement = '';
-
+
/**
* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
* @access private
*/
var $upgrade = '';
-
+
/**
* @var string Optional object prefix
* @access private
*/
var $objectPrefix = '';
-
+
/**
* @var long Original Magic Quotes Runtime value
* @access private
*/
var $mgq;
-
+
/**
* @var long System debug
* @access private
*/
var $debug;
-
+
/**
* @var string Regular expression to find schema version
* @access private
*/
var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-
+
/**
* @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,12 +1406,13 @@ class adoSchema {
*
* @param object $db ADOdb database connection object.
*/
- function adoSchema( &$db ) {
+ function __construct( $db ) {
// Initialize the environment
$this->mgq = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
-
- $this->db =& $db;
+ #set_magic_quotes_runtime(0);
+ ini_set("magic_quotes_runtime", 0);
+
+ $this->db = $db;
$this->debug = $this->db->debug;
$this->dict = NewDataDictionary( $this->db );
$this->sqlArray = array();
@@ -1419,7 +1422,7 @@ class adoSchema {
$this->existingData( XMLS_EXISTING_DATA );
$this->setUpgradeMethod();
}
-
+
/**
* Sets the method to be used for upgrading an existing database
*
@@ -1440,9 +1443,9 @@ class adoSchema {
if( !is_string( $method ) ) {
return FALSE;
}
-
+
$method = strtoupper( $method );
-
+
// Handle the upgrade methods
switch( $method ) {
case 'ALTER':
@@ -1461,10 +1464,10 @@ class adoSchema {
// Use default if no legitimate method is passed.
$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
}
-
+
return $this->upgrade;
}
-
+
/**
* Specifies how to handle existing data row when there is a unique key conflict.
*
@@ -1473,7 +1476,7 @@ class adoSchema {
* data into an existing table with one or more primary keys or unique indexes.
* The existingData method takes one of three options: XMLS_MODE_INSERT attempts
* to always insert the data as a new row. In the event of a unique key violation,
- * the database will generate an error. XMLS_MODE_UPDATE attempts to update the
+ * the database will generate an error. XMLS_MODE_UPDATE attempts to update the
* any existing rows with the new data based upon primary or unique key fields in
* the schema. If the data row in the schema specifies no unique fields, the row
* data will be inserted as a new row. XMLS_MODE_IGNORE specifies that any data rows
@@ -1497,15 +1500,15 @@ class adoSchema {
$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.
*
@@ -1523,10 +1526,10 @@ class adoSchema {
if( is_bool( $mode ) ) {
$this->executeInline = $mode;
}
-
+
return $this->executeInline;
}
-
+
/**
* Enables/disables SQL continue on error.
*
@@ -1544,10 +1547,10 @@ class adoSchema {
if( is_bool( $mode ) ) {
$this->continueOnError = $mode;
}
-
+
return $this->continueOnError;
}
-
+
/**
* Loads an XML schema from a file and converts it to SQL.
*
@@ -1564,7 +1567,7 @@ class adoSchema {
function ParseSchema( $filename, $returnSchema = FALSE ) {
return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
}
-
+
/**
* Loads an XML schema from a file and converts it to SQL.
*
@@ -1592,13 +1595,13 @@ class adoSchema {
logMsg( 'Unable to open file' );
return FALSE;
}
-
+
// do version detection here
if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
logMsg( 'Invalid Schema Version' );
return FALSE;
}
-
+
if( $returnSchema ) {
$xmlstring = '';
while( $data = fread( $fp, 4096 ) ) {
@@ -1606,11 +1609,11 @@ class adoSchema {
}
return $xmlstring;
}
-
+
$this->success = 2;
-
+
$xmlParser = $this->create_parser();
-
+
// Process the file
while( $data = fread( $fp, 4096 ) ) {
if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
@@ -1621,17 +1624,17 @@ class adoSchema {
) );
}
}
-
+
xml_parser_free( $xmlParser );
-
+
return $this->sqlArray;
}
-
+
/**
* Converts an XML schema string to SQL.
*
* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
- * and generate the SQL necessary to create the database described by the schema.
+ * and generate the SQL necessary to create the database described by the schema.
* @see ParseSchema()
*
* @param string $xmlstring XML schema string.
@@ -1643,21 +1646,21 @@ class adoSchema {
logMsg( 'Empty or Invalid Schema' );
return FALSE;
}
-
+
// do version detection here
if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
logMsg( 'Invalid Schema Version' );
return FALSE;
}
-
+
if( $returnSchema ) {
return $xmlstring;
}
-
+
$this->success = 2;
-
+
$xmlParser = $this->create_parser();
-
+
if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
die( sprintf(
"XML error: %s at line %d",
@@ -1665,12 +1668,12 @@ class adoSchema {
xml_get_current_line_number( $xmlParser)
) );
}
-
+
xml_parser_free( $xmlParser );
-
+
return $this->sqlArray;
}
-
+
/**
* Loads an XML schema from a file and converts it to uninstallation SQL.
*
@@ -1685,12 +1688,12 @@ class adoSchema {
function RemoveSchema( $filename, $returnSchema = FALSE ) {
return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
}
-
+
/**
* Converts an XML schema string to uninstallation SQL.
*
* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
- * and generate the SQL necessary to uninstall the database described by the schema.
+ * and generate the SQL necessary to uninstall the database described by the schema.
* @see RemoveSchema()
*
* @param string $schema XML schema string.
@@ -1698,20 +1701,20 @@ class adoSchema {
* @return array Array of SQL queries, ready to execute.
*/
function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-
+
// grab current version
if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
return FALSE;
}
-
+
return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
}
-
+
/**
* Applies the current XML schema to the database (post execution).
*
- * Call this method to apply the current schema (generally created by calling
- * ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
+ * Call this method to apply the current schema (generally created by calling
+ * ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
* and executing other SQL specified in the schema) after parsing.
* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
*
@@ -1724,25 +1727,25 @@ class adoSchema {
if( !is_bool( $continueOnErr ) ) {
$continueOnErr = $this->ContinueOnError();
}
-
+
if( !isset( $sqlArray ) ) {
$sqlArray = $this->sqlArray;
}
-
+
if( !is_array( $sqlArray ) ) {
$this->success = 0;
} else {
$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
}
-
+
return $this->success;
}
-
+
/**
- * Returns the current SQL array.
+ * Returns the current SQL array.
*
- * Call this method to fetch the array of SQL queries resulting from
- * ParseSchema() or ParseSchemaString().
+ * Call this method to fetch the array of SQL queries resulting from
+ * ParseSchema() or ParseSchemaString().
*
* @param string $format Format: HTML, TEXT, or NONE (PHP array)
* @return array Array of SQL statements or FALSE if an error occurs
@@ -1751,7 +1754,7 @@ class adoSchema {
$sqlArray = null;
return $this->getSQL( $format, $sqlArray );
}
-
+
/**
* Saves the current SQL array to the local filesystem as a list of SQL queries.
*
@@ -1759,25 +1762,25 @@ class adoSchema {
* parsed XML schema) to the filesystem.
*
* @param string $filename Path and name where the file should be saved.
- * @return boolean TRUE if save is successful, else FALSE.
+ * @return boolean TRUE if save is successful, else FALSE.
*/
function SaveSQL( $filename = './schema.sql' ) {
-
+
if( !isset( $sqlArray ) ) {
$sqlArray = $this->sqlArray;
}
if( !isset( $sqlArray ) ) {
return FALSE;
}
-
+
$fp = fopen( $filename, "w" );
-
+
foreach( $sqlArray as $key => $query ) {
fwrite( $fp, $query . ";\n" );
}
fclose( $fp );
}
-
+
/**
* Create an xml parser
*
@@ -1785,18 +1788,18 @@ class adoSchema {
*
* @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
*
@@ -1819,9 +1822,9 @@ class adoSchema {
default:
// print_r( array( $tag, $attributes ) );
}
-
+
}
-
+
/**
* XML Callback to process CDATA elements
*
@@ -1829,7 +1832,7 @@ class adoSchema {
*/
function _tag_cdata( &$parser, $cdata ) {
}
-
+
/**
* XML Callback to process end elements
*
@@ -1837,16 +1840,16 @@ class adoSchema {
* @internal
*/
function _tag_close( &$parser, $tag ) {
-
+
}
-
+
/**
* Converts an XML schema string to the specified DTD version.
*
* Call this method to convert a string containing an XML schema to a different AXMLS
- * DTD version. For instance, to convert a schema created for an pre-1.0 version for
- * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
- * parameter is specified, the schema will be converted to the current DTD version.
+ * DTD version. For instance, to convert a schema created for an pre-1.0 version for
+ * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+ * parameter is specified, the schema will be converted to the current DTD version.
* If the newFile parameter is provided, the converted schema will be written to the specified
* file.
* @see ConvertSchemaFile()
@@ -1857,27 +1860,27 @@ class adoSchema {
* @return string Converted XML schema or FALSE if an error occurs.
*/
function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-
+
// grab current version
if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
return FALSE;
}
-
+
if( !isset ($newVersion) ) {
$newVersion = $this->schemaVersion;
}
-
+
if( $version == $newVersion ) {
$result = $schema;
} else {
$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
}
-
+
if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
fwrite( $fp, $result );
fclose( $fp );
}
-
+
return $result;
}
@@ -1888,14 +1891,14 @@ class adoSchema {
if (function_exists('file_get_contents')) return file_get_contents($path);
return join('',file($path));
}*/
-
+
/**
* Converts an XML schema file to the specified DTD version.
*
* Call this method to convert the specified XML schema file to a different AXMLS
- * DTD version. For instance, to convert a schema created for an pre-1.0 version for
- * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
- * parameter is specified, the schema will be converted to the current DTD version.
+ * DTD version. For instance, to convert a schema created for an pre-1.0 version for
+ * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+ * parameter is specified, the schema will be converted to the current DTD version.
* If the newFile parameter is provided, the converted schema will be written to the specified
* file.
* @see ConvertSchemaString()
@@ -1906,19 +1909,19 @@ class adoSchema {
* @return string Converted XML schema or FALSE if an error occurs.
*/
function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-
+
// grab current version
if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
return FALSE;
}
-
+
if( !isset ($newVersion) ) {
$newVersion = $this->schemaVersion;
}
-
+
if( $version == $newVersion ) {
$result = _file_get_contents( $filename );
-
+
// remove unicode BOM if present
if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
$result = substr( $result, 3 );
@@ -1926,36 +1929,36 @@ class adoSchema {
} else {
$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
}
-
+
if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
fwrite( $fp, $result );
fclose( $fp );
}
-
+
return $result;
}
-
+
function TransformSchema( $schema, $xsl, $schematype='string' )
{
// Fail if XSLT extension is not available
if( ! function_exists( 'xslt_create' ) ) {
return FALSE;
}
-
+
$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-
+
// look for xsl
if( !is_readable( $xsl_file ) ) {
return FALSE;
}
-
+
switch( $schematype )
{
case 'file':
if( !is_readable( $schema ) ) {
return FALSE;
}
-
+
$schema = _file_get_contents( $schema );
break;
case 'string':
@@ -1964,26 +1967,26 @@ class adoSchema {
return FALSE;
}
}
-
+
$arguments = array (
'/_xml' => $schema,
'/_xsl' => _file_get_contents( $xsl_file )
);
-
+
// create an XSLT processor
$xh = xslt_create ();
-
+
// set error handler
xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-
+
// process the schema
- $result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
-
+ $result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
+
xslt_free ($xh);
-
+
return $result;
}
-
+
/**
* Processes XSLT transformation errors
*
@@ -2003,7 +2006,7 @@ class adoSchema {
'Error Number' => $errno,
'Level' => $level
);
-
+
switch( $fields['URI'] ) {
case 'arg:/_xml':
$msg['Input'] = 'XML';
@@ -2014,7 +2017,7 @@ class adoSchema {
default:
$msg['Input'] = $fields['URI'];
}
-
+
$msg['Line'] = $fields['line'];
} else {
$msg = array(
@@ -2024,19 +2027,19 @@ class adoSchema {
'Fields' => var_export( $fields, TRUE )
);
}
-
+
$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
. '<table>' . "\n";
-
+
foreach( $msg as $label => $details ) {
$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
}
-
+
$error_details .= '</table>';
-
+
trigger_error( $error_details, E_USER_ERROR );
}
-
+
/**
* Returns the AXMLS Schema Version of the requested XML schema file.
*
@@ -2052,17 +2055,17 @@ class adoSchema {
// die( 'Unable to open file' );
return FALSE;
}
-
+
// Process the file
while( $data = fread( $fp, 4096 ) ) {
if( preg_match( $this->versionRegex, $data, $matches ) ) {
return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
}
}
-
+
return FALSE;
}
-
+
/**
* Returns the AXMLS Schema Version of the provided XML schema string.
*
@@ -2076,73 +2079,78 @@ class adoSchema {
if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
return FALSE;
}
-
+
if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
}
-
+
return FALSE;
}
-
+
/**
* Extracts an XML schema from an existing database.
*
* Call this method to create an XML schema string from an existing database.
* If the data parameter is set to TRUE, AXMLS will include the data from the database
- * in the schema.
+ * in the schema.
*
* @param boolean $data Include data in schema dump
+ * @indent string indentation to use
+ * @prefix string extract only tables with given prefix
+ * @stripprefix strip prefix string when storing in XML schema
* @return string Generated XML schema
*/
- function ExtractSchema( $data = FALSE, $indent = ' ' ) {
+ function ExtractSchema( $data = FALSE, $indent = ' ', $prefix = '' , $stripprefix=false) {
$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-
+
$schema = '<?xml version="1.0"?>' . "\n"
. '<schema version="' . $this->schemaVersion . '">' . "\n";
-
- if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
+ if( is_array( $tables = $this->db->MetaTables( 'TABLES' ,false ,($prefix) ? str_replace('_','\_',$prefix).'%' : '') ) ) {
foreach( $tables as $table ) {
- $schema .= $indent . '<table name="' . htmlentities( $table ) . '">' . "\n";
-
+ $schema .= $indent
+ . '<table name="'
+ . htmlentities( $stripprefix ? str_replace($prefix, '', $table) : $table )
+ . '">' . "\n";
+
// grab details from database
$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE -1' );
$fields = $this->db->MetaColumns( $table );
$indexes = $this->db->MetaIndexes( $table );
-
+
if( is_array( $fields ) ) {
foreach( $fields as $details ) {
$extra = '';
$content = array();
-
+
if( isset($details->max_length) && $details->max_length > 0 ) {
$extra .= ' size="' . $details->max_length . '"';
}
-
+
if( isset($details->primary_key) && $details->primary_key ) {
$content[] = '<KEY/>';
} elseif( isset($details->not_null) && $details->not_null ) {
$content[] = '<NOTNULL/>';
}
-
+
if( isset($details->has_default) && $details->has_default ) {
$content[] = '<DEFAULT value="' . htmlentities( $details->default_value ) . '"/>';
}
-
+
if( isset($details->auto_increment) && $details->auto_increment ) {
$content[] = '<AUTOINCREMENT/>';
}
-
+
if( isset($details->unsigned) && $details->unsigned ) {
$content[] = '<UNSIGNED/>';
}
-
+
// this stops the creation of 'R' columns,
// AUTOINCREMENT is used to create auto columns
$details->primary_key = 0;
$type = $rs->MetaType( $details );
-
+
$schema .= str_repeat( $indent, 2 ) . '<field name="' . htmlentities( $details->name ) . '" type="' . $type . '"' . $extra;
-
+
if( !empty( $content ) ) {
$schema .= ">\n" . str_repeat( $indent, 3 )
. implode( "\n" . str_repeat( $indent, 3 ), $content ) . "\n"
@@ -2152,57 +2160,57 @@ class adoSchema {
}
}
}
-
+
if( is_array( $indexes ) ) {
foreach( $indexes as $index => $details ) {
$schema .= str_repeat( $indent, 2 ) . '<index name="' . $index . '">' . "\n";
-
+
if( $details['unique'] ) {
$schema .= str_repeat( $indent, 3 ) . '<UNIQUE/>' . "\n";
}
-
+
foreach( $details['columns'] as $column ) {
$schema .= str_repeat( $indent, 3 ) . '<col>' . htmlentities( $column ) . '</col>' . "\n";
}
-
+
$schema .= str_repeat( $indent, 2 ) . '</index>' . "\n";
}
}
-
+
if( $data ) {
$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-
+
if( is_object( $rs ) && !$rs->EOF ) {
$schema .= str_repeat( $indent, 2 ) . "<data>\n";
-
+
while( $row = $rs->FetchRow() ) {
foreach( $row as $key => $val ) {
if ( $val != htmlentities( $val ) ) {
$row[$key] = '<![CDATA[' . $val . ']]>';
}
}
-
+
$schema .= str_repeat( $indent, 3 ) . '<row><f>' . implode( '</f><f>', $row ) . "</f></row>\n";
}
-
+
$schema .= str_repeat( $indent, 2 ) . "</data>\n";
}
}
-
+
$schema .= $indent . "</table>\n";
}
}
-
+
$this->db->SetFetchMode( $old_mode );
-
+
$schema .= '</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.
@@ -2223,17 +2231,17 @@ class adoSchema {
logMsg( 'Invalid prefix: ' . $prefix );
return FALSE;
}
-
+
if( $underscore AND substr( $prefix, -1 ) != '_' ) {
$prefix .= '_';
}
-
+
// prefix valid
logMsg( 'Set prefix: ' . $prefix );
$this->objectPrefix = $prefix;
return TRUE;
}
-
+
/**
* Returns an object name with the current prefix prepended.
*
@@ -2249,11 +2257,11 @@ class adoSchema {
// prepend after quote if used
return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
}
-
+
// No prefix set. Use name provided.
return $name;
}
-
+
/**
* Checks if element references a specific platform
*
@@ -2265,7 +2273,7 @@ class adoSchema {
function supportedPlatform( $platform = NULL ) {
if( !empty( $platform ) ) {
$regex = '/(^|\|)' . $this->db->databaseType . '(\||$)/i';
-
+
if( preg_match( '/^- /', $platform ) ) {
if (preg_match ( $regex, substr( $platform, 2 ) ) ) {
logMsg( 'Platform ' . $platform . ' is NOT supported' );
@@ -2278,11 +2286,11 @@ class adoSchema {
}
}
}
-
+
logMsg( 'Platform ' . $platform . ' is supported' );
return TRUE;
}
-
+
/**
* Clears the array of generated SQL.
*
@@ -2291,7 +2299,7 @@ class adoSchema {
function clearSQL() {
$this->sqlArray = array();
}
-
+
/**
* Adds SQL into the SQL array.
*
@@ -2299,58 +2307,58 @@ class adoSchema {
* @return boolean TRUE if successful, else FALSE.
*
* @access private
- */
+ */
function addSQL( $sql = NULL ) {
if( is_array( $sql ) ) {
foreach( $sql as $line ) {
$this->addSQL( $line );
}
-
+
return TRUE;
}
-
+
if( is_string( $sql ) ) {
$this->sqlArray[] = $sql;
-
+
// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
$saved = $this->db->debug;
$this->db->debug = $this->debug;
$ok = $this->db->Execute( $sql );
$this->db->debug = $saved;
-
+
if( !$ok ) {
if( $this->debug ) {
ADOConnection::outp( $this->db->ErrorMsg() );
}
-
+
$this->success = 1;
}
}
-
+
return TRUE;
}
-
+
return FALSE;
}
-
+
/**
* Gets the SQL array in the specified format.
*
* @param string $format Format
* @return mixed SQL
- *
+ *
* @access private
*/
function getSQL( $format = NULL, $sqlArray = NULL ) {
if( !is_array( $sqlArray ) ) {
$sqlArray = $this->sqlArray;
}
-
+
if( !is_array( $sqlArray ) ) {
return FALSE;
}
-
+
switch( strtolower( $format ) ) {
case 'string':
case 'text':
@@ -2358,10 +2366,10 @@ class adoSchema {
case'html':
return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
}
-
+
return $this->sqlArray;
}
-
+
/**
* Destroys an adoSchema object.
*
@@ -2369,8 +2377,8 @@ class adoSchema {
* @deprecated adoSchema now cleans up automatically.
*/
function Destroy() {
- set_magic_quotes_runtime( $this->mgq );
- unset( $this );
+ ini_set("magic_quotes_runtime", $this->mgq );
+ #set_magic_quotes_runtime( $this->mgq );
}
}
@@ -2382,18 +2390,17 @@ class adoSchema {
function logMsg( $msg, $title = NULL, $force = FALSE ) {
if( XMLS_DEBUG or $force ) {
echo '<pre>';
-
+
if( isset( $title ) ) {
echo '<h3>' . htmlentities( $title ) . '</h3>';
}
-
+
if( @is_object( $this ) ) {
echo '[' . get_class( $this ) . '] ';
}
-
+
print_r( $msg );
-
+
echo '</pre>';
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb.inc.php b/libraries/adodb/adodb.inc.php
index 55e7ee7b8..62607a258 100644
--- a/libraries/adodb/adodb.inc.php
+++ b/libraries/adodb/adodb.inc.php
@@ -1,9 +1,9 @@
-<?php
+<?php
/*
* Set tabs to 4 for best viewing.
- *
+ *
* Latest version is available at http://adodb.sourceforge.net
- *
+ *
* This is the main include file for ADOdb.
* Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
*
@@ -12,15 +12,17 @@
*/
/**
- \mainpage
-
- @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ \mainpage
+
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license. You can choose which license
you prefer.
-
- PHP's database access functions are not standardised. This creates a need for a database
- class library to hide the differences between the different database API's (encapsulate
+
+ PHP's database access functions are not standardised. This creates a need for a database
+ class library to hide the differences between the different database API's (encapsulate
the differences) so we can easily switch databases.
We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2,
@@ -29,110 +31,161 @@
other databases via ODBC.
Latest Download at http://adodb.sourceforge.net/
-
+
*/
-
- if (!defined('_ADODB_LAYER')) {
- define('_ADODB_LAYER',1);
-
- //==============================================================================================
+
+if (!defined('_ADODB_LAYER')) {
+ define('_ADODB_LAYER',1);
+
+ // The ADOdb extension is no longer maintained and effectively unsupported
+ // since v5.04. The library will not function properly if it is present.
+ if(defined('ADODB_EXTENSION')) {
+ $msg = "Unsupported ADOdb Extension (v" . ADODB_EXTENSION . ") detected! "
+ . "Disable it to use ADOdb";
+
+ $errorfn = defined('ADODB_ERROR_HANDLER') ? ADODB_ERROR_HANDLER : false;
+ if ($errorfn) {
+ $conn = false;
+ $errorfn('ADOdb', basename(__FILE__), -9999, $msg, null, null, $conn);
+ } else {
+ die($msg . PHP_EOL);
+ }
+ }
+
+ //==============================================================================================
// CONSTANT DEFINITIONS
- //==============================================================================================
+ //==============================================================================================
- /**
+ /**
* Set ADODB_DIR to the directory where this file resides...
* This constant was formerly called $ADODB_RootPath
*/
- if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
-
- //==============================================================================================
+ if (!defined('ADODB_DIR')) {
+ define('ADODB_DIR',dirname(__FILE__));
+ }
+
+ //==============================================================================================
// GLOBAL VARIABLES
- //==============================================================================================
+ //==============================================================================================
- GLOBAL
- $ADODB_vers, // database version
+ GLOBAL
+ $ADODB_vers, // database version
$ADODB_COUNTRECS, // count number of records returned - slows down query
$ADODB_CACHE_DIR, // directory to cache recordsets
+ $ADODB_CACHE,
+ $ADODB_CACHE_CLASS,
$ADODB_EXTENSION, // ADODB extension installed
$ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF
- $ADODB_FETCH_MODE; // DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
-
- //==============================================================================================
+ $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
- 0 = ignore empty fields. All empty fields in array are ignored.
- 1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
- 2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
- 3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
- */
- define('ADODB_FORCE_IGNORE',0);
- define('ADODB_FORCE_NULL',1);
- define('ADODB_FORCE_EMPTY',2);
- define('ADODB_FORCE_VALUE',3);
- //********************************************************//
+ // ********************************************************
+ // Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
+ // Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi
+ //
+ // 0 = ignore empty fields. All empty fields in array are ignored.
+ // 1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
+ // 2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
+ // 3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
+
+ define('ADODB_FORCE_IGNORE',0);
+ define('ADODB_FORCE_NULL',1);
+ define('ADODB_FORCE_EMPTY',2);
+ define('ADODB_FORCE_VALUE',3);
+ // ********************************************************
if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-
+
define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>');
-
+
// allow [ ] @ ` " and . in table names
define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
-
+
// prefetching used by oracle
- if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-
-
- /*
- Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
- This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-
- 0 = assoc lowercase field names. $rs->fields['orderid']
- 1 = assoc uppercase field names. $rs->fields['ORDERID']
- 2 = use native-case field names. $rs->fields['OrderID']
- */
-
- define('ADODB_FETCH_DEFAULT',0);
- define('ADODB_FETCH_NUM',1);
- define('ADODB_FETCH_ASSOC',2);
- define('ADODB_FETCH_BOTH',3);
-
- if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-
+ if (!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);
+ }
+
+ /**
+ * 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);
+
+
// PHP's version scheme makes converting to numbers difficult - workaround
$_adodb_ver = (float) PHP_VERSION;
- if ($_adodb_ver >= 5.0) {
+ if ($_adodb_ver >= 5.2) {
+ define('ADODB_PHPVER',0x5200);
+ } else 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);
+ die("PHP5 or later required. You are running ".PHP_VERSION);
}
+ unset($_adodb_ver);
}
-
- //if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-
+
/**
- Accepts $src and $dest arrays, replacing string $data
+ 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);
-
+ function ADODB_str_replace($src, $dest, $data) {
+ if (ADODB_PHPVER >= 0x4050) {
+ return str_replace($src,$dest,$data);
+ }
+
$s = reset($src);
$d = reset($dest);
while ($s !== false) {
@@ -142,78 +195,118 @@
}
return $data;
}
-
- function ADODB_Setup()
- {
- GLOBAL
- $ADODB_vers, // database version
+
+ 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
+ // -- note Since PHP 4.2.0, the seed becomes optional and defaults to a random value if omitted.
srand(((double)microtime())*1000000);
-
+
/**
* ADODB version as a string.
*/
- $ADODB_vers = 'V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
-
+ $ADODB_vers = 'v5.20.9 21-Dec-2016';
+
/**
- * 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) {
@@ -221,38 +314,139 @@
$fn($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<br><pre>\n". $rez."</pre>");
+ }
+ }
+ 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 $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 $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,25 +454,33 @@
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 $raiseErrorFn = false; /// error function to call
+ 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 $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
@@ -287,80 +489,113 @@
var $ansiOuter = false; /// whether ansi outer join syntax supported
var $autoRollback = false; // autoRollback on PConnect().
var $poorAffectedRows = false; // affectedRows not working or unreliable
-
+
var $fnExecute = false;
var $fnCacheExecute = false;
var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
var $rsPrefix = "ADORecordSet_";
-
- var $autoCommit = true; /// do not modify this yourself - actually private
- var $transOff = 0; /// temporarily disable transactions
- var $transCnt = 0; /// count of nested transactions
-
+
+ var $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 $_connectionID = false; /// The returned link identifier whenever a successful database connection is made.
var $_errorMsg = false; /// A variable which was used to keep the returned last error message. The value will
- /// then returned by the errorMsg() function
- var $_errorCode = false; /// Last error code, not guaranteed to be used - only by oci8
+ /// then returned by the errorMsg() function
+ var $_errorCode = false; /// Last error code, not guaranteed to be used - only by oci8
var $_queryID = false; /// This variable keeps the last created result link identifier
-
+
var $_isPersistentConnection = false; /// A boolean variable to state whether its a persistent connection or normal connection. */
var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
var $_evalAll = false;
var $_affected = false;
var $_logsql = false;
var $_transmode = ''; // transaction mode
-
- /**
- * Constructor
+
+ /*
+ * Additional parameters that may be passed to drivers in the connect string
+ * Driver must be coded to accept the parameters
*/
- function ADOConnection()
+ protected $connectionParameters = array();
+
+ /**
+ * Adds a parameter to the connection string.
+ *
+ * These parameters are added to the connection string when connecting,
+ * if the driver is coded to use it.
+ *
+ * @param string $parameter The name of the parameter to set
+ * @param string $value The value of the parameter
+ *
+ * @return null
+ *
+ * @example, for mssqlnative driver ('CharacterSet','UTF-8')
+ */
+ final public function setConnectionParameter($parameter,$value)
{
- die('Virtual Class -- cannot instantiate');
+
+ $this->connectionParameters[$parameter] = $value;
+
}
-
- function Version()
- {
- global $ADODB_vers;
-
- return (float) substr($ADODB_vers,1);
+
+ 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...
-
- @returns An array with 2 elements: $arr['string'] is the description string,
+
+ @returns An array with 2 elements: $arr['string'] is the description string,
and $arr[version] is the version (also a string).
*/
- function ServerInfo()
- {
+ function ServerInfo() {
return array('description' => '', 'version' => '');
}
-
- function IsConnected()
- {
- return !empty($this->_connectionID);
+
+ 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;
-
+ static function outp($msg,$newline=true) {
+ global $ADODB_FLUSH,$ADODB_OUTP;
+
if (defined('ADODB_OUTP')) {
$fn = ADODB_OUTP;
$fn($msg,$newline);
@@ -370,25 +605,33 @@
$fn($msg,$newline);
return;
}
-
- if ($newline) $msg .= "<br>\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 .= "<br>\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));
+ }
+
return false;
}
-
+
/**
* Connect to database
*
@@ -399,43 +642,61 @@
* @param [forceNew] force new connection
*
* @return true or false
- */
- function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false)
- {
- if ($argHostname != "") $this->host = $argHostname;
- if ($argUsername != "") $this->user = $argUsername;
- if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
- if ($argDatabaseName != "") $this->database = $argDatabaseName;
-
- $this->_isPersistentConnection = false;
+ */
+ function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) {
+ if ($argHostname != "") {
+ $this->host = $argHostname;
+ }
+ if ( strpos($this->host, ':') > 0 && isset($this->port) ) {
+ list($this->host, $this->port) = explode(":", $this->host, 2);
+ }
+ 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', $errno, $err, $this->host, $this->database, $this);
}
- if ($fn = $this->raiseErrorFn)
- $fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-
-
+
$this->_connectionID = false;
- if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
- return $ret;
- }
-
- function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
- {
+ 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
*
@@ -445,12 +706,11 @@
* @param [argDatabaseName] database
*
* @return true or false
- */
- function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
- {
+ */
+ function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") {
return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
}
-
+
/**
* Establish persistent connect to database
*
@@ -460,22 +720,39 @@
* @param [argDatabaseName] database
*
* @return return true or false
- */
- function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
- {
- if (defined('ADODB_NEVER_PERSIST'))
+ */
+ 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;
+ }
+ if ( strpos($this->host, ':') > 0 && isset($this->port) ) {
+ list($this->host, $this->port) = explode(":", $this->host, 2);
+ }
+ 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;
@@ -484,19 +761,46 @@
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;
}
+ 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 backward compat with old memcache implementation
+ function _CreateCache() {
+ global $ADODB_CACHE, $ADODB_CACHE_CLASS;
+
+ if ($this->memCache) {
+ global $ADODB_INCLUDED_MEMCACHE;
+
+ if (empty($ADODB_INCLUDED_MEMCACHE)) {
+ include_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 given an input format that understands Y M D
- function SQLDate($fmt, $col=false)
- {
- if (!$col) $col = $this->sysDate;
+ function SQLDate($fmt, $col=false) {
+ if (!$col) {
+ $col = $this->sysDate;
+ }
return $col; // child class implement
}
-
+
/**
* Should prepare the sql statement and return the stmt resource.
* For databases that do not support this, we return the $sql. To ensure
@@ -509,14 +813,13 @@
* @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.
+ * if the database does not support prepare.
*
- */
- function Prepare($sql)
- {
+ */
+ function Prepare($sql) {
return $sql;
}
-
+
/**
* Some databases, eg. mssql require a different function for preparing
* stored procedures. So we cannot use Prepare().
@@ -528,164 +831,159 @@
* @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.
+ * if the database does not support prepare.
*
- */
- function PrepareSP($sql,$param=true)
- {
+ */
+ function PrepareSP($sql,$param=true) {
return $this->Prepare($sql,$param);
}
-
+
/**
* PEAR DB Compat
*/
- function Quote($s)
- {
+ function Quote($s) {
return $this->qstr($s,false);
}
-
+
/**
- Requested by "Karsten Dambekalns" <k.dambekalns@fishfarm.de>
- */
- function QMagic($s)
- {
+ * Requested by "Karsten Dambekalns" <k.dambekalns@fishfarm.de>
+ */
+ function QMagic($s) {
return $this->qstr($s,get_magic_quotes_gpc());
}
- function q(&$s)
- {
- #if (!empty($this->qNull)) if ($s == 'null') return $s;
+ function q(&$s) {
+ //if (!empty($this->qNull && $s == 'null') {
+ // return $s;
+ //}
$s = $this->qstr($s,false);
}
-
+
/**
- * PEAR DB Compat - do not use internally.
+ * PEAR DB Compat - do not use internally.
*/
- function ErrorNative()
- {
+ 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 $table name of table to lock
+ * @param $where where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
+ */
+ function RowLock($table,$where,$col='1 as adodbignore') {
return false;
}
-
- function CommitLock($table)
- {
+
+ function CommitLock($table) {
return $this->CommitTrans();
}
-
- function RollbackLock($table)
- {
+
+ 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 mode The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
* @returns The 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.
*/
- 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();
+ 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()
- {
+ 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 string $name parameter's name, false to force a reset of the
+ * number to 1 (for databases that require positioned
+ * params such as PostgreSQL; note that ADOdb will
+ * automatically reset this when executing a query )
+ * @param string $type (unused)
+ * @return string query parameter placeholder
+ */
+ function Param($name,$type='C') {
return '?';
}
-
+
/*
InParameter and OutParameter are self-documenting versions of Parameter().
*/
- 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.
@@ -694,76 +992,94 @@
@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) {
+ if (!$saveErrs) {
+ $saveErrs = array($this->raiseErrorFn,$this->_transOK);
+ $this->raiseErrorFn = false;
+ return $saveErrs;
+ } else {
+ $this->raiseErrorFn = $saveErrs[0];
+ $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.<br>
- b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br>
- 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.<br>
+ * b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br>
+ * 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 {
@@ -772,140 +1088,208 @@
}
$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 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 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
- $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)) {
$sql .= $sqlarr[$i];
// from Ron Baldwin <ron.baldwin#sourceprose.com>
- // 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.
+ $sql = ADODB_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(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;
}
-
+
// 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;
@@ -914,15 +1298,17 @@
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));
}
@@ -934,43 +1320,50 @@
* @param startID if sequence does not exist, start at this ID
* @return 0 if not supported, otherwise a sequence id
*/
- function GenID($seqname='adodbseq',$startID=1)
- {
+ 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);
+ */
+ 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( '<p>Insert_ID error</p>');
adodb_backtrace();
@@ -984,141 +1377,146 @@
*
* @return the last inserted ID. All databases support this. But aware possible
* problems in multiuser environments. Heavy test this before deploying.
- */
- function PO_Insert_ID($table="", $id="")
- {
- if ($this->hasInsertID){
- return $this->Insert_ID($table,$id);
- } else {
- return $this->GetOne("SELECT MAX($id) FROM $table");
- }
+ */
+ 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( '<p>Affected_Rows error</p>',false);
+
+ if ($this->debug) {
+ ADOConnection::outp( '<p>Affected_Rows error</p>',false);
+ }
return false;
}
-
-
+
+
/**
* @return 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.
*/
- 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)
- {
+ * @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
+ // 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 ($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);
+ if ($secs2cache != 0) {
+ $ret = $this->CacheExecute($secs2cache, $sql,$inputarr);
} else {
- $ret =& $this->Execute($sql,$inputarr);
+ $ret = $this->Execute($sql,$inputarr);
}
return $ret; // PHP5 fix
} else if ($ismssql){
@@ -1139,67 +1537,64 @@
}
}
}
-
+
// 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
*/
- 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.
*
* @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 [nrows] number of rows to retrieve (optional)
+ * @param [offset] offset by number of rows (optional)
+ * @return the new recordset
*/
- function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
- {
+ function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true) {
if (! $rs) {
- $false = false;
- return $false;
+ return false;
}
$dbtype = $rs->databaseType;
if (!$dbtype) {
- $rs = &$rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
+ $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();
@@ -1207,56 +1602,53 @@
$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
*/
- function &GetAll($sql, $inputarr=false)
- {
- $arr =& $this->GetArray($sql,$inputarr);
+ function GetAll($sql, $inputarr=false) {
+ $arr = $this->GetArray($sql,$inputarr);
return $arr;
}
-
- function &GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
- {
- $rs =& $this->Execute($sql, $inputarr);
+
+ function GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false) {
+ $rs = $this->Execute($sql, $inputarr);
if (!$rs) {
- $false = false;
- return $false;
+ return false;
}
- $arr =& $rs->GetAssoc($force_array,$first2cols);
+ $arr = $rs->GetAssoc($force_array,$first2cols);
return $arr;
}
-
- function &CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
- {
+
+ 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);
+ $arr = $rs->GetAssoc($force_array,$first2cols);
return $arr;
}
-
+
/**
* Return first element of first row of sql statement. Recordset is disposed
* for you.
@@ -1264,187 +1656,231 @@
* @param sql SQL statement
* @param [inputarr] input bind array
*/
- function GetOne($sql,$inputarr=false)
- {
- global $ADODB_COUNTRECS;
+ 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) {
+
+ 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,$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;
-
+ 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;
} else {
- $false = false;
- return $false;
+ return false;
}
- $arr =& $rs->GetArray();
+ $arr = $rs->GetArray();
$rs->Close();
return $arr;
}
-
- function &CacheGetAll($secs2cache,$sql=false,$inputarr=false)
- {
- return $this->CacheGetArray($secs2cache,$sql,$inputarr);
+
+ function CacheGetAll($secs2cache,$sql=false,$inputarr=false) {
+ $arr = $this->CacheGetArray($secs2cache,$sql,$inputarr);
+ return $arr;
}
-
- function &CacheGetArray($secs2cache,$sql=false,$inputarr=false)
- {
- global $ADODB_COUNTRECS;
-
+
+ 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;
} 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
*/
- 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);
+
+ 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...
@@ -1460,339 +1896,299 @@
*
* 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(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 [secs2cache] seconds to cache data, set to 0 to force query. This is optional
+ * @param sql
+ * @param [offset] is the row to start calculations from (1-based)
+ * @param [nrows] is the number of rows to get
+ * @param [inputarr] array of bind variables
+ * @return the recordset ($rs->databaseType == 'array')
+ */
+ function CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false) {
if (!is_numeric($secs2cache)) {
- if ($sql === false) $sql = -1;
- if ($offset == -1) $offset = false;
- // sql, nrows, offset,inputarr
- $rs =& $this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
+ 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 (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<br><pre>\n", $this->_dirFlush($dir),"</pre>");
- } 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 (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<br><pre>\n", system($cmd),"</pre>");
- } else {
- exec($cmd);
- }
+ * 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 (!$sql) {
+ $ADODB_CACHE->flushall($this->debug);
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");
}
+
+ $f = $this->_gencachename($sql.serialize($inputarr),false);
+ return $ADODB_CACHE->flushcache($f, $this->debug);
}
-
+
+
/**
- * Private function to generate filename for caching.
- * Filename is generated based on:
- *
- * - sql statement
- * - database type (oci8, ibase, ifx, etc)
- * - database name
- * - userid
- * - setFetchMode (adodb 4.23)
- *
- * When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR).
- * Assuming that we can have 50,000 files per directory with good performance,
- * then we can scale to 12.8 million unique cached recordsets. Wow!
- */
- function _gencachename($sql,$createdir)
- {
- 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 (!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.
+ * @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
+ * @return 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;
-
- global $ADODB_INCLUDED_CSV;
- if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-
+
+
$md5file = $this->_gencachename($sql.serialize($inputarr),true);
$err = '';
-
+
if ($secs2cache > 0){
- $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
if ($this->debug) {
- if (get_magic_quotes_runtime()) {
+ 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 (see sql below)");
+ if ($this->debug !== -1) {
+ ADOConnection::outp( " $md5file cache failure: $err (this is a notice and not an error)");
+ }
}
-
- $rs = &$this->Execute($sqlparam,$inputarr);
+
+ $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
- @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 = '<i>'.htmlspecialchars($s).'</i>';
-
+ if ($inBrowser) {
+ $s = '<i>'.htmlspecialchars($s).'</i>';
+ }
+
ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
}
}
return $rs;
}
-
-
- /*
- Similar to PEAR DB's autoExecute(), except that
+
+
+ /*
+ Similar to PEAR DB's autoExecute(), except that
$mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
If $mode == 'UPDATE', then $where is compulsory as a safety measure.
-
+
$forceUpdate means that even if the data has not changed, perform update.
*/
- function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false)
- {
- $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;
+ function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = false, $forceUpdate = true, $magicq = 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, $magicq);
+ break;
+ case 'INSERT':
+ case DB_AUTOQUERY_INSERT:
+ $sql = $this->GetInsertSQL($rs, $fields_values, $magicq);
+ 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
+ * that is run against a single table and sql should only
* be a simple select stmt with no groupby/orderby/limit
*
* "Jonathan Younger" <jyounger@unilab.com>
- */
- function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
- {
+ */
+ function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null) {
global $ADODB_INCLUDED_LIB;
- //********************************************************//
- //This is here to maintain compatibility
- //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
+ // ********************************************************
+ // This is here to maintain compatibility
+ // with older adodb versions. Sets force type to force nulls if $forcenulls is set.
if (!isset($force)) {
- global $ADODB_FORCE_TYPE;
- $force = $ADODB_FORCE_TYPE;
+ global $ADODB_FORCE_TYPE;
+ $force = $ADODB_FORCE_TYPE;
}
- //********************************************************//
+ // ********************************************************
- if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) {
+ include(ADODB_DIR.'/adodb-lib.inc.php');
+ }
return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
}
@@ -1802,30 +2198,30 @@
* 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.
+ */
+ function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null) {
global $ADODB_INCLUDED_LIB;
if (!isset($force)) {
global $ADODB_FORCE_TYPE;
$force = $ADODB_FORCE_TYPE;
-
}
- if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) {
+ include(ADODB_DIR.'/adodb-lib.inc.php');
+ }
return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
}
-
+
/**
* Update a blob column, given a where clause. There are more sophisticated
* blob handling functions that we could have implemented, but all require
* a very complex API. Instead we have chosen something that is extremely
- * simple to understand and use.
+ * simple to understand and use.
*
* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
*
- * Usage to update a $blobvalue which has a primary key blob_id=1 into a
+ * Usage to update a $blobvalue which has a primary key blob_id=1 into a
* field blobtable.blobcolumn:
*
* UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
@@ -1835,68 +2231,67 @@
* $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;
+
+ function GetCharSet() {
+ return $this->charSet;
}
-
- function IfNull( $field, $ifNull )
- {
+
+ 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');
@@ -1904,31 +2299,28 @@
* $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))
{
@@ -1936,12 +2328,13 @@
$this->fmtDate="'Y-m-d'";
$this->fmtTimeStamp = "'Y-m-d H:i:s'";
break;
-
+
case 'US':
$this->fmtDate = "'m-d-Y'";
$this->fmtTimeStamp = "'m-d-Y H:i:s'";
break;
-
+
+ case 'PT_BR':
case 'NL':
case 'FR':
case 'RO':
@@ -1949,12 +2342,12 @@
$this->fmtDate="'d-m-Y'";
$this->fmtTimeStamp = "'d-m-Y H:i:s'";
break;
-
+
case 'GE':
$this->fmtDate="'d.m.Y'";
$this->fmtTimeStamp = "'d.m.Y H:i:s'";
break;
-
+
default:
$this->fmtDate="'Y-m-d'";
$this->fmtTimeStamp = "'Y-m-d H:i:s'";
@@ -1962,69 +2355,61 @@
}
}
- 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;
+ include_once(ADODB_DIR.'/adodb-active-record.inc.php');
}
- $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;
- }
- 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->_connectionID = false;
return $rez;
}
-
+
/**
* Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
*
* @return true if succeeded or false if database does not support transactions
*/
- function BeginTrans() {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;
}
@@ -2034,15 +2419,14 @@ http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
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';
@@ -2050,11 +2434,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
return 'ISOLATION LEVEL READ UNCOMMITTED';
}
break;
-
+
case 'READ COMMITTED':
return 'ISOLATION LEVEL READ COMMITTED';
break;
-
+
case 'REPEATABLE READ':
switch($db) {
case 'oci8':
@@ -2064,16 +2448,16 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
return 'ISOLATION LEVEL REPEATABLE READ';
}
break;
-
+
case 'SERIALIZABLE':
return 'ISOLATION LEVEL SERIALIZABLE';
break;
-
+
default:
return $mode;
}
}
-
+
/**
* If database does not support transactions, always return true as data always commited
*
@@ -2081,89 +2465,122 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @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.
*/
- 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.
*/
- 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]);
@@ -2171,20 +2588,19 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
$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
@@ -2193,24 +2609,26 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return array of ADOFieldObjects for current table.
*/
- function &MetaColumns($table,$normalize=true)
- {
- 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);
@@ -2218,91 +2636,93 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
$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;
}
-
+
/**
* Different SQL databases used different methods to combine strings together.
- * This function provides a wrapper.
- *
+ * This function provides a wrapper.
+ *
* param s variable number of string parameters
*
* Usage: $db->Concat($str1,$str2);
- *
+ *
* @return concatenated string
- */
- function Concat()
- {
+ */
+ function Concat() {
$arr = func_get_args();
return implode($this->concat_operator, $arr);
}
-
-
+
+
/**
* Converts a date "d" to a string that the database can understand.
*
@@ -2310,36 +2730,53 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return 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.
*
@@ -2347,44 +2784,61 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return 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
*
* @return 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.
@@ -2392,115 +2846,123 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return 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()
+ * @param v is the character date in YYYY-MM-DD format, returned by database
+ * @param fmt is the format to apply to it, using date()
*
* @return a date formated as user desires
*/
-
- function UserDate($v,$fmt='Y-m-d',$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);
-
+
}
-
- /**
+
+ /**
*
- * @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 v is the character timestamp in YYYY-MM-DD hh:mm:ss format
+ * @param fmt is the format to apply to it, using date()
*
* @return a timestamp formated as user desires
*/
- function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$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)
- {
+
+ function escape($s,$magic_quotes=false) {
return $this->addq($s,$magic_quotes);
}
-
+
/**
- * Quotes a string, without prefixing nor appending quotes.
+ * Quotes a string, without prefixing nor appending quotes.
*/
- function addq($s,$magic_quotes=false)
- {
+ function addq($s,$magic_quotes=false) {
if (!$magic_quotes) {
-
- if ($this->replaceQuote[0] == '\\'){
+ 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
+
+ if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase')) {
+ // ' already quoted, no need to change anything
return $s;
- else {// change \' to '' for sybase/mssql
+ } 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)
- {
+ 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);
@@ -2508,25 +2970,27 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
}
return "'".str_replace("'",$this->replaceQuote,$s)."'";
}
-
+
// undo magic quotes for "
$s = str_replace('\\"','"',$s);
-
- if ($this->replaceQuote == "\\'") // ' already quoted, no need to change anything
+
+ if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase')) {
+ // ' already quoted, no need to change anything
return "'$s'";
- else {// change \' to '' for sybase/mssql
+ } else {
+ // change \' to '' for sybase/mssql
$s = str_replace('\\\\','\\',$s);
return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
}
}
-
-
+
+
/**
- * Will select the supplied $page number from a recordset, given that it is paginated in pages of
- * $nrows rows per page. It also saves two boolean values saying if the given page is the first
- * and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
+ * Will select the supplied $page number from a recordset, given that it is paginated in pages of
+ * $nrows rows per page. It also saves two boolean values saying if the given page is the first
+ * and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
*
- * See readme.htm#ex8 for an example of usage.
+ * See docs-adodb.htm#ex8 for an example of usage.
*
* @param sql
* @param nrows is the number of rows per page to get
@@ -2538,20 +3002,24 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
* NOTE: phpLens uses a different algorithm and does not use PageExecute().
*
*/
- function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0)
- {
+ function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) {
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
- 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(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
@@ -2560,40 +3028,74 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
* @param [inputarr] array of bind variables
* @return the recordset ($rs->databaseType == 'array')
*/
- function &CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false)
- {
+ function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) {
/*switch($this->dataProvider) {
case 'postgres':
- case 'mysql':
+ case 'mysql':
break;
default: $secs2cache = 0; break;
}*/
- $rs =& $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
+ $rs = $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
return $rs;
}
} // end class ADOConnection
-
-
-
- //==============================================================================================
+
+
+
+ //==============================================================================================
// CLASS ADOFetchObj
- //==============================================================================================
-
+ //==============================================================================================
+
/**
* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
*/
class ADOFetchObj {
};
-
- //==============================================================================================
+
+ //==============================================================================================
// CLASS ADORecordSet_empty
- //==============================================================================================
-
+ //==============================================================================================
+
+ 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;
@@ -2601,95 +3103,207 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
var $_numOfRows = 0;
var $fields = false;
var $connection = false;
- function RowCount() {return 0;}
- function RecordCount() {return 0;}
- function PO_RecordCount(){return 0;}
- function Close(){return true;}
- function FetchRow() {return false;}
- function FieldCount(){ return 0;}
+
+ 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(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);
+ }
+
+ function hasMore() {
+ return !$this->rs->EOF;
+ }
+
+ }
+
- if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
- else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
- /**
+ /**
* RecordSet class that represents the dataset returned by the database.
* To keep memory overhead low, this class holds only the current row in memory.
* No prefetching of data is done, so the RecordCount() can return -1 ( which
* means recordcount not known).
*/
- class ADORecordSet extends ADODB_BASE_RS {
- /*
- * public variables
+ 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 $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 $_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;
-
+
/**
* Constructor
*
- * @param queryID this is the queryID returned by ADOConnection->_query()
+ * @param 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
@@ -2698,22 +3312,22 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
$this->EOF = true;
}
}
-
-
+
+
/**
* Generate a SELECT tag string from a recordset, and return the string.
- * If the recordset has 2 cols, we treat the 1st col as the containing
+ * If the recordset has 2 cols, we treat the 1st col as the containing
* the text to display to the user, and 2nd col as the return value. Default
* strings are compared with the FIRST column.
*
- * @param name name of SELECT tag
+ * @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
+ & @param [compareFields0] when we have 2 cols in recordset, we compare the defstr with
* column 0 (1st col) if this is true. This is not documented.
*
* @return HTML
@@ -2724,26 +3338,27 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
$size=0, $selectAttr='',$compareFields0=true)
{
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) {
+ include(ADODB_DIR.'/adodb-lib.inc.php');
+ }
return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
$size, $selectAttr,$compareFields0);
}
-
-
+
+
/**
* Generate a SELECT tag string from a recordset, and return the string.
- * If the recordset has 2 cols, we treat the 1st col as the containing
+ * If the recordset has 2 cols, we treat the 1st col as the containing
* the text to display to the user, and 2nd col as the return value. Default
* strings are compared with the SECOND column.
*
*/
- function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')
- {
+ function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='') {
return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
$size, $selectAttr,false);
}
-
+
/*
Grouped Menu
*/
@@ -2751,7 +3366,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
$size=0, $selectAttr='')
{
global $ADODB_INCLUDED_LIB;
- if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+ if (empty($ADODB_INCLUDED_LIB)) {
+ include(ADODB_DIR.'/adodb-lib.inc.php');
+ }
return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple,
$size, $selectAttr,false);
}
@@ -2763,9 +3380,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return an array indexed by the rows (0-based) from the recordset
*/
- function &GetArray($nRows = -1)
- {
- global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
+ function GetArray($nRows = -1) {
+ global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
$results = adodb_getall($this,$nRows);
return $results;
}
@@ -2778,24 +3394,22 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
}
return $results;
}
-
- function &GetAll($nRows = -1)
- {
- $arr =& $this->GetArray($nRows);
+
+ function GetAll($nRows = -1) {
+ $arr = $this->GetArray($nRows);
return $arr;
}
-
+
/*
* Some databases allow multiple recordsets to be returned. This function
* will return true if there is a next recordset, or false if no more.
*/
- function NextRecordSet()
- {
+ 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)
@@ -2803,26 +3417,25 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return an array indexed by the rows (0-based) from the recordset
*/
- function &GetArrayLimit($nrows,$offset=-1)
- {
+ function GetArrayLimit($nrows,$offset=-1) {
if ($offset <= 0) {
- $arr =& $this->GetArray($nrows);
+ $arr = $this->GetArray($nrows);
return $arr;
- }
-
+ }
+
$this->Move($offset);
-
+
$results = array();
$cnt = 0;
while (!$this->EOF && $nrows != $cnt) {
$results[$cnt++] = $this->fields;
$this->MoveNext();
}
-
+
return $results;
}
-
-
+
+
/**
* Synonym for GetArray() for compatibility with ADO.
*
@@ -2830,40 +3443,45 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return an array indexed by the rows (0-based) from the recordset
*/
- function &GetRows($nRows = -1)
- {
- $arr =& $this->GetArray($nRows);
+ function GetRows($nRows = -1) {
+ $arr = $this->GetArray($nRows);
return $arr;
}
-
+
/**
- * return whole recordset as a 2-dimensional associative array if there are more than 2 columns.
- * The first column is treated as the key and is not included in the array.
+ * return whole recordset as a 2-dimensional associative array if there are more than 2 columns.
+ * The first column is treated as the key and is not included in the array.
* If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
* $force_array == true.
*
* @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.
+ * array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
+ * read the source.
*
- * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and
+ * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and
* instead of returning array[col0] => array(remaining cols), return array[col0] => col1
*
- * @return an associative array indexed by the first column of the array,
- * or false if the data has less than 2 cols.
+ * @return an associative array indexed by the first column of the array,
+ * or false if the data has less than 2 cols.
*/
- function &GetAssoc($force_array = false, $first2cols = false)
- {
- global $ADODB_EXTENSION;
-
+ function GetAssoc($force_array = false, $first2cols = false) {
+ global $ADODB_EXTENSION;
+
$cols = $this->_numOfFields;
if ($cols < 2) {
- $false = false;
- return $false;
+ return false;
+ }
+
+ // Empty recordset
+ if (!$this->fields) {
+ return array();
}
- $numIndex = isset($this->fields[0]);
+
+ // Determine whether the array is associative or 0-based numeric
+ $numIndex = array_keys($this->fields) == range(0, count($this->fields) - 1);
+
$results = array();
-
+
if (!$first2cols && ($cols > 2 || $force_array)) {
if ($ADODB_EXTENSION) {
if ($numIndex) {
@@ -2873,7 +3491,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
}
} else {
while (!$this->EOF) {
- $results[trim(reset($this->fields))] = array_slice($this->fields, 1);
+ // Fix for array_slice re-numbering numeric associative keys
+ $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;
adodb_movenext($this);
}
}
@@ -2885,7 +3511,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
}
} else {
while (!$this->EOF) {
- $results[trim(reset($this->fields))] = array_slice($this->fields, 1);
+ // Fix for array_slice re-numbering numeric associative keys
+ $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();
}
}
@@ -2903,7 +3537,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
while (!$this->EOF) {
// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
$v1 = trim(reset($this->fields));
- $v2 = ''.next($this->fields);
+ $v2 = ''.next($this->fields);
$results[$v1] = $v2;
adodb_movenext($this);
}
@@ -2919,158 +3553,165 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
while (!$this->EOF) {
// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
$v1 = trim(reset($this->fields));
- $v2 = ''.next($this->fields);
+ $v2 = ''.next($this->fields);
$results[$v1] = $v2;
$this->MoveNext();
}
}
}
}
-
- $ref =& $results; # workaround accelerator incompat with PHP 4.4 :(
- return $ref;
+
+ $ref = $results; # workaround accelerator incompat with PHP 4.4 :(
+ return $ref;
}
-
-
+
+
/**
*
- * @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 v is the character timestamp in YYYY-MM-DD hh:mm:ss format
+ * @param fmt is the format to apply to it, using date()
*
* @return a timestamp formated as user desires
*/
- function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
- {
- if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
+ 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 v is the character date in YYYY-MM-DD format, returned by database
+ * @param fmt is the format to apply to it, using date()
*
* @return a date formated as user desires
*/
- function UserDate($v,$fmt='Y-m-d')
- {
+ 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
*
* @return 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
*
* @return 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()
- {
+ function NumRows() {
return $this->_numOfRows;
}
-
-
+
+
/**
* PEAR DB compat, number of cols
*/
- function NumCols()
- {
+ function NumCols() {
return $this->_numOfFields;
}
-
+
/**
- * Fetch a row, returning false if no more rows.
+ * Fetch a row, returning false if no more rows.
* This is PEAR DB compat mode.
*
* @return false or array containing the current record
*/
- function &FetchRow()
- {
+ 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
*/
- 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
*/
- 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
*/
- 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();
@@ -3079,18 +3720,19 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
$this->EOF = false;
return true;
}
-
-
+
+
/**
* Move to next record in the recordset.
*
* @return true if there still rows available, or false if there are no more rows (EOF).
*/
- function MoveNext()
- {
+ function MoveNext() {
if (!$this->EOF) {
$this->_currentRow++;
- if ($this->_fetch()) return true;
+ if ($this->_fetch()) {
+ return true;
+ }
}
$this->EOF = true;
/* -- tested error handling when scrolling cursor -- seems useless.
@@ -3102,8 +3744,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*/
return false;
}
-
-
+
+
/**
* Random access to a specific row in the recordset. Some databases do not support
* access to previous rows in the databases (no scrolling backwards).
@@ -3112,15 +3754,23 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return true if there still rows available, or false if there are no more rows (EOF).
*/
- function Move($rowNumber = 0)
- {
+ function Move($rowNumber = 0) {
$this->EOF = false;
- if ($rowNumber == $this->_currentRow) return true;
- if ($rowNumber >= $this->_numOfRows)
- if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-
- if ($this->canSeek) {
-
+ if ($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()) {
@@ -3131,119 +3781,164 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
return false;
}
} else {
- if ($rowNumber < $this->_currentRow) return false;
+ 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 (!$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
*/
- 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
+ * @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
*/
- function Close()
- {
+ function Close() {
// free connection object - this seems to globally free the object
// and not merely the reference, so don't do this...
- // $this->connection = false;
+ // $this->connection = false;
if (!$this->_closed) {
$this->_closed = true;
- return $this->_close();
+ return $this->_close();
} else
return true;
}
-
+
/**
- * synonyms RecordCount and RowCount
+ * synonyms RecordCount and RowCount
*
* @return the number of rows or -1 if this is not supported
*/
- function RecordCount() {return $this->_numOfRows;}
-
-
+ 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 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 <pabloroca@mvps.org>
@@ -3252,39 +3947,49 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* But aware possible problems in multiuser environments. For better speed the table
* must be indexed by the condition. Heavy test this before deploying.
- */
+ */
function PO_RecordCount($table="", $condition="") {
-
+
$lnumrows = $this->_numOfRows;
// the database doesn't support native recordcount, so we do a workaround
if ($lnumrows == -1 && $this->connection) {
IF ($table) {
- if ($condition) $condition = " WHERE " . $condition;
- $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;
+ }
/**
@@ -3294,45 +3999,43 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @return the ADOFieldObject for that column, or false.
*/
- function &FetchField($fieldoffset)
- {
+ function FetchField($fieldoffset = -1) {
// must be defined by child class
- }
-
+
+ return false;
+ }
+
/**
* Get the ADOFieldObjects of all columns in an array.
*
*/
- function& FieldTypesArray()
- {
+ function FieldTypesArray() {
$arr = array();
- for ($i=0, $max=$this->_numOfFields; $i < $max; $i++)
+ for ($i=0, $max=$this->_numOfFields; $i < $max; $i++)
$arr[] = $this->FetchField($i);
return $arr;
}
-
+
/**
* Return the fields array of the current row as an object for convenience.
* The default case is lowercase field names.
*
* @return the object with the properties set to the fields of the current row
*/
- function &FetchObj()
- {
- $o =& $this->FetchObject(false);
+ function FetchObj() {
+ $o = $this->FetchObject(false);
return $o;
}
-
+
/**
* Return the fields array of the current row as an object for convenience.
* The default case is uppercase.
- *
+ *
* @param $isupper to set the object property names to uppercase
*
* @return the object with the properties set to the fields of the current row
*/
- function &FetchObject($isupper=true)
- {
+ function FetchObject($isupper=true) {
if (empty($this->_obj)) {
$this->_obj = new ADOFetchObj();
$this->_names = array();
@@ -3342,58 +4045,64 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
}
}
$i = 0;
- if (PHP_VERSION >= 5) $o = clone($this->_obj);
- else $o = $this->_obj;
-
+ if (PHP_VERSION >= 5) {
+ $o = clone($this->_obj);
+ } else {
+ $o = $this->_obj;
+ }
+
for ($i=0; $i <$this->_numOfFields; $i++) {
$name = $this->_names[$i];
- if ($isupper) $n = strtoupper($name);
- else $n = $name;
-
+ 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);
+ function FetchNextObj() {
+ $o = $this->FetchNextObject(false);
return $o;
}
-
-
+
+
/**
- * Return the fields array of the current row as an object for convenience.
+ * Return the fields array of the current row as an object for convenience.
* The default is upper case field names.
- *
+ *
* @param $isupper to set the object property names to uppercase
*
* @return the object with the properties set to the fields of the current row,
- * 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
@@ -3401,256 +4110,338 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
*
* @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
- ##
- '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'
+
+ // 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] : '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';
- }
- 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;
- }
- }
-
+ 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( empty($this->fields)) {
+ return;
+ }
+
+ // 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);
+ }
+ $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
- var $_fieldarr; // holds array of field objects
+ var $_fieldobjects; // holds array of field objects
var $canSeek = true;
var $affectedrows = false;
var $insertid = false;
var $sql = '';
var $compat = false;
+
/**
* Constructor
- *
*/
- function ADORecordSet_array($fakeid=1)
- {
- global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-
+ 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($addfieldnames=true) {
+ global $ADODB_INCLUDED_LIB;
+
+ if (empty($ADODB_INCLUDED_LIB)) {
+ include(ADODB_DIR.'/adodb-lib.inc.php');
+ }
+ $hdr = true;
+
+ $fobjs = $addfieldnames ? $this->_fieldobjects : false;
+ adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
+ //adodb_pr($newarr);
+
+ $this->_skiprow1 = false;
+ $this->_array = $newarr;
+ $this->_colnames = $hdr;
+
+ adodb_probetypes($newarr,$this->_types);
+
+ $this->_fieldobjects = array();
+
+ foreach($hdr as $k => $name) {
+ $f = new ADOFieldObject();
+ $f->name = $name;
+ $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
+ * The first row should hold the column names
* unless paramter $colnames is used.
- * @param typearr holds an array of types. These are the same types
+ * @param typearr holds an array of types. These are the same types
* used in MetaTypes (C,B,L,I,N).
* @param [colnames] array of column names. If set, then the first row of
* $array should not hold the column names.
*/
- 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];
}
@@ -3660,46 +4451,47 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
* Setup the Array and datatype file objects
*
* @param array is a 2-dimensional array holding the data.
- * The first row should hold the column names
+ * The first row should hold the column names
* unless paramter $colnames is used.
* @param fieldarr holds an array of ADOFieldObject's.
*/
- 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)
- {
+
+ function GetArray($nRows=-1) {
if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
return $this->_array;
} else {
- $arr =& ADORecordSet::GetArray($nRows);
+ $arr = ADORecordSet::GetArray($nRows);
return $arr;
}
}
-
- 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);
+ 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)
- {
+ 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) {
@@ -3711,9 +4503,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
}
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
- function &FetchField($fieldOffset = -1)
- {
+
+ function FetchField($fieldOffset = -1) {
if (isset($this->_fieldobjects)) {
return $this->_fieldobjects[$fieldOffset];
}
@@ -3721,172 +4512,213 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
$o->name = $this->_colnames[$fieldOffset];
$o->type = $this->_types[$fieldOffset];
$o->max_length = -1; // length not known
-
+
return $o;
}
-
- function _seek($row)
- {
+
+ 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) {
+
+ 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()
- {
+ }
+
+ 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':
+ if (PHP_VERSION >= 5) {
+ $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 = 'postgres8';
+ break;
+
default:
$class = $db; break;
}
-
+
$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
@include_once($file);
$ADODB_LASTDB = $class;
- if (class_exists("ADODB_" . $class)) return $class;
-
+ 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
*/
- function &NewADOConnection($db='')
- {
- $tmp =& ADONewConnection($db);
+ function NewADOConnection($db='') {
+ $tmp = ADONewConnection($db);
return $tmp;
}
-
+
/**
* Instantiate a new Connection class for a specific database driver.
*
* @param [db] is the database Connection object to create. If undefined,
- * use the last database driver that was loaded by ADOLoadCode().
+ * use the last database driver that was loaded by ADOLoadCode().
*
* @return the freshly created instance of the Connection class.
*/
- function &ADONewConnection($db='')
- {
- GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-
- if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
+ function ADONewConnection($db='') {
+ global $ADODB_NEWCONNECTION, $ADODB_LASTDB;
+
+ if (!defined('ADODB_ASSOC_CASE')) {
+ define('ADODB_ASSOC_CASE', ADODB_ASSOC_CASE_NATIVE);
+ }
$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);
+ $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
$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']) : '';
+
+ if (!$dsna) {
+ 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';
}
+ $dsna['scheme'] = 'pdo';
}
}
-
- if (!$dsna) {
- // special handling of oracle, which might not have host
- $db = str_replace('@/','@adodb-fakehost/',$db);
- $dsna = parse_url($db);
- if (!$dsna) return $false;
- $dsna['host'] = '';
- }
+
$db = @$dsna['scheme'];
- if (!$db) return $false;
+ if (!$db) {
+ return false;
+ }
$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
$dsna['path'] = isset($dsna['path']) ? rawurldecode(substr($dsna['path'],1)) : ''; # strip off initial /
-
+
if (isset($dsna['query'])) {
$opt1 = explode('&',$dsna['query']);
foreach($opt1 as $k => $v) {
$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.)
@@ -3900,51 +4732,64 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
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( "<p>ADONewConnection: Unable to load database driver '$db'</p>",false);
-
- return $false;
+ "could not load the database driver for '$db'",
+ $db,false,$ignore);
+ } else {
+ ADOConnection::outp( "<p>ADONewConnection: Unable to load database driver '$db'</p>",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;
@@ -3958,74 +4803,115 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
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;
+ if (!class_exists($class)) {
+ return false;
+ }
$perf = new $class($conn);
-
+
return $perf;
}
-
- function &NewDataDictionary(&$conn,$drivername=false)
- {
- $false = false;
- if (!$drivername) $drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
+
+ function NewDataDictionary(&$conn,$drivername=false) {
+ 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');
@@ -4033,55 +4919,57 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
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 " <pre>\n";print_r($var);echo "</pre>\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(ADODB_DIR.'/adodb-lib.inc.php');
+ }
+ return _adodb_backtrace($printOrArr,$levels,0,$ishtml);
}
-
}
-?>
diff --git a/libraries/adodb/composer.json b/libraries/adodb/composer.json
new file mode 100644
index 000000000..21bd25f92
--- /dev/null
+++ b/libraries/adodb/composer.json
@@ -0,0 +1,37 @@
+{
+ "name" : "adodb/adodb-php",
+ "description" : "ADOdb is a PHP database abstraction layer library",
+ "license" : [ "BSD-3-Clause", "LGPL-2.1" ],
+ "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": "http://adodb.org/",
+ "support" : {
+ "issues" : "https://github.com/ADOdb/ADOdb/issues",
+ "source" : "https://github.com/ADOdb/ADOdb"
+ },
+
+ "require" : {
+ "php" : ">=5.3.2"
+ },
+
+ "autoload" : {
+ "files" : ["adodb.inc.php"]
+ }
+
+}
diff --git a/libraries/adodb/contrib/toxmlrpc.inc.php b/libraries/adodb/contrib/toxmlrpc.inc.php
index ef49235a7..f769cc5fd 100644
--- a/libraries/adodb/contrib/toxmlrpc.inc.php
+++ b/libraries/adodb/contrib/toxmlrpc.inc.php
@@ -2,11 +2,11 @@
/**
* Helper functions to convert between ADODB recordset objects and XMLRPC values.
* Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
- *
+ *
* @author Daniele Baroncelli
* @author Gaetano Giunta
* @copyright (c) 2003-2004 Giunta/Baroncelli. All rights reserved.
- *
+ *
* @todo some more error checking here and there
* @todo document the xmlrpc-struct used to encode recordset info
* @todo verify if using xmlrpc_encode($rs->GetArray()) would work with:
@@ -16,20 +16,20 @@
/**
* 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);
+ $header = rs2xmlrpcval_header($adodbrs);
+ $body = rs2xmlrpcval_body($adodbrs);
// put it all together and build final xmlrpc struct
- $xmlrpcrs =& new xmlrpcval ( array(
+ $xmlrpcrs = new xmlrpcval ( array(
"header" => $header,
"body" => $body,
), "struct");
@@ -52,25 +52,25 @@
$fld = $adodbrs->FetchField($i);
$fieldarray = array();
if (isset($fld->name))
- $fieldarray["name"] =& new xmlrpcval ($fld->name);
+ $fieldarray["name"] = new xmlrpcval ($fld->name);
if (isset($fld->type))
- $fieldarray["type"] =& new xmlrpcval ($fld->type);
+ $fieldarray["type"] = new xmlrpcval ($fld->type);
if (isset($fld->max_length))
- $fieldarray["max_length"] =& new xmlrpcval ($fld->max_length, "int");
+ $fieldarray["max_length"] = new xmlrpcval ($fld->max_length, "int");
if (isset($fld->not_null))
- $fieldarray["not_null"] =& new xmlrpcval ($fld->not_null, "boolean");
+ $fieldarray["not_null"] = new xmlrpcval ($fld->not_null, "boolean");
if (isset($fld->has_default))
- $fieldarray["has_default"] =& new xmlrpcval ($fld->has_default, "boolean");
+ $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");
+ $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");
+ $fieldcount = new xmlrpcval ($numfields, "int");
+ $recordcount = new xmlrpcval ($numrecords, "int");
+ $sql = new xmlrpcval ($adodbrs->sql);
+ $fieldinfo = new xmlrpcval ($fieldstruct, "array");
- $header =& new xmlrpcval ( array(
+ $header = new xmlrpcval ( array(
"fieldcount" => $fieldcount,
"recordcount" => $recordcount,
"sql" => $sql,
@@ -97,28 +97,28 @@
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 ('');
+ $columns[$i] = new xmlrpcval ('');
else
- $columns[$i] =& xmlrpc_encode ($adodbrs->fields[$i]);
+ $columns[$i] = xmlrpc_encode ($adodbrs->fields[$i]);
else
foreach ($adodbrs->fields as $val)
if ($val === null)
- $columns[] =& new xmlrpcval ('');
+ $columns[] = new xmlrpcval ('');
else
- $columns[] =& xmlrpc_encode ($val);
+ $columns[] = xmlrpc_encode ($val);
- $rows[] =& new xmlrpcval ($columns, "array");
+ $rows[] = new xmlrpcval ($columns, "array");
$adodbrs->MoveNext();
}
- $body =& new xmlrpcval ($rows, "array");
+ $body = new xmlrpcval ($rows, "array");
- return $body;
+ return $body;
}
-
+
/**
* Returns an xmlrpc struct value as string out of an AdoDB recordset
- */
+ */
function rs2xmlrpcstring (&$adodbrs) {
$xmlrpc = rs2xmlrpcval ($adodbrs);
if ($xmlrpc)
@@ -129,28 +129,28 @@
/**
* 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');
-
+
+ // 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');
+
+ $fieldinfo = $header->structmem('fieldinfo');
for ($i = 0; $i < $numfields; $i++) {
- $temp =& $fieldinfo->arraymem($i);
- $fld =& new ADOFieldObject();
+ $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();
@@ -163,21 +163,19 @@
} // for
// fetch recordset information into php array
- $body =& $xmlrpcval->structmem('body');
+ $body = $xmlrpcval->structmem('body');
for ($i = 0; $i < $numrecords; $i++) {
$data_array[$i]= array();
- $xmlrpcrs_row =& $body->arraymem($i);
+ $xmlrpcrs_row = $body->arraymem($i);
for ($j = 0; $j < $numfields; $j++) {
- $temp =& $xmlrpcrs_row->arraymem($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 = new ADORecordSet_array();
$rs->InitArrayFields($data_array,$fields_array);
return $rs;
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/cute_icons_for_site/adodb.gif b/libraries/adodb/cute_icons_for_site/adodb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c5e8dfc6db2d41dfcdd1beaf338ad60bc8375587
GIT binary patch
literal 1091
zcmb7<{WIHl0DwOUc@N?x-e2-H64Owrwi9hvoYw2<meED5mh8wFs$NblGl%3#imJ4V
zM7?z0lFmz_^LF#HR3uJX*{M3^EY_*0SyMWv=9;a4!k*usyXT3BIv+&mFo6eH0RIt~
zl5$V4-^O4vv|8<vBPIR)Ismw#q1A3~1w!Gl$z)<M>H%QrbkEDm9?<C(gM;&}t<y&1
z9+%q)0E<Y>CJ@p9h|bB8i9};DF}E-nu8&VKlPQ^+TA|VS1j3czU?Biulaoss8J!Ts
zYim>Uczu?Z+_AA$2BXQzDHnj#?_luvIsX&rtvSLD_yg*D@BI@%nkK8u<)Ibft?jup
znZYf(?&GWgZ>sABvVO@9()Sm}`b*{vZ=B*&F9lTrGZ^P;?EcTibFcm}m6R4^Fpw*e
z7=|WYq*9@qwU9d&ix$<^iR-*c4Yed6YYz`+_m&oyx@O3`uDij^3}s<~b|H`<#Q<u2
z0*=E`CR9qb#@SwlveKw6Nm}h=9D3YKIlqh|{^VJS8C%AyZK3(OIi$*24fk47+LBiu
zDHl;Yd)ieCHiB6tA;S_&@^O)eSZj7!KOaTV@(W1<7zaC&FgsN9TOZ3JB*ehxu;m0L
zK1iEJg#rmm*ZtA7Eb-~|aY7^sf=!(_Wj;GLHCu8y$qerp{!-zf=lp{Bo258hppoeu
ztD+O<UH}gr;!+ziwcvPquY7(qE(qk6BDs!TS+@-ZF46U5vS(}JXD!KMn<~$Q>x0Zy
zM5&dzEm-tEQItP$xl*zQ1@sj=e1abg>0jztUh!k=?>ldPnd6aEsrB=JB)><;@~cOf
ziOLmMa+SkLdEXON^ReiWo-F;14%!D3i;H{ufzKD*TyTdwEY-j|EBReup8T)JXC0b_
zH23V;2{)6hD(EfTEN!{@6v=r5CRRk4cxSdx=5w#k<cktEF~-SKE5W&%qmY3df<y-x
zpTI@Gs^Y@ce{6u@EKH>7X<jSwVKQ=FC%Bcr+w=m59+f^%;u@)~NyWCYqzid#YtymJ
zPl*EyNvKFl3G$4;S7;?$s?k@Yd?|P|mhq;o&^;l2JqG>7S2Y+G&phnomHi<*Sc+&S
zwsGRNkSpfK{Xm9&J@{>iBx79Id6ynmPLW(WP;|BA+V5^iO5o4B?s7d3tSbzfC`wZ)
zGMLi-J(g$a$UI2z?i2;Hqz%;<4-D;hrlVxiE*{ILz5RD-_t7Dm%{QGgd$F{q=;?<q
zJA|uIhL#FEc}v=3$=Yleutv%9X2$h&=@gG24?|S&f9##H`EFY=?CY}Gd+mUC|AAw^
zt~6x1K*IJN*2!imvMrgkr*X9^0PcQmzf3cJxVQCc0-&hINpn<2Hk|5OhK|I4^r!J5
zA%gmP%8oCH$N33vmYq$7)?ceh<<uRGSAC{pW)H4|qso~@JF@|5>aJ$*2EiPh`WLqT
B&Itej
literal 0
HcmV?d00001
diff --git a/libraries/adodb/cute_icons_for_site/adodb2.gif b/libraries/adodb/cute_icons_for_site/adodb2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f12ae2037ee14b11d8cc0f00a31ba088ef755119
GIT binary patch
literal 1458
zcma)%{Xf%r0Kh++S@STy8>OwtRIg)EqO#F-9)>lg*;Sk)BR4Xap**$p9Yd5hwrdr#
zErn4eAxDke5jyLYh{~qsQf}Su)x*`f+SPw>@7Md+_Yd#T?I9FuJO^w54*)QkOh)6o
zxw$!=&Y;me8yy`T8X6iHc&t`Wb#&ZsZPnD**DDl*a`~^7mA%qaX{DuI1qJOe4Cm#w
zq^GO6+)Igx%BZL+7E2ZuCJ7G@4+tpt^)01Rk8j*qxNaTn>Y7g?<vBWL5eOMem!?4w
z4}y|yY&aGcTnh^h0H2KpfCT^pfItAY0^t1#fdu~>(g&2eJ=h4`zZ74d0NUjL6OZmr
z6b;p7+)4F9Xc~62A$olzyr=bg2$sD;N<PKvi#+s>!8vk+JL}smrf)*O2;46tt^r5!
zxlA;_kd>7!WR}5ke4<q*^GJ3=aSSmtLu!?4C5fm4wn`=uNvx_XsxOtdhz^J@a}|P<
zg2Uacn#{xeGooWG+hdAr(Iws4{iS93*MEpS-5AN2-s<cfVP49wEN(%!L=+ZB4#&YN
zDd_5IohJWT%e8G<Q0<-Ml(hM~WeVL`K3}6BI11YgPlzcts~Oew3W?;za_^MKLsu^h
zidK5ZsKxPSOKhB2m$o*xT^x~l?jNq+e(m=WTM|u7C+U&qCMyRo=^y^md5w}TA;%84
zH{P#jR^+Lv{it0_m%FncYU0VqA$Cv>Hmsw0>RR%BRqV*=W(;mEt2v59)1z&vp(kDY
zI)#|tqaXIcAU;TUQ)p**MK{Zfv$eyor08@7`v(aapY;&}<J_1aLeA_fC=z1{zCzb@
z+M8q-Gr1=v@D8HX1vdd1<!gLkY#`*R?^3oyHrc^FoB|R9Oa#xkIX`tC2B>}o3R5xQ
z!&^G#x6J2q!F&mBM7Bws(1)={1u>#9;9_qXcG}S7s?Z(HcGVUQMjX)RY7m$;buyX-
z)75_!{~iL&LQehxF!b>whnCe-GhqTqY>qCLXB`1Mnrk-q1zLGv;&mzEQA}+f;Drj0
z1!IzDad#1r0P<o40C)}3GtnMZ*ELY)p)x8f8P)_?!lXd6!l0azRbVf%Pc9@2#ac8W
z1v7JoutkTGtXHAe;uDbaOO{u$yo<Q#z`s`i$YwFM(ABeNYw`tG?j%%sdPO*b<(S#;
zF9hl6wDa3sX5)(8))SrW&*JZ(s=~XcP)G3z+4|}lwi~KEXLAm%DC4|^y6(K?d_#Sh
z6EQ`}ctZ&-t3+C=rH3-gp4WD$JeAGu=gx8^ySyq$S>sNPajoR{gr+tu*<vA+>^`lq
zBpe)`ht8-POx$(`KbM4i6=JCdxbYQz6^|?;kd0={Rs?#}-n`l-v&j?^xAo@Yi*6-Z
z;b9(<_>i;~;s4U5@jE$r;qYzZ)>JS>U36EbElaN}r=h0ih-MTxgO6pW*8TENaZJmg
zldehIui0Xa4|PgqN8w4<y)+F$F#Kw4htK7MV?DkeZ^wh0)x7cDNq5^HFl907$v6kZ
zJBTgXne{M48Vf&6Zh||eQbdlO_!tR);Bium2WsX>=T4M1<?kn*GwCI<l-N*L!)tBc
z&pY2w=Pw%G>r<`5sdFN`{2OzpRv#2TjmrGAMPHt_?S}r$H~Aepajnz)S^9Wy(`5OI
zePfG;lP$mHOevGXyA3^KhFo0Rh8n*GShkPyh!Z!{@%TdIwhu;{y~x4P<L5+qKAqI!
z_qyWQOs^s7+qk#gliHeI{k_av)R%=}wRy&2Svaa;6<=OG@vk?QjB)ngWkS#6mUXGk
z13_4f&{Kx?H431Ua@1G!KFerh!CpT(^vOkb1DY>%wpL(5>HYX~Mxh5K{y@~50*Cnp
z)U$Z}2@d@>aoSi+8CBS19}jXcii4L31y*~+$j?~`eTNb+YZx$d5yQ;XXb1qm{{VnR
Bbn*ZI
literal 0
HcmV?d00001
diff --git a/libraries/adodb/datadict/datadict-access.inc.php b/libraries/adodb/datadict/datadict-access.inc.php
index 25d639866..c14591543 100644
--- a/libraries/adodb/datadict/datadict-access.inc.php
+++ b/libraries/adodb/datadict/datadict-access.inc.php
@@ -1,55 +1,58 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class ADODB2_access extends ADODB_DataDict {
-
+
var $databaseType = 'access';
var $seqField = false;
-
-
+
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'TEXT';
case 'XL':
- case 'X': return 'MEMO';
-
+ case 'X': return 'MEMO';
+
case 'C2': return 'TEXT'; // up to 32K
case 'X2': return 'MEMO';
-
+
case 'B': return 'BINARY';
-
+
+ case 'TS':
case 'D': return 'DATETIME';
case 'T': return 'DATETIME';
-
+
case 'L': return 'BYTE';
case 'I': return 'INTEGER';
case 'I1': return 'BYTE';
case 'I2': return 'SMALLINT';
case 'I4': return 'INTEGER';
case 'I8': return 'INTEGER';
-
+
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)
+ function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
{
if ($fautoinc) {
$ftype = 'COUNTER';
@@ -65,31 +68,28 @@ class ADODB2_access extends ADODB_DataDict {
if ($fconstraint) $suffix .= ' '.$fconstraint;
return $suffix;
}
-
+
function CreateDatabase($dbname,$options=false)
{
return array();
}
-
-
+
+
function SetSchema($schema)
{
}
- function AlterColumnSQL($tabname, $flds)
+ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
{
if ($this->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/libraries/adodb/datadict/datadict-db2.inc.php b/libraries/adodb/datadict/datadict-db2.inc.php
index 38f2a1e01..7d201ff17 100644
--- a/libraries/adodb/datadict/datadict-db2.inc.php
+++ b/libraries/adodb/datadict/datadict-db2.inc.php
@@ -1,28 +1,30 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class ADODB2_db2 extends ADODB_DataDict {
-
+
var $databaseType = 'db2';
var $seqField = false;
-
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';
case 'XL': return 'CLOB';
- case 'X': return 'VARCHAR(3600)';
+ case 'X': return 'VARCHAR(3600)';
case 'C2': return 'VARCHAR'; // up to 32K
case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
@@ -30,6 +32,7 @@ class ADODB2_db2 extends ADODB_DataDict {
case 'B': return 'BLOB';
case 'D': return 'DATE';
+ case 'TS':
case 'T': return 'TIMESTAMP';
case 'L': return 'SMALLINT';
@@ -45,54 +48,54 @@ class ADODB2_db2 extends ADODB_DataDict {
return $meta;
}
}
-
+
// 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 ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as identity start with
+ if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as identity start with
if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
if ($fnotnull) $suffix .= ' NOT NULL';
if ($fconstraint) $suffix .= ' '.$fconstraint;
return $suffix;
}
- function AlterColumnSQL($tabname, $flds)
+ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
{
if ($this->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();
}
-
-
+
+
function ChangeTableSQL($tablename, $flds, $tableoptions = false)
{
-
+
/**
Allow basic table changes to DB2 databases
- DB2 will fatally reject changes to non character columns
+ DB2 will fatally reject changes to non character columns
*/
-
+
$validTypes = array("CHAR","VARC");
$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
// check table exists
- $cols = &$this->MetaColumns($tablename);
- if ( empty($cols)) {
+ $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);
$sql = array();
-
+
foreach ( $lines as $id => $v ) {
if ( isset($cols[$id]) && is_object($cols[$id]) ) {
/**
@@ -109,10 +112,10 @@ class ADODB2_db2 extends ADODB_DataDict {
for ($i=1;$i<sizeof($vargs);$i++)
if ($vargs[$i] != '')
break;
-
+
// if $vargs[$i] is one of the following, we are trying to change the
// size of the field, if not allowed, simply ignore the request.
- if (in_array(substr($vargs[$i],0,4),$invalidTypes))
+ if (in_array(substr($vargs[$i],0,4),$invalidTypes))
continue;
// insert the appropriate DB2 syntax
if (in_array(substr($vargs[$i],0,4),$validTypes)) {
@@ -127,17 +130,14 @@ class ADODB2_db2 extends ADODB_DataDict {
break;
array_splice($vargs,$i,2,'');
}
- $v = implode(' ',$vargs);
+ $v = implode(' ',$vargs);
$sql[] = $alter . $this->alterCol . ' ' . $v;
} else {
$sql[] = $alter . $this->addCol . ' ' . $v;
}
}
-
+
return $sql;
}
-
-}
-
-?>
\ No newline at end of file
+}
diff --git a/libraries/adodb/datadict/datadict-firebird.inc.php b/libraries/adodb/datadict/datadict-firebird.inc.php
index dff2a24c1..f247c8dc0 100644
--- a/libraries/adodb/datadict/datadict-firebird.inc.php
+++ b/libraries/adodb/datadict/datadict-firebird.inc.php
@@ -1,75 +1,78 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
class ADODB2_firebird extends ADODB_DataDict {
-
+
var $databaseType = 'firebird';
var $seqField = false;
var $seqPrefix = 'gen_';
- var $blobSize = 40000;
-
+ var $blobSize = 40000;
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';
- case 'XL': return 'VARCHAR(32000)';
- case 'X': return 'VARCHAR(4000)';
-
+ case 'XL': return 'VARCHAR(32000)';
+ case 'X': return 'VARCHAR(4000)';
+
case 'C2': return 'VARCHAR'; // up to 32K
case 'X2': return 'VARCHAR(4000)';
-
+
case 'B': return 'BLOB';
-
+
case 'D': return 'DATE';
+ case 'TS':
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 'INTEGER';
-
+
case 'F': return 'DOUBLE PRECISION';
case 'N': return 'DECIMAL';
default:
return $meta;
}
}
-
+
function NameQuote($name = NULL)
{
if (!is_string($name)) {
return FALSE;
}
-
+
$name = trim($name);
-
+
if ( !is_object($this->connection) ) {
return $name;
}
-
+
$quote = $this->connection->nameQuote;
-
+
// if name is of the form `name`, quote it
if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
return $quote . $matches[1] . $quote;
}
-
+
// if name contains special characters, quote it
if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
return $quote . $name . $quote;
}
-
+
return $quote . $name . $quote;
}
@@ -77,12 +80,12 @@ class ADODB2_firebird extends ADODB_DataDict {
{
$options = $this->_Options($options);
$sql = array();
-
+
$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
-
+
return $sql;
}
-
+
function _DropAutoIncrement($t)
{
if (strpos($t,'.') !== false) {
@@ -91,20 +94,20 @@ class ADODB2_firebird extends ADODB_DataDict {
}
return 'DROP GENERATOR "GEN_'.$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;
if ($fconstraint) $suffix .= ' '.$fconstraint;
-
+
return $suffix;
}
-
+
/*
CREATE or replace TRIGGER jaddress_insert
before insert on jaddress
@@ -115,9 +118,9 @@ IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
end;
*/
function _Triggers($tabname,$tableoptions)
- {
+ {
if (!$this->seqField) return array();
-
+
$tab1 = preg_replace( '/"/', '', $tabname );
if ($this->schema) {
$t = strpos($tab1,'.');
@@ -140,12 +143,9 @@ end;
{ $sql[] = "CREATE GENERATOR \"$seqname\"";
$sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
}
-
+
$this->seqField = false;
return $sql;
}
}
-
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/datadict/datadict-generic.inc.php b/libraries/adodb/datadict/datadict-generic.inc.php
index 33438066c..e2e6909e7 100644
--- a/libraries/adodb/datadict/datadict-generic.inc.php
+++ b/libraries/adodb/datadict/datadict-generic.inc.php
@@ -1,46 +1,49 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class ADODB2_generic extends ADODB_DataDict {
-
+
var $databaseType = 'generic';
var $seqField = false;
-
-
+
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';
case 'XL':
case 'X': return 'VARCHAR(250)';
-
+
case 'C2': return 'VARCHAR';
case 'X2': return 'VARCHAR(250)';
-
+
case 'B': return 'VARCHAR';
-
+
case 'D': return 'DATE';
+ case 'TS':
case 'T': return 'DATE';
-
+
case 'L': return 'DECIMAL(1)';
case 'I': return 'DECIMAL(10)';
case 'I1': return 'DECIMAL(3)';
case 'I2': return 'DECIMAL(5)';
case 'I4': return 'DECIMAL(10)';
case 'I8': return 'DECIMAL(20)';
-
+
case 'F': return 'DECIMAL(32,8)';
case 'N': return 'DECIMAL';
default:
@@ -48,19 +51,19 @@ class ADODB2_generic extends ADODB_DataDict {
}
}
- function AlterColumnSQL($tabname, $flds)
+ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
{
if ($this->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 +72,52 @@ class ADODB2_generic extends ADODB_DataDict {
{
switch($meta) {
case 'C': return 'VARCHAR';
- case 'X': return 'VARCHAR';
-
+ case 'X': return 'VARCHAR';
+
case 'C2': return 'VARCHAR'; // up to 32K
case 'X2': return 'VARCHAR';
-
+
case 'B': return 'BLOB';
-
+
case 'D': return 'DATE';
case 'T': return 'TIMESTAMP';
-
+
case 'L': return 'SMALLINT';
case 'I': return 'INTEGER';
case 'I1': return 'SMALLINT';
case 'I2': return 'SMALLINT';
case 'I4': return 'INTEGER';
case 'I8': return 'BIGINT';
-
+
case 'F': return 'DOUBLE';
case 'N': return 'DECIMAL';
default:
return $meta;
}
}
-
+
// ifx
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';// 255
- case 'X': return 'TEXT';
-
+ case 'X': return 'TEXT';
+
case 'C2': return 'NVARCHAR';
case 'X2': return 'TEXT';
-
+
case 'B': return 'BLOB';
-
+
case 'D': return 'DATE';
case 'T': return 'DATETIME';
-
+
case 'L': return 'SMALLINT';
case 'I': return 'INTEGER';
case 'I1': return 'SMALLINT';
case 'I2': return 'SMALLINT';
case 'I4': return 'INTEGER';
case 'I8': return 'DECIMAL(20)';
-
+
case 'F': return 'FLOAT';
case 'N': return 'DECIMAL';
default:
@@ -122,4 +125,3 @@ function ActualType($meta)
}
}
*/
-?>
\ No newline at end of file
diff --git a/libraries/adodb/datadict/datadict-ibase.inc.php b/libraries/adodb/datadict/datadict-ibase.inc.php
index 6c2e8e7d3..495a722d6 100644
--- a/libraries/adodb/datadict/datadict-ibase.inc.php
+++ b/libraries/adodb/datadict/datadict-ibase.inc.php
@@ -1,46 +1,49 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class ADODB2_ibase extends ADODB_DataDict {
-
+
var $databaseType = 'ibase';
var $seqField = false;
-
-
+
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';
case 'XL':
- case 'X': return 'VARCHAR(4000)';
-
+ case 'X': return 'VARCHAR(4000)';
+
case 'C2': return 'VARCHAR'; // up to 32K
case 'X2': return 'VARCHAR(4000)';
-
+
case 'B': return 'BLOB';
-
+
case 'D': return 'DATE';
+ case 'TS':
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 'INTEGER';
-
+
case 'F': return 'DOUBLE PRECISION';
case 'N': return 'DECIMAL';
default:
@@ -48,20 +51,17 @@ class ADODB2_ibase extends ADODB_DataDict {
}
}
- function AlterColumnSQL($tabname, $flds)
+ function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
{
if ($this->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/libraries/adodb/datadict/datadict-informix.inc.php b/libraries/adodb/datadict/datadict-informix.inc.php
index 67a4b332e..25726f499 100644
--- a/libraries/adodb/datadict/datadict-informix.inc.php
+++ b/libraries/adodb/datadict/datadict-informix.inc.php
@@ -1,46 +1,49 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class ADODB2_informix extends ADODB_DataDict {
-
+
var $databaseType = 'informix';
var $seqField = false;
-
-
+
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';// 255
case 'XL':
- 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 'TS':
+ case 'T': return 'DATETIME YEAR TO SECOND';
+
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:
@@ -48,21 +51,21 @@ class ADODB2_informix extends ADODB_DataDict {
}
}
- function AlterColumnSQL($tabname, $flds)
+ function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
{
if ($this->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 +77,5 @@ class ADODB2_informix extends ADODB_DataDict {
if ($fconstraint) $suffix .= ' '.$fconstraint;
return $suffix;
}
-
-}
-?>
\ No newline at end of file
+}
diff --git a/libraries/adodb/datadict/datadict-mssql.inc.php b/libraries/adodb/datadict/datadict-mssql.inc.php
index 9be5f80cd..2c496dea6 100644
--- a/libraries/adodb/datadict/datadict-mssql.inc.php
+++ b/libraries/adodb/datadict/datadict-mssql.inc.php
@@ -1,38 +1,40 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
/*
In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
- Note Delimiters are for identifiers only. Delimiters cannot be used for keywords,
+ Note Delimiters are for identifiers only. Delimiters cannot be used for keywords,
whether or not they are marked as reserved in SQL Server.
-
+
Quoted identifiers are delimited by double quotation marks ("):
SELECT * FROM "Blanks in Table Name"
-
+
Bracketed identifiers are delimited by brackets ([ ]):
SELECT * FROM [Blanks In Table Name]
-
- Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default,
- the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON
- when they connect.
-
- In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER,
+
+ Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default,
+ the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON
+ when they connect.
+
+ In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER,
the quoted identifier option of sp_dboption, or the user options option of sp_configure.
-
+
When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
-
+
Syntax
-
+
SET QUOTED_IDENTIFIER { ON | OFF }
@@ -49,9 +51,9 @@ class ADODB2_mssql extends ADODB_DataDict {
var $typeX = 'TEXT'; ## Alternatively, set it to VARCHAR(4000)
var $typeXL = 'TEXT';
-
+
//var $alterCol = ' ALTER COLUMN ';
-
+
function MetaType($t,$len=-1,$fieldobj=false)
{
if (is_object($t)) {
@@ -59,23 +61,23 @@ class ADODB2_mssql extends ADODB_DataDict {
$t = $fieldobj->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 +87,30 @@ class ADODB2_mssql extends ADODB_DataDict {
case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
case 'C2': return 'NVARCHAR';
case 'X2': return 'NTEXT';
-
+
case 'B': return 'IMAGE';
-
+
case 'D': return 'DATETIME';
+
+ case 'TS':
case 'T': return 'DATETIME';
case 'L': return 'BIT';
-
- case 'R':
- case 'I': return 'INT';
+
+ case 'R':
+ case 'I': return 'INT';
case 'I1': return 'TINYINT';
case 'I2': return 'SMALLINT';
case 'I4': return 'INT';
case 'I8': return 'BIGINT';
-
+
case 'F': return 'REAL';
case 'N': return 'NUMERIC';
default:
return $meta;
}
}
-
-
+
+
function AddColumnSQL($tabname, $flds)
{
$tabname = $this->TableName ($tabname);
@@ -120,9 +124,9 @@ class ADODB2_mssql extends ADODB_DataDict {
$sql[] = $s;
return $sql;
}
-
+
/*
- function AlterColumnSQL($tabname, $flds)
+ function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
{
$tabname = $this->TableName ($tabname);
$sql = array();
@@ -134,8 +138,8 @@ class ADODB2_mssql extends ADODB_DataDict {
return $sql;
}
*/
-
- function DropColumnSQL($tabname, $flds)
+
+ function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
{
$tabname = $this->TableName ($tabname);
if (!is_array($flds))
@@ -149,10 +153,10 @@ class ADODB2_mssql extends ADODB_DataDict {
$sql[] = $s;
return $sql;
}
-
+
// return string must begin with space
- function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
- {
+ function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+ {
$suffix = '';
if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
@@ -161,110 +165,110 @@ class ADODB2_mssql extends ADODB_DataDict {
if ($fconstraint) $suffix .= ' '.$fconstraint;
return $suffix;
}
-
+
/*
-CREATE TABLE
- [ database_name.[ owner ] . | owner. ] table_name
- ( { < column_definition >
- | column_name AS computed_column_expression
+CREATE TABLE
+ [ database_name.[ owner ] . | owner. ] table_name
+ ( { < column_definition >
+ | column_name AS computed_column_expression
| < table_constraint > ::= [ CONSTRAINT constraint_name ] }
- | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
- )
+ | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+ )
-[ ON { filegroup | DEFAULT } ]
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
-< column_definition > ::= { column_name data_type }
- [ COLLATE < collation_name > ]
- [ [ DEFAULT constant_expression ]
+< column_definition > ::= { column_name data_type }
+ [ COLLATE < collation_name > ]
+ [ [ DEFAULT constant_expression ]
| [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
- ]
- [ ROWGUIDCOL]
- [ < column_constraint > ] [ ...n ]
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ]
- { [ NULL | NOT NULL ]
- | [ { PRIMARY KEY | UNIQUE }
- [ CLUSTERED | NONCLUSTERED ]
- [ WITH FILLFACTOR = fillfactor ]
- [ON {filegroup | DEFAULT} ] ]
- ]
- | [ [ FOREIGN KEY ]
- REFERENCES ref_table [ ( ref_column ) ]
- [ ON DELETE { CASCADE | NO ACTION } ]
- [ ON UPDATE { CASCADE | NO ACTION } ]
- [ NOT FOR REPLICATION ]
- ]
- | CHECK [ NOT FOR REPLICATION ]
- ( logical_expression )
- }
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ]
- { [ { PRIMARY KEY | UNIQUE }
- [ CLUSTERED | NONCLUSTERED ]
- { ( column [ ASC | DESC ] [ ,...n ] ) }
- [ WITH FILLFACTOR = fillfactor ]
- [ ON { filegroup | DEFAULT } ]
- ]
- | FOREIGN KEY
- [ ( column [ ,...n ] ) ]
- REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
- [ ON DELETE { CASCADE | NO ACTION } ]
- [ ON UPDATE { CASCADE | NO ACTION } ]
- [ NOT FOR REPLICATION ]
- | CHECK [ NOT FOR REPLICATION ]
- ( search_conditions )
- }
+ ]
+ [ ROWGUIDCOL]
+ [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+ { [ NULL | NOT NULL ]
+ | [ { PRIMARY KEY | UNIQUE }
+ [ CLUSTERED | NONCLUSTERED ]
+ [ WITH FILLFACTOR = fillfactor ]
+ [ON {filegroup | DEFAULT} ] ]
+ ]
+ | [ [ FOREIGN KEY ]
+ REFERENCES ref_table [ ( ref_column ) ]
+ [ ON DELETE { CASCADE | NO ACTION } ]
+ [ ON UPDATE { CASCADE | NO ACTION } ]
+ [ NOT FOR REPLICATION ]
+ ]
+ | CHECK [ NOT FOR REPLICATION ]
+ ( logical_expression )
+ }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+ { [ { PRIMARY KEY | UNIQUE }
+ [ CLUSTERED | NONCLUSTERED ]
+ { ( column [ ASC | DESC ] [ ,...n ] ) }
+ [ WITH FILLFACTOR = fillfactor ]
+ [ ON { filegroup | DEFAULT } ]
+ ]
+ | FOREIGN KEY
+ [ ( column [ ,...n ] ) ]
+ REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+ [ ON DELETE { CASCADE | NO ACTION } ]
+ [ ON UPDATE { CASCADE | NO ACTION } ]
+ [ NOT FOR REPLICATION ]
+ | CHECK [ NOT FOR REPLICATION ]
+ ( search_conditions )
+ }
*/
-
+
/*
- CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
- ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
- [ WITH < index_option > [ ,...n] ]
+ CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+ ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+ [ WITH < index_option > [ ,...n] ]
[ ON filegroup ]
- < index_option > :: =
- { PAD_INDEX |
- FILLFACTOR = fillfactor |
- IGNORE_DUP_KEY |
- DROP_EXISTING |
- STATISTICS_NORECOMPUTE |
- SORT_IN_TEMPDB
+ < index_option > :: =
+ { PAD_INDEX |
+ FILLFACTOR = fillfactor |
+ IGNORE_DUP_KEY |
+ DROP_EXISTING |
+ STATISTICS_NORECOMPUTE |
+ SORT_IN_TEMPDB
}
*/
function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
{
$sql = array();
-
+
if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
if ( isset($idxoptions['DROP']) )
return $sql;
}
-
+
if ( empty ($flds) ) {
return $sql;
}
-
+
$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-
+
if ( is_array($flds) )
$flds = implode(', ',$flds);
$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-
+
if ( isset($idxoptions[$this->upperName]) )
$s .= $idxoptions[$this->upperName];
-
+
$sql[] = $s;
-
+
return $sql;
}
-
-
+
+
function _GetSize($ftype, $ty, $fsize, $fprec)
{
switch ($ftype) {
@@ -275,8 +279,7 @@ CREATE TABLE
return $ftype;
}
if ($ty == 'T') return $ftype;
- return parent::_GetSize($ftype, $ty, $fsize, $fprec);
+ return parent::_GetSize($ftype, $ty, $fsize, $fprec);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/datadict/datadict-mssqlnative.inc.php b/libraries/adodb/datadict/datadict-mssqlnative.inc.php
new file mode 100644
index 000000000..36d5fcad4
--- /dev/null
+++ b/libraries/adodb/datadict/datadict-mssqlnative.inc.php
@@ -0,0 +1,369 @@
+<?php
+
+/**
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+
+ Set tabs to 4 for best viewing.
+
+*/
+
+/*
+In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
+
+ Note Delimiters are for identifiers only. Delimiters cannot be used for keywords,
+ whether or not they are marked as reserved in SQL Server.
+
+ Quoted identifiers are delimited by double quotation marks ("):
+ SELECT * FROM "Blanks in Table Name"
+
+ Bracketed identifiers are delimited by brackets ([ ]):
+ SELECT * FROM [Blanks In Table Name]
+
+ Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default,
+ the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON
+ when they connect.
+
+ In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER,
+ the quoted identifier option of sp_dboption, or the user options option of sp_configure.
+
+ When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
+
+ Syntax
+
+ SET QUOTED_IDENTIFIER { ON | OFF }
+
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_mssqlnative extends ADODB_DataDict {
+ var $databaseType = 'mssqlnative';
+ var $dropIndex = 'DROP INDEX %1$s ON %2$s';
+ var $renameTable = "EXEC sp_rename '%s','%s'";
+ var $renameColumn = "EXEC sp_rename '%s.%s','%s'";
+ var $typeX = 'TEXT'; ## Alternatively, set it to VARCHAR(4000)
+ var $typeXL = 'TEXT';
+
+ //var $alterCol = ' ALTER COLUMN ';
+
+ function MetaType($t,$len=-1,$fieldobj=false)
+ {
+ if (is_object($t)) {
+ $fieldobj = $t;
+ $t = $fieldobj->type;
+ $len = $fieldobj->max_length;
+ }
+
+ $_typeConversion = array(
+ -155 => 'D',
+ 93 => 'D',
+ -154 => 'D',
+ -2 => 'D',
+ 91 => 'D',
+
+ 12 => 'C',
+ 1 => 'C',
+ -9 => 'C',
+ -8 => 'C',
+
+ -7 => 'L',
+ -6 => 'I2',
+ -5 => 'I8',
+ -11 => 'I',
+ 4 => 'I',
+ 5 => 'I4',
+
+ -1 => 'X',
+ -10 => 'X',
+
+ 2 => 'N',
+ 3 => 'N',
+ 6 => 'N',
+ 7 => 'N',
+
+ -152 => 'X',
+ -151 => 'X',
+ -4 => 'X',
+ -3 => 'X'
+ );
+
+ return $_typeConversion($t);
+
+ }
+
+ function ActualType($meta)
+ {
+ $DATE_TYPE = 'DATETIME';
+
+ switch(strtoupper($meta)) {
+
+ case 'C': return 'VARCHAR';
+ 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:
+ print "RETURN $meta";
+ return $meta;
+ }
+ }
+
+
+ function AddColumnSQL($tabname, $flds)
+ {
+ $tabname = $this->TableName ($tabname);
+ $f = array();
+ list($lines,$pkey) = $this->_GenFields($flds);
+ $s = "ALTER TABLE $tabname $this->addCol";
+ foreach($lines as $v) {
+ $f[] = "\n $v";
+ }
+ $s .= implode(', ',$f);
+ $sql[] = $s;
+ return $sql;
+ }
+
+ function DefaultConstraintname($tabname, $colname)
+ {
+ $constraintname = false;
+ $rs = $this->connection->Execute(
+ "SELECT name FROM sys.default_constraints
+ WHERE object_name(parent_object_id) = '$tabname'
+ AND col_name(parent_object_id, parent_column_id) = '$colname'"
+ );
+ if ( is_object($rs) ) {
+ $row = $rs->FetchRow();
+ $constraintname = $row['name'];
+ }
+ return $constraintname;
+ }
+
+ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+ {
+ $tabname = $this->TableName ($tabname);
+ $sql = array();
+
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+ $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+ foreach($lines as $v) {
+ $not_null = false;
+ if ($not_null = preg_match('/NOT NULL/i',$v)) {
+ $v = preg_replace('/NOT NULL/i','',$v);
+ }
+ 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))
+ $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
+ 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;
+ }
+
+ /*
+CREATE TABLE
+ [ database_name.[ owner ] . | owner. ] table_name
+ ( { < column_definition >
+ | column_name AS computed_column_expression
+ | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+ | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+ )
+
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
+
+< column_definition > ::= { column_name data_type }
+ [ COLLATE < collation_name > ]
+ [ [ DEFAULT constant_expression ]
+ | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+ ]
+ [ ROWGUIDCOL]
+ [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+ { [ NULL | NOT NULL ]
+ | [ { PRIMARY KEY | UNIQUE }
+ [ CLUSTERED | NONCLUSTERED ]
+ [ WITH FILLFACTOR = fillfactor ]
+ [ON {filegroup | DEFAULT} ] ]
+ ]
+ | [ [ FOREIGN KEY ]
+ REFERENCES ref_table [ ( ref_column ) ]
+ [ ON DELETE { CASCADE | NO ACTION } ]
+ [ ON UPDATE { CASCADE | NO ACTION } ]
+ [ NOT FOR REPLICATION ]
+ ]
+ | CHECK [ NOT FOR REPLICATION ]
+ ( logical_expression )
+ }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+ { [ { PRIMARY KEY | UNIQUE }
+ [ CLUSTERED | NONCLUSTERED ]
+ { ( column [ ASC | DESC ] [ ,...n ] ) }
+ [ WITH FILLFACTOR = fillfactor ]
+ [ ON { filegroup | DEFAULT } ]
+ ]
+ | FOREIGN KEY
+ [ ( column [ ,...n ] ) ]
+ REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+ [ ON DELETE { CASCADE | NO ACTION } ]
+ [ ON UPDATE { CASCADE | NO ACTION } ]
+ [ NOT FOR REPLICATION ]
+ | CHECK [ NOT FOR REPLICATION ]
+ ( search_conditions )
+ }
+
+
+ */
+
+ /*
+ CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+ ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+ [ WITH < index_option > [ ,...n] ]
+ [ ON filegroup ]
+ < index_option > :: =
+ { PAD_INDEX |
+ FILLFACTOR = fillfactor |
+ IGNORE_DUP_KEY |
+ DROP_EXISTING |
+ STATISTICS_NORECOMPUTE |
+ SORT_IN_TEMPDB
+ }
+*/
+ function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+ {
+ $sql = array();
+
+ if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+ $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+ if ( isset($idxoptions['DROP']) )
+ return $sql;
+ }
+
+ if ( empty ($flds) ) {
+ return $sql;
+ }
+
+ $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+ $clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+
+ if ( is_array($flds) )
+ $flds = implode(', ',$flds);
+ $s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+
+ if ( isset($idxoptions[$this->upperName]) )
+ $s .= $idxoptions[$this->upperName];
+
+
+ $sql[] = $s;
+
+ return $sql;
+ }
+
+
+ function _GetSize($ftype, $ty, $fsize, $fprec)
+ {
+ switch ($ftype) {
+ case 'INT':
+ case 'SMALLINT':
+ case 'TINYINT':
+ case 'BIGINT':
+ return $ftype;
+ }
+ if ($ty == 'T') return $ftype;
+ return parent::_GetSize($ftype, $ty, $fsize, $fprec);
+
+ }
+}
diff --git a/libraries/adodb/datadict/datadict-mysql.inc.php b/libraries/adodb/datadict/datadict-mysql.inc.php
index 7fb82a86f..00a43a2a1 100644
--- a/libraries/adodb/datadict/datadict-mysql.inc.php
+++ b/libraries/adodb/datadict/datadict-mysql.inc.php
@@ -1,13 +1,15 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
@@ -18,10 +20,10 @@ class ADODB2_mysql extends ADODB_DataDict {
var $alterCol = ' MODIFY COLUMN';
var $alterTableAddIndex = true;
var $dropTable = 'DROP TABLE IF EXISTS %s'; // requires mysql 3.22 or later
-
+
var $dropIndex = 'DROP INDEX %s ON %s';
var $renameColumn = 'ALTER TABLE %s CHANGE COLUMN %s %s %s'; // needs column-definition!
-
+
function MetaType($t,$len=-1,$fieldobj=false)
{
if (is_object($t)) {
@@ -30,43 +32,43 @@ class ADODB2_mysql extends ADODB_DataDict {
$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';
@@ -82,33 +84,34 @@ class ADODB2_mysql extends ADODB_DataDict {
case 'C': return 'VARCHAR';
case 'XL':return 'LONGTEXT';
case 'X': return 'TEXT';
-
+
case 'C2': return 'VARCHAR';
case 'X2': return 'LONGTEXT';
-
+
case 'B': return 'LONGBLOB';
-
+
case 'D': return 'DATE';
+ case 'TS':
case 'T': return 'DATETIME';
case 'L': return 'TINYINT';
-
+
case 'R':
case 'I4':
case 'I': return 'INTEGER';
case 'I1': return 'TINYINT';
case 'I2': return 'SMALLINT';
case 'I8': return 'BIGINT';
-
+
case 'F': return 'DOUBLE';
case 'N': return 'NUMERIC';
default:
return $meta;
}
}
-
+
// return string must begin with space
- function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
- {
+ function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+ {
$suffix = '';
if ($funsigned) $suffix .= ' UNSIGNED';
if ($fnotnull) $suffix .= ' NOT NULL';
@@ -117,7 +120,7 @@ class ADODB2_mysql extends ADODB_DataDict {
if ($fconstraint) $suffix .= ' '.$fconstraint;
return $suffix;
}
-
+
/*
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
[table_options] [select_statement]
@@ -133,16 +136,16 @@ class ADODB2_mysql extends ADODB_DataDict {
[reference_definition]
or CHECK (expr)
*/
-
+
/*
CREATE [UNIQUE|FULLTEXT] INDEX index_name
ON tbl_name (col_name[(length)],... )
*/
-
+
function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
{
$sql = array();
-
+
if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
@@ -150,11 +153,11 @@ class ADODB2_mysql extends ADODB_DataDict {
if ( isset($idxoptions['DROP']) )
return $sql;
}
-
+
if ( empty ($flds) ) {
return $sql;
}
-
+
if (isset($idxoptions['FULLTEXT'])) {
$unique = ' FULLTEXT';
} elseif (isset($idxoptions['UNIQUE'])) {
@@ -162,20 +165,19 @@ class ADODB2_mysql extends ADODB_DataDict {
} else {
$unique = '';
}
-
+
if ( is_array($flds) ) $flds = implode(', ',$flds);
-
+
if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
-
+
$s .= ' (' . $flds . ')';
-
+
if ( isset($idxoptions[$this->upperName]) )
$s .= $idxoptions[$this->upperName];
-
+
$sql[] = $s;
-
+
return $sql;
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/datadict/datadict-oci8.inc.php b/libraries/adodb/datadict/datadict-oci8.inc.php
index c2e8e7587..57cf0af52 100644
--- a/libraries/adodb/datadict/datadict-oci8.inc.php
+++ b/libraries/adodb/datadict/datadict-oci8.inc.php
@@ -1,20 +1,22 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class ADODB2_oci8 extends ADODB_DataDict {
-
+
var $databaseType = 'oci8';
var $seqField = false;
var $seqPrefix = 'SEQ_';
@@ -23,8 +25,8 @@ class ADODB2_oci8 extends ADODB_DataDict {
var $alterCol = ' MODIFY ';
var $typeX = 'VARCHAR(4000)';
var $typeXL = 'CLOB';
-
- function MetaType($t,$len=-1)
+
+ function MetaType($t, $len=-1, $fieldobj=false)
{
if (is_object($t)) {
$fieldobj = $t;
@@ -39,63 +41,70 @@ class ADODB2_oci8 extends ADODB_DataDict {
case 'BINARY':
if (isset($this) && $len <= $this->blobSize) return 'C';
return 'X';
-
+
case 'NCHAR':
case 'NVARCHAR2':
case 'NVARCHAR':
if (isset($this) && $len <= $this->blobSize) return 'C2';
return 'X2';
-
+
case 'NCLOB':
case 'CLOB':
return 'XL';
-
+
case 'LONG RAW':
case 'LONG VARBINARY':
case 'BLOB':
return 'B';
-
- case 'DATE':
+
+ case 'TIMESTAMP':
+ return 'TS';
+
+ case 'DATE':
return 'T';
-
- case 'INT':
+
+ case 'INT':
case 'SMALLINT':
- case 'INTEGER':
+ case 'INTEGER':
return 'I';
-
+
default:
return 'N';
}
}
-
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';
case 'X': return $this->typeX;
case 'XL': return $this->typeXL;
-
- case 'C2': return 'NVARCHAR';
- case 'X2': return 'NVARCHAR(2000)';
-
+
+ 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 +112,28 @@ class ADODB2_oci8 extends ADODB_DataDict {
$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
-
+
return $sql;
}
-
+
function AddColumnSQL($tabname, $flds)
{
+ $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 +144,19 @@ class ADODB2_oci8 extends ADODB_DataDict {
$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,26 +165,26 @@ class ADODB2_oci8 extends ADODB_DataDict {
}
return "drop sequence seq_".$t;
}
-
+
// return string must begin with space
- function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+ 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
@@ -185,7 +196,7 @@ end;
function _Triggers($tabname,$tableoptions)
{
if (!$this->seqField) return array();
-
+
if ($this->schema) {
$t = strpos($tabname,'.');
if ($t !== false) $tab = substr($tabname,$t+1);
@@ -196,6 +207,14 @@ end;
$seqname = $this->seqPrefix.$tabname;
$trigname = $this->trigPrefix.$seqname;
}
+
+ 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'];}
@@ -205,11 +224,11 @@ end;
if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];}
$sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache";
$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
-
+
$this->seqField = false;
return $sql;
}
-
+
/*
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
[table_options] [select_statement]
@@ -225,58 +244,57 @@ end;
[reference_definition]
or CHECK (expr)
*/
-
-
+
+
function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
{
$sql = array();
-
+
if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
if ( isset($idxoptions['DROP']) )
return $sql;
}
-
+
if ( empty ($flds) ) {
return $sql;
}
-
+
if (isset($idxoptions['BITMAP'])) {
- $unique = ' BITMAP';
+ $unique = ' BITMAP';
} elseif (isset($idxoptions['UNIQUE'])) {
$unique = ' UNIQUE';
} else {
$unique = '';
}
-
+
if ( is_array($flds) )
$flds = implode(', ',$flds);
$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-
+
if ( isset($idxoptions[$this->upperName]) )
$s .= $idxoptions[$this->upperName];
-
+
if (isset($idxoptions['oci8']))
$s .= $idxoptions['oci8'];
-
+
$sql[] = $s;
-
+
return $sql;
}
-
+
function GetCommentSQL($table,$col)
{
$table = $this->connection->qstr($table);
- $col = $this->connection->qstr($col);
+ $col = $this->connection->qstr($col);
return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
}
-
+
function SetCommentSQL($table,$col,$cmt)
{
$cmt = $this->connection->qstr($cmt);
return "COMMENT ON COLUMN $table.$col IS $cmt";
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/datadict/datadict-postgres.inc.php b/libraries/adodb/datadict/datadict-postgres.inc.php
index eb7773e6f..99a564131 100644
--- a/libraries/adodb/datadict/datadict-postgres.inc.php
+++ b/libraries/adodb/datadict/datadict-postgres.inc.php
@@ -1,20 +1,22 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class ADODB2_postgres extends ADODB_DataDict {
-
+
var $databaseType = 'postgres';
var $seqField = false;
var $seqPrefix = 'SEQ_';
@@ -22,7 +24,7 @@ class ADODB2_postgres extends ADODB_DataDict {
var $quote = '"';
var $renameTable = 'ALTER TABLE %s RENAME TO %s'; // at least since 7.1
var $dropTable = 'DROP TABLE %s CASCADE';
-
+
function MetaType($t,$len=-1,$fieldobj=false)
{
if (is_object($t)) {
@@ -30,9 +32,9 @@ class ADODB2_postgres extends ADODB_DataDict {
$t = $fieldobj->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 +43,84 @@ class ADODB2_postgres extends ADODB_DataDict {
case 'NAME':
case 'BPCHAR':
if ($len <= $this->blobSize) return 'C';
-
+
case 'TEXT':
return 'X';
-
+
case 'IMAGE': // user defined type
case 'BLOB': // user defined type
case 'BIT': // This is a bit string, not a single bit, so don't return 'L'
case 'VARBIT':
case 'BYTEA':
return 'B';
-
+
case 'BOOL':
case 'BOOLEAN':
return 'L';
-
+
case 'DATE':
return 'D';
-
+
case 'TIME':
case 'DATETIME':
case 'TIMESTAMP':
case 'TIMESTAMPTZ':
return 'T';
-
+
case 'INTEGER': return !$is_serial ? 'I' : 'R';
- case 'SMALLINT':
+ case 'SMALLINT':
case 'INT2': return !$is_serial ? 'I2' : 'R';
case 'INT4': return !$is_serial ? 'I4' : 'R';
- case 'BIGINT':
+ case 'BIGINT':
case 'INT8': return !$is_serial ? 'I8' : 'R';
-
+
case 'OID':
case 'SERIAL':
return 'R';
-
+
case 'FLOAT4':
case 'FLOAT8':
case 'DOUBLE PRECISION':
case 'REAL':
return 'F';
-
+
default:
return 'N';
}
}
-
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';
case 'XL':
case 'X': return 'TEXT';
-
+
case 'C2': return 'VARCHAR';
case 'X2': return 'TEXT';
-
+
case 'B': return 'BYTEA';
-
+
case 'D': return 'DATE';
+ case 'TS':
case 'T': return 'TIMESTAMP';
-
+
case 'L': return 'BOOLEAN';
case 'I': return 'INTEGER';
case 'I1': return 'SMALLINT';
case 'I2': return 'INT2';
case 'I4': return 'INT4';
case 'I8': return 'INT8';
-
+
case 'F': return 'FLOAT8';
case 'N': return 'NUMERIC';
default:
return $meta;
}
}
-
+
/**
- * Adding a new Column
+ * Adding a new Column
*
* reimplementation of the default function as postgres does NOT allow to set the default in the same statement
*
@@ -129,18 +132,19 @@ class ADODB2_postgres extends ADODB_DataDict {
{
$tabname = $this->TableName ($tabname);
$sql = array();
+ $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,7 +154,13 @@ class ADODB2_postgres extends ADODB_DataDict {
}
return $sql;
}
-
+
+
+ function DropIndexSQL ($idxname, $tabname = NULL)
+ {
+ return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname)));
+ }
+
/**
* Change the definition of one column
*
@@ -162,6 +172,7 @@ class ADODB2_postgres extends ADODB_DataDict {
* @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
* @return array with SQL strings
*/
+ /*
function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
{
if (!$tableflds) {
@@ -169,8 +180,97 @@ class ADODB2_postgres extends ADODB_DataDict {
return array();
}
return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+ }*/
+
+ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+ {
+ // Check if alter single column datatype available - works with 8.0+
+ $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
+
+ if ($has_alter_column) {
+ $tabname = $this->TableName($tabname);
+ $sql = array();
+ list($lines,$pkey) = $this->_GenFields($flds);
+ $set_null = false;
+ 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 explicitely asked for null
+ // Lookbehind pattern covers the case 'fieldname NULL datatype DEFAULT NULL'
+ // only the first NULL should be removed, not the one specifying
+ // the default value
+ $v = preg_replace('/(?<!DEFAULT)\sNULL/i','',$v);
+ }
+
+ if (preg_match('/^([^ ]+) .*DEFAULT (\'[^\']+\'|\"[^\"]+\"|[^ ]+)/',$v,$matches)) {
+ $existing = $this->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);
}
-
+
/**
* Drop one column
*
@@ -194,7 +294,7 @@ class ADODB2_postgres extends ADODB_DataDict {
}
return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
}
-
+
/**
* Save the content into a temp. table, drop and recreate the original table and copy the content back in
*
@@ -214,14 +314,14 @@ class ADODB2_postgres extends ADODB_DataDict {
foreach($this->MetaColumns($tabname) as $fld) {
if (!$dropflds || !in_array($fld->name,$dropflds)) {
// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
- if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) &&
+ if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) &&
in_array($fld->type,array('varchar','char','text','bytea'))) {
$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
} else {
$copyflds[] = $fld->name;
}
// identify the sequence name and the fld its on
- if ($fld->primary_key && $fld->has_default &&
+ if ($fld->primary_key && $fld->has_default &&
preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
$seq_name = $matches[1];
$seq_fld = $fld->name;
@@ -229,7 +329,7 @@ class ADODB2_postgres extends ADODB_DataDict {
}
}
$copyflds = implode(', ',$copyflds);
-
+
$tempname = $tabname.'_tmp';
$aSql[] = 'BEGIN'; // we use a transaction, to make sure not to loose the content of the table
$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
@@ -252,19 +352,19 @@ class ADODB2_postgres extends ADODB_DataDict {
$aSql[] = 'COMMIT';
return $aSql;
}
-
+
function DropTableSQL($tabname)
{
$sql = ADODB_DataDict::DropTableSQL($tabname);
-
+
$drop_seq = $this->_DropAutoIncrement($tabname);
if ($drop_seq) $sql[] = $drop_seq;
-
+
return $sql;
}
// 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,7 +376,7 @@ class ADODB2_postgres extends ADODB_DataDict {
if ($fconstraint) $suffix .= ' '.$fconstraint;
return $suffix;
}
-
+
// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
// if yes return sql to drop it
// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
@@ -292,7 +392,21 @@ class ADODB2_postgres extends ADODB_DataDict {
}
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 +430,8 @@ class ADODB2_postgres extends ADODB_DataDict {
[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
*/
-
-
+
+
/*
CREATE [ UNIQUE ] INDEX index_name ON table
[ USING acc_method ] ( column [ ops_name ] [, ...] )
@@ -329,35 +443,35 @@ CREATE [ UNIQUE ] INDEX index_name ON table
function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
{
$sql = array();
-
+
if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
if ( isset($idxoptions['DROP']) )
return $sql;
}
-
+
if ( empty ($flds) ) {
return $sql;
}
-
+
$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-
+
$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-
+
if (isset($idxoptions['HASH']))
$s .= 'USING HASH ';
-
+
if ( isset($idxoptions[$this->upperName]) )
$s .= $idxoptions[$this->upperName];
-
+
if ( is_array($flds) )
$flds = implode(', ',$flds);
$s .= '(' . $flds . ')';
$sql[] = $s;
-
+
return $sql;
}
-
+
function _GetSize($ftype, $ty, $fsize, $fprec)
{
if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty != 'I' && strpos($ftype,'(') === false) {
@@ -368,4 +482,3 @@ CREATE [ UNIQUE ] INDEX index_name ON table
return $ftype;
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/datadict/datadict-sapdb.inc.php b/libraries/adodb/datadict/datadict-sapdb.inc.php
index 144d81c06..fbf931c73 100644
--- a/libraries/adodb/datadict/datadict-sapdb.inc.php
+++ b/libraries/adodb/datadict/datadict-sapdb.inc.php
@@ -1,13 +1,15 @@
<?php
/**
- V4.50 6 July 2004 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
Modified from datadict-generic.inc.php for sapdb by RalfBecker-AT-outdoor-training.de
*/
@@ -15,40 +17,41 @@
if (!defined('ADODB_DIR')) die();
class ADODB2_sapdb extends ADODB_DataDict {
-
+
var $databaseType = 'sapdb';
- var $seqField = false;
+ var $seqField = false;
var $renameColumn = 'RENAME COLUMN %s.%s TO %s';
-
+
function ActualType($meta)
{
switch($meta) {
case 'C': return 'VARCHAR';
case 'XL':
case 'X': return 'LONG';
-
+
case 'C2': return 'VARCHAR UNICODE';
case 'X2': return 'LONG UNICODE';
-
+
case 'B': return 'LONG';
-
+
case 'D': return 'DATE';
+ case 'TS':
case 'T': return 'TIMESTAMP';
-
+
case 'L': return 'BOOLEAN';
case 'I': return 'INTEGER';
case 'I1': return 'FIXED(3)';
case 'I2': return 'SMALLINT';
case 'I4': return 'INTEGER';
case 'I8': return 'FIXED(20)';
-
+
case 'F': return 'FLOAT(38)';
case 'N': return 'FIXED';
default:
return $meta;
}
}
-
+
function MetaType($t,$len=-1,$fieldobj=false)
{
if (is_object($t)) {
@@ -78,10 +81,10 @@ class ADODB2_sapdb extends ADODB_DataDict {
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 +101,8 @@ class ADODB2_sapdb extends ADODB_DataDict {
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 +110,7 @@ class ADODB2_sapdb extends ADODB_DataDict {
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 +118,5 @@ class ADODB2_sapdb extends ADODB_DataDict {
$flds[$k] = $this->NameQuote($v);
}
return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
- }
+ }
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/datadict/datadict-sqlite.inc.php b/libraries/adodb/datadict/datadict-sqlite.inc.php
new file mode 100644
index 000000000..86b1b0478
--- /dev/null
+++ b/libraries/adodb/datadict/datadict-sqlite.inc.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+
+ Set tabs to 4 for best viewing.
+
+ SQLite datadict Andrei Besleaga
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_sqlite extends ADODB_DataDict {
+ var $databaseType = 'sqlite';
+ var $seqField = false;
+ var $addCol=' ADD COLUMN';
+ var $dropTable = 'DROP TABLE IF EXISTS %s';
+ var $dropIndex = 'DROP INDEX IF EXISTS %s';
+ var $renameTable = 'ALTER TABLE %s RENAME TO %s';
+
+
+
+ function ActualType($meta)
+ {
+ switch(strtoupper($meta)) {
+ case 'C': return 'VARCHAR'; // TEXT , TEXT affinity
+ case 'XL':return 'LONGTEXT'; // TEXT , TEXT affinity
+ case 'X': return 'TEXT'; // TEXT , TEXT affinity
+
+ case 'C2': return 'VARCHAR'; // TEXT , TEXT affinity
+ case 'X2': return 'LONGTEXT'; // TEXT , TEXT affinity
+
+ case 'B': return 'LONGBLOB'; // TEXT , NONE affinity , BLOB
+
+ case 'D': return 'DATE'; // NUMERIC , NUMERIC affinity
+ case 'T': return 'DATETIME'; // NUMERIC , NUMERIC affinity
+ case 'L': return 'TINYINT'; // NUMERIC , INTEGER affinity
+
+ case 'R':
+ case 'I4':
+ case 'I': return 'INTEGER'; // NUMERIC , INTEGER affinity
+ case 'I1': return 'TINYINT'; // NUMERIC , INTEGER affinity
+ case 'I2': return 'SMALLINT'; // NUMERIC , INTEGER affinity
+ case 'I8': return 'BIGINT'; // NUMERIC , INTEGER affinity
+
+ case 'F': return 'DOUBLE'; // NUMERIC , REAL affinity
+ case 'N': return 'NUMERIC'; // NUMERIC , NUMERIC affinity
+ default:
+ return $meta;
+ }
+ }
+
+ // return string must begin with space
+ function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+ {
+ $suffix = '';
+ if ($funsigned) $suffix .= ' UNSIGNED';
+ if ($fnotnull) $suffix .= ' NOT NULL';
+ if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+ if ($fautoinc) $suffix .= ' AUTOINCREMENT';
+ if ($fconstraint) $suffix .= ' '.$fconstraint;
+ return $suffix;
+ }
+
+ function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
+ {
+ if ($this->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/libraries/adodb/datadict/datadict-sybase.inc.php b/libraries/adodb/datadict/datadict-sybase.inc.php
index 61147f19c..d4e5f0530 100644
--- a/libraries/adodb/datadict/datadict-sybase.inc.php
+++ b/libraries/adodb/datadict/datadict-sybase.inc.php
@@ -1,13 +1,15 @@
<?php
/**
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4 for best viewing.
-
+
*/
// security - hide paths
@@ -15,9 +17,9 @@ if (!defined('ADODB_DIR')) die();
class ADODB2_sybase extends ADODB_DataDict {
var $databaseType = 'sybase';
-
+
var $dropIndex = 'DROP INDEX %2$s.%1$s';
-
+
function MetaType($t,$len=-1,$fieldobj=false)
{
if (is_object($t)) {
@@ -25,53 +27,54 @@ class ADODB2_sybase extends ADODB_DataDict {
$t = $fieldobj->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 +88,8 @@ class ADODB2_sybase extends ADODB_DataDict {
$sql[] = $s;
return $sql;
}
-
- function AlterColumnSQL($tabname, $flds)
+
+ function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
{
$tabname = $this->TableName ($tabname);
$sql = array();
@@ -97,8 +100,8 @@ class ADODB2_sybase extends ADODB_DataDict {
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 +114,10 @@ class ADODB2_sybase extends ADODB_DataDict {
$sql[] = $s;
return $sql;
}
-
+
// return string must begin with space
- function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
- {
+ function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+ {
$suffix = '';
if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
@@ -123,106 +126,105 @@ class ADODB2_sybase extends ADODB_DataDict {
if ($fconstraint) $suffix .= ' '.$fconstraint;
return $suffix;
}
-
+
/*
-CREATE TABLE
- [ database_name.[ owner ] . | owner. ] table_name
- ( { < column_definition >
- | column_name AS computed_column_expression
+CREATE TABLE
+ [ database_name.[ owner ] . | owner. ] table_name
+ ( { < column_definition >
+ | column_name AS computed_column_expression
| < table_constraint > ::= [ CONSTRAINT constraint_name ] }
- | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
- )
+ | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+ )
-[ ON { filegroup | DEFAULT } ]
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
-< column_definition > ::= { column_name data_type }
- [ COLLATE < collation_name > ]
- [ [ DEFAULT constant_expression ]
+< column_definition > ::= { column_name data_type }
+ [ COLLATE < collation_name > ]
+ [ [ DEFAULT constant_expression ]
| [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
- ]
- [ ROWGUIDCOL]
- [ < column_constraint > ] [ ...n ]
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ]
- { [ NULL | NOT NULL ]
- | [ { PRIMARY KEY | UNIQUE }
- [ CLUSTERED | NONCLUSTERED ]
- [ WITH FILLFACTOR = fillfactor ]
- [ON {filegroup | DEFAULT} ] ]
- ]
- | [ [ FOREIGN KEY ]
- REFERENCES ref_table [ ( ref_column ) ]
- [ ON DELETE { CASCADE | NO ACTION } ]
- [ ON UPDATE { CASCADE | NO ACTION } ]
- [ NOT FOR REPLICATION ]
- ]
- | CHECK [ NOT FOR REPLICATION ]
- ( logical_expression )
- }
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ]
- { [ { PRIMARY KEY | UNIQUE }
- [ CLUSTERED | NONCLUSTERED ]
- { ( column [ ASC | DESC ] [ ,...n ] ) }
- [ WITH FILLFACTOR = fillfactor ]
- [ ON { filegroup | DEFAULT } ]
- ]
- | FOREIGN KEY
- [ ( column [ ,...n ] ) ]
- REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
- [ ON DELETE { CASCADE | NO ACTION } ]
- [ ON UPDATE { CASCADE | NO ACTION } ]
- [ NOT FOR REPLICATION ]
- | CHECK [ NOT FOR REPLICATION ]
- ( search_conditions )
- }
+ ]
+ [ ROWGUIDCOL]
+ [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+ { [ NULL | NOT NULL ]
+ | [ { PRIMARY KEY | UNIQUE }
+ [ CLUSTERED | NONCLUSTERED ]
+ [ WITH FILLFACTOR = fillfactor ]
+ [ON {filegroup | DEFAULT} ] ]
+ ]
+ | [ [ FOREIGN KEY ]
+ REFERENCES ref_table [ ( ref_column ) ]
+ [ ON DELETE { CASCADE | NO ACTION } ]
+ [ ON UPDATE { CASCADE | NO ACTION } ]
+ [ NOT FOR REPLICATION ]
+ ]
+ | CHECK [ NOT FOR REPLICATION ]
+ ( logical_expression )
+ }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+ { [ { PRIMARY KEY | UNIQUE }
+ [ CLUSTERED | NONCLUSTERED ]
+ { ( column [ ASC | DESC ] [ ,...n ] ) }
+ [ WITH FILLFACTOR = fillfactor ]
+ [ ON { filegroup | DEFAULT } ]
+ ]
+ | FOREIGN KEY
+ [ ( column [ ,...n ] ) ]
+ REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+ [ ON DELETE { CASCADE | NO ACTION } ]
+ [ ON UPDATE { CASCADE | NO ACTION } ]
+ [ NOT FOR REPLICATION ]
+ | CHECK [ NOT FOR REPLICATION ]
+ ( search_conditions )
+ }
*/
-
+
/*
- CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
- ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
- [ WITH < index_option > [ ,...n] ]
+ CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+ ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+ [ WITH < index_option > [ ,...n] ]
[ ON filegroup ]
- < index_option > :: =
- { PAD_INDEX |
- FILLFACTOR = fillfactor |
- IGNORE_DUP_KEY |
- DROP_EXISTING |
- STATISTICS_NORECOMPUTE |
- SORT_IN_TEMPDB
+ < index_option > :: =
+ { PAD_INDEX |
+ FILLFACTOR = fillfactor |
+ IGNORE_DUP_KEY |
+ DROP_EXISTING |
+ STATISTICS_NORECOMPUTE |
+ SORT_IN_TEMPDB
}
*/
function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
{
$sql = array();
-
+
if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
if ( isset($idxoptions['DROP']) )
return $sql;
}
-
+
if ( empty ($flds) ) {
return $sql;
}
-
+
$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-
+
if ( is_array($flds) )
$flds = implode(', ',$flds);
$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-
+
if ( isset($idxoptions[$this->upperName]) )
$s .= $idxoptions[$this->upperName];
$sql[] = $s;
-
+
return $sql;
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/docs/README.md b/libraries/adodb/docs/README.md
new file mode 100644
index 000000000..b0ec29417
--- /dev/null
+++ b/libraries/adodb/docs/README.md
@@ -0,0 +1,17 @@
+# ADOdb Documentation
+
+ADOdb documentation is available in the following locations
+
+- [Online](http://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/libraries/adodb/docs/adodb.gif b/libraries/adodb/docs/adodb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c5e8dfc6db2d41dfcdd1beaf338ad60bc8375587
GIT binary patch
literal 1091
zcmb7<{WIHl0DwOUc@N?x-e2-H64Owrwi9hvoYw2<meED5mh8wFs$NblGl%3#imJ4V
zM7?z0lFmz_^LF#HR3uJX*{M3^EY_*0SyMWv=9;a4!k*usyXT3BIv+&mFo6eH0RIt~
zl5$V4-^O4vv|8<vBPIR)Ismw#q1A3~1w!Gl$z)<M>H%QrbkEDm9?<C(gM;&}t<y&1
z9+%q)0E<Y>CJ@p9h|bB8i9};DF}E-nu8&VKlPQ^+TA|VS1j3czU?Biulaoss8J!Ts
zYim>Uczu?Z+_AA$2BXQzDHnj#?_luvIsX&rtvSLD_yg*D@BI@%nkK8u<)Ibft?jup
znZYf(?&GWgZ>sABvVO@9()Sm}`b*{vZ=B*&F9lTrGZ^P;?EcTibFcm}m6R4^Fpw*e
z7=|WYq*9@qwU9d&ix$<^iR-*c4Yed6YYz`+_m&oyx@O3`uDij^3}s<~b|H`<#Q<u2
z0*=E`CR9qb#@SwlveKw6Nm}h=9D3YKIlqh|{^VJS8C%AyZK3(OIi$*24fk47+LBiu
zDHl;Yd)ieCHiB6tA;S_&@^O)eSZj7!KOaTV@(W1<7zaC&FgsN9TOZ3JB*ehxu;m0L
zK1iEJg#rmm*ZtA7Eb-~|aY7^sf=!(_Wj;GLHCu8y$qerp{!-zf=lp{Bo258hppoeu
ztD+O<UH}gr;!+ziwcvPquY7(qE(qk6BDs!TS+@-ZF46U5vS(}JXD!KMn<~$Q>x0Zy
zM5&dzEm-tEQItP$xl*zQ1@sj=e1abg>0jztUh!k=?>ldPnd6aEsrB=JB)><;@~cOf
ziOLmMa+SkLdEXON^ReiWo-F;14%!D3i;H{ufzKD*TyTdwEY-j|EBReup8T)JXC0b_
zH23V;2{)6hD(EfTEN!{@6v=r5CRRk4cxSdx=5w#k<cktEF~-SKE5W&%qmY3df<y-x
zpTI@Gs^Y@ce{6u@EKH>7X<jSwVKQ=FC%Bcr+w=m59+f^%;u@)~NyWCYqzid#YtymJ
zPl*EyNvKFl3G$4;S7;?$s?k@Yd?|P|mhq;o&^;l2JqG>7S2Y+G&phnomHi<*Sc+&S
zwsGRNkSpfK{Xm9&J@{>iBx79Id6ynmPLW(WP;|BA+V5^iO5o4B?s7d3tSbzfC`wZ)
zGMLi-J(g$a$UI2z?i2;Hqz%;<4-D;hrlVxiE*{ILz5RD-_t7Dm%{QGgd$F{q=;?<q
zJA|uIhL#FEc}v=3$=Yleutv%9X2$h&=@gG24?|S&f9##H`EFY=?CY}Gd+mUC|AAw^
zt~6x1K*IJN*2!imvMrgkr*X9^0PcQmzf3cJxVQCc0-&hINpn<2Hk|5OhK|I4^r!J5
zA%gmP%8oCH$N33vmYq$7)?ceh<<uRGSAC{pW)H4|qso~@JF@|5>aJ$*2EiPh`WLqT
B&Itej
literal 0
HcmV?d00001
diff --git a/libraries/adodb/docs/adodb2.gif b/libraries/adodb/docs/adodb2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f12ae2037ee14b11d8cc0f00a31ba088ef755119
GIT binary patch
literal 1458
zcma)%{Xf%r0Kh++S@STy8>OwtRIg)EqO#F-9)>lg*;Sk)BR4Xap**$p9Yd5hwrdr#
zErn4eAxDke5jyLYh{~qsQf}Su)x*`f+SPw>@7Md+_Yd#T?I9FuJO^w54*)QkOh)6o
zxw$!=&Y;me8yy`T8X6iHc&t`Wb#&ZsZPnD**DDl*a`~^7mA%qaX{DuI1qJOe4Cm#w
zq^GO6+)Igx%BZL+7E2ZuCJ7G@4+tpt^)01Rk8j*qxNaTn>Y7g?<vBWL5eOMem!?4w
z4}y|yY&aGcTnh^h0H2KpfCT^pfItAY0^t1#fdu~>(g&2eJ=h4`zZ74d0NUjL6OZmr
z6b;p7+)4F9Xc~62A$olzyr=bg2$sD;N<PKvi#+s>!8vk+JL}smrf)*O2;46tt^r5!
zxlA;_kd>7!WR}5ke4<q*^GJ3=aSSmtLu!?4C5fm4wn`=uNvx_XsxOtdhz^J@a}|P<
zg2Uacn#{xeGooWG+hdAr(Iws4{iS93*MEpS-5AN2-s<cfVP49wEN(%!L=+ZB4#&YN
zDd_5IohJWT%e8G<Q0<-Ml(hM~WeVL`K3}6BI11YgPlzcts~Oew3W?;za_^MKLsu^h
zidK5ZsKxPSOKhB2m$o*xT^x~l?jNq+e(m=WTM|u7C+U&qCMyRo=^y^md5w}TA;%84
zH{P#jR^+Lv{it0_m%FncYU0VqA$Cv>Hmsw0>RR%BRqV*=W(;mEt2v59)1z&vp(kDY
zI)#|tqaXIcAU;TUQ)p**MK{Zfv$eyor08@7`v(aapY;&}<J_1aLeA_fC=z1{zCzb@
z+M8q-Gr1=v@D8HX1vdd1<!gLkY#`*R?^3oyHrc^FoB|R9Oa#xkIX`tC2B>}o3R5xQ
z!&^G#x6J2q!F&mBM7Bws(1)={1u>#9;9_qXcG}S7s?Z(HcGVUQMjX)RY7m$;buyX-
z)75_!{~iL&LQehxF!b>whnCe-GhqTqY>qCLXB`1Mnrk-q1zLGv;&mzEQA}+f;Drj0
z1!IzDad#1r0P<o40C)}3GtnMZ*ELY)p)x8f8P)_?!lXd6!l0azRbVf%Pc9@2#ac8W
z1v7JoutkTGtXHAe;uDbaOO{u$yo<Q#z`s`i$YwFM(ABeNYw`tG?j%%sdPO*b<(S#;
zF9hl6wDa3sX5)(8))SrW&*JZ(s=~XcP)G3z+4|}lwi~KEXLAm%DC4|^y6(K?d_#Sh
z6EQ`}ctZ&-t3+C=rH3-gp4WD$JeAGu=gx8^ySyq$S>sNPajoR{gr+tu*<vA+>^`lq
zBpe)`ht8-POx$(`KbM4i6=JCdxbYQz6^|?;kd0={Rs?#}-n`l-v&j?^xAo@Yi*6-Z
z;b9(<_>i;~;s4U5@jE$r;qYzZ)>JS>U36EbElaN}r=h0ih-MTxgO6pW*8TENaZJmg
zldehIui0Xa4|PgqN8w4<y)+F$F#Kw4htK7MV?DkeZ^wh0)x7cDNq5^HFl907$v6kZ
zJBTgXne{M48Vf&6Zh||eQbdlO_!tR);Bium2WsX>=T4M1<?kn*GwCI<l-N*L!)tBc
z&pY2w=Pw%G>r<`5sdFN`{2OzpRv#2TjmrGAMPHt_?S}r$H~Aepajnz)S^9Wy(`5OI
zePfG;lP$mHOevGXyA3^KhFo0Rh8n*GShkPyh!Z!{@%TdIwhu;{y~x4P<L5+qKAqI!
z_qyWQOs^s7+qk#gliHeI{k_av)R%=}wRy&2Svaa;6<=OG@vk?QjB)ngWkS#6mUXGk
z13_4f&{Kx?H431Ua@1G!KFerh!CpT(^vOkb1DY>%wpL(5>HYX~Mxh5K{y@~50*Cnp
z)U$Z}2@d@>aoSi+8CBS19}jXcii4L31y*~+$j?~`eTNb+YZx$d5yQ;XXb1qm{{VnR
Bbn*ZI
literal 0
HcmV?d00001
diff --git a/libraries/adodb/docs/changelog.md b/libraries/adodb/docs/changelog.md
new file mode 100644
index 000000000..1e097e962
--- /dev/null
+++ b/libraries/adodb/docs/changelog.md
@@ -0,0 +1,491 @@
+# ADOdb Changelog - v5.x
+
+Older changelogs:
+[v4.x](changelog_v4.x.md),
+[v3.x](changelog_v3.x.md),
+[v2.x](changelog_v2.x.md).
+
+## 5.20.9 - 21-Dec-2016
+
+- mssql: fix syntax error in version matching regex #305
+
+## 5.20.8 - 17-Dec-2016
+
+- mssql: support MSSQL Server 2016 and later #294
+- mssql: fix Find() returning no results. #298
+- mssql: fix Sequence name forced to 'adodbseq'. #295, #300
+- mssql: fix GenId() not returning next sequence value with SQL Server 2005/2008. #302
+- mssql: fix drop/alter column with existing default constraint. #290
+- mssql: fix PHP notice in MetaColumns(). #289
+- oci8po: fix inconsistent variable binding in SelectLimit() #288
+- oci8po: fix SelectLimit() with prepared statements #282
+
+## 5.20.7 - 20-Sep-2016
+
+- security: Fix SQL injection in PDO drivers qstr() method (CVE-2016-7405). #226
+- oci8po: prevent segfault on PHP 7. #259
+- pdo/mysql: Fix MetaTables() method. #275
+
+## 5.20.6 - 31-Aug-2016
+
+- security: Fix XSS vulnerability in old test script (CVE-2016-4855). #274
+- adodb: Exit with error/exception when the ADOdb Extension is loaded. #269
+- adodb: Fix truncated exception messages. #273
+
+## 5.20.5 - 10-Aug-2016
+
+- adodb: Fix fatal error when connecting with missing extension. #254
+- adodb: Fix _adodb_getcount(). #236
+- mssql: Destructor fails if recordset already closed. #268
+- mssql: Use SQL server native data types if available. #234
+- mysqli: Fix PHP notice in _close() method. #240
+- pdo: Let driver handle SelectDB() and SQLDate() calls. #242
+- xml: Fix PHP strict warning. #260
+- xml: remove calls to 'unset($this)' (PHP 7.1 compatibility). #257
+
+## 5.20.4 - 31-Mar-2016
+
+- adodb: Fix BulkBind() param count validation. #199
+- mysqli: fix PHP warning in recordset destructor. #217
+- mysqli: cast port number to int when connecting (PHP7 compatibility). #218
+
+## 5.20.3 - 01-Jan-2016
+
+- mssql: PHP warning when closing recordset from destructor not fixed in v5.20.2. #180
+
+## 5.20.2 - 27-Dec-2015
+
+- adodb: Remove a couple leftover PHP 4.x constructors (PHP7 compatibility). #139
+- db2ora: Remove deprecated preg_replace '/e' flag (PHP7 compatibility). #168
+- mysql: MoveNext() now respects ADODB_ASSOC_CASE. #167
+- mssql, mysql, informix: Avoid PHP warning when closing recordset from destructor. #170
+
+## 5.20.1 - 06-Dec-2015
+
+- adodb: Fix regression introduced in 5.20.0, causing a PHP Warning when
+ calling GetAssoc() on an empty recordset. See Github #162
+- ADOConnection::Version() now handles SemVer. See Github #164
+
+## 5.20.0 - 28-Nov-2015
+
+- adodb: Fix regression introduced in v5.19, causing queries to return empty rows. See Github #20, #93, #95
+- adodb: Fix regression introduced in v5.19 in GetAssoc() with ADODB_FETCH_ASSOC mode and '0' as data. See Github #102
+- adodb: AutoExecute correctly handles empty result set in case of updates. See Github #13
+- adodb: Fix regex in Version(). See Github #16
+- adodb: Align method signatures to definition in parent class ADODB_DataDict. See Github #31
+- adodb: Improve compatibility of ADORecordSet_empty, thanks to Sjan Evardsson. See Github #43
+- adodb: fix ADODB_Session::open() failing after successful ADONewConnection() call, thanks to Sjan Evardsson. See Github #44
+- adodb: Only include memcache library once for PHPUnit 4.x, thanks to Alan Farquharson. See Github #74
+- adodb: Move() returns false when given row is < 0, thanks to Mike Benoit.
+- adodb: Add support for pagination with complex queries, thanks to Mike Benoit. See Github #88
+- adodb: Parse port out of hostname if specified in connection parameters, thanks to Andy Theuninck. See Github #63
+- adodb: Fix inability to set values from 0 to null (and vice versa) with Active Record, thanks to Louis Johnson. See Github #71
+- adodb: Fix PHP strict warning in ADODB_Active_Record::Reload(), thanks to Boštjan Žokš. See Github #75
+- adodb: Add mssql's DATETIME2 type to ADOConnection::MetaType(), thanks to MarcelTO. See Github #80
+- adodb: When flushing cache, initialize it if it is not set, thanks to Paul Haggart. See Github #57
+- adodb: Define DB_AUTOQUERY_* constants in main include file. See Github #49
+- adodb: Improve documentation of fetch mode and assoc case
+- adodb: Improve logic to build the assoc case bind array
+- adodb: Strict-standards compliance for function names. See Github #18, #142
+- adodb: Remove old PHP 4.x constructors for compatibility with PHP 7. See Github #139
+- adodb: Initialize charset in ADOConnection::SetCharSet. See Github #39
+- adodb: Fix incorrect handling of input array in Execute(). See Github #146
+- adodb: Release Recordset when raising exception. See Github #143
+- adodb: Added new setConnectionParameter() method, currently implemented in mssqlnative driver only. See Github #158.
+- adodb-lib: Optimize query pagination, thanks to Mike Benoit. See Github #110
+- memcache: use include_once() to avoid issues with PHPUnit. See http://phplens.com/lens/lensforum/msgs.php?id=19489
+- mssql_n: Allow use of prepared statements with driver. See Github #22
+- mssqlnative: Use ADOConnection::outp instead of error_log. See Github #12
+- mssqlnative: fix failure on Insert_ID() if the insert statement contains a semicolon in a value string, thanks to sketule. See Github #96
+- mssqlnative: Fix "invalid parameter was passed to sqlsrv_configure" error, thanks to Ray Morris. See Github #103
+- mssqlnative: Fix insert_ID() failing if server returns more than 1 row, thanks to gitjti. See Github #41
+- mysql: prevent race conditions when creating/dropping sequences, thanks to MikeB. See Github #28
+- mysql: Fix adodb_strip_order_by() bug causing SQL error for subqueries with order/limit clause, thanks to MikeB.
+- mysql: workaround for HHVM behavior, thanks to Mike Benoit.
+- mysqli: Fix qstr() when called without an active connection. See Github #11
+- oci8: Fix broken quoting of table name in AddColumnSQL and AlterColumnSQL, thanks to Andreas Fernandez. see Github #67
+- oci8: Allow oci8 driver to use lowercase field names in assoc mode. See Github #21
+- oci8po: Prevent replacement of '?' within strings, thanks to Mark Newnham. See Github #132
+- pdo: Added missing property (fixes PHP notices). see Github #56
+- pdo: Align method signatures with parent class, thanks to Andy Theuninck. see Github #62
+- pdo: new sqlsrv driver, thanks to MarcelTO. See Github #81
+- pdo/mysql: New methods to make the driver behave more like mysql/mysqli, thanks to Andy Theuninck. see Github #40
+- postgres: Stop using legacy function aliases
+- postgres: Fix AlterColumnSQL when updating multiple columns, thanks to Jouni Ahto. See Github #72
+- postgres: Fix support for HHVM 3.6, thanks to Mike Benoit. See Github #87
+- postgres: Noblob optimization, thanks to Mike Benoit. See Github #112
+- postgres7: fix system warning in MetaColumns() with schema. See http://phplens.com/lens/lensforum/msgs.php?id=19481
+- sqlite3: ServerInfo() now returns driver's version
+- sqlite3: Fix wrong connection parameter in _connect(), thanks to diogotoscano. See Github #51
+- sqlite3: Fix FetchField, thanks to diogotoscano. See Github #53
+- sqlite3: Fix result-less SQL statements executed twice. See Github #99
+- sqlite3: use -1 for _numOfRows. See Github #151
+- xmlschema: Fix ExtractSchema() when given $prefix and $stripprefix parameters, thanks to peterdd. See Github #92
+- Convert languages files to UTF-8, thanks to Marc-Etienne Vargenau. See Github #32.
+
+## 5.19 - 23-Apr-2014
+
+**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 http://phplens.com/lens/lensforum/msgs.php?id=19289
+- adodb: Fix GetRowAssoc bug introduced in 5.17, causing function to return data from previous fetch for NULL fields. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+- adodb: GetAssoc will return a zero-based array when 2nd column is null. See https://sourceforge.net/p/adodb/bugs/130/
+- adodb: Execute no longer ignores single parameters evaluating to false. See https://sourceforge.net/p/adodb/patches/32/
+- adodb: Fix LIMIT 1 clause in subquery gets stripped off. See http://phplens.com/lens/lensforum/msgs.php?id=17813
+- adodb-lib: Fix columns quoting bug. See https://sourceforge.net/p/adodb/bugs/127/
+- Added new ADODB_ASSOC_CASE_* constants. Thx to Damien Regad.
+- sessions: changed lob handling to detect all variations of oci8 driver.
+- ads: clear fields before fetching. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+- mssqlnative: fixed many FetchField compat issues. See http://phplens.com/lens/lensforum/msgs.php?id=18464. Also date format changed to remove timezone.
+- mssqlnative: Numerous fixes and improvements by Mark Newnham
+ - 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 http://phplens.com/lens/lensforum/msgs.php?id=19079
+- mssql: timestamp format changed to `Y-m-d\TH:i:s` (ISO 8601) to make them independent from DATEFORMAT setting, as recommended on
+ [Microsoft TechNet](http://technet.microsoft.com/en-us/library/ms180878%28v=sql.105%29.aspx#StringLiteralDateandTimeFormats).
+- mysql/mysqli: Fix ability for MetaTables to filter by table name, broken since 5.15. See http://phplens.com/lens/lensforum/msgs.php?id=19359
+- odbc: Fixed MetaTables and MetaPrimaryKeys definitions in odbc driver to match adoconnection class.
+- odbc: clear fields before fetching. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+- oci8: GetRowAssoc now works in ADODB_FETCH_ASSOC fetch mode
+- oci8: MetaType and MetaForeignKeys argument count are now strict-standards compliant
+- oci8: Added trailing `;` on trigger creation for sequence fields, prevents occurence of ORA-24344
+- oci8quercus: new oci8 driver with support for quercus jdbc data types.
+- pdo: Fixed concat recursion bug in 5.3. See http://phplens.com/lens/lensforum/msgs.php?id=19285
+- pgsql: Default driver (postgres/pgsql) is now postgres8
+- pgsql: Fix output of BLOB (bytea) columns with PostgreSQL >= 9.0
+- pgsql: Fix handling of DEFAULT NULL columns in AlterColumnSQL
+- pgsql: Fix mapping of error message to ADOdb error codes
+- pgsql: Reset parameter number in Param() method when $name == false
+- postgres8: New class/type with correct behavior for _insertid(). See Github #8
+- postgres9: Fixed assoc problem. See http://phplens.com/lens/lensforum/msgs.php?id=19296
+- sybase: Removed redundant sybase_connect() call in _connect(). See Github #3
+- sybase: Allow connection on custom port. See Github #9
+- sybase: Fix null values returned with ASSOC fetch mode. See Github #10
+- Added Composer support. See Github #7
+
+## 5.18 - 3 Sep 2012
+
+- datadict-postgres: Fixes bug in ALTER COL. See http://phplens.com/lens/lensforum/msgs.php?id=19202.
+- datadict-postgres: fixed bugs in MetaType() checking $fieldobj properties.
+- GetRowAssoc did not work with null values. Bug in 5.17.
+- postgres9: New driver to better support PostgreSQL 9. Thx Glenn Herteg and Cacti team.
+- sqlite3: Modified to support php 5.4. Thx Günter Weber [built.development#googlemail.com]
+- adodb: When fetch mode is ADODB_FETCH_ASSOC, and we execute `$db->GetAssoc("select 'a','0'");` we get an error. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=19190
+- adodb: 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 - 18 May 2012
+
+- Active Record: Removed trailing whitespace from adodb-active-record.inc.php.
+- odbc: Added support for $database parameter in odbc Connect() function. E.g. $DB->Connect($dsn_without_db, $user, $pwd, $database).
+ 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 - 26 March 2012
+
+- mysqli: extra mysqli_next_result() in close() removed. See http://phplens.com/lens/lensforum/msgs.php?id=19100
+- datadict-oci8: minor typo in create sequence trigger fixed. See http://phplens.com/lens/lensforum/msgs.php?id=18879.
+- security: safe date parsing changes. Does not impact security, these are code optimisations. Thx Saithis.
+- postgres, oci8, oci8po, db2oci: Param() function parameters inconsistent with base class. $type='C' missing. Fixed.
+- active-record: locked bug fixed. http://phplens.com/lens/lensforum/msgs.php?phplens_forummsg=new&id=19073
+- mysql, mysqli and informix: added MetaProcedures. Metaprocedures allows to retrieve an array list of all procedures in database. http://phplens.com/lens/lensforum/msgs.php?id=18414
+- Postgres7: added support for serial data type in MetaColumns().
+
+## 5.15 - 19 Jan 2012
+
+- pdo: fix ErrorMsg() to detect errors correctly. Thx Jens.
+- mssqlnative: added another check for $this->fields array exists.
+- mssqlnative: bugs in FetchField() fixed. See http://phplens.com/lens/lensforum/msgs.php?id=19024
+- DBDate and DBTimeStamp had sql injection bug. Fixed. Thx Saithis
+- mysql and mysqli: MetaTables() now identifies views and tables correctly.
+- Added function adodb_time() to adodb-time.inc.php. Generates current time in unsigned integer format.
+
+## 5.14 - 8 Sep 2011
+
+- 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 - 15 Aug 2011
+
+- Postgres: Fix in 5.12 was wrong. Uses pg_unescape_bytea() correctly now in _decode.
+- GetInsertSQL/GetUpdateSQL: Now $ADODB_QUOTE_FIELDNAMES allows you to define 'NATIVE', 'UPPER', 'LOWER'. If set to true, will default to 'UPPER'.
+- mysqli: added support for persistent connections 'p:'.
+- mssqlnative: ADODB_FETCH_BOTH did not work properly. Fixed.
+- mssqlnative: return values for stored procedures where not returned! Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=18919
+- mssqlnative: timestamp and fetchfield bugs fixed. http ://phplens.com/lens/lensforum/msgs.php?id=18453
+
+## 5.12 - 30 June 2011
+
+- Postgres: Added information_schema support for postgresql.
+- Postgres: Use pg_unescape_bytea() in _decode.
+- Fix bulk binding with oci8. http://phplens.com/lens/lensforum/msgs.php?id=18786
+- oci8 perf: added wait evt monitoring. Also db cache advice now handles multiple buffer pools properly.
+- sessions2: Fixed setFetchMode problem.
+- sqlite: Some DSN connection settings were not parsed correctly.
+- mysqli: now GetOne obeys $ADODB_GETONE_EOF;
+- memcache: compress option did not work. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=18899
+
+## 5.11 - 5 May 2010
+
+- 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 http://phplens.com/lens/lensforum/msgs.php?id=18288.
+- db2: fixed ServerInfo().
+- adodb_date: Added support for format 'e' for TZ as in adodb_date('e')
+- Active Record: If you have a field which is a string field (with numbers in) and you add preceding 0's to it the adodb library does not pick up the fact that the field has changed because of the way php's == works (dodgily). The end result is that it never gets updated into the database - fix by Matthew Forrester (MediaEquals). [matthew.forrester#mediaequals.com]
+- Fixes RowLock() and MetaIndexes() inconsistencies. See http://phplens.com/lens/lensforum/msgs.php?id=18236
+- Active record support for postgrseql boolean. See http://phplens.com/lens/lensforum/msgs.php?id=18246
+- By default, Execute 2D array is disabled for security reasons. Set $conn->bulkBind = true to enable. See http://phplens.com/lens/lensforum/msgs.php?id=18270. Note this breaks backward compat.
+- MSSQL: fixes for 5.2 compat. http://phplens.com/lens/lensforum/msgs.php?id=18325
+- Changed Version() to return a string instead of a float so it correctly returns 5.10 instead of 5.1.
+
+## 5.10 - 10 Nov 2009
+
+- Fixed memcache to properly support $rs->timeCreated.
+- adodb-ado.inc.php: Added BigInt support for PHP5. Will return float instead to support large numbers. Thx nasb#mail.goo.ne.jp.
+- adodb-mysqli.inc.php: mysqli_multi_query is now turned off by default. To turn it on, use $conn->multiQuery = true; This is because of the risks of sql injection. See http://phplens.com/lens/lensforum/msgs.php?id=18144
+- 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 - 25 June 2009
+
+- 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 http://phplens.com/lens/lensforum/msgs.php?id=17991.
+- Datadict: In order to support TIMESTAMP with subsecond accuracy, added to datadict the new TS type. Supported by mssql, postgresql and oci8 (oracle). Also changed oci8 $conn->sysTimeStamp to use 'SYSTIMESTAMP' instead of 'SYSDATE'. Should be backwards compat.
+- Added support for PHP 5.1+ DateTime objects in DBDate and DBTimeStamp. This means that dates and timestamps will be managed by DateTime objects if you are running PHP 5.1+.
+- Added new property to postgres64 driver to support returning I if type is unique int called $db->uniqueIisR, defaulting to true. See http://phplens.com/lens/lensforum/msgs.php?id=17963
+- Added support for bindarray in adodb_GetActiveRecordsClass with SelectLimit in adodb-active-record.inc.php.
+- Transactions now allowed in ado_access driver. Thx to petar.petrov.georgiev#gmail.com.
+- Sessions2 garbage collection is now much more robust. We perform ORDER BY to prevent deadlock in adodb-sessions2.inc.php.
+- Fixed typo in pdo_sqlite driver.
+
+## 5.08a - 17 Apr 2009
+
+- Fixes wrong version number string.
+- Incorrect + in adodb-datadict.inc.php removed.
+- Fixes missing OffsetDate() function in pdo. Thx paul#mantisforge.org.
+
+## 5.08 - 17 Apr 2009
+
+- 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 - 26 Dec 2008
+
+- 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/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+- 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 - 16 Oct 2008
+
+- Added driver adodb-pdo_sqlite.inc.php. Thanks Diogo Toscano (diogo#scriptcase.net) for the code.
+- Added support for [one-to-many relationships](docs-active-record.htm#onetomany) 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 - 11 Jul 2008
+
+Released together with [v4.990](changelog_v4.x.md#4990---11-jul-2008)
+
+- Added support for multiple recordsets in mysqli , thanks to Geisel Sierote geisel#4up.com.br. See http://phplens.com/lens/lensforum/msgs.php?id=15917
+- Malcolm Cook added new Reload() function to Active Record. See http://phplens.com/lens/lensforum/msgs.php?id=17474
+- 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 - 13 Feb 2008
+
+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 - 22 Jan 2008
+
+Released together with [v4.97](changelog_v4.x.md#497---22-jan-2008)
+
+- Active Record: $ADODB_ASSOC_CASE=1 did not work properly. Fixed.
+- Modified Fields() in recordset class to support display null fields in FetchNextObject().
+- In ADOdb5, active record implementation, we now support column names with spaces in them - we autoconvert the spaces to _ using __set(). Thx Daniel Cook. http://phplens.com/lens/lensforum/msgs.php?id=17200
+- Removed $arg3 from mysqli SelectLimit. See http://phplens.com/lens/lensforum/msgs.php?id=16243. Thx Zsolt Szeberenyi.
+- 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 - 24 Sept 2007
+
+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 - 17 May 2007
+
+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.
diff --git a/libraries/adodb/docs/changelog_v2.x.md b/libraries/adodb/docs/changelog_v2.x.md
new file mode 100644
index 000000000..000dcd5ad
--- /dev/null
+++ b/libraries/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 independant fetchMode.
+- ADODB_ASSOC_CASE now defaults to 2, use native defaults. This is because we would break backward compat for too many applications otherwise.
+- Patched encrypted sessions to use replace()
+- The qstr function supports quoting of nulls when escape character is \
+- Rewrote bits and pieces of session code to check for time synch and improve reliability.
+- Added property ADOConnection::hasTransactions = true/false;
+- Added CreateSequence and DropSequence functions
+- Found misplaced MoveNext() in adodb-postgres.inc.php. Fixed.
+- Sybase SelectLimit not reliable because 'set rowcount' not cached - fixed.
+- Moved ADOConnection to adodb-connection.inc.php and ADORecordSet to adodb-recordset.inc.php. This allows us to use doxygen to generate documentation. Doxygen doesn't like the classes in the main adodb.inc.php file for some mysterious reason.
+
+## 2.50 - 14 Nov 2002
+
+- Added transOff and transCnt properties for disabling (transOff = true) and tracking transaction status (transCnt>0).
+- Added inputarray handling into _adodb_pageexecute_all_rows - "Ross Smith" RossSmith#bnw.com.
+- Fixed postgresql inconsistencies in date handling.
+- Added support for mssql_fetch_assoc.
+- Fixed $ADODB_FETCH_MODE bug in odbc MetaTables() and MetaPrimaryKeys().
+- Accidentally declared UnixDate() twice, making adodb incompatible with php 4.3.0\. Fixed.
+- Fixed pager problems with some databases that returned -1 for _currentRow on MoveLast() by switching to MoveNext() in adodb-lib.inc.php.
+- Also fixed uninited $discard in adodb-lib.inc.php.
+
+## 2.43 - 25 Oct 2002
+
+- Added ADODB_ASSOC_CASE constant to better support ibase and odbc field names.
+- Added support for NConnect() for oracle OCINLogin.
+- Fixed NumCols() bug.
+- Changed session handler to use Replace() on write.
+- Fixed oci8 SelectLimit aggregate function bug again.
+- Rewrote pivoting code.
+
+## 2.42 - 4 Oct 2002
+
+- Fixed ibase_fetch() problem with nulls. Also interbase now does automatic blob decoding, and is backward compatible. Suggested by Heinz Hombergs heinz#hhombergs.de.
+- Fixed postgresql MoveNext() problems when called repeatedly after EOF. Also suggested by Heinz Hombergs.
+- PageExecute() does not rewrite queries if SELECT DISTINCT is used. Requested by hans#velum.net
+- Added additional fixes to oci8 SelectLimit handling with aggregate functions - thx to Christian Bugge for reporting the problem.
+
+## 2.41 - 2 Oct 2002
+
+- Fixed ADODB_COUNTRECS bug in odbc. Thx to Joshua Zoshi jzoshi#hotmail.com.
+- Increased buffers for adodb-csvlib.inc.php for extremely long sql from 8192 to 32000.
+- Revised pivottable.inc.php code. Added better support for aggregate fields.
+- Fixed mysql text/blob types problem in MetaTypes base class - thx to horacio degiorgi.
+- Added SQLDate($fmt,$date) function, which allows an sql date format string to be generated - useful for group by's.
+- Fixed bug in oci8 SelectLimit when offset>100.
+
+## 2.40 - 4 Sept 2002
+
+- Added new NLS_DATE_FORMAT property to oci8\. Suggested by Laurent NAVARRO ln#altidev.com
+- Now use bind parameters in oci8 selectlimit for better performance.
+- Fixed interbase replaceQuote for dialect != 1\. Thx to "BEGUIN Pierre-Henri - INFOCOB" phb#infocob.com.
+- Added white-space check to QA.
+- Changed unixtimestamp to support fractional seconds (we always round down/floor the seconds). Thanks to beezly#beezly.org.uk.
+- Now you can set the trigger_error type your own user-defined type in adodb-errorhandler.inc.php. Suggested by Claudio Bustos clbustos#entelchile.net.
+- Added recordset filters with rsfilter.inc.php.
+ $conn->_rs2rs does not create a new recordset when it detects it is of type array. Some trickery there as there seems to be a bug in Zend Engine
+- Added render_pagelinks to adodb-pager.inc.php. Code by "Pablo Costa" pablo#cbsp.com.br.
+- MetaType() speedup in adodb.inc.php by using hashing instead of switch. Best performance if constant arrays are supported, as they are in PHP5.
+- adodb-session.php now updates only the expiry date if the crc32 check indicates that the data has not been modified.
+
+## 2.31 - 20 Aug 2002
+
+- Made changes to pivottable.inc.php due to daniel lucuzaeu's suggestions (we sum the pivottable column if desired).
+- Fixed ErrorNo() in postgres so it does not depend on _errorMsg property.
+- Robert Tuttle added support for oracle cursors. See ExecuteCursor().
+- Fixed Replace() so it works with mysql when updating record where data has not changed. Reported by Cal Evans (cal#calevans.com).
+
+## 2.30 - 1 Aug 2002
+
+- Added pivottable.inc.php. Thanks to daniel.lucazeau#ajornet.com for the original concept.
+- Added ADOConnection::outp($msg,$newline) to output error and debugging messages. Now you can override this using the ADODB_OUTP constant and use your own output handler.
+- Changed == to === for 'null' comparison. Reported by ericquil#yahoo.com
+- Fixed mssql SelectLimit( ) bug when distinct used.
+
+## 2.30 - 1 Aug 2002
+
+- New GetCol() and CacheGetCol() from ross#bnw.com that returns the first field as a 1 dim array.
+- We have an empty recordset, but RecordCount() could return -1\. Fixed. Reported by "Jonathan Polansky" jonathan#polansky.com.
+- We now check for session variable changes using strlen($sessval).crc32($sessval). Formerly we only used crc32().
+- Informix SelectLimit() problem with $ADODB_COUNTRECS fixed.
+- Fixed informix SELECT FIRST x DISTINCT, and not SELECT DISTINCT FIRST x - reported by F Riosa
+- Now default adodb error handlers ignores error if @ used.
+- If you set $conn->autoRollback=true, we auto-rollback persistent connections for odbc, mysql, oci8, mssql. Default for autoRollback is false. No need to do so for postgres. As interbase requires a transaction id (what a flawed api), we don't do it for interbase.
+- Changed PageExecute() to use non-greedy preg_match when searching for "FROM" keyword.
+
+## 2.20 - 9 July 2002
+
+- Added CacheGetOne($secs2cache,$sql), CacheGetRow($secs2cache,$sql), CacheGetAll($secs2cache,$sql).
+- Added $conn->OffsetDate($dayFraction,$date=false) to generate sql that calcs date offsets. Useful for scheduling appointments.
+- Added connection properties: leftOuter, rightOuter that hold left and right outer join operators.
+- Added connection property: ansiOuter to indicate whether ansi outer joins supported.
+- New driver _mssqlpo_, the portable mssql driver, which converts string concat operator from || to +.
+- Fixed ms access bug - SelectLimit() did not support ties - fixed.
+- Karsten Kraus (Karsten.Kraus#web.de), contributed error-handling code to ADONewConnection. Unfortunately due to backward compat problems, had to rollback most of the changes.
+- Added new parameter to GetAssoc() to allow returning an array of key-value pairs, ignoring any additional columns in the recordset. Off by default.
+- Corrected mssql $conn->sysDate to return only date using convert().
+- CacheExecute() improved debugging output.
+- Changed rs2html() so newlines are converted to BR tags. Also optimized rs2html() based on feedback by "Jerry Workman" jerry#mtncad.com.
+- Added support for Replace() with Interbase, using DELETE and INSERT.
+- Some minor optimizations (mostly removing & references when passing arrays).
+- Changed GenID() to allows id's larger than the size of an integer.
+- Added force_session property to oci8 for better updateblob() support.
+- Fixed PageExecute() which did not work properly with sql containing GROUP BY.
+
+## 2.12 - 12 June 2002
+
+- Added toexport.inc.php to export recordsets in CSV and tab-delimited format.
+- CachePageExecute() does not work - fixed - thx John Huong.
+- Interbase aliases not set properly in FetchField() - fixed. Thx Stefan Goethals.
+- Added cache property to adodb pager class. The number of secs to cache recordsets.
+- SQL rewriting bug in pageexecute() due to skipping of newlines due to missing /s modifier. Fixed.
+- Max size of cached recordset due to a bug was 256000 bytes. Fixed.
+- Speedup of 1st invocation of CacheExecute() by tuning code.
+- We compare $rewritesql with $sql in pageexecute code in case of rewrite failure.
+
+## 2.11 - 7 June 2002
+
+- Fixed PageExecute() rewrite sql problem - COUNT(*) and ORDER BY don't go together with mssql, access and postgres. Thx to Alexander Zhukov alex#unipack.ru
+- DB2 support for CHARACTER type added - thx John Huong huongch#bigfoot.com
+- For ado, $argProvider not properly checked. Fixed - kalimero#ngi.it
+- Added $conn->Replace() function for update with automatic insert if the record does not exist. Supported by all databases except interbase.
+
+## 2.10 - 4 June 2002
+
+- Added uniqueSort property to indicate mssql ORDER BY cols must be unique.
+- Optimized session handler by crc32 the data. We only write if session data has changed.
+- adodb_sess_read in adodb-session.php now returns ''correctly - thanks to Jorma Tuomainen, webmaster#wizactive.com
+- Mssql driver did not throw EXECUTE errors correctly because ErrorMsg() and ErrorNo() called in wrong order. Pointed out by Alexios Fakos. Fixed.
+- Changed ado to use client cursors. This fixes BeginTran() problems with ado.
+- Added handling of timestamp type in ado.
+- Added to ado_mssql support for insert_id() and affected_rows().
+- Added support for mssql.datetimeconvert=0, available since php 4.2.0.
+- Made UnixDate() less strict, so that the time is ignored if present.
+- Changed quote() so that it checks for magic_quotes_gpc.
+- Changed maxblobsize for odbc to default to 64000.
+
+## 2.00 - 13 May 2002
+
+- Added drivers _informix72_ for pre-7.3 versions, and _oci805_ for oracle 8.0.5, and postgres64 for postgresql 6.4 and earlier. The postgres and postgres7 drivers are now identical.
+- Interbase now partially supports ADODB_FETCH_BOTH, by defaulting to ASSOC mode.
+- Proper support for blobs in mssql. Also revised blob support code is base class. Now UpdateBlobFile() calls UpdateBlob() for consistency.
+- Added support for changed odbc_fetch_into api in php 4.2.0 with $conn->_has_stupid_odbc_fetch_api_change.
+- Fixed spelling of tablock locking hint in GenID( ) for mssql.
+- Added RowLock( ) to several databases, including oci8, informix, sybase, etc. Fixed where error in mssql RowLock().
+- Added sysDate and sysTimeStamp properties to most database drivers. These are the sql functions/constants for that database that return the current date and current timestamp, and are useful for portable inserts and updates.
+- Support for RecordCount() caused date handling in sybase and mssql to break. Fixed, thanks to Toni Tunkkari, by creating derived classes for ADORecordSet_array for both databases. Generalized using arrayClass property. Also to support RecordCount(), changed metatype handling for ado drivers. Now the type returned in FetchField is no longer a number, but the 1-char data type returned by MetaType. At the same time, fixed a lot of date handling. Now mssql support dmy and mdy date formats. Also speedups in sybase and mssql with preg_match and ^ in date/timestamp handling. Added support in sybase and mssql for 24 hour clock in timestamps (no AM/PM).
+- Extensive revisions to informix driver - thanks to Samuel CARRIERE samuel_carriere#hotmail.com
+- Added $ok parameter to CommitTrans($ok) for easy rollbacks.
+- Fixed odbc MetaColumns and MetaTables to save and restore $ADODB_FETCH_MODE.
+- Some odbc drivers did not call the base connection class constructor. Fixed.
+- Fixed regex for GetUpdateSQL() and GetInsertSQL() to support more legal character combinations.
+
+## 1.99 - 21 April 2002
+
+- Added emulated RecordCount() to all database drivers if $ADODB_COUNTRECS = true (which it is by default). Inspired by Cristiano Duarte (cunha17#uol.com.br).
+- Unified stored procedure support for mssql and oci8\. Parameter() and PrepareSP() functions implemented.
+- Added support for SELECT FIRST in informix, modified hasTop property to support this.
+- Changed csv driver to handle updates/deletes/inserts properly (when Execute() returns true). Bind params also work now, and raiseErrorFn with csv driver. Added csv driver to QA process.
+- Better error checking in oci8 UpdateBlob() and UpdateBlobFile().
+- Added TIME type to MySQL - patch by Manfred h9125297#zechine.wu-wien.ac.at
+- Prepare/Execute implemented for Interbase/Firebird
+- Changed some regular expressions to be anchored by /^ $/ for speed.
+- Added UnixTimeStamp() and UnixDate() to ADOConnection(). Now these functions are in both ADOConnection and ADORecordSet classes.
+- Empty recordsets were not cached - fixed.
+- Thanks to Gaetano Giunta (g.giunta#libero.it) for the oci8 code review. We didn't agree on everything, but i hoped we agreed to disagree!
+
+## 1.90 - 6 April 2002
+
+- Now all database drivers support fetch modes ADODB_FETCH_NUM and ADODB_FETCH_ASSOC, though still not fully tested. Eg. Frontbase, Sybase, Informix.
+- NextRecordSet() support for mssql. Contributed by "Sven Axelsson" sven.axelsson#bokochwebb.se
+- Added blob support for SQL Anywhere. Contributed by Wade Johnson wade#wadejohnson.de
+- Fixed some security loopholes in server.php. Server.php also supports fetch mode.
+- Generalized GenID() to support odbc and mssql drivers. Mssql no longer generates GUID's.
+- Experimental RowLock($table,$where) for mssql.
+- Properly implemented Prepare() in oci8 and ODBC.
+- Added Bind() support to oci8 to support Prepare().
+- Improved error handler. Catches CacheExecute() and GenID() errors now.
+- Now if you are running php from the command line, debugging messages do not output html formating. Not 100% complete, but getting there.
+
+## 1.81 - 22 March 2002
+
+- Restored default $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT for backward compatibility.
+- SelectLimit for oci8 improved - Our FIRST_ROWS optimization now does not overwrite existing hint.
+- New Sybase SQL Anywhere driver. Contributed by Wade Johnson wade#wadejohnson.de
+
+## 1.80 - 15 March 2002
+
+- Redesigned directory structure of ADOdb files. Added new driver directory where all database drivers reside.
+- Changed caching algorithm to create subdirectories. Now we scale better.
+- Informix driver now supports insert_id(). Contribution by "Andrea Pinnisi" pinnisi#sysnet.it
+- Added experimental ISO date and FetchField support for informix.
+- Fixed a quoting bug in Execute() with bind parameters, causing problems with blobs.
+- Mssql driver speedup by 10-15%.
+- Now in CacheExecute($secs2cache,$sql,...), $secs2cache is optional. If missing, it will take the value defined in $connection->cacheSecs (default is 3600 seconds). Note that CacheSelectLimit(), the secs2cache is still compulsory - sigh.
+- Sybase SQL Anywhere driver (using ODBC) contributed by Wade Johnson wade#wadejohnson.de
+
+## 1.72 - 8 March 2002
+
+- Added @ when returning Fields() to prevent spurious error - "Michael William Miller" mille562#pilot.msu.edu
+- MetaDatabases() for postgres contributed by Phil pamelant#nerim.net
+- Mitchell T. Young (mitch#youngfamily.org) contributed informix driver.
+- Fixed rs2html() problem. I cannot reproduce, so probably a problem with pre PHP 4.1.0 versions, when supporting new ADODB_FETCH_MODEs.
+- Mattia Rossi (mattia#technologist.com) contributed BlobDecode() and UpdateBlobFile() for postgresql using the postgres specific pg_lo_import()/pg_lo_open() - i don't use them but hopefully others will find this useful. See [this posting](http://phplens.com/lens/lensforum/msgs.php?id=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 <danny.milo#gmx.net> added some patches for MySQL error handling and displaying default values.
+- Fixed some ADODB_FETCH_BOTH inconsistencies in odbc and interbase.
+- Added more tests to test suite to cover ADODB_FETCH_* and ADODB_ERROR_HANDLER.
+- Added firebird (ibase) driver
+- Added borland_ibase driver for interbase 6.5
+
+## 1.63 - 13 Dec 2001
+
+- Absolute to the adodb-lib.inc.php file not set properly. Fixed.
+
+## 1.62 - 11 Dec 2001
+
+- Major speedup of ADOdb for low-end web sites by reducing the php code loading and compiling cycle. We conditionally compile not so common functions. Moved csv code to adodb-csvlib.inc.php to reduce adodb.inc.php parsing. This file is loaded only when the csv/proxy driver is used, or CacheExecute() is run. Also moved PageExecute(), GetSelectSQL() and GetUpdateSQL() core code to adodb-lib.inc.php. This reduced the 70K main adodb.inc.php file to 55K, and since at least 20K of the file is comments, we have reduced 50K of code in adodb.inc.php to 35K. There should be 35% reduction in memory and thus 35% speedup in compiling the php code for the main adodb.inc.php file.
+- Highly tuned SelectLimit() for oci8 for massive speed improvements on large files. Selecting 20 rows starting from the 20,000th row of a table is now 7 times faster. Thx to Tomas V V Cox.
+- Allow . and # in table definitions in GetInsertSQL and GetUpdateSQL. See ADODB_TABLE_REGEX constant. Thx to Ari Kuorikoski.
+- Added ADODB_PREFETCH_ROWS constant, defaulting to 10\. This determines the number of records to prefetch in a SELECT statement. Only used by oci8.
+- Added high portability Oracle class called oci8po. This uses ? for bind variables, and lower cases column names.
+- Now all database drivers support $ADODB_FETCH_MODE, including interbase, ado, and odbc: ADODB_FETCH_NUM and ADODB_FETCH_ASSOC. ADODB_FETCH_BOTH is not fully implemented for all database drivers.
+
+## 1.61 - Nov 2001
+- Added PO_RecordCount() and PO_Insert_ID(). PO stands for portable. Pablo Roca [pabloroca#mvps.org]
+- GenID now returns 0 if not available. Safer is that you should check $conn->hasGenID for availability.
+- M'soft ADO we now correctly close recordset in _close() peterd#telephonetics.co.uk
+- MSSQL now supports GenID(). It generates a 16-byte GUID from mssql newid() function.
+- Changed ereg_replace to preg_replace in SelectLimit. This is a fix for mssql. Ereg doesn't support t or n! Reported by marino Carlos xaplo#postnuke-espanol.org
+- Added $recordset->connection. This is the ADOConnection object for the recordset. Works with cached and normal recordsets. Surprisingly, this had no affect on performance!
+
+## 1.54 - 15 Nov 2001
+
+- Fixed some more bugs in PageExecute(). I am getting sick of bug in this and will have to reconsider my QA here. The main issue is that I don't use PageExecute() and to check whether it is working requires a visual inspection of the html generated currently. It is possible to write a test script but it would be quite complicated :(
+- More speedups of SelectLimit() for DB2, Oci8, access, vfp, mssql.
+
+## 1.53 - 7 Nov 2001
+
+- Added support for ADODB_FETCH_ASSOC for ado and odbc drivers.
+- Tuned GetRowAssoc(false) in postgresql and mysql.
+- Stephen Van Dyke contributed ADOdb icon, accepted with some minor mods.
+- Enabled Affected_Rows() for postgresql
+- Speedup for Concat() using implode() - Benjamin Curtis ben_curtis#yahoo.com
+- Fixed some more bugs in PageExecute() to prevent infinite loops
+
+## 1.52 - 5 Nov 2001
+
+- Spelling error in CacheExecute() caused it to fail. $ql should be $sql in line 625!
+- Added fixes for parsing [ and ] in GetUpdateSQL().
+
+## 1.51 - 5 Nov 2001
+
+- Oci8 SelectLimit() speedup by using OCIFetch().
+- Oci8 was mistakenly reporting errors when $db->debug = true.
+- If a connection failed with ODBC, it was not correctly reported - fixed.
+- _connectionID was inited to -1, changed to false.
+- Added $rs->FetchRow(), to simplify API, ala PEAR DB
+- Added PEAR DB compat mode, which is still faster than PEAR! See adodb-pear.inc.php.
+- Removed postgres pconnect debugging statement.
+
+## 1.50 - 31 Oct 2001
+
+- ADOdbConnection renamed to ADOConnection, and ADOdbFieldObject to ADOFieldObject.
+- PageExecute() now checks for empty $rs correctly, and the errors in the docs on this subject have been fixed.
+- odbc_error() does not return 6 digit error correctly at times. Implemented workaround.
+- Added ADORecordSet_empty class. This will speedup INSERTS/DELETES/UPDATES because the return object created is much smaller.
+- Added Prepare() to odbc, and oci8 (but doesn't work properly for oci8 still).
+- Made pgsql a synonym for postgre7, and changed SELECT LIMIT to use OFFSET for compat with postgres 7.2.
+- Revised adodb-cryptsession.php thanks to Ari.
+- Set resources to false on _close, to force freeing of resources.
+- Added adodb-errorhandler.inc.php, adodb-errorpear.inc.php and raiseErrorFn on Freek's urging.
+- GetRowAssoc($toUpper=true): $toUpper added as default.
+- Errors when connecting to a database were not captured formerly. Now we do it correctly.
+
+## 1.40 - 19 September 2001
+
+- PageExecute() to implement page scrolling added. Code and idea by Iván Oliva.
+- Some minor postgresql fixes.
+- Added sequence support using GenID() for postgresql, oci8, mysql, interbase.
+- Added UpdateBlob support for interbase (untested).
+- Added encrypted sessions (see adodb-cryptsession.php). By Ari Kuorikoski <kuoriari#finebyte.com>
+
+## 1.31 - 21 August 2001
+
+- Many bug fixes thanks to "GaM3R (Cameron)" <gamr#outworld.cx>. Some session changes due to Gam3r.
+- Fixed qstr() to quote also.
+- rs2html() now pretty printed.
+- Jonathan Younger <jyounger#unilab.com> contributed the great idea GetUpdateSQL() and GetInsertSQL() which generates SQL to update and insert into a table from a recordset. Modify the recordset fields array, then can this function to generate the SQL (the SQL is not executed).
+- Nicola Fankhauser <nicola.fankhauser#couniq.com> found some bugs in date handling for mssql.
+- Added minimal Oracle support for LOBs. Still under development.
+- Added $ADODB_FETCH_MODE so you can control whether recordsets return arrays which are numeric, associative or both. This is a global variable you set. Currently only MySQL, Oci8, Postgres drivers support this.
+- PostgreSQL properly closes recordsets now. Reported by several people.
+- Added UpdateBlob() for Oracle. A hack to make it easier to save blobs.
+- Oracle timestamps did not display properly. Fixed.
+
+## 1.20 - 6 June 2001
+
+- Now Oracle can connect using tnsnames.ora or server and service name
+- Extensive Oci8 speed optimizations. Oci8 code revised to support variable binding, and /*+ FIRST_ROWS */ hint.
+- Worked around some 4.0.6 bugs in odbc_fetch_into().
+- Paolo S. Asioli paolo.asioli#libero.it suggested GetRowAssoc().
+- Escape quotes for oracle wrongly set to '. Now '' is used.
+- Variable binding now works in ODBC also.
+- Jumped to version 1.20 because I don't like 13 :-)
+
+## 1.12 - 6 June 2001
+
+- Changed $ADODB_DIR to ADODB_DIR constant to plug a security loophole.
+- Changed _close() to close persistent connections also. Prevents connection leaks.
+- Major revision of oracle and oci8 drivers. Added OCI_RETURN_NULLS and OCI_RETURN_LOBS to OCIFetchInto(). BLOB, CLOB and VARCHAR2 recognition in MetaType() improved. MetaColumns() returns columns in correct sort order.
+- Interbase timestamp input format was wrong. Fixed.
+
+## 1.11 - 20 May 2001
+
+- Improved file locking for Windows.
+- Probabilistic flushing of cache to avoid avalanche updates when cache timeouts.
+- Cached recordset timestamp not saved in some scenarios. Fixed.
+
+## 1.10 - 19 May 2001
+
+- Added caching. CacheExecute() and CacheSelectLimit().
+- Added csv driver. See [http://php.weblogs.com/ADODB_csv](http://php.weblogs.com/adodb_csv).
+- Fixed SelectLimit(), SELECT TOP not working under certain circumstances.
+- Added better Frontbase support of MetaTypes() by Frank M. Kromann.
+
+## 1.01 - 24 April 2001
+
+- Fixed SelectLimit bug. not quoted properly.
+- SelectLimit: SELECT TOP -1 * FROM TABLE not support by Microsoft. Fixed.
+- GetMenu improved by glen.davies#cce.ac.nz to support multiple hilited items
+- FetchNextObject() did not work with only 1 record returned. Fixed bug reported by $tim#orotech.net
+- Fixed mysql field max_length problem. Fix suggested by Jim Nicholson (jnich#att.com)
+
+## 1.00 - 16 April 2001
+
+- Given some brilliant suggestions on how to simplify ADOdb by akul. You no longer need to setup $ADODB_DIR yourself, and ADOLoadCode() is automatically called by ADONewConnection(), simplifying the startup code.
+- FetchNextObject() added. Suggested by Jakub Marecek. This makes FetchObject() obsolete, as this is more flexible and powerful.
+- Misc fixes to SelectLimit() to support Access (top must follow distinct) and Fields() in the array recordset. From Reinhard Balling.
+
+## 0.96 - 27 Mar 2001
+
+- ADOConnection Close() did not return a value correctly. Thanks to akul#otamedia.com.
+- When the horrible magic_quotes is enabled, back-slash () is changed to double-backslash (\). This doesn't make sense for Microsoft/Sybase databases. We fix this in qstr().
+- Fixed Sybase date problem in UnixDate() thanks to Toni Tunkkari. Also fixed MSSQL problem in UnixDate() - thanks to milhouse31#hotmail.com.
+- MoveNext() moved to leaf classes for speed in MySQL/PostgreSQL. 10-15% speedup.
+- Added null handling in bindInputArray in Execute() -- Ron Baldwin suggestion.
+- Fixed some option tags. Thanks to john#jrmstudios.com.
+
+## 0.95 - 13 Mar 2001
+
+- Added postgres7 database driver which supports LIMIT and other version 7 stuff in the future.
+- Added SelectLimit to ADOConnection to simulate PostgreSQL's "select * from table limit 10 offset 3". Added helper function GetArrayLimit() to ADORecordSet.
+- Fixed mysql metacolumns bug. Thanks to Freek Dijkstra (phpeverywhere#macfreek.com).
+- Also many PostgreSQL changes by Freek. He almost rewrote the whole PostgreSQL driver!
+- Added fix to input parameters in Execute for non-strings by Ron Baldwin.
+- Added new metatype, X for TeXt. Formerly, metatype B for Blob also included text fields. Now 'B' is for binary/image data. 'X' for textual data.
+- Fixed $this->GetArray() in GetRows().
+- Oracle and OCI8: 1st parameter is always blank -- now warns if it is filled.
+- Now _hasLimit_ and _hasTop_ added to indicate whether SELECT * FROM TABLE LIMIT 10 or SELECT TOP 10 * FROM TABLE are supported.
+
+## 0.94 - 04 Feb 2001
+
+- Added ADORecordSet::GetRows() for compatibility with Microsoft ADO. Synonym for GetArray().
+- Added new metatype 'R' to represent autoincrement numbers.
+- Added ADORecordSet.FetchObject() to return a row as an object.
+- Finally got a Linux box to test PostgreSql. Many fixes.
+- Fixed copyright misspellings in 0.93.
+- Fixed mssql MetaColumns type bug.
+- Worked around odbc bug in PHP4 for sessions.
+- Fixed many documentation bugs (affected_rows, metadatabases, qstr).
+- Fixed MySQL timestamp format (removed comma).
+- Interbase driver did not call ibase_pconnect(). Fixed.
+
+## 0.93 - 18 Jan 2002
+
+- Fixed GetMenu bug.
+- Simplified Interbase commit and rollback.
+- Default behaviour on closing a connection is now to rollback all active transactions.
+- Added field object handling for array recordset for future XML compatibility.
+- Added arr2html() to convert array to html table.
+
+## 0.92 - 2 Jan 2002
+
+- Interbase Commit and Rollback should be working again.
+- Changed initialisation of ADORecordSet. This is internal and should not affect users. We are doing this to support cached recordsets in the future.
+- Implemented ADORecordSet_array class. This allows you to simulate a database recordset with an array.
+- Added UnixDate() and UnixTimeStamp() to ADORecordSet.
+
+## 0.91 - 21 Dec 2000
+
+- Fixed ODBC so ErrorMsg() is working.
+- Worked around ADO unrecognised null (0x1) value problem in COM.
+- Added Sybase support for FetchField() type
+- Removed debugging code and unneeded html from various files
+- Changed to javadoc style comments to adodb.inc.php.
+- Added maxsql as synonym for mysqlt
+- Now ODBC downloads first 8K of blob by default
+
+## 0.90 - 15 Nov 2000
+
+- Lots of testing of Microsoft ADO. Should be more stable now.
+- Added $ADODB_COUNTREC. Set to false for high speed selects.
+- Added Sybase support. Contributed by Toni Tunkkari (toni.tunkkari#finebyte.com). Bug in Sybase API: GetFields is unable to determine date types.
+- Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.
+- Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent empty dates.
+- Added MetaColumns($table) that returns an array of ADOFieldObject's listing the columns of a table.
+- Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.
+- Added adodb-session.php for session support.
+
+## 0.80 - 30 Nov 2000
+
+- Added support for charSet for interbase. Implemented MetaTables for most databases. PostgreSQL more extensively tested.
+
+## 0.71 - 22 Nov 2000
+
+- Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier.
+
+## 0.70 - 15 Nov 2000
+
+- Calls by reference have been removed (call_time_pass_reference=Off) to ensure compatibility with future versions of PHP, except in Oracle 7 driver due to a bug in php_oracle.dll.
+- PostgreSQL database driver contributed by Alberto Cerezal (acerezalp#dbnet.es).
+- Oci8 driver for Oracle 8 contributed by George Fourlanos (fou#infomap.gr).
+- Added _mysqlt_ database driver to support MySQL 3.23 which has transaction support.
+- Oracle default date format (DD-MON-YY) did not match ADOdb default date format (which is YYYY-MM-DD). Use ALTER SESSION to force the default date.
+- Error message checking is now included in test suite.
+- MoveNext() did not check EOF properly -- fixed.
+
+## 0.60 - 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/libraries/adodb/docs/changelog_v3.x.md b/libraries/adodb/docs/changelog_v3.x.md
new file mode 100644
index 000000000..ee2bded40
--- /dev/null
+++ b/libraries/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 portugese (brazilian) to languages. Thx to "Levi Fukumori".
+- Removed arg3 parameter from Execute/SelectLimit/Cache* functions.
+- Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() to note change in sql query counting with 2-d arrays.
+- Added MONEY to MetaType in PostgreSQL.
+- Added more debugging output to CacheFlush().
+
+## 3.72 - 9 Aug 2003
+
+- Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes and does the right thing...
+- Fixed CacheFlush() bug - Thx to martin#gmx.de
+- Walt Boring contributed MetaForeignKeys for postgres7.
+- _fetch() called _BlobDecode() wrongly in interbase. Fixed.
+- adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980
+
+## 3.71 - 4 Aug 2003
+
+- The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner == false.
+- Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
+- Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com.
+- Error handling in oci8 bugfix - if there was an error in Execute(), then when calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but the 2nd call would return no error.
+- Error handling in odbc bugfix. ODBC would always return the last error, even if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 0 everytime before CacheExecute() and Execute().
+
+## 3.70 - 29 July 2003
+
+- Added new SQLite driver. Tested on PHP 4.3 and PHP 5.
+- Added limited "sapdb" driver support - mainly date support.
+- The oci8 driver did not identify NUMBER with no defined precision correctly.
+- Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls in GetInsertSQL/GetUpdateSQL.
+- DBDate() and DBTimeStamp() format for postgresql had problems. Fixed.
+- Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit.
+- Added charset support to postgresql. Thx to Julian Tarkhanov.
+- Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS)
+- Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn.
+- adodb-cryptsession.php includes wrong. Fixed.
+- Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8.
+- Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring.
+- adodb_getcount() did not init qryRecs to 0\. Missing "WHERE" clause checking in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn.
+- Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring.
+- Upgraded to adodb-xmlschema.inc.php 0.0.2.
+- NConnect for mysql now returns value. Thx to Dennis Verspuij.
+- ADODB_FETCH_BOTH support added to interbase/firebird.
+- Czech language file contributed by Kamil Jakubovic jake#host.sk.
+- PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec.
+- Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it
+- ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed.
+
+## 3.60 - 16 June 2003
+
+- We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with mssql driver.
+- The property $emptyDate missing from connection class. Also changed 1903 to constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn.
+- ADOdb speedup optimization - we now return all arrays by reference.
+- Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. Suggested by vincent.
+- Added GetArray() to connection class.
+- Added not_null check in informix metacolumns().
+- Connection parameters for postgresql did not work correctly when port was defined.
+- DB2 is now a tested driver, making adodb 100% compatible. Extensive changes to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() fixes.
+- The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed.
+- Some bugs in adodb_backtrace() fixed.
+- Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql properly.
+- MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions to odbc MetaColumns() for vfp and db2 compat.
+- Added unsigned support to mysql datadict class. Thx to iamsure.
+- Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to Josh R, Night_Wulfe#hotmail.com.
+- ChangeTableSQL contributed by Florian Buzin.
+- The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with mssql driver.
+
+## 3.50 - 19 May 2003
+
+- Fixed mssql compat with FreeTDS. FreeTDS does not implement mssql_fetch_assoc().
+- Merged back connection and recordset code into adodb.inc.php.
+- ADOdb sessions using oracle clobs contributed by achim.gosse#ddd.de. See adodb-session-clob.php.
+- Added /s modifier to preg_match everywhere, which ensures that regex does not stop at /n. Thx Pao-Hsi Huang.
+- Fixed error in metacolumns() for mssql.
+- Added time format support for SQLDate.
+- Image => B added to metatype.
+- MetaType now checks empty($this->blobSize) instead of empty($this).
+- Datadict has beta support for informix, sybase (mapped to mssql), db2 and generic (which is a fudge).
+- BlobEncode for postgresql uses pg_escape_bytea, if available. Needed for compat with 7.3.
+- Added $ADODB_LANG, to support multiple languages in MetaErrorMsg().
+- Datadict can now parse table definition as declarative text.
+- For DataDict, oci8 autoincrement trigger missing semi-colon. Fixed.
+- For DataDict, when REPLACE flag enabled, drop sequence in datadict for autoincrement field in postgres and oci8.s
+- Postgresql defaults to template1 database if no database defined in connect/pconnect.
+- We now clear _resultid in postgresql if query fails.
+
+## 3.40 - 19 May 2003
+
+- Added insert_id for odbc_mssql.
+- Modified postgresql UpdateBlobFile() because it did not work in safe mode.
+- Now connection object is passed to raiseErrorFn as last parameter. Needed by StartTrans().
+- Added StartTrans() and CompleteTrans(). It is recommended that you do not modify transOff, but use the above functions.
+- oci8po now obeys ADODB_ASSOC_CASE settings.
+- Added virtualized error codes, using PEAR DB equivalents. Requires you to manually include adodb-error.inc.php yourself, with MetaError() and MetaErrorMsg($errno).
+- GetRowAssoc for mysql and pgsql were flawed. Fix by Ross Smith.
+- Added to datadict types I1, I2, I4 and I8\. Changed datadict type 'T' to map to timestamp instead of datetime for postgresql.
+- Error handling in ExecuteSQLArray(), adodb-datadict.inc.php did not work.
+- We now auto-quote postgresql connection parameters when building connection string.
+- Added session expiry notification.
+- We now test with odbc mysql - made some changes to odbc recordset constructor.
+- MetaColumns now special cases access and other databases for odbc.
+
+## 3.31 - 17 March 2003
+
+- Added row checking for _fetch in postgres.
+- Added Interval type to MetaType for postgres.
+- Remapped postgres driver to call postgres7 driver internally.
+- Adorecordset_array::getarray() did not return array when nRows >= 0.
+- Postgresql: at times, no error message returned by pg_result_error() but error message returned in pg_last_error(). Recoded again.
+- Interbase blob's now use chunking for updateblob.
+- Move() did not set EOF correctly. Reported by Jorma T.
+- We properly support mysql timestamp fields when we are creating mysql tables using the data-dict interface.
+- Table regex includes backticks character now.
+
+## 3.30 - 3 March 2003
+
+- Added $ADODB_EXTENSION and $ADODB_COMPAT_FETCH constant.
+- Made blank1stItem configurable using syntax "value:text" in GetMenu/GetMenu2. Thx to Gabriel Birke.
+- Previously ADOdb differed from the Microsoft standard because it did not define what to set $this->fields when EOF was reached. Now at EOF, ADOdb sets $this->fields to false for all databases, which is consist with Microsoft's implementation. Postgresql and mysql have always worked this way (in 3.11 and earlier). If you are experiencing compatibility problems (and you are not using postgresql nor mysql) on upgrading to 3.30, try setting the global variables $ADODB_COUNTRECS = true (which is the default) and $ADODB_FETCH_COMPAT = true (this is a new global variable).
+- We now check both pg_result_error and pg_last_error as sometimes pg_result_error does not display anything. Iman Mayes
+- We no longer check for magic quotes gpc in Quote().
+- Misc fixes for table creation in adodb-datadict.inc.php. Thx to iamsure.
+- Time calculations use adodb_time library for all negative timestamps due to problems in Red Hat 7.3 or later. Formerly, only did this for Windows.
+- In mssqlpo, we now check if $sql in _query is a string before we change || to +. This is to support prepared stmts.
+- Move() and MoveLast() internals changed to support to support EOF and $this->fields change.
+- Added ADODB_FETCH_BOTH support to mssql. Thx to Angel Fradejas afradejas#mediafusion.es
+- We now check if link resource exists before we run mysql_escape_string in qstr().
+- Before we flock in csv code, we check that it is not a http url.
+
+## 3.20 - 17 Feb 2003
+
+- Added new Data Dictionary classes for creating tables and indexes. Warning - this is very much alpha quality code. The API can still change. See adodb/tests/test-datadict.php for more info.
+- We now ignore $ADODB_COUNTRECS for mysql, because PHP truncates incomplete recordsets when mysql_unbuffered_query() is called a second time.
+- Now postgresql works correctly when $ADODB_COUNTRECS = false.
+- Changed _adodb_getcount to properly support SELECT DISTINCT.
+- Discovered that $ADODB_COUNTRECS=true has some problems with prepared queries - suspect PHP bug.
+- Now GetOne and GetRow run in $ADODB_COUNTRECS=false mode for better performance.
+- Added support for mysql_real_escape_string() and pg_escape_string() in qstr().
+- Added an intermediate variable for mysql _fetch() and MoveNext() to store fields, to prevent overwriting field array with boolean when mysql_fetch_array() returns false.
+- Made arrays for getinsertsql and getupdatesql case-insensitive. Suggested by Tim Uckun" tim#diligence.com
+
+## 3.11 - 11 Feb 2003
+
+- Added check for ADODB_NEVER_PERSIST constant in PConnect(). If defined, then PConnect() will actually call non-persistent Connect().
+- Modified interbase to properly work with Prepare().
+- Added $this->ibase_timefmt to allow you to change the date and time format.
+- Added support for $input_array parameter in CacheFlush().
+- Added experimental support for dbx, which was then removed when i found that it was slower than using native calls.
+- Added MetaPrimaryKeys for mssql and ibase/firebird.
+- Added new $trim parameter to GetCol and CacheGetCol
+- Uses updated adodb-time.inc.php 0.06.
+
+## 3.10 - 27 Jan 2003
+
+- Added adodb_date(), adodb_getdate(), adodb_mktime() and adodb-time.inc.php.
+- For interbase, added code to handle unlimited number of bind parameters. From Daniel Hasan daniel#hasan.cl.
+- Added BlobDecode and UpdateBlob for informix. Thx to Fernando Ortiz.
+- Added constant ADODB_WINDOWS. If defined, means that running on Windows.
+- Added constant ADODB_PHPVER which stores php version as a hex num. Removed $ADODB_PHPVER variable.
+- Felho Bacsi reported a minor white-space regular expression problem in GetInsertSQL.
+- Modified ADO to use variant to store _affectedRows
+- Changed ibase to use base class Replace(). Modified base class Replace() to support ibase.
+- Changed odbc to auto-detect when 0 records returned is wrong due to bad odbc drivers.
+- Changed mssql to use datetimeconvert ini setting only when 4.30 or later (does not work in 4.23).
+- ExecuteCursor($stmt, $cursorname, $params) now accepts a new $params array of additional bind parameters -- William Lovaton walovaton#yahoo.com.mx.
+- Added support for sybase_unbuffered_query if ADODB_COUNTRECS == false. Thx to chuck may.
+- Fixed FetchNextObj() bug. Thx to Jorma Tuomainen.
+- We now use SCOPE_IDENTITY() instead of @@IDENTITY for mssql - thx to marchesini#eside.it
+- Changed postgresql movenext logic to prevent illegal row number from being passed to pg_fetch_array().
+- Postgresql initrs bug found by "Bogdan RIPA" bripa#interakt.ro $f1 accidentally named $f
+
+## 3.00 - 6 Jan 2003
+
+- Fixed adodb-pear.inc.php syntax error.
+- Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages that accept it.
+- Fixed _adodb_getcount() caching error.
+- Added sql to retrive table and column info for odbc_mssql.
diff --git a/libraries/adodb/docs/changelog_v4+5.md b/libraries/adodb/docs/changelog_v4+5.md
new file mode 100644
index 000000000..c6a9c10de
--- /dev/null
+++ b/libraries/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 <geisel#4up.com.br>. See http://phplens.com/lens/lensforum/msgs.php?id=15917
+- Malcolm Cook added new Reload() function to Active Record. See http://phplens.com/lens/lensforum/msgs.php?id=17474
+- 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. http://phplens.com/lens/lensforum/msgs.php?id=17200
+- Removed $arg3 from mysqli SelectLimit. See http://phplens.com/lens/lensforum/msgs.php?id=16243. Thx Zsolt Szeberenyi.
+- 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/libraries/adodb/docs/changelog_v4.x.md b/libraries/adodb/docs/changelog_v4.x.md
new file mode 100644
index 000000000..84bdd8a70
--- /dev/null
+++ b/libraries/adodb/docs/changelog_v4.x.md
@@ -0,0 +1,722 @@
+# 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 <geisel#4up.com.br>. See http://phplens.com/lens/lensforum/msgs.php?id=15917
+- Malcolm Cook added new Reload() function to Active Record. See http://phplens.com/lens/lensforum/msgs.php?id=17474
+- 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. http://phplens.com/lens/lensforum/msgs.php?id=17200
+- Removed $arg3 from mysqli SelectLimit. See http://phplens.com/lens/lensforum/msgs.php?id=16243. Thx Zsolt Szeberenyi.
+- 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. http://phplens.com/lens/lensforum/msgs.php?id=16182
+- Added var $upperCase = 'ucase' to access and ado_access drivers. Thx Renato De Giovanni renato#cria.org.br
+- Postgres64 driver, if preparing plan failed in _query, did not handle error properly. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=16131.
+- Fixed GetActiveRecordsClass() reference bug. See http://phplens.com/lens/lensforum/msgs.php?id=16120
+- Added handling of nulls in adodb-ado_mssql.inc.php for qstr(). Thx to Felix Rabinovich.
+- Adodb-dict contributions by Gaetano
+ - Support for INDEX in data-dict. Example: idx_ev1. The ability to define indexes using the INDEX keyword was added in ADOdb 4.94. The following example features mutiple indexes, including a compound index idx_ev1.
+
+ ```
+ 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 portugese.
+- 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 http://phplens.com/lens/lensforum/msgs.php?id=15902.
+- Path disclosure problem in mysqli fixed. Thx Andy.
+- Fixed typo in session_schema2.xml.
+- Changed INT in oci8 to return correct precision in $fld->max_length, MetaColumns(). Thx Eloy Lafuente Plaza.
+- Patched postgres64 _connect to handle serverinfo(). see http://phplens.com/lens/lensforum/msgs.php?id=15887.
+- Added pdo fix for null columns. See http://phplens.com/lens/lensforum/msgs.php?id=15889
+- 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: http://phplens.com/lens/lensforum/msgs.php?id=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 http://phplens.com/lens/lensforum/msgs.php?id=15425
+- Active Record - If inserting a record and the value of a primary key field is null, then we do not insert that field in as we assume it is an auto-increment field. Needed by mssql.
+- Changed postgres7 MetaForeignKeys() see http://phplens.com/lens/lensforum/msgs.php?id=15531
+- 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 http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976. 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 http://phplens.com/lens/lensforum/msgs.php?id=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 http://phplens.com/lens/lensforum/msgs.php?id=14200.
+
+## 4.70 - 6 Jan 2006
+
+- Many fixes from Danila Ulyanov to ibase, oci8, postgres, mssql, odbc_oracle, odbtp, etc drivers.
+- Changed usage of binary hint in adodb-session.inc.php for mysql. See http://phplens.com/lens/lensforum/msgs.php?id=14160
+- Fixed invalid variable reference problem in undomq(), adodb-perf.inc.php.
+- Fixed http://phplens.com/lens/lensforum/msgs.php?id=14254 in adodb-perf.inc.php, `_DBParameter()` settings of fetchmode was wrong.
+- Fixed 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 cant 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 http://phplens.com/lens/lensforum/msgs.php?id=9849.
+- Fixed ibase datetimestamp typo in PHP5. Thx stefan.
+- Removed whitespace at end of odbtp drivers.
+- Added db2 metaprimarykeys fix.
+- Optimizations to MoveNext() for mysql and oci8. Misc speedups to Get* functions.
+
+## 4.50 - 6 July 2004
+
+- Bumped it to 4.50 to avoid confusion with PHP 4.3.x series.
+- Added db2 metatables and metacolumns extensions.
+- Added alpha PDO driver. Very buggy, only works with odbc.
+- Tested mysqli. Set poorAffectedRows = true. Cleaned up movenext() and _fetch().
+- PageExecute does not work properly with php5 (return val not a variable). Reported Dmytro Sychevsky sych#php.com.ua. Fixed.
+- MetaTables() for mysql, $showschema parameter was not backward compatible with older versions of adodb. Fixed.
+- Changed mysql GetOne() to work with mysql 3.23 when using with non-select stmts (e.g. SHOW TABLES).
+- Changed TRIG_ prefix to a variable in datadict-oci8.inc.php. Thx to Luca.Gioppo#csi.it.
+- New to adodb-time code. We allow you to define your own daylights savings function, adodb_daylight_sv for pre-1970 dates. If the function is defined (somewhere in an include), then you can correct for daylights savings. See http://phplens.com/phpeverywhere/node/view/16#daylightsavings for more info.
+- New sqlitepo driver. This is because assoc mode does not work like other drivers in sqlite. Namely, when selecting (joining) multiple tables, in assoc mode the table names are included in the assoc keys in the "sqlite" driver. In "sqlitepo" driver, the table names are stripped from the returned column names. When this results in a conflict, the first field get preference. Contributed by Herman Kuiper herman#ozuzo.net
+- Added $forcenull parameter to GetInsertSQL/GetUpdateSQL. Idea by Marco Aurelio Silva.
+- More XHTML changes for GetMenu. By Jeremy Evans.
+- Fixes some ibase date issues. Thx to stefan bogdan.
+- Improvements to mysqli driver to support $ADODB_COUNTRECS.
+- Fixed adodb-csvlib.inc.php problem when reading stream from socket. We need to poll stream continiously.
+
+## 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."<br>";</pre>
+```
+
+ 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)</pre>
+- 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 convertor by Gaetano G.
+- Fixed array recordset bugs when `_skiprow1` is true. Thx to Gaetano G.
+- Fixed pivot table code when count is false.
+
+## 4.05 - 13 Dec 2003
+
+- Added MetaIndexes 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/libraries/adodb/drivers/adodb-access.inc.php b/libraries/adodb/drivers/adodb-access.inc.php
index aae91aa14..3a5a8edc3 100644
--- a/libraries/adodb/drivers/adodb-access.inc.php
+++ b/libraries/adodb/drivers/adodb-access.inc.php
@@ -1,24 +1,26 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Microsoft Access data driver. Requires ODBC. Works only on MS Windows.
*/
if (!defined('_ADODB_ODBC_LAYER')) {
if (!defined('ADODB_DIR')) die();
-
+
include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
}
if (!defined('_ADODB_ACCESS')) {
define('_ADODB_ACCESS',1);
-class ADODB_access extends ADODB_odbc {
+class ADODB_access extends ADODB_odbc {
var $databaseType = 'access';
var $hasTop = 'top'; // support mssql SELECT TOP 10 * FROM TABLE
var $fmtDate = "#Y-m-d#";
@@ -27,41 +29,42 @@ class ADODB_access extends ADODB_odbc {
var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
var $sysTimeStamp = 'NOW';
var $hasTransactions = false;
-
- function ADODB_access()
+ var $upperCase = 'ucase';
+
+ function __construct()
{
global $ADODB_EXTENSION;
-
+
$ADODB_EXTENSION = false;
- $this->ADODB_odbc();
+ parent::__construct();
}
-
+
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,14 @@ class ADODB_access extends ADODB_odbc {
}*/
}
-
-class ADORecordSet_access extends ADORecordSet_odbc {
-
- var $databaseType = "access";
-
- function ADORecordSet_access($id,$mode=false)
+
+class ADORecordSet_access extends ADORecordSet_odbc {
+
+ var $databaseType = "access";
+
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbc($id,$mode);
+ return parent::__construct($id,$mode);
}
}// class
-}
-?>
\ No newline at end of file
+}
diff --git a/libraries/adodb/drivers/adodb-ado.inc.php b/libraries/adodb/drivers/adodb-ado.inc.php
index 9c40247e9..449cdd005 100644
--- a/libraries/adodb/drivers/adodb-ado.inc.php
+++ b/libraries/adodb/drivers/adodb-ado.inc.php
@@ -1,31 +1,33 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
-
+
define("_ADODB_ADO_LAYER", 1 );
/*--------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------*/
-
+
class ADODB_ado extends ADOConnection {
- var $databaseType = "ado";
+ var $databaseType = "ado";
var $_bindInputArray = false;
var $fmtDate = "'Y-m-d'";
var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
var $replaceQuote = "''"; // string to use to replace quotes
- var $dataProvider = "ado";
+ var $dataProvider = "ado";
var $hasAffectedRows = true;
var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
var $_affectedRows = false;
@@ -34,11 +36,11 @@ class ADODB_ado extends ADOConnection {
var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
var $_lock_type = -1;
var $_execute_option = -1;
- var $poorAffectedRows = true;
+ var $poorAffectedRows = true;
var $charPage;
-
- function ADODB_ado()
- {
+
+ function __construct()
+ {
$this->_affectedRows = new VARIANT;
}
@@ -47,14 +49,14 @@ class ADODB_ado extends ADOConnection {
if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
return array('description' => $desc, 'version' => '');
}
-
+
function _affectedrows()
{
if (PHP_VERSION >= 5) return $this->_affectedRows;
-
+
return $this->_affectedRows->value;
}
-
+
// you can also pass a connection string like this:
//
// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
@@ -62,49 +64,49 @@ class ADODB_ado extends ADOConnection {
{
$u = 'UID';
$p = 'PWD';
-
+
if (!empty($this->charPage))
$dbc = new COM('ADODB.Connection',null,$this->charPage);
else
$dbc = new COM('ADODB.Connection');
-
+
if (! $dbc) return false;
/* special support if provider is mssql or access */
if ($argProvider=='mssql') {
$u = 'User Id'; //User parameter name for OLEDB
- $p = 'Password';
+ $p = 'Password';
$argProvider = "SQLOLEDB"; // SQL Server Provider
-
+
// not yet
//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-
+
//use trusted conection for SQL if username not specified
if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
} else if ($argProvider=='access')
$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-
- if ($argProvider) $dbc->Provider = $argProvider;
-
+
+ if ($argProvider) $dbc->Provider = $argProvider;
+
if ($argUsername) $argHostname .= ";$u=$argUsername";
if ($argPassword)$argHostname .= ";$p=$argPassword";
-
+
if ($this->debug) ADOConnection::outp( "Host=".$argHostname."<BR>\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 +148,12 @@ class ADODB_ado extends ADOConnection {
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 +167,25 @@ class ADODB_ado extends ADOConnection {
}
$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 +193,7 @@ class ADODB_ado extends ADOConnection {
$fld->max_length = -1;
$arr[strtoupper($fld->name)]=$fld;
}
-
+
$adors->MoveNext();
}
$adors->Close();
@@ -199,20 +201,20 @@ class ADODB_ado extends ADOConnection {
$false = false;
return empty($arr) ? $false : $arr;
}
-
-
+
+
/* returns queryID or false */
- function &_query($sql,$inputarr=false)
+ function _query($sql,$inputarr=false)
{
-
+
$dbc = $this->_connectionID;
$false = false;
-
- // return rs
+
+ // return rs
if ($inputarr) {
-
+
if (!empty($this->charPage))
$oCmd = new COM('ADODB.Command',null,$this->charPage);
else
@@ -221,11 +223,27 @@ class ADODB_ado extends ADOConnection {
$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 !!!
+ while(list(, $val) = each($inputarr)) {
+ $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 +252,12 @@ class ADODB_ado extends ADOConnection {
if ($dbc->Errors->Count > 0) return $false;
return $rs;
}
-
+
$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
if ($dbc->Errors->Count > 0) return $false;
if (! $rs) return $false;
-
+
if ($rs->State == 0) {
$true = true;
return $true; // 0 = adStateClosed means no records returned
@@ -247,11 +265,11 @@ class ADODB_ado extends ADOConnection {
return $rs;
}
-
- function BeginTrans()
- {
+
+ function BeginTrans()
+ {
if ($this->transOff) return true;
-
+
if (isset($this->_thisTransactions))
if (!$this->_thisTransactions) return false;
else {
@@ -263,12 +281,12 @@ class ADODB_ado extends ADOConnection {
$this->transCnt += 1;
return true;
}
-
- function CommitTrans($ok=true)
- {
+
+ function CommitTrans($ok=true)
+ {
if (!$ok) return $this->RollbackTrans();
if ($this->transOff) return true;
-
+
@$this->_connectionID->CommitTrans();
if ($this->transCnt) @$this->transCnt -= 1;
return true;
@@ -279,10 +297,10 @@ class ADODB_ado extends ADOConnection {
if ($this->transCnt) @$this->transCnt -= 1;
return true;
}
-
- /* Returns: the last error message from previous database operation */
- function ErrorMsg()
+ /* Returns: the last error message from previous database operation */
+
+ function ErrorMsg()
{
if (!$this->_connectionID) return "No connection established";
$errc = $this->_connectionID->Errors;
@@ -291,8 +309,8 @@ class ADODB_ado extends ADOConnection {
$err = $errc->Item($errc->Count-1);
return $err->Description;
}
-
- function ErrorNo()
+
+ function ErrorNo()
{
$errc = $this->_connectionID->Errors;
if ($errc->Count == 0) return 0;
@@ -307,39 +325,39 @@ class ADODB_ado extends ADOConnection {
$this->_connectionID = false;
return true;
}
-
-
+
+
}
-
+
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
-class ADORecordSet_ado extends ADORecordSet {
-
+class ADORecordSet_ado extends ADORecordSet {
+
var $bind = false;
- var $databaseType = "ado";
- var $dataProvider = "ado";
+ var $databaseType = "ado";
+ var $dataProvider = "ado";
var $_tarr = false; // caches the types
var $_flds; // and field objects
var $canSeek = true;
var $hideErrors = true;
-
- function ADORecordSet_ado($id,$mode=false)
+
+ 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);
+ return parent::__construct($id,$mode);
}
// 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 +365,12 @@ class ADORecordSet_ado extends ADORecordSet {
$t = $f->Type;
$o->type = $this->MetaType($t);
$o->max_length = $f->DefinedSize;
- $o->ado_type = $t;
+ $o->ado_type = $t;
//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
return $o;
}
-
+
/* Use associative array to get fields array */
function Fields($colname)
{
@@ -364,25 +382,25 @@ class ADORecordSet_ado extends ADORecordSet {
$this->bind[strtoupper($o->name)] = $i;
}
}
-
+
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
+
function _initrs()
{
$rs = $this->_queryID;
$this->_numOfRows = $rs->RecordCount;
-
+
$f = $rs->Fields;
$this->_numOfFields = $f->Count;
}
-
-
+
+
// should only be used to move forward as we normally use forward-only cursors
function _seek($row)
{
- $rs = $this->_queryID;
+ $rs = $this->_queryID;
// absoluteposition doesn't work -- my maths is wrong ?
// $rs->AbsolutePosition->$row-2;
// return true;
@@ -390,10 +408,10 @@ class ADORecordSet_ado extends ADORecordSet {
@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
return true;
}
-
+
/*
OLEDB types
-
+
enum DBTYPEENUM
{ DBTYPE_EMPTY = 0,
DBTYPE_NULL = 1,
@@ -429,9 +447,9 @@ class ADORecordSet_ado extends ADORecordSet {
DBTYPE_DBDATE = 133,
DBTYPE_DBTIME = 134,
DBTYPE_DBTIMESTAMP = 135
-
+
ADO Types
-
+
adEmpty = 0,
adTinyInt = 16,
adSmallInt = 2,
@@ -451,7 +469,7 @@ class ADORecordSet_ado extends ADORecordSet {
adUserDefined = 132,
adVariant = 12,
adIDispatch = 9,
- adIUnknown = 13,
+ adIUnknown = 13,
adGUID = 72,
adDate = 7,
adDBDate = 133,
@@ -480,9 +498,9 @@ class ADORecordSet_ado extends ADORecordSet {
$t = $fieldobj->type;
$len = $fieldobj->max_length;
}
-
+
if (!is_numeric($t)) return $t;
-
+
switch ($t) {
case 0:
case 12: // variant
@@ -495,7 +513,7 @@ class ADORecordSet_ado extends ADORecordSet {
case 204: // varBin
case 72: // guid
if ($len <= $this->blobSize) return 'C';
-
+
case 201:
case 203:
return 'X';
@@ -505,12 +523,12 @@ class ADORecordSet_ado extends ADORecordSet {
return 'B';
case 7:
case 133: return 'D';
-
+
case 134:
case 135: return 'T';
-
+
case 11: return 'L';
-
+
case 16:// adTinyInt = 16,
case 2://adSmallInt = 2,
case 3://adInteger = 3,
@@ -523,17 +541,17 @@ class ADORecordSet_ado extends ADORecordSet {
default: return 'N';
}
}
-
+
// time stamp not supported yet
function _fetch()
- {
+ {
$rs = $this->_queryID;
if (!$rs or $rs->EOF) {
$this->fields = false;
return false;
}
$this->fields = array();
-
+
if (!$this->_tarr) {
$tarr = array();
$flds = array();
@@ -543,12 +561,12 @@ class ADORecordSet_ado extends ADORecordSet {
$tarr[] = $f->Type;
}
// bind types and flds only once
- $this->_tarr = $tarr;
+ $this->_tarr = $tarr;
$this->_flds = $flds;
}
$t = reset($this->_tarr);
$f = reset($this->_flds);
-
+
if ($this->hideErrors) $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
@@ -559,12 +577,12 @@ class ADORecordSet_ado extends ADORecordSet {
if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
$val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
- else
+ else
$val = $f->value;
$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
}
- break;
- case 133:// A date value (yyyymmdd)
+ break;
+ case 133:// A date value (yyyymmdd)
if ($val = $f->value) {
$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
} else
@@ -575,7 +593,7 @@ class ADORecordSet_ado extends ADORecordSet {
else {
if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
else $val = $f->value;
-
+
if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
}
@@ -587,8 +605,18 @@ class ADORecordSet_ado extends ADORecordSet {
ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
$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 +625,27 @@ class ADORecordSet_ado extends ADORecordSet {
} // for
if ($this->hideErrors) error_reporting($olde);
@$rs->MoveNext(); // @ needed for some versions of PHP!
-
+
if ($this->fetchMode & ADODB_FETCH_ASSOC) {
- $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+ $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 +654,7 @@ class ADORecordSet_ado extends ADORecordSet {
function _close() {
$this->_flds = false;
@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
- $this->_queryID = false;
+ $this->_queryID = false;
}
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-ado5.inc.php b/libraries/adodb/drivers/adodb-ado5.inc.php
index 6fac23a25..21df32f16 100644
--- a/libraries/adodb/drivers/adodb-ado5.inc.php
+++ b/libraries/adodb/drivers/adodb-ado5.inc.php
@@ -1,31 +1,33 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Microsoft ADO data driver. Requires ADO. Works only on MS Windows. PHP5 compat version.
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
-
+
define("_ADODB_ADO_LAYER", 1 );
/*--------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------*/
-
+
class ADODB_ado extends ADOConnection {
- var $databaseType = "ado";
+ var $databaseType = "ado";
var $_bindInputArray = false;
var $fmtDate = "'Y-m-d'";
var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
var $replaceQuote = "''"; // string to use to replace quotes
- var $dataProvider = "ado";
+ var $dataProvider = "ado";
var $hasAffectedRows = true;
var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
var $_affectedRows = false;
@@ -34,11 +36,11 @@ class ADODB_ado extends ADOConnection {
var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
var $_lock_type = -1;
var $_execute_option = -1;
- var $poorAffectedRows = true;
+ var $poorAffectedRows = true;
var $charPage;
-
- function ADODB_ado()
- {
+
+ function __construct()
+ {
$this->_affectedRows = new VARIANT;
}
@@ -47,14 +49,14 @@ class ADODB_ado extends ADOConnection {
if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
return array('description' => $desc, 'version' => '');
}
-
+
function _affectedrows()
{
if (PHP_VERSION >= 5) return $this->_affectedRows;
-
+
return $this->_affectedRows->value;
}
-
+
// you can also pass a connection string like this:
//
// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
@@ -63,71 +65,73 @@ class ADODB_ado extends ADOConnection {
// two modes
// - if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
// - if $argProvider is not empty, then $argDBorProvider holds db
-
-
+
+
if ($argProvider) {
$argDatabasename = $argDBorProvider;
} else {
$argDatabasename = '';
if ($argDBorProvider) $argProvider = $argDBorProvider;
- else $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
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."<BR>\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 "<pre>",$argHostname,"\n",$e,"</pre>\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 +173,12 @@ class ADODB_ado extends ADOConnection {
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 +192,25 @@ class ADODB_ado extends ADOConnection {
}
$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 +218,28 @@ class ADODB_ado extends ADOConnection {
$fld->max_length = -1;
$arr[strtoupper($fld->name)]=$fld;
}
-
+
$adors->MoveNext();
}
$adors->Close();
}
-
+
return $arr;
}
-
+
/* returns queryID or false */
- function &_query($sql,$inputarr=false)
+ function _query($sql,$inputarr=false)
{
try { // In PHP5, all COM errors are exceptions, so to maintain old behaviour...
-
+
$dbc = $this->_connectionID;
-
- // return rs
-
+
+ // return rs
+
$false = false;
-
+
if ($inputarr) {
-
+
if (!empty($this->charPage))
$oCmd = new COM('ADODB.Command',null,$this->charPage);
else
@@ -244,42 +248,57 @@ class ADODB_ado extends ADOConnection {
$oCmd->CommandText = $sql;
$oCmd->CommandType = 1;
- foreach($inputarr as $val) {
+ while(list(, $val) = each($inputarr)) {
+ $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 +310,11 @@ class ADODB_ado extends ADOConnection {
$this->transCnt += 1;
return true;
}
- function CommitTrans($ok=true)
- {
+ function CommitTrans($ok=true)
+ {
if (!$ok) return $this->RollbackTrans();
if ($this->transOff) return true;
-
+
@$this->_connectionID->CommitTrans();
if ($this->transCnt) @$this->transCnt -= 1;
return true;
@@ -306,14 +325,14 @@ class ADODB_ado extends ADOConnection {
if ($this->transCnt) @$this->transCnt -= 1;
return true;
}
-
- /* Returns: the last error message from previous database operation */
- function ErrorMsg()
+ /* Returns: the last error message from previous database operation */
+
+ function ErrorMsg()
{
if (!$this->_connectionID) return "No connection established";
$errmsg = '';
-
+
try {
$errc = $this->_connectionID->Errors;
if (!$errc) return "No Errors object found";
@@ -324,8 +343,8 @@ class ADODB_ado extends ADOConnection {
}
return $errmsg;
}
-
- function ErrorNo()
+
+ function ErrorNo()
{
$errc = $this->_connectionID->Errors;
if ($errc->Count == 0) return 0;
@@ -340,53 +359,55 @@ class ADODB_ado extends ADOConnection {
$this->_connectionID = false;
return true;
}
-
-
+
+
}
-
+
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
-class ADORecordSet_ado extends ADORecordSet {
-
+class ADORecordSet_ado extends ADORecordSet {
+
var $bind = false;
- var $databaseType = "ado";
- var $dataProvider = "ado";
+ var $databaseType = "ado";
+ var $dataProvider = "ado";
var $_tarr = false; // caches the types
var $_flds; // and field objects
var $canSeek = true;
var $hideErrors = true;
-
- function ADORecordSet_ado($id,$mode=false)
+
+ 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);
+ return parent::__construct($id,$mode);
}
// 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<br>";
return $o;
}
-
+
/* Use associative array to get fields array */
function Fields($colname)
{
@@ -398,25 +419,29 @@ class ADORecordSet_ado extends ADORecordSet {
$this->bind[strtoupper($o->name)] = $i;
}
}
-
+
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
+
function _initrs()
{
$rs = $this->_queryID;
- $this->_numOfRows = $rs->RecordCount;
-
+
+ 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 +449,10 @@ class ADORecordSet_ado extends ADORecordSet {
@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
return true;
}
-
+
/*
OLEDB types
-
+
enum DBTYPEENUM
{ DBTYPE_EMPTY = 0,
DBTYPE_NULL = 1,
@@ -463,9 +488,9 @@ class ADORecordSet_ado extends ADORecordSet {
DBTYPE_DBDATE = 133,
DBTYPE_DBTIME = 134,
DBTYPE_DBTIMESTAMP = 135
-
+
ADO Types
-
+
adEmpty = 0,
adTinyInt = 16,
adSmallInt = 2,
@@ -485,7 +510,7 @@ class ADORecordSet_ado extends ADORecordSet {
adUserDefined = 132,
adVariant = 12,
adIDispatch = 9,
- adIUnknown = 13,
+ adIUnknown = 13,
adGUID = 72,
adDate = 7,
adDBDate = 133,
@@ -514,9 +539,9 @@ class ADORecordSet_ado extends ADORecordSet {
$t = $fieldobj->type;
$len = $fieldobj->max_length;
}
-
+
if (!is_numeric($t)) return $t;
-
+
switch ($t) {
case 0:
case 12: // variant
@@ -529,7 +554,7 @@ class ADORecordSet_ado extends ADORecordSet {
case 204: // varBin
case 72: // guid
if ($len <= $this->blobSize) return 'C';
-
+
case 201:
case 203:
return 'X';
@@ -539,12 +564,12 @@ class ADORecordSet_ado extends ADORecordSet {
return 'B';
case 7:
case 133: return 'D';
-
+
case 134:
case 135: return 'T';
-
+
case 11: return 'L';
-
+
case 16:// adTinyInt = 16,
case 2://adSmallInt = 2,
case 3://adInteger = 3,
@@ -557,17 +582,17 @@ class ADORecordSet_ado extends ADORecordSet {
default: return 'N';
}
}
-
+
// time stamp not supported yet
function _fetch()
- {
+ {
$rs = $this->_queryID;
if (!$rs or $rs->EOF) {
$this->fields = false;
return false;
}
$this->fields = array();
-
+
if (!$this->_tarr) {
$tarr = array();
$flds = array();
@@ -577,12 +602,12 @@ class ADORecordSet_ado extends ADORecordSet {
$tarr[] = $f->Type;
}
// bind types and flds only once
- $this->_tarr = $tarr;
+ $this->_tarr = $tarr;
$this->_flds = $flds;
}
$t = reset($this->_tarr);
$f = reset($this->_flds);
-
+
if ($this->hideErrors) $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
@@ -593,12 +618,12 @@ class ADORecordSet_ado extends ADORecordSet {
if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
$val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
- else
+ else
$val = $f->value;
$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
}
- break;
- case 133:// A date value (yyyymmdd)
+ break;
+ case 133:// A date value (yyyymmdd)
if ($val = $f->value) {
$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
} else
@@ -609,7 +634,7 @@ class ADORecordSet_ado extends ADORecordSet {
else {
if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
else $val = $f->value;
-
+
if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
}
@@ -617,12 +642,26 @@ class ADORecordSet_ado extends ADORecordSet {
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( '<b>'.$f->Name.': currency type not supported by PHP</b>');
$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 +670,27 @@ class ADORecordSet_ado extends ADORecordSet {
} // for
if ($this->hideErrors) error_reporting($olde);
@$rs->MoveNext(); // @ needed for some versions of PHP!
-
+
if ($this->fetchMode & ADODB_FETCH_ASSOC) {
- $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+ $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 +698,11 @@ class ADORecordSet_ado extends ADORecordSet {
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/libraries/adodb/drivers/adodb-ado_access.inc.php b/libraries/adodb/drivers/adodb-ado_access.inc.php
index e24992ca0..c167ce63a 100644
--- a/libraries/adodb/drivers/adodb-ado_access.inc.php
+++ b/libraries/adodb/drivers/adodb-ado_access.inc.php
@@ -1,13 +1,15 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
-Released under both BSD license and Lesser GPL library license.
-Whenever there is any discrepancy between the two licenses,
-the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+Released under both BSD license and Lesser GPL library license.
+Whenever there is any discrepancy between the two licenses,
+the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on MS Windows.
*/
@@ -19,36 +21,30 @@ if (!defined('_ADODB_ADO_LAYER')) {
else include(ADODB_DIR."/drivers/adodb-ado.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)
+
+class ADORecordSet_ado_access extends ADORecordSet_ado {
+
+ var $databaseType = "ado_access";
+
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_ado($id,$mode);
+ return parent::__construct($id,$mode);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-ado_mssql.inc.php b/libraries/adodb/drivers/adodb-ado_mssql.inc.php
index 42ea898b2..57eacc938 100644
--- a/libraries/adodb/drivers/adodb-ado_mssql.inc.php
+++ b/libraries/adodb/drivers/adodb-ado_mssql.inc.php
@@ -1,17 +1,19 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client.
+
+ Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client.
Works only on MS Windows.
-
- Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used.
+
+ Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used.
Please check http://bugs.php.net/ for more info.
*/
@@ -24,7 +26,7 @@ if (!defined('_ADODB_ADO_LAYER')) {
}
-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 +37,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()
{
- return $this->GetOne('select @@identity');
+ return $this->GetOne('select SCOPE_IDENTITY()');
}
-
+
function _affectedrows()
{
return $this->GetOne('select @@rowcount');
}
-
- function SetTransactionMode( $transaction_mode )
+
+ function SetTransactionMode( $transaction_mode )
{
$this->_transmode = $transaction_mode;
if (empty($transaction_mode)) {
@@ -63,19 +61,25 @@ class ADODB_ado_mssql extends ADODB_ado {
if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
$this->Execute("SET TRANSACTION ".$transaction_mode);
}
-
- function MetaColumns($table)
+
+ function qstr($s,$magic_quotes=false)
+ {
+ $s = ADOConnection::qstr($s, $magic_quotes);
+ return str_replace("\0", "\\\\000", $s);
+ }
+
+ function MetaColumns($table, $normalize=true)
{
$table = strtoupper($table);
$arr= array();
$dbc = $this->_connectionID;
-
+
$osoptions = array();
$osoptions[0] = null;
$osoptions[1] = null;
$osoptions[2] = $table;
$osoptions[3] = null;
-
+
$adors=@$dbc->OpenSchema(4, $osoptions);//tables
if ($adors){
@@ -86,7 +90,7 @@ class ADODB_ado_mssql extends ADODB_ado {
$fld->type = 'CHAR'; // cannot discover type in ADO!
$fld->max_length = -1;
$arr[strtoupper($fld->name)]=$fld;
-
+
$adors->MoveNext();
}
$adors->Close();
@@ -94,10 +98,10 @@ class ADODB_ado_mssql extends ADODB_ado {
$false = false;
return empty($arr) ? $false : $arr;
}
-
+
function CreateSequence($seq='adodbseq',$start=1)
{
-
+
$this->Execute('BEGIN TRANSACTION adodbseq');
$start -= 1;
$this->Execute("create table $seq (id float(53))");
@@ -106,7 +110,7 @@ class ADODB_ado_mssql extends ADODB_ado {
$this->Execute('ROLLBACK TRANSACTION adodbseq');
return false;
}
- $this->Execute('COMMIT TRANSACTION adodbseq');
+ $this->Execute('COMMIT TRANSACTION adodbseq');
return true;
}
@@ -122,26 +126,25 @@ class ADODB_ado_mssql extends ADODB_ado {
$this->Execute('ROLLBACK TRANSACTION adodbseq');
return false;
}
- $this->Execute('COMMIT TRANSACTION adodbseq');
+ $this->Execute('COMMIT TRANSACTION adodbseq');
return $start;
}
$num = $this->GetOne("select id from $seq");
- $this->Execute('COMMIT TRANSACTION adodbseq');
+ $this->Execute('COMMIT TRANSACTION adodbseq');
return $num;
-
+
// in old implementation, pre 1.90, we returned GUID...
//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
}
-
- } // end class
-
- class ADORecordSet_ado_mssql extends ADORecordSet_ado {
-
+
+ } // end class
+
+ class ADORecordSet_ado_mssql extends ADORecordSet_ado {
+
var $databaseType = 'ado_mssql';
-
- function ADORecordSet_ado_mssql($id,$mode=false)
+
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_ado($id,$mode);
+ return parent::__construct($id,$mode);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-ads.inc.php b/libraries/adodb/drivers/adodb-ads.inc.php
new file mode 100644
index 000000000..d59df663a
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-ads.inc.php
@@ -0,0 +1,784 @@
+<?php
+/*
+ (c) 2000-2014 John Lim (jlim#natsoft.com.my). All rights reserved.
+ Portions Copyright (c) 2007-2009, iAnywhere Solutions, Inc.
+ All rights reserved. All unpublished rights reserved.
+
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+
+Set tabs to 4 for best viewing.
+
+
+NOTE: This driver requires the Advantage PHP client libraries, which
+ can be downloaded for free via:
+ http://devzone.advantagedatabase.com/dz/content.aspx?key=20
+
+DELPHI FOR PHP USERS:
+ The following steps can be taken to utilize this driver from the
+ CodeGear Delphi for PHP product:
+ 1 - See note above, download and install the Advantage PHP client.
+ 2 - Copy the following files to the Delphi for PHP\X.X\php\ext directory:
+ ace32.dll
+ axcws32.dll
+ adsloc32.dll
+ php_advantage.dll (rename the existing php_advantage.dll.5.x.x file)
+ 3 - Add the following line to the Delphi for PHP\X.X\php\php.ini.template file:
+ extension=php_advantage.dll
+ 4 - To use: enter "ads" as the DriverName on a connection component, and set
+ a Host property similar to "DataDirectory=c:\". See the Advantage PHP
+ help file topic for ads_connect for details on connection path options
+ and formatting.
+ 5 - (optional) - Modify the Delphi for PHP\X.X\vcl\packages\database.packages.php
+ file and add ads to the list of strings returned when registering the
+ Database object's DriverName property.
+
+*/
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+ define("_ADODB_ADS_LAYER", 2 );
+
+/*--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------*/
+
+
+class ADODB_ads extends ADOConnection {
+ var $databaseType = "ads";
+ var $fmt = "'m-d-Y'";
+ var $fmtTimeStamp = "'Y-m-d H:i:s'";
+ var $concat_operator = '';
+ var $replaceQuote = "''"; // string to use to replace quotes
+ var $dataProvider = "ads";
+ var $hasAffectedRows = true;
+ var $binmode = ODBC_BINMODE_RETURN;
+ var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive
+ // breaking backward-compat
+ //var $longreadlen = 8000; // default number of chars to return for a Blob/Long field
+ var $_bindInputArray = false;
+ var $curmode = SQL_CUR_USE_DRIVER; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L
+ var $_genSeqSQL = "create table %s (id integer)";
+ var $_autocommit = true;
+ var $_haserrorfunctions = true;
+ var $_has_stupid_odbc_fetch_api_change = true;
+ var $_lastAffectedRows = 0;
+ var $uCaseTables = true; // for meta* functions, uppercase table names
+
+
+ function __construct()
+ {
+ $this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
+ $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
+ }
+
+ // returns true or false
+ function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+ {
+ global $php_errormsg;
+
+ if (!function_exists('ads_connect')) return null;
+
+ if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') {
+ ADOConnection::outp("For Advantage Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
+ }
+ if (isset($php_errormsg)) $php_errormsg = '';
+ if ($this->curmode === false) $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword);
+ else $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword,$this->curmode);
+ $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+ if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+
+ return $this->_connectionID != false;
+ }
+
+ // returns true or false
+ function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+ {
+ global $php_errormsg;
+
+ if (!function_exists('ads_connect')) return null;
+
+ if (isset($php_errormsg)) $php_errormsg = '';
+ $this->_errorMsg = isset($php_errormsg) ? $php_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<br>"; flush();
+ if ($this->curmode === false) $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword);
+ else $this->_connectionID = ads_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
+
+ $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+ if ($this->_connectionID && $this->autoRollback) @ads_rollback($this->_connectionID);
+ if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+
+ return $this->_connectionID != false;
+ }
+
+ // returns the Server version and Description
+ function ServerInfo()
+ {
+
+ if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
+ $stmt = $this->Prepare('EXECUTE PROCEDURE sp_mgGetInstallInfo()');
+ $res = $this->Execute($stmt);
+ if(!$res)
+ print $this->ErrorMsg();
+ else{
+ $ret["version"]= $res->fields[3];
+ $ret["description"]="Advantage Database Server";
+ return $ret;
+ }
+ }
+ else {
+ return ADOConnection::ServerInfo();
+ }
+ }
+
+
+ // returns true or false
+ function CreateSequence($seqname = 'adodbseq', $start = 1)
+ {
+ $res = $this->Execute("CREATE TABLE $seqname ( ID autoinc( 1 ) ) IN DATABASE");
+ if(!$res){
+ print $this->ErrorMsg();
+ return false;
+ }
+ else
+ return true;
+
+ }
+
+ // returns true or false
+ function DropSequence($seqname = 'adodbseq')
+ {
+ $res = $this->Execute("DROP TABLE $seqname");
+ if(!$res){
+ print $this->ErrorMsg();
+ return false;
+ }
+ else
+ return true;
+ }
+
+
+ // returns the generated ID or false
+ // checks if the table already exists, else creates the table and inserts a record into the table
+ // and gets the ID number of the last inserted record.
+ function GenID($seqname = 'adodbseq', $start = 1)
+ {
+ $go = $this->Execute("select * from $seqname");
+ if (!$go){
+ $res = $this->Execute("CREATE TABLE $seqname ( ID autoinc( 1 ) ) IN DATABASE");
+ if(!res){
+ print $this->ErrorMsg();
+ return false;
+ }
+ }
+ $res = $this->Execute("INSERT INTO $seqname VALUES( DEFAULT )");
+ if(!$res){
+ print $this->ErrorMsg();
+ return false;
+ }
+ else{
+ $gen = $this->Execute("SELECT LastAutoInc( STATEMENT ) FROM system.iota");
+ $ret = $gen->fields[0];
+ return $ret;
+ }
+
+ }
+
+
+
+
+ function ErrorMsg()
+ {
+ if ($this->_haserrorfunctions) {
+ if ($this->_errorMsg !== false) return $this->_errorMsg;
+ if (empty($this->_connectionID)) return @ads_errormsg();
+ return @ads_errormsg($this->_connectionID);
+ } else return ADOConnection::ErrorMsg();
+ }
+
+
+ function ErrorNo()
+ {
+
+ if ($this->_haserrorfunctions) {
+ if ($this->_errorCode !== false) {
+ // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+ return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
+ }
+
+ if (empty($this->_connectionID)) $e = @ads_error();
+ else $e = @ads_error($this->_connectionID);
+
+ // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+ // so we check and patch
+ if (strlen($e)<=2) return 0;
+ return $e;
+ } else return ADOConnection::ErrorNo();
+ }
+
+
+
+ function BeginTrans()
+ {
+ if (!$this->hasTransactions) return false;
+ if ($this->transOff) return true;
+ $this->transCnt += 1;
+ $this->_autocommit = false;
+ return ads_autocommit($this->_connectionID,false);
+ }
+
+ function CommitTrans($ok=true)
+ {
+ if ($this->transOff) return true;
+ if (!$ok) return $this->RollbackTrans();
+ if ($this->transCnt) $this->transCnt -= 1;
+ $this->_autocommit = true;
+ $ret = ads_commit($this->_connectionID);
+ ads_autocommit($this->_connectionID,true);
+ return $ret;
+ }
+
+ function RollbackTrans()
+ {
+ if ($this->transOff) return true;
+ if ($this->transCnt) $this->transCnt -= 1;
+ $this->_autocommit = true;
+ $ret = ads_rollback($this->_connectionID);
+ ads_autocommit($this->_connectionID,true);
+ return $ret;
+ }
+
+
+ // Returns tables,Views or both on succesfull execution. Returns
+ // tables by default on succesfull execustion.
+ function &MetaTables($ttype = false, $showSchema = false, $mask = false)
+ {
+ $recordSet1 = $this->Execute("select * from system.tables");
+ if(!$recordSet1){
+ print $this->ErrorMsg();
+ return false;
+ }
+ $recordSet2 = $this->Execute("select * from system.views");
+ if(!$recordSet2){
+ print $this->ErrorMsg();
+ return false;
+ }
+ $i=0;
+ while (!$recordSet1->EOF){
+ $arr["$i"] = $recordSet1->fields[0];
+ $recordSet1->MoveNext();
+ $i=$i+1;
+ }
+ if($ttype=='FALSE'){
+ while (!$recordSet2->EOF){
+ $arr["$i"] = $recordSet2->fields[0];
+ $recordSet2->MoveNext();
+ $i=$i+1;
+ }
+ return $arr;
+ }
+ elseif($ttype=='VIEWS'){
+ while (!$recordSet2->EOF){
+ $arrV["$i"] = $recordSet2->fields[0];
+ $recordSet2->MoveNext();
+ $i=$i+1;
+ }
+ return $arrV;
+ }
+ else{
+ return $arr;
+ }
+
+ }
+
+ function &MetaPrimaryKeys($table, $owner = false)
+ {
+ $recordSet = $this->Execute("select table_primary_key from system.tables where name='$table'");
+ if(!$recordSet){
+ print $this->ErrorMsg();
+ return false;
+ }
+ $i=0;
+ while (!$recordSet->EOF){
+ $arr["$i"] = $recordSet->fields[0];
+ $recordSet->MoveNext();
+ $i=$i+1;
+ }
+ return $arr;
+ }
+
+/*
+See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
+/ SQL data type codes /
+#define SQL_UNKNOWN_TYPE 0
+#define SQL_CHAR 1
+#define SQL_NUMERIC 2
+#define SQL_DECIMAL 3
+#define SQL_INTEGER 4
+#define SQL_SMALLINT 5
+#define SQL_FLOAT 6
+#define SQL_REAL 7
+#define SQL_DOUBLE 8
+#if (ODBCVER >= 0x0300)
+#define SQL_DATETIME 9
+#endif
+#define SQL_VARCHAR 12
+
+
+/ One-parameter shortcuts for date/time data types /
+#if (ODBCVER >= 0x0300)
+#define SQL_TYPE_DATE 91
+#define SQL_TYPE_TIME 92
+#define SQL_TYPE_TIMESTAMP 93
+
+#define SQL_UNICODE (-95)
+#define SQL_UNICODE_VARCHAR (-96)
+#define SQL_UNICODE_LONGVARCHAR (-97)
+*/
+ function ODBCTypes($t)
+ {
+ switch ((integer)$t) {
+ case 1:
+ case 12:
+ case 0:
+ case -95:
+ case -96:
+ return 'C';
+ case -97:
+ case -1: //text
+ return 'X';
+ case -4: //image
+ return 'B';
+
+ case 9:
+ case 91:
+ return 'D';
+
+ case 10:
+ case 11:
+ case 92:
+ case 93:
+ return 'T';
+
+ case 4:
+ case 5:
+ case -6:
+ return 'I';
+
+ case -11: // uniqidentifier
+ return 'R';
+ case -7: //bit
+ return 'L';
+
+ default:
+ return 'N';
+ }
+ }
+
+ function &MetaColumns($table, $normalize = true)
+ {
+ global $ADODB_FETCH_MODE;
+
+ $false = false;
+ if ($this->uCaseTables) $table = strtoupper($table);
+ $schema = '';
+ $this->_findschema($table,$schema);
+
+ $savem = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+ /*if (false) { // after testing, confirmed that the following does not work becoz of a bug
+ $qid2 = ads_tables($this->_connectionID);
+ $rs = new ADORecordSet_ads($qid2);
+ $ADODB_FETCH_MODE = $savem;
+ if (!$rs) return false;
+ $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+ $rs->_fetch();
+
+ while (!$rs->EOF) {
+ if ($table == strtoupper($rs->fields[2])) {
+ $q = $rs->fields[0];
+ $o = $rs->fields[1];
+ break;
+ }
+ $rs->MoveNext();
+ }
+ $rs->Close();
+
+ $qid = ads_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
+ } */
+
+ switch ($this->databaseType) {
+ case 'access':
+ case 'vfp':
+ $qid = ads_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
+ break;
+
+
+ case 'db2':
+ $colname = "%";
+ $qid = ads_columns($this->_connectionID, "", $schema, $table, $colname);
+ break;
+
+ default:
+ $qid = @ads_columns($this->_connectionID,'%','%',strtoupper($table),'%');
+ if (empty($qid)) $qid = ads_columns($this->_connectionID);
+ break;
+ }
+ if (empty($qid)) return $false;
+
+ $rs = new ADORecordSet_ads($qid);
+ $ADODB_FETCH_MODE = $savem;
+
+ if (!$rs) return $false;
+ $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+ $rs->_fetch();
+
+ $retarr = array();
+
+ /*
+ $rs->fields indices
+ 0 TABLE_QUALIFIER
+ 1 TABLE_SCHEM
+ 2 TABLE_NAME
+ 3 COLUMN_NAME
+ 4 DATA_TYPE
+ 5 TYPE_NAME
+ 6 PRECISION
+ 7 LENGTH
+ 8 SCALE
+ 9 RADIX
+ 10 NULLABLE
+ 11 REMARKS
+ */
+ while (!$rs->EOF) {
+ // adodb_pr($rs->fields);
+ if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
+ $fld = new ADOFieldObject();
+ $fld->name = $rs->fields[3];
+ $fld->type = $this->ODBCTypes($rs->fields[4]);
+
+ // ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
+ // access uses precision to store length for char/varchar
+ if ($fld->type == 'C' or $fld->type == 'X') {
+ if ($this->databaseType == 'access')
+ $fld->max_length = $rs->fields[6];
+ else if ($rs->fields[4] <= -95) // UNICODE
+ $fld->max_length = $rs->fields[7]/2;
+ else
+ $fld->max_length = $rs->fields[7];
+ } else
+ $fld->max_length = $rs->fields[7];
+ $fld->not_null = !empty($rs->fields[10]);
+ $fld->scale = $rs->fields[8];
+ $retarr[strtoupper($fld->name)] = $fld;
+ } else if (sizeof($retarr)>0)
+ break;
+ $rs->MoveNext();
+ }
+ $rs->Close(); //-- crashes 4.03pl1 -- why?
+
+ if (empty($retarr)) $retarr = false;
+ return $retarr;
+ }
+
+ // Returns an array of columns names for a given table
+ function &MetaColumnNames($table, $numIndexes = false, $useattnum = false)
+ {
+ $recordSet = $this->Execute("select name from system.columns where parent='$table'");
+ if(!$recordSet){
+ print $this->ErrorMsg();
+ return false;
+ }
+ else{
+ $i=0;
+ while (!$recordSet->EOF){
+ $arr["FIELD$i"] = $recordSet->fields[0];
+ $recordSet->MoveNext();
+ $i=$i+1;
+ }
+ return $arr;
+ }
+ }
+
+
+ function Prepare($sql)
+ {
+ if (! $this->_bindInputArray) return $sql; // no binding
+ $stmt = ads_prepare($this->_connectionID,$sql);
+ if (!$stmt) {
+ // we don't know whether odbc driver is parsing prepared stmts, so just return sql
+ return $sql;
+ }
+ return array($sql,$stmt,false);
+ }
+
+ /* returns queryID or false */
+ function _query($sql,$inputarr=false)
+ {
+ GLOBAL $php_errormsg;
+ if (isset($php_errormsg)) $php_errormsg = '';
+ $this->_error = '';
+
+ if ($inputarr) {
+ if (is_array($sql)) {
+ $stmtid = $sql[1];
+ } else {
+ $stmtid = ads_prepare($this->_connectionID,$sql);
+
+ if ($stmtid == false) {
+ $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+ return false;
+ }
+ }
+
+ if (! ads_execute($stmtid,$inputarr)) {
+ //@ads_free_result($stmtid);
+ if ($this->_haserrorfunctions) {
+ $this->_errorMsg = ads_errormsg();
+ $this->_errorCode = ads_error();
+ }
+ return false;
+ }
+
+ } else if (is_array($sql)) {
+ $stmtid = $sql[1];
+ if (!ads_execute($stmtid)) {
+ //@ads_free_result($stmtid);
+ if ($this->_haserrorfunctions) {
+ $this->_errorMsg = ads_errormsg();
+ $this->_errorCode = ads_error();
+ }
+ return false;
+ }
+ } else
+ {
+
+ $stmtid = ads_exec($this->_connectionID,$sql);
+
+ }
+
+ $this->_lastAffectedRows = 0;
+
+ if ($stmtid)
+ {
+
+ if (@ads_num_fields($stmtid) == 0) {
+ $this->_lastAffectedRows = ads_num_rows($stmtid);
+ $stmtid = true;
+
+ } else {
+
+ $this->_lastAffectedRows = 0;
+ ads_binmode($stmtid,$this->binmode);
+ ads_longreadlen($stmtid,$this->maxblobsize);
+
+ }
+
+ if ($this->_haserrorfunctions)
+ {
+
+ $this->_errorMsg = '';
+ $this->_errorCode = 0;
+ }
+ else
+ $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+ }
+ else
+ {
+ if ($this->_haserrorfunctions) {
+ $this->_errorMsg = ads_errormsg();
+ $this->_errorCode = ads_error();
+ } else
+ $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+ }
+
+ return $stmtid;
+
+ }
+
+ /*
+ Insert a null into the blob field of the table first.
+ Then use UpdateBlob to store the blob.
+
+ Usage:
+
+ $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+ $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+ */
+ function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+ {
+ $sql = "UPDATE $table SET $column=? WHERE $where";
+ $stmtid = ads_prepare($this->_connectionID,$sql);
+ if ($stmtid == false){
+ $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+ return false;
+ }
+ if (! ads_execute($stmtid,array($val),array(SQL_BINARY) )){
+ if ($this->_haserrorfunctions){
+ $this->_errorMsg = ads_errormsg();
+ $this->_errorCode = ads_error();
+ }
+ return false;
+ }
+ return TRUE;
+ }
+
+ // returns true or false
+ function _close()
+ {
+ $ret = @ads_close($this->_connectionID);
+ $this->_connectionID = false;
+ return $ret;
+ }
+
+ function _affectedrows()
+ {
+ return $this->_lastAffectedRows;
+ }
+
+}
+
+/*--------------------------------------------------------------------------------------
+ Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_ads extends ADORecordSet {
+
+ var $bind = false;
+ var $databaseType = "ads";
+ var $dataProvider = "ads";
+ var $useFetchArray;
+ var $_has_stupid_odbc_fetch_api_change;
+
+ function __construct($id,$mode=false)
+ {
+ if ($mode === false) {
+ global $ADODB_FETCH_MODE;
+ $mode = $ADODB_FETCH_MODE;
+ }
+ $this->fetchMode = $mode;
+
+ $this->_queryID = $id;
+
+ // the following is required for mysql odbc driver in 4.3.1 -- why?
+ $this->EOF = false;
+ $this->_currentRow = -1;
+ //parent::__construct($id);
+ }
+
+
+ // returns the field object
+ function &FetchField($fieldOffset = -1)
+ {
+
+ $off=$fieldOffset+1; // offsets begin at 1
+
+ $o= new ADOFieldObject();
+ $o->name = @ads_field_name($this->_queryID,$off);
+ $o->type = @ads_field_type($this->_queryID,$off);
+ $o->max_length = @ads_field_len($this->_queryID,$off);
+ if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+ else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+ return $o;
+ }
+
+ /* Use associative array to get fields array */
+ function Fields($colname)
+ {
+ if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+ if (!$this->bind) {
+ $this->bind = array();
+ for ($i=0; $i < $this->_numOfFields; $i++) {
+ $o = $this->FetchField($i);
+ $this->bind[strtoupper($o->name)] = $i;
+ }
+ }
+
+ return $this->fields[$this->bind[strtoupper($colname)]];
+ }
+
+
+ function _initrs()
+ {
+ global $ADODB_COUNTRECS;
+ $this->_numOfRows = ($ADODB_COUNTRECS) ? @ads_num_rows($this->_queryID) : -1;
+ $this->_numOfFields = @ads_num_fields($this->_queryID);
+ // some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
+ if ($this->_numOfRows == 0) $this->_numOfRows = -1;
+ //$this->useFetchArray = $this->connection->useFetchArray;
+ $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
+ }
+
+ function _seek($row)
+ {
+ return false;
+ }
+
+ // speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
+ function &GetArrayLimit($nrows,$offset=-1)
+ {
+ if ($offset <= 0) {
+ $rs =& $this->GetArray($nrows);
+ return $rs;
+ }
+ $savem = $this->fetchMode;
+ $this->fetchMode = ADODB_FETCH_NUM;
+ $this->Move($offset);
+ $this->fetchMode = $savem;
+
+ if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+ $this->fields =& $this->GetRowAssoc();
+ }
+
+ $results = array();
+ $cnt = 0;
+ while (!$this->EOF && $nrows != $cnt) {
+ $results[$cnt++] = $this->fields;
+ $this->MoveNext();
+ }
+
+ return $results;
+ }
+
+
+ function MoveNext()
+ {
+ if ($this->_numOfRows != 0 && !$this->EOF) {
+ $this->_currentRow++;
+ if( $this->_fetch() ) {
+ return true;
+ }
+ }
+ $this->fields = false;
+ $this->EOF = true;
+ return false;
+ }
+
+ function _fetch()
+ {
+ $this->fields = false;
+ if ($this->_has_stupid_odbc_fetch_api_change)
+ $rez = @ads_fetch_into($this->_queryID,$this->fields);
+ else {
+ $row = 0;
+ $rez = @ads_fetch_into($this->_queryID,$row,$this->fields);
+ }
+ if ($rez) {
+ if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+ $this->fields =& $this->GetRowAssoc();
+ }
+ return true;
+ }
+ return false;
+ }
+
+ function _close()
+ {
+ return @ads_free_result($this->_queryID);
+ }
+
+}
diff --git a/libraries/adodb/drivers/adodb-borland_ibase.inc.php b/libraries/adodb/drivers/adodb-borland_ibase.inc.php
index 442af0e34..d3de2caa1 100644
--- a/libraries/adodb/drivers/adodb-borland_ibase.inc.php
+++ b/libraries/adodb/drivers/adodb-borland_ibase.inc.php
@@ -1,13 +1,15 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Support Borland Interbase 6.5 and later
*/
@@ -18,27 +20,22 @@ if (!defined('ADODB_DIR')) die();
include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
class ADODB_borland_ibase extends ADODB_ibase {
- var $databaseType = "borland_ibase";
-
- function ADODB_borland_ibase()
- {
- $this->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:
@@ -48,44 +45,43 @@ class ADODB_borland_ibase extends ADODB_ibase {
$arr['description'] = $s;
return $arr;
}
-
+
// Note that Interbase 6.5 uses ROWS instead - don't you love forking wars!
- // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows
+ // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows
// SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
// Firebird uses
// SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
- function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+ function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
{
if ($nrows > 0) {
- if ($offset <= 0) $str = " ROWS $nrows ";
+ if ($offset <= 0) $str = " ROWS $nrows ";
else {
$a = $offset+1;
$b = $offset+$nrows;
$str = " ROWS $a TO $b";
}
} else {
- // ok, skip
+ // ok, skip
$a = $offset + 1;
$str = " ROWS $a TO 999999999"; // 999 million
}
$sql .= $str;
-
- return ($secs2cache) ?
+
+ return ($secs2cache) ?
$this->CacheExecute($secs2cache,$sql,$inputarr)
:
$this->Execute($sql,$inputarr);
}
-
+
};
-
-class ADORecordSet_borland_ibase extends ADORecordSet_ibase {
-
- var $databaseType = "borland_ibase";
-
- function ADORecordSet_borland_ibase($id,$mode=false)
+
+class ADORecordSet_borland_ibase extends ADORecordSet_ibase {
+
+ var $databaseType = "borland_ibase";
+
+ function __construct($id,$mode=false)
{
- $this->ADORecordSet_ibase($id,$mode);
+ parent::__construct($id,$mode);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-csv.inc.php b/libraries/adodb/drivers/adodb-csv.inc.php
index 638c99c43..fd47784de 100644
--- a/libraries/adodb/drivers/adodb-csv.inc.php
+++ b/libraries/adodb/drivers/adodb-csv.inc.php
@@ -1,19 +1,21 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4.
-
+
Currently unsupported: MetaDatabases, MetaTables and MetaColumns, and also inputarr in Execute.
Native types have been converted to MetaTypes.
Transactions not supported yet.
-
+
Limitation of url length. For IIS, see MaxClientRequestBuffer registry value.
-
+
http://support.microsoft.com/default.aspx?scid=kb;en-us;260694
-*/
+*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
@@ -22,12 +24,12 @@ if (! defined("_ADODB_CSV_LAYER")) {
define("_ADODB_CSV_LAYER", 1 );
include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-
+
class ADODB_csv extends ADOConnection {
var $databaseType = 'csv';
var $databaseProvider = 'csv';
var $hasInsertID = true;
- var $hasAffectedRows = true;
+ var $hasAffectedRows = true;
var $fmtTimeStamp = "'Y-m-d H:i:s'";
var $_affectedrows=0;
var $_insertid=0;
@@ -35,35 +37,35 @@ class ADODB_csv extends ADOConnection {
var $replaceQuote = "''"; // string to use to replace quotes
var $hasTransactions = false;
var $_errorNo = false;
-
- function ADODB_csv()
- {
+
+ function __construct()
+ {
}
-
+
function _insertid()
{
return $this->_insertid;
}
-
+
function _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 +73,24 @@ class ADODB_csv extends ADOConnection {
$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;
-
+
$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<br><i>$err</i><br>";
$at = strpos($err,'::::');
@@ -99,25 +101,25 @@ class ADODB_csv extends ADOConnection {
$this->_errorMsg = substr($err,$at+4,1024);
$this->_errorNo = -9999;
}
- if ($this->_errorNo)
+ if ($this->_errorNo)
if ($fn = $this->raiseErrorFn) {
$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
}
-
- if (is_object($rs)) {
-
- $rs->databaseType='csv';
+
+ if (is_object($rs)) {
+
+ $rs->databaseType='csv';
$rs->fetchMode = ($this->fetchMode !== false) ? $this->fetchMode : $ADODB_FETCH_MODE;
- $rs->connection = &$this;
+ $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 +134,57 @@ class ADODB_csv extends ADOConnection {
else
$sql .= $v;
$i += 1;
-
+
}
$sql .= $sqlarr[$i];
- if ($i+1 != sizeof($sqlarr))
+ if ($i+1 != sizeof($sqlarr))
print "Input Array does not match ?: ".htmlspecialchars($sql);
$inputarr = false;
}
-
+
$url = $this->_url.'?sql='.urlencode($sql)."&fetch=".
(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
$err = false;
-
-
+
+
$rs = csv2rs($url,$err,false);
if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
$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;
}
-
- /* 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 +193,11 @@ class ADODB_csv extends ADOConnection {
} // class
class ADORecordset_csv extends ADORecordset {
- function ADORecordset_csv($id,$mode=false)
+ function __construct($id,$mode=false)
{
- $this->ADORecordset($id,$mode);
+ parent::__construct($id,$mode);
}
-
+
function _close()
{
return true;
@@ -203,5 +205,3 @@ class ADORecordset_csv extends ADORecordset {
}
} // define
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-db2.inc.php b/libraries/adodb/drivers/adodb-db2.inc.php
index 61d600b4a..e7b9dbdd7 100644
--- a/libraries/adodb/drivers/adodb-db2.inc.php
+++ b/libraries/adodb/drivers/adodb-db2.inc.php
@@ -1,13 +1,17 @@
<?php
-/*
- V4.90 8 June 2006 (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+/**
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
-This is a version of the ADODB driver for DB2. It uses the 'ibm_db2' PECL extension for PHP
- (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2.
+ This is a version of the ADODB driver for DB2. It uses the 'ibm_db2' PECL extension
+ for PHP (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2 or
+ higher.
- Tested with PHP 5.1.1 and Apache 2.0.55 on Windows XP SP2.
+ Originally tested with PHP 5.1.1 and Apache 2.0.55 on Windows XP SP2.
+ More recently tested with PHP 5.1.2 and Apache 2.0.55 on Windows XP SP2.
- This file was ported from "adodb-odbc.inc.php" by Larry Menard, "larry.menard@rogers.com".
+ This file was ported from "adodb-odbc.inc.php" by Larry Menard, "larry.menard#rogers.com".
I ripped out what I believed to be a lot of redundant or obsolete code, but there are
probably still some remnants of the ODBC support in this file; I'm relying on reviewers
of this code to point out any other things that can be removed.
@@ -17,22 +21,24 @@ This is a version of the ADODB driver for DB2. It uses the 'ibm_db2' PECL exten
if (!defined('ADODB_DIR')) die();
define("_ADODB_DB2_LAYER", 2 );
-
+
/*--------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------*/
+
+
+
class ADODB_db2 extends ADOConnection {
- var $databaseType = "db2";
+ var $databaseType = "db2";
var $fmtDate = "'Y-m-d'";
var $concat_operator = '||';
-
+
var $sysTime = 'CURRENT TIME';
var $sysDate = 'CURRENT DATE';
var $sysTimeStamp = 'CURRENT TIMESTAMP';
-
- var $fmtTimeStamp = "'Y-m-d-H.i.s'";
- #var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+
+ var $fmtTimeStamp = "'Y-m-d H:i:s'";
var $replaceQuote = "''"; // string to use to replace quotes
var $dataProvider = "db2";
var $hasAffectedRows = true;
@@ -41,89 +47,114 @@ class ADODB_db2 extends ADOConnection {
var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive
// breaking backward-compat
- var $_bindInputArray = false;
- var $_genSeqSQL = "create table %s (id integer)";
+ var $_bindInputArray = false;
+ var $_genIDSQL = "VALUES NEXTVAL FOR %s";
+ var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s NO MAXVALUE NO CYCLE";
+ var $_dropSeqSQL = "DROP SEQUENCE %s";
var $_autocommit = true;
var $_haserrorfunctions = true;
var $_lastAffectedRows = 0;
var $uCaseTables = true; // for meta* functions, uppercase table names
var $hasInsertID = true;
-
+
+
function _insertid()
{
return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
}
-
- function ADODB_db2()
- {
+
+ function __construct()
+ {
$this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
}
-
+
// returns true or false
function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
{
global $php_errormsg;
-
+
if (!function_exists('db2_connect')) {
- ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension.");
+ ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension which is not installed.");
return null;
}
// 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 ($argDatabasename) {
- $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
+ if ($argDatabasename && empty($argDSN)) {
+
+ if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_connect($argDatabasename,null,null);
+ else $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
} else {
- $this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword);
+ if ($argDatabasename) $schema = $argDatabasename;
+ if (stripos($argDSN,'UID=') && stripos($argDSN,'PWD=')) $this->_connectionID = db2_connect($argDSN,null,null);
+ else $this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword);
}
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.
- $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+ $this->_errorMsg = @db2_conn_errormsg();
if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-
+
+ if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
return $this->_connectionID != false;
}
-
+
// returns true or false
function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
{
global $php_errormsg;
-
+
if (!function_exists('db2_connect')) return null;
-
+
// This needs to be set before the connect().
// Replaces the odbc_binmode() call that was in Execute()
ini_set('ibm_db2.binmode', $this->binmode);
if (isset($php_errormsg)) $php_errormsg = '';
$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-
- if ($argDatabasename) {
- $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
+
+ if ($argDatabasename && empty($argDSN)) {
+
+ if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_pconnect($argDatabasename,null,null);
+ else $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
} else {
- $this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword);
+ if ($argDatabasename) $schema = $argDatabasename;
+ if (stripos($argDSN,'UID=') && stripos($argDSN,'PWD=')) $this->_connectionID = db2_pconnect($argDSN,null,null);
+ else $this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword);
}
if (isset($php_errormsg)) $php_errormsg = '';
- $this->_errorMsg = 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);
-
+
+ if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
return $this->_connectionID != false;
}
-
+ // format and return date string in database timestamp format
+ 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).",'YYYY-MM-DD HH24:MI:SS')";
+ }
+
// Format date column in sql string given an input format that understands Y M D
function SQLDate($fmt, $col=false)
- {
+ {
// use right() and replace() ?
if (!$col) $col = $this->sysDate;
+
+ /* use TO_CHAR() if $fmt is TO_CHAR() allowed fmt */
+ if ($fmt== 'Y-m-d H:i:s')
+ 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;
@@ -131,31 +162,38 @@ class ADODB_db2 extends ADOConnection {
switch($ch) {
case 'Y':
case 'y':
+ if ($len==1) return "year($col)";
$s .= "char(year($col))";
break;
case 'M':
+ if ($len==1) return "monthname($col)";
$s .= "substr(monthname($col),1,3)";
break;
case 'm':
+ if ($len==1) return "month($col)";
$s .= "right(digits(month($col)),2)";
break;
case 'D':
case 'd':
+ if ($len==1) return "day($col)";
$s .= "right(digits(day($col)),2)";
break;
case 'H':
case 'h':
- if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
+ if ($len==1) return "hour($col)";
+ if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
else $s .= "''";
break;
case 'i':
case 'I':
+ if ($len==1) return "minute($col)";
if ($col != $this->sysDate)
$s .= "right(digits(minute($col)),2)";
else $s .= "''";
break;
case 'S':
case 's':
+ if ($len==1) return "second($col)";
if ($col != $this->sysDate)
$s .= "right(digits(second($col)),2)";
else $s .= "''";
@@ -169,87 +207,71 @@ class ADODB_db2 extends ADOConnection {
}
}
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;
+ $row = $this->GetRow("SELECT service_level, fixpack_num FROM TABLE(sysproc.env_get_inst_info())
+ as INSTANCEINFO");
+
+
+ if ($row) {
+ $info['version'] = $row[0].':'.$row[1];
+ $info['fixpack'] = $row[1];
+ $info['description'] = '';
} else {
return ADOConnection::ServerInfo();
}
+
+ return $info;
}
-
function CreateSequence($seqname='adodbseq',$start=1)
{
if (empty($this->_genSeqSQL)) return false;
- $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+ $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$start));
if (!$ok) return false;
- $start -= 1;
- return $this->Execute("insert into $seqname values($start)");
+ return true;
}
-
- 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));
}
-
+
+ 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);
+ } else {
+ if ($offset > 0 && $nrows < 0);
+ else {
+ $nrows += $offset;
+ $sql .= " FETCH FIRST $nrows ROWS ONLY ";
+ }
+ $rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
+ }
+
+ return $rs;
+ }
+
/*
This algorithm is not very efficient, but works even if table locking
is not available.
-
+
Will return false if unable to generate an ID after $MAXLOOPS attempts.
*/
function GenID($seq='adodbseq',$start=1)
- {
+ {
// if you have to modify the parameter below, your database is overloaded,
// or you need to implement generation of id's yourself!
- $MAXLOOPS = 100;
- 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;
+ $num = $this->GetOne("VALUES NEXTVAL FOR $seq");
return $num;
- }
- }
- if ($fn = $this->raiseErrorFn) {
- $fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
- }
- return false;
}
@@ -257,44 +279,44 @@ class ADODB_db2 extends ADOConnection {
{
if ($this->_haserrorfunctions) {
if ($this->_errorMsg !== false) return $this->_errorMsg;
- if (empty($this->_connectionID)) return @db2_errormsg();
- return @db2_errormsg($this->_connectionID);
+ if (empty($this->_connectionID)) return @db2_conn_errormsg();
+ return @db2_conn_errormsg($this->_connectionID);
} else return ADOConnection::ErrorMsg();
}
-
+
function ErrorNo()
{
-
+
if ($this->_haserrorfunctions) {
if ($this->_errorCode !== false) {
// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
}
- if (empty($this->_connectionID)) $e = @db2_error();
- else $e = @db2_error($this->_connectionID);
-
+ if (empty($this->_connectionID)) $e = @db2_conn_error();
+ else $e = @db2_conn_error($this->_connectionID);
+
// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
// so we check and patch
if (strlen($e)<=2) return 0;
return $e;
} else return ADOConnection::ErrorNo();
}
-
-
+
+
function BeginTrans()
- {
+ {
if (!$this->hasTransactions) return false;
- if ($this->transOff) return true;
+ if ($this->transOff) return true;
$this->transCnt += 1;
$this->_autocommit = false;
return db2_autocommit($this->_connectionID,false);
}
-
- function CommitTrans($ok=true)
- {
- if ($this->transOff) return true;
+
+ function CommitTrans($ok=true)
+ {
+ if ($this->transOff) return true;
if (!$ok) return $this->RollbackTrans();
if ($this->transCnt) $this->transCnt -= 1;
$this->_autocommit = true;
@@ -302,21 +324,21 @@ class ADODB_db2 extends ADOConnection {
db2_autocommit($this->_connectionID,true);
return $ret;
}
-
+
function RollbackTrans()
{
- if ($this->transOff) return true;
+ if ($this->transOff) return true;
if ($this->transCnt) $this->transCnt -= 1;
$this->_autocommit = true;
$ret = db2_rollback($this->_connectionID);
db2_autocommit($this->_connectionID,true);
return $ret;
}
-
- function MetaPrimaryKeys($table)
+
+ function MetaPrimaryKeys($table, $owner = false)
{
global $ADODB_FETCH_MODE;
-
+
if ($this->uCaseTables) $table = strtoupper($table);
$schema = '';
$this->_findschema($table,$schema);
@@ -324,17 +346,17 @@ class ADODB_db2 extends ADOConnection {
$savem = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
$qid = @db2_primarykeys($this->_connectionID,'',$schema,$table);
-
+
if (!$qid) {
$ADODB_FETCH_MODE = $savem;
return false;
}
$rs = new ADORecordSet_db2($qid);
$ADODB_FETCH_MODE = $savem;
-
+
if (!$rs) return false;
-
- $arr =& $rs->GetArray();
+
+ $arr = $rs->GetArray();
$rs->Close();
$arr2 = array();
for ($i=0; $i < sizeof($arr); $i++) {
@@ -342,45 +364,90 @@ class ADODB_db2 extends ADOConnection {
}
return $arr2;
}
-
-
-
- function &MetaTables($ttype=false)
+
+ function MetaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE )
+ {
+ global $ADODB_FETCH_MODE;
+
+ if ($this->uCaseTables) $table = strtoupper($table);
+ $schema = '';
+ $this->_findschema($table,$schema);
+
+ $savem = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ $qid = @db2_foreign_keys($this->_connectionID,'',$schema,$table);
+ if (!$qid) {
+ $ADODB_FETCH_MODE = $savem;
+ return false;
+ }
+ $rs = new ADORecordSet_db2($qid);
+
+ $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();
+ }
+
+ $rs->Close();
+ return $foreign_key;
+ }
+
+
+ function MetaTables($ttype = false, $schema = false, $mask = false)
{
global $ADODB_FETCH_MODE;
-
+
$savem = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
$qid = db2_tables($this->_connectionID);
-
+
$rs = new ADORecordSet_db2($qid);
-
+
$ADODB_FETCH_MODE = $savem;
if (!$rs) {
$false = false;
return $false;
}
-
- $arr =& $rs->GetArray();
-
+
+ $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];
- if ($ttype) {
+ $owner = $arr[$i][1];
+ $schemaval = ($schema) ? $arr[$i][1].'.' : '';
+ if ($ttype) {
if ($isview) {
- if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+ if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2];
+ } else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
+ } else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
}
return $arr2;
}
-
+
/*
See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp
/ SQL data type codes /
@@ -412,7 +479,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
function DB2Types($t)
{
switch ((integer)$t) {
- case 1:
+ case 1:
case 12:
case 0:
case -95:
@@ -423,56 +490,56 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
return 'X';
case -4: //image
return 'B';
-
- case 9:
+
+ case 9:
case 91:
return 'D';
-
+
case 10:
case 11:
case 92:
case 93:
return 'T';
-
+
case 4:
case 5:
case -6:
return 'I';
-
+
case -11: // uniqidentifier
return 'R';
case -7: //bit
return 'L';
-
+
default:
return 'N';
}
}
-
- function &MetaColumns($table)
+
+ function MetaColumns($table, $normalize=true)
{
global $ADODB_FETCH_MODE;
-
+
$false = false;
if ($this->uCaseTables) $table = strtoupper($table);
$schema = '';
$this->_findschema($table,$schema);
-
+
$savem = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-
+
$colname = "%";
$qid = db2_columns($this->_connectionID, "", $schema, $table, $colname);
if (empty($qid)) return $false;
-
- $rs =& new ADORecordSet_db2($qid);
+
+ $rs = new ADORecordSet_db2($qid);
$ADODB_FETCH_MODE = $savem;
-
+
if (!$rs) return $false;
$rs->_fetch();
-
+
$retarr = array();
-
+
/*
$rs->fields indices
0 TABLE_QUALIFIER
@@ -493,7 +560,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
$fld = new ADOFieldObject();
$fld->name = $rs->fields[3];
$fld->type = $this->DB2Types($rs->fields[4]);
-
+
// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
// access uses precision to store length for char/varchar
if ($fld->type == 'C' or $fld->type == 'X') {
@@ -501,21 +568,51 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
$fld->max_length = $rs->fields[7]/2;
else
$fld->max_length = $rs->fields[7];
- } else
+ } else
$fld->max_length = $rs->fields[7];
$fld->not_null = !empty($rs->fields[10]);
$fld->scale = $rs->fields[8];
- $retarr[strtoupper($fld->name)] = $fld;
+ $fld->primary_key = false;
+ $retarr[strtoupper($fld->name)] = $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->_fetch();
+
+ /*
+ $rs->fields indices
+ 0 TABLE_CAT
+ 1 TABLE_SCHEM
+ 2 TABLE_NAME
+ 3 COLUMN_NAME
+ 4 KEY_SEQ
+ 5 PK_NAME
+ */
+ while (!$rs->EOF) {
+ 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)
break;
$rs->MoveNext();
}
- $rs->Close(); //-- crashes 4.03pl1 -- why?
-
+ $rs->Close();
+
if (empty($retarr)) $retarr = false;
return $retarr;
}
-
+
+
function Prepare($sql)
{
if (! $this->_bindInputArray) return $sql; // no binding
@@ -528,44 +625,44 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
}
/* returns queryID or false */
- function _query($sql,$inputarr=false)
+ function _query($sql,$inputarr=false)
{
GLOBAL $php_errormsg;
if (isset($php_errormsg)) $php_errormsg = '';
$this->_error = '';
-
+
if ($inputarr) {
if (is_array($sql)) {
$stmtid = $sql[1];
} else {
$stmtid = db2_prepare($this->_connectionID,$sql);
-
+
if ($stmtid == false) {
$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
return false;
}
}
-
+
if (! db2_execute($stmtid,$inputarr)) {
if ($this->_haserrorfunctions) {
- $this->_errorMsg = db2_errormsg();
- $this->_errorCode = db2_error();
+ $this->_errorMsg = db2_stmt_errormsg();
+ $this->_errorCode = db2_stmt_error();
}
return false;
}
-
+
} else if (is_array($sql)) {
$stmtid = $sql[1];
if (!db2_execute($stmtid)) {
if ($this->_haserrorfunctions) {
- $this->_errorMsg = db2_errormsg();
- $this->_errorCode = db2_error();
+ $this->_errorMsg = db2_stmt_errormsg();
+ $this->_errorCode = db2_stmt_error();
}
return false;
}
} else
- $stmtid = db2_exec($this->_connectionID,$sql);
-
+ $stmtid = @db2_exec($this->_connectionID,$sql);
+
$this->_lastAffectedRows = 0;
if ($stmtid) {
if (@db2_num_fields($stmtid) == 0) {
@@ -574,7 +671,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
} else {
$this->_lastAffectedRows = 0;
}
-
+
if ($this->_haserrorfunctions) {
$this->_errorMsg = '';
$this->_errorCode = 0;
@@ -586,6 +683,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
$this->_errorCode = db2_stmt_error();
} else
$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+
}
return $stmtid;
}
@@ -593,9 +691,9 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
/*
Insert a null into the blob field of the table first.
Then use UpdateBlob to store the blob.
-
+
Usage:
-
+
$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
*/
@@ -603,7 +701,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
{
return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
}
-
+
// returns true or false
function _close()
{
@@ -616,34 +714,34 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
{
return $this->_lastAffectedRows;
}
-
+
}
-
+
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
-class ADORecordSet_db2 extends ADORecordSet {
-
+class ADORecordSet_db2 extends ADORecordSet {
+
var $bind = false;
- var $databaseType = "db2";
+ var $databaseType = "db2";
var $dataProvider = "db2";
var $useFetchArray;
-
- function ADORecordSet_db2($id,$mode=false)
+
+ 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)
+ function FetchField($offset = -1)
{
$o= new ADOFieldObject();
$o->name = @db2_field_name($this->_queryID,$offset);
@@ -653,7 +751,7 @@ class ADORecordSet_db2 extends ADORecordSet {
else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
return $o;
}
-
+
/* Use associative array to get fields array */
function Fields($colname)
{
@@ -668,8 +766,8 @@ class ADORecordSet_db2 extends ADORecordSet {
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
-
+
+
function _initrs()
{
global $ADODB_COUNTRECS;
@@ -677,49 +775,49 @@ class ADORecordSet_db2 extends ADORecordSet {
$this->_numOfFields = @db2_num_fields($this->_queryID);
// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
if ($this->_numOfRows == 0) $this->_numOfRows = -1;
- }
-
+ }
+
function _seek($row)
{
return false;
}
-
+
// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
- function &GetArrayLimit($nrows,$offset=-1)
+ function GetArrayLimit($nrows,$offset=-1)
{
if ($offset <= 0) {
- $rs =& $this->GetArray($nrows);
+ $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++;
-
+
$this->fields = @db2_fetch_array($this->_queryID);
if ($this->fields) {
if ($this->fetchMode & ADODB_FETCH_ASSOC) {
- $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+ $this->fields = $this->GetRowAssoc();
}
return true;
}
@@ -727,26 +825,25 @@ class ADORecordSet_db2 extends ADORecordSet {
$this->fields = false;
$this->EOF = true;
return false;
- }
-
+ }
+
function _fetch()
{
$this->fields = db2_fetch_array($this->_queryID);
if ($this->fields) {
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 @db2_free_result($this->_queryID);
+ return @db2_free_result($this->_queryID);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-db2oci.inc.php b/libraries/adodb/drivers/adodb-db2oci.inc.php
new file mode 100644
index 000000000..91d61af14
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-db2oci.inc.php
@@ -0,0 +1,226 @@
+<?php
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+include(ADODB_DIR."/drivers/adodb-db2.inc.php");
+
+
+if (!defined('ADODB_DB2OCI')){
+define('ADODB_DB2OCI',1);
+
+/*
+// regex code for smart remapping of :0, :1 bind vars to ? ?
+function _colontrack($p)
+{
+global $_COLONARR,$_COLONSZ;
+ $v = (integer) substr($p,1);
+ if ($v > $_COLONSZ) return $p;
+ $_COLONARR[] = $v;
+ return '?';
+}
+
+// smart remapping of :0, :1 bind vars to ? ?
+function _colonscope($sql,$arr)
+{
+global $_COLONARR,$_COLONSZ;
+
+ $_COLONARR = array();
+ $_COLONSZ = sizeof($arr);
+
+ $sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql);
+
+ if (empty($_COLONARR)) return array($sql,$arr);
+
+ foreach($_COLONARR as $k => $v) {
+ $arr2[] = $arr[$v];
+ }
+
+ return array($sql2,$arr2);
+}
+*/
+
+/*
+ Smart remapping of :0, :1 bind vars to ? ?
+
+ Handles colons in comments -- and / * * / and in quoted strings.
+*/
+
+function _colonparser($sql,$arr)
+{
+ $lensql = strlen($sql);
+ $arrsize = sizeof($arr);
+ $state = 'NORM';
+ $at = 1;
+ $ch = $sql[0];
+ $ch2 = @$sql[1];
+ $sql2 = '';
+ $arr2 = array();
+ $nprev = 0;
+
+
+ while (strlen($ch)) {
+
+ switch($ch) {
+ case '/':
+ if ($state == 'NORM' && $ch2 == '*') {
+ $state = 'COMMENT';
+
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ }
+ break;
+
+ case '*':
+ if ($state == 'COMMENT' && $ch2 == '/') {
+ $state = 'NORM';
+
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ }
+ break;
+
+ case "\n":
+ case "\r":
+ if ($state == 'COMMENT2') $state = 'NORM';
+ break;
+
+ case "'":
+ do {
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ } while ($ch !== "'");
+ break;
+
+ case ':':
+ if ($state == 'COMMENT' || $state == 'COMMENT2') break;
+
+ //echo "$at=$ch $ch2, ";
+ if ('0' <= $ch2 && $ch2 <= '9') {
+ $n = '';
+ $nat = $at;
+ do {
+ $at += 1;
+ $ch = $ch2;
+ $n .= $ch;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ } while ('0' <= $ch && $ch <= '9');
+ #echo "$n $arrsize ] ";
+ $n = (integer) $n;
+ if ($n < $arrsize) {
+ $sql2 .= substr($sql,$nprev,$nat-$nprev-1).'?';
+ $nprev = $at-1;
+ $arr2[] = $arr[$n];
+ }
+ }
+ break;
+
+ case '-':
+ if ($state == 'NORM') {
+ if ($ch2 == '-') $state = 'COMMENT2';
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ }
+ break;
+ }
+
+ $at += 1;
+ $ch = $ch2;
+ $ch2 = $at < $lensql ? $sql[$at] : '';
+ }
+
+ if ($nprev == 0) {
+ $sql2 = $sql;
+ } else {
+ $sql2 .= substr($sql,$nprev);
+ }
+
+ return array($sql2,$arr2);
+}
+
+class ADODB_db2oci extends ADODB_db2 {
+ var $databaseType = "db2oci";
+ var $sysTimeStamp = 'sysdate';
+ var $sysDate = 'trunc(sysdate)';
+ var $_bindInputArray = true;
+
+ function Param($name,$type='C')
+ {
+ return ':'.$name;
+ }
+
+
+ function MetaTables($ttype = false, $schema = false, $mask = false)
+ {
+ global $ADODB_FETCH_MODE;
+
+ $savem = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ $qid = db2_tables($this->_connectionID);
+
+ $rs = new ADORecordSet_db2($qid);
+
+ $ADODB_FETCH_MODE = $savem;
+ if (!$rs) {
+ $false = false;
+ return $false;
+ }
+
+ $arr = $rs->GetArray();
+ $rs->Close();
+ $arr2 = array();
+ // 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";
+
+ function __construct($id,$mode=false)
+ {
+ return parent::__construct($id,$mode);
+ }
+}
+
+} //define
diff --git a/libraries/adodb/drivers/adodb-db2ora.inc.php b/libraries/adodb/drivers/adodb-db2ora.inc.php
new file mode 100644
index 000000000..1261689db
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-db2ora.inc.php
@@ -0,0 +1,86 @@
+<?php
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+include(ADODB_DIR."/drivers/adodb-db2.inc.php");
+
+
+if (!defined('ADODB_DB2OCI')){
+define('ADODB_DB2OCI',1);
+
+
+/**
+ * Callback function for preg_replace in _colonscope()
+ * @param array $p matched patterns
+ * return string '?' if parameter replaced, :N if not
+ */
+function _colontrack($p)
+{
+ global $_COLONARR, $_COLONSZ;
+ $v = (integer) substr($p[1], 1);
+ if ($v > $_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";
+
+ function __construct($id,$mode=false)
+ {
+ return parent::__construct($id,$mode);
+ }
+}
+
+} //define
diff --git a/libraries/adodb/drivers/adodb-fbsql.inc.php b/libraries/adodb/drivers/adodb-fbsql.inc.php
index 1cf0d4d9a..9a2440cfa 100644
--- a/libraries/adodb/drivers/adodb-fbsql.inc.php
+++ b/libraries/adodb/drivers/adodb-fbsql.inc.php
@@ -1,12 +1,14 @@
<?php
/*
- @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
- Contribution by Frank M. Kromann <frank@frontbase.com>.
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+ Contribution by Frank M. Kromann <frank@frontbase.com>.
Set tabs to 8.
-*/
+*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
@@ -17,27 +19,27 @@ if (! defined("_ADODB_FBSQL_LAYER")) {
class ADODB_fbsql extends ADOConnection {
var $databaseType = 'fbsql';
var $hasInsertID = true;
- var $hasAffectedRows = true;
- var $metaTablesSQL = "SHOW TABLES";
+ var $hasAffectedRows = true;
+ var $metaTablesSQL = "SHOW TABLES";
var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
var $fmtTimeStamp = "'Y-m-d H:i:s'";
var $hasLimit = false;
-
- function ADODB_fbsql()
- {
+
+ function __construct()
+ {
}
-
+
function _insertid()
{
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 +63,39 @@ class ADODB_fbsql extends ADOConnection {
if (sizeof($arr) > 0) return "CONCAT($s)";
else return '';
}
-
+
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
$this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword);
if ($this->_connectionID === false) return false;
if ($argDatabasename) return $this->SelectDB($argDatabasename);
- return true;
+ return true;
}
-
+
// returns true or false
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
$this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword);
if ($this->_connectionID === false) return false;
if ($argDatabasename) return $this->SelectDB($argDatabasename);
- return true;
+ return true;
}
-
- function &MetaColumns($table)
+
+ 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 +107,89 @@ class ADODB_fbsql extends ADOConnection {
$fld->primary_key = ($rs->fields[3] == 'PRI');
$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
$fld->binary = (strpos($fld->type,'blob') !== false);
-
- $retarr[strtoupper($fld->name)] = $fld;
+
+ $retarr[strtoupper($fld->name)] = $fld;
$rs->MoveNext();
}
$rs->Close();
- return $retarr;
+ return $retarr;
}
return false;
}
-
+
// returns true or false
- function SelectDB($dbName)
+ function SelectDB($dbName)
{
$this->database = $dbName;
if ($this->_connectionID) {
- return @fbsql_select_db($dbName,$this->_connectionID);
+ return @fbsql_select_db($dbName,$this->_connectionID);
}
- else return false;
+ else return false;
}
-
-
+
+
// returns queryID or false
- function _query($sql,$inputarr)
+ 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);
+ return 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 +200,25 @@ class ADORecordSet_fbsql extends ADORecordSet{
$o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable
//$o->max_length = -1;
}
-
+
return $o;
}
-
+
function _seek($row)
{
return @fbsql_data_seek($this->_queryID,$row);
}
-
+
function _fetch($ignore_fields=false)
{
$this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode);
return ($this->fields == true);
}
-
+
function _close() {
- return @fbsql_free_result($this->_queryID);
+ return @fbsql_free_result($this->_queryID);
}
-
+
function MetaType($t,$len=-1,$fieldobj=false)
{
if (is_object($t)) {
@@ -227,40 +229,39 @@ class ADORecordSet_fbsql extends ADORecordSet{
$len = -1; // fbsql max_length is not accurate
switch (strtoupper($t)) {
case 'CHARACTER':
- case 'CHARACTER VARYING':
- case 'BLOB':
- case 'CLOB':
- case 'BIT':
- case 'BIT VARYING':
+ case 'CHARACTER VARYING':
+ case 'BLOB':
+ case 'CLOB':
+ case 'BIT':
+ case 'BIT VARYING':
if ($len <= $this->blobSize) return 'C';
-
+
// so we have to check whether binary...
case 'IMAGE':
- case 'LONGBLOB':
+ case 'LONGBLOB':
case 'BLOB':
case 'MEDIUMBLOB':
return !empty($fieldobj->binary) ? 'B' : 'X';
-
+
case 'DATE': return 'D';
-
+
case 'TIME':
case 'TIME WITH TIME ZONE':
- case 'TIMESTAMP':
+ case 'TIMESTAMP':
case 'TIMESTAMP WITH TIME ZONE': return 'T';
-
+
case 'PRIMARY_KEY':
return 'R';
case 'INTEGER':
- case 'SMALLINT':
+ case 'SMALLINT':
case 'BOOLEAN':
-
+
if (!empty($fieldobj->primary_key)) return 'R';
else return 'I';
-
+
default: return 'N';
}
}
} //class
} // defined
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-firebird.inc.php b/libraries/adodb/drivers/adodb-firebird.inc.php
index c26fc98b1..415f66f21 100644
--- a/libraries/adodb/drivers/adodb-firebird.inc.php
+++ b/libraries/adodb/drivers/adodb-firebird.inc.php
@@ -1,11 +1,13 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
*/
@@ -16,21 +18,16 @@ if (!defined('ADODB_DIR')) die();
include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
class ADODB_firebird extends ADODB_ibase {
- var $databaseType = "firebird";
+ var $databaseType = "firebird";
var $dialect = 3;
-
- var $sysTimeStamp = "cast('NOW' as timestamp)";
-
- function ADODB_firebird()
- {
- $this->ADODB_ibase();
- }
-
+
+ var $sysTimeStamp = "CURRENT_TIMESTAMP"; //"cast('NOW' as timestamp)";
+
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 +37,37 @@ class ADODB_firebird extends ADODB_ibase {
$arr['description'] = $s;
return $arr;
}
-
+
// Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars!
- // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows
+ // SELECT col1, col2 FROM table ROWS 5 -- get 5 rows
// SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
- function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0)
+ 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 ADORecordSet_firebird extends ADORecordSet_ibase {
+
+ var $databaseType = "firebird";
+
+ function __construct($id,$mode=false)
{
- $this->ADORecordSet_ibase($id,$mode);
+ parent::__construct($id,$mode);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-ibase.inc.php b/libraries/adodb/drivers/adodb-ibase.inc.php
index d8d3bf16d..c4f0cbdb6 100644
--- a/libraries/adodb/drivers/adodb-ibase.inc.php
+++ b/libraries/adodb/drivers/adodb-ibase.inc.php
@@ -1,23 +1,25 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Latest version is available at http://adodb.sourceforge.net
-
+
Interbase data driver. Requires interbase client. Works on Windows and Unix.
3 Jan 2002 -- suggestions by Hans-Peter Oeri <kampfcaspar75@oeri.ch>
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,...)");
@@ -47,32 +49,32 @@ class ADODB_ibase extends ADOConnection {
var $buffers = 0;
var $dialect = 1;
var $sysDate = "cast('TODAY' as timestamp)";
- var $sysTimeStamp = "cast('NOW' as timestamp)";
+ var $sysTimeStamp = "CURRENT_TIMESTAMP"; //"cast('NOW' as timestamp)";
var $ansiOuter = true;
var $hasAffectedRows = false;
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 +82,18 @@ class ADODB_ibase extends ADOConnection {
$this->_handleerror();
return false;
}
-
+
// PHP5 change.
if (function_exists('ibase_timefmt')) {
ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
- if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
- else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
+ 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 +101,37 @@ class ADODB_ibase extends ADOConnection {
}
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 +143,146 @@ class ADODB_ibase extends ADOConnection {
}
function BeginTrans()
- {
+ {
if ($this->transOff) return true;
$this->transCnt += 1;
$this->autoCommit = false;
- $this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
+ $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);
- }
- $ADODB_FETCH_MODE = $save;
-
- return $indexes;
+ // 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)
+ 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 +292,23 @@ class ADODB_ibase extends ADOConnection {
$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 +316,13 @@ class ADODB_ibase extends ADOConnection {
$this->_errorMsg = ibase_errmsg();
}
- function ErrorNo()
+ function ErrorNo()
{
if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
else return 0;
}
- function ErrorMsg()
+ function ErrorMsg()
{
return $this->_errorMsg;
}
@@ -308,10 +334,10 @@ class ADODB_ibase extends ADOConnection {
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;
@@ -326,7 +352,7 @@ class ADODB_ibase extends ADOConnection {
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);
+ $fnarr = array_merge( array($sql) , $iarr);
$ret = call_user_func_array($fn,$fnarr);
} else {
switch(sizeof($iarr)) {
@@ -341,14 +367,14 @@ class ADODB_ibase extends ADOConnection {
case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
}
}
- } else $ret = $fn($sql);
+ } else $ret = $fn($sql);
} else {
$fn = 'ibase_query';
-
- if (is_array($iarr)) {
+
+ if (is_array($iarr)) {
if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
- $fnarr =& array_merge( array($conn,$sql) , $iarr);
+ $fnarr = array_merge( array($conn,$sql) , $iarr);
$ret = call_user_func_array($fn,$fnarr);
} else {
switch(sizeof($iarr)) {
@@ -363,21 +389,25 @@ class ADODB_ibase extends ADOConnection {
case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
}
}
- } else $ret = $fn($conn,$sql);
+ } else $ret = $fn($conn,$sql);
+ }
+ if ($docommit && $ret === true) {
+ ibase_commit($this->_connectionID);
}
- 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 +415,27 @@ class ADODB_ibase extends ADOConnection {
$fld->max_length = $flen;
$fld->scale = null;
switch($ftype){
- case 7:
+ case 7:
case 8:
if ($dialect3) {
- switch($fsubtype){
- case 0:
- $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 +443,25 @@ class ADODB_ibase extends ADOConnection {
}
}
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 +472,7 @@ class ADODB_ibase extends ADOConnection {
break;
case 27:
if ($fscale !=0) {
- $fld->type = 'decimal';
+ $fld->type = 'decimal';
$fld->max_length = 15;
$fld->scale = 5;
} else {
@@ -451,7 +481,7 @@ class ADODB_ibase extends ADOConnection {
break;
case 35:
if ($dialect3) {
- $fld->type = 'timestamp';
+ $fld->type = 'timestamp';
} else {
$fld->type = 'date';
}
@@ -475,22 +505,23 @@ class ADODB_ibase extends ADOConnection {
} // 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 +533,16 @@ class ADODB_ibase extends ADOConnection {
$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
if (isset($rs->fields[1]) && $rs->fields[1]) {
$fld->not_null = true;
- }
+ }
if (isset($rs->fields[2])) {
-
+
$fld->has_default = true;
$d = substr($rs->fields[2],strlen('default '));
switch ($fld->type)
{
case 'smallint':
case 'integer': $fld->default_value = (int) $d; break;
- case 'char':
+ case 'char':
case 'blob':
case 'text':
case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
@@ -527,109 +558,135 @@ class ADODB_ibase extends ADOConnection {
$fld->sub_type = null;
}
//OPN STUFF end
- if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
+ if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
else $retarr[strtoupper($fld->name)] = $fld;
-
+
$rs->MoveNext();
}
$rs->Close();
if ( empty($retarr)) return $false;
- else return $retarr;
+ else return $retarr;
}
-
- function BlobEncode( $blob )
+
+ function BlobEncode( $blob )
{
$blobid = ibase_blob_create( $this->_connectionID);
ibase_blob_add( $blobid, $blob );
return ibase_blob_close( $blobid );
}
-
- // since we auto-decode all blob's since 2.42,
+
+ // since we auto-decode all blob's since 2.42,
// BlobDecode should not do any transforms
function BlobDecode($blob)
{
- return $blob;
+ return $blob;
}
-
-
-
-
+
+
+
+
// old blobdecode function
// still used to auto-decode all blob's
- function _BlobDecode( $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 <kevinboillet@yahoo.fr>
- 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 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 )
+ {
+ 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;
+ }
+
/*
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);
@@ -637,15 +694,15 @@ class ADODB_ibase extends ADOConnection {
$blob_id_str = ibase_blob_close($blob_id);
return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
}
-
+
// Format date column in sql string given an input format that understands Y M D
// Only since Interbase 6.0 - uses EXTRACT
// problem - does not zero-fill the day and month yet
function SQLDate($fmt, $col=false)
- {
+ {
if (!$col) $col = $this->sysDate;
$s = '';
-
+
$len = strlen($fmt);
for ($i=0; $i < $len; $i++) {
if ($s) $s .= '||';
@@ -669,16 +726,16 @@ class ADODB_ibase extends ADOConnection {
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 == '\\') {
@@ -694,7 +751,7 @@ class ADODB_ibase extends ADOConnection {
}
/*--------------------------------------------------------------------------------------
- Class Name: Recordset
+ Class Name: Recordset
--------------------------------------------------------------------------------------*/
class ADORecordset_ibase extends ADORecordSet
@@ -703,13 +760,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.
@@ -717,33 +774,34 @@ class ADORecordset_ibase extends ADORecordSet
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()
@@ -752,53 +810,53 @@ class ADORecordset_ibase extends ADORecordSet
$this->_numOfFields = @ibase_num_fields($this->_queryID);
// cache types for blob decode check
- for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
- $f1 = $this->FetchField($i);
+ for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
+ $f1 = $this->FetchField($i);
$this->_cacheType[] = $f1->type;
- }
+ }
}
function _seek($row)
{
return false;
}
-
- function _fetch()
+
+ function _fetch()
{
- $f = @ibase_fetch_row($this->_queryID);
+ $f = @ibase_fetch_row($this->_queryID);
if ($f === false) {
$this->fields = false;
return false;
}
// OPN stuff start - optimized
// fix missing nulls and decode blobs automatically
-
+
global $ADODB_ANSI_PADDING_OFF;
//$ADODB_ANSI_PADDING_OFF=1;
$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
-
- for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
+
+ for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
if ($this->_cacheType[$i]=="BLOB") {
- if (isset($f[$i])) {
- $f[$i] = $this->connection->_BlobDecode($f[$i]);
- } else {
- $f[$i] = null;
- }
- } else {
- if (!isset($f[$i])) {
- $f[$i] = null;
+ if (isset($f[$i])) {
+ $f[$i] = $this->connection->_BlobDecode($f[$i]);
+ } else {
+ $f[$i] = null;
+ }
+ } else {
+ if (!isset($f[$i])) {
+ $f[$i] = null;
} else if ($rtrim && is_string($f[$i])) {
$f[$i] = rtrim($f[$i]);
}
- }
- }
- // OPN stuff end
-
+ }
+ }
+ // OPN stuff end
+
$this->fields = $f;
if ($this->fetchMode == ADODB_FETCH_ASSOC) {
- $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+ $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;
}
@@ -814,13 +872,13 @@ class ADORecordset_ibase extends ADORecordSet
$this->bind[strtoupper($o->name)] = $i;
}
}
-
+
return $this->fields[$this->bind[strtoupper($colname)]];
-
+
}
-
- function _close()
+
+ function _close()
{
return @ibase_free_result($this->_queryID);
}
@@ -835,7 +893,7 @@ class ADORecordset_ibase extends ADORecordSet
switch (strtoupper($t)) {
case 'CHAR':
return 'C';
-
+
case 'TEXT':
case 'VARCHAR':
case 'VARYING':
@@ -843,14 +901,14 @@ class ADORecordset_ibase extends ADORecordSet
return 'X';
case 'BLOB':
return 'B';
-
+
case 'TIMESTAMP':
case 'DATE': return 'D';
case 'TIME': return 'T';
//case 'T': return 'T';
//case 'L': return 'L';
- case 'INT':
+ case 'INT':
case 'SHORT':
case 'INTEGER': return 'I';
default: return 'N';
@@ -858,4 +916,3 @@ class ADORecordset_ibase extends ADORecordSet
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-informix.inc.php b/libraries/adodb/drivers/adodb-informix.inc.php
index 99b9c1288..801451ea5 100644
--- a/libraries/adodb/drivers/adodb-informix.inc.php
+++ b/libraries/adodb/drivers/adodb-informix.inc.php
@@ -1,6 +1,8 @@
<?php
/**
-* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version v5.20.9 21-Dec-2016
+* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
@@ -22,7 +24,7 @@ class ADODB_informix extends ADODB_informix72 {
var $databaseType = "informix";
var $hasTop = 'FIRST';
var $ansiOuter = true;
-
+
function IfNull( $field, $ifNull )
{
return " NVL($field, $ifNull) "; // if Informix 9.X or 10.X
@@ -31,10 +33,9 @@ class ADODB_informix extends ADODB_informix72 {
class ADORecordset_informix extends ADORecordset_informix72 {
var $databaseType = "informix";
-
- function ADORecordset_informix($id,$mode=false)
+
+ function __construct($id,$mode=false)
{
- $this->ADORecordset_informix72($id,$mode);
+ parent::__construct($id,$mode);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-informix72.inc.php b/libraries/adodb/drivers/adodb-informix72.inc.php
index 1f52b63d8..58f233a1f 100644
--- a/libraries/adodb/drivers/adodb-informix72.inc.php
+++ b/libraries/adodb/drivers/adodb-informix72.inc.php
@@ -1,6 +1,8 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim. All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -31,7 +33,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 +55,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;
@@ -104,8 +106,8 @@ class ADODB_informix72 extends ADOConnection {
return true;
}
- function CommitTrans($ok=true)
- {
+ function CommitTrans($ok=true)
+ {
if (!$ok) return $this->RollbackTrans();
if ($this->transOff) return true;
if ($this->transCnt) $this->transCnt -= 1;
@@ -123,16 +125,16 @@ class ADODB_informix72 extends ADOConnection {
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 +144,60 @@ class ADODB_informix72 extends ADOConnection {
function ErrorNo()
{
preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse);
- if (is_array($parse) && isset($parse[1])) return (int)$parse[1];
+ if (is_array($parse) && isset($parse[1])) return (int)$parse[1];
return 0;
}
-
- function &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 +234,19 @@ class ADODB_informix72 extends ADOConnection {
$fld->has_default = 0;
}
- $retarr[strtolower($fld->name)] = $fld;
+ $retarr[strtolower($fld->name)] = $fld;
$rs->MoveNext();
}
$rs->Close();
- $rspKey->Close(); //!eos
- return $retarr;
+ $rspkey->Close(); //!eos
+ return $retarr;
}
return $false;
}
-
- function &xMetaColumns($table)
+
+ function xMetaColumns($table)
{
return ADOConnection::MetaColumns($table,false);
}
@@ -219,7 +266,7 @@ class ADODB_informix72 extends ADOConnection {
$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 +294,15 @@ class ADODB_informix72 extends ADOConnection {
{
return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid);
}
-
+
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
if (!function_exists('ifx_connect')) return null;
-
+
$dbs = $argDatabasename . "@" . $argHostname;
- if ($argHostname) putenv("INFORMIXSERVER=$argHostname");
- putenv("INFORMIXSERVER=".trim($argHostname));
+ if ($argHostname) putenv("INFORMIXSERVER=$argHostname");
+ putenv("INFORMIXSERVER=".trim($argHostname));
$this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword);
if ($this->_connectionID === false) return false;
#if ($argDatabasename) return $this->SelectDB($argDatabasename);
@@ -266,9 +313,9 @@ class ADODB_informix72 extends ADOConnection {
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
if (!function_exists('ifx_connect')) return null;
-
+
$dbs = $argDatabasename . "@" . $argHostname;
- putenv("INFORMIXSERVER=".trim($argHostname));
+ putenv("INFORMIXSERVER=".trim($argHostname));
$this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword);
if ($this->_connectionID === false) return false;
#if ($argDatabasename) return $this->SelectDB($argDatabasename);
@@ -284,10 +331,10 @@ class ADODB_informix72 extends ADOConnection {
}
*/
// 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 +378,10 @@ class ADODB_informix72 extends ADOConnection {
function _close()
{
$this->lastQuery = false;
- return ifx_close($this->_connectionID);
+ if($this->_connectionID) {
+ return ifx_close($this->_connectionID);
+ }
+ return true;
}
}
@@ -346,14 +396,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);
+ return parent::__construct($id);
}
@@ -362,14 +412,14 @@ class ADORecordset_informix72 extends ADORecordSet {
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,7 +493,10 @@ class ADORecordset_informix72 extends ADORecordSet {
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;
}
}
@@ -470,6 +523,3 @@ function ifx_props($coltype,$collength){
}
return array($mtype,$length,$precision,$nullable);
}
-
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-ldap.inc.php b/libraries/adodb/drivers/adodb-ldap.inc.php
index 05f20cb3a..633705e09 100644
--- a/libraries/adodb/drivers/adodb-ldap.inc.php
+++ b/libraries/adodb/drivers/adodb-ldap.inc.php
@@ -1,64 +1,73 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
-
+
Revision 1: (02/25/2005) Updated codebase to include the _inject_bind_options function. This allows
users to access the options in the ldap_set_option function appropriately. Most importantly
LDAP Version 3 is now supported. See the examples for more information. Also fixed some minor
bugs that surfaced when PHP error levels were set high.
-
+
Joshua Eldridge (joshuae74#hotmail.com)
-*/
+*/
// 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";
+
+ function __construct()
+ {
}
-
+
// 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 +77,16 @@ class ADODB_ldap extends ADOConnection {
if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) {
$this->_inject_bind_options( $LDAP_CONNECT_OPTIONS );
}
-
+
if ($username) {
- $bind = ldap_bind( $this->_connectionID, $username, $password );
+ $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 +95,7 @@ class ADODB_ldap extends ADOConnection {
$this->database = $ldapbase;
return $this->_connectionID;
}
-
+
/*
Valid Domain Values for LDAP Options:
@@ -145,262 +154,275 @@ class ADODB_ldap extends ADOConnection {
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;
- return $rs;
+ $rs = @ldap_search( $this->_connectionID, $this->database, $sql );
+ $this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql.': '.ldap_error($this->_connectionID);
+ return $rs;
}
- /* closes the LDAP connection */
+ function ErrorMsg()
+ {
+ return $this->_errorMsg;
+ }
+
+ function ErrorNo()
+ {
+ return @ldap_errno($this->_connectionID);
+ }
+
+ /* closes the LDAP connection */
function _close()
{
@ldap_close( $this->_connectionID );
$this->_connectionID = false;
}
-
+
function SelectDB($db) {
$this->database = $db;
return true;
} // 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)
{
$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($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;
}
-
- function &GetRowAssoc()
+
+ function GetRowNums()
{
- $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 ) {
+ 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/libraries/adodb/drivers/adodb-mssql.inc.php b/libraries/adodb/drivers/adodb-mssql.inc.php
index 7693059ad..068dffce0 100644
--- a/libraries/adodb/drivers/adodb-mssql.inc.php
+++ b/libraries/adodb/drivers/adodb-mssql.inc.php
@@ -1,33 +1,36 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Native mssql driver. Requires mssql client. Works on Windows.
- To configure for Unix, see
+
+ Native mssql driver. Requires mssql client. Works on Windows.
+ To configure for Unix, see
http://phpbuilder.com/columns/alberto20000919.php3
-
+
*/
+
// security - hide paths
if (!defined('ADODB_DIR')) die();
//----------------------------------------------------------------
// MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
-// and this causes tons of problems because localized versions of
-// MSSQL will return the dates in dmy or mdy order; and also the
-// month strings depends on what language has been configured. The
+// and this causes tons of problems because localized versions of
+// MSSQL will return the dates in dmy or mdy order; and also the
+// month strings depends on what language has been configured. The
// following two variables allow you to control the localization
// settings - Ugh.
//
// MORE LOCALIZATION INFO
// ----------------------
-// To configure datetime, look for and modify sqlcommn.loc,
+// To configure datetime, look for and modify sqlcommn.loc,
// typically found in c:\mssql\install
// Also read :
// http://support.microsoft.com/default.aspx?scid=kb;EN-US;q220918
@@ -39,12 +42,12 @@ if (!defined('ADODB_DIR')) die();
// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
if (ADODB_PHPVER >= 0x4300) {
// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
- ini_set('mssql.datetimeconvert',0);
+ ini_set('mssql.datetimeconvert',0);
} else {
global $ADODB_mssql_mths; // array, months must be upper-case
- $ADODB_mssql_date_order = 'mdy';
+ $ADODB_mssql_date_order = 'mdy';
$ADODB_mssql_mths = array(
'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
@@ -71,11 +74,11 @@ global $ADODB_mssql_date_order;
}
class ADODB_mssql extends ADOConnection {
- var $databaseType = "mssql";
+ var $databaseType = "mssql";
var $dataProvider = "mssql";
var $replaceQuote = "''"; // string to use to replace quotes
var $fmtDate = "'Y-m-d'";
- var $fmtTimeStamp = "'Y-m-d H:i:s'";
+ var $fmtTimeStamp = "'Y-m-d\TH:i:s'";
var $hasInsertID = true;
var $substr = "substring";
var $length = 'len';
@@ -83,9 +86,9 @@ 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;
@@ -99,58 +102,100 @@ 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()
- {
+ var $forceNewConnect = false;
+
+ function __construct()
+ {
$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
}
function ServerInfo()
{
global $ADODB_FETCH_MODE;
-
- $stmt = $this->PrepareSP('sp_server_info');
- $val = 2;
+
+
if ($this->fetchMode === false) {
$savem = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
- } else
+ } 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()
{
// 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",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) {
+ return "'".str_replace("'",$this->replaceQuote,$s)."'";
+ }
+
+ // undo magic quotes for " unless sybase is on
+ $sybase = ini_get('magic_quotes_sybase');
+ if (!$sybase) {
+ $s = str_replace('\\"','"',$s);
+ if ($this->replaceQuote == "\\'") // ' already quoted, no need to change anything
+ return "'$s'";
+ else {// change \' to '' for sybase/mssql
+ $s = str_replace('\\\\','\\',$s);
+ return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+ }
+ } else {
+ return "'".$s."'";
+ }
}
+// moodle change end - see readme_moodle.txt
function _affectedrows()
{
@@ -158,10 +203,10 @@ class ADODB_mssql extends ADOConnection {
}
var $_dropSeqSQL = "drop table %s";
-
+
function CreateSequence($seq='adodbseq',$start=1)
{
-
+
$this->Execute('BEGIN TRANSACTION adodbseq');
$start -= 1;
$this->Execute("create table $seq (id float(53))");
@@ -170,7 +215,7 @@ class ADODB_mssql extends ADOConnection {
$this->Execute('ROLLBACK TRANSACTION adodbseq');
return false;
}
- $this->Execute('COMMIT TRANSACTION adodbseq');
+ $this->Execute('COMMIT TRANSACTION adodbseq');
return true;
}
@@ -186,37 +231,41 @@ class ADODB_mssql extends ADOConnection {
$this->Execute('ROLLBACK TRANSACTION adodbseq');
return false;
}
- $this->Execute('COMMIT TRANSACTION adodbseq');
+ $this->Execute('COMMIT TRANSACTION adodbseq');
return $start;
}
$num = $this->GetOne("select id from $seq");
- $this->Execute('COMMIT TRANSACTION adodbseq');
+ $this->Execute('COMMIT TRANSACTION adodbseq');
return $num;
-
+
// in old implementation, pre 1.90, we returned GUID...
//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
}
-
- function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+
+ function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
{
if ($nrows > 0 && $offset <= 0) {
$sql = preg_replace(
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
- $rs =& $this->Execute($sql,$inputarr);
+
+ 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 +292,11 @@ class ADODB_mssql extends ADOConnection {
case 'h':
$s .= "substring(convert(char(14),$col,0),13,2)";
break;
-
+
case 'H':
$s .= "replace(str(datepart(hh,$col),2),' ','0')";
break;
-
+
case 'i':
$s .= "replace(str(datepart(mi,$col),2),' ','0')";
break;
@@ -258,7 +307,7 @@ class ADODB_mssql extends ADOConnection {
case 'A':
$s .= "substring(convert(char(19),$col,0),18,2)";
break;
-
+
default:
if ($ch == '\\') {
$i++;
@@ -271,32 +320,32 @@ class ADODB_mssql extends ADOConnection {
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,35 +355,94 @@ class ADODB_mssql extends ADOConnection {
if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
$this->Execute("SET TRANSACTION ".$transaction_mode);
}
-
+
/*
Usage:
-
+
$this->BeginTrans();
$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
-
+
# some operation on both tables table1 and table2
-
+
$this->CommitTrans();
-
+
See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
*/
- function RowLock($tables,$where,$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";
@@ -345,7 +453,7 @@ class ADODB_mssql extends ADOConnection {
if ($this->fetchMode !== FALSE) {
$savem = $this->SetFetchMode(FALSE);
}
-
+
$rs = $this->Execute($sql);
if (isset($savem)) {
$this->SetFetchMode($savem);
@@ -358,23 +466,23 @@ class ADODB_mssql extends ADOConnection {
$indexes = array();
while ($row = $rs->FetchRow()) {
- if (!$primary && $row[5]) continue;
-
+ 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,
@@ -382,20 +490,20 @@ class ADODB_mssql extends ADOConnection {
from sysforeignkeys
where upper(object_name(fkeyid)) = $table
order by constraint_name, referenced_table_name, keyno";
-
- $constraints =& $this->GetArray($sql);
-
+
+ $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);
@@ -406,88 +514,88 @@ order by constraint_name, referenced_table_name, keyno";
}
//From: Fernando Moreira <FMoreira@imediata.pt>
- 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" <basma@accelero.no>
// 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)) {
@@ -500,34 +608,39 @@ order by constraint_name, referenced_table_name, keyno";
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);
+ $this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword,$newconnect);
if ($this->_connectionID === false) return false;
if ($argDatabasename) return $this->SelectDB($argDatabasename);
- return true;
+ return true;
}
-
-
+
+
// returns true or false
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
if (!function_exists('mssql_pconnect')) return null;
$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
if ($this->_connectionID === false) return false;
-
+
// persistent connections can forget to rollback on crash, so we do it here.
if ($this->autoRollback) {
$cnt = $this->GetOne('select @@TRANCOUNT');
- while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN');
+ while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN');
}
if ($argDatabasename) return $this->SelectDB($argDatabasename);
- return true;
+ return true;
}
-
+
+ function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+ {
+ return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
+ }
+
function Prepare($sql)
{
$sqlarr = explode('?',$sql);
@@ -535,11 +648,11 @@ order by constraint_name, referenced_table_name, keyno";
$sql2 = $sqlarr[0];
for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
$sql2 .= '@P'.($i-1) . $sqlarr[$i];
- }
- return array($sql,$this->qstr($sql2),$max);
+ }
+ 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");
@@ -549,7 +662,7 @@ order by constraint_name, referenced_table_name, keyno";
if (!$stmt) return $sql;
return array($sql,$stmt);
}
-
+
// returns concatenated string
// MSSQL requires integers to be cast as strings
// automatically cast every datatype to VARCHAR(255)
@@ -570,26 +683,26 @@ order by constraint_name, referenced_table_name, keyno";
array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
$s = implode('+',$arr);
if (sizeof($arr) > 0) return "$s";
-
+
return '';
}
-
- /*
+
+ /*
Usage:
$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
-
+
# note that the parameter does not have @ in front!
$db->Parameter($stmt,$id,'myid');
$db->Parameter($stmt,$group,'group',false,64);
$db->Execute($stmt);
-
+
@param $stmt Statement returned by Prepare() or PrepareSP().
@param $var PHP variable to bind to. Can set to null (for isNull support).
@param $name Name of stored procedure variable name to bind to.
@param [$isOutput] Indicates direction of parameter 0/false=IN 1=OUT 2= IN/OUT. This is ignored in oci8.
@param [$maxLen] Holds an maximum length of the variable.
@param [$type] The data type of $var. Legal values depend on driver.
-
+
See mssql_bind documentation at php.net.
*/
function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
@@ -600,16 +713,16 @@ order by constraint_name, referenced_table_name, keyno";
}
$isNull = is_null($var); // php 4.0.4 and above...
-
- if ($type === false)
+
+ if ($type === false)
switch(gettype($var)) {
default:
- case 'string': $type = 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;
@@ -617,32 +730,32 @@ order by constraint_name, referenced_table_name, keyno";
}
/*
See http://phplens.com/lens/lensforum/msgs.php?id=7231
-
+
RETVAL is HARD CODED into php_mssql extension:
- The return value (a long integer value) is treated like a special OUTPUT parameter,
- called "RETVAL" (without the @). See the example at mssql_execute to
- see how it works. - type: one of this new supported PHP constants.
- SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8
+ The return value (a long integer value) is treated like a special OUTPUT parameter,
+ called "RETVAL" (without the @). See the example at mssql_execute to
+ see how it works. - type: one of this new supported PHP constants.
+ SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8
*/
if ($name !== 'RETVAL') $name = '@'.$name;
return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen);
}
-
- /*
+
+ /*
Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
So all your blobs must be of type "image".
-
+
Remember to set in php.ini the following...
-
- ; Valid range 0 - 2147483647. Default = 4096.
- mssql.textlimit = 0 ; zero to pass through
- ; Valid range 0 - 2147483647. Default = 4096.
- mssql.textsize = 0 ; zero to pass through
+ ; Valid range 0 - 2147483647. Default = 4096.
+ mssql.textlimit = 0 ; zero to pass through
+
+ ; Valid range 0 - 2147483647. Default = 4096.
+ mssql.textsize = 0 ; zero to pass through
*/
function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
{
-
+
if (strtoupper($blobtype) == 'CLOB') {
$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
return $this->Execute($sql) != false;
@@ -650,16 +763,21 @@ order by constraint_name, referenced_table_name, keyno";
$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
return $this->Execute($sql) != false;
}
-
+
// returns query ID if successful, otherwise false
- function _query($sql,$inputarr)
+ 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 +786,11 @@ order by constraint_name, referenced_table_name, keyno";
if ($decl) {
$decl .= ', ';
$params .= ', ';
- }
+ }
if (is_string($v)) {
$len = strlen($v);
if ($len == 0) $len = 1;
-
+
if ($len > 4000 ) {
// NVARCHAR is max 4000 chars. Let's use NTEXT
$decl .= "@P$i NTEXT";
@@ -698,72 +816,79 @@ order by constraint_name, referenced_table_name, keyno";
}
$decl = $this->qstr($decl);
if ($this->debug) ADOConnection::outp("<font size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
- $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);
$this->_connectionID = false;
return $rez;
}
-
+
// mssql uses a default date like Dec 30 2000 12:00AM
- function UnixDate($v)
+ static function UnixDate($v)
{
return ADORecordSet_array_mssql::UnixDate($v);
}
-
- function UnixTimeStamp($v)
+
+ static function UnixTimeStamp($v)
{
return ADORecordSet_array_mssql::UnixTimeStamp($v);
- }
+ }
}
-
+
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
-class ADORecordset_mssql extends ADORecordSet {
+class ADORecordset_mssql extends ADORecordSet {
var $databaseType = "mssql";
var $canSeek = true;
var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083
// _mths works only in non-localised system
-
- function ADORecordset_mssql($id,$mode=false)
+
+ 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,$mode);
}
-
-
+
+
function _initrs()
{
- GLOBAL $ADODB_COUNTRECS;
+ GLOBAL $ADODB_COUNTRECS;
$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
$this->_numOfFields = @mssql_num_fields($this->_queryID);
}
-
+
//Contributed by "Sven Axelsson" <sven.axelsson@bokochwebb.se>
// get next resultset - requires PHP 4.0.5 or later
@@ -788,16 +913,16 @@ class ADORecordset_mssql extends ADORecordSet {
$this->bind[strtoupper($o->name)] = $i;
}
}
-
+
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
- /* Returns: an object containing field information.
+
+ /* Returns: an object containing field information.
Get column information in the Recordset object. fetchField() can be used in order to obtain information about
fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
fetchField() is retrieved. */
- function &FetchField($fieldOffset = -1)
+ function FetchField($fieldOffset = -1)
{
if ($fieldOffset != -1) {
$f = @mssql_fetch_field($this->_queryID, $fieldOffset);
@@ -809,19 +934,19 @@ class ADORecordset_mssql extends ADORecordSet {
if (empty($f)) return $false;
return $f;
}
-
- function _seek($row)
+
+ function _seek($row)
{
return @mssql_data_seek($this->_queryID, $row);
}
// speedup
- function MoveNext()
+ function MoveNext()
{
if ($this->EOF) return false;
-
+
$this->_currentRow++;
-
+
if ($this->fetchMode & ADODB_FETCH_ASSOC) {
if ($this->fetchMode & ADODB_FETCH_NUM) {
//ADODB_FETCH_BOTH mode
@@ -843,15 +968,23 @@ class ADORecordset_mssql extends ADORecordSet {
$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 +993,14 @@ class ADORecordset_mssql extends ADORecordSet {
}
if ($this->fields) return true;
$this->EOF = true;
-
+
return false;
}
-
+
// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
- function _fetch($ignore_fields=false)
+ function _fetch($ignore_fields=false)
{
if ($this->fetchMode & ADODB_FETCH_ASSOC) {
if ($this->fetchMode & ADODB_FETCH_NUM) {
@@ -888,15 +1021,23 @@ class ADORecordset_mssql extends ADORecordSet {
}
}
}
-
+
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,51 +1045,55 @@ class ADORecordset_mssql extends ADORecordSet {
}
return $this->fields;
}
-
+
/* close() only needs to be called if you are worried about using too much memory while your script
is running. All associated result memory for the specified result identifier will automatically be freed. */
- function _close()
+ function _close()
{
- $rez = mssql_free_result($this->_queryID);
- $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)
+ static function UnixDate($v)
{
return ADORecordSet_array_mssql::UnixDate($v);
}
-
- function UnixTimeStamp($v)
+
+ static function UnixTimeStamp($v)
{
return ADORecordSet_array_mssql::UnixTimeStamp($v);
}
-
+
}
class ADORecordSet_array_mssql extends ADORecordSet_array {
- function ADORecordSet_array_mssql($id=-1,$mode=false)
+ function __construct($id=-1,$mode=false)
{
- $this->ADORecordSet_array($id,$mode);
+ parent::__construct($id,$mode);
}
-
+
// mssql uses a default date like Dec 30 2000 12:00AM
- function UnixDate($v)
+ static function UnixDate($v)
{
-
+
if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-
+
global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-
- //Dec 30 2000 12:00AM
+
+ //Dec 30 2000 12:00AM
if ($ADODB_mssql_date_order == 'dmy') {
if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
return parent::UnixDate($v);
}
if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-
+
$theday = $rr[1];
$themth = substr(strtoupper($rr[2]),0,3);
} else {
@@ -956,7 +1101,7 @@ class ADORecordSet_array_mssql extends ADORecordSet_array {
return parent::UnixDate($v);
}
if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-
+
$theday = $rr[2];
$themth = substr(strtoupper($rr[1]),0,3);
}
@@ -965,34 +1110,34 @@ class ADORecordSet_array_mssql extends ADORecordSet_array {
// h-m-s-MM-DD-YY
return mktime(0,0,0,$themth,$theday,$rr[3]);
}
-
- function UnixTimeStamp($v)
+
+ static function UnixTimeStamp($v)
{
-
+
if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-
+
global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-
+
//Dec 30 2000 12:00AM
if ($ADODB_mssql_date_order == 'dmy') {
if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
,$v, $rr)) return parent::UnixTimeStamp($v);
if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-
+
$theday = $rr[1];
$themth = substr(strtoupper($rr[2]),0,3);
} else {
if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
,$v, $rr)) return parent::UnixTimeStamp($v);
if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-
+
$theday = $rr[2];
$themth = substr(strtoupper($rr[1]),0,3);
}
-
+
$themth = $ADODB_mssql_mths[$themth];
if ($themth <= 0) return false;
-
+
switch (strtoupper($rr[6])) {
case 'P':
if ($rr[4]<12) $rr[4] += 12;
@@ -1012,7 +1157,7 @@ class ADORecordSet_array_mssql extends ADORecordSet_array {
Code Example 1:
select object_name(constid) as constraint_name,
- object_name(fkeyid) as table_name,
+ object_name(fkeyid) as table_name,
col_name(fkeyid, fkey) as column_name,
object_name(rkeyid) as referenced_table_name,
col_name(rkeyid, rkey) as referenced_column_name
@@ -1031,5 +1176,3 @@ order by constraint_name, ordinal_position
http://www.databasejournal.com/scripts/article.php/1440551
*/
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-mssql_n.inc.php b/libraries/adodb/drivers/adodb-mssql_n.inc.php
new file mode 100644
index 000000000..2bbac5b28
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-mssql_n.inc.php
@@ -0,0 +1,249 @@
+<?php
+
+/// $Id $
+
+///////////////////////////////////////////////////////////////////////////
+// //
+// NOTICE OF COPYRIGHT //
+// //
+// ADOdb - Database Abstraction Library for PHP //
+// http://adodb.sourceforge.net/ //
+// //
+// Copyright (c) 2000-2014 John Lim (jlim\@natsoft.com.my) //
+// All rights reserved. //
+// Released under both BSD license and LGPL library license. //
+// Whenever there is any discrepancy between the two licenses, //
+// the BSD license will take precedence //
+// //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment //
+// http://moodle.com //
+// //
+// Copyright (C) 2001-3001 Martin Dougiamas http://dougiamas.com //
+// (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details: //
+// //
+// http://www.gnu.org/copyleft/gpl.html //
+// //
+///////////////////////////////////////////////////////////////////////////
+
+/**
+* MSSQL Driver with auto-prepended "N" for correct unicode storage
+* of SQL literal strings. Intended to be used with MSSQL drivers that
+* are sending UCS-2 data to MSSQL (FreeTDS and ODBTP) in order to get
+* true cross-db compatibility from the application point of view.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+// one useful constant
+if (!defined('SINGLEQUOTE')) define('SINGLEQUOTE', "'");
+
+include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
+
+class ADODB_mssql_n extends ADODB_mssql {
+ var $databaseType = "mssql_n";
+
+ function _query($sql,$inputarr=false)
+ {
+ $sql = $this->_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 orginal 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";
+ function __construct($id,$mode=false)
+ {
+ parent::__construct($id,$mode);
+ }
+}
diff --git a/libraries/adodb/drivers/adodb-mssqlnative.inc.php b/libraries/adodb/drivers/adodb-mssqlnative.inc.php
new file mode 100644
index 000000000..23eb2c03d
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-mssqlnative.inc.php
@@ -0,0 +1,1197 @@
+<?php
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Native mssql driver. Requires mssql client. Works on Windows.
+ http://www.microsoft.com/sql/technologies/php/default.mspx
+ To configure for Unix, see
+ http://phpbuilder.com/columns/alberto20000919.php3
+
+ $stream = sqlsrv_get_field($stmt, $index, SQLSRV_SQLTYPE_STREAM(SQLSRV_ENC_BINARY));
+ stream_filter_append($stream, "convert.iconv.ucs-2/utf-8"); // Voila, UTF-8 can be read directly from $stream
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!function_exists('sqlsrv_configure')) {
+ die("mssqlnative extension not installed");
+}
+
+if (!function_exists('sqlsrv_set_error_handling')) {
+ function sqlsrv_set_error_handling($constant) {
+ sqlsrv_configure("WarningsReturnAsErrors", $constant);
+ }
+}
+if (!function_exists('sqlsrv_log_set_severity')) {
+ function sqlsrv_log_set_severity($constant) {
+ sqlsrv_configure("LogSeverity", $constant);
+ }
+}
+if (!function_exists('sqlsrv_log_set_subsystems')) {
+ function sqlsrv_log_set_subsystems($constant) {
+ sqlsrv_configure("LogSubsystems", $constant);
+ }
+}
+
+
+//----------------------------------------------------------------
+// MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
+// and this causes tons of problems because localized versions of
+// MSSQL will return the dates in dmy or mdy order; and also the
+// month strings depends on what language has been configured. The
+// following two variables allow you to control the localization
+// settings - Ugh.
+//
+// MORE LOCALIZATION INFO
+// ----------------------
+// To configure datetime, look for and modify sqlcommn.loc,
+// typically found in c:\mssql\install
+// Also read :
+// http://support.microsoft.com/default.aspx?scid=kb;EN-US;q220918
+// Alternatively use:
+// CONVERT(char(12),datecol,120)
+//
+// Also if your month is showing as month-1,
+// e.g. Jan 13, 2002 is showing as 13/0/2002, then see
+// http://phplens.com/lens/lensforum/msgs.php?id=7048&x=1
+// it's a localisation problem.
+//----------------------------------------------------------------
+
+
+// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
+if (ADODB_PHPVER >= 0x4300) {
+// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
+ ini_set('mssql.datetimeconvert',0);
+} else {
+ global $ADODB_mssql_mths; // array, months must be upper-case
+ $ADODB_mssql_date_order = 'mdy';
+ $ADODB_mssql_mths = array(
+ 'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
+ 'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+}
+
+class ADODB_mssqlnative extends ADOConnection {
+ var $databaseType = "mssqlnative";
+ var $dataProvider = "mssqlnative";
+ var $replaceQuote = "''"; // string to use to replace quotes
+ var $fmtDate = "'Y-m-d'";
+ var $fmtTimeStamp = "'Y-m-d\TH:i:s'";
+ var $hasInsertID = true;
+ var $substr = "substring";
+ var $length = 'len';
+ var $hasAffectedRows = true;
+ var $poorAffectedRows = false;
+ var $metaDatabasesSQL = "select name from sys.sysdatabases where name <> 'master'";
+ var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
+ var $metaColumnsSQL =
+ "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();
+ var $cachedSchemaFlush = false;
+ var $sequences = false;
+ var $mssql_version = '';
+
+ function __construct()
+ {
+ if ($this->debug) {
+ ADOConnection::outp("<pre>");
+ 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
+ }
+
+ function _insertid()
+ {
+ // SCOPE_IDENTITY()
+ // Returns the last IDENTITY value inserted into an IDENTITY column in
+ // the same scope. A scope is a module -- a stored procedure, trigger,
+ // function, or batch. Thus, two statements are in the same scope if
+ // they are in the same stored procedure, function, or batch.
+ return $this->lastInsertID;
+ }
+
+ function _affectedrows()
+ {
+ if ($this->_queryID)
+ return sqlsrv_rows_affected($this->_queryID);
+ }
+
+ function GenID($seq='adodbseq',$start=1) {
+ if (!$this->mssql_version)
+ $this->ServerVersion();
+ switch($this->mssql_version){
+ case 9:
+ case 10:
+ return $this->GenID2008($seq, $start);
+ break;
+ default:
+ return $this->GenID2012($seq, $start);
+ break;
+ }
+ }
+
+ function CreateSequence($seq='adodbseq',$start=1)
+ {
+ if (!$this->mssql_version)
+ $this->ServerVersion();
+
+ 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("<hr>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("<hr>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("<hr>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("<hr>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 = '';
+
+ $len = strlen($fmt);
+ for ($i=0; $i < $len; $i++) {
+ if ($s) $s .= '+';
+ $ch = $fmt[$i];
+ switch($ch) {
+ case 'Y':
+ case 'y':
+ $s .= "datename(yyyy,$col)";
+ break;
+ case 'M':
+ $s .= "convert(char(3),$col,0)";
+ break;
+ case 'm':
+ $s .= "replace(str(month($col),2),' ','0')";
+ break;
+ case 'Q':
+ case 'q':
+ $s .= "datename(quarter,$col)";
+ break;
+ case 'D':
+ case 'd':
+ $s .= "replace(str(day($col),2),' ','0')";
+ break;
+ case 'h':
+ $s .= "substring(convert(char(14),$col,0),13,2)";
+ break;
+
+ case 'H':
+ $s .= "replace(str(datepart(hh,$col),2),' ','0')";
+ break;
+
+ case 'i':
+ $s .= "replace(str(datepart(mi,$col),2),' ','0')";
+ break;
+ case 's':
+ $s .= "replace(str(datepart(ss,$col),2),' ','0')";
+ break;
+ case 'a':
+ case 'A':
+ $s .= "substring(convert(char(19),$col,0),18,2)";
+ break;
+
+ default:
+ if ($ch == '\\') {
+ $i++;
+ $ch = substr($fmt,$i,1);
+ }
+ $s .= $this->qstr($ch);
+ break;
+ }
+ }
+ return $s;
+ }
+
+
+ function BeginTrans()
+ {
+ if ($this->transOff) return true;
+ $this->transCnt += 1;
+ if ($this->debug) ADOConnection::outp('<hr>begin transaction');
+ sqlsrv_begin_transaction($this->_connectionID);
+ return true;
+ }
+
+ function CommitTrans($ok=true)
+ {
+ if ($this->transOff) return true;
+ if ($this->debug) ADOConnection::outp('<hr>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('<hr>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";
+ }
+ } else {
+ $this->_errorMsg = "No errors found";
+ }
+ return $this->_errorMsg;
+ }
+
+ function ErrorNo()
+ {
+ $err = sqlsrv_errors(SQLSRV_ERR_ALL);
+ if($err[0]) return $err[0]['code'];
+ else return 0;
+ }
+
+ // returns true or false
+ function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+ {
+ if (!function_exists('sqlsrv_connect')) return null;
+ $connectionInfo = $this->connectionInfo;
+ $connectionInfo["Database"]=$argDatabasename;
+ $connectionInfo["UID"]=$argUsername;
+ $connectionInfo["PWD"]=$argPassword;
+
+ foreach ($this->connectionParameters as $parameter=>$value)
+ $connectionInfo[$parameter] = $value;
+
+ if ($this->debug) ADOConnection::outp("<hr>connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
+ //if ($this->debug) ADOConnection::outp("<hr>_connectionID before: ".serialize($this->_connectionID));
+ if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) {
+ if ($this->debug) ADOConnection::outp( "<hr><b>errors</b>: ".print_r( sqlsrv_errors(), true));
+ return false;
+ }
+ //if ($this->debug) ADOConnection::outp(" _connectionID after: ".serialize($this->_connectionID));
+ //if ($this->debug) ADOConnection::outp("<hr>defined functions: <pre>".var_export(get_defined_functions(),true)."</pre>");
+ 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!
+
+ $stmt = sqlsrv_prepare( $this->_connectionID, $sql);
+ if (!$stmt) return $sql;
+ return array($sql,$stmt);
+ }
+
+ // returns concatenated string
+ // MSSQL requires integers to be cast as strings
+ // automatically cast every datatype to VARCHAR(255)
+ // @author David Rogers (introspectshun)
+ function Concat()
+ {
+ $s = "";
+ $arr = func_get_args();
+
+ // Split single record on commas, if possible
+ if (sizeof($arr) == 1) {
+ foreach ($arr as $arg) {
+ $args = explode(',', $arg);
+ }
+ $arr = $args;
+ }
+
+ array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
+ $s = implode('+',$arr);
+ if (sizeof($arr) > 0) return "$s";
+
+ return '';
+ }
+
+ /*
+ Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
+ So all your blobs must be of type "image".
+
+ Remember to set in php.ini the following...
+
+ ; Valid range 0 - 2147483647. Default = 4096.
+ mssql.textlimit = 0 ; zero to pass through
+
+ ; Valid range 0 - 2147483647. Default = 4096.
+ mssql.textsize = 0 ; zero to pass through
+ */
+ 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;
+ }
+
+ // returns query ID if successful, otherwise false
+ function _query($sql,$inputarr=false)
+ {
+ $this->_errorMsg = false;
+
+ if (is_array($sql)) $sql = $sql[1];
+
+ $insert = false;
+ // handle native driver flaw for retrieving the last insert ID
+ if(preg_match('/^\W*insert[\s\w()",.]+values\s*\((?:[^;\']|\'\'|(?:(?:\'\')*\'[^\']+\'(?:\'\')*))*;?$/i', $sql)) {
+ $insert = true;
+ $sql .= '; '.$this->identitySQL; // select scope_identity()
+ }
+ if($inputarr) {
+ $rez = sqlsrv_query($this->_connectionID, $sql, $inputarr);
+ } else {
+ $rez = sqlsrv_query($this->_connectionID,$sql);
+ }
+
+ if ($this->debug) ADOConnection::outp("<hr>running query: ".var_export($sql,true)."<hr>input array: ".var_export($inputarr,true)."<hr>result: ".var_export($rez,true));
+
+ if(!$rez) {
+ $rez = false;
+ } else if ($insert) {
+ // retrieve the last insert ID (where applicable)
+ while ( sqlsrv_next_result($rez) ) {
+ sqlsrv_fetch($rez);
+ $this->lastInsertID = sqlsrv_get_field($rez, 0);
+ }
+ }
+ return $rez;
+ }
+
+ // returns true or false
+ function _close()
+ {
+ if ($this->transCnt) $this->RollbackTrans();
+ $rez = @sqlsrv_close($this->_connectionID);
+ $this->_connectionID = false;
+ return $rez;
+ }
+
+ // mssql uses a default date like Dec 30 2000 12:00AM
+ static function UnixDate($v)
+ {
+ return ADORecordSet_array_mssqlnative::UnixDate($v);
+ }
+
+ static function UnixTimeStamp($v)
+ {
+ return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
+ }
+
+ function MetaIndexes($table,$primary=false, $owner = false)
+ {
+ $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);
+ $arr2[$a] = $b;
+ }
+ }
+ return $arr2;
+ }
+
+ //From: Fernando Moreira <FMoreira@imediata.pt>
+ function MetaDatabases()
+ {
+ $this->SelectDB("master");
+ $rs =& $this->Execute($this->metaDatabasesSQL);
+ $rows = $rs->GetRows();
+ $ret = array();
+ for($i=0;$i<count($rows);$i++) {
+ $ret[] = $rows[$i][0];
+ }
+ $this->SelectDB($this->database);
+ if($ret)
+ return $ret;
+ else
+ return false;
+ }
+
+ // "Stein-Aksel Basma" <basma@accelero.no>
+ // 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){
+
+ # start adg
+ static $cached_columns = array();
+ if ($this->cachedSchemaFlush)
+ $cached_columns = array();
+
+ if (array_key_exists($table,$cached_columns)){
+ return $cached_columns[$table];
+ }
+ # end adg
+
+ if (!$this->mssql_version)
+ $this->ServerVersion();
+
+ $this->_findschema($table,$schema);
+ if ($schema) {
+ $dbName = $this->database;
+ $this->SelectDB($schema);
+ }
+ global $ADODB_FETCH_MODE;
+ $save = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+ if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+ $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+
+ if ($schema) {
+ $this->SelectDB($dbName);
+ }
+
+ if (isset($savem)) $this->SetFetchMode($savem);
+ $ADODB_FETCH_MODE = $save;
+ if (!is_object($rs)) {
+ $false = false;
+ return $false;
+ }
+
+ $retarr = array();
+ while (!$rs->EOF){
+
+ $fld = new ADOFieldObject();
+ if (array_key_exists(0,$rs->fields)) {
+ $fld->name = $rs->fields[0];
+ $fld->type = $rs->fields[1];
+ $fld->max_length = $rs->fields[2];
+ $fld->precision = $rs->fields[3];
+ $fld->scale = $rs->fields[4];
+ $fld->not_null =!$rs->fields[5];
+ $fld->has_default = $rs->fields[6];
+ $fld->xtype = $rs->fields[7];
+ $fld->type_length = $rs->fields[8];
+ $fld->auto_increment= $rs->fields[9];
+ } else {
+ $fld->name = $rs->fields['name'];
+ $fld->type = $rs->fields['type'];
+ $fld->max_length = $rs->fields['length'];
+ $fld->precision = $rs->fields['precision'];
+ $fld->scale = $rs->fields['scale'];
+ $fld->not_null =!$rs->fields['nullable'];
+ $fld->has_default = $rs->fields['default_value'];
+ $fld->xtype = $rs->fields['xtype'];
+ $fld->type_length = $rs->fields['type_length'];
+ $fld->auto_increment= $rs->fields['is_identity'];
+ }
+
+ if ($save == ADODB_FETCH_NUM)
+ $retarr[] = $fld;
+ else
+ $retarr[strtoupper($fld->name)] = $fld;
+
+ $rs->MoveNext();
+
+ }
+ $rs->Close();
+ # start adg
+ $cached_columns[$table] = $retarr;
+ # end adg
+ return $retarr;
+ }
+
+}
+
+/*--------------------------------------------------------------------------------------
+ Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_mssqlnative extends ADORecordSet {
+
+ var $databaseType = "mssqlnative";
+ var $canSeek = false;
+ var $fieldOffset = 0;
+ // _mths works only in non-localised system
+
+ function __construct($id,$mode=false)
+ {
+ if ($mode === false) {
+ global $ADODB_FETCH_MODE;
+ $mode = $ADODB_FETCH_MODE;
+
+ }
+ $this->fetchMode = $mode;
+ return parent::__construct($id,$mode);
+ }
+
+
+ function _initrs()
+ {
+ global $ADODB_COUNTRECS;
+ # KMN # if ($this->connection->debug) ADOConnection::outp("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+ /*$retRowsAff = sqlsrv_rows_affected($this->_queryID);//"If you need to determine the number of rows a query will return before retrieving the actual results, appending a SELECT COUNT ... query would let you get that information, and then a call to next_result would move you to the "real" results."
+ ADOConnection::outp("rowsaff: ".serialize($retRowsAff));
+ $this->_numOfRows = ($ADODB_COUNTRECS)? $retRowsAff:-1;*/
+ $this->_numOfRows = -1;//not supported
+ $fieldmeta = sqlsrv_field_metadata($this->_queryID);
+ $this->_numOfFields = ($fieldmeta)? count($fieldmeta):-1;
+ # KMN # if ($this->connection->debug) ADOConnection::outp("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+ /*
+ * Copy the oracle method and cache the metadata at init time
+ */
+ if ($this->_numOfFields>0) {
+ $this->_fieldobjs = array();
+ $max = $this->_numOfFields;
+ for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
+ }
+
+ }
+
+
+ //Contributed by "Sven Axelsson" <sven.axelsson@bokochwebb.se>
+ // 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 ($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.
+ Designed By jcortinap#jc.com.mx
+ */
+ function _FetchField($fieldOffset = -1)
+ {
+ $_typeConversion = array(
+ -155 => 'datetimeoffset',
+ -154 => 'time',
+ -152 => 'xml',
+ -151 => 'udt',
+ -11 => 'uniqueidentifier',
+ -10 => 'ntext',
+ -9 => 'nvarchar',
+ -8 => 'nchar',
+ -7 => 'bit',
+ -6 => 'tinyint',
+ -5 => 'bigint',
+ -4 => 'image',
+ -3 => 'varbinary',
+ -2 => 'timestamp',
+ -1 => 'text',
+ 1 => 'char',
+ 2 => 'numeric',
+ 3 => 'decimal',
+ 4 => 'int',
+ 5 => 'smallint',
+ 6 => 'float',
+ 7 => 'real',
+ 12 => 'varchar',
+ 91 => 'date',
+ 93 => 'datetime'
+ );
+
+ $fa = @sqlsrv_field_metadata($this->_queryID);
+ if ($fieldOffset != -1) {
+ $fa = $fa[$fieldOffset];
+ }
+ $false = false;
+ if (empty($fa)) {
+ $f = false;//PHP Notice: Only variable references should be returned by reference
+ }
+ else
+ {
+ // Convert to an object
+ $fa = array_change_key_case($fa, CASE_LOWER);
+ $fb = array();
+ if ($fieldOffset != -1)
+ {
+ $fb = array(
+ 'name' => $fa['name'],
+ 'max_length' => $fa['size'],
+ 'column_source' => $fa['name'],
+ 'type' => $_typeConversion[$fa['type']]
+ );
+ }
+ else
+ {
+ foreach ($fa as $key => $value)
+ {
+ $fb[] = array(
+ 'name' => $value['name'],
+ 'max_length' => $value['size'],
+ 'column_source' => $value['name'],
+ 'type' => $_typeConversion[$value['type']]
+ );
+ }
+ }
+ $f = (object) $fb;
+ }
+ return $f;
+ }
+
+ /*
+ * Fetchfield copies the oracle method, it loads the field information
+ * into the _fieldobjs array once, to save multiple calls to the
+ * sqlsrv_field_metadata function
+ *
+ * @author KM Newnham
+ * @date 02/20/2013
+ */
+ function FetchField($fieldOffset = -1)
+ {
+ return $this->_fieldobjs[$fieldOffset];
+ }
+
+ function _seek($row)
+ {
+ return false;//There is no support for cursors in the driver at this time. All data is returned via forward-only streams.
+ }
+
+ // speedup
+ function MoveNext()
+ {
+ //# KMN # if ($this->connection->debug) ADOConnection::outp("movenext()");
+ //# KMN # if ($this->connection->debug) ADOConnection::outp("eof (beginning): ".$this->EOF);
+ if ($this->EOF) return false;
+
+ $this->_currentRow++;
+ // # KMN # if ($this->connection->debug) ADOConnection::outp("_currentRow: ".$this->_currentRow);
+
+ if ($this->_fetch()) return true;
+ $this->EOF = true;
+ //# KMN # if ($this->connection->debug) ADOConnection::outp("eof (end): ".$this->EOF);
+
+ return false;
+ }
+
+
+ // INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
+ // also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
+ function _fetch($ignore_fields=false)
+ {
+ # KMN # if ($this->connection->debug) ADOConnection::outp("_fetch()");
+ if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+ if ($this->fetchMode & ADODB_FETCH_NUM) {
+ //# KMN # if ($this->connection->debug) ADOConnection::outp("fetch mode: both");
+ $this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_BOTH);
+ } else {
+ //# KMN # if ($this->connection->debug) ADOConnection::outp("fetch mode: assoc");
+ $this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
+ }
+
+ if (is_array($this->fields)) {
+ if (ADODB_ASSOC_CASE == 0) {
+ foreach($this->fields as $k=>$v) {
+ $this->fields[strtolower($k)] = $v;
+ }
+ } else if (ADODB_ASSOC_CASE == 1) {
+ foreach($this->fields as $k=>$v) {
+ $this->fields[strtoupper($k)] = $v;
+ }
+ }
+ }
+ } else {
+ //# KMN # if ($this->connection->debug) ADOConnection::outp("fetch mode: num");
+ $this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_NUMERIC);
+ }
+ if(is_array($this->fields) && array_key_exists(1,$this->fields) && !array_key_exists(0,$this->fields)) {//fix fetch numeric keys since they're not 0 based
+ $arrFixed = array();
+ foreach($this->fields as $key=>$value) {
+ if(is_numeric($key)) {
+ $arrFixed[$key-1] = $value;
+ } else {
+ $arrFixed[$key] = $value;
+ }
+ }
+ //if($this->connection->debug) ADOConnection::outp("<hr>fixing non 0 based return array, old: ".print_r($this->fields,true)." new: ".print_r($arrFixed,true));
+ $this->fields = $arrFixed;
+ }
+ if(is_array($this->fields)) {
+ foreach($this->fields as $key=>$value) {
+ if (is_object($value) && method_exists($value, 'format')) {//is DateTime object
+ $this->fields[$key] = $value->format("Y-m-d\TH:i:s\Z");
+ }
+ }
+ }
+ if($this->fields === null) $this->fields = false;
+ # KMN # if ($this->connection->debug) ADOConnection::outp("<hr>after _fetch, fields: <pre>".print_r($this->fields,true)." backtrace: ".adodb_backtrace(false));
+ return $this->fields;
+ }
+
+ /* close() only needs to be called if you are worried about using too much memory while your script
+ is running. All associated result memory for the specified result identifier will automatically be freed. */
+ function _close()
+ {
+ if(is_object($this->_queryID)) {
+ $rez = sqlsrv_free_stmt($this->_queryID);
+ $this->_queryID = false;
+ return $rez;
+ }
+ return true;
+ }
+
+ // mssql uses a default date like Dec 30 2000 12:00AM
+ static function UnixDate($v)
+ {
+ return ADORecordSet_array_mssqlnative::UnixDate($v);
+ }
+
+ static function UnixTimeStamp($v)
+ {
+ return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
+ }
+}
+
+
+class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
+ function __construct($id=-1,$mode=false)
+ {
+ parent::__construct($id,$mode);
+ }
+
+ // mssql uses a default date like Dec 30 2000 12:00AM
+ static function UnixDate($v)
+ {
+
+ if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
+
+ global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+
+ //Dec 30 2000 12:00AM
+ if ($ADODB_mssql_date_order == 'dmy') {
+ if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+ return parent::UnixDate($v);
+ }
+ if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+
+ $theday = $rr[1];
+ $themth = substr(strtoupper($rr[2]),0,3);
+ } else {
+ if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+ return parent::UnixDate($v);
+ }
+ if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+
+ $theday = $rr[2];
+ $themth = substr(strtoupper($rr[1]),0,3);
+ }
+ $themth = $ADODB_mssql_mths[$themth];
+ if ($themth <= 0) return false;
+ // h-m-s-MM-DD-YY
+ return adodb_mktime(0,0,0,$themth,$theday,$rr[3]);
+ }
+
+ static function UnixTimeStamp($v)
+ {
+
+ if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
+
+ global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+
+ //Dec 30 2000 12:00AM
+ if ($ADODB_mssql_date_order == 'dmy') {
+ if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+ ,$v, $rr)) return parent::UnixTimeStamp($v);
+ if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+
+ $theday = $rr[1];
+ $themth = substr(strtoupper($rr[2]),0,3);
+ } else {
+ if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+ ,$v, $rr)) return parent::UnixTimeStamp($v);
+ if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+
+ $theday = $rr[2];
+ $themth = substr(strtoupper($rr[1]),0,3);
+ }
+
+ $themth = $ADODB_mssql_mths[$themth];
+ if ($themth <= 0) return false;
+
+ switch (strtoupper($rr[6])) {
+ case 'P':
+ if ($rr[4]<12) $rr[4] += 12;
+ break;
+ case 'A':
+ if ($rr[4]==12) $rr[4] = 0;
+ break;
+ default:
+ break;
+ }
+ // h-m-s-MM-DD-YY
+ return adodb_mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
+ }
+}
+
+/*
+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/libraries/adodb/drivers/adodb-mssqlpo.inc.php b/libraries/adodb/drivers/adodb-mssqlpo.inc.php
index 058dcf710..cd6a2850a 100644
--- a/libraries/adodb/drivers/adodb-mssqlpo.inc.php
+++ b/libraries/adodb/drivers/adodb-mssqlpo.inc.php
@@ -1,6 +1,8 @@
<?php
/**
-* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version v5.20.9 21-Dec-2016
+* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
* Whenever there is any discrepancy between the two licenses,
* the BSD license will take precedence.
@@ -21,19 +23,14 @@ if (!defined('ADODB_DIR')) die();
The big difference between mssqlpo and it's parent mssql is that mssqlpo supports
the more standard || string concatenation operator.
*/
-
+
include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
class ADODB_mssqlpo extends ADODB_mssql {
var $databaseType = "mssqlpo";
- var $concat_operator = '||';
-
- function ADODB_mssqlpo()
- {
- ADODB_mssql::ADODB_mssql();
- }
+ var $concat_operator = '||';
- 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");
@@ -44,8 +41,8 @@ class ADODB_mssqlpo extends ADODB_mssql {
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 +51,8 @@ class ADODB_mssqlpo extends ADODB_mssql {
class ADORecordset_mssqlpo extends ADORecordset_mssql {
var $databaseType = "mssqlpo";
- function ADORecordset_mssqlpo($id,$mode=false)
+ function __construct($id,$mode=false)
{
- $this->ADORecordset_mssql($id,$mode);
+ parent::__construct($id,$mode);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-mysql.inc.php b/libraries/adodb/drivers/adodb-mysql.inc.php
index 7524a76a5..2d999c6bc 100644
--- a/libraries/adodb/drivers/adodb-mysql.inc.php
+++ b/libraries/adodb/drivers/adodb-mysql.inc.php
@@ -1,30 +1,40 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
+
+ This driver only supports the original non-transactional MySQL driver. It
+ is deprected 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
- MySQL code that does not support transactions. Use mysqlt if you need transactions.
Requires mysql client. Works on Windows and Unix.
-
+
28 Feb 2001: MetaColumns bug fix - suggested by Freek Dijkstra (phpeverywhere@macfreek.com)
-*/
+*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
if (! defined("_ADODB_MYSQL_LAYER")) {
- define("_ADODB_MYSQL_LAYER", 1 );
+ define("_ADODB_MYSQL_LAYER", 1 );
class ADODB_mysql extends ADOConnection {
var $databaseType = 'mysql';
var $dataProvider = 'mysql';
var $hasInsertID = true;
- var $hasAffectedRows = true;
- var $metaTablesSQL = "SHOW TABLES";
- var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
+ var $hasAffectedRows = true;
+ var $metaTablesSQL = "SELECT
+ TABLE_NAME,
+ CASE WHEN TABLE_TYPE = 'VIEW' THEN 'V' ELSE 'T' END
+ FROM INFORMATION_SCHEMA.TABLES
+ WHERE TABLE_SCHEMA=";
+ var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
var $fmtTimeStamp = "'Y-m-d H:i:s'";
var $hasLimit = true;
var $hasMoveFirst = true;
@@ -36,104 +46,192 @@ class ADODB_mysql extends ADOConnection {
var $forceNewConnect = false;
var $poorAffectedRows = true;
var $clientFlags = 0;
+ var $charSet = '';
var $substr = "substring";
var $nameQuote = '`'; /// string to use to quote identifiers and names
var $compat323 = false; // true if compat with mysql 3.23
-
- function ADODB_mysql()
- {
+
+ function __construct()
+ {
if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
}
-
+
+
+ // SetCharSet - switch the client encoding
+ function SetCharSet($charset_name)
+ {
+ if (!function_exists('mysql_set_charset')) {
+ return false;
+ }
+
+ if ($this->charSet !== $charset_name) {
+ $ok = @mysql_set_charset($charset_name,$this->_connectionID);
+ if ($ok) {
+ $this->charSet = $charset_name;
+ 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;
- }
-
-
+ $save = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ if ($this->fetchMode !== FALSE) {
+ $savem = $this->SetFetchMode(FALSE);
+ }
+
+ // get index details
+ $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
+
+ // restore fetchmode
+ if (isset($savem)) {
+ $this->SetFetchMode($savem);
+ }
+ $ADODB_FETCH_MODE = $save;
+
+ if (!is_object($rs)) {
+ return $false;
+ }
+
+ $indexes = array ();
+
+ // parse index data into array
+ while ($row = $rs->FetchRow()) {
+ if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+ continue;
+ }
+
+ if (!isset($indexes[$row[2]])) {
+ $indexes[$row[2]] = array(
+ 'unique' => ($row[1] == 0),
+ 'columns' => array()
+ );
+ }
+
+ $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
+ }
+
+ // sort columns by order in the index
+ foreach ( array_keys ($indexes) as $index )
+ {
+ ksort ($indexes[$index]['columns']);
+ }
+
+ return $indexes;
+ }
+
+
// if magic quotes disabled, use mysql_real_escape_string()
function qstr($s,$magic_quotes=false)
{
+ if (is_null($s)) return 'NULL';
if (!$magic_quotes) {
-
+
if (ADODB_PHPVER >= 0x4300) {
if (is_resource($this->_connectionID))
return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
@@ -141,27 +239,28 @@ class ADODB_mysql extends ADOConnection {
if ($this->replaceQuote[0] == '\\'){
$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
}
- return "'".str_replace("'",$this->replaceQuote,$s)."'";
+ return "'".str_replace("'",$this->replaceQuote,$s)."'";
}
-
+
// undo magic quotes for "
$s = str_replace('\\"','"',$s);
return "'$s'";
}
-
+
function _insertid()
{
return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
//return mysql_insert_id($this->_connectionID);
}
-
+
function GetOne($sql,$inputarr=false)
{
+ global $ADODB_GETONE_EOF;
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 +268,41 @@ class ADODB_mysql extends ADOConnection {
}
return false;
}
-
+
function BeginTrans()
{
if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
}
-
+
function _affectedrows()
{
return mysql_affected_rows($this->_connectionID);
}
-
- // See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
+
+ // 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";
-
+ 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)
{
// post-nuke sets hasGenID to false
if (!$this->hasGenID) return false;
-
+
$savelog = $this->_logsql;
$this->_logsql = false;
$getnext = sprintf($this->_genIDSQL,$seqname);
@@ -212,18 +312,22 @@ class ADODB_mysql extends ADOConnection {
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 +340,11 @@ class ADODB_mysql extends ADOConnection {
}
return $arr;
}
-
-
+
+
// Format date column in sql string given an input format that understands Y M D
function SQLDate($fmt, $col=false)
- {
+ {
if (!$col) $col = $this->sysTimeStamp;
$s = 'DATE_FORMAT('.$col.",'";
$concat = false;
@@ -248,7 +352,7 @@ class ADODB_mysql extends ADOConnection {
for ($i=0; $i < $len; $i++) {
$ch = $fmt[$i];
switch($ch) {
-
+
default:
if ($ch == '\\') {
$i++;
@@ -259,7 +363,7 @@ class ADODB_mysql extends ADOConnection {
case '/':
$s .= $ch;
break;
-
+
case 'Y':
case 'y':
$s .= '%Y';
@@ -267,7 +371,7 @@ class ADODB_mysql extends ADOConnection {
case 'M':
$s .= '%b';
break;
-
+
case 'm':
$s .= '%m';
break;
@@ -275,45 +379,45 @@ class ADODB_mysql extends ADOConnection {
case 'd':
$s .= '%d';
break;
-
+
case 'Q':
case 'q':
$s .= "'),Quarter($col)";
-
+
if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
else $s .= ",('";
$concat = true;
break;
-
- case 'H':
+
+ case 'H':
$s .= '%H';
break;
-
+
case 'h':
$s .= '%I';
break;
-
+
case 'i':
$s .= '%i';
break;
-
+
case 's':
$s .= '%s';
break;
-
+
case 'a':
case 'A':
$s .= '%p';
break;
-
+
case 'w':
$s .= '%w';
break;
-
+
case 'W':
$s .= '%U';
break;
-
+
case 'l':
$s .= '%W';
break;
@@ -323,7 +427,7 @@ class ADODB_mysql extends ADOConnection {
if ($concat) $s = "CONCAT($s)";
return $s;
}
-
+
// returns concatenated string
// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
@@ -331,25 +435,28 @@ class ADODB_mysql extends ADOConnection {
{
$s = "";
$arr = func_get_args();
-
+
// suggestion by andrew005@mnogo.ru
- $s = implode(',',$arr);
+ $s = implode(',',$arr);
if (strlen($s) > 0) return "CONCAT($s)";
else return '';
}
-
+
function OffsetDate($dayFraction,$date=false)
- {
+ {
if (!$date) $date = $this->sysDate;
+
$fraction = $dayFraction * 24 * 3600;
- return "from_unixtime(unix_timestamp($date)+$fraction)";
+ 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);
@@ -358,17 +465,17 @@ class ADODB_mysql extends ADOConnection {
$this->forceNewConnect);
else
$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
-
+
if ($this->_connectionID === false) return false;
if ($argDatabasename) return $this->SelectDB($argDatabasename);
- return true;
+ return true;
}
-
+
// returns true or false
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
if (!empty($this->port)) $argHostname .= ":".$this->port;
-
+
if (ADODB_PHPVER >= 0x4300)
$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
else
@@ -376,16 +483,16 @@ class ADODB_mysql extends ADOConnection {
if ($this->_connectionID === false) return false;
if ($this->autoRollback) $this->RollbackTrans();
if ($argDatabasename) return $this->SelectDB($argDatabasename);
- return true;
+ return true;
}
-
+
function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
$this->forceNewConnect = true;
return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
}
-
- function &MetaColumns($table)
+
+ function MetaColumns($table, $normalize=true)
{
$this->_findschema($table,$schema);
if ($schema) {
@@ -395,27 +502,27 @@ class ADODB_mysql extends ADOConnection {
global $ADODB_FETCH_MODE;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-
+
if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-
+
if ($schema) {
$this->SelectDB($dbName);
}
-
+
if (isset($savem)) $this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
if (!is_object($rs)) {
$false = false;
return $false;
}
-
+
$retarr = array();
while (!$rs->EOF){
$fld = new ADOFieldObject();
$fld->name = $rs->fields[0];
$type = $rs->fields[1];
-
+
// split type into type(length):
$fld->scale = null;
if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -438,9 +545,10 @@ class ADODB_mysql extends ADOConnection {
$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') {
@@ -450,7 +558,7 @@ class ADODB_mysql extends ADOConnection {
$fld->has_default = false;
}
}
-
+
if ($save == ADODB_FETCH_NUM) {
$retarr[] = $fld;
} else {
@@ -458,144 +566,157 @@ class ADODB_mysql extends ADOConnection {
}
$rs->MoveNext();
}
-
+
$rs->Close();
- return $retarr;
+ return $retarr;
}
-
+
// returns true or false
- function SelectDB($dbName)
+ function SelectDB($dbName)
{
$this->database = $dbName;
$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
if ($this->_connectionID) {
- return @mysql_select_db($dbName,$this->_connectionID);
+ return @mysql_select_db($dbName,$this->_connectionID);
}
- else return false;
+ else return false;
}
-
+
// parameters use PostgreSQL convention, not MySQL
- function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
+ function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
{
$offsetStr =($offset>=0) ? ((integer)$offset)."," : '';
// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
- if ($nrows < 0) $nrows = '18446744073709551615';
-
+ if ($nrows < 0) $nrows = '18446744073709551615';
+
if ($secs)
- $rs =& $this->CacheExecute($secs,$sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
+ $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()
{
- return 255;
+ return 255;
}
-
+
/*
* Maximum size of X field
*/
function TextMax()
{
- return 4294967295;
+ return 4294967295;
}
-
+
// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
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/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+ 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;
}
@@ -609,9 +730,9 @@ class ADORecordSet_mysql extends ADORecordSet{
$this->fetchMode = MYSQL_BOTH; break;
}
$this->adodbFetchMode = $mode;
- $this->ADORecordSet($queryID);
+ parent::__construct($queryID);
}
-
+
function _initrs()
{
//GLOBAL $ADODB_COUNTRECS;
@@ -619,38 +740,42 @@ class ADORecordSet_mysql extends ADORecordSet{
$this->_numOfRows = @mysql_num_rows($this->_queryID);
$this->_numOfFields = @mysql_num_fields($this->_queryID);
}
-
- function &FetchField($fieldOffset = -1)
- {
+
+ function FetchField($fieldOffset = -1)
+ {
if ($fieldOffset != -1) {
$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
$f = @mysql_field_flags($this->_queryID,$fieldOffset);
- $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)
- {
+ {
// added @ by "Michael William Miller" <mille562@pilot.msu.edu>
if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
-
+
if (!$this->bind) {
$this->bind = array();
for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -660,18 +785,19 @@ class ADORecordSet_mysql extends ADORecordSet{
}
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
+
function _seek($row)
{
if ($this->_numOfRows == 0) return false;
return @mysql_data_seek($this->_queryID,$row);
}
-
+
function MoveNext()
{
//return adodb_movenext($this);
//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;
}
@@ -681,18 +807,19 @@ class ADORecordSet_mysql extends ADORecordSet{
}
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)
{
if (is_object($t)) {
@@ -700,80 +827,65 @@ class ADORecordSet_mysql extends ADORecordSet{
$t = $fieldobj->type;
$len = $fieldobj->max_length;
}
-
+
$len = -1; // mysql max_length is not accurate
switch (strtoupper($t)) {
- case 'STRING':
+ case 'STRING':
case 'CHAR':
- case 'VARCHAR':
- case 'TINYBLOB':
- case 'TINYTEXT':
- case 'ENUM':
- case 'SET':
+ case 'VARCHAR':
+ case 'TINYBLOB':
+ case 'TINYTEXT':
+ case 'ENUM':
+ case 'SET':
if ($len <= $this->blobSize) return 'C';
-
+
case 'TEXT':
- case 'LONGTEXT':
+ case 'LONGTEXT':
case 'MEDIUMTEXT':
return 'X';
-
+
// php_mysql extension always returns 'blob' even if 'text'
// so we have to check whether binary...
case 'IMAGE':
- case 'LONGBLOB':
+ case 'LONGBLOB':
case 'BLOB':
case 'MEDIUMBLOB':
+ case 'BINARY':
return !empty($fieldobj->binary) ? 'B' : 'X';
-
+
case 'YEAR':
case 'DATE': return 'D';
-
+
case 'TIME':
case 'DATETIME':
case 'TIMESTAMP': return 'T';
-
- case 'INT':
+
+ case 'INT':
case 'INTEGER':
case 'BIGINT':
case 'TINYINT':
case 'MEDIUMINT':
- case 'SMALLINT':
-
+ case 'SMALLINT':
+
if (!empty($fieldobj->primary_key)) return 'R';
else return 'I';
-
+
default: return 'N';
}
}
}
-class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
- function ADORecordSet_ext_mysql($queryID,$mode=false)
+class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
+ function __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;
- $this->ADORecordSet($queryID);
+ parent::__construct($queryID,$mode);
}
-
+
function MoveNext()
{
return @adodb_movenext($this);
}
}
-
}
-?>
diff --git a/libraries/adodb/drivers/adodb-mysqli.inc.php b/libraries/adodb/drivers/adodb-mysqli.inc.php
index 0915942ba..188efc9fe 100644
--- a/libraries/adodb/drivers/adodb-mysqli.inc.php
+++ b/libraries/adodb/drivers/adodb-mysqli.inc.php
@@ -1,26 +1,32 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
+
+ This is the preferred driver for MySQL connections, and supports both transactional
+ and non-transactional table types. You can use this as a drop-in replacement for both
+ the mysql and mysqlt drivers. As of ADOdb Version 5.20.0, all other native MySQL drivers
+ are deprecated
- MySQL code that does not support transactions. Use mysqlt if you need transactions.
Requires mysql client. Works on Windows and Unix.
-
+
21 October 2003: MySQLi extension implementation by Arjen de Rijke (a.de.rijke@xs4all.nl)
Based on adodb 3.40
-*/
+*/
// security - hide paths
-//if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR')) die();
if (! defined("_ADODB_MYSQLI_LAYER")) {
define("_ADODB_MYSQLI_LAYER", 1 );
-
+
// PHP5 compat...
- if (! defined("MYSQLI_BINARY_FLAG")) define("MYSQLI_BINARY_FLAG", 128);
+ if (! defined("MYSQLI_BINARY_FLAG")) define("MYSQLI_BINARY_FLAG", 128);
if (!defined('MYSQLI_READ_DEFAULT_GROUP')) define('MYSQLI_READ_DEFAULT_GROUP',1);
// disable adodb extension - currently incompatible.
@@ -28,11 +34,15 @@ if (! defined("_ADODB_MYSQLI_LAYER")) {
class ADODB_mysqli extends ADOConnection {
var $databaseType = 'mysqli';
- var $dataProvider = 'native';
+ var $dataProvider = 'mysql';
var $hasInsertID = true;
- var $hasAffectedRows = true;
- var $metaTablesSQL = "SHOW TABLES";
- var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
+ var $hasAffectedRows = true;
+ var $metaTablesSQL = "SELECT
+ TABLE_NAME,
+ CASE WHEN TABLE_TYPE = 'VIEW' THEN 'V' ELSE 'T' END
+ FROM INFORMATION_SCHEMA.TABLES
+ WHERE TABLE_SCHEMA=";
+ var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
var $fmtTimeStamp = "'Y-m-d H:i:s'";
var $hasLimit = true;
var $hasMoveFirst = true;
@@ -45,22 +55,23 @@ class ADODB_mysqli extends ADOConnection {
var $poorAffectedRows = true;
var $clientFlags = 0;
var $substr = "substring";
- var $port = false;
- var $socket = false;
+ var $port = 3306; //Default to 3306 to fix HHVM bug
+ var $socket = ''; //Default to empty string to fix HHVM bug
var $_bindInputArray = false;
var $nameQuote = '`'; /// string to use to quote identifiers and names
var $optionFlags = array(array(MYSQLI_READ_DEFAULT_GROUP,0));
-
- function ADODB_mysqli()
- {
- // if(!extension_loaded("mysqli"))
- ;//trigger_error("You must have the mysqli extension installed.", E_USER_ERROR);
-
+ var $arrayClass = 'ADORecordSet_array_mysqli';
+ var $multiQuery = false;
+
+ function __construct()
+ {
+ // if(!extension_loaded("mysqli"))
+ //trigger_error("You must have the mysqli extension installed.", E_USER_ERROR);
}
-
- function SetTransactionMode( $transaction_mode )
+
+ function SetTransactionMode( $transaction_mode )
{
- $this->_transmode = $transaction_mode;
+ $this->_transmode = $transaction_mode;
if (empty($transaction_mode)) {
$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
return;
@@ -72,183 +83,217 @@ class ADODB_mysqli extends ADOConnection {
// returns true or false
// To add: parameter int $port,
// parameter string $socket
- function _connect($argHostname = NULL,
- $argUsername = NULL,
- $argPassword = NULL,
- $argDatabasename = NULL, $persist=false)
- {
- if(!extension_loaded("mysqli")) {
+ 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)
+ }
+ $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;
- }
+ }
+ 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" <bduclaux#yahoo.com>
*/
- foreach($this->optionFlags as $arr) {
+ foreach($this->optionFlags as $arr) {
mysqli_options($this->_connectionID,$arr[0],$arr[1]);
}
+ //http ://php.net/manual/en/mysqli.persistconns.php
+ if ($persist && PHP_VERSION > 5.2 && strncmp($argHostname,'p:',2) != 0) $argHostname = 'p:'.$argHostname;
+
#if (!empty($this->port)) $argHostname .= ":".$this->port;
$ok = mysqli_real_connect($this->_connectionID,
- $argHostname,
- $argUsername,
- $argPassword,
- $argDatabasename,
- $this->port,
+ $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't connect : " . $this->ErrorMsg());
+ }
+ $this->_connectionID = null;
return false;
- }
+ }
}
-
+
// returns true or false
// How to force a persistent connection
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
-
}
-
+
// When is this used? Close old connection first?
- // In _connect(), check $this->forceNewConnect?
+ // In _connect(), check $this->forceNewConnect?
function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
- {
- $this->forceNewConnect = true;
- return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
- }
-
- function IfNull( $field, $ifNull )
+ {
+ $this->forceNewConnect = true;
+ return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+ }
+
+ function IfNull( $field, $ifNull )
{
return " IFNULL($field, $ifNull) "; // if MySQL
}
-
+
+ // do not use $ADODB_COUNTRECS
+ function GetOne($sql,$inputarr=false)
+ {
+ global $ADODB_GETONE_EOF;
+
+ $ret = false;
+ $rs = $this->Execute($sql,$inputarr);
+ if ($rs) {
+ if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
+ else $ret = reset($rs->fields);
+ $rs->Close();
+ }
+ return $ret;
+ }
+
function ServerInfo()
{
$arr['description'] = $this->GetOne("select version()");
$arr['version'] = ADOConnection::_findvers($arr['description']);
return $arr;
}
-
-
+
+
function BeginTrans()
- {
+ {
if ($this->transOff) return true;
$this->transCnt += 1;
- $this->Execute('SET AUTOCOMMIT=0');
+
+ //$this->Execute('SET AUTOCOMMIT=0');
+ mysqli_autocommit($this->_connectionID, false);
$this->Execute('BEGIN');
return true;
}
-
- function CommitTrans($ok=true)
+
+ function CommitTrans($ok=true)
{
- if ($this->transOff) return true;
+ if ($this->transOff) return true;
if (!$ok) return $this->RollbackTrans();
-
+
if ($this->transCnt) $this->transCnt -= 1;
$this->Execute('COMMIT');
- $this->Execute('SET AUTOCOMMIT=1');
+
+ //$this->Execute('SET AUTOCOMMIT=1');
+ mysqli_autocommit($this->_connectionID, true);
return true;
}
-
+
function RollbackTrans()
{
if ($this->transOff) return true;
if ($this->transCnt) $this->transCnt -= 1;
$this->Execute('ROLLBACK');
- $this->Execute('SET AUTOCOMMIT=1');
+ //$this->Execute('SET AUTOCOMMIT=1');
+ mysqli_autocommit($this->_connectionID, true);
return true;
}
-
- 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);
- }
-
- // 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());
+ $rs = $this->Execute("select $col from $tables $where for update");
+ return !empty($rs);
+ }
+
+ /**
+ * Quotes a string to be sent to the database
+ * When there is no active connection,
+ * @param string $s The string to quote
+ * @param boolean $magic_quotes If false, use mysqli_real_escape_string()
+ * if you are quoting a string extracted from a POST/GET variable,
+ * then pass get_magic_quotes_gpc() as the second parameter. This will
+ * ensure that the variable is not quoted twice, once by qstr() and
+ * once by the magic_quotes_gpc.
+ * Eg. $s = $db->qstr(_GET['name'],get_magic_quotes_gpc());
+ * @return string Quoted string
+ */
function qstr($s, $magic_quotes = false)
{
+ if (is_null($s)) return 'NULL';
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'";
- }
-
+ // mysqli_real_escape_string() throws a warning when the given
+ // connection is invalid
+ if (PHP_VERSION >= 5 && $this->_connectionID) {
+ return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";
+ }
+
+ if ($this->replaceQuote[0] == '\\') {
+ $s = adodb_str_replace(array('\\',"\0"), array('\\\\',"\\\0") ,$s);
+ }
+ return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
+ }
+ // undo magic quotes for "
+ $s = str_replace('\\"','"',$s);
+ return "'$s'";
+ }
+
function _insertid()
{
- $result = @mysqli_insert_id($this->_connectionID);
- if ($result == -1){
- if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : " . $this->ErrorMsg());
- }
- return $result;
+ $result = @mysqli_insert_id($this->_connectionID);
+ if ($result == -1) {
+ if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : " . $this->ErrorMsg());
+ }
+ return $result;
}
-
+
// Only works for INSERT, UPDATE and DELETE query's
function _affectedrows()
{
- $result = @mysqli_affected_rows($this->_connectionID);
- if ($result == -1) {
- if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : " . $this->ErrorMsg());
- }
- return $result;
+ $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
+
+ // 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";
-
+ 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)
{
// 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);
@@ -256,89 +301,93 @@ class ADODB_mysqli extends ADOConnection {
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 = mysqli_insert_id($this->_connectionID);
-
- if ($rs) $rs->Close();
-
+
+ if ($rs) {
+ $this->genID = mysqli_insert_id($this->_connectionID);
+ $rs->Close();
+ } else
+ $this->genID = 0;
+
return $this->genID;
}
-
- function &MetaDatabases()
+
+ 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');
if ($db != 'mysql') $arr[] = $db;
$ret->MoveNext();
}
- return $arr;
+ return $arr;
}
- return $ret;
+ return $ret;
}
-
- function &MetaIndexes ($table, $primary = FALSE)
+
+ 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));
-
+
// 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];
- }
-
+ 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)
- {
+ {
if (!$col) $col = $this->sysTimeStamp;
$s = 'DATE_FORMAT('.$col.",'";
$concat = false;
@@ -353,7 +402,7 @@ class ADODB_mysqli extends ADOConnection {
case 'Q':
case 'q':
$s .= "'),Quarter($col)";
-
+
if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
else $s .= ",('";
$concat = true;
@@ -361,7 +410,7 @@ class ADODB_mysqli extends ADOConnection {
case 'M':
$s .= '%b';
break;
-
+
case 'm':
$s .= '%m';
break;
@@ -369,38 +418,38 @@ class ADODB_mysqli extends ADOConnection {
case 'd':
$s .= '%d';
break;
-
- case 'H':
+
+ case 'H':
$s .= '%H';
break;
-
+
case 'h':
$s .= '%I';
break;
-
+
case 'i':
$s .= '%i';
break;
-
+
case 's':
$s .= '%s';
break;
-
+
case 'a':
case 'A':
$s .= '%p';
break;
-
+
case 'w':
$s .= '%w';
break;
-
+
case 'l':
$s .= '%W';
break;
-
+
default:
-
+
if ($ch == '\\') {
$i++;
$ch = substr($fmt,$i,1);
@@ -413,93 +462,168 @@ class ADODB_mysqli extends ADOConnection {
if ($concat) $s = "CONCAT($s)";
return $s;
}
-
+
// returns concatenated string
// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
function Concat()
{
$s = "";
$arr = func_get_args();
-
+
// suggestion by andrew005@mnogo.ru
- $s = implode(',',$arr);
+ $s = implode(',',$arr);
if (strlen($s) > 0) return "CONCAT($s)";
else return '';
}
-
+
// dayFraction is a day in floating point
function OffsetDate($dayFraction,$date=false)
- {
- if (!$date)
- $date = $this->sysDate;
- return "from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
- }
-
- function &MetaTables($ttype=false,$showSchema=false,$mask=false)
- {
+ {
+ if (!$date) $date = $this->sysDate;
+
+ $fraction = $dayFraction * 24 * 3600;
+ return $date . ' + INTERVAL ' . $fraction.' SECOND';
+
+// return "from_unixtime(unix_timestamp($date)+$fraction)";
+ }
+
+ function MetaProcedures($NamePattern = false, $catalog = null, $schemaPattern = null)
+ {
+ // save old fetch mode
+ 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;
}
-
+
// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
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;
- }
-
- function &MetaColumns($table)
+
+ 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/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+ 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, $normalize=true)
{
$false = false;
if (!$this->metaColumnsSQL)
return $false;
-
+
global $ADODB_FETCH_MODE;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
@@ -510,13 +634,13 @@ class ADODB_mysqli extends ADOConnection {
$ADODB_FETCH_MODE = $save;
if (!is_object($rs))
return $false;
-
+
$retarr = array();
while (!$rs->EOF) {
$fld = new ADOFieldObject();
$fld->name = $rs->fields[0];
$type = $rs->fields[1];
-
+
// split type into type(length):
$fld->scale = null;
if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -528,8 +652,10 @@ class ADODB_mysqli extends ADOConnection {
$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;
@@ -539,6 +665,7 @@ class ADODB_mysqli extends ADOConnection {
$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];
@@ -549,7 +676,7 @@ class ADODB_mysqli extends ADOConnection {
$fld->has_default = false;
}
}
-
+
if ($save == ADODB_FETCH_NUM) {
$retarr[] = $fld;
} else {
@@ -557,52 +684,50 @@ class ADODB_mysqli extends ADOConnection {
}
$rs->MoveNext();
}
-
+
$rs->Close();
return $retarr;
}
-
+
// returns true or false
- function SelectDB($dbName)
+ function SelectDB($dbName)
{
-// $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
- $this->database = $dbName;
+// $this->_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)
+ function SelectLimit($sql,
+ $nrows = -1,
+ $offset = -1,
+ $inputarr = false,
+ $secs = 0)
{
$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;
}
-
-
+
+
function Prepare($sql)
{
return $sql;
-
$stmt = $this->_connectionID->prepare($sql);
if (!$stmt) {
echo $this->ErrorMsg();
@@ -610,163 +735,188 @@ class ADODB_mysqli extends ADOConnection {
}
return array($sql,$stmt);
}
-
-
+
+
// returns queryID or false
function _query($sql, $inputarr)
{
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);
-
$ret = mysqli_stmt_execute($stmt);
return $ret;
}
+
+ /*
if (!$mysql_res = mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
- if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
- return false;
+ 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) 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: 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;
- }
+ {
+ @mysqli_close($this->_connectionID);
+ $this->_connectionID = false;
+ }
/*
* Maximum size of C field
*/
function CharMax()
{
- return 255;
+ return 255;
}
-
+
/*
* Maximum size of X field
*/
function TextMax()
{
- return 4294967295;
+ return 4294967295;
}
-
// 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;
-
- 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;
- }
+ // 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;
+ }
+
+ if ($this->charSet !== $charset_name) {
+ $if = @$this->_connectionID->set_charset($charset_name);
+ return ($if === true & $this->GetCharSet() == $charset_name);
+ } else {
+ return true;
+ }
+ }
}
-
+
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
-class ADORecordSet_mysqli extends ADORecordSet{
-
+class ADORecordSet_mysqli extends ADORecordSet{
+
var $databaseType = "mysqli";
var $canSeek = true;
-
- function ADORecordSet_mysqli($queryID, $mode = false)
- {
- 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
@@ -787,13 +937,19 @@ class ADORecordSet_mysqli extends ADORecordSet{
131072 = MYSQLI_BINCMP_FLAG
*/
- function &FetchField($fieldOffset = -1)
- {
+ function FetchField($fieldOffset = -1)
+ {
$fieldnr = $fieldOffset;
if ($fieldOffset != -1) {
- $fieldOffset = mysqli_field_seek($this->_queryID, $fieldnr);
+ $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,69 +961,111 @@ class ADORecordSet_mysqli extends ADORecordSet{
return $o;
}
- function &GetRowAssoc($upper = true)
+ 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 */
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)]];
+ }
+
function _seek($row)
{
- if ($this->_numOfRows == 0)
- return false;
+ if ($this->_numOfRows == 0 || $row < 0) {
+ return false;
+ }
+
+ mysqli_data_seek($this->_queryID, $row);
+ $this->EOF = false;
+ return true;
+ }
- if ($row < 0)
- return false;
- mysqli_data_seek($this->_queryID, $row);
- $this->EOF = false;
- return true;
+ function NextRecordSet()
+ {
+ global $ADODB_COUNTRECS;
+
+ mysqli_free_result($this->_queryID);
+ $this->_queryID = -1;
+ // Move to the next recordset, or return false if there is none. In a stored proc
+ // 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;
+ }
+ // 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()
+ 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;
- }
-
+ }
+
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()
+
+ function _close()
{
- mysqli_free_result($this->_queryID);
- $this->_queryID = false;
+ //if results are attached to this pointer from Stored Proceedure calls, the next standard query will die 2014
+ //only a problem with persistant connections
+
+ if(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,101 +1098,196 @@ class ADORecordSet_mysqli extends ADORecordSet{
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':
-
+ $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_CHAR :
case MYSQLI_TYPE_STRING :
case MYSQLI_TYPE_ENUM :
case MYSQLI_TYPE_SET :
case 253 :
- if ($len <= $this->blobSize) return 'C';
-
+ 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...
+ return 'X';
+
+ // php_mysql extension always returns 'blob' even if 'text'
+ // so we have to check whether binary...
case 'IMAGE':
- case 'LONGBLOB':
+ case 'LONGBLOB':
case 'BLOB':
case 'MEDIUMBLOB':
-
+
case MYSQLI_TYPE_BLOB :
case MYSQLI_TYPE_LONG_BLOB :
case MYSQLI_TYPE_MEDIUM_BLOB :
-
- return !empty($fieldobj->binary) ? 'B' : 'X';
+ return !empty($fieldobj->binary) ? 'B' : 'X';
+
case 'YEAR':
- case 'DATE':
+ case 'DATE':
case MYSQLI_TYPE_DATE :
case MYSQLI_TYPE_YEAR :
-
- return 'D';
-
+ return 'D';
+
case 'TIME':
case 'DATETIME':
case 'TIMESTAMP':
-
+
case MYSQLI_TYPE_DATETIME :
case MYSQLI_TYPE_NEWDATE :
case MYSQLI_TYPE_TIME :
case MYSQLI_TYPE_TIMESTAMP :
-
return 'T';
-
- case 'INT':
+
+ case 'INT':
case 'INTEGER':
case 'BIGINT':
case 'TINYINT':
case 'MEDIUMINT':
- case 'SMALLINT':
-
+ case 'SMALLINT':
+
case MYSQLI_TYPE_INT24 :
case MYSQLI_TYPE_LONG :
case MYSQLI_TYPE_LONGLONG :
case MYSQLI_TYPE_SHORT :
case MYSQLI_TYPE_TINY :
-
- if (!empty($fieldobj->primary_key)) return 'R';
-
- return 'I';
-
-
- // Added floating-point types
- // Maybe not necessery.
- case 'FLOAT':
- case 'DOUBLE':
- // case 'DOUBLE PRECISION':
- case 'DECIMAL':
- case 'DEC':
- case 'FIXED':
- default:
- //if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>";
- return 'N';
+ 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 "<p>--- Error in type matching $t -----</p>";
+ return 'N';
}
} // function
-
+
} // rs class
-
+
}
-?>
\ No newline at end of file
+class ADORecordSet_array_mysqli extends ADORecordSet_array {
+
+ function __construct($id=-1,$mode=false)
+ {
+ parent::__construct($id,$mode);
+ }
+
+ 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 necessery.
+ case 'FLOAT':
+ case 'DOUBLE':
+// case 'DOUBLE PRECISION':
+ case 'DECIMAL':
+ case 'DEC':
+ case 'FIXED':
+ default:
+ //if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>";
+ return 'N';
+ }
+ } // function
+
+}
diff --git a/libraries/adodb/drivers/adodb-mysqlpo.inc.php b/libraries/adodb/drivers/adodb-mysqlpo.inc.php
new file mode 100644
index 000000000..26b354aee
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-mysqlpo.inc.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+ Set tabs to 8.
+
+ MySQL code that supports transactions. For MySQL 3.23 or later.
+ Code from James Poon <jpoon88@yahoo.com>
+
+ This driver extends the deprecated mysql driver, and was originally designed to be a
+ portable driver in the same manner as oci8po and mssqlpo. Its functionality
+ is exactly duplicated in the mysqlt driver, which is itself deprecated.
+ This driver will be removed in ADOdb version 6.0.0.
+
+ Requires mysql client. Works on Windows and Unix.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
+
+
+class ADODB_mysqlt extends ADODB_mysql {
+ var $databaseType = 'mysqlt';
+ var $ansiOuter = true; // for Version 3.23.17 or later
+ var $hasTransactions = true;
+ var $autoRollback = true; // apparently mysql does not autorollback properly
+
+ function __construct()
+ {
+ global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
+ }
+
+ function BeginTrans()
+ {
+ if ($this->transOff) return true;
+ $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 __construct($queryID,$mode=false)
+ {
+ parent::__construct($queryID,$mode);
+ }
+
+ function MoveNext()
+ {
+ return adodb_movenext($this);
+ }
+}
diff --git a/libraries/adodb/drivers/adodb-mysqlt.inc.php b/libraries/adodb/drivers/adodb-mysqlt.inc.php
index c37d4bc6f..79c937600 100644
--- a/libraries/adodb/drivers/adodb-mysqlt.inc.php
+++ b/libraries/adodb/drivers/adodb-mysqlt.inc.php
@@ -1,15 +1,19 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
-
- MySQL code that supports transactions. For MySQL 3.23 or later.
- Code from James Poon <jpoon88@yahoo.com>
-
+
+ This driver only supports the original MySQL driver in transactional mode. It
+ is deprected 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
+
Requires mysql client. Works on Windows and Unix.
*/
@@ -23,20 +27,20 @@ class ADODB_mysqlt extends ADODB_mysql {
var $databaseType = 'mysqlt';
var $ansiOuter = true; // for Version 3.23.17 or later
var $hasTransactions = true;
- var $autoRollback = true; // apparently mysql does not autorollback properly
-
- function ADODB_mysqlt()
- {
+ var $autoRollback = true; // apparently mysql does not autorollback properly
+
+ function __construct()
+ {
global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
}
-
+
/* set transaction mode
-
+
SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
{ READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
*/
- function SetTransactionMode( $transaction_mode )
+ function SetTransactionMode( $transaction_mode )
{
$this->_transmode = $transaction_mode;
if (empty($transaction_mode)) {
@@ -46,70 +50,70 @@ class ADODB_mysqlt extends ADODB_mysql {
if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
}
-
+
function BeginTrans()
- {
+ {
if ($this->transOff) return true;
$this->transCnt += 1;
$this->Execute('SET AUTOCOMMIT=0');
$this->Execute('BEGIN');
return true;
}
-
- function CommitTrans($ok=true)
+
+ function CommitTrans($ok=true)
{
- if ($this->transOff) return true;
+ if ($this->transOff) return true;
if (!$ok) return $this->RollbackTrans();
-
+
if ($this->transCnt) $this->transCnt -= 1;
- $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 +128,10 @@ class ADORecordSet_mysqlt extends ADORecordSet_mysql{
}
}
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
- function ADORecordSet_ext_mysqlt($queryID,$mode=false)
- {
- 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/libraries/adodb/drivers/adodb-netezza.inc.php b/libraries/adodb/drivers/adodb-netezza.inc.php
index 6ed02c0e4..af3a1a11d 100644
--- a/libraries/adodb/drivers/adodb-netezza.inc.php
+++ b/libraries/adodb/drivers/adodb-netezza.inc.php
@@ -1,7 +1,9 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
-
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+
First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
Based on the previous postgres drivers.
http://www.netezza.com/
@@ -20,7 +22,7 @@ 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 +36,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 +49,52 @@ class ADODB_netezza extends ADODB_postgres64 {
var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
// http://bugs.php.net/bug.php?id=25404
-
- function ADODB_netezza()
+
+ function __construct()
{
-
+
}
-
- 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 +118,20 @@ class ADODB_netezza extends ADODB_postgres64 {
$fld->max_length = 12;
break;
}
-
- if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
+
+ if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
-
+
$rs->MoveNext();
}
$rs->Close();
- return $retarr;
-
+ return $retarr;
+
}
-
+
}
-
+
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
@@ -138,33 +140,18 @@ class ADORecordSet_netezza extends ADORecordSet_postgres64
{
var $databaseType = "netezza";
var $canSeek = true;
-
- function ADORecordSet_netezza($queryID,$mode=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 = 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::__construct($queryID,$mode);
}
-
+
// _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/libraries/adodb/drivers/adodb-oci8.inc.php b/libraries/adodb/drivers/adodb-oci8.inc.php
index 4741986ac..928d1b843 100644
--- a/libraries/adodb/drivers/adodb-oci8.inc.php
+++ b/libraries/adodb/drivers/adodb-oci8.inc.php
@@ -1,16 +1,18 @@
<?php
/*
- version V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim. All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Latest version is available at http://adodb.sourceforge.net
-
+
Code contributed by George Fourlanos <fou@infomap.gr>
-
+
13 Nov 2000 jlim - removed all ora_* references.
*/
@@ -30,26 +32,25 @@ For Oracle the default is dd-mon-yy or dd-mon-yyyy, and for SQL-92 the default i
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,146 +59,182 @@ 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)";
var $noNullStrings = false;
var $connectSID = false;
var $_bind = false;
- var $_hasOCIFetchStatement = 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()
+
+ function __construct()
{
- $this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
- if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
+ $this->_hasOciFetchStatement = ADODB_PHPVER >= 0x4200;
+ if (defined('ADODB_EXTENSION')) {
+ $this->rsPrefix .= 'ext_';
+ }
}
-
- /* Function &MetaColumns($table) added by smondino@users.sourceforge.net*/
- function &MetaColumns($table)
+
+ /* 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 <jorma.tuomainen@ppoy.fi>
- 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)))";
@@ -206,43 +243,43 @@ NATSOFT.DOMAIN =
.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
}
}
-
- //if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
+
+ //if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
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;
}
@@ -251,90 +288,139 @@ NATSOFT.DOMAIN =
{
return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
}
-
+
// returns true or false
function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
}
-
+
function _affectedrows()
{
- if (is_resource($this->_stmt)) return @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
}
-
+
// 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);
@@ -342,131 +428,183 @@ NATSOFT.DOMAIN =
// 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];
@@ -479,11 +617,11 @@ NATSOFT.DOMAIN =
case 'q':
$s .= 'Q';
break;
-
+
case 'M':
$s .= 'Mon';
break;
-
+
case 'm':
$s .= 'MM';
break;
@@ -491,219 +629,268 @@ NATSOFT.DOMAIN =
case 'd':
$s .= 'DD';
break;
-
+
case 'H':
$s.= 'HH24';
break;
-
+
case 'h':
$s .= 'HH';
break;
-
+
case 'i':
$s .= 'MI';
break;
-
+
case 's':
$s .= 'SS';
break;
-
+
case 'a':
case 'A':
$s .= 'AM';
break;
-
+
case 'w':
$s .= 'D';
break;
-
+
case 'l':
$s .= 'DAY';
break;
-
- case 'W':
+
+ case 'W':
$s .= 'WW';
break;
-
+
default:
- // handle escape characters...
+ // 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)
{
+ // 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("<b>UpdateBlob</b>: 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)) {
@@ -711,107 +898,174 @@ NATSOFT.DOMAIN =
case 'BLOB': $type = OCI_B_BLOB; break;
case 'CLOB': $type = OCI_B_CLOB; break;
}
-
- if ($this->databaseType == 'oci8po')
+
+ if ($this->databaseType == 'oci8po')
$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
- else
+ else
$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-
- $desc = 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 http://phplens.com/lens/lensforum/msgs.php?id=18786
+ if ($array2d || !$this->_bindInputArray) {
+
+ # is_object check because oci8 descriptors can be passed in
+ if ($array2d && $this->_bindInputArray) {
+ if (is_string($sql)) {
+ $stmt = $this->Prepare($sql);
+ } else {
+ $stmt = $sql;
+ }
+
+ foreach($inputarr as $arr) {
+ $ret = $this->_Execute($stmt,$arr);
+ if (!$ret) {
+ return $ret;
+ }
+ }
+ return $ret;
+ } else {
+ $sqlarr = explode(':', $sql);
+ $sql = '';
+ $lastnomatch = -2;
+ #var_dump($sqlarr);echo "<hr>";var_dump($inputarr);echo"<hr>";
+ 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;
@@ -823,73 +1077,82 @@ NATSOFT.DOMAIN =
}
} 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("<b>Bind</b>: 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("<b>Bind</b>: descriptor has been allocated, var (".$name.") binded");
}
-
+
// if type is input then write data to lob now
if ($isOutput == false) {
$var = $this->BlobEncode($var);
@@ -903,36 +1166,40 @@ NATSOFT.DOMAIN =
}
$rez = $tmp;
} else {
- if ($this->debug)
+ if ($this->debug)
ADOConnection::outp("<b>Bind</b>: 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)
{
@@ -943,80 +1210,97 @@ NATSOFT.DOMAIN =
}
return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
}
-
- /*
- returns query ID if successful, otherwise false
- this version supports:
-
- 1. $db->execute('select * from table');
-
- 2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
- $db->execute($prepared_statement, array(1,2,3));
-
- 3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-
- 4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
- $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3);
- $db->execute($stmt);
- */
- 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],'<br>';
+ // 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],'<br>';
+ }
+ else {
+ echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'<br>';
+ }
+
+ }
} 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();
@@ -1026,68 +1310,101 @@ NATSOFT.DOMAIN =
//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
$this -> _refLOBs[$key]['VAR'] = $tmp;
} else {
- $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
+ $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
$this -> _refLOBs[$key]['LOB']->free();
unset($this -> _refLOBs[$key]);
- if ($this->debug) {
+ if ($this->debug) {
ADOConnection::outp("<b>IN LOB</b>: LOB has been saved. <br>");
}
- }
+ }
}
}
-
- 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')))";
@@ -1105,9 +1422,9 @@ SELECT /*+ RULE */ distinct b.column_name
$owner_clause
AND (a.constraint_name = b.constraint_name)";
- $rs = $this->Execute($sql);
+ $rs = $this->Execute($sql);
if ($rs && !$rs->EOF) {
- $arr =& $rs->GetArray();
+ $arr = $rs->GetArray();
$a = array();
foreach($arr as $v) {
$a[] = reset($v);
@@ -1116,12 +1433,21 @@ SELECT /*+ RULE */ distinct b.column_name
}
else return false;
}
-
- // http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
- function MetaForeignKeys($table, $owner=false)
+
+ /**
+ * returns assoc array where keys are tables, and values are foreign keys
+ *
+ * @param str $table
+ * @param str $owner [optional][default=NULL]
+ * @param bool $upper [optional][discarded]
+ * @return mixed[] Array of foreign key information
+ *
+ * @link http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
+ */
+ function MetaForeignKeys($table, $owner=false, $upper=false)
{
- global $ADODB_FETCH_MODE;
-
+ global $ADODB_FETCH_MODE;
+
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
$table = $this->qstr(strtoupper($table));
@@ -1130,15 +1456,15 @@ SELECT /*+ RULE */ distinct b.column_name
$tabp = 'user_';
} else
$tabp = 'all_';
-
+
$owner = ' and owner='.$this->qstr(strtoupper($owner));
-
- $sql =
-"select constraint_name,r_owner,r_constraint_name
+
+ $sql =
+"select constraint_name,r_owner,r_constraint_name
from {$tabp}constraints
where constraint_type = 'R' and table_name = $table $owner";
-
- $constraints =& $this->GetArray($sql);
+
+ $constraints = $this->GetArray($sql);
$arr = false;
foreach($constraints as $constr) {
$cons = $this->qstr($constr[0]);
@@ -1146,62 +1472,66 @@ SELECT /*+ RULE */ distinct b.column_name
$rcons = $this->qstr($constr[2]);
$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
-
- if ($cols && $tabcol)
+
+ if ($cols && $tabcol)
for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
}
}
$ADODB_FETCH_MODE = $save;
-
+
return $arr;
}
-
+
function CharMax()
{
return 4000;
}
-
+
function TextMax()
{
return 4000;
}
-
+
/**
* Quotes a string.
* An example is $db->qstr("Don't bother",magic_quotes_runtime());
- *
- * @param s the string to quote
- * @param [magic_quotes] if $s is GET/POST var, set to get_magic_quotes_gpc().
- * This undoes the stupidity of magic quotes for GPC.
*
- * @return quoted string to be sent back to database
+ * @param string $s the string to quote
+ * @param bool $magic_quotes if $s is GET/POST var, set to get_magic_quotes_gpc().
+ * This undoes the stupidity of magic quotes for GPC.
+ *
+ * @return string quoted string to be sent back to database
*/
function qstr($s,$magic_quotes=false)
- {
+ {
//$nofixquotes=false;
-
- if ($this->noNullStrings && strlen($s)==0)$s = ' ';
- if (!$magic_quotes) {
+
+ if ($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)."'";
-
+
+ // undo magic quotes for " unless sybase is on
+ if (!ini_get('magic_quotes_sybase')) {
+ $s = str_replace('\\"','"',$s);
+ $s = str_replace('\\\\','\\',$s);
+ return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+ } else {
+ return "'".$s."'";
+ }
}
-
+
}
/*--------------------------------------------------------------------------------------
- Class Name: Recordset
+ Class Name: Recordset
--------------------------------------------------------------------------------------*/
class ADORecordset_oci8 extends ADORecordSet {
@@ -1209,25 +1539,27 @@ 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;
}
@@ -1235,22 +1567,29 @@ class ADORecordset_oci8 extends ADORecordSet {
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);
+ $err = oci_error($this->_queryID);
+ if ($err && $this->connection->debug) {
+ ADOConnection::outp($err);
+ }
*/
-
+
if (!is_array($this->fields)) {
$this->_numOfRows = 0;
$this->fields = array();
@@ -1262,11 +1601,11 @@ class ADORecordset_oci8 extends ADORecordSet {
$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;
@@ -1274,55 +1613,56 @@ class ADORecordset_oci8 extends ADORecordSet {
}
}
- /* Returns: an object containing field information.
- Get column information in the Recordset object. fetchField() can be used in order to obtain information about
- fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
- fetchField() is retrieved. */
-
- 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) {
@@ -1331,64 +1671,37 @@ class ADORecordset_oci8 extends ADORecordSet {
}
return false;
}
-
- /*
- # does not work as first record is retrieved in _initrs(), so is not included in GetArray()
- function &GetArray($nRows = -1)
+
+ // 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) {
@@ -1398,10 +1711,9 @@ class ADORecordset_oci8 extends ADORecordSet {
$this->bind[strtoupper($o->name)] = $i;
}
}
-
- return $this->fields[$this->bind[strtoupper($colname)]];
+
+ return $this->fields[$this->bind[strtoupper($colname)]];
}
-
function _seek($row)
@@ -1409,93 +1721,98 @@ class ADORecordset_oci8 extends ADORecordSet {
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;
-
+ @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 'N';
}
}
}
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {
- function ADORecordSet_ext_oci8($queryID,$mode=false)
+class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {
+ function __construct($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;
+ parent::__construct($queryID, $mode);
}
-
+
function MoveNext()
{
return adodb_movenext($this);
}
}
-?>
diff --git a/libraries/adodb/drivers/adodb-oci805.inc.php b/libraries/adodb/drivers/adodb-oci805.inc.php
index 2aed0e0c2..112e9eccd 100644
--- a/libraries/adodb/drivers/adodb-oci805.inc.php
+++ b/libraries/adodb/drivers/adodb-oci805.inc.php
@@ -1,12 +1,14 @@
<?php
-/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+/**
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
*
* Set tabs to 4 for best viewing.
- *
+ *
* Latest version is available at http://php.weblogs.com
*
* Oracle 8.0.5 driver
@@ -18,27 +20,22 @@ if (!defined('ADODB_DIR')) die();
include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
class ADODB_oci805 extends ADODB_oci8 {
- var $databaseType = "oci805";
+ var $databaseType = "oci805";
var $connectSID = true;
-
- function ADODB_oci805()
- {
- $this->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 +46,10 @@ class ADODB_oci805 extends ADODB_oci8 {
}
}
-class ADORecordset_oci805 extends ADORecordset_oci8 {
+class ADORecordset_oci805 extends ADORecordset_oci8 {
var $databaseType = "oci805";
- function ADORecordset_oci805($id,$mode=false)
+ function __construct($id,$mode=false)
{
- $this->ADORecordset_oci8($id,$mode);
+ parent::__construct($id,$mode);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-oci8po.inc.php b/libraries/adodb/drivers/adodb-oci8po.inc.php
index a0338160a..6b939b0a0 100644
--- a/libraries/adodb/drivers/adodb-oci8po.inc.php
+++ b/libraries/adodb/drivers/adodb-oci8po.inc.php
@@ -1,12 +1,14 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim. All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Latest version is available at http://adodb.sourceforge.net
-
+
Portable version of oci8 driver, to make it more similar to other database drivers.
The main differences are
@@ -14,7 +16,7 @@ V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
2. bind variables are mapped using ? instead of :<bindvar>
Should some emulation of RecordCount() be implemented?
-
+
*/
// security - hide paths
@@ -27,43 +29,77 @@ 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()
+
+ function __construct()
{
$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 {
+ // Need to identify if the ? is inside a quoted string, and if
+ // so not use it as a bind variable
+ preg_match_all('/".*\??"|\'.*\?.*?\'/', $sql, $matches);
+ foreach($matches[0] as $qmMatch){
+ $qmReplace = str_replace('?', '-QUESTIONMARK-', $qmMatch);
+ $sql = str_replace($qmMatch, $qmReplace, $sql);
+ }
+
+ // Replace parameters if any were found
$sqlarr = explode('?',$sql);
- $sql = $sqlarr[0];
- foreach($inputarr as $k => $v) {
- $sql .= ":$k" . $sqlarr[++$i];
+ if(count($sqlarr) > 1) {
+ $sql = $sqlarr[0];
+
+ foreach ($inputarr as $k => $v) {
+ $sql .= ":$k" . $sqlarr[++$i];
+ }
}
+
+ $sql = str_replace('-QUESTIONMARK-', '?', $sql);
}
}
return ADODB_oci8::_query($sql,$inputarr);
@@ -77,16 +113,16 @@ class ADODB_oci8po extends ADODB_oci8 {
class ADORecordset_oci8po extends ADORecordset_oci8 {
var $databaseType = 'oci8po';
-
- function ADORecordset_oci8po($queryID,$mode=false)
+
+ function __construct($queryID,$mode=false)
{
- $this->ADORecordset_oci8($queryID,$mode);
+ parent::__construct($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 +132,37 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
}
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
+
// lowercase field names...
- function &_FetchField($fieldOffset = -1)
+ function _FetchField($fieldOffset = -1)
{
- $fld = new ADOFieldObject;
- $fieldOffset += 1;
- $fld->name = strtolower(OCIcolumnname($this->_queryID, $fieldOffset));
- $fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
- $fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
- if ($fld->type == 'NUMBER') {
- //$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
- $sc = OCIColumnScale($this->_queryID, $fieldOffset);
- if ($sc == 0) $fld->type = 'INT';
- }
- return $fld;
- }
- /*
- function MoveNext()
- {
- if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
- $this->_currentRow += 1;
- return true;
+ $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 +175,53 @@ class ADORecordset_oci8po extends ADORecordset_oci8 {
$this->_currentRow++;
}
return false;
- }
-
+ }
+
/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
- function &GetArrayLimit($nrows,$offset=-1)
+ function GetArrayLimit($nrows,$offset=-1)
{
if ($offset <= 0) {
$arr = $this->GetArray($nrows);
return $arr;
}
- for ($i=1; $i < $offset; $i++)
+ for ($i=1; $i < $offset; $i++)
if (!@OCIFetch($this->_queryID)) {
$arr = array();
return $arr;
}
- 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/libraries/adodb/drivers/adodb-oci8quercus.inc.php b/libraries/adodb/drivers/adodb-oci8quercus.inc.php
new file mode 100644
index 000000000..1940e802e
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-oci8quercus.inc.php
@@ -0,0 +1,89 @@
+<?php
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim. All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ 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 :<bindvar>
+
+ Should some emulation of RecordCount() be implemented?
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
+
+class ADODB_oci8quercus extends ADODB_oci8 {
+ var $databaseType = 'oci8quercus';
+ var $dataProvider = 'oci8';
+
+ function __construct()
+ {
+ }
+
+}
+
+/*--------------------------------------------------------------------------------------
+ Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8quercus extends ADORecordset_oci8 {
+
+ var $databaseType = 'oci8quercus';
+
+ function __construct($queryID,$mode=false)
+ {
+ parent::__construct($queryID,$mode);
+ }
+
+ function _FetchField($fieldOffset = -1)
+ {
+ global $QUERCUS;
+ $fld = new ADOFieldObject;
+
+ if (!empty($QUERCUS)) {
+ $fld->name = oci_field_name($this->_queryID, $fieldOffset);
+ $fld->type = oci_field_type($this->_queryID, $fieldOffset);
+ $fld->max_length = oci_field_size($this->_queryID, $fieldOffset);
+
+ //if ($fld->name == 'VAL6_NUM_12_4') $fld->type = 'NUMBER';
+ switch($fld->type) {
+ case 'string': $fld->type = 'VARCHAR'; break;
+ case 'real': $fld->type = 'NUMBER'; break;
+ }
+ } else {
+ $fieldOffset += 1;
+ $fld->name = oci_field_name($this->_queryID, $fieldOffset);
+ $fld->type = oci_field_type($this->_queryID, $fieldOffset);
+ $fld->max_length = oci_field_size($this->_queryID, $fieldOffset);
+ }
+ switch($fld->type) {
+ case 'NUMBER':
+ $p = oci_field_precision($this->_queryID, $fieldOffset);
+ $sc = oci_field_scale($this->_queryID, $fieldOffset);
+ if ($p != 0 && $sc == 0) $fld->type = 'INT';
+ $fld->scale = $p;
+ break;
+
+ case 'CLOB':
+ case 'NCLOB':
+ case 'BLOB':
+ $fld->max_length = -1;
+ break;
+ }
+
+ return $fld;
+ }
+
+}
diff --git a/libraries/adodb/drivers/adodb-odbc.inc.php b/libraries/adodb/drivers/adodb-odbc.inc.php
index 0a61d3e66..efaa5bb1a 100644
--- a/libraries/adodb/drivers/adodb-odbc.inc.php
+++ b/libraries/adodb/drivers/adodb-odbc.inc.php
@@ -1,26 +1,28 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Requires ODBC. Works on Windows and Unix.
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
define("_ADODB_ODBC_LAYER", 2 );
-
+
/*--------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------*/
class ADODB_odbc extends ADOConnection {
- var $databaseType = "odbc";
+ var $databaseType = "odbc";
var $fmtDate = "'Y-m-d'";
var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
var $replaceQuote = "''"; // string to use to replace quotes
@@ -30,7 +32,7 @@ class ADODB_odbc extends ADOConnection {
var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive
// breaking backward-compat
//var $longreadlen = 8000; // default number of chars to return for a Blob/Long field
- var $_bindInputArray = false;
+ var $_bindInputArray = false;
var $curmode = SQL_CUR_USE_DRIVER; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L
var $_genSeqSQL = "create table %s (id integer)";
var $_autocommit = true;
@@ -38,39 +40,43 @@ class ADODB_odbc extends ADOConnection {
var $_has_stupid_odbc_fetch_api_change = true;
var $_lastAffectedRows = 0;
var $uCaseTables = true; // for meta* functions, uppercase table names
-
- function ADODB_odbc()
- {
+
+ function __construct()
+ {
$this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
}
-
+
// returns true or false
function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
{
global $php_errormsg;
-
+
if (!function_exists('odbc_connect')) return null;
-
- if ($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 = '';
if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-
+
return $this->_connectionID != false;
}
-
+
// returns true or false
function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
{
global $php_errormsg;
-
+
if (!function_exists('odbc_connect')) return null;
-
+
if (isset($php_errormsg)) $php_errormsg = '';
$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
if ($this->debug && $argDatabasename) {
@@ -79,27 +85,27 @@ class ADODB_odbc extends ADOConnection {
// print "dsn=$argDSN u=$argUsername p=$argPassword<br>"; flush();
if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
-
+
$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-
+
return $this->_connectionID != false;
}
-
+
function ServerInfo()
{
-
+
if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
$dsn = strtoupper($this->host);
$first = true;
$found = false;
-
+
if (!function_exists('odbc_data_source')) return false;
-
+
while(true) {
-
+
$rez = @odbc_data_source($this->_connectionID,
$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
$first = false;
@@ -108,7 +114,7 @@ class ADODB_odbc extends ADOConnection {
$found = true;
break;
}
- }
+ }
if (!$found) return ADOConnection::ServerInfo();
if (!isset($rez['version'])) $rez['version'] = '';
return $rez;
@@ -117,7 +123,7 @@ class ADODB_odbc extends ADOConnection {
}
}
-
+
function CreateSequence($seqname='adodbseq',$start=1)
{
if (empty($this->_genSeqSQL)) return false;
@@ -126,22 +132,22 @@ class ADODB_odbc extends ADOConnection {
$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 +155,24 @@ class ADODB_odbc extends ADOConnection {
while (--$MAXLOOPS>=0) {
$num = $this->GetOne("select id from $seq");
if ($num === false) {
- $this->Execute(sprintf($this->_genSeqSQL ,$seq));
+ $this->Execute(sprintf($this->_genSeqSQL ,$seq));
$start -= 1;
$num = '0';
$ok = $this->Execute("insert into $seq values($start)");
if (!$ok) return false;
- }
+ }
$this->Execute("update $seq set id=id+1 where id=$num");
-
+
if ($this->affected_rows() > 0) {
$num += 1;
$this->genID = $num;
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) {
@@ -178,40 +190,40 @@ class ADODB_odbc extends ADOConnection {
return @odbc_errormsg($this->_connectionID);
} else return ADOConnection::ErrorMsg();
}
-
+
function ErrorNo()
{
-
+
if ($this->_haserrorfunctions) {
if ($this->_errorCode !== false) {
// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
}
- if (empty($this->_connectionID)) $e = @odbc_error();
+ if (empty($this->_connectionID)) $e = @odbc_error();
else $e = @odbc_error($this->_connectionID);
-
+
// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
// so we check and patch
if (strlen($e)<=2) return 0;
return $e;
} else return ADOConnection::ErrorNo();
}
-
-
+
+
function BeginTrans()
- {
+ {
if (!$this->hasTransactions) return false;
- if ($this->transOff) return true;
+ if ($this->transOff) return true;
$this->transCnt += 1;
$this->_autocommit = false;
return odbc_autocommit($this->_connectionID,false);
}
-
- function CommitTrans($ok=true)
- {
- if ($this->transOff) return true;
+
+ function CommitTrans($ok=true)
+ {
+ if ($this->transOff) return true;
if (!$ok) return $this->RollbackTrans();
if ($this->transCnt) $this->transCnt -= 1;
$this->_autocommit = true;
@@ -219,21 +231,21 @@ class ADODB_odbc extends ADOConnection {
odbc_autocommit($this->_connectionID,true);
return $ret;
}
-
+
function RollbackTrans()
{
- if ($this->transOff) return true;
+ if ($this->transOff) return true;
if ($this->transCnt) $this->transCnt -= 1;
$this->_autocommit = true;
$ret = odbc_rollback($this->_connectionID);
odbc_autocommit($this->_connectionID,true);
return $ret;
}
-
- function MetaPrimaryKeys($table)
+
+ function MetaPrimaryKeys($table,$owner=false)
{
global $ADODB_FETCH_MODE;
-
+
if ($this->uCaseTables) $table = strtoupper($table);
$schema = '';
$this->_findschema($table,$schema);
@@ -241,18 +253,18 @@ class ADODB_odbc extends ADOConnection {
$savem = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
$qid = @odbc_primarykeys($this->_connectionID,'',$schema,$table);
-
+
if (!$qid) {
$ADODB_FETCH_MODE = $savem;
return false;
}
$rs = new ADORecordSet_odbc($qid);
$ADODB_FETCH_MODE = $savem;
-
+
if (!$rs) return false;
$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-
- $arr =& $rs->GetArray();
+
+ $arr = $rs->GetArray();
$rs->Close();
//print_r($arr);
$arr2 = array();
@@ -261,39 +273,39 @@ class ADODB_odbc extends ADOConnection {
}
return $arr2;
}
-
-
-
- function &MetaTables($ttype=false)
+
+
+
+ function MetaTables($ttype=false,$showSchema=false,$mask=false)
{
global $ADODB_FETCH_MODE;
-
+
$savem = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
$qid = odbc_tables($this->_connectionID);
-
+
$rs = new ADORecordSet_odbc($qid);
-
+
$ADODB_FETCH_MODE = $savem;
if (!$rs) {
$false = false;
return $false;
}
$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-
- $arr =& $rs->GetArray();
+
+ $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 +313,7 @@ class ADODB_odbc extends ADOConnection {
}
return $arr2;
}
-
+
/*
See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
/ SQL data type codes /
@@ -333,7 +345,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
function ODBCTypes($t)
{
switch ((integer)$t) {
- case 1:
+ case 1:
case 12:
case 0:
case -95:
@@ -344,52 +356,52 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
return 'X';
case -4: //image
return 'B';
-
- case 9:
+
+ case 9:
case 91:
return 'D';
-
+
case 10:
case 11:
case 92:
case 93:
return 'T';
-
+
case 4:
case 5:
case -6:
return 'I';
-
+
case -11: // uniqidentifier
return 'R';
case -7: //bit
return 'L';
-
+
default:
return 'N';
}
}
-
- function &MetaColumns($table)
+
+ function MetaColumns($table, $normalize=true)
{
global $ADODB_FETCH_MODE;
-
+
$false = false;
if ($this->uCaseTables) $table = strtoupper($table);
$schema = '';
$this->_findschema($table,$schema);
-
+
$savem = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-
+
/*if (false) { // after testing, confirmed that the following does not work becoz of a bug
$qid2 = odbc_tables($this->_connectionID);
- $rs = new ADORecordSet_odbc($qid2);
+ $rs = new ADORecordSet_odbc($qid2);
$ADODB_FETCH_MODE = $savem;
if (!$rs) return false;
$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
$rs->_fetch();
-
+
while (!$rs->EOF) {
if ($table == strtoupper($rs->fields[2])) {
$q = $rs->fields[0];
@@ -399,38 +411,38 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
$rs->MoveNext();
}
$rs->Close();
-
+
$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
} */
-
+
switch ($this->databaseType) {
case 'access':
case 'vfp':
$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
break;
-
-
+
+
case 'db2':
$colname = "%";
$qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
break;
-
+
default:
$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
if (empty($qid)) $qid = odbc_columns($this->_connectionID);
break;
}
if (empty($qid)) return $false;
-
- $rs =& new ADORecordSet_odbc($qid);
+
+ $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
@@ -452,31 +464,31 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
$fld = new ADOFieldObject();
$fld->name = $rs->fields[3];
$fld->type = $this->ODBCTypes($rs->fields[4]);
-
+
// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
// access uses precision to store length for char/varchar
if ($fld->type == 'C' or $fld->type == 'X') {
- if ($this->databaseType == 'access')
+ if ($this->databaseType == 'access')
$fld->max_length = $rs->fields[6];
else if ($rs->fields[4] <= -95) // UNICODE
$fld->max_length = $rs->fields[7]/2;
else
$fld->max_length = $rs->fields[7];
- } else
+ } else
$fld->max_length = $rs->fields[7];
$fld->not_null = !empty($rs->fields[10]);
$fld->scale = $rs->fields[8];
- $retarr[strtoupper($fld->name)] = $fld;
+ $retarr[strtoupper($fld->name)] = $fld;
} else if (sizeof($retarr)>0)
break;
$rs->MoveNext();
}
$rs->Close(); //-- crashes 4.03pl1 -- why?
-
+
if (empty($retarr)) $retarr = false;
return $retarr;
}
-
+
function Prepare($sql)
{
if (! $this->_bindInputArray) return $sql; // no binding
@@ -489,24 +501,24 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
}
/* returns queryID or false */
- function _query($sql,$inputarr=false)
+ function _query($sql,$inputarr=false)
{
GLOBAL $php_errormsg;
if (isset($php_errormsg)) $php_errormsg = '';
$this->_error = '';
-
+
if ($inputarr) {
if (is_array($sql)) {
$stmtid = $sql[1];
} else {
$stmtid = odbc_prepare($this->_connectionID,$sql);
-
+
if ($stmtid == false) {
$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
return false;
}
}
-
+
if (! odbc_execute($stmtid,$inputarr)) {
//@odbc_free_result($stmtid);
if ($this->_haserrorfunctions) {
@@ -515,7 +527,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
}
return false;
}
-
+
} else if (is_array($sql)) {
$stmtid = $sql[1];
if (!odbc_execute($stmtid)) {
@@ -528,7 +540,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
}
} else
$stmtid = odbc_exec($this->_connectionID,$sql);
-
+
$this->_lastAffectedRows = 0;
if ($stmtid) {
if (@odbc_num_fields($stmtid) == 0) {
@@ -539,7 +551,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
odbc_binmode($stmtid,$this->binmode);
odbc_longreadlen($stmtid,$this->maxblobsize);
}
-
+
if ($this->_haserrorfunctions) {
$this->_errorMsg = '';
$this->_errorCode = 0;
@@ -558,9 +570,9 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
/*
Insert a null into the blob field of the table first.
Then use UpdateBlob to store the blob.
-
+
Usage:
-
+
$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
*/
@@ -568,7 +580,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
{
return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
}
-
+
// returns true or false
function _close()
{
@@ -581,44 +593,44 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
{
return $this->_lastAffectedRows;
}
-
+
}
-
+
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
-class ADORecordSet_odbc extends ADORecordSet {
-
+class ADORecordSet_odbc extends ADORecordSet {
+
var $bind = false;
- var $databaseType = "odbc";
+ var $databaseType = "odbc";
var $dataProvider = "odbc";
var $useFetchArray;
var $_has_stupid_odbc_fetch_api_change;
-
- function ADORecordSet_odbc($id,$mode=false)
+
+ 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 +639,7 @@ class ADORecordSet_odbc extends ADORecordSet {
else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
return $o;
}
-
+
/* Use associative array to get fields array */
function Fields($colname)
{
@@ -642,8 +654,8 @@ class ADORecordSet_odbc extends ADORecordSet {
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
-
+
+
function _initrs()
{
global $ADODB_COUNTRECS;
@@ -653,66 +665,56 @@ class ADORecordSet_odbc extends ADORecordSet {
if ($this->_numOfRows == 0) $this->_numOfRows = -1;
//$this->useFetchArray = $this->connection->useFetchArray;
$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
- }
-
+ }
+
function _seek($row)
{
return false;
}
-
+
// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
- function &GetArrayLimit($nrows,$offset=-1)
+ function GetArrayLimit($nrows,$offset=-1)
{
if ($offset <= 0) {
- $rs =& $this->GetArray($nrows);
+ $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()
{
-
+ $this->fields = false;
if ($this->_has_stupid_odbc_fetch_api_change)
$rez = @odbc_fetch_into($this->_queryID,$this->fields);
else {
@@ -721,18 +723,16 @@ class ADORecordSet_odbc extends ADORecordSet {
}
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/libraries/adodb/drivers/adodb-odbc_db2.inc.php b/libraries/adodb/drivers/adodb-odbc_db2.inc.php
index 96e5dc0d9..fa6d8b849 100644
--- a/libraries/adodb/drivers/adodb-odbc_db2.inc.php
+++ b/libraries/adodb/drivers/adodb-odbc_db2.inc.php
@@ -1,15 +1,17 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
DB2 data driver. Requires ODBC.
-
+
From phpdb list:
Hi Andrew,
@@ -40,18 +42,18 @@ Kind regards,
Christian Szardenings
2 Oct 2001
-Mark Newnham has discovered that the SQL_CUR_USE_ODBC is not supported by
+Mark Newnham has discovered that the SQL_CUR_USE_ODBC is not supported by
IBM's DB2 ODBC driver, so this must be a 3rd party ODBC driver.
From the IBM CLI Reference:
-SQL_ATTR_ODBC_CURSORS (DB2 CLI v5)
+SQL_ATTR_ODBC_CURSORS (DB2 CLI v5)
This connection attribute is defined by ODBC, but is not supported by DB2
CLI. Any attempt to set or get this attribute will result in an SQLSTATE of
-HYC00 (Driver not capable).
+HYC00 (Driver not capable).
A 32-bit option specifying how the Driver Manager uses the ODBC cursor
-library.
+library.
So I guess this means the message [above] was related to using a 3rd party
odbc driver.
@@ -69,15 +71,15 @@ $db->Connect($dsn, $userid, $pwd);
USING CLI INTERFACE
===================
-I have had reports that the $host and $database params have to be reversed in
+I have had reports that the $host and $database params have to be reversed in
Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
> The symptom is that if I change the database engine from postgres or any other to DB2 then the following
-> connection command becomes wrong despite being described this version to be correct in the docs.
+> connection command becomes wrong despite being described this version to be correct in the docs.
>
> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
>
-> In case of DB2 I had to swap the first and last arguments in order to connect properly.
+> In case of DB2 I had to swap the first and last arguments in order to connect properly.
System Error 5
@@ -96,12 +98,12 @@ if (!defined('ADODB_ODBC_DB2')){
define('ADODB_ODBC_DB2',1);
class ADODB_ODBC_DB2 extends ADODB_odbc {
- var $databaseType = "db2";
+ var $databaseType = "db2";
var $concat_operator = '||';
var $sysTime = 'CURRENT TIME';
var $sysDate = 'CURRENT DATE';
var $sysTimeStamp = 'CURRENT TIMESTAMP';
- // The complete string representation of a timestamp has the form
+ // The complete string representation of a timestamp has the form
// yyyy-mm-dd-hh.mm.ss.nnnnnn.
var $fmtTimeStamp = "'Y-m-d-H.i.s'";
var $ansiOuter = true;
@@ -109,18 +111,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 +130,54 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
}
-
+
function _insertid()
{
return $this->GetOne($this->identitySQL);
}
-
- function RowLock($tables,$where,$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 +186,7 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
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 +199,11 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
// get index details
$table = strtoupper($table);
$SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'";
- if ($primary)
+ if ($primary)
$SQL.= " AND UNIQUERULE='P'";
$rs = $this->Execute($SQL);
if (!is_object($rs)) {
- if (isset($savem))
+ if (isset($savem))
$this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
return $false;
@@ -216,20 +218,20 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
$cols = ltrim($row[2],'+');
$indexes[$row[0]]['columns'] = explode('+', $cols);
}
- if (isset($savem)) {
+ if (isset($savem)) {
$this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
}
return $indexes;
}
-
+
// Format date column in sql string given an input format that understands Y M D
function SQLDate($fmt, $col=false)
- {
+ {
// use right() and replace() ?
if (!$col) $col = $this->sysDate;
$s = '';
-
+
$len = strlen($fmt);
for ($i=0; $i < $len; $i++) {
if ($s) $s .= '||';
@@ -251,7 +253,7 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
break;
case 'H':
case 'h':
- if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
+ if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
else $s .= "''";
break;
case 'i':
@@ -275,38 +277,38 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
}
}
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)
+
+class ADORecordSet_odbc_db2 extends ADORecordSet_odbc {
+
+ var $databaseType = "db2";
+
+ function __construct($id,$mode=false)
{
- $this->ADORecordSet_odbc($id,$mode);
+ parent::__construct($id,$mode);
}
function MetaType($t,$len=-1,$fieldobj=false)
@@ -316,53 +318,52 @@ class ADORecordSet_odbc_db2 extends ADORecordSet_odbc {
$t = $fieldobj->type;
$len = $fieldobj->max_length;
}
-
+
switch (strtoupper($t)) {
case 'VARCHAR':
case 'CHAR':
case 'CHARACTER':
case 'C':
if ($len <= $this->blobSize) return 'C';
-
+
case 'LONGCHAR':
case 'TEXT':
case 'CLOB':
case 'DBCLOB': // double-byte
case 'X':
return 'X';
-
+
case 'BLOB':
case 'GRAPHIC':
case 'VARGRAPHIC':
return 'B';
-
+
case 'DATE':
case 'D':
return 'D';
-
+
case 'TIME':
case 'TIMESTAMP':
case 'T':
return 'T';
-
- //case 'BOOLEAN':
+
+ //case 'BOOLEAN':
//case 'BIT':
// return 'L';
-
+
//case 'COUNTER':
// return 'R';
-
+
case 'INT':
case 'INTEGER':
case 'BIGINT':
case 'SMALLINT':
case 'I':
return 'I';
-
+
default: return 'N';
}
}
}
} //define
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-odbc_mssql.inc.php b/libraries/adodb/drivers/adodb-odbc_mssql.inc.php
index d9186a122..aa6431680 100644
--- a/libraries/adodb/drivers/adodb-odbc_mssql.inc.php
+++ b/libraries/adodb/drivers/adodb-odbc_mssql.inc.php
@@ -1,14 +1,16 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix.
+
+ MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix.
For Unix configuration, see http://phpbuilder.com/columns/alberto20000919.php3
*/
@@ -19,14 +21,19 @@ if (!defined('_ADODB_ODBC_LAYER')) {
include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
}
-
-class ADODB_odbc_mssql extends ADODB_odbc {
+
+class ADODB_odbc_mssql extends ADODB_odbc {
var $databaseType = 'odbc_mssql';
var $fmtDate = "'Y-m-d'";
- var $fmtTimeStamp = "'Y-m-d H:i:s'";
+ var $fmtTimeStamp = "'Y-m-d\TH:i:s'";
var $_bindInputArray = true;
+ var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'";
var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE'))";
- 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,15 +42,15 @@ 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()
+
+ function __construct()
{
- $this->ADODB_odbc();
- //$this->curmode = SQL_CUR_USE_ODBC;
+ parent::__construct();
+ //$this->curmode = SQL_CUR_USE_ODBC;
}
// crashes php...
@@ -60,31 +67,31 @@ class ADODB_odbc_mssql extends ADODB_odbc {
return $arr;
}
- function IfNull( $field, $ifNull )
+ function IfNull( $field, $ifNull )
{
return " ISNULL($field, $ifNull) "; // if MS SQL Server
}
-
+
function _insertid()
{
// SCOPE_IDENTITY()
- // Returns the last IDENTITY value inserted into an IDENTITY column in
- // the same scope. A scope is a module -- a stored procedure, trigger,
- // function, or batch. Thus, two statements are in the same scope if
+ // Returns the last IDENTITY value inserted into an IDENTITY column in
+ // the same scope. A scope is a module -- a stored procedure, trigger,
+ // function, or batch. Thus, two statements are in the same scope if
// they are in the same stored procedure, function, or batch.
return $this->GetOne($this->identitySQL);
}
-
-
+
+
function MetaForeignKeys($table, $owner=false, $upper=false)
{
global $ADODB_FETCH_MODE;
-
+
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
$table = $this->qstr(strtoupper($table));
-
- $sql =
+
+ $sql =
"select object_name(constid) as constraint_name,
col_name(fkeyid, fkey) as column_name,
object_name(rkeyid) as referenced_table_name,
@@ -92,20 +99,20 @@ class ADODB_odbc_mssql extends ADODB_odbc {
from sysforeignkeys
where upper(object_name(fkeyid)) = $table
order by constraint_name, referenced_table_name, keyno";
-
- $constraints =& $this->GetArray($sql);
-
+
+ $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 +121,127 @@ order by constraint_name, referenced_table_name, keyno";
}
return $arr2;
}
-
- function &MetaTables($ttype=false,$showSchema=false,$mask=false)
+
+ function MetaTables($ttype=false,$showSchema=false,$mask=false)
{
- if ($mask) {$this->debug=1;
+ 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 +251,51 @@ order by constraint_name, referenced_table_name, keyno";
if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
$this->Execute("SET TRANSACTION ".$transaction_mode);
}
-
+
// "Stein-Aksel Basma" <basma@accelero.no>
// 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)
{
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 +322,11 @@ order by constraint_name, referenced_table_name, keyno";
case 'h':
$s .= "substring(convert(char(14),$col,0),13,2)";
break;
-
+
case 'H':
$s .= "replace(str(datepart(hh,$col),2),' ','0')";
break;
-
+
case 'i':
$s .= "replace(str(datepart(mi,$col),2),' ','0')";
break;
@@ -238,7 +337,7 @@ order by constraint_name, referenced_table_name, keyno";
case 'A':
$s .= "substring(convert(char(19),$col,0),18,2)";
break;
-
+
default:
if ($ch == '\\') {
$i++;
@@ -251,15 +350,14 @@ order by constraint_name, referenced_table_name, keyno";
return $s;
}
-}
-
-class ADORecordSet_odbc_mssql extends ADORecordSet_odbc {
-
+}
+
+class ADORecordSet_odbc_mssql extends ADORecordSet_odbc {
+
var $databaseType = 'odbc_mssql';
-
- function ADORecordSet_odbc_mssql($id,$mode=false)
+
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbc($id,$mode);
- }
+ return parent::__construct($id,$mode);
+ }
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-odbc_oracle.inc.php b/libraries/adodb/drivers/adodb-odbc_oracle.inc.php
index a77bcd23b..dfa851c0a 100644
--- a/libraries/adodb/drivers/adodb-odbc_oracle.inc.php
+++ b/libraries/adodb/drivers/adodb-odbc_oracle.inc.php
@@ -1,14 +1,16 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Oracle support via ODBC. Requires ODBC. Works on Windows.
+
+ Oracle support via ODBC. Requires ODBC. Works on Windows.
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
@@ -17,26 +19,21 @@ if (!defined('_ADODB_ODBC_LAYER')) {
include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
}
-
-class ADODB_odbc_oracle extends ADODB_odbc {
+
+class ADODB_odbc_oracle extends ADODB_odbc {
var $databaseType = 'odbc_oracle';
var $replaceQuote = "''"; // string to use to replace quotes
var $concat_operator='||';
- var $fmtDate = "'Y-m-d 00:00:00'";
+ var $fmtDate = "'Y-m-d 00:00:00'";
var $fmtTimeStamp = "'Y-m-d h:i:sA'";
var $metaTablesSQL = 'select table_name from cat';
var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
var $sysDate = "TRUNC(SYSDATE)";
var $sysTimeStamp = 'SYSDATE';
-
+
//var $_bindInputArray = false;
-
- function ADODB_odbc_oracle()
- {
- $this->ADODB_odbc();
- }
-
- function &MetaTables()
+
+ function MetaTables($ttype = false, $showSchema = false, $mask = false)
{
$false = false;
$rs = $this->Execute($this->metaTablesSQL);
@@ -49,13 +46,13 @@ class ADODB_odbc_oracle extends ADODB_odbc {
$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 +62,26 @@ class ADODB_odbc_oracle extends ADODB_odbc {
$fld->name = $rs->fields[0];
$fld->type = $rs->fields[1];
$fld->max_length = $rs->fields[2];
-
-
- if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
+
+
+ if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
else $retarr[strtoupper($fld->name)] = $fld;
-
+
$rs->MoveNext();
}
$rs->Close();
- return $retarr;
+ return $retarr;
}
// returns true or false
function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
{
global $php_errormsg;
-
+
$php_errormsg = '';
$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
$this->_errorMsg = $php_errormsg;
-
+
$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
return $this->_connectionID != false;
@@ -96,20 +93,19 @@ class ADODB_odbc_oracle extends ADODB_odbc {
$php_errormsg = '';
$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
$this->_errorMsg = $php_errormsg;
-
+
$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
return $this->_connectionID != false;
}
-}
-
-class ADORecordSet_odbc_oracle extends ADORecordSet_odbc {
-
+}
+
+class ADORecordSet_odbc_oracle extends ADORecordSet_odbc {
+
var $databaseType = 'odbc_oracle';
-
- function ADORecordSet_odbc_oracle($id,$mode=false)
+
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbc($id,$mode);
+ return parent::__construct($id,$mode);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-odbtp.inc.php b/libraries/adodb/drivers/adodb-odbtp.inc.php
index 270d2fa8f..ec374a5db 100644
--- a/libraries/adodb/drivers/adodb-odbtp.inc.php
+++ b/libraries/adodb/drivers/adodb-odbtp.inc.php
@@ -1,6 +1,8 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
@@ -33,7 +35,7 @@ class ADODB_odbtp extends ADOConnection{
var $_canPrepareSP = false;
var $_dontPoolDBC = true;
- function ADODB_odbtp()
+ function __construct()
{
}
@@ -45,15 +47,38 @@ class ADODB_odbtp extends ADOConnection{
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 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)";
+ }
+*/
function _insertid()
{
@@ -97,7 +122,7 @@ class ADODB_odbtp extends ADOConnection{
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,11 +174,17 @@ class ADODB_odbtp extends ADOConnection{
//if uid & pwd can be separate
function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
{
- $this->_connectionID = @odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
+ 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);
@@ -164,7 +195,7 @@ class ADODB_odbtp extends ADOConnection{
$this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, $this->_connectionID);
$dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, $this->_connectionID));
$this->odbc_name = $dbms;
-
+
// Account for inconsistent DBMS names
if( $this->odbc_driver == ODB_DRIVER_ORACLE )
$dbms = 'oracle';
@@ -189,7 +220,7 @@ class ADODB_odbtp extends ADOConnection{
$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;
@@ -215,6 +246,7 @@ class ADODB_odbtp extends ADOConnection{
$this->replaceQuote = "'+chr(39)+'";
$this->true = '.T.';
$this->false = '.F.';
+
break;
case 'oracle':
$this->databaseType = 'odbtp_oci8';
@@ -236,7 +268,7 @@ class ADODB_odbtp extends ADOConnection{
$this->rightOuter = '=*';
$this->hasInsertID = true;
$this->hasTransactions = true;
- $this->identitySQL = 'select @@IDENTITY';
+ $this->identitySQL = 'select SCOPE_IDENTITY()';
break;
default:
$this->databaseType = 'odbtp';
@@ -268,17 +300,17 @@ class ADODB_odbtp extends ADOConnection{
$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
return true;
}
-
- function &MetaTables($ttype='',$showSchema=false,$mask=false)
+
+ 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;
@@ -286,12 +318,12 @@ class ADODB_odbtp extends ADOConnection{
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;
@@ -302,9 +334,9 @@ class ADODB_odbtp extends ADOConnection{
$savem = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-
+
$rs = $this->Execute( "||SQLColumns||$schema|$table" );
-
+
if (isset($savefm)) $this->SetFetchMode($savefm);
$ADODB_FETCH_MODE = $savem;
@@ -322,10 +354,11 @@ class ADODB_odbtp extends ADOConnection{
$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;
@@ -336,13 +369,13 @@ class ADODB_odbtp extends ADOConnection{
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);
@@ -353,13 +386,13 @@ class ADODB_odbtp extends ADOConnection{
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;
@@ -371,7 +404,7 @@ class ADODB_odbtp extends ADOConnection{
$false = false;
return $false;
}
-
+
$arr2 = array();
foreach($arr as $k => $v) {
@@ -419,19 +452,23 @@ class ADODB_odbtp extends ADOConnection{
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()."<br>";
@@ -440,10 +477,13 @@ class ADODB_odbtp extends ADOConnection{
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);
@@ -506,6 +546,56 @@ class ADODB_odbtp extends ADOConnection{
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 ) {
@@ -520,7 +610,10 @@ class ADODB_odbtp extends ADOConnection{
function _query($sql,$inputarr=false)
{
global $php_errormsg;
-
+
+ $this->_errorMsg = false;
+ $this->_errorCode = false;
+
if ($inputarr) {
if (is_array($sql)) {
$stmtid = $sql[1];
@@ -532,10 +625,20 @@ class ADODB_odbtp extends ADOConnection{
}
}
$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;
}
@@ -545,7 +648,7 @@ class ADODB_odbtp extends ADOConnection{
return false;
}
} else {
- $stmtid = @odbtp_query($sql,$this->_connectionID);
+ $stmtid = odbtp_query($sql,$this->_connectionID);
}
$this->_lastAffectedRows = 0;
if ($stmtid) {
@@ -567,14 +670,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()
@@ -597,7 +700,7 @@ class ADORecordSet_odbtp extends ADORecordSet {
}
}
- function &FetchField($fieldOffset = 0)
+ function FetchField($fieldOffset = 0)
{
$off=$fieldOffset; // offsets begin at 0
$o= new ADOFieldObject();
@@ -640,6 +743,12 @@ class ADORecordSet_odbtp extends ADORecordSet {
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);
}
@@ -684,9 +793,9 @@ class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp {
var $databaseType = 'odbtp_mssql';
- function ADORecordSet_odbtp_mssql($id,$mode=false)
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbtp($id,$mode);
+ return parent::__construct($id,$mode);
}
}
@@ -694,9 +803,9 @@ class ADORecordSet_odbtp_access extends ADORecordSet_odbtp {
var $databaseType = 'odbtp_access';
- function ADORecordSet_odbtp_access($id,$mode=false)
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbtp($id,$mode);
+ return parent::__construct($id,$mode);
}
}
@@ -704,9 +813,9 @@ class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp {
var $databaseType = 'odbtp_vfp';
- function ADORecordSet_odbtp_vfp($id,$mode=false)
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbtp($id,$mode);
+ return parent::__construct($id,$mode);
}
}
@@ -714,9 +823,9 @@ class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp {
var $databaseType = 'odbtp_oci8';
- function ADORecordSet_odbtp_oci8($id,$mode=false)
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbtp($id,$mode);
+ return parent::__construct($id,$mode);
}
}
@@ -724,9 +833,8 @@ class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
var $databaseType = 'odbtp_sybase';
- function ADORecordSet_odbtp_sybase($id,$mode=false)
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbtp($id,$mode);
+ return parent::__construct($id,$mode);
}
}
-?>
diff --git a/libraries/adodb/drivers/adodb-odbtp_unicode.inc.php b/libraries/adodb/drivers/adodb-odbtp_unicode.inc.php
index f291bb32e..5ca03e717 100644
--- a/libraries/adodb/drivers/adodb-odbtp_unicode.inc.php
+++ b/libraries/adodb/drivers/adodb-odbtp_unicode.inc.php
@@ -1,6 +1,8 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
@@ -30,10 +32,4 @@ if (!defined('_ADODB_ODBTP_LAYER')) {
class ADODB_odbtp_unicode extends ADODB_odbtp {
var $databaseType = 'odbtp';
var $_useUnicodeSQL = true;
-
- function ADODB_odbtp_unicode()
- {
- $this->ADODB_odbtp();
- }
}
-?>
diff --git a/libraries/adodb/drivers/adodb-oracle.inc.php b/libraries/adodb/drivers/adodb-oracle.inc.php
index 69df13b32..ca737d668 100644
--- a/libraries/adodb/drivers/adodb-oracle.inc.php
+++ b/libraries/adodb/drivers/adodb-oracle.inc.php
@@ -1,14 +1,16 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Latest version is available at http://adodb.sourceforge.net
-
+
Oracle data driver. Requires Oracle client. Works on Windows and Unix and Oracle 7.
-
+
If you are using Oracle 8 or later, use the oci8 driver which is much better and more reliable.
*/
@@ -21,67 +23,71 @@ class ADODB_oracle extends ADOConnection {
var $concat_operator='||';
var $_curs;
var $_initdate = true; // init date to YYYY-MM-DD
- var $metaTablesSQL = 'select table_name from cat';
+ var $metaTablesSQL = 'select table_name from cat';
var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
var $sysDate = "TO_DATE(TO_CHAR(SYSDATE,'YYYY-MM-DD'),'YYYY-MM-DD')";
var $sysTimeStamp = 'SYSDATE';
var $connectSID = true;
-
- function ADODB_oracle()
+
+ function __construct()
{
}
// format and return date string in database date format
- function DBDate($d)
+ function DBDate($d, $isfld = false)
{
if (is_string($d)) $d = ADORecordSet::UnixDate($d);
- return 'TO_DATE('.adodb_date($this->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 +97,8 @@ class ADODB_oracle extends ADOConnection {
/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
- function ErrorMsg()
- {
+ function ErrorMsg()
+ {
if ($this->_errorMsg !== false) return $this->_errorMsg;
if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
@@ -100,8 +106,8 @@ class ADODB_oracle extends ADOConnection {
return $this->_errorMsg;
}
-
- function ErrorNo()
+
+ function ErrorNo()
{
if ($this->_errorCode !== false) return $this->_errorCode;
@@ -110,17 +116,17 @@ class ADODB_oracle extends ADOConnection {
return $this->_errorCode;
}
-
+
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
{
if (!function_exists('ora_plogon')) return null;
-
+
// <G. Giunta 2003/03/03/> 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 +156,7 @@ class ADODB_oracle extends ADOConnection {
if ($argDatabasename) $argUsername .= "@$argDatabasename";
//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
- if ($mode = 1)
+ if ($mode == 1)
$this->_connectionID = ora_plogon($argUsername,$argPassword);
else
$this->_connectionID = ora_logon($argUsername,$argPassword);
@@ -180,7 +186,7 @@ class ADODB_oracle extends ADOConnection {
$this->_errorCode = false;
$curs = ora_open($this->_connectionID);
-
+
if ($curs === false) return false;
$this->_curs = $curs;
if (!ora_parse($curs,$sql)) return false;
@@ -189,7 +195,7 @@ class ADODB_oracle extends ADOConnection {
// that we can obtain ONLY from the cursor (and not from the connection)
$this->_errorCode = @ora_errorcode($curs);
$this->_errorMsg = @ora_error($curs);
- // </G. Giunta 2004/03/03>
+ // </G. Giunta 2004/03/03>
@ora_close($curs);
return false;
}
@@ -215,17 +221,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 +243,7 @@ class ADORecordset_oracle extends ADORecordSet {
$this->_numOfFields = 0;
$this->EOF = true;
}
-
+
return $this->_queryID;
}
@@ -248,7 +254,7 @@ class ADORecordset_oracle extends ADORecordSet {
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 +273,10 @@ class ADORecordset_oracle extends ADORecordSet {
$this->bind[strtoupper($o->name)] = $i;
}
}
-
+
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
+
function _initrs()
{
$this->_numOfRows = -1;
@@ -286,27 +292,27 @@ class ADORecordset_oracle extends ADORecordSet {
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 +328,16 @@ class ADORecordset_oracle extends ADORecordSet {
case 'LONG VARBINARY':
case 'BLOB':
return 'B';
-
+
case 'DATE': return 'D';
-
+
//case 'T': return 'T';
-
+
case 'BIT': return 'L';
- case 'INT':
+ case 'INT':
case 'SMALLINT':
case 'INTEGER': return 'I';
default: return 'N';
}
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-pdo.inc.php b/libraries/adodb/drivers/adodb-pdo.inc.php
index e002efac5..b7b5577fa 100644
--- a/libraries/adodb/drivers/adodb-pdo.inc.php
+++ b/libraries/adodb/drivers/adodb-pdo.inc.php
@@ -1,19 +1,24 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
- Latest version is available at http://adodb.sourceforge.net
-
- Requires ODBC. Works on Windows and Unix.
-
- Problems:
+/**
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+
+ Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Requires ODBC. Works on Windows and Unix.
+
+ Problems:
Where is float/decimal type in pdo_param_type
LOB handling for CLOB/BLOB differs significantly
*/
+
// security - hide paths
if (!defined('ADODB_DIR')) die();
@@ -24,30 +29,30 @@ PDO::PARAM_NULL, 0
/* int as in long (the php native int type).
* If you mark a column as an int, PDO expects get_col to return
- * a pointer to a long
+ * a pointer to a long
PDO::PARAM_INT, 1
-/* get_col ptr should point to start of the string buffer
+/* get_col ptr should point to start of the string buffer
PDO::PARAM_STR, 2
/* get_col: when len is 0 ptr should point to a php_stream *,
* otherwise it should behave like a string. Indicate a NULL field
- * value by setting the ptr to NULL
+ * value by setting the ptr to NULL
PDO::PARAM_LOB, 3
/* get_col: will expect the ptr to point to a new PDOStatement object handle,
- * but this isn't wired up yet
-PDO::PARAM_STMT, 4 /* hierarchical result set
+ * but this isn't wired up yet
+PDO::PARAM_STMT, 4 /* hierarchical result set
-/* get_col ptr should point to a zend_bool
+/* get_col ptr should point to a zend_bool
PDO::PARAM_BOOL, 5
-/* magic flag to denote a parameter as being input/output
+/* magic flag to denote a parameter as being input/output
PDO::PARAM_INPUT_OUTPUT = 0x80000000
};
*/
-
+
function adodb_pdo_type($t)
{
switch($t) {
@@ -56,75 +61,39 @@ function adodb_pdo_type($t)
default: return 'NUMERIC';
}
}
-
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-////////////////////////////////////////////////
-
-
-
-class ADODB_pdo_base extends ADODB_pdo {
-
- var $sysDate = "'?'";
- var $sysTimeStamp = "'?'";
-
-
- function _init($parentDriver)
- {
- $parentDriver->_bindInputArray = true;
- #$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
- }
-
- function ServerInfo()
- {
- return ADOConnection::ServerInfo();
- }
-
- function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
- {
- $ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
- return $ret;
- }
-
- function MetaTables()
- {
- return false;
- }
-
- function MetaColumns()
- {
- return false;
- }
-}
+/*----------------------------------------------------------------------------*/
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;
+
+ function __construct()
{
}
-
+
function _UpdatePDO()
{
- $d = &$this->_driver;
+ $d = $this->_driver;
$this->fmtDate = $d->fmtDate;
$this->fmtTimeStamp = $d->fmtTimeStamp;
$this->replaceQuote = $d->replaceQuote;
@@ -133,21 +102,32 @@ class ADODB_pdo extends ADOConnection {
$this->random = $d->random;
$this->concat_operator = $d->concat_operator;
$this->nameQuote = $d->nameQuote;
-
+
+ $this->hasGenID = $d->hasGenID;
+ $this->_genIDSQL = $d->_genIDSQL;
+ $this->_genSeqSQL = $d->_genSeqSQL;
+ $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,7 +135,18 @@ class ADODB_pdo extends ADOConnection {
$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':
+ default:
+ $argDSN .= ';dbname='.$argDatabasename;
+ }
}
try {
$this->_connectionID = new PDO($argDSN, $argUsername, $argPassword);
@@ -166,192 +157,338 @@ class ADODB_pdo extends ADOConnection {
$this->_errormsg = 'Connection attempt failed: '.$e->getMessage();
return false;
}
-
+
if ($this->_connectionID) {
switch(ADODB_ASSOC_CASE){
- case 0: $m = PDO::CASE_LOWER; break;
- 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);
-
+
$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':
+ 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);
+ }
+
+ if (PHP_VERSION >= 5.3) {
+ return call_user_func_array('parent::Concat', $args);
+ }
+ return call_user_func_array(array($this,'parent::Concat'), $args);
+ }
+
// returns true or false
function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
{
return $this->_connect($argDSN, $argUsername, $argPassword, $argDatabasename, true);
}
-
+
/*------------------------------------------------------------------------------*/
-
-
- function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
- {
+
+
+ function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+ {
$save = $this->_driver->fetchMode;
$this->_driver->fetchMode = $this->fetchMode;
- $this->_driver->debug = $this->debug;
+ $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);
}
-
+
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 SetTransactionMode($transaction_mode)
+ {
+ if(method_exists($this->_driver, 'SetTransactionMode')) {
+ return $this->_driver->SetTransactionMode($transaction_mode);
+ }
+
+ return parent::SetTransactionMode($seqname);
+ }
+
function BeginTrans()
- {
- if (!$this->hasTransactions) return false;
- if ($this->transOff) return true;
+ {
+ 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);
+
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);
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);
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;
}
+ 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)
{
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 ($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];
@@ -376,26 +513,84 @@ class ADODB_pdo extends ADOConnection {
{
return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
}
-
+
function _insertid()
{
return ($this->_connectionID) ? $this->_connectionID->lastInsertId() : 0;
}
+
+ /**
+ * Quotes a string to be sent to the database.
+ * If we have an active connection, delegates quoting to the underlying
+ * PDO object. Otherwise, replace "'" by the value of $replaceQuote (same
+ * behavior as mysqli driver)
+ * @param string $s The string to quote
+ * @param boolean $magic_quotes If false, use PDO::quote().
+ * @return string Quoted string
+ */
+ function qstr($s, $magic_quotes = false)
+ {
+ if (!$magic_quotes) {
+ if ($this->_connectionID) {
+ return $this->_connectionID->quote($s);
+ }
+ return "'" . str_replace("'", $this->replaceQuote, $s) . "'";
+ }
+
+ // undo magic quotes for "
+ $s = str_replace('\\"', '"', $s);
+ return "'$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;
@@ -403,55 +598,73 @@ class ADOPDOStatement {
$this->_connectionID->_stmt = $savestmt;
return $rs;
}
-
+
function InParameter(&$var,$name,$maxLen=4000,$type=false)
{
- if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
- else $this->_stmt->bindParam($name, $var);
+ 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;
}
@@ -459,22 +672,26 @@ class ADORecordSet_pdo extends ADORecordSet {
switch($mode) {
case ADODB_FETCH_NUM: $mode = PDO::FETCH_NUM; break;
case ADODB_FETCH_ASSOC: $mode = PDO::FETCH_ASSOC; break;
-
- case ADODB_FETCH_BOTH:
+
+ case ADODB_FETCH_BOTH:
default: $mode = PDO::FETCH_BOTH; break;
}
$this->fetchMode = $mode;
-
+
$this->_queryID = $id;
- $this->ADORecordSet($id);
+ 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;
@@ -488,21 +705,23 @@ class ADORecordSet_pdo extends ADORecordSet {
$this->EOF = true;
}
}
-
+
function _initrs()
{
global $ADODB_COUNTRECS;
-
+
$this->_numOfRows = ($ADODB_COUNTRECS) ? @$this->_queryID->rowCount() : -1;
- if (!$this->_numOfRows) $this->_numOfRows = -1;
+ 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) {
@@ -515,38 +734,62 @@ class ADORecordSet_pdo extends ADORecordSet {
}
//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++) {
@@ -554,9 +797,7 @@ class ADORecordSet_pdo extends ADORecordSet {
$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
diff --git a/libraries/adodb/drivers/adodb-pdo_mssql.inc.php b/libraries/adodb/drivers/adodb-pdo_mssql.inc.php
index 54a681dd8..219cf1312 100644
--- a/libraries/adodb/drivers/adodb-pdo_mssql.inc.php
+++ b/libraries/adodb/drivers/adodb-pdo_mssql.inc.php
@@ -2,41 +2,43 @@
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
-
-*/
+
+*/
class ADODB_pdo_mssql extends ADODB_pdo {
-
+
var $hasTop = 'top';
var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
var $sysTimeStamp = 'GetDate()';
-
-
+
+
function _init($parentDriver)
{
-
+
$parentDriver->hasTransactions = false; ## <<< BUG IN PDO mssql driver
$parentDriver->_bindInputArray = false;
$parentDriver->hasInsertID = true;
}
-
+
function ServerInfo()
{
return ADOConnection::ServerInfo();
}
-
+
function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
{
$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
return $ret;
}
-
- function SetTransactionMode( $transaction_mode )
+
+ function SetTransactionMode( $transaction_mode )
{
$this->_transmode = $transaction_mode;
if (empty($transaction_mode)) {
@@ -46,16 +48,15 @@ class ADODB_pdo_mssql extends ADODB_pdo {
if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
$this->Execute("SET TRANSACTION ".$transaction_mode);
}
-
- function MetaTables()
+
+ 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/libraries/adodb/drivers/adodb-pdo_mysql.inc.php b/libraries/adodb/drivers/adodb-pdo_mysql.inc.php
index 3cec6d14d..36d97b6ec 100644
--- a/libraries/adodb/drivers/adodb-pdo_mysql.inc.php
+++ b/libraries/adodb/drivers/adodb-pdo_mysql.inc.php
@@ -1,69 +1,106 @@
<?php
-
-
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
-
-*/
+
+*/
class ADODB_pdo_mysql extends ADODB_pdo {
- var $metaTablesSQL = "SHOW TABLES";
- var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
- var $_bindInputArray = false;
+
+ var $metaTablesSQL = "SELECT
+ TABLE_NAME,
+ CASE WHEN TABLE_TYPE = 'VIEW' THEN 'V' ELSE 'T' END
+ FROM INFORMATION_SCHEMA.TABLES
+ WHERE TABLE_SCHEMA=";
+ var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
var $sysDate = 'CURDATE()';
var $sysTimeStamp = 'NOW()';
-
+ var $hasGenID = true;
+ var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
+ var $_dropSeqSQL = "drop table %s";
+ var $fmtTimeStamp = "'Y-m-d, H:i:s'";
+ var $nameQuote = '`';
+
function _init($parentDriver)
{
-
$parentDriver->hasTransactions = false;
- $parentDriver->_bindInputArray = true;
+ #$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;
+ }
+
+ $fraction = $dayFraction * 24 * 3600;
+ return $date . ' + INTERVAL ' . $fraction . ' SECOND';
+// return "from_unixtime(unix_timestamp($date)+$fraction)";
+ }
+
+ 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 )
+
+ 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);
@@ -71,41 +108,45 @@ class ADODB_pdo_mysql extends ADODB_pdo {
global $ADODB_FETCH_MODE;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-
- if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
- $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-
+
+ if ($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;
@@ -114,9 +155,9 @@ class ADODB_pdo_mysql extends ADODB_pdo {
$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') {
@@ -126,32 +167,136 @@ class ADODB_pdo_mysql extends ADODB_pdo {
$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)
{
$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);
+ 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;
+ }
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-pdo_oci.inc.php b/libraries/adodb/drivers/adodb-pdo_oci.inc.php
index 5c2519c13..0bca35e3c 100644
--- a/libraries/adodb/drivers/adodb-pdo_oci.inc.php
+++ b/libraries/adodb/drivers/adodb-pdo_oci.inc.php
@@ -2,13 +2,15 @@
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
-
-*/
+
+*/
class ADODB_pdo_oci extends ADODB_pdo_base {
@@ -18,46 +20,46 @@ class ADODB_pdo_oci extends ADODB_pdo_base {
var $NLS_DATE_FORMAT = 'YYYY-MM-DD'; // To include time, use 'RRRR-MM-DD HH24:MI:SS'
var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW')";
- var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno";
-
+ var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno";
+
var $_initdate = true;
var $_hasdual = true;
-
+
function _init($parentDriver)
{
$parentDriver->_bindInputArray = true;
-
+ $parentDriver->_nestedSQL = true;
if ($this->_initdate) {
$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 +75,19 @@ class ADODB_pdo_oci extends ADODB_pdo_base {
if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
$fld->type ='INT';
$fld->max_length = $rs->fields[4];
- }
+ }
$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
$fld->binary = (strpos($fld->type,'BLOB') !== false);
$fld->default_value = $rs->fields[6];
-
- if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
+
+ if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
else $retarr[strtoupper($fld->name)] = $fld;
$rs->MoveNext();
}
$rs->Close();
if (empty($retarr))
return $false;
- else
+ else
return $retarr;
}
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-pdo_pgsql.inc.php b/libraries/adodb/drivers/adodb-pdo_pgsql.inc.php
index d1cc363aa..9afe4b0e4 100644
--- a/libraries/adodb/drivers/adodb-pdo_pgsql.inc.php
+++ b/libraries/adodb/drivers/adodb-pdo_pgsql.inc.php
@@ -1,46 +1,48 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
-
-*/
+
+*/
class ADODB_pdo_pgsql extends ADODB_pdo {
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
+ '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";
// 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,40 +55,41 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
var $random = 'random()'; /// random function
var $concat_operator='||';
-
+
function _init($parentDriver)
{
-
+
$parentDriver->hasTransactions = false; ## <<< BUG IN PDO pgsql driver
$parentDriver->hasInsertID = true;
+ $parentDriver->_nestedSQL = true;
}
-
+
function ServerInfo()
{
$arr['description'] = ADOConnection::GetOne("select version()");
$arr['version'] = ADOConnection::_findvers($arr['description']);
return $arr;
}
-
- function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+
+ function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
{
$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
$limitStr = ($nrows >= 0) ? " LIMIT $nrows" : '';
if ($secs2cache)
- $rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+ $rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
else
- $rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-
+ $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) {
@@ -94,59 +97,59 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
$mask = $this->qstr(strtolower($mask));
if ($info['version']>=7.3)
$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
- union
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
+ union
select viewname,'V' from pg_views where viewname like $mask and schemaname not in ( 'pg_catalog','information_schema') ";
else
$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask
- union
+select tablename,'T' from pg_tables where tablename like $mask
+ union
select viewname,'V' from pg_views where viewname like $mask";
}
- $ret =& ADOConnection::MetaTables($ttype,$showSchema);
-
+ $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);
}
@@ -158,7 +161,7 @@ select viewname,'V' from pg_views where viewname like $mask";
$rsdef = $this->Execute($sql);
if (isset($savem)) $this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
-
+
if ($rsdef) {
while (!$rsdef->EOF) {
$num = $rsdef->fields['num'];
@@ -176,9 +179,9 @@ select viewname,'V' from pg_views where viewname like $mask";
}
unset($rsdef);
}
-
+
$retarr = array();
- while (!$rs->EOF) {
+ while (!$rs->EOF) {
$fld = new ADOFieldObject();
$fld->name = $rs->fields[0];
$fld->type = $rs->fields[1];
@@ -200,30 +203,28 @@ select viewname,'V' from pg_views where viewname like $mask";
if ($rs->fields[4] == $this->true) {
$fld->not_null = true;
}
-
+
// Freek
if (is_array($keys)) {
foreach($keys as $key) {
- if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true)
+ if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true)
$fld->primary_key = true;
- if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true)
+ if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true)
$fld->unique = true; // What name is more compatible?
}
}
-
- if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
+
+ if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-
+
$rs->MoveNext();
}
$rs->Close();
if (empty($retarr)) {
$false = false;
return $false;
- } else return $retarr;
-
+ } else return $retarr;
+
}
}
-
-?>
diff --git a/libraries/adodb/drivers/adodb-pdo_sqlite.inc.php b/libraries/adodb/drivers/adodb-pdo_sqlite.inc.php
new file mode 100644
index 000000000..d42c5191c
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-pdo_sqlite.inc.php
@@ -0,0 +1,204 @@
+<?php
+
+/*
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
+ Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Thanks Diogo Toscano (diogo#scriptcase.net) for the code.
+ And also Sid Dunayer [sdunayer#interserv.com] for extensive fixes.
+*/
+
+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)
+ {
+ $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/libraries/adodb/drivers/adodb-pdo_sqlsrv.inc.php b/libraries/adodb/drivers/adodb-pdo_sqlsrv.inc.php
new file mode 100644
index 000000000..869e8e181
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-pdo_sqlsrv.inc.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Provided by Ned Andre to support sqlsrv library
+ */
+class ADODB_pdo_sqlsrv extends ADODB_pdo
+{
+
+ var $hasTop = 'top';
+ var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+ var $sysTimeStamp = 'GetDate()';
+
+ 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)
+ {
+ 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();
+ }
+
+}
diff --git a/libraries/adodb/drivers/adodb-postgres.inc.php b/libraries/adodb/drivers/adodb-postgres.inc.php
index 496a947b3..3c866b72f 100644
--- a/libraries/adodb/drivers/adodb-postgres.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres.inc.php
@@ -1,14 +1,14 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4.
-
+
NOTE: Since 3.31, this file is no longer used, and the "postgres" driver is
remapped to "postgres7". Maintaining multiple postgres drivers is no easy
job, so hopefully this will ensure greater consistency and fewer bugs.
*/
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-postgres64.inc.php b/libraries/adodb/drivers/adodb-postgres64.inc.php
index dcdba682e..5fd271109 100644
--- a/libraries/adodb/drivers/adodb-postgres64.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres64.inc.php
@@ -1,29 +1,31 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 8.
-
- Original version derived from Alberto Cerezal (acerezalp@dbnet.es) - DBNet Informatica & Comunicaciones.
+
+ Original version derived from Alberto Cerezal (acerezalp@dbnet.es) - DBNet Informatica & Comunicaciones.
08 Nov 2000 jlim - Minor corrections, removing mysql stuff
09 Nov 2000 jlim - added insertid support suggested by "Christopher Kings-Lynne" <chriskl@familyhealth.com.au>
- jlim - changed concat operator to || and data types to MetaType to match documented pgsql types
- see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm
+ jlim - changed concat operator to || and data types to MetaType to match documented pgsql types
+ see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm
22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" <raser@mail.zen.com.tw>
27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" <leen@wirehub.nl>
- 15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk.
+ 15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk.
31 Jan 2002 jlim - finally installed postgresql. testing
01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-
+
See http://www.varlena.com/varlena/GeneralBits/47.php
-
+
-- What indexes are on my table?
select * from pg_indexes where tablename = 'tablename';
-
+
-- What triggers are on my table?
- select c.relname as "Table", t.tgname as "Trigger Name",
+ select c.relname as "Table", t.tgname as "Trigger Name",
t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
p.proname as "Function Name"
@@ -31,7 +33,7 @@
where t.tgfoid = p.oid and t.tgrelid = c.oid
and t.tgconstrrelid = cc.oid
and c.relname = 'tablename';
-
+
-- What constraints are on my table?
select r.relname as "Table", c.conname as "Constraint Name",
contype as "Constraint Type", conkey as "Key Columns",
@@ -50,7 +52,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 +61,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,54 +109,59 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
var $random = 'random()'; /// random function
var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
// http://bugs.php.net/bug.php?id=25404
-
+
+ var $uniqueIisR = true;
var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
-
- // 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 $_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()
+ function __construct()
{
- // changes the metaColumnsSQL, adds columns: attnum[6]
+ // changes the metaColumnsSQL, adds columns: attnum[6]
}
-
+
function ServerInfo()
{
if (isset($this->version)) return $this->version;
-
+
$arr['description'] = $this->GetOne("select version()");
$arr['version'] = ADOConnection::_findvers($arr['description']);
$this->version = $arr;
return $arr;
}
- function IfNull( $field, $ifNull )
+ function IfNull( $field, $ifNull )
{
- return " coalesce($field, $ifNull) ";
+ return " coalesce($field, $ifNull) ";
}
// get the last id - never tested
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. */
+
+ /**
+ * 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)
{
if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
@@ -160,117 +170,110 @@ a different OID if a database must be reloaded. */
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);
- }
-
-
- function SetTransactionMode( $transaction_mode )
- {
- if (empty($transaction_mode)) {
- $transaction_mode = 'ISOLATION LEVEL SERIALIZABLE';
- }
- if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
- $this->_transmode = $transaction_mode;
- return( @pg_Exec($this->_connectionID, "SET SESSION TRANSACTION ".$transaction_mode));
- }
-
- function BeginTrans()
- {
- if ($this->transOff) return true;
- $this->transCnt += 1;
- if( $this->SetTransactionMode($this->_transmode))
- return @pg_Exec($this->_connectionID, "begin");
- else
- return(0);
- }
-
- function RowLock($tables,$where,$flds='1 as ignore')
+ 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_query($this->_connectionID, 'begin '.$this->_transmode);
+ }
+
+ 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)
{
+ if (is_bool($s)) return $s ? 'true' : 'false';
+
if (!$magic_quotes) {
+ if (ADODB_PHPVER >= 0x5200 && $this->_connectionID) {
+ return "'".pg_escape_string($this->_connectionID,$s)."'";
+ }
if (ADODB_PHPVER >= 0x4200) {
return "'".pg_escape_string($s)."'";
}
if ($this->replaceQuote[0] == '\\'){
$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
}
- return "'".str_replace("'",$this->replaceQuote,$s)."'";
+ return "'".str_replace("'",$this->replaceQuote,$s)."'";
}
-
+
// undo magic quotes for "
$s = str_replace('\\"','"',$s);
return "'$s'";
}
-
-
-
+
+
+
// Format date column in sql string given an input format that understands Y M D
function SQLDate($fmt, $col=false)
- {
+ {
if (!$col) $col = $this->sysTimeStamp;
$s = 'TO_CHAR('.$col.",'";
-
+
$len = strlen($fmt);
for ($i=0; $i < $len; $i++) {
$ch = $fmt[$i];
@@ -283,11 +286,11 @@ select viewname,'V' from pg_views where viewname like $mask";
case 'q':
$s .= 'Q';
break;
-
+
case 'M':
$s .= 'Mon';
break;
-
+
case 'm':
$s .= 'MM';
break;
@@ -295,37 +298,37 @@ select viewname,'V' from pg_views where viewname like $mask";
case 'd':
$s .= 'DD';
break;
-
+
case 'H':
$s.= 'HH24';
break;
-
+
case 'h':
$s .= 'HH';
break;
-
+
case 'i':
$s .= 'MI';
break;
-
+
case 's':
$s .= 'SS';
break;
-
+
case 'a':
case 'A':
$s .= 'AM';
break;
-
+
case 'w':
$s .= 'D';
break;
-
+
case 'l':
$s .= 'DAY';
break;
-
- case 'W':
+
+ case 'W':
$s .= 'WW';
break;
@@ -337,44 +340,44 @@ select viewname,'V' from pg_views where viewname like $mask";
}
if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
else $s .= '"'.$ch.'"';
-
+
}
}
return $s. "')";
}
-
-
-
- /*
- * Load a Large Object from a file
- * - the procedure stores the object id in the table and imports the object using
- * postgres proprietary blob handling routines
+
+
+
+ /*
+ * Load a Large Object from a file
+ * - the procedure stores the object id in the table and imports the object using
+ * postgres proprietary blob handling routines
*
* contributed by Mattia Rossi mattia@technologist.com
* modified for safe mode by juraj chlebec
- */
- function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
- {
- pg_exec ($this->_connectionID, "begin");
-
+ */
+ function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+ {
+ pg_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.
@@ -383,9 +386,9 @@ select viewname,'V' from pg_views where viewname like $mask";
*/
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 );
}
@@ -397,8 +400,8 @@ select viewname,'V' from pg_views where viewname like $mask";
if (strlen($oid)>16) return false;
return is_numeric($oid);
}
-
- /*
+
+ /*
* If an OID is detected, then we use pg_lo_* to open the oid file and read the
* real blob from the db using the oid supplied as a parameter. If you are storing
* blobs using bytea, we autodetect and process it so this function is not needed.
@@ -409,105 +412,122 @@ select viewname,'V' from pg_views where viewname like $mask";
*
* Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
* added maxsize parameter, which defaults to $db->maxblobsize if not defined.
- */
- function BlobDecode($blob,$maxsize=false,$hastrans=true)
+ */
+ function BlobDecode($blob,$maxsize=false,$hastrans=true)
{
if (!$this->GuessOID($blob)) return $blob;
-
- if ($hastrans) @pg_exec($this->_connectionID,"begin");
- $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_loclose($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
+
+ NOTE: SQL string literals (input strings) must be preceded with two backslashes
+ due to the fact that they must pass through two parsers in the PostgreSQL
backend.
*/
function BlobEncode($blob)
{
+ if (ADODB_PHPVER >= 0x5200) return pg_escape_bytea($this->_connectionID, $blob);
if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
-
+
/*92=backslash, 0=null, 39=single-quote*/
$badch = array(chr(92),chr(0),chr(39)); # \ null '
$fixch = array('\\\\134','\\\\000','\\\\047');
return adodb_str_replace($badch,$fixch,$blob);
-
+
// note that there is a pg_escape_bytea function only for php 4.2.0 or later
}
-
+
// assumes bytea for blob, and varchar for clob
function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
{
-
if ($blobtype == 'CLOB') {
- return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
+ return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
}
// do not use bind params which uses qstr(), as blobencode() already quotes data
return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
}
-
+
function OffsetDate($dayFraction,$date=false)
- {
+ {
if (!$date) $date = $this->sysDate;
else if (strncmp($date,"'",1) == 0) {
$len = strlen($date);
if (10 <= $len && $len <= 12) $date = 'date '.$date;
else $date = 'timestamp '.$date;
}
- return "($date+interval'$dayFraction 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)
+ 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);
}
@@ -519,7 +539,7 @@ select viewname,'V' from pg_views where viewname like $mask";
$rsdef = $this->Execute($sql);
if (isset($savem)) $this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
-
+
if ($rsdef) {
while (!$rsdef->EOF) {
$num = $rsdef->fields['num'];
@@ -537,15 +557,15 @@ select viewname,'V' from pg_views where viewname like $mask";
}
unset($rsdef);
}
-
+
$retarr = array();
- while (!$rs->EOF) {
+ while (!$rs->EOF) {
$fld = new ADOFieldObject();
$fld->name = $rs->fields[0];
$fld->type = $rs->fields[1];
$fld->max_length = $rs->fields[2];
$fld->attnum = $rs->fields[6];
-
+
if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
if ($fld->max_length <= 0) $fld->max_length = -1;
if ($fld->type == 'numeric') {
@@ -561,93 +581,107 @@ select viewname,'V' from pg_views where viewname like $mask";
//Freek
$fld->not_null = $rs->fields[4] == 't';
-
-
+
+
// Freek
if (is_array($keys)) {
foreach($keys as $key) {
- if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't')
+ if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't')
$fld->primary_key = true;
- if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't')
+ if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't')
$fld->unique = true; // What name is more compatible?
}
}
-
- if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
+
+ if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-
+
$rs->MoveNext();
}
$rs->Close();
if (empty($retarr))
return $false;
else
- return $retarr;
-
+ return $retarr;
+
}
- function &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) {
+ $this->_pnum += 1;
+ } else {
+ // Reset param num if $name is false
+ $this->_pnum = 1;
+ }
+ return '$'.$this->_pnum;
+ }
+
+ function MetaIndexes ($table, $primary = FALSE, $owner = false)
+ {
+ global $ADODB_FETCH_MODE;
+
+ $schema = false;
+ $this->_findschema($table,$schema);
+
+ if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
+ $sql = '
+ SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+ FROM pg_catalog.pg_class c
+ JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+ JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+ ,pg_namespace n
+ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))
+ and c.relnamespace=c2.relnamespace
+ and c.relnamespace=n.oid
+ and n.nspname=\'%s\'';
+ } else {
+ $sql = '
+ SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+ FROM pg_catalog.pg_class c
+ JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+ JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
+ }
+
+ if ($primary == FALSE) {
+ $sql .= ' AND i.indisprimary=false;';
+ }
+
+ $save = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ if ($this->fetchMode !== FALSE) {
+ $savem = $this->SetFetchMode(FALSE);
+ }
+
+ $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
+ if (isset($savem)) {
+ $this->SetFetchMode($savem);
+ }
+ $ADODB_FETCH_MODE = $save;
+
+ if (!is_object($rs)) {
+ $false = false;
+ return $false;
+ }
+
+ $col_names = $this->MetaColumnNames($table,true,true);
+ //3rd param is use attnum,
+ // see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
+ $indexes = array();
+ while ($row = $rs->FetchRow()) {
+ $columns = array();
+ foreach (explode(' ', $row[2]) as $col) {
+ $columns[] = $col_names[$col];
+ }
+
+ $indexes[$row[0]] = array(
+ 'unique' => ($row[1] == 't'),
+ 'columns' => $columns
+ );
+ }
+ return $indexes;
+ }
// returns true or false
//
@@ -656,53 +690,67 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
// $db->Connect('host1','user1','secret');
function _connect($str,$user='',$pwd='',$db='',$ctype=0)
{
-
if (!function_exists('pg_connect')) return null;
-
+
$this->_errorMsg = false;
-
+
if ($user || $pwd || $db) {
$user = adodb_addslashes($user);
$pwd = adodb_addslashes($pwd);
if (strlen($db) == 0) $db = 'template1';
$db = adodb_addslashes($db);
- if ($str) {
- $host = split(":", $str);
+ if ($str) {
+ $host = explode(":", $str);
if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
- else $str = 'host=localhost';
+ else $str = '';
if (isset($host[1])) $str .= " port=$host[1]";
else if (!empty($this->port)) $str .= " port=".$this->port;
}
- if ($user) $str .= " user=".$user;
- if ($pwd) $str .= " password=".$pwd;
- if ($db) $str .= " dbname=".$db;
+ if ($user) $str .= " user=".$user;
+ if ($pwd) $str .= " password=".$pwd;
+ if ($db) $str .= " dbname=".$db;
}
//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
-
+
if ($ctype === 1) { // persistent
$this->_connectionID = pg_pconnect($str);
} else {
if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
- static $ncnt;
-
+ static $ncnt;
+
if (empty($ncnt)) $ncnt = 1;
else $ncnt += 1;
-
+
$str .= str_repeat(' ',$ncnt);
}
$this->_connectionID = pg_connect($str);
}
if ($this->_connectionID === false) return false;
$this->Execute("set datestyle='ISO'");
+
+ $info = $this->ServerInfo();
+ $this->pgVersion = (float) substr($info['version'],0,3);
+ if ($this->pgVersion >= 7.1) { // good till version 999
+ $this->_nestedSQL = true;
+ }
+
+ # PostgreSQL 9.0 changed the default output for bytea from 'escape' to 'hex'
+ # PHP does not handle 'hex' properly ('x74657374' is returned as 't657374')
+ # https://bugs.php.net/bug.php?id=59831 states this is in fact not a bug,
+ # so we manually set bytea_output
+ if ( !empty($this->connection->noBlobs) && version_compare($info['version'], '9.0', '>=')) {
+ $this->Execute('set bytea_output=escape');
+ }
+
return true;
}
-
+
function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
{
- return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
+ return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
}
-
+
// returns true or false
//
// examples:
@@ -712,28 +760,26 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
{
return $this->_connect($str,$user,$pwd,$db,1);
}
-
+
// returns queryID or false
- function _query($sql,$inputarr)
+ 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 .= ',';
@@ -743,12 +789,12 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
$execp .= $v;
}
}
-
+
if ($execp) $exsql = "EXECUTE $plan ($execp)";
else $exsql = "EXECUTE $plan";
-
-
- $rez = @pg_exec($this->_connectionID,$exsql);
+
+
+ $rez = @pg_execute($this->_connectionID,$exsql);
if (!$rez) {
# Perhaps plan does not exist? Prepare/compile plan.
$params = '';
@@ -770,37 +816,37 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
$sql .= $v.' $'.$i;
$i++;
}
- $s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);
+ $s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);
//adodb_pr($s);
- 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) {
@@ -808,7 +854,7 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
$this->_errorMsg = @pg_result_error($this->_resultid);
if ($this->_errorMsg) return $this->_errorMsg;
}
-
+
if (!empty($this->_connectionID)) {
$this->_errorMsg = @pg_last_error($this->_connectionID);
} else $this->_errorMsg = $this->_errconnect();
@@ -818,14 +864,14 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
}
return $this->_errorMsg;
}
-
+
function ErrorNo()
{
$e = $this->ErrorMsg();
if (strlen($e)) {
return ADOConnection::MetaError($e);
- }
- return 0;
+ }
+ return 0;
}
// returns true or false
@@ -833,15 +879,15 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
{
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
*/
@@ -849,7 +895,7 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
{
return 1000000000; // should be 1 Gb?
}
-
+
/*
* Maximum size of X field
*/
@@ -857,21 +903,22 @@ WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
{
return 1000000000; // should be 1 Gb?
}
-
-
+
+
}
-
+
/*--------------------------------------------------------------------------------------
- Class Name: Recordset
+ Class Name: Recordset
--------------------------------------------------------------------------------------*/
class ADORecordSet_postgres64 extends ADORecordSet{
var $_blobArr;
var $databaseType = "postgres64";
var $canSeek = true;
- function ADORecordSet_postgres64($queryID,$mode=false)
+
+ function __construct($queryID, $mode=false)
{
- if ($mode === false) {
+ if ($mode === false) {
global $ADODB_FETCH_MODE;
$mode = $ADODB_FETCH_MODE;
}
@@ -879,35 +926,40 @@ class ADORecordSet_postgres64 extends ADORecordSet{
{
case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-
+
case ADODB_FETCH_DEFAULT:
case ADODB_FETCH_BOTH:
default: $this->fetchMode = PGSQL_BOTH; break;
}
$this->adodbFetchMode = $mode;
- $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()
{
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);
}
}
}
@@ -916,7 +968,7 @@ class ADORecordSet_postgres64 extends ADORecordSet{
function Fields($colname)
{
if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
-
+
if (!$this->bind) {
$this->bind = array();
for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -924,31 +976,32 @@ class ADORecordSet_postgres64 extends ADORecordSet{
$this->bind[strtoupper($o->name)] = $i;
}
}
- return $this->fields[$this->bind[strtoupper($colname)]];
+ return $this->fields[$this->bind[strtoupper($colname)]];
}
- function &FetchField($off = 0)
+ function FetchField($off = 0)
{
// offsets begin at 0
-
+
$o= new ADOFieldObject();
- $o->name = @pg_fieldname($this->_queryID,$off);
- $o->type = @pg_fieldtype($this->_queryID,$off);
+ $o->name = @pg_field_name($this->_queryID,$off);
+ $o->type = @pg_field_type($this->_queryID,$off);
$o->max_length = @pg_fieldsize($this->_queryID,$off);
- return $o;
+ return $o;
}
function _seek($row)
{
return @pg_fetch_row($this->_queryID,$row);
}
-
+
function _decode($blob)
{
- eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
- return $realblob;
+ if ($blob === NULL) return NULL;
+// eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
+ return pg_unescape_bytea($blob);
}
-
+
function _fixblobs()
{
if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
@@ -962,9 +1015,9 @@ class ADORecordSet_postgres64 extends ADORecordSet{
}
}
}
-
+
// 10% speedup to move MoveNext to child class
- function MoveNext()
+ function MoveNext()
{
if (!$this->EOF) {
$this->_currentRow++;
@@ -979,24 +1032,24 @@ class ADORecordSet_postgres64 extends ADORecordSet{
$this->EOF = true;
}
return false;
- }
-
+ }
+
function _fetch()
{
-
+
if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
- return false;
+ return false;
$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-
+
if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-
+
return (is_array($this->fields));
}
- function _close()
- {
- return @pg_freeresult($this->_queryID);
+ function _close()
+ {
+ return @pg_free_result($this->_queryID);
}
function MetaType($t,$len=-1,$fieldobj=false)
@@ -1013,54 +1066,53 @@ class ADORecordSet_postgres64 extends ADORecordSet{
case 'CHARACTER':
case 'VARCHAR':
case 'NAME':
- case 'BPCHAR':
+ case 'BPCHAR':
case '_VARCHAR':
case 'INET':
case 'MACADDR':
if ($len <= $this->blobSize) return 'C';
-
+
case 'TEXT':
return 'X';
-
+
case 'IMAGE': // user defined type
case 'BLOB': // user defined type
case 'BIT': // This is a bit string, not a single bit, so don't return 'L'
case 'VARBIT':
case 'BYTEA':
return 'B';
-
+
case 'BOOL':
case 'BOOLEAN':
return 'L';
-
+
case 'DATE':
return 'D';
-
-
+
+
case 'TIMESTAMP WITHOUT TIME ZONE':
case 'TIME':
case 'DATETIME':
case 'TIMESTAMP':
case 'TIMESTAMPTZ':
return 'T';
-
- case 'SMALLINT':
- case 'BIGINT':
- case 'INTEGER':
- case 'INT8':
+
+ case 'SMALLINT':
+ case 'BIGINT':
+ case 'INTEGER':
+ case 'INT8':
case 'INT4':
case 'INT2':
if (isset($fieldobj) &&
- empty($fieldobj->primary_key) && 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 'N';
}
}
}
-?>
diff --git a/libraries/adodb/drivers/adodb-postgres7.inc.php b/libraries/adodb/drivers/adodb-postgres7.inc.php
index fb2c9565d..ebdf2acfb 100644
--- a/libraries/adodb/drivers/adodb-postgres7.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres7.inc.php
@@ -1,11 +1,13 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4.
-
+
Postgres7 support.
28 Feb 2001: Currently indicate that we support LIMIT
01 Dec 2001: dannym added support for default values
@@ -17,36 +19,108 @@ if (!defined('ADODB_DIR')) die();
include_once(ADODB_DIR."/drivers/adodb-postgres64.inc.php");
class ADODB_postgres7 extends ADODB_postgres64 {
- var $databaseType = 'postgres7';
+ var $databaseType = 'postgres7';
var $hasLimit = true; // set to true for pgsql 6.5+ only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
var $ansiOuter = true;
var $charSet = true; //set to true for Postgres 7 and above - PG client supports encodings
-
- function ADODB_postgres7()
+
+ // Richard 3/18/2012 - Modified SQL to return SERIAL type correctly AS old driver no longer return SERIAL as data type.
+ var $metaColumnsSQL = "
+ 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_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 a.attname not like '....%%'
+ AND a.attnum > 0
+ AND a.attrelid = c.oid
+ ORDER BY
+ a.attnum";
+
+ // used when schema defined
+ var $metaColumnsSQL1 = "
+ SELECT
+ a.attname,
+ CASE
+ 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;
}
-
- // 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)
+ {
+ $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) {
@@ -54,11 +128,77 @@ class ADODB_postgres7 extends ADODB_postgres64 {
}
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
@@ -71,32 +211,34 @@ class ADODB_postgres7 extends ADODB_postgres64 {
c.relname = \''.strtolower($table).'\'
ORDER BY
t.tgrelid';
-
- $rs =& $this->Execute($sql);
-
- if ($rs && !$rs->EOF) {
- $arr =& $rs->GetArray();
- $a = array();
- foreach($arr as $v)
- {
- $data = explode(chr(0), $v['args']);
- if ($upper) {
- $a[strtoupper($data[2])][] = strtoupper($data[4].'='.$data[5]);
- } else {
- $a[$data[2]][] = $data[4].'='.$data[5];
- }
+
+ $rs = $this->Execute($sql);
+
+ if (!$rs || $rs->EOF) return false;
+
+ $arr = $rs->GetArray();
+ $a = array();
+ foreach($arr as $v) {
+ $data = explode(chr(0), $v['args']);
+ $size = count($data)-1; //-1 because the last node is empty
+ for($i = 4; $i < $size; $i++) {
+ if ($upper)
+ $a[strtoupper($data[2])][] = strtoupper($data[$i].'='.$data[++$i]);
+ else
+ $a[$data[2]][] = $data[$i].'='.$data[++$i];
}
- return $a;
}
- return false;
+ 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) {
@@ -109,23 +251,23 @@ class ADODB_postgres7 extends ADODB_postgres64 {
else $sql .= $v.' $'.$i;
$i++;
}
-
+
$rez = pg_query_params($this->_connectionID,$sql, $inputarr);
} else {
$rez = pg_query($this->_connectionID,$sql);
}
// 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
+
+ // 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
@@ -142,7 +284,7 @@ class ADODB_postgres7 extends ADODB_postgres64 {
return $this->charSet;
}
}
-
+
// SetCharSet - switch the client encoding
function SetCharSet($charset_name)
{
@@ -156,29 +298,29 @@ class ADODB_postgres7 extends ADODB_postgres64 {
}
}
-
+
/*--------------------------------------------------------------------------------------
- Class Name: Recordset
+ Class Name: Recordset
--------------------------------------------------------------------------------------*/
class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
var $databaseType = "postgres7";
-
-
- function ADORecordSet_postgres7($queryID,$mode=false)
+
+
+ function __construct($queryID, $mode=false)
{
- $this->ADORecordSet_postgres64($queryID,$mode);
+ parent::__construct($queryID, $mode);
}
-
- // 10% speedup to move MoveNext to child class
- function MoveNext()
+
+ // 10% speedup to move MoveNext to child class
+ function MoveNext()
{
if (!$this->EOF) {
$this->_currentRow++;
if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-
+
if (is_array($this->fields)) {
if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
return true;
@@ -188,77 +330,57 @@ class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
$this->EOF = true;
}
return false;
- }
+ }
}
class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
var $databaseType = "postgres7";
-
-
- function ADORecordSet_assoc_postgres7($queryID,$mode=false)
+
+
+ function __construct($queryID, $mode=false)
{
- $this->ADORecordSet_postgres64($queryID,$mode);
+ parent::__construct($queryID, $mode);
}
-
+
function _fetch()
{
- if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
- return false;
+ 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/libraries/adodb/drivers/adodb-postgres8.inc.php b/libraries/adodb/drivers/adodb-postgres8.inc.php
index b81f10110..54b14abbc 100644
--- a/libraries/adodb/drivers/adodb-postgres8.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres8.inc.php
@@ -1,12 +1,50 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4.
-
- NOTE: The "postgres8" driver is remapped to "postgres7".
+
+ Postgres8 support.
*/
-?>
\ No newline at end of file
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-postgres7.inc.php");
+
+class ADODB_postgres8 extends ADODB_postgres7
+{
+ var $databaseType = 'postgres8';
+
+
+ /**
+ * Retrieve last inserted ID
+ * Don't use OIDs, since as per {@link http://php.net/function.pg-last-oid php manual }
+ * they won't be there in Postgres 8.1
+ * (and they're not what the application wants back, anyway).
+ * @param string $table
+ * @param string $column
+ * @return int last inserted ID for given table/column, or the most recently
+ * returned one if $table or $column are empty
+ */
+ function _insertid($table, $column)
+ {
+ return empty($table) || empty($column)
+ ? $this->GetOne("SELECT lastval()")
+ : $this->GetOne("SELECT currval(pg_get_serial_sequence('$table', '$column'))");
+ }
+}
+
+class ADORecordSet_postgres8 extends ADORecordSet_postgres7
+{
+ var $databaseType = "postgres8";
+}
+
+class ADORecordSet_assoc_postgres8 extends ADORecordSet_assoc_postgres7
+{
+ var $databaseType = "postgres8";
+}
diff --git a/libraries/adodb/drivers/adodb-postgres9.inc.php b/libraries/adodb/drivers/adodb-postgres9.inc.php
new file mode 100644
index 000000000..fb589188e
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-postgres9.inc.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+ Set tabs to 4.
+
+ Postgres9 support.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-postgres8.inc.php");
+
+class ADODB_postgres9 extends ADODB_postgres8
+{
+ var $databaseType = 'postgres9';
+}
+
+class ADORecordSet_postgres9 extends ADORecordSet_postgres8
+{
+ var $databaseType = "postgres9";
+}
+
+class ADORecordSet_assoc_postgres9 extends ADORecordSet_assoc_postgres8
+{
+ var $databaseType = "postgres9";
+}
diff --git a/libraries/adodb/drivers/adodb-proxy.inc.php b/libraries/adodb/drivers/adodb-proxy.inc.php
index 77598901e..4004fa78c 100644
--- a/libraries/adodb/drivers/adodb-proxy.inc.php
+++ b/libraries/adodb/drivers/adodb-proxy.inc.php
@@ -1,13 +1,15 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4.
-
+
Synonym for csv driver.
-*/
+*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
@@ -15,19 +17,17 @@ if (!defined('ADODB_DIR')) die();
if (! defined("_ADODB_PROXY_LAYER")) {
define("_ADODB_PROXY_LAYER", 1 );
include(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";
-
- function ADORecordset_proxy($id,$mode=false)
+ var $databaseType = "proxy";
+
+ function __construct($id,$mode=false)
{
- $this->ADORecordset($id,$mode);
+ parent::__construct($id,$mode);
}
};
} // define
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-sapdb.inc.php b/libraries/adodb/drivers/adodb-sapdb.inc.php
index 7e968acd0..a11e7e068 100644
--- a/libraries/adodb/drivers/adodb-sapdb.inc.php
+++ b/libraries/adodb/drivers/adodb-sapdb.inc.php
@@ -1,13 +1,15 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
SAPDB data driver. Requires ODBC.
*/
@@ -22,7 +24,7 @@ if (!defined('ADODB_SAPDB')){
define('ADODB_SAPDB',1);
class ADODB_SAPDB extends ADODB_odbc {
- var $databaseType = "sapdb";
+ var $databaseType = "sapdb";
var $concat_operator = '||';
var $sysDate = 'DATE';
var $sysTimeStamp = 'TIMESTAMP';
@@ -30,13 +32,13 @@ class ADODB_SAPDB extends ADODB_odbc {
var $fmtTimeStamp = "'Y-m-d H:i:s'"; /// used by DBTimeStamp as the default timestamp fmt.
var $hasInsertId = true;
var $_bindInputArray = true;
-
- function ADODB_SAPDB()
+
+ function __construct()
{
//if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
- $this->ADODB_odbc();
+ parent::__construct();
}
-
+
function ServerInfo()
{
$info = ADODB_odbc::ServerInfo();
@@ -46,14 +48,14 @@ class ADODB_SAPDB extends ADODB_odbc {
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));
@@ -67,7 +69,7 @@ class ADODB_SAPDB extends ADODB_odbc {
if ($this->fetchMode !== FALSE) {
$savem = $this->SetFetchMode(FALSE);
}
-
+
$rs = $this->Execute($sql);
if (isset($savem)) {
$this->SetFetchMode($savem);
@@ -91,8 +93,8 @@ class ADODB_SAPDB extends ADODB_odbc {
}
return $indexes;
}
-
- function &MetaColumns ($table)
+
+ function MetaColumns ($table, $normalize = true)
{
global $ADODB_FETCH_MODE;
$save = $ADODB_FETCH_MODE;
@@ -101,7 +103,7 @@ class ADODB_SAPDB extends ADODB_odbc {
$savem = $this->SetFetchMode(FALSE);
}
$table = $this->Quote(strtoupper($table));
-
+
$retarr = array();
foreach($this->GetAll("SELECT COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER BY pos") as $column)
{
@@ -130,7 +132,7 @@ class ADODB_SAPDB extends ADODB_odbc {
}
}
}
- $retarr[$fld->name] = $fld;
+ $retarr[$fld->name] = $fld;
}
if (isset($savem)) {
$this->SetFetchMode($savem);
@@ -139,14 +141,14 @@ class ADODB_SAPDB extends ADODB_odbc {
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)
{
@@ -155,30 +157,29 @@ class ADODB_SAPDB extends ADODB_odbc {
/*
SelectLimit implementation problems:
-
+
The following will return random 10 rows as order by performed after "WHERE rowno<10"
which is not ideal...
-
+
select * from table where rowno < 10 order by 1
-
+
This means that we have to use the adoconnection base class SelectLimit when
there is an "order by".
-
+
See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
*/
-
+
};
-
-class ADORecordSet_sapdb extends ADORecordSet_odbc {
-
- var $databaseType = "sapdb";
-
- function ADORecordSet_sapdb($id,$mode=false)
+
+class ADORecordSet_sapdb extends ADORecordSet_odbc {
+
+ var $databaseType = "sapdb";
+
+ function __construct($id,$mode=false)
{
- $this->ADORecordSet_odbc($id,$mode);
+ parent::__construct($id,$mode);
}
}
} //define
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-sqlanywhere.inc.php b/libraries/adodb/drivers/adodb-sqlanywhere.inc.php
index 5e2fcd49d..03a9da2a0 100644
--- a/libraries/adodb/drivers/adodb-sqlanywhere.inc.php
+++ b/libraries/adodb/drivers/adodb-sqlanywhere.inc.php
@@ -1,10 +1,12 @@
<?php
-/*
-version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
Latest version is available at http://adodb.sourceforge.net
@@ -30,7 +32,7 @@ Set tabs to 4 for best viewing.
.
'VALUES (\'test\', ' . $blobVarName . ')');
- instead of loading blob from a file, you can also load from
+ instead of loading blob from a file, you can also load from
an unformatted (raw) blob variable:
$dbcon->load_blobvar_from_var($blobVarName, $varName);
@@ -53,13 +55,8 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){
define('ADODB_SYBASE_SQLANYWHERE',1);
class ADODB_sqlanywhere extends ADODB_odbc {
- var $databaseType = "sqlanywhere";
+ var $databaseType = "sqlanywhere";
var $hasInsertID = true;
-
- function ADODB_sqlanywhere()
- {
- $this->ADODB_odbc();
- }
function _insertid() {
return $this->GetOne('select @@identity');
@@ -152,13 +149,13 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){
}
}; //class
- class ADORecordSet_sqlanywhere extends ADORecordSet_odbc {
+ class ADORecordSet_sqlanywhere extends ADORecordSet_odbc {
- var $databaseType = "sqlanywhere";
+ var $databaseType = "sqlanywhere";
- function ADORecordSet_sqlanywhere($id,$mode=false)
+ function __construct($id,$mode=false)
{
- $this->ADORecordSet_odbc($id,$mode);
+ parent::__construct($id,$mode);
}
@@ -166,4 +163,3 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){
} //define
-?>
diff --git a/libraries/adodb/drivers/adodb-sqlite.inc.php b/libraries/adodb/drivers/adodb-sqlite.inc.php
index 70b1f0228..5cc6b9ea3 100644
--- a/libraries/adodb/drivers/adodb-sqlite.inc.php
+++ b/libraries/adodb/drivers/adodb-sqlite.inc.php
@@ -1,14 +1,16 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Latest version is available at http://adodb.sourceforge.net
-
+
SQLite info: http://www.hwaci.com/sw/sqlite/
-
+
Install Instructions:
====================
1. Place this in adodb/drivers
@@ -23,27 +25,18 @@ class ADODB_sqlite extends ADOConnection {
var $replaceQuote = "''"; // string to use to replace quotes
var $concat_operator='||';
var $_errorNo = 0;
- var $hasLimit = true;
+ var $hasLimit = true;
var $hasInsertID = true; /// supports autoincrement ID?
var $hasAffectedRows = true; /// supports affected rows for update/delete?
var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
var $sysDate = "adodb_date('Y-m-d')";
var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')";
var $fmtTimeStamp = "'Y-m-d H:i:s'";
-
- function ADODB_sqlite()
+
+ function __construct()
{
}
-
-/*
- function __get($name)
- {
- switch($name) {
- case 'sysDate': return "'".date($this->fmtDate)."'";
- case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
- }
- }*/
-
+
function ServerInfo()
{
$arr['version'] = sqlite_libversion();
@@ -51,71 +44,93 @@ class ADODB_sqlite extends ADOConnection {
$arr['encoding'] = sqlite_libencoding();
return $arr;
}
-
+
function BeginTrans()
- {
- if ($this->transOff) return true;
- $ret = $this->Execute("BEGIN TRANSACTION");
- $this->transCnt += 1;
- return true;
+ {
+ if ($this->transOff) {
+ return true;
+ }
+ $ret = $this->Execute("BEGIN TRANSACTION");
+ $this->transCnt += 1;
+ return true;
}
-
- function CommitTrans($ok=true)
- {
- if ($this->transOff) return true;
- if (!$ok) return $this->RollbackTrans();
+
+ 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;
}
@@ -124,57 +139,71 @@ class ADODB_sqlite extends ADOConnection {
{
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 +215,38 @@ class ADODB_sqlite extends ADOConnection {
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)
{
$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 +254,16 @@ class ADODB_sqlite extends ADOConnection {
while (--$MAXLOOPS>=0) {
@($num = $this->GetOne("select id from $seq"));
if ($num === false) {
- $this->Execute(sprintf($this->_genSeqSQL ,$seq));
+ $this->Execute(sprintf($this->_genSeqSQL ,$seq));
$start -= 1;
$num = '0';
$ok = $this->Execute("insert into $seq values($start)");
- if (!$ok) return false;
- }
+ 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 +278,85 @@ class ADODB_sqlite extends ADOConnection {
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;
}
}
/*--------------------------------------------------------------------------------------
- Class Name: Recordset
+ Class Name: Recordset
--------------------------------------------------------------------------------------*/
class ADORecordset_sqlite extends ADORecordSet {
@@ -318,22 +364,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 +397,12 @@ class ADORecordset_sqlite extends ADORecordSet {
$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 +410,18 @@ class ADORecordset_sqlite extends ADORecordSet {
$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 +429,23 @@ class ADORecordset_sqlite extends ADORecordSet {
$this->bind[strtoupper($o->name)] = $i;
}
}
-
- return $this->fields[$this->bind[strtoupper($colname)]];
+
+ return $this->fields[$this->bind[strtoupper($colname)]];
}
-
- function _seek($row)
- {
- return sqlite_seek($this->_queryID, $row);
- }
- function _fetch($ignore_fields=false)
+ function _seek($row)
+ {
+ return sqlite_seek($this->_queryID, $row);
+ }
+
+ function _fetch($ignore_fields=false)
{
$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
return !empty($this->fields);
}
-
- function _close()
+
+ function _close()
{
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-sqlite3.inc.php b/libraries/adodb/drivers/adodb-sqlite3.inc.php
new file mode 100644
index 000000000..7600c3a96
--- /dev/null
+++ b/libraries/adodb/drivers/adodb-sqlite3.inc.php
@@ -0,0 +1,438 @@
+<?php
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ SQLite info: http://www.hwaci.com/sw/sqlite/
+
+ Install Instructions:
+ ====================
+ 1. Place this in adodb/drivers
+ 2. Rename the file, remove the .txt prefix.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB_sqlite3 extends ADOConnection {
+ var $databaseType = "sqlite3";
+ var $replaceQuote = "''"; // string to use to replace quotes
+ var $concat_operator='||';
+ var $_errorNo = 0;
+ var $hasLimit = true;
+ var $hasInsertID = true; /// supports autoincrement ID?
+ var $hasAffectedRows = true; /// supports affected rows for update/delete?
+ var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
+ var $sysDate = "adodb_date('Y-m-d')";
+ var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')";
+ var $fmtTimeStamp = "'Y-m-d H:i:s'";
+
+ function __construct()
+ {
+ }
+
+ function ServerInfo()
+ {
+ $version = SQLite3::version();
+ $arr['version'] = $version['versionString'];
+ $arr['description'] = 'SQLite 3';
+ return $arr;
+ }
+
+ function BeginTrans()
+ {
+ if ($this->transOff) {
+ return true;
+ }
+ $ret = $this->Execute("BEGIN TRANSACTION");
+ $this->transCnt += 1;
+ return true;
+ }
+
+ function CommitTrans($ok=true)
+ {
+ if ($this->transOff) {
+ return true;
+ }
+ if (!$ok) {
+ return $this->RollbackTrans();
+ }
+ $ret = $this->Execute("COMMIT");
+ if ($this->transCnt > 0) {
+ $this->transCnt -= 1;
+ }
+ return !empty($ret);
+ }
+
+ function RollbackTrans()
+ {
+ if ($this->transOff) {
+ return true;
+ }
+ $ret = $this->Execute("ROLLBACK");
+ if ($this->transCnt > 0) {
+ $this->transCnt -= 1;
+ }
+ return !empty($ret);
+ }
+
+ // 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 _init($parentDriver)
+ {
+ $parentDriver->hasTransactions = false;
+ $parentDriver->hasInsertID = true;
+ }
+
+ function _insertid()
+ {
+ 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)
+ {
+ $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)
+ {
+ $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);
+ }
+ $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)) {
+ $this->SetFetchMode($savem);
+ }
+ $ADODB_FETCH_MODE = $save;
+ 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()
+ );
+ }
+ /**
+ * 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);
+ $ADODB_FETCH_MODE = $save;
+ }
+ return $indexes;
+ }
+
+}
+
+/*--------------------------------------------------------------------------------------
+ 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/libraries/adodb/drivers/adodb-sqlitepo.inc.php b/libraries/adodb/drivers/adodb-sqlitepo.inc.php
index f8c6fbcda..b167e8c8b 100644
--- a/libraries/adodb/drivers/adodb-sqlitepo.inc.php
+++ b/libraries/adodb/drivers/adodb-sqlitepo.inc.php
@@ -1,6 +1,8 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -10,11 +12,11 @@ V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights rese
1. 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.
+
+ 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
+ Contributed by Herman Kuiper herman#ozuzo.net
*/
if (!defined('ADODB_DIR')) die();
@@ -23,11 +25,6 @@ include_once(ADODB_DIR.'/drivers/adodb-sqlite.inc.php');
class ADODB_sqlitepo extends ADODB_sqlite {
var $databaseType = 'sqlitepo';
-
- function ADODB_sqlitepo()
- {
- $this->ADODB_sqlite();
- }
}
/*--------------------------------------------------------------------------------------
@@ -38,11 +35,11 @@ class ADORecordset_sqlitepo extends ADORecordset_sqlite {
var $databaseType = 'sqlitepo';
- function ADORecordset_sqlitepo($queryID,$mode=false)
+ function __construct($queryID,$mode=false)
{
- $this->ADORecordset_sqlite($queryID,$mode);
+ parent::__construct($queryID,$mode);
}
-
+
// Modified to strip table names from returned fields
function _fetch($ignore_fields=false)
{
@@ -59,4 +56,3 @@ class ADORecordset_sqlitepo extends ADORecordset_sqlite {
return !empty($this->fields);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-sybase.inc.php b/libraries/adodb/drivers/adodb-sybase.inc.php
index ef9948cf7..6ba392d35 100644
--- a/libraries/adodb/drivers/adodb-sybase.inc.php
+++ b/libraries/adodb/drivers/adodb-sybase.inc.php
@@ -1,25 +1,27 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim. All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Sybase driver contributed by Toni (toni.tunkkari@finebyte.com)
-
+
- MSSQL date patch applied.
-
+
Date patch by Toni 15 Feb 2002
*/
-
+
// 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,20 +32,22 @@ 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()
- {
+
+ var $port;
+
+ function __construct()
+ {
}
-
+
// might require begintrans -- committrans
function _insertid()
{
@@ -52,31 +56,31 @@ class ADODB_sybase extends ADOConnection {
// 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,30 +88,30 @@ class ADODB_sybase extends ADOConnection {
$this->Execute('ROLLBACK TRAN');
return true;
}
-
+
// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
- function RowLock($tables,$where,$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;
@@ -122,154 +126,175 @@ class ADODB_sybase extends ADOConnection {
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)
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 +303,29 @@ $ADODB_sybase_mths = array(
'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
-class ADORecordset_sybase extends ADORecordSet {
+class ADORecordset_sybase extends ADORecordSet {
var $databaseType = "sybase";
var $canSeek = true;
// _mths works only in non-localised system
- var $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+ var $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
- function ADORecordset_sybase($id,$mode=false)
+ 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,$mode);
}
-
- /* Returns: an object containing field information.
+
+ /* Returns: an object containing field information.
Get column information in the Recordset object. fetchField() can be used in order to obtain information about
fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
fetchField() is retrieved. */
- function &FetchField($fieldOffset = -1)
+ function FetchField($fieldOffset = -1)
{
if ($fieldOffset != -1) {
$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
@@ -312,27 +337,28 @@ class ADORecordset_sybase extends ADORecordSet {
if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
return $o;
}
-
+
function _initrs()
{
global $ADODB_COUNTRECS;
$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
$this->_numOfFields = @sybase_num_fields($this->_queryID);
}
-
- function _seek($row)
+
+ function _seek($row)
{
return @sybase_data_seek($this->_queryID, $row);
- }
+ }
- function _fetch($ignore_fields=false)
+ function _fetch($ignore_fields=false)
{
if ($this->fetchMode == ADODB_FETCH_NUM) {
$this->fields = @sybase_fetch_row($this->_queryID);
} else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
- $this->fields = @sybase_fetch_row($this->_queryID);
+ $this->fields = @sybase_fetch_assoc($this->_queryID);
+
if (is_array($this->fields)) {
- $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+ $this->fields = $this->GetRowAssoc();
return true;
}
return false;
@@ -345,62 +371,62 @@ class ADORecordset_sybase extends ADORecordSet {
return false;
}
-
+
/* close() only needs to be called if you are worried about using too much memory while your script
is running. All associated result memory for the specified result identifier will automatically be freed. */
function _close() {
- return @sybase_free_result($this->_queryID);
+ return @sybase_free_result($this->_queryID);
}
-
+
// sybase/mssql uses a default date like Dec 30 2000 12:00AM
- 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)
+ function __construct($id=-1)
{
- $this->ADORecordSet_array($id);
+ parent::__construct($id);
}
-
+
// sybase/mssql uses a default date like Dec 30 2000 12:00AM
- function UnixDate($v)
+ 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 +438,6 @@ class ADORecordSet_array_sybase extends ADORecordSet_array {
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/libraries/adodb/drivers/adodb-sybase_ase.inc.php b/libraries/adodb/drivers/adodb-sybase_ase.inc.php
index dfc083504..669dd22ff 100644
--- a/libraries/adodb/drivers/adodb-sybase_ase.inc.php
+++ b/libraries/adodb/drivers/adodb-sybase_ase.inc.php
@@ -1,45 +1,51 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Set tabs to 4.
-
+
Contributed by Interakt Online. Thx Cristian MARIN cristic#interaktonline.com
*/
+
+
+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()
+ function __construct()
{
}
-
+
// 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){
@@ -67,17 +73,17 @@ class ADODB_sybase_ase extends ADODB_sybase {
}
// fix a bug which prevent the metaColumns query to be executed for Sybase ASE
- function &MetaColumns($table,$upper=false)
+ function MetaColumns($table,$upper=false)
{
$false = false;
if (!empty($this->metaColumnsSQL)) {
-
+
$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
if ($rs === false) return $false;
$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');
@@ -85,11 +91,11 @@ class ADODB_sybase_ase extends ADODB_sybase {
$rs->MoveNext();
}
$rs->Close();
- return $retarr;
+ return $retarr;
}
return $false;
}
-
+
function getProcedureList($schema)
{
return false;
@@ -100,16 +106,15 @@ class ADODB_sybase_ase extends ADODB_sybase {
if (!function_exists('sybase_connect')){
return 'Your PHP doesn\'t contain the Sybase connection module!';
}
- return parent::ErrorMsg();
+ return parent::ErrorMsg();
}
}
class adorecordset_sybase_ase extends ADORecordset_sybase {
var $databaseType = "sybase_ase";
-function ADORecordset_sybase_ase($id,$mode=false)
+function __construct($id,$mode=false)
{
- $this->ADORecordSet_sybase($id,$mode);
+ parent::__construct($id,$mode);
}
-
+
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-vfp.inc.php b/libraries/adodb/drivers/adodb-vfp.inc.php
index 1e4237f4b..840c9c109 100644
--- a/libraries/adodb/drivers/adodb-vfp.inc.php
+++ b/libraries/adodb/drivers/adodb-vfp.inc.php
@@ -1,13 +1,15 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
+
Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
*/
@@ -20,7 +22,7 @@ if (!defined('_ADODB_ODBC_LAYER')) {
if (!defined('ADODB_VFP')){
define('ADODB_VFP',1);
class ADODB_vfp extends ADODB_odbc {
- var $databaseType = "vfp";
+ var $databaseType = "vfp";
var $fmtDate = "{^Y-m-d}";
var $fmtTimeStamp = "{^Y-m-d, h:i:sA}";
var $replaceQuote = "'+chr(39)+'" ;
@@ -33,19 +35,14 @@ class ADODB_vfp extends ADODB_odbc {
var $ansiOuter = true;
var $hasTransactions = false;
var $curmode = false ; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L
-
- function ADODB_vfp()
- {
- $this->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 +50,31 @@ class ADODB_vfp extends ADODB_odbc {
return "'".$s."'";
}
-
+
// TOP requires ORDER BY for VFP
- function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+ 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)
+class ADORecordSet_vfp extends ADORecordSet_odbc {
+
+ var $databaseType = "vfp";
+
+
+ function __construct($id,$mode=false)
{
- return $this->ADORecordSet_odbc($id,$mode);
+ return parent::__construct($id,$mode);
}
- function MetaType($t,$len=-1)
+ function MetaType($t, $len = -1, $fieldobj = false)
{
if (is_object($t)) {
$fieldobj = $t;
@@ -89,19 +86,18 @@ class ADORecordSet_vfp extends ADORecordSet_odbc {
if ($len <= $this->blobSize) return 'C';
case 'M':
return 'X';
-
+
case 'D': return 'D';
-
+
case 'T': return 'T';
-
+
case 'L': return 'L';
-
+
case 'I': return 'I';
-
+
default: return 'N';
}
}
}
} //define
-?>
\ No newline at end of file
diff --git a/libraries/adodb/lang/adodb-ar.inc.php b/libraries/adodb/lang/adodb-ar.inc.php
index dd0f830f1..0b8f12ff8 100644
--- a/libraries/adodb/lang/adodb-ar.inc.php
+++ b/libraries/adodb/lang/adodb-ar.inc.php
@@ -2,33 +2,31 @@
// by "El-Shamaa, Khaled" <k.el-shamaa#cgiar.org>
$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/libraries/adodb/lang/adodb-bg.inc.php b/libraries/adodb/lang/adodb-bg.inc.php
index 4fb1dc070..07069b421 100644
--- a/libraries/adodb/lang/adodb-bg.inc.php
+++ b/libraries/adodb/lang/adodb-bg.inc.php
@@ -1,38 +1,36 @@
<?php
/*
- Bulgarian language, v1.0, 25.03.2004, encoding by Windows-1251 charset
+ Bulgarian language, v1.0, 25.03.2004, encoding by UTF-8 charset
contributed by Valentin Sheiretsky <valio#valio.eu.org>
*/
$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/libraries/adodb/lang/adodb-bgutf8.inc.php b/libraries/adodb/lang/adodb-bgutf8.inc.php
deleted file mode 100644
index 1efd9b501..000000000
--- a/libraries/adodb/lang/adodb-bgutf8.inc.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- Bulgarian language, v1.0, 25.03.2004, encoding by UTF-8 charset
- contributed by Valentin Sheiretsky <valio#valio.eu.org>
-*/
-
-$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/libraries/adodb/lang/adodb-ca.inc.php b/libraries/adodb/lang/adodb-ca.inc.php
index 081f632f5..adbafac98 100644
--- a/libraries/adodb/lang/adodb-ca.inc.php
+++ b/libraries/adodb/lang/adodb-ca.inc.php
@@ -8,28 +8,26 @@ $ADODB_LANG_ARRAY = array (
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/libraries/adodb/lang/adodb-cn.inc.php b/libraries/adodb/lang/adodb-cn.inc.php
index 44d5f490c..9c9734130 100644
--- a/libraries/adodb/lang/adodb-cn.inc.php
+++ b/libraries/adodb/lang/adodb-cn.inc.php
@@ -1,35 +1,33 @@
<?php
// Chinese language file contributed by "Cuiyan (cysoft)" cysoft#php.net.
-// Encode by GB2312
// Simplified Chinese
$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/libraries/adodb/lang/adodb-cz.inc.php b/libraries/adodb/lang/adodb-cz.inc.php
index 1f5c08a96..d79d7142f 100644
--- a/libraries/adodb/lang/adodb-cz.inc.php
+++ b/libraries/adodb/lang/adodb-cz.inc.php
@@ -1,40 +1,35 @@
<?php
-# Czech language, encoding by ISO 8859-2 charset (Iso Latin-2)
-# For convert to MS Windows use shell command:
-# iconv -f ISO_8859-2 -t CP1250 < adodb-cz.inc.php
-# For convert to ASCII use shell command:
-# unaccent ISO_8859-2 < adodb-cz.inc.php
+# Czech language
# v1.0, 19.06.2003 Kamil Jakubovic <jake@host.sk>
$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/libraries/adodb/lang/adodb-da.inc.php b/libraries/adodb/lang/adodb-da.inc.php
index ca0e72d61..14e720b85 100644
--- a/libraries/adodb/lang/adodb-da.inc.php
+++ b/libraries/adodb/lang/adodb-da.inc.php
@@ -7,7 +7,7 @@ $ADODB_LANG_ARRAY = array (
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 +18,15 @@ $ADODB_LANG_ARRAY = array (
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/libraries/adodb/lang/adodb-de.inc.php b/libraries/adodb/lang/adodb-de.inc.php
index 44c57e9ff..dca4ffefe 100644
--- a/libraries/adodb/lang/adodb-de.inc.php
+++ b/libraries/adodb/lang/adodb-de.inc.php
@@ -5,29 +5,28 @@ $ADODB_LANG_ARRAY = array (
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_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_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_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_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'
+ DB_ERROR_ACCESS_VIOLATION => 'ungenügende Rechte'
);
-?>
\ No newline at end of file
diff --git a/libraries/adodb/lang/adodb-en.inc.php b/libraries/adodb/lang/adodb-en.inc.php
index ed1b8f19a..05828554c 100644
--- a/libraries/adodb/lang/adodb-en.inc.php
+++ b/libraries/adodb/lang/adodb-en.inc.php
@@ -28,7 +28,8 @@ $ADODB_LANG_ARRAY = array (
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/libraries/adodb/lang/adodb-esperanto.inc.php b/libraries/adodb/lang/adodb-eo.inc.php
similarity index 85%
rename from libraries/adodb/lang/adodb-esperanto.inc.php
rename to libraries/adodb/lang/adodb-eo.inc.php
index 16ca00e2f..baa589c1c 100644
--- a/libraries/adodb/lang/adodb-esperanto.inc.php
+++ b/libraries/adodb/lang/adodb-eo.inc.php
@@ -1,5 +1,5 @@
<?php
-// Vivu Esperanto cxiam!
+// Vivu Esperanto ĉiam!
// Traduko fare de Antono Vasiljev (anders[#]brainactive.org)
$ADODB_LANG_ARRAY = array (
@@ -9,7 +9,7 @@ $ADODB_LANG_ARRAY = array (
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 +26,9 @@ $ADODB_LANG_ARRAY = array (
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/libraries/adodb/lang/adodb-es.inc.php b/libraries/adodb/lang/adodb-es.inc.php
index 1e0afbb40..a80a64415 100644
--- a/libraries/adodb/lang/adodb-es.inc.php
+++ b/libraries/adodb/lang/adodb-es.inc.php
@@ -30,4 +30,3 @@ $ADODB_LANG_ARRAY = array (
DB_ERROR_NOSUCHDB => 'base de datos no encontrada',
DB_ERROR_ACCESS_VIOLATION => 'permisos insuficientes'
);
-?>
\ No newline at end of file
diff --git a/libraries/adodb/lang/adodb-fa.inc.php b/libraries/adodb/lang/adodb-fa.inc.php
new file mode 100644
index 000000000..7fa46183e
--- /dev/null
+++ b/libraries/adodb/lang/adodb-fa.inc.php
@@ -0,0 +1,34 @@
+<?php
+
+/* Farsi - by "Peyman Hooshmandi Raad" <phooshmand#gmail.com> */
+
+$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/libraries/adodb/lang/adodb-fr.inc.php b/libraries/adodb/lang/adodb-fr.inc.php
index 11127cd60..620196b43 100644
--- a/libraries/adodb/lang/adodb-fr.inc.php
+++ b/libraries/adodb/lang/adodb-fr.inc.php
@@ -3,31 +3,30 @@
$ADODB_LANG_ARRAY = array (
'LANG' => '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/libraries/adodb/lang/adodb-hu.inc.php b/libraries/adodb/lang/adodb-hu.inc.php
index d6f0ef82d..49357ce22 100644
--- a/libraries/adodb/lang/adodb-hu.inc.php
+++ b/libraries/adodb/lang/adodb-hu.inc.php
@@ -1,34 +1,33 @@
<?php
# Hungarian language, encoding by ISO 8859-2 charset (Iso Latin-2)
-# Halászvári Gábor <g.halaszvari#portmax.hu>
+# Halászvári Gábor <g.halaszvari#portmax.hu>
$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/libraries/adodb/lang/adodb-it.inc.php b/libraries/adodb/lang/adodb-it.inc.php
index ac5cc5a7d..80524e1d3 100644
--- a/libraries/adodb/lang/adodb-it.inc.php
+++ b/libraries/adodb/lang/adodb-it.inc.php
@@ -1,10 +1,10 @@
<?php
-// Italian language file contributed by Tiraboschi Massimiliano aka TiMax
+// Italian language file contributed by Tiraboschi Massimiliano aka TiMax
// www.maxdev.com timax@maxdev.com
$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 +31,3 @@ $ADODB_LANG_ARRAY = array (
DB_ERROR_NOSUCHDB => 'database non trovato',
DB_ERROR_ACCESS_VIOLATION => 'permessi insufficienti'
);
-?>
\ No newline at end of file
diff --git a/libraries/adodb/lang/adodb-nl.inc.php b/libraries/adodb/lang/adodb-nl.inc.php
index abe77b528..43e3ee694 100644
--- a/libraries/adodb/lang/adodb-nl.inc.php
+++ b/libraries/adodb/lang/adodb-nl.inc.php
@@ -30,4 +30,3 @@ $ADODB_LANG_ARRAY = array (
DB_ERROR_NOSUCHDB => 'onbekende database',
DB_ERROR_ACCESS_VIOLATION => 'onvoldoende rechten'
);
-?>
\ No newline at end of file
diff --git a/libraries/adodb/lang/adodb-pl.inc.php b/libraries/adodb/lang/adodb-pl.inc.php
index aee5bfdfd..ffa10e33e 100644
--- a/libraries/adodb/lang/adodb-pl.inc.php
+++ b/libraries/adodb/lang/adodb-pl.inc.php
@@ -4,33 +4,31 @@
$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/libraries/adodb/lang/adodb-pt-br.inc.php b/libraries/adodb/lang/adodb-pt-br.inc.php
index 320cce89e..9c687b060 100644
--- a/libraries/adodb/lang/adodb-pt-br.inc.php
+++ b/libraries/adodb/lang/adodb-pt-br.inc.php
@@ -4,32 +4,31 @@
$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/libraries/adodb/lang/adodb-ro.inc.php b/libraries/adodb/lang/adodb-ro.inc.php
index 7c9aa522b..b6ddd3132 100644
--- a/libraries/adodb/lang/adodb-ro.inc.php
+++ b/libraries/adodb/lang/adodb-ro.inc.php
@@ -32,5 +32,3 @@ $ADODB_LANG_ARRAY = array (
DB_ERROR_NOSUCHDB => 'nu exista baza de date',
DB_ERROR_ACCESS_VIOLATION => 'permisiuni insuficiente'
);
-?>
-
diff --git a/libraries/adodb/lang/adodb-ru.inc.php b/libraries/adodb/lang/adodb-ru.inc.php
new file mode 100644
index 000000000..67d80f2cc
--- /dev/null
+++ b/libraries/adodb/lang/adodb-ru.inc.php
@@ -0,0 +1,34 @@
+<?php
+
+// Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
+
+$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/libraries/adodb/lang/adodb-ru1251.inc.php b/libraries/adodb/lang/adodb-ru1251.inc.php
deleted file mode 100644
index e273f4279..000000000
--- a/libraries/adodb/lang/adodb-ru1251.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-// Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
-
-$ADODB_LANG_ARRAY = array (
- 'LANG' => '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/libraries/adodb/lang/adodb-sv.inc.php b/libraries/adodb/lang/adodb-sv.inc.php
index 64a5b4bb5..d3be6b0e7 100644
--- a/libraries/adodb/lang/adodb-sv.inc.php
+++ b/libraries/adodb/lang/adodb-sv.inc.php
@@ -2,32 +2,31 @@
// Christian Tiberg" christian@commsoft.nu
$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/libraries/adodb/lang/adodb-th.inc.php b/libraries/adodb/lang/adodb-th.inc.php
new file mode 100644
index 000000000..a0685645d
--- /dev/null
+++ b/libraries/adodb/lang/adodb-th.inc.php
@@ -0,0 +1,32 @@
+<?php
+// by Trirat Petchsingh <rosskouk#gmail.com>
+$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/libraries/adodb/lang/adodb-uk.inc.php b/libraries/adodb/lang/adodb-uk.inc.php
new file mode 100644
index 000000000..2ace5bc49
--- /dev/null
+++ b/libraries/adodb/lang/adodb-uk.inc.php
@@ -0,0 +1,34 @@
+<?php
+
+// Ukrainian language file contributed by Alex Rootoff rootoff{AT}pisem.net.
+
+$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/libraries/adodb/lang/adodb-uk1251.inc.php b/libraries/adodb/lang/adodb-uk1251.inc.php
deleted file mode 100644
index 9fa32ed5b..000000000
--- a/libraries/adodb/lang/adodb-uk1251.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-// Ukrainian language file contributed by Alex Rootoff rootoff{AT}pisem.net.
-
-$ADODB_LANG_ARRAY = array (
- 'LANG' => '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/libraries/adodb/pear/Auth/Container/ADOdb.php b/libraries/adodb/pear/Auth/Container/ADOdb.php
index f5020aa86..26c3a23e1 100644
--- a/libraries/adodb/pear/Auth/Container/ADOdb.php
+++ b/libraries/adodb/pear/Auth/Container/ADOdb.php
@@ -1,24 +1,18 @@
<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4 |
-// +----------------------------------------------------------------------+
-// | |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license, |
-// | that is bundled with this package in the file LICENSE, and is |
-// | available at through the world-wide-web at |
-// | http://www.php.net/license/2_02.txt. |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to |
-// | license@php.net so we can mail you a copy immediately. |
-// +----------------------------------------------------------------------+
-// | Authors: Martin Jansen <mj@php.net>
-// | Richard Tango-Lowy <richtl@arscognita.com> |
-// +----------------------------------------------------------------------+
-//
-// $Id: ADOdb.php,v 1.3 2005/05/18 06:58:47 jlim Exp $
-//
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
+ Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Original Authors: Martin Jansen <mj#php.net>
+ Richard Tango-Lowy <richtl#arscognita.com>
+*/
require_once 'Auth/Container.php';
require_once 'adodb.inc.php';
@@ -52,7 +46,7 @@ class Auth_Container_ADOdb extends Auth_Container
*/
var $db = null;
var $dsn = '';
-
+
/**
* User that is currently selected from the DB.
* @var string
@@ -69,10 +63,10 @@ class Auth_Container_ADOdb extends Auth_Container
* @param string Connection data or DB object
* @return object Returns an error object if something went wrong
*/
- function Auth_Container_ADOdb($dsn)
+ function __construct($dsn)
{
$this->_setDefaults();
-
+
if (is_array($dsn)) {
$this->_parseOptions($dsn);
@@ -99,12 +93,12 @@ class Auth_Container_ADOdb extends Auth_Container
{
if (is_string($dsn) || is_array($dsn)) {
if(!$this->db) {
- $this->db = &ADONewConnection($dsn);
+ $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,
@@ -113,7 +107,7 @@ class Auth_Container_ADOdb extends Auth_Container
null
);
}
-
+
if(!$this->db) {
return PEAR::raiseError(ADODB_Pear_error());
} else {
@@ -136,7 +130,7 @@ class Auth_Container_ADOdb extends Auth_Container
function _prepare()
{
if(!$this->db) {
- $res = $this->_connect($this->options['dsn']);
+ $res = $this->_connect($this->options['dsn']);
}
return true;
}
@@ -242,11 +236,11 @@ class Auth_Container_ADOdb extends Auth_Container
else{
$sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
}
-
+
$query = "SELECT ".$sql_from.
" FROM ".$this->options['table'].
" WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
-
+
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
$rset = $this->db->Execute( $query );
$res = $rset->fetchRow();
@@ -410,4 +404,3 @@ function dump( $var, $str, $vardump = false ) {
( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
print "</pre>";
}
-?>
diff --git a/libraries/adodb/pear/auth_adodb_example.php b/libraries/adodb/pear/auth_adodb_example.php
new file mode 100644
index 000000000..3b7cf5e85
--- /dev/null
+++ b/libraries/adodb/pear/auth_adodb_example.php
@@ -0,0 +1,25 @@
+<?php
+// NOTE: The ADOdb and PEAR directories MUST be in your PHP include_path!
+require_once "Auth/Auth.php";
+
+function loginFunction() {
+?>
+ <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+ <input type="text" name="username">
+ <input type="password" name="password">
+ <input type="submit">
+ </form>
+<?php
+}
+
+$dsn = 'mysql://username:password@hostname/database';
+// To use encrypted passwords, change cryptType to 'md5'
+$params = array('dsn' => $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/libraries/adodb/pear/readme.Auth.txt b/libraries/adodb/pear/readme.Auth.txt
new file mode 100644
index 000000000..f5b162cc1
--- /dev/null
+++ b/libraries/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/libraries/adodb/perf/perf-db2.inc.php b/libraries/adodb/perf/perf-db2.inc.php
index e2d19443a..143fc3d55 100644
--- a/libraries/adodb/perf/perf-db2.inc.php
+++ b/libraries/adodb/perf/perf-db2.inc.php
@@ -1,15 +1,17 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Library for basic performance monitoring and tuning
-
+
+ Library for basic performance monitoring and tuning
+
*/
// security - hide paths
@@ -27,16 +29,16 @@ class perf_db2 extends adodb_perf{
tracer varchar(500) NOT NULL,
timer decimal(16,6) NOT NULL
)";
-
+
var $settings = array(
'Ratios',
'data cache hit ratio' => 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 +58,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 +87,22 @@ class perf_db2 extends adodb_perf{
$s = ob_get_contents();
ob_end_clean();
$this->conn->LogSQL($save);
-
+
$s .= $this->Tracer($sql);
return $s;
}
-
-
- function Tables()
+
+ /**
+ * Gets a list of tables
+ *
+ * @param int $throwaway discarded variable to match the parent method
+ * @return string The formatted table list
+ */
+ function Tables($throwaway=0)
{
$rs = $this->conn->Execute("select tabschema,tabname,card as rows,
- npages pages_used,fpages pages_allocated, tbspace tablespace
+ npages pages_used,fpages pages_allocated, tbspace tablespace
from syscat.tables where tabschema not in ('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
return rs2html($rs,false,false,false,false);
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/perf/perf-informix.inc.php b/libraries/adodb/perf/perf-informix.inc.php
index 7d7e96f7a..e5cfb25d9 100644
--- a/libraries/adodb/perf/perf-informix.inc.php
+++ b/libraries/adodb/perf/perf-informix.inc.php
@@ -1,15 +1,17 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Library for basic performance monitoring and tuning
-
+
+ Library for basic performance monitoring and tuning
+
*/
// security - hide paths
@@ -31,9 +33,9 @@ class perf_informix extends adodb_perf{
tracer varchar(255) NOT NULL,
timer decimal(16,6) NOT NULL
)";
-
+
var $tablesSQL = "select a.tabname tablename, ti_nptotal*2 size_in_k, ti_nextns extents, ti_nrows records from systables c, sysmaster:systabnames a, sysmaster:systabinfo b where c.tabname not matches 'sys*' and c.partnum = a.partnum and c.partnum = b.ti_partnum";
-
+
var $settings = array(
'Ratios',
'data cache hit ratio' => array('RATIOH',
@@ -47,24 +49,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/libraries/adodb/perf/perf-mssql.inc.php b/libraries/adodb/perf/perf-mssql.inc.php
index 30025210f..cd8a6641f 100644
--- a/libraries/adodb/perf/perf-mssql.inc.php
+++ b/libraries/adodb/perf/perf-mssql.inc.php
@@ -1,16 +1,18 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Library for basic performance monitoring and tuning
-
+
+ Library for basic performance monitoring and tuning
+
*/
// security - hide paths
@@ -29,7 +31,7 @@ class perf_mssql extends adodb_perf{
tracer varchar(500) NOT NULL,
timer decimal(16,6) NOT NULL
)";
-
+
var $settings = array(
'Ratios',
'data cache hit ratio' => array('RATIO',
@@ -46,7 +48,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 +65,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 +90,18 @@ class perf_mssql extends adodb_perf{
}
}
}
-
+
$s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
$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 .= '<table bgcolor=white border=0 cellpadding="1" callspacing=0><tr><td nowrap align=center> Rows<td nowrap align=center> IO<td nowrap align=center> CPU<td align=left> Plan</tr>';
while (!$rs->EOF) {
@@ -107,20 +109,20 @@ class perf_mssql extends adodb_perf{
$rs->MoveNext();
}
$s .= '</table>';
-
+
$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 +144,21 @@ class perf_mssql extends adodb_perf{
$ADODB_FETCH_MODE = $save;
return $s.'</table>';
}
-
+
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/libraries/adodb/perf/perf-mssqlnative.inc.php b/libraries/adodb/perf/perf-mssqlnative.inc.php
new file mode 100644
index 000000000..b27788821
--- /dev/null
+++ b/libraries/adodb/perf/perf-mssqlnative.inc.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
+ Set tabs to 4 for best viewing.
+
+ Latest version is available at http://adodb.sourceforge.net
+
+ Library for basic performance monitoring and tuning
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+/*
+ MSSQL has moved most performance info to Performance Monitor
+*/
+class perf_mssqlnative extends adodb_perf{
+ var $sql1 = 'cast(sql1 as text)';
+ var $createTableSQL = "CREATE TABLE adodb_logsql (
+ created datetime NOT NULL,
+ sql0 varchar(250) NOT NULL,
+ sql1 varchar(4000) NOT NULL,
+ params varchar(3000) NOT NULL,
+ tracer varchar(500) NOT NULL,
+ timer decimal(16,6) NOT NULL
+ )";
+
+ var $settings = array(
+ 'Ratios',
+ 'data cache hit ratio' => 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 = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
+ $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 .= '<table bgcolor=white border=0 cellpadding="1" callspacing=0><tr><td nowrap align=center> Rows<td nowrap align=center> IO<td nowrap align=center> CPU<td align=left> Plan</tr>';
+ while (!$rs->EOF) {
+ $s .= '<tr><td>'.round($rs->fields[8],1).'<td>'.round($rs->fields[9],3).'<td align=right>'.round($rs->fields[10],3).'<td nowrap><pre>'.htmlspecialchars($rs->fields[0])."</td></pre></tr>\n"; ## NOTE CORRUPT </td></pre> tag is intentional!!!!
+ $rs->MoveNext();
+ }
+ $s .= '</table>';
+
+ $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 = '<table border=1 bgcolor=white><tr><td><b>tablename</b></td><td><b>size_in_k</b></td><td><b>index size</b></td><td><b>reserved size</b></td></tr>';
+ $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 .= '<tr><td>'.$tab.'</td><td align=right>'.$rs2->fields[3].'</td><td align=right>'.$rs2->fields[4].'</td><td align=right>'.$rs2->fields[2].'</td></tr>';
+ $rs2->Close();
+ }
+ $rs1->MoveNext();
+ }
+ $rs1->Close();
+ }
+ $ADODB_FETCH_MODE = $save;
+ return $s.'</table>';
+ }
+
+ 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/libraries/adodb/perf/perf-mysql.inc.php b/libraries/adodb/perf/perf-mysql.inc.php
index 62f1778f9..adccbdc92 100644
--- a/libraries/adodb/perf/perf-mysql.inc.php
+++ b/libraries/adodb/perf/perf-mysql.inc.php
@@ -1,24 +1,26 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Library for basic performance monitoring and tuning
-
+
+ Library for basic performance monitoring and tuning
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
class perf_mysql extends adodb_perf{
-
+
var $tablesSQL = 'show table status';
-
+
var $createTableSQL = "CREATE TABLE adodb_logsql (
created datetime NOT NULL,
sql0 varchar(250) NOT NULL,
@@ -27,7 +29,7 @@ class perf_mysql extends adodb_perf{
tracer text NOT NULL,
timer decimal(16,6) NOT NULL
)";
-
+
var $settings = array(
'Ratios',
'MyISAM cache hit ratio' => array('RATIO',
@@ -49,7 +51,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 +72,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 '<p>Unable to EXPLAIN non-select statement</p>';
$save = $this->conn->LogSQL(false);
if ($partial) {
@@ -102,12 +104,12 @@ class perf_mysql extends adodb_perf{
}
}
$sql = str_replace('?',"''",$sql);
-
+
if ($partial) {
$sqlq = $this->conn->qstr($sql.'%');
$sql = $this->conn->GetOne("select sql1 from adodb_logsql where sql1 like $sqlq");
}
-
+
$s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
$rs = $this->conn->Execute('EXPLAIN '.$sql);
$s .= rs2html($rs,false,false,false,false);
@@ -115,95 +117,95 @@ class perf_mysql extends adodb_perf{
$s .= $this->Tracer($sql);
return $s;
}
-
+
function Tables()
{
if (!$this->tablesSQL) return false;
-
+
$rs = $this->conn->Execute($this->tablesSQL);
if (!$rs) return false;
-
+
$html = rs2html($rs,false,false,false,false);
return $html;
}
-
+
function GetReads()
{
global $ADODB_FETCH_MODE;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-
+
$rs = $this->conn->Execute('show status');
-
+
if (isset($savem)) $this->conn->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
-
+
if (!$rs) return 0;
$val = 0;
while (!$rs->EOF) {
switch($rs->fields[0]) {
- case 'Com_select':
+ case 'Com_select':
$val = $rs->fields[1];
$rs->Close();
return $val;
}
$rs->MoveNext();
- }
-
+ }
+
$rs->Close();
-
+
return $val;
}
-
+
function GetWrites()
{
global $ADODB_FETCH_MODE;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-
+
$rs = $this->conn->Execute('show status');
-
+
if (isset($savem)) $this->conn->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
-
+
if (!$rs) return 0;
$val = 0.0;
while (!$rs->EOF) {
switch($rs->fields[0]) {
- case 'Com_insert':
+ case 'Com_insert':
$val += $rs->fields[1]; break;
- case 'Com_delete':
+ case 'Com_delete':
$val += $rs->fields[1]; break;
- case 'Com_update':
+ case 'Com_update':
$val += $rs->fields[1]/2;
$rs->Close();
return $val;
}
$rs->MoveNext();
- }
-
+ }
+
$rs->Close();
-
+
return $val;
}
-
+
function FindDBHitRatio()
{
// first find out type of table
//$this->conn->debug=1;
-
+
global $ADODB_FETCH_MODE;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-
+
$rs = $this->conn->Execute('show table status');
-
+
if (isset($savem)) $this->conn->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
-
+
if (!$rs) return '';
$type = strtoupper($rs->fields[1]);
$rs->Close();
@@ -216,29 +218,29 @@ class perf_mysql extends adodb_perf{
default:
return $type.' not supported';
}
-
+
}
-
+
function GetQHitRatio()
{
//Total number of queries = Qcache_inserts + Qcache_hits + Qcache_not_cached
$hits = $this->_DBParameter(array("show status","Qcache_hits"));
$total = $this->_DBParameter(array("show status","Qcache_inserts"));
$total += $this->_DBParameter(array("show status","Qcache_not_cached"));
-
+
$total += $hits;
if ($total) return round(($hits*100)/$total,2);
return 0;
}
-
+
/*
Use session variable to store Hit percentage, because MySQL
does not remember last value of SHOW INNODB STATUS hit ratio
-
+
# 1st query to SHOW INNODB STATUS
0.00 reads/s, 0.00 creates/s, 0.00 writes/s
Buffer pool hit rate 1000 / 1000
-
+
# 2nd query to SHOW INNODB STATUS
0.00 reads/s, 0.00 creates/s, 0.00 writes/s
No buffer pool activity since the last printout
@@ -246,16 +248,16 @@ class perf_mysql extends adodb_perf{
function GetInnoDBHitRatio()
{
global $ADODB_FETCH_MODE;
-
+
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-
- $rs = $this->conn->Execute('show 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,35 +273,35 @@ class perf_mysql extends adodb_perf{
}
return 0;
}
-
+
function GetKeyHitRatio()
{
$hits = $this->_DBParameter(array("show status","Key_read_requests"));
$reqs = $this->_DBParameter(array("show status","Key_reads"));
if ($reqs == 0) return 0;
-
+
return round(($hits/($reqs+$hits))*100,2);
}
-
- // start hack
+
+ // start hack
var $optimizeTableLow = 'CHECK TABLE %s FAST QUICK';
var $optimizeTableHigh = 'OPTIMIZE TABLE %s';
-
- /**
+
+ /**
* @see adodb_perf#optimizeTable
*/
- function optimizeTable( $table, $mode = ADODB_OPT_LOW)
+ function optimizeTable( $table, $mode = ADODB_OPT_LOW)
{
if ( !is_string( $table)) return false;
-
+
$conn = $this->conn;
if ( !$conn) return false;
-
+
$sql = '';
switch( $mode) {
case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
- default :
+ default :
{
// May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0)
ADOConnection::outp( sprintf( "<p>%s: '%s' using of undefined mode '%s'</p>", __CLASS__, __FUNCTION__, $mode));
@@ -307,9 +309,8 @@ class perf_mysql extends adodb_perf{
}
}
$sql = sprintf( $sql, $table);
-
+
return $conn->Execute( $sql) !== false;
}
- // end hack
+ // end hack
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/perf/perf-oci8.inc.php b/libraries/adodb/perf/perf-oci8.inc.php
index 654f9d204..69df104fa 100644
--- a/libraries/adodb/perf/perf-oci8.inc.php
+++ b/libraries/adodb/perf/perf-oci8.inc.php
@@ -1,26 +1,32 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Library for basic performance monitoring and tuning
-
+
+ Library for basic performance monitoring and tuning
+
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
+
class perf_oci8 extends ADODB_perf{
-
- var $tablesSQL = "select segment_name as \"tablename\", sum(bytes)/1024 as \"size_in_k\",tablespace_name as \"tablespace\",count(*) \"extents\" from sys.user_extents
+
+ var $noShowIxora = 15; // if the sql for suspicious sql is taking too long, then disable ixora
+
+ var $tablesSQL = "select segment_name as \"tablename\", sum(bytes)/1024 as \"size_in_k\",tablespace_name as \"tablespace\",count(*) \"extents\" from sys.user_extents
group by segment_name,tablespace_name";
-
+
var $version;
+
var $createTableSQL = "CREATE TABLE adodb_logsql (
created date NOT NULL,
sql0 varchar(250) NOT NULL,
@@ -29,32 +35,32 @@ class perf_oci8 extends ADODB_perf{
tracer varchar(4000),
timer decimal(16,6) NOT NULL
)";
-
+
var $settings = array(
'Ratios',
'data cache hit ratio' => 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 <i>shared_pool_size</i> 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 <i>shared_pool_size</i> 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 +69,37 @@ AND b.name = 'sorts (memory)'",
'IO',
'data reads' => array('IO',
"select value from v\$sysstat where name='physical reads'"),
-
+
'data writes' => array('IO',
"select value from v\$sysstat where name='physical writes'"),
-
+
'Data Cache',
+
'data cache buffers' => array( 'DATAC',
- "select a.value/b.value from v\$parameter a, v\$parameter b
+ "select a.value/b.value from v\$parameter a, v\$parameter b
where a.name = 'db_cache_size' and b.name= 'db_block_size'",
'Number of cache buffers. Tune <i>db_cache_size</i> if the <i>data cache hit ratio</i> 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 +112,8 @@ AND b.name = 'sorts (memory)'",
"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 +122,20 @@ AND b.name = 'sorts (memory)'",
"select value from v\$parameter where name='sessions'",
''),
- 'Memory Utilization',
+ 'Memory Utilization',
'data cache utilization ratio' => array('RATIOU',
"select round((1-bytes/sgasize)*100, 2)
from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
where name = 'free memory' and pool = 'shared pool'",
'Percentage of data cache actually in use - should be over 85%'),
-
+
'shared pool utilization ratio' => array('RATIOU',
- '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 +145,13 @@ AND b.name = 'sorts (memory)'",
"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 +160,7 @@ AND b.name = 'sorts (memory)'",
'max transactions' => array('ROLLBACK',
"select value from v\$parameter where name = 'transactions'",
'max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)'),
- 'Parameters',
+ 'Parameters',
'cursor sharing' => array('CURSOR',
"select value from v\$parameter where name = 'cursor_sharing'",
'Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See <a href=http://www.praetoriate.com/oracle_tips_cursor_sharing.htm>cursor_sharing</a>.'),
@@ -156,62 +176,203 @@ having count(*) > 100)",'These are sql statements that should be using bind vari
'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:<br>
+ <pre><font size=-2>
+ SQLPLUS> connect sys as sysdba;
+ SQLPLUS> shutdown immediate;
+
+ SQLPLUS> startup mount exclusive;
+ SQLPLUS> alter database noarchivelog;
+ SQLPLUS> alter database open;
+</font></pre>';
+
+ return 'To turn on archivelog:<br>
+ <pre><font size=-2>
+ SQLPLUS> connect sys as sysdba;
+ SQLPLUS> shutdown immediate;
+
+ SQLPLUS> startup mount exclusive;
+ SQLPLUS> alter database archivelog;
+ SQLPLUS> archive log start;
+ SQLPLUS> alter database open;
+</font></pre>';
+ }
+
+ 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 " <p>".$ret." </p>";
+
+ }
+
+ 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 " <p>".$ret." </p>";
+
+ }
+
+ 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 = "<p><b>Tablespace</b>".rs2html($rs,false,false,false,false);
+
+ $rs = $this->conn->Execute("select * from dba_data_files order by tablespace_name, 1");
+ $ret .= "<p><b>Datafile</b>".rs2html($rs,false,false,false,false);
+
+ return " <p>".$ret." </p>";
+ }
+
+ 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 " <p>".$ret." </p>";
+
}
-
+
+ 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 " <p>".$ret." </p>";
+ }
+
+ function FlashUsage()
+ {
+ $rs = $this->conn->Execute("select * from V\$FLASH_RECOVERY_AREA_USAGE");
+ $ret = rs2html($rs,false,false,false,false);
+ return " <p>".$ret." </p>";
+ }
+
function WarnPageCost($val)
{
- if ($val == 100) $s = '<font color=red><b>Too High</b>. </font>';
+ if ($val == 100 && $this->version['version'] < 10) $s = '<font color=red><b>Too High</b>. </font>';
else $s = '';
-
+
return $s.'Recommended is 20-50 for TP, and 50 for data warehouses. Default is 100. See <a href=http://www.dba-oracle.com/oracle_tips_cost_adj.htm>optimizer_index_cost_adj</a>. ';
}
-
+
function WarnIndexCost($val)
{
- if ($val == 0) $s = '<font color=red><b>Too Low</b>. </font>';
+ if ($val == 0 && $this->version['version'] < 10) $s = '<font color=red><b>Too Low</b>. </font>';
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 <a href=http://www.dba-oracle.com/oracle_tips_cbo_part1.htm>optimizer_index_caching</a>.';
}
-
+
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 = "<h3>PGA Advice Estimate</h3>";
+ 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 "<p><b>Missing PLAN_TABLE</b></p>
<pre>
@@ -244,13 +405,13 @@ CREATE TABLE PLAN_TABLE (
</pre>";
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 +419,13 @@ CREATE TABLE PLAN_TABLE (
}
}
}
-
- $s = "<p><b>Explain</b>: ".htmlspecialchars($sql)."</p>";
-
+
+ $s = "<p><b>Explain</b>: ".htmlspecialchars($sql)."</p>";
+
$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 +433,53 @@ CREATE TABLE PLAN_TABLE (
$s .= "<p>$m</p>";
return $s;
}
- $rs =& $this->conn->Execute("
- select
- '<pre>'||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'</pre>' as Operation,
+ $rs = $this->conn->Execute("
+ select
+ '<pre>'||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'</pre>' 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 = "<h3>Data Cache Estimate</h3>";
+ $s = "<h3>Data Cache Advice Estimate</h3>";
if ($rs->EOF) {
$s .= "<p>Cache that is 50% of current size is still too big</p>";
} 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 +502,18 @@ select a.size_for_estimate as cache_mb_estimate,
$prefix = '';
$suffix = '';
}
-
+
$s .= "\n<tr><td align=right>".$carr[0].'</td><td align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
}
$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 = "<a target=".rand()." href=\"?&hidem=1&$type=1&sql=".rawurlencode($sql).'&x#explain">';
$suffix = '</a>';
@@ -359,11 +522,11 @@ select a.size_for_estimate as cache_mb_estimate,
$suffix = '';
}
$s .= "\n<tr><td align=right>".$carr[0].'</td><td align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
-
+
return $s."</table>\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 +537,7 @@ select
s.executions executes,
p.sql_text
from
- (
+ (
select
address,
buffer_gets,
@@ -382,7 +545,7 @@ from
pct,
rank() over (order by buffer_gets desc) ranking
from
- (
+ (
select
address,
buffer_gets,
@@ -410,30 +573,34 @@ order by
}
if (isset($_GET['sql'])) return $this->_SuspiciousSQL($numsql);
-
+
$s = '';
+ $timer = time();
$s .= $this->_SuspiciousSQL($numsql);
+ $timer = time() - $timer;
+
+ if ($timer > $this->noShowIxora) return $s;
$s .= '<p>';
-
+
$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<h3>Ixora Suspicious SQL</h3>";
$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 +611,7 @@ select
s.executions executes,
p.sql_text
from
- (
+ (
select
address,
disk_reads,
@@ -475,35 +642,62 @@ order by
";
global $ADODB_CACHE_MODE;
if (isset($_GET['expeixora']) && isset($_GET['sql'])) {
- $partial = empty($_GET['part']);
+ $partial = empty($_GET['part']);
echo "<a name=explain></a>".$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 .= '<p>';
$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<h3>Ixora Expensive SQL</h3>";
$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 created<SYSDATE)
+ LOOP
+ cnt := cnt + 1;
+ DELETE FROM $perf_table WHERE ROWID=rec.rr;
+ IF cnt = 1000 THEN
+ COMMIT;
+ cnt := 0;
+ END IF;
+ END LOOP;
+ commit;
+END;";
+
+ $ok = $this->conn->Execute($sql);
+ }
+
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/perf/perf-postgres.inc.php b/libraries/adodb/perf/perf-postgres.inc.php
index dccfac061..bd0ccb1b5 100644
--- a/libraries/adodb/perf/perf-postgres.inc.php
+++ b/libraries/adodb/perf/perf-postgres.inc.php
@@ -1,16 +1,18 @@
<?php
-/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence. See License.txt.
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence. See License.txt.
Set tabs to 4 for best viewing.
-
+
Latest version is available at http://adodb.sourceforge.net
-
- Library for basic performance monitoring and tuning
-
+
+ Library for basic performance monitoring and tuning
+
*/
// security - hide paths
@@ -20,13 +22,13 @@ if (!defined('ADODB_DIR')) die();
Notice that PostgreSQL has no sql query cache
*/
class perf_postgres extends adodb_perf{
-
- var $tablesSQL =
+
+ var $tablesSQL =
"select a.relname as tablename,(a.relpages+CASE WHEN b.relpages is null THEN 0 ELSE b.relpages END+CASE WHEN c.relpages is null THEN 0 ELSE c.relpages END)*8 as size_in_K,a.relfilenode as \"OID\" from pg_class a left join pg_class b
- on b.relname = 'pg_toast_'||trim(a.relfilenode)
+ on b.relname = 'pg_toast_'||trim(a.relfilenode)
left join pg_class c on c.relname = 'pg_toast_'||trim(a.relfilenode)||'_index'
where a.relname in (select tablename from pg_tables where tablename not like 'pg_%')";
-
+
var $createTableSQL = "CREATE TABLE adodb_logsql (
created timestamp NOT NULL,
sql0 varchar(250) NOT NULL,
@@ -34,8 +36,8 @@ class perf_postgres extends adodb_perf{
params text NOT NULL,
tracer text NOT NULL,
timer decimal(16,6) NOT NULL
- )";
-
+ )";
+
var $settings = array(
'Ratios',
'statistics collector' => array('RATIO',
@@ -86,16 +88,45 @@ class perf_postgres extends adodb_perf{
'Cost of doing a seek (default=4). See <a href=http://www.varlena.com/GeneralBits/Tidbits/perf.html#less>random_page_cost</a>'),
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("<p>%s: '%s' using of undefined mode '%s'</p>", __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 +152,3 @@ class perf_postgres extends adodb_perf{
return $s;
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/pivottable.inc.php b/libraries/adodb/pivottable.inc.php
index 290171f07..dd7d5d88a 100644
--- a/libraries/adodb/pivottable.inc.php
+++ b/libraries/adodb/pivottable.inc.php
@@ -1,16 +1,18 @@
<?php
-/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+/**
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
*
* Set tabs to 4 for best viewing.
- *
+ *
*/
/*
- * Concept from daniel.lucazeau@ajornet.com.
+ * Concept from daniel.lucazeau@ajornet.com.
*
* @param db Adodb database connection
* @param tables List of tables to join
@@ -18,8 +20,8 @@
* @colfield Pivot field to slice and display in columns, if we want to calculate
* ranges, we pass in an array (see example2)
* @where Where clause. Optional.
- * @aggfield This is the field to sum. Optional.
- * Since 2.3.1, if you can use your own aggregate function
+ * @aggfield This is the field to sum. Optional.
+ * Since 2.3.1, if you can use your own aggregate function
* instead of SUM, eg. $aggfield = 'fieldname'; $aggfn = 'AVG';
* @sumlabel Prefix to display in sum columns. Optional.
* @aggfn Aggregate function to use (could be AVG, SUM, COUNT)
@@ -27,28 +29,28 @@
*
* @returns Sql generated
*/
-
+
function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
$aggfield = false,$sumlabel='Sum ',$aggfn ='SUM', $showcount = true)
{
if ($aggfield) $hidecnt = true;
else $hidecnt = false;
-
- $iif = strpos($db->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 +61,7 @@
:
"\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
}
- }
+ }
} else {
foreach ($colarr as $v) {
if (!is_numeric($v)) $vq = $db->qstr($v);
@@ -84,20 +86,20 @@
}
if ($aggfield && $aggfield != '1'){
$agg = "$aggfn($aggfield)";
- $sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";
+ $sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";
}
-
+
if ($showcount)
$sel .= "\n\tSUM(1) as Total";
else
$sel = substr($sel,0,strlen($sel)-2);
-
-
+
+
// Strip aliases
$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
-
+
$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
-
+
return $sql;
}
@@ -109,7 +111,7 @@ if (0) {
# Query the main "product" table
# Set the rows to CompanyName and QuantityPerUnit
# and the columns to the Categories
-# and define the joins to link to lookup tables
+# and define the joins to link to lookup tables
# "categories" and "suppliers"
#
@@ -117,27 +119,27 @@ if (0) {
$gDB, # adodb connection
'products p ,categories c ,suppliers s', # tables
'CompanyName,QuantityPerUnit', # row fields
- 'CategoryName', # column fields
+ 'CategoryName', # column fields
'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
);
print "<pre>$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 +149,7 @@ GROUP BY CompanyName,QuantityPerUnit
# Query the main "product" table
# Set the rows to CompanyName and QuantityPerUnit
# and the columns to the UnitsInStock for diiferent ranges
-# and define the joins to link to lookup tables
+# and define the joins to link to lookup tables
# "categories" and "suppliers"
#
$sql = PivotTableSQL(
@@ -155,7 +157,7 @@ GROUP BY CompanyName,QuantityPerUnit
'products p ,categories c ,suppliers s', # tables
'CompanyName,QuantityPerUnit', # row fields
# column ranges
-array(
+array(
' 0 ' => 'UnitsInStock <= 0',
"1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
"6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
@@ -171,17 +173,16 @@ array(
rs2html($rs);
/*
Generated SQL:
-
-SELECT CompanyName,QuantityPerUnit,
- SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum 0 ",
- SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5",
- SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10",
- SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15",
+
+SELECT CompanyName,QuantityPerUnit,
+ SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum 0 ",
+ SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5",
+ SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10",
+ SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15",
SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 16+",
- SUM(UnitsInStock) AS "Sum UnitsInStock",
- SUM(1) as Total
-FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID
+ SUM(UnitsInStock) AS "Sum UnitsInStock",
+ SUM(1) as Total
+FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID
GROUP BY CompanyName,QuantityPerUnit
*/
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/rsfilter.inc.php b/libraries/adodb/rsfilter.inc.php
index 052752948..4b609b98b 100644
--- a/libraries/adodb/rsfilter.inc.php
+++ b/libraries/adodb/rsfilter.inc.php
@@ -1,29 +1,31 @@
<?php
-/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+/**
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
*
* Set tabs to 4 for best viewing.
- *
+ *
* Latest version is available at http://php.weblogs.com
*
* Requires PHP4.01pl2 or later because it uses include_once
*/
/*
- Filter all fields and all rows in a recordset and returns the
+ Filter all fields and all rows in a recordset and returns the
processed recordset. We scroll to the beginning of the new recordset
after processing.
-
+
We pass a recordset and function name to RSFilter($rs,'rowfunc');
and the function will be called multiple times, once
for each row in the recordset. The function will be passed
an array containing one row repeatedly.
-
- Example:
-
+
+ Example:
+
// ucwords() every element in the recordset
function do_ucwords(&$arr,$rs)
{
@@ -33,12 +35,12 @@
}
$rs = RSFilter($rs,'do_ucwords');
*/
-function &RSFilter($rs,$fn)
+function RSFilter($rs,$fn)
{
if ($rs->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 +51,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/libraries/adodb/server.php b/libraries/adodb/server.php
index 4cadaa394..c61287e73 100644
--- a/libraries/adodb/server.php
+++ b/libraries/adodb/server.php
@@ -1,29 +1,31 @@
<?php
-/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
+/**
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
*/
-
+
/* Documentation on usage is at http://php.weblogs.com/adodb_csv
*
* Legal query string parameters:
- *
+ *
* sql = holds sql string
- * nrows = number of rows to return
+ * nrows = number of rows to return
* offset = skip offset rows of data
* fetch = $ADODB_FETCH_MODE
- *
+ *
* example:
*
* http://localhost/php/server.php?select+*+from+table&nrows=10&offset=2
*/
-/*
- * Define the IP address you want to accept requests from
+/*
+ * Define the IP address you want to accept requests from
* as a security measure. If blank we accept anyone promisciously!
*/
$ACCEPTIP = '127.0.0.1';
@@ -50,14 +52,14 @@ function err($s)
}
// undo stupid magic quotes
-function undomq(&$m)
+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;
}
@@ -65,36 +67,34 @@ function undomq(&$m)
///////////////////////////////////////// DEFINITIONS
-$remote = $_SERVER["REMOTE_ADDR"];
-
+$remote = $_SERVER["REMOTE_ADDR"];
+
if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP)
+ if ($remote != '127.0.0.1' && $remote != $ACCEPTIP)
err("Unauthorised client: '$remote'");
-
-
+
+
if (empty($_REQUEST['sql'])) err('No SQL');
-$conn = &ADONewConnection($driver);
+$conn = ADONewConnection($driver);
if (!$conn->Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
$sql = undomq($_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
+} else
$rs = $conn->Execute($sql);
-if ($rs){
+if ($rs){
//$rs->timeToLive = 1;
echo _rs2serialize($rs,$conn,$sql);
$rs->Close();
} else
err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/adodb-compress-bzip2.php b/libraries/adodb/session/adodb-compress-bzip2.php
index 91d15e3f1..4e6ab501a 100644
--- a/libraries/adodb/session/adodb-compress-bzip2.php
+++ b/libraries/adodb/session/adodb-compress-bzip2.php
@@ -1,8 +1,10 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Contributed by Ross Smith (adodb@netebb.com).
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -73,7 +75,7 @@ class ADODB_Compress_Bzip2 {
/**
*/
- 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 +116,3 @@ class ADODB_Compress_Bzip2 {
}
return 1;
-
-?>
diff --git a/libraries/adodb/session/adodb-compress-gzip.php b/libraries/adodb/session/adodb-compress-gzip.php
index 3134408c8..53bb0530a 100644
--- a/libraries/adodb/session/adodb-compress-gzip.php
+++ b/libraries/adodb/session/adodb-compress-gzip.php
@@ -2,8 +2,10 @@
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Contributed by Ross Smith (adodb@netebb.com).
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -56,7 +58,7 @@ class ADODB_Compress_Gzip {
/**
*/
- 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 +91,3 @@ class ADODB_Compress_Gzip {
}
return 1;
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/adodb-cryptsession.php b/libraries/adodb/session/adodb-cryptsession.php
index 677c18eb7..763cb50e8 100644
--- a/libraries/adodb/session/adodb-cryptsession.php
+++ b/libraries/adodb/session/adodb-cryptsession.php
@@ -2,8 +2,10 @@
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Contributed by Ross Smith (adodb@netebb.com).
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -16,9 +18,10 @@ This file is provided for backwards compatibility purposes
*/
-require_once dirname(__FILE__) . '/adodb-session.php';
+if (!defined('ADODB_SESSION')) {
+ require_once dirname(__FILE__) . '/adodb-session.php';
+}
+
require_once ADODB_SESSION . '/adodb-encrypt-md5.php';
ADODB_Session::filter(new ADODB_Encrypt_MD5());
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/adodb-cryptsession2.php b/libraries/adodb/session/adodb-cryptsession2.php
new file mode 100644
index 000000000..b2ef54dd9
--- /dev/null
+++ b/libraries/adodb/session/adodb-cryptsession2.php
@@ -0,0 +1,27 @@
+<?php
+
+
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+ Set tabs to 4 for best viewing.
+*/
+
+/*
+
+This file is provided for backwards compatibility purposes
+
+*/
+
+if (!defined('ADODB_SESSION')) {
+ require_once dirname(__FILE__) . '/adodb-session2.php';
+}
+
+require_once ADODB_SESSION . '/adodb-encrypt-md5.php';
+
+ADODB_Session::filter(new ADODB_Encrypt_MD5());
diff --git a/libraries/adodb/session/adodb-encrypt-mcrypt.php b/libraries/adodb/session/adodb-encrypt-mcrypt.php
index 0a5174b18..fc99fbc29 100644
--- a/libraries/adodb/session/adodb-encrypt-mcrypt.php
+++ b/libraries/adodb/session/adodb-encrypt-mcrypt.php
@@ -2,8 +2,10 @@
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Contributed by Ross Smith (adodb@netebb.com).
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -69,7 +71,7 @@ class ADODB_Encrypt_MCrypt {
/**
*/
- function ADODB_Encrypt_MCrypt($cipher = null, $mode = null, $source = null) {
+ function __construct($cipher = null, $mode = null, $source = null) {
if (!$cipher) {
$cipher = MCRYPT_RIJNDAEL_256;
}
@@ -105,5 +107,3 @@ class ADODB_Encrypt_MCrypt {
}
return 1;
-
-?>
diff --git a/libraries/adodb/session/adodb-encrypt-md5.php b/libraries/adodb/session/adodb-encrypt-md5.php
index fc62c566e..f5b2da616 100644
--- a/libraries/adodb/session/adodb-encrypt-md5.php
+++ b/libraries/adodb/session/adodb-encrypt-md5.php
@@ -1,8 +1,10 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Contributed by Ross Smith (adodb@netebb.com).
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -21,19 +23,17 @@ class ADODB_Encrypt_MD5 {
/**
*/
function write($data, $key) {
- $md5crypt =& new MD5Crypt();
+ $md5crypt = new MD5Crypt();
return $md5crypt->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/libraries/adodb/session/adodb-encrypt-secret.php b/libraries/adodb/session/adodb-encrypt-secret.php
index b882714b1..96ae85494 100644
--- a/libraries/adodb/session/adodb-encrypt-secret.php
+++ b/libraries/adodb/session/adodb-encrypt-secret.php
@@ -1,8 +1,10 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Contributed by Ross Smith (adodb@netebb.com).
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -44,5 +46,3 @@ class ADODB_Encrypt_Secret {
}
return 1;
-
-?>
diff --git a/libraries/adodb/session/adodb-encrypt-sha1.php b/libraries/adodb/session/adodb-encrypt-sha1.php
index c876002bb..70655153f 100644
--- a/libraries/adodb/session/adodb-encrypt-sha1.php
+++ b/libraries/adodb/session/adodb-encrypt-sha1.php
@@ -10,17 +10,17 @@ include_once ADODB_SESSION . '/crypt.inc.php';
class ADODB_Encrypt_SHA1 {
- function write($data, $key)
+ function write($data, $key)
{
- $sha1crypt =& new SHA1Crypt();
+ $sha1crypt = new SHA1Crypt();
return $sha1crypt->encrypt($data, $key);
}
- function read($data, $key)
+ function read($data, $key)
{
- $sha1crypt =& new SHA1Crypt();
+ $sha1crypt = new SHA1Crypt();
return $sha1crypt->decrypt($data, $key);
}
@@ -29,4 +29,3 @@ class ADODB_Encrypt_SHA1 {
return 1;
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/adodb-sess.txt b/libraries/adodb/session/adodb-sess.txt
new file mode 100644
index 000000000..c6c768586
--- /dev/null
+++ b/libraries/adodb/session/adodb-sess.txt
@@ -0,0 +1,131 @@
+John,
+
+I have been an extremely satisfied ADODB user for several years now.
+
+To give you something back for all your hard work, I've spent the last 3
+days rewriting the adodb-session.php code.
+
+----------
+What's New
+----------
+
+Here's a list of the new code's benefits:
+
+* Combines the functionality of the three files:
+
+adodb-session.php
+adodb-session-clob.php
+adodb-cryptsession.php
+
+each with very similar functionality, into a single file adodb-session.php.
+This will ease maintenance and support issues.
+
+* Supports multiple encryption and compression schemes.
+ Currently, we support:
+
+ MD5Crypt (crypt.inc.php)
+ MCrypt
+ Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
+ GZip
+ BZip2
+
+These can be stacked, so if you want to compress and then encrypt your
+session data, it's easy.
+Also, the built-in MCrypt functions will be *much* faster, and more secure,
+than the MD5Crypt code.
+
+* adodb-session.php contains a single class ADODB_Session that encapsulates
+all functionality.
+ This eliminates the use of global vars and defines (though they are
+supported for backwards compatibility).
+
+* All user defined parameters are now static functions in the ADODB_Session
+class.
+
+New parameters include:
+
+* encryptionKey(): Define the encryption key used to encrypt the session.
+Originally, it was a hard coded string.
+
+* persist(): Define if the database will be opened in persistent mode.
+Originally, the user had to call adodb_sess_open().
+
+* dataFieldName(): Define the field name used to store the session data, as
+'DATA' appears to be a reserved word in the following cases:
+ ANSI SQL
+ IBM DB2
+ MS SQL Server
+ Postgres
+ SAP
+
+* filter(): Used to support multiple, simulataneous encryption/compression
+schemes.
+
+* Debug support is improved thru _rsdump() function, which is called after
+every database call.
+
+------------
+What's Fixed
+------------
+
+The new code includes several bug fixes and enhancements:
+
+* sesskey is compared in BINARY mode for MySQL, to avoid problems with
+session keys that differ only by case.
+ Of course, the user should define the sesskey field as BINARY, to
+correctly fix this problem, otherwise performance will suffer.
+
+* In ADODB_Session::gc(), if $expire_notify is true, the multiple DELETES in
+the original code have been optimized to a single DELETE.
+
+* In ADODB_Session::destroy(), since "SELECT expireref, sesskey FROM $table
+WHERE sesskey = $qkey" will only return a single value, we don't loop on the
+result, we simply process the row, if any.
+
+* We close $rs after every use.
+
+---------------
+What's the Same
+---------------
+
+I know backwards compatibility is *very* important to you. Therefore, the
+new code is 100% backwards compatible.
+
+If you like my code, but don't "trust" it's backwards compatible, maybe we
+offer it as beta code, in a new directory for a release or two?
+
+------------
+What's To Do
+------------
+
+I've vascillated over whether to use a single function to get/set
+parameters:
+
+$user = ADODB_Session::user(); // get
+ADODB_Session::user($user); // set
+
+or to use separate functions (which is the PEAR/Java way):
+
+$user = ADODB_Session::getUser();
+ADODB_Session::setUser($user);
+
+I've chosen the former as it's makes for a simpler API, and reduces the
+amount of code, but I'd be happy to change it to the latter.
+
+Also, do you think the class should be a singleton class, versus a static
+class?
+
+Let me know if you find this code useful, and will be including it in the
+next release of ADODB.
+
+If so, I will modify the current documentation to detail the new
+functionality. To that end, what file(s) contain the documentation? Please
+send them to me if they are not publically available.
+
+Also, if there is *anything* in the code that you like to see changed, let
+me know.
+
+Thanks,
+
+Ross
+
diff --git a/libraries/adodb/session/adodb-session-clob.php b/libraries/adodb/session/adodb-session-clob.php
index 1d470eaac..a6906f601 100644
--- a/libraries/adodb/session/adodb-session-clob.php
+++ b/libraries/adodb/session/adodb-session-clob.php
@@ -2,8 +2,10 @@
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Contributed by Ross Smith (adodb@netebb.com).
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -16,8 +18,7 @@ This file is provided for backwards compatibility purposes
*/
-require_once dirname(__FILE__) . '/adodb-session.php';
-
+if (!defined('ADODB_SESSION')) {
+ require_once dirname(__FILE__) . '/adodb-session.php';
+}
ADODB_Session::clob('CLOB');
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/adodb-session-clob2.php b/libraries/adodb/session/adodb-session-clob2.php
new file mode 100644
index 000000000..2cb1cab67
--- /dev/null
+++ b/libraries/adodb/session/adodb-session-clob2.php
@@ -0,0 +1,24 @@
+<?php
+
+
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+ Set tabs to 4 for best viewing.
+*/
+
+/*
+
+This file is provided for backwards compatibility purposes
+
+*/
+
+if (!defined('ADODB_SESSION')) {
+ require_once dirname(__FILE__) . '/adodb-session2.php';
+}
+ADODB_Session::clob('CLOB');
diff --git a/libraries/adodb/session/adodb-session.php b/libraries/adodb/session/adodb-session.php
index dde1d9442..aa2ea1e84 100644
--- a/libraries/adodb/session/adodb-session.php
+++ b/libraries/adodb/session/adodb-session.php
@@ -2,8 +2,10 @@
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Contributed by Ross Smith (adodb@netebb.com).
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
@@ -34,16 +36,16 @@ if (defined('ADODB_SESSION')) return 1;
define('ADODB_SESSION', dirname(__FILE__));
-/*
- Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821
-
- From Kerr Schere, to unserialize session data stored via ADOdb.
- 1. Pull the session data from the db and loop through it.
- 2. Inside the loop, you will need to urldecode the data column.
+/*
+ Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821
+
+ From Kerr Schere, to unserialize session data stored via ADOdb.
+ 1. Pull the session data from the db and loop through it.
+ 2. Inside the loop, you will need to urldecode the data column.
3. After urldecode, run the serialized string through this function:
*/
-function adodb_unserialize( $serialized_string )
+function adodb_unserialize( $serialized_string )
{
$variables = array( );
$a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
@@ -57,9 +59,9 @@ function adodb_unserialize( $serialized_string )
Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
Since adodb 4.61.
*/
-function adodb_session_regenerate_id()
+function adodb_session_regenerate_id()
{
- $conn =& ADODB_Session::_conn();
+ $conn = ADODB_Session::_conn();
if (!$conn) return false;
$old_id = session_id();
@@ -72,8 +74,8 @@ function adodb_session_regenerate_id()
//@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);
@@ -81,7 +83,7 @@ function adodb_session_regenerate_id()
setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
return false;
}
-
+
return true;
}
@@ -95,7 +97,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 +113,13 @@ class ADODB_Session {
/////////////////////
// getter/setter methods
/////////////////////
-
+
/*
-
+
function Lock($lock=null)
{
static $_lock = false;
-
+
if (!is_null($lock)) $_lock = $lock;
return $lock;
}
@@ -219,7 +221,7 @@ class ADODB_Session {
/*!
*/
- function persist($persist = null)
+ function persist($persist = null)
{
static $_persist = true;
@@ -421,7 +423,7 @@ class ADODB_Session {
/*!
*/
- function &_conn($conn=null) {
+ function _conn($conn=null) {
return $GLOBALS['ADODB_SESS_CONN'];
}
@@ -463,7 +465,7 @@ class ADODB_Session {
/*!
*/
function _dumprs($rs) {
- $conn =& ADODB_Session::_conn();
+ $conn = ADODB_Session::_conn();
$debug = ADODB_Session::debug();
if (!$conn) {
@@ -492,7 +494,7 @@ class ADODB_Session {
/////////////////////
// public methods
/////////////////////
-
+
function config($driver, $host, $user, $password, $database=false,$options=false)
{
ADODB_Session::driver($driver);
@@ -500,10 +502,12 @@ class ADODB_Session {
ADODB_Session::user($user);
ADODB_Session::password($password);
ADODB_Session::database($database);
-
+
+ if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
+
if (isset($options['table'])) ADODB_Session::table($options['table']);
- if (isset($options['clob'])) ADODB_Session::table($options['clob']);
- if (isset($options['field'])) ADODB_Session::dataFieldName($options['field']);
+ if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
+ if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
}
/*!
@@ -511,8 +515,9 @@ class ADODB_Session {
If $conn already exists, reuse that connection
*/
- function open($save_path, $session_name, $persist = null) {
- $conn =& ADODB_Session::_conn();
+ function open($save_path, $session_name, $persist = null)
+ {
+ $conn = ADODB_Session::_conn();
if ($conn) {
return true;
@@ -536,7 +541,7 @@ class ADODB_Session {
# assert('$driver');
# assert('$host');
- $conn =& ADONewConnection($driver);
+ $conn = ADONewConnection($driver);
if ($debug) {
$conn->debug = true;
@@ -554,10 +559,10 @@ class ADODB_Session {
$ok = $conn->Connect($host, $user, $password, $database);
}
- if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
+ if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
else
ADOConnection::outp('<p>Session: connection failed</p>', false);
-
+
return $ok;
}
@@ -565,9 +570,10 @@ class ADODB_Session {
/*!
Close the connection
*/
- function close() {
+ function close()
+ {
/*
- $conn =& ADODB_Session::_conn();
+ $conn = ADODB_Session::_conn();
if ($conn) $conn->Close();
*/
return true;
@@ -576,8 +582,9 @@ class ADODB_Session {
/*
Slurp in the session variables and return the serialized string
*/
- function read($key) {
- $conn =& ADODB_Session::_conn();
+ function read($key)
+ {
+ $conn = ADODB_Session::_conn();
$data = ADODB_Session::dataFieldName();
$filter = ADODB_Session::filter();
$table = ADODB_Session::table();
@@ -586,20 +593,20 @@ class ADODB_Session {
return '';
}
- assert('$table');
+ //assert('$table');
$qkey = $conn->quote($key);
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-
+
$sql = "SELECT $data FROM $table WHERE sesskey = $binary $qkey AND expiry >= " . time();
- /* Lock code does not work as it needs to hold transaction within whole page, and we don't know if
+ /* Lock code does not work as it needs to hold transaction within whole page, and we don't know if
developer has commited elsewhere... :(
*/
#if (ADODB_Session::Lock())
- # $rs =& $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
+ # $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) {
@@ -629,13 +636,14 @@ class ADODB_Session {
If the data has not been modified since the last read(), we do not write.
*/
- function write($key, $val) {
+ function write($key, $val)
+ {
global $ADODB_SESSION_READONLY;
-
+
if (!empty($ADODB_SESSION_READONLY)) return;
-
+
$clob = ADODB_Session::clob();
- $conn =& ADODB_Session::_conn();
+ $conn = ADODB_Session::_conn();
$crc = ADODB_Session::_crc();
$data = ADODB_Session::dataFieldName();
$debug = ADODB_Session::debug();
@@ -644,13 +652,13 @@ class ADODB_Session {
$filter = ADODB_Session::filter();
$lifetime = ADODB_Session::lifetime();
$table = ADODB_Session::table();
-
+
if (!$conn) {
return false;
}
$qkey = $conn->qstr($key);
-
- assert('$table');
+
+ //assert('$table');
$expiry = time() + $lifetime;
@@ -660,9 +668,9 @@ class ADODB_Session {
// 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 '<p>Session: Only updating date - crc32 not changed</p>';
+ ADOConnection::outp( '<p>Session: Only updating date - crc32 not changed</p>');
}
-
+
$expirevar = '';
if ($expire_notify) {
$var = reset($expire_notify);
@@ -671,10 +679,10 @@ class ADODB_Session {
$expirevar = $$var;
}
}
-
-
+
+
$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
- $rs =& $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
+ $rs = $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
return true;
}
$val = rawurlencode($val);
@@ -694,9 +702,9 @@ class ADODB_Session {
}
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) {
@@ -713,36 +721,28 @@ class ADODB_Session {
$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();
- }
+ if ($rs)$rs->Close();
+
$err = '';
- $rs1 =& $conn->Execute($sql);
- if (!$rs1) {
- $err = $conn->ErrorMsg()."\n";
- }
- $rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
-
- if (!$rs2) {
- $err .= $conn->ErrorMsg()."\n";
- }
+ $rs1 = $conn->Execute($sql);
+ if (!$rs1) $err = $conn->ErrorMsg()."\n";
+
+ $rs2 = $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
+ if (!$rs2) $err .= $conn->ErrorMsg()."\n";
+
$rs = ($rs && $rs2) ? true : false;
- if ($rs1) {
- $rs1->Close();
- }
- if (is_object($rs2)) {
- $rs2->Close();
- }
+ $conn->CompleteTrans();
}
if (!$rs) {
@@ -753,7 +753,7 @@ class ADODB_Session {
// 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();
@@ -769,7 +769,7 @@ class ADODB_Session {
/*!
*/
function destroy($key) {
- $conn =& ADODB_Session::_conn();
+ $conn = ADODB_Session::_conn();
$table = ADODB_Session::table();
$expire_notify = ADODB_Session::expireNotify();
@@ -777,7 +777,7 @@ class ADODB_Session {
return false;
}
- assert('$table');
+ //assert('$table');
$qkey = $conn->quote($key);
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
@@ -787,7 +787,7 @@ class ADODB_Session {
$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) {
@@ -804,19 +804,17 @@ class ADODB_Session {
}
$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
- $rs =& $conn->Execute($sql);
+ $rs = $conn->Execute($sql);
ADODB_Session::_dumprs($rs);
- if ($rs) {
- $rs->Close();
- }
return $rs ? true : false;
}
/*!
*/
- function gc($maxlifetime) {
- $conn =& ADODB_Session::_conn();
+ function gc($maxlifetime)
+ {
+ $conn = ADODB_Session::_conn();
$debug = ADODB_Session::debug();
$expire_notify = ADODB_Session::expireNotify();
$optimize = ADODB_Session::optimize();
@@ -827,10 +825,8 @@ class ADODB_Session {
return false;
}
- assert('$table');
$time = time();
-
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
if ($expire_notify) {
@@ -838,35 +834,35 @@ class ADODB_Session {
$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) {
- $conn->BeginTrans();
+ $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='$key'");
+ $del = $conn->Execute("DELETE FROM $table WHERE sesskey=".$conn->Param('0'),array($key));
$rs->MoveNext();
}
$rs->Close();
-
- $conn->CommitTrans();
+
+ $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='$row[0]'";
- $conn->Execute($sql2);
+ $sql2 = "DELETE FROM $table WHERE sesskey=".$conn->Param('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();
}
@@ -899,7 +895,7 @@ class ADODB_Session {
}
$sql .= " FROM $table";
- $rs =& $conn->SelectLimit($sql, 1);
+ $rs = $conn->SelectLimit($sql, 1);
if ($rs && !$rs->EOF) {
$dbts = reset($rs->fields);
$rs->Close();
@@ -933,8 +929,6 @@ function adodb_sess_open($save_path, $session_name, $persist = true) {
// for backwards compatability only
function adodb_sess_gc($t)
-{
+{
return ADODB_Session::gc($t);
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/adodb-session2.php b/libraries/adodb/session/adodb-session2.php
new file mode 100644
index 000000000..adeefc621
--- /dev/null
+++ b/libraries/adodb/session/adodb-session2.php
@@ -0,0 +1,939 @@
+<?php
+
+
+/*
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Contributed by Ross Smith (adodb@netebb.com).
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+ Set tabs to 4 for best viewing.
+
+
+*/
+
+/*
+
+CREATE Table SCripts
+
+Oracle
+======
+
+CREATE TABLE SESSIONS2
+(
+ SESSKEY VARCHAR2(48 BYTE) NOT NULL,
+ EXPIRY DATE NOT NULL,
+ EXPIREREF VARCHAR2(200 BYTE),
+ CREATED DATE NOT NULL,
+ MODIFIED DATE NOT NULL,
+ SESSDATA CLOB,
+ PRIMARY KEY(SESSKEY)
+);
+
+
+CREATE INDEX SESS2_EXPIRY ON SESSIONS2(EXPIRY);
+CREATE UNIQUE INDEX SESS2_PK ON SESSIONS2(SESSKEY);
+CREATE INDEX SESS2_EXP_REF ON SESSIONS2(EXPIREREF);
+
+
+
+ MySQL
+ =====
+
+CREATE TABLE sessions2(
+ sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
+ expiry TIMESTAMP NOT NULL ,
+ expireref VARCHAR( 250 ) DEFAULT '',
+ created TIMESTAMP NOT NULL ,
+ modified TIMESTAMP NOT NULL ,
+ sessdata LONGTEXT DEFAULT '',
+ PRIMARY KEY ( sesskey ) ,
+ INDEX sess2_expiry( expiry ),
+ INDEX sess2_expireref( expireref )
+)
+
+
+*/
+
+if (!defined('_ADODB_LAYER')) {
+ require realpath(dirname(__FILE__) . '/../adodb.inc.php');
+}
+
+if (defined('ADODB_SESSION')) return 1;
+
+define('ADODB_SESSION', dirname(__FILE__));
+define('ADODB_SESSION2', ADODB_SESSION);
+
+/*
+ Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821
+
+ From Kerr Schere, to unserialize session data stored via ADOdb.
+ 1. Pull the session data from the db and loop through it.
+ 2. Inside the loop, you will need to urldecode the data column.
+ 3. After urldecode, run the serialized string through this function:
+
+*/
+function adodb_unserialize( $serialized_string )
+{
+ $variables = array( );
+ $a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
+ for( $i = 0; $i < count( $a ); $i = $i+2 ) {
+ $variables[$a[$i]] = unserialize( $a[$i+1] );
+ }
+ return( $variables );
+}
+
+/*
+ Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
+ Since adodb 4.61.
+*/
+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;
+}
+
+/*
+ Generate database table for session data
+ @see http://phplens.com/lens/lensforum/msgs.php?id=12280
+ @return 0 if failure, 1 if errors, 2 if successful.
+ @author Markus Staab http://www.public-4u.de
+*/
+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) return 0;
+
+ $schema = new adoSchema($conn);
+ $schema->ParseSchema($schemaFile);
+ return $schema->ExecuteSchema();
+}
+
+/*!
+ \static
+*/
+class ADODB_Session {
+ /////////////////////
+ // getter/setter methods
+ /////////////////////
+
+ /*
+
+ function Lock($lock=null)
+ {
+ static $_lock = false;
+
+ if (!is_null($lock)) $_lock = $lock;
+ return $lock;
+ }
+ */
+ /*!
+ */
+ static function driver($driver = null)
+ {
+ static $_driver = 'mysql';
+ static $set = false;
+
+ if (!is_null($driver)) {
+ $_driver = trim($driver);
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
+ return $GLOBALS['ADODB_SESSION_DRIVER'];
+ }
+ }
+
+ return $_driver;
+ }
+
+ /*!
+ */
+ static function host($host = null) {
+ static $_host = 'localhost';
+ static $set = false;
+
+ if (!is_null($host)) {
+ $_host = trim($host);
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
+ return $GLOBALS['ADODB_SESSION_CONNECT'];
+ }
+ }
+
+ return $_host;
+ }
+
+ /*!
+ */
+ static function user($user = null)
+ {
+ static $_user = 'root';
+ static $set = false;
+
+ if (!is_null($user)) {
+ $_user = trim($user);
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESSION_USER'])) {
+ return $GLOBALS['ADODB_SESSION_USER'];
+ }
+ }
+
+ return $_user;
+ }
+
+ /*!
+ */
+ static function password($password = null)
+ {
+ static $_password = '';
+ static $set = false;
+
+ if (!is_null($password)) {
+ $_password = $password;
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
+ return $GLOBALS['ADODB_SESSION_PWD'];
+ }
+ }
+
+ return $_password;
+ }
+
+ /*!
+ */
+ static function database($database = null)
+ {
+ static $_database = '';
+ static $set = false;
+
+ if (!is_null($database)) {
+ $_database = trim($database);
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESSION_DB'])) {
+ return $GLOBALS['ADODB_SESSION_DB'];
+ }
+ }
+ return $_database;
+ }
+
+ /*!
+ */
+ static function persist($persist = null)
+ {
+ static $_persist = true;
+
+ if (!is_null($persist)) {
+ $_persist = trim($persist);
+ }
+
+ return $_persist;
+ }
+
+ /*!
+ */
+ static function lifetime($lifetime = null)
+ {
+ static $_lifetime;
+ static $set = false;
+
+ if (!is_null($lifetime)) {
+ $_lifetime = (int) $lifetime;
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
+ return $GLOBALS['ADODB_SESS_LIFE'];
+ }
+ }
+ if (!$_lifetime) {
+ $_lifetime = ini_get('session.gc_maxlifetime');
+ if ($_lifetime <= 1) {
+ // bug in PHP 4.0.3 pl 1 -- how about other versions?
+ //print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $lifetime</h3>";
+ $_lifetime = 1440;
+ }
+ }
+
+ return $_lifetime;
+ }
+
+ /*!
+ */
+ static function debug($debug = null)
+ {
+ static $_debug = false;
+ static $set = false;
+
+ if (!is_null($debug)) {
+ $_debug = (bool) $debug;
+
+ $conn = ADODB_Session::_conn();
+ if ($conn) {
+ #$conn->debug = $_debug;
+ }
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
+ return $GLOBALS['ADODB_SESS_DEBUG'];
+ }
+ }
+
+ return $_debug;
+ }
+
+ /*!
+ */
+ static function expireNotify($expire_notify = null)
+ {
+ static $_expire_notify;
+ static $set = false;
+
+ if (!is_null($expire_notify)) {
+ $_expire_notify = $expire_notify;
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
+ return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
+ }
+ }
+
+ return $_expire_notify;
+ }
+
+ /*!
+ */
+ static function table($table = null)
+ {
+ static $_table = 'sessions2';
+ static $set = false;
+
+ if (!is_null($table)) {
+ $_table = trim($table);
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
+ return $GLOBALS['ADODB_SESSION_TBL'];
+ }
+ }
+
+ return $_table;
+ }
+
+ /*!
+ */
+ static function optimize($optimize = null)
+ {
+ static $_optimize = false;
+ static $set = false;
+
+ if (!is_null($optimize)) {
+ $_optimize = (bool) $optimize;
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (defined('ADODB_SESSION_OPTIMIZE')) {
+ return true;
+ }
+ }
+
+ return $_optimize;
+ }
+
+ /*!
+ */
+ static function syncSeconds($sync_seconds = null) {
+ //echo ("<p>WARNING: ADODB_SESSION::syncSeconds is longer used, please remove this function for your code</p>");
+
+ return 0;
+ }
+
+ /*!
+ */
+ static function clob($clob = null) {
+ static $_clob = false;
+ static $set = false;
+
+ if (!is_null($clob)) {
+ $_clob = strtolower(trim($clob));
+ $set = true;
+ } elseif (!$set) {
+ // backwards compatibility
+ if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
+ return $GLOBALS['ADODB_SESSION_USE_LOBS'];
+ }
+ }
+
+ return $_clob;
+ }
+
+ /*!
+ */
+ static function dataFieldName($data_field_name = null) {
+ //echo ("<p>WARNING: ADODB_SESSION::dataFieldName() is longer used, please remove this function for your code</p>");
+ return '';
+ }
+
+ /*!
+ */
+ static function filter($filter = null) {
+ static $_filter = array();
+
+ if (!is_null($filter)) {
+ if (!is_array($filter)) {
+ $filter = array($filter);
+ }
+ $_filter = $filter;
+ }
+
+ return $_filter;
+ }
+
+ /*!
+ */
+ static function encryptionKey($encryption_key = null) {
+ static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
+
+ if (!is_null($encryption_key)) {
+ $_encryption_key = $encryption_key;
+ }
+
+ return $_encryption_key;
+ }
+
+ /////////////////////
+ // private methods
+ /////////////////////
+
+ /*!
+ */
+ static function _conn($conn=null) {
+ return isset($GLOBALS['ADODB_SESS_CONN']) ? $GLOBALS['ADODB_SESS_CONN'] : false;
+ }
+
+ /*!
+ */
+ static function _crc($crc = null) {
+ static $_crc = false;
+
+ if (!is_null($crc)) {
+ $_crc = $crc;
+ }
+
+ return $_crc;
+ }
+
+ /*!
+ */
+ static function _init() {
+ session_module_name('user');
+ session_set_save_handler(
+ array('ADODB_Session', 'open'),
+ array('ADODB_Session', 'close'),
+ array('ADODB_Session', 'read'),
+ array('ADODB_Session', 'write'),
+ array('ADODB_Session', 'destroy'),
+ array('ADODB_Session', 'gc')
+ );
+ }
+
+
+ /*!
+ */
+ 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());
+ }
+
+ /*!
+ */
+ static function _dumprs(&$rs) {
+ $conn = ADODB_Session::_conn();
+ $debug = ADODB_Session::debug();
+
+ if (!$conn) {
+ return;
+ }
+
+ if (!$debug) {
+ return;
+ }
+
+ if (!$rs) {
+ echo "<br />\$rs is null or false<br />\n";
+ return;
+ }
+
+ //echo "<br />\nAffected_Rows=",$conn->Affected_Rows(),"<br />\n";
+
+ if (!is_object($rs)) {
+ return;
+ }
+ $rs = $conn->_rs2rs($rs);
+
+ require_once ADODB_SESSION.'/../tohtml.inc.php';
+ rs2html($rs);
+ $rs->MoveFirst();
+ }
+
+ /////////////////////
+ // public methods
+ /////////////////////
+
+ 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 (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']);
+ }
+
+ /*!
+ Create the connection to the database.
+
+ If $conn already exists, reuse that connection
+ */
+ static function open($save_path, $session_name, $persist = null)
+ {
+ $conn = ADODB_Session::_conn();
+
+ if ($conn) {
+ return true;
+ }
+
+ $database = ADODB_Session::database();
+ $debug = ADODB_Session::debug();
+ $driver = ADODB_Session::driver();
+ $host = ADODB_Session::host();
+ $password = ADODB_Session::password();
+ $user = ADODB_Session::user();
+
+ if (!is_null($persist)) {
+ ADODB_Session::persist($persist);
+ } else {
+ $persist = ADODB_Session::persist();
+ }
+
+# these can all be defaulted to in php.ini
+# assert('$database');
+# assert('$driver');
+# assert('$host');
+
+ $conn = ADONewConnection($driver);
+
+ if ($debug) {
+ $conn->debug = true;
+ ADOConnection::outp( " driver=$driver user=$user db=$database ");
+ }
+
+ if (empty($conn->_connectionID)) { // not dsn
+ if ($persist) {
+ switch($persist) {
+ default:
+ case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
+ case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
+ case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
+ }
+ } else {
+ $ok = $conn->Connect($host, $user, $password, $database);
+ }
+ } else {
+ $ok = true; // $conn->_connectionID is set after call to ADONewConnection
+ }
+
+ if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
+ else
+ ADOConnection::outp('<p>Session: connection failed</p>', false);
+
+
+ return $ok;
+ }
+
+ /*!
+ Close the connection
+ */
+ static function close()
+ {
+/*
+ $conn = ADODB_Session::_conn();
+ if ($conn) $conn->Close();
+*/
+ return true;
+ }
+
+ /*
+ Slurp in the session variables and return the serialized string
+ */
+ static function read($key)
+ {
+ $conn = ADODB_Session::_conn();
+ $filter = ADODB_Session::filter();
+ $table = ADODB_Session::table();
+
+ if (!$conn) {
+ return '';
+ }
+
+ //assert('$table');
+
+ $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+ global $ADODB_SESSION_SELECT_FIELDS;
+ if (!isset($ADODB_SESSION_SELECT_FIELDS)) $ADODB_SESSION_SELECT_FIELDS = 'sessdata';
+ $sql = "SELECT $ADODB_SESSION_SELECT_FIELDS FROM $table WHERE sesskey = $binary ".$conn->Param(0)." AND expiry >= " . $conn->sysTimeStamp;
+
+ /* Lock code does not work as it needs to hold transaction within whole page, and we don't know if
+ developer has commited elsewhere... :(
+ */
+ #if (ADODB_Session::Lock())
+ # $rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), sessdata);
+ #else
+ $rs = $conn->Execute($sql, array($key));
+ //ADODB_Session::_dumprs($rs);
+ if ($rs) {
+ if ($rs->EOF) {
+ $v = '';
+ } else {
+ $v = reset($rs->fields);
+ $filter = array_reverse($filter);
+ foreach ($filter as $f) {
+ if (is_object($f)) {
+ $v = $f->read($v, ADODB_Session::_sessionKey());
+ }
+ }
+ $v = rawurldecode($v);
+ }
+
+ $rs->Close();
+
+ ADODB_Session::_crc(strlen($v) . crc32($v));
+ return $v;
+ }
+
+ return '';
+ }
+
+ /*!
+ Write the serialized data to a database.
+
+ If the data has not been modified since the last read(), we do not write.
+ */
+ static function write($key, $oval)
+ {
+ global $ADODB_SESSION_READONLY;
+
+ if (!empty($ADODB_SESSION_READONLY)) return;
+
+ $clob = ADODB_Session::clob();
+ $conn = ADODB_Session::_conn();
+ $crc = ADODB_Session::_crc();
+ $debug = ADODB_Session::debug();
+ $driver = ADODB_Session::driver();
+ $expire_notify = ADODB_Session::expireNotify();
+ $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);
+
+ $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+ // crc32 optimization since adodb 2.1
+ // now we only update expiry date, thx to sebastian thom in adodb 2.32
+ if ($crc !== '00' && $crc !== false && $crc == (strlen($oval) . crc32($oval))) {
+ if ($debug) {
+ echo '<p>Session: Only updating date - crc32 not changed</p>';
+ }
+
+ $expirevar = '';
+ if ($expire_notify) {
+ $var = reset($expire_notify);
+ global $$var;
+ if (isset($$var)) {
+ $expirevar = $$var;
+ }
+ }
+
+
+ $sql = "UPDATE $table SET expiry = $expiry ,expireref=".$conn->Param('0').", modified = $sysTimeStamp WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= $sysTimeStamp";
+ $rs = $conn->Execute($sql,array($expirevar,$key));
+ return true;
+ }
+ $val = rawurlencode($oval);
+ foreach ($filter as $f) {
+ if (is_object($f)) {
+ $val = $f->write($val, ADODB_Session::_sessionKey());
+ }
+ }
+
+ $expireref = '';
+ if ($expire_notify) {
+ $var = reset($expire_notify);
+ global $$var;
+ if (isset($$var)) {
+ $expireref = $$var;
+ }
+ }
+
+ if (!$clob) { // no lobs, simply use replace()
+ $rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
+ if ($rs) $rs->Close();
+
+ if ($rs && reset($rs->fields) > 0) {
+ $sql = "UPDATE $table SET expiry=$expiry, sessdata=".$conn->Param(0).", expireref= ".$conn->Param(1).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param(2);
+
+ } else {
+ $sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified)
+ VALUES ($expiry,".$conn->Param('0').", ". $conn->Param('1').", ".$conn->Param('2').", $sysTimeStamp, $sysTimeStamp)";
+ }
+
+
+ $rs = $conn->Execute($sql,array($val,$expireref,$key));
+
+ } else {
+ // what value shall we insert/update for lob row?
+ if (strncmp($driver, 'oci8', 4) == 0) $lob_value = sprintf('empty_%s()', strtolower($clob));
+ else $lob_value = 'null';
+
+ $conn->StartTrans();
+
+ $rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
+
+ if ($rs && reset($rs->fields) > 0) {
+ $sql = "UPDATE $table SET expiry=$expiry, sessdata=$lob_value, expireref= ".$conn->Param(0).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('1');
+
+ } else {
+ $sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified)
+ VALUES ($expiry,$lob_value, ". $conn->Param('0').", ".$conn->Param('1').", $sysTimeStamp, $sysTimeStamp)";
+ }
+
+ $rs = $conn->Execute($sql,array($expireref,$key));
+
+ $qkey = $conn->qstr($key);
+ $rs2 = $conn->UpdateBlob($table, 'sessdata', $val, " sesskey=$qkey", strtoupper($clob));
+ if ($debug) echo "<hr>",htmlspecialchars($oval), "<hr>";
+ $rs = @$conn->CompleteTrans();
+
+
+ }
+
+ if (!$rs) {
+ ADOConnection::outp('<p>Session Replace: ' . $conn->ErrorMsg() . '</p>', false);
+ return false;
+ } else {
+ // bug in access driver (could be odbc?) means that info is not committed
+ // properly unless select statement executed in Win2000
+ if ($conn->databaseType == 'access') {
+ $sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
+ $rs = $conn->Execute($sql);
+ ADODB_Session::_dumprs($rs);
+ if ($rs) {
+ $rs->Close();
+ }
+ }
+ }/*
+ if (ADODB_Session::Lock()) {
+ $conn->CommitTrans();
+ }*/
+ return $rs ? true : false;
+ }
+
+ /*!
+ */
+ 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 */' : '';
+
+ 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);
+ ADODB_Session::_dumprs($rs);
+ $conn->SetFetchMode($savem);
+ if (!$rs) {
+ return false;
+ }
+ if (!$rs->EOF) {
+ $ref = $rs->fields[0];
+ $key = $rs->fields[1];
+ //assert('$ref');
+ //assert('$key');
+ $fn($ref, $key);
+ }
+ $rs->Close();
+ }
+
+ $sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
+ $rs = $conn->Execute($sql);
+ if ($rs) {
+ $rs->Close();
+ }
+
+ return $rs ? true : false;
+ }
+
+ /*!
+ */
+ static function gc($maxlifetime)
+ {
+ $conn = ADODB_Session::_conn();
+ $debug = ADODB_Session::debug();
+ $expire_notify = ADODB_Session::expireNotify();
+ $optimize = ADODB_Session::optimize();
+ $table = ADODB_Session::table();
+
+ if (!$conn) {
+ return false;
+ }
+
+
+ $debug = ADODB_Session::debug();
+ if ($debug) {
+ $conn->debug = 1;
+ $COMMITNUM = 2;
+ } else {
+ $COMMITNUM = 20;
+ }
+
+ //assert('$table');
+
+ $time = $conn->OffsetDate(-$maxlifetime/24/3600,$conn->sysTimeStamp);
+ $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+ if ($expire_notify) {
+ reset($expire_notify);
+ $fn = next($expire_notify);
+ } else {
+ $fn = false;
+ }
+
+ $savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
+ $sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time ORDER BY 2"; # add order by to prevent deadlock
+ $rs = $conn->SelectLimit($sql,1000);
+ 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<br>\n";
+ $conn->CommitTrans();
+ $conn->BeginTrans();
+ }
+ }
+ $rs->Close();
+
+ if ($tr) $conn->CommitTrans();
+ }
+
+
+ // suggested by Cameron, "GaM3R" <gamr@outworld.cx>
+ if ($optimize) {
+ $driver = ADODB_Session::driver();
+
+ if (preg_match('/mysql/i', $driver)) {
+ $sql = "OPTIMIZE TABLE $table";
+ }
+ if (preg_match('/postgres/i', $driver)) {
+ $sql = "VACUUM $table";
+ }
+ if (!empty($sql)) {
+ $conn->Execute($sql);
+ }
+ }
+
+
+ return true;
+ }
+}
+
+ADODB_Session::_init();
+if (empty($ADODB_SESSION_READONLY))
+ register_shutdown_function('session_write_close');
+
+// for backwards compatability only
+function adodb_sess_open($save_path, $session_name, $persist = true) {
+ return ADODB_Session::open($save_path, $session_name, $persist);
+}
+
+// for backwards compatability only
+function adodb_sess_gc($t)
+{
+ return ADODB_Session::gc($t);
+}
diff --git a/libraries/adodb/session/adodb-sessions.mysql.sql b/libraries/adodb/session/adodb-sessions.mysql.sql
new file mode 100644
index 000000000..f90de4493
--- /dev/null
+++ b/libraries/adodb/session/adodb-sessions.mysql.sql
@@ -0,0 +1,16 @@
+-- $CVSHeader$
+
+CREATE DATABASE /*! IF NOT EXISTS */ adodb_sessions;
+
+USE adodb_sessions;
+
+DROP TABLE /*! IF EXISTS */ sessions;
+
+CREATE TABLE /*! IF NOT EXISTS */ sessions (
+ sesskey CHAR(32) /*! BINARY */ NOT NULL DEFAULT '',
+ expiry INT(11) /*! UNSIGNED */ NOT NULL DEFAULT 0,
+ expireref VARCHAR(64) DEFAULT '',
+ data LONGTEXT DEFAULT '',
+ PRIMARY KEY (sesskey),
+ INDEX expiry (expiry)
+);
diff --git a/libraries/adodb/session/adodb-sessions.oracle.clob.sql b/libraries/adodb/session/adodb-sessions.oracle.clob.sql
new file mode 100644
index 000000000..c5c4f2d07
--- /dev/null
+++ b/libraries/adodb/session/adodb-sessions.oracle.clob.sql
@@ -0,0 +1,15 @@
+-- $CVSHeader$
+
+DROP TABLE adodb_sessions;
+
+CREATE TABLE sessions (
+ sesskey CHAR(32) DEFAULT '' NOT NULL,
+ expiry INT DEFAULT 0 NOT NULL,
+ expireref VARCHAR(64) DEFAULT '',
+ data CLOB DEFAULT '',
+ PRIMARY KEY (sesskey)
+);
+
+CREATE INDEX ix_expiry ON sessions (expiry);
+
+QUIT;
diff --git a/libraries/adodb/session/adodb-sessions.oracle.sql b/libraries/adodb/session/adodb-sessions.oracle.sql
new file mode 100644
index 000000000..8fd5a3423
--- /dev/null
+++ b/libraries/adodb/session/adodb-sessions.oracle.sql
@@ -0,0 +1,16 @@
+-- $CVSHeader$
+
+DROP TABLE adodb_sessions;
+
+CREATE TABLE sessions (
+ sesskey CHAR(32) DEFAULT '' NOT NULL,
+ expiry INT DEFAULT 0 NOT NULL,
+ expireref VARCHAR(64) DEFAULT '',
+ data VARCHAR(4000) DEFAULT '',
+ PRIMARY KEY (sesskey),
+ INDEX expiry (expiry)
+);
+
+CREATE INDEX ix_expiry ON sessions (expiry);
+
+QUIT;
diff --git a/libraries/adodb/session/crypt.inc.php b/libraries/adodb/session/crypt.inc.php
index 41cb06a5a..1468cb1ae 100644
--- a/libraries/adodb/session/crypt.inc.php
+++ b/libraries/adodb/session/crypt.inc.php
@@ -64,7 +64,6 @@ class MD5Crypt{
class SHA1Crypt{
-
function keyED($txt,$encrypt_key)
{
@@ -81,8 +80,6 @@ class SHA1Crypt{
}
-
-
function Encrypt($txt,$key)
{
@@ -158,4 +155,3 @@ class SHA1Crypt{
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/old/adodb-cryptsession.php b/libraries/adodb/session/old/adodb-cryptsession.php
index 7b6804499..ca0d79305 100644
--- a/libraries/adodb/session/old/adodb-cryptsession.php
+++ b/libraries/adodb/session/old/adodb-cryptsession.php
@@ -1,26 +1,28 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Made table name configurable - by David Johnson djohnson@inpro.net
Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
-
+
Set tabs to 4 for best viewing.
-
+
Latest version of ADODB is available at http://php.weblogs.com/adodb
======================================================================
-
+
This file provides PHP4 session management using the ADODB database
wrapper library.
-
+
Example
=======
-
+
include('adodb.inc.php');
#---------------------------------#
- include('adodb-cryptsession.php');
+ include('adodb-cryptsession.php');
#---------------------------------#
session_start();
session_register('AVAR');
@@ -28,12 +30,12 @@ wrapper library.
print "
-- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
+
Installation
============
1. Create a new database in MySQL or Access "sessions" like
so:
-
+
create table sessions (
SESSKEY char(32) not null,
EXPIRY int(11) unsigned not null,
@@ -41,17 +43,17 @@ so:
DATA CLOB,
primary key (sesskey)
);
-
+
2. Then define the following parameters. You can either modify
this file, or define them before this file is included:
-
+
$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
$ADODB_SESSION_CONNECT='server to connect to';
$ADODB_SESSION_USER ='user';
$ADODB_SESSION_PWD ='password';
$ADODB_SESSION_DB ='database';
$ADODB_SESSION_TBL = 'sessions'
-
+
3. Recommended is PHP 4.0.2 or later. There are documented
session bugs in earlier versions of PHP.
@@ -65,13 +67,13 @@ if (!defined('_ADODB_LAYER')) {
}
/* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60);
+ define('ADODB_SESSION_SYNCH_SECS',60);
if (!defined('ADODB_SESSION')) {
define('ADODB_SESSION',1);
-
-GLOBAL $ADODB_SESSION_CONNECT,
+
+GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_DRIVER,
$ADODB_SESSION_USER,
$ADODB_SESSION_PWD,
@@ -81,10 +83,10 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESS_DEBUG,
$ADODB_SESS_INSERT,
$ADODB_SESSION_EXPIRE_NOTIFY,
- $ADODB_SESSION_TBL;
+ $ADODB_SESSION_TBL;
//$ADODB_SESS_DEBUG = true;
-
+
/* SET THE FOLLOWING PARAMETERS */
if (empty($ADODB_SESSION_DRIVER)) {
$ADODB_SESSION_DRIVER='mysql';
@@ -102,7 +104,7 @@ if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
$ADODB_SESSION_EXPIRE_NOTIFY = false;
}
-function ADODB_Session_Key()
+function ADODB_Session_Key()
{
$ADODB_CRYPT_KEY = 'CRYPTED ADODB SESSIONS ROCK!';
@@ -118,20 +120,20 @@ if ($ADODB_SESS_LIFE <= 1) {
$ADODB_SESS_LIFE=1440;
}
-function adodb_sess_open($save_path, $session_name)
+function adodb_sess_open($save_path, $session_name)
{
-GLOBAL $ADODB_SESSION_CONNECT,
+GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_DRIVER,
$ADODB_SESSION_USER,
$ADODB_SESSION_PWD,
$ADODB_SESSION_DB,
$ADODB_SESS_CONN,
$ADODB_SESS_DEBUG;
-
+
$ADODB_SESS_INSERT = false;
-
+
if (isset($ADODB_SESS_CONN)) return true;
-
+
$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
if (!empty($ADODB_SESS_DEBUG)) {
$ADODB_SESS_CONN->debug = true;
@@ -139,10 +141,10 @@ GLOBAL $ADODB_SESSION_CONNECT,
}
return $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-
+
}
-function adodb_sess_close()
+function adodb_sess_close()
{
global $ADODB_SESS_CONN;
@@ -150,7 +152,7 @@ global $ADODB_SESS_CONN;
return true;
}
-function adodb_sess_read($key)
+function adodb_sess_read($key)
{
$Crypt = new MD5Crypt;
global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
@@ -167,20 +169,20 @@ global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
return $v;
}
else $ADODB_SESS_INSERT = true;
-
+
return '';
}
-function adodb_sess_write($key, $val)
+function adodb_sess_write($key, $val)
{
$Crypt = new MD5Crypt;
global $ADODB_SESS_INSERT,$ADODB_SESS_CONN, $ADODB_SESS_LIFE, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
$expiry = time() + $ADODB_SESS_LIFE;
- // encrypt session data..
+ // encrypt session data..
$val = $Crypt->Encrypt(rawurlencode($val), ADODB_Session_Key());
-
+
$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
if ($ADODB_SESSION_EXPIRE_NOTIFY) {
$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -197,16 +199,16 @@ $Crypt = new MD5Crypt;
} else {
// bug in access driver (could be odbc?) means that info is not commited
// properly unless select statement executed in Win2000
-
+
if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
}
return isset($rs);
}
-function adodb_sess_destroy($key)
+function adodb_sess_destroy($key)
{
global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-
+
if ($ADODB_SESSION_EXPIRE_NOTIFY) {
reset($ADODB_SESSION_EXPIRE_NOTIFY);
$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -252,7 +254,7 @@ function adodb_sess_gc($maxlifetime) {
$rs->MoveNext();
}
$rs->Close();
-
+
$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
$ADODB_SESS_CONN->CommitTrans();
}
@@ -260,12 +262,12 @@ function adodb_sess_gc($maxlifetime) {
$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
$ADODB_SESS_CONN->Execute($qry);
}
-
+
// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
if (defined('ADODB_SESSION_OPTIMIZE'))
{
global $ADODB_SESSION_DRIVER;
-
+
switch( $ADODB_SESSION_DRIVER ) {
case 'mysql':
case 'mysqlt':
@@ -273,34 +275,34 @@ function adodb_sess_gc($maxlifetime) {
break;
case 'postgresql':
case 'postgresql7':
- $opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
+ $opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
break;
}
}
-
+
if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-
- $rs =& $ADODB_SESS_CONN->SelectLimit($sql,1);
+
+ $rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
if ($rs && !$rs->EOF) {
-
+
$dbts = reset($rs->fields);
$rs->Close();
$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
$t = time();
if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
- $msg =
+ $msg =
__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
error_log($msg);
if ($ADODB_SESS_DEBUG) ADOConnection::outp("
-- $msg</p>");
}
}
-
+
return true;
}
-session_module_name('user');
+session_module_name('user');
session_set_save_handler(
"adodb_sess_open",
"adodb_sess_close",
@@ -321,4 +323,3 @@ if (0) {
-- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
}
*/
-?>
diff --git a/libraries/adodb/session/old/adodb-session-clob.php b/libraries/adodb/session/old/adodb-session-clob.php
index 00678863b..3361ea595 100644
--- a/libraries/adodb/session/old/adodb-session-clob.php
+++ b/libraries/adodb/session/old/adodb-session-clob.php
@@ -1,20 +1,22 @@
<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version of ADODB is available at http://php.weblogs.com/adodb
======================================================================
-
+
This file provides PHP4 session management using the ADODB database
wrapper library, using Oracle CLOB's to store data. Contributed by achim.gosse@ddd.de.
Example
=======
-
+
include('adodb.inc.php');
include('adodb-session.php');
session_start();
@@ -22,7 +24,7 @@
$_SESSION['AVAR'] += 1;
print "
-- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
+
To force non-persistent connections, call adodb_session_open first before session_start():
include('adodb.inc.php');
@@ -34,11 +36,11 @@ To force non-persistent connections, call adodb_session_open first before sessio
print "
-- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
+
Installation
============
1. Create this table in your database (syntax might vary depending on your db):
-
+
create table sessions (
SESSKEY char(32) not null,
EXPIRY int(11) unsigned not null,
@@ -56,7 +58,7 @@ To force non-persistent connections, call adodb_session_open first before sessio
$ADODB_SESSION_DB ='database';
$ADODB_SESSION_TBL = 'sessions'
$ADODB_SESSION_USE_LOBS = false; (or, if you wanna use CLOBS (= 'CLOB') or ( = 'BLOB')
-
+
3. Recommended is PHP 4.1.0 or later. There are documented
session bugs in earlier versions of PHP.
@@ -64,24 +66,24 @@ To force non-persistent connections, call adodb_session_open first before sessio
you can tag a session with an EXPIREREF, and before the session
record is deleted, we can call a function that will pass the EXPIREREF
as the first parameter, and the session key as the second parameter.
-
+
To do this, define a notification function, say NotifyFn:
-
+
function NotifyFn($expireref, $sesskey)
{
}
-
+
Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
This is an array with 2 elements, the first being the name of the variable
- you would like to store in the EXPIREREF field, and the 2nd is the
+ you would like to store in the EXPIREREF field, and the 2nd is the
notification function's name.
-
- In this example, we want to be notified when a user's session
- has expired, so we store the user id in the global variable $USERID,
+
+ In this example, we want to be notified when a user's session
+ has expired, so we store the user id in the global variable $USERID,
store this value in the EXPIREREF field:
-
+
$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-
+
Then when the NotifyFn is called, we are passed the $USERID as the first
parameter, eg. NotifyFn($userid, $sesskey).
*/
@@ -93,14 +95,14 @@ if (!defined('_ADODB_LAYER')) {
if (!defined('ADODB_SESSION')) {
define('ADODB_SESSION',1);
-
+
/* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60);
+ define('ADODB_SESSION_SYNCH_SECS',60);
/****************************************************************************************\
Global definitions
\****************************************************************************************/
-GLOBAL $ADODB_SESSION_CONNECT,
+GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_DRIVER,
$ADODB_SESSION_USER,
$ADODB_SESSION_PWD,
@@ -112,9 +114,9 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_CRC,
$ADODB_SESSION_USE_LOBS,
$ADODB_SESSION_TBL;
-
+
if (!isset($ADODB_SESSION_USE_LOBS)) $ADODB_SESSION_USE_LOBS = 'CLOB';
-
+
$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
if ($ADODB_SESS_LIFE <= 1) {
// bug in PHP 4.0.3 pl 1 -- how about other versions?
@@ -123,11 +125,11 @@ GLOBAL $ADODB_SESSION_CONNECT,
}
$ADODB_SESSION_CRC = false;
//$ADODB_SESS_DEBUG = true;
-
+
//////////////////////////////////
/* SET THE FOLLOWING PARAMETERS */
//////////////////////////////////
-
+
if (empty($ADODB_SESSION_DRIVER)) {
$ADODB_SESSION_DRIVER='mysql';
$ADODB_SESSION_CONNECT='localhost';
@@ -135,7 +137,7 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_PWD ='';
$ADODB_SESSION_DB ='xphplens_2';
}
-
+
if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
$ADODB_SESSION_EXPIRE_NOTIFY = false;
}
@@ -143,7 +145,7 @@ GLOBAL $ADODB_SESSION_CONNECT,
if (empty($ADODB_SESSION_TBL)){
$ADODB_SESSION_TBL = 'sessions';
}
-
+
// defaulting $ADODB_SESSION_USE_LOBS
if (!isset($ADODB_SESSION_USE_LOBS) || empty($ADODB_SESSION_USE_LOBS)) {
@@ -158,28 +160,28 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESS['db'] = $ADODB_SESSION_DB;
$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
-
+
$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
$ADODB_SESS['table'] = $ADODB_SESS_TBL;
*/
-
+
/****************************************************************************************\
- Create the connection to the database.
-
+ Create the connection to the database.
+
If $ADODB_SESS_CONN already exists, reuse that connection
\****************************************************************************************/
-function adodb_sess_open($save_path, $session_name,$persist=true)
+function adodb_sess_open($save_path, $session_name,$persist=true)
{
GLOBAL $ADODB_SESS_CONN;
if (isset($ADODB_SESS_CONN)) return true;
-
-GLOBAL $ADODB_SESSION_CONNECT,
+
+GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_DRIVER,
$ADODB_SESSION_USER,
$ADODB_SESSION_PWD,
$ADODB_SESSION_DB,
$ADODB_SESS_DEBUG;
-
+
// cannot use & below - do not know why...
$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
if (!empty($ADODB_SESS_DEBUG)) {
@@ -190,7 +192,7 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-
+
if (!$ok) ADOConnection::outp( "
-- Session: connection failed</p>",false);
}
@@ -198,7 +200,7 @@ GLOBAL $ADODB_SESSION_CONNECT,
/****************************************************************************************\
Close the connection
\****************************************************************************************/
-function adodb_sess_close()
+function adodb_sess_close()
{
global $ADODB_SESS_CONN;
@@ -209,7 +211,7 @@ global $ADODB_SESS_CONN;
/****************************************************************************************\
Slurp in the session variables and return the serialized string
\****************************************************************************************/
-function adodb_sess_read($key)
+function adodb_sess_read($key)
{
global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
@@ -217,50 +219,50 @@ global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
if ($rs) {
if ($rs->EOF) {
$v = '';
- } else
+ } else
$v = rawurldecode(reset($rs->fields));
-
+
$rs->Close();
-
+
// new optimization adodb 2.1
$ADODB_SESSION_CRC = strlen($v).crc32($v);
-
+
return $v;
}
-
+
return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
}
/****************************************************************************************\
Write the serialized data to a database.
-
+
If the data has not been modified since adodb_sess_read(), we do not write.
\****************************************************************************************/
-function adodb_sess_write($key, $val)
+function adodb_sess_write($key, $val)
{
global
- $ADODB_SESS_CONN,
- $ADODB_SESS_LIFE,
+ $ADODB_SESS_CONN,
+ $ADODB_SESS_LIFE,
$ADODB_SESSION_TBL,
- $ADODB_SESS_DEBUG,
+ $ADODB_SESS_DEBUG,
$ADODB_SESSION_CRC,
$ADODB_SESSION_EXPIRE_NOTIFY,
$ADODB_SESSION_DRIVER, // added
$ADODB_SESSION_USE_LOBS; // added
$expiry = time() + $ADODB_SESS_LIFE;
-
+
// crc32 optimization since adodb 2.1
// now we only update expiry date, thx to sebastian thom in adodb 2.32
if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
if ($ADODB_SESS_DEBUG) echo "
-- Session: Only updating date - crc32 not changed</p>";
$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
- $rs = $ADODB_SESS_CONN->Execute($qry);
+ $rs = $ADODB_SESS_CONN->Execute($qry);
return true;
}
$val = rawurlencode($val);
-
+
$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
if ($ADODB_SESSION_EXPIRE_NOTIFY) {
$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -268,7 +270,7 @@ function adodb_sess_write($key, $val)
$arr['expireref'] = $$var;
}
-
+
if ($ADODB_SESSION_USE_LOBS === false) { // no lobs, simply use replace()
$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr, 'sesskey',$autoQuote = true);
if (!$rs) {
@@ -318,16 +320,16 @@ function adodb_sess_write($key, $val)
} else {
// bug in access driver (could be odbc?) means that info is not commited
// properly unless select statement executed in Win2000
- if ($ADODB_SESS_CONN->databaseType == 'access')
+ if ($ADODB_SESS_CONN->databaseType == 'access')
$rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
}
return !empty($rs);
}
-function adodb_sess_destroy($key)
+function adodb_sess_destroy($key)
{
global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-
+
if ($ADODB_SESSION_EXPIRE_NOTIFY) {
reset($ADODB_SESSION_EXPIRE_NOTIFY);
$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -352,10 +354,10 @@ function adodb_sess_destroy($key)
return $rs ? true : false;
}
-function adodb_sess_gc($maxlifetime)
+function adodb_sess_gc($maxlifetime)
{
global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-
+
if ($ADODB_SESSION_EXPIRE_NOTIFY) {
reset($ADODB_SESSION_EXPIRE_NOTIFY);
$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -373,21 +375,21 @@ function adodb_sess_gc($maxlifetime)
$rs->MoveNext();
}
$rs->Close();
-
+
//$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
$ADODB_SESS_CONN->CommitTrans();
-
+
}
} else {
$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time());
-
+
if ($ADODB_SESS_DEBUG) ADOConnection::outp("
-- <b>Garbage Collection</b>: $qry</p>");
}
// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
if (defined('ADODB_SESSION_OPTIMIZE')) {
global $ADODB_SESSION_DRIVER;
-
+
switch( $ADODB_SESSION_DRIVER ) {
case 'mysql':
case 'mysqlt':
@@ -395,7 +397,7 @@ function adodb_sess_gc($maxlifetime)
break;
case 'postgresql':
case 'postgresql7':
- $opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
+ $opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
break;
}
if (!empty($opt_qry)) {
@@ -404,27 +406,27 @@ function adodb_sess_gc($maxlifetime)
}
if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-
- $rs =& $ADODB_SESS_CONN->SelectLimit($sql,1);
+
+ $rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
if ($rs && !$rs->EOF) {
-
+
$dbts = reset($rs->fields);
$rs->Close();
$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
$t = time();
if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
- $msg =
+ $msg =
__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
error_log($msg);
if ($ADODB_SESS_DEBUG) ADOConnection::outp("
-- $msg</p>");
}
}
-
+
return true;
}
-session_module_name('user');
+session_module_name('user');
session_set_save_handler(
"adodb_sess_open",
"adodb_sess_close",
@@ -444,5 +446,3 @@ if (0) {
ADOConnection::outp( "
-- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>",false);
}
-
-?>
diff --git a/libraries/adodb/session/old/adodb-session.php b/libraries/adodb/session/old/adodb-session.php
index 413171f00..5764339ec 100644
--- a/libraries/adodb/session/old/adodb-session.php
+++ b/libraries/adodb/session/old/adodb-session.php
@@ -1,20 +1,22 @@
<?php
/*
-V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+@version v5.20.9 21-Dec-2016
+@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4 for best viewing.
-
+
Latest version of ADODB is available at http://php.weblogs.com/adodb
======================================================================
-
+
This file provides PHP4 session management using the ADODB database
wrapper library.
-
+
Example
=======
-
+
include('adodb.inc.php');
include('adodb-session.php');
session_start();
@@ -22,7 +24,7 @@ wrapper library.
$_SESSION['AVAR'] += 1;
print "
-- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
+
To force non-persistent connections, call adodb_session_open first before session_start():
include('adodb.inc.php');
@@ -34,11 +36,11 @@ To force non-persistent connections, call adodb_session_open first before sessio
print "
-- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
+
Installation
============
1. Create this table in your database (syntax might vary depending on your db):
-
+
create table sessions (
SESSKEY char(32) not null,
EXPIRY int(11) unsigned not null,
@@ -46,7 +48,7 @@ To force non-persistent connections, call adodb_session_open first before sessio
DATA text not null,
primary key (sesskey)
);
-
+
For oracle:
create table sessions (
SESSKEY char(32) not null,
@@ -59,14 +61,14 @@ To force non-persistent connections, call adodb_session_open first before sessio
2. Then define the following parameters. You can either modify
this file, or define them before this file is included:
-
+
$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
$ADODB_SESSION_CONNECT='server to connect to';
$ADODB_SESSION_USER ='user';
$ADODB_SESSION_PWD ='password';
$ADODB_SESSION_DB ='database';
$ADODB_SESSION_TBL = 'sessions'
-
+
3. Recommended is PHP 4.1.0 or later. There are documented
session bugs in earlier versions of PHP.
@@ -74,24 +76,24 @@ To force non-persistent connections, call adodb_session_open first before sessio
you can tag a session with an EXPIREREF, and before the session
record is deleted, we can call a function that will pass the EXPIREREF
as the first parameter, and the session key as the second parameter.
-
+
To do this, define a notification function, say NotifyFn:
-
+
function NotifyFn($expireref, $sesskey)
{
}
-
+
Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
This is an array with 2 elements, the first being the name of the variable
- you would like to store in the EXPIREREF field, and the 2nd is the
+ you would like to store in the EXPIREREF field, and the 2nd is the
notification function's name.
-
- In this example, we want to be notified when a user's session
- has expired, so we store the user id in the global variable $USERID,
+
+ In this example, we want to be notified when a user's session
+ has expired, so we store the user id in the global variable $USERID,
store this value in the EXPIREREF field:
-
+
$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-
+
Then when the NotifyFn is called, we are passed the $USERID as the first
parameter, eg. NotifyFn($userid, $sesskey).
*/
@@ -103,16 +105,16 @@ if (!defined('_ADODB_LAYER')) {
if (!defined('ADODB_SESSION')) {
define('ADODB_SESSION',1);
-
+
/* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60);
+ define('ADODB_SESSION_SYNCH_SECS',60);
/*
Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
*/
-function adodb_session_regenerate_id()
+function adodb_session_regenerate_id()
{
- $conn =& ADODB_Session::_conn();
+ $conn = ADODB_Session::_conn();
if (!$conn) return false;
$old_id = session_id();
@@ -125,8 +127,8 @@ function adodb_session_regenerate_id()
//@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);
@@ -134,14 +136,14 @@ function adodb_session_regenerate_id()
setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
return false;
}
-
+
return true;
}
/****************************************************************************************\
Global definitions
\****************************************************************************************/
-GLOBAL $ADODB_SESSION_CONNECT,
+GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_DRIVER,
$ADODB_SESSION_USER,
$ADODB_SESSION_PWD,
@@ -152,8 +154,8 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_EXPIRE_NOTIFY,
$ADODB_SESSION_CRC,
$ADODB_SESSION_TBL;
-
-
+
+
$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
if ($ADODB_SESS_LIFE <= 1) {
// bug in PHP 4.0.3 pl 1 -- how about other versions?
@@ -162,11 +164,11 @@ GLOBAL $ADODB_SESSION_CONNECT,
}
$ADODB_SESSION_CRC = false;
//$ADODB_SESS_DEBUG = true;
-
+
//////////////////////////////////
/* SET THE FOLLOWING PARAMETERS */
//////////////////////////////////
-
+
if (empty($ADODB_SESSION_DRIVER)) {
$ADODB_SESSION_DRIVER='mysql';
$ADODB_SESSION_CONNECT='localhost';
@@ -174,7 +176,7 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_PWD ='';
$ADODB_SESSION_DB ='xphplens_2';
}
-
+
if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
$ADODB_SESSION_EXPIRE_NOTIFY = false;
}
@@ -182,7 +184,7 @@ GLOBAL $ADODB_SESSION_CONNECT,
if (empty($ADODB_SESSION_TBL)){
$ADODB_SESSION_TBL = 'sessions';
}
-
+
/*
$ADODB_SESS['driver'] = $ADODB_SESSION_DRIVER;
$ADODB_SESS['connect'] = $ADODB_SESSION_CONNECT;
@@ -191,28 +193,28 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESS['db'] = $ADODB_SESSION_DB;
$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
-
+
$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
$ADODB_SESS['table'] = $ADODB_SESS_TBL;
*/
-
+
/****************************************************************************************\
- Create the connection to the database.
-
+ Create the connection to the database.
+
If $ADODB_SESS_CONN already exists, reuse that connection
\****************************************************************************************/
-function adodb_sess_open($save_path, $session_name,$persist=true)
+function adodb_sess_open($save_path, $session_name,$persist=true)
{
GLOBAL $ADODB_SESS_CONN;
if (isset($ADODB_SESS_CONN)) return true;
-
-GLOBAL $ADODB_SESSION_CONNECT,
+
+GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_DRIVER,
$ADODB_SESSION_USER,
$ADODB_SESSION_PWD,
$ADODB_SESSION_DB,
$ADODB_SESS_DEBUG;
-
+
// cannot use & below - do not know why...
$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
if (!empty($ADODB_SESS_DEBUG)) {
@@ -223,7 +225,7 @@ GLOBAL $ADODB_SESSION_CONNECT,
$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-
+
if (!$ok) ADOConnection::outp( "
-- Session: connection failed</p>",false);
}
@@ -231,7 +233,7 @@ GLOBAL $ADODB_SESSION_CONNECT,
/****************************************************************************************\
Close the connection
\****************************************************************************************/
-function adodb_sess_close()
+function adodb_sess_close()
{
global $ADODB_SESS_CONN;
@@ -242,7 +244,7 @@ global $ADODB_SESS_CONN;
/****************************************************************************************\
Slurp in the session variables and return the serialized string
\****************************************************************************************/
-function adodb_sess_read($key)
+function adodb_sess_read($key)
{
global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
@@ -250,48 +252,48 @@ global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
if ($rs) {
if ($rs->EOF) {
$v = '';
- } else
+ } else
$v = rawurldecode(reset($rs->fields));
-
+
$rs->Close();
-
+
// new optimization adodb 2.1
$ADODB_SESSION_CRC = strlen($v).crc32($v);
-
+
return $v;
}
-
+
return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
}
/****************************************************************************************\
Write the serialized data to a database.
-
+
If the data has not been modified since adodb_sess_read(), we do not write.
\****************************************************************************************/
-function adodb_sess_write($key, $val)
+function adodb_sess_write($key, $val)
{
global
- $ADODB_SESS_CONN,
- $ADODB_SESS_LIFE,
+ $ADODB_SESS_CONN,
+ $ADODB_SESS_LIFE,
$ADODB_SESSION_TBL,
- $ADODB_SESS_DEBUG,
+ $ADODB_SESS_DEBUG,
$ADODB_SESSION_CRC,
$ADODB_SESSION_EXPIRE_NOTIFY;
$expiry = time() + $ADODB_SESS_LIFE;
-
+
// crc32 optimization since adodb 2.1
// now we only update expiry date, thx to sebastian thom in adodb 2.32
if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
if ($ADODB_SESS_DEBUG) echo "
-- Session: Only updating date - crc32 not changed</p>";
$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
- $rs = $ADODB_SESS_CONN->Execute($qry);
+ $rs = $ADODB_SESS_CONN->Execute($qry);
return true;
}
$val = rawurlencode($val);
-
+
$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
if ($ADODB_SESSION_EXPIRE_NOTIFY) {
$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -300,23 +302,23 @@ function adodb_sess_write($key, $val)
}
$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr,
'sesskey',$autoQuote = true);
-
+
if (!$rs) {
ADOConnection::outp( '
-- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'</p>',false);
} else {
// bug in access driver (could be odbc?) means that info is not commited
// properly unless select statement executed in Win2000
- if ($ADODB_SESS_CONN->databaseType == 'access')
+ if ($ADODB_SESS_CONN->databaseType == 'access')
$rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
}
return !empty($rs);
}
-function adodb_sess_destroy($key)
+function adodb_sess_destroy($key)
{
global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-
+
if ($ADODB_SESSION_EXPIRE_NOTIFY) {
reset($ADODB_SESSION_EXPIRE_NOTIFY);
$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
@@ -341,16 +343,16 @@ function adodb_sess_destroy($key)
return $rs ? true : false;
}
-function adodb_sess_gc($maxlifetime)
+function adodb_sess_gc($maxlifetime)
{
global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-
+
if ($ADODB_SESSION_EXPIRE_NOTIFY) {
reset($ADODB_SESSION_EXPIRE_NOTIFY);
$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
$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");
+ $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();
@@ -362,21 +364,21 @@ function adodb_sess_gc($maxlifetime)
$rs->MoveNext();
}
$rs->Close();
-
+
$ADODB_SESS_CONN->CommitTrans();
-
+
}
} else {
$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
$ADODB_SESS_CONN->Execute($qry);
-
+
if ($ADODB_SESS_DEBUG) ADOConnection::outp("
-- <b>Garbage Collection</b>: $qry</p>");
}
// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
if (defined('ADODB_SESSION_OPTIMIZE')) {
global $ADODB_SESSION_DRIVER;
-
+
switch( $ADODB_SESSION_DRIVER ) {
case 'mysql':
case 'mysqlt':
@@ -384,7 +386,7 @@ function adodb_sess_gc($maxlifetime)
break;
case 'postgresql':
case 'postgresql7':
- $opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
+ $opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;
break;
}
if (!empty($opt_qry)) {
@@ -393,29 +395,29 @@ function adodb_sess_gc($maxlifetime)
}
if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-
- $rs =& $ADODB_SESS_CONN->SelectLimit($sql,1);
+
+ $rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
if ($rs && !$rs->EOF) {
-
+
$dbts = reset($rs->fields);
$rs->Close();
$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
$t = time();
-
+
if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
-
- $msg =
+
+ $msg =
__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
error_log($msg);
if ($ADODB_SESS_DEBUG) ADOConnection::outp("
-- $msg</p>");
}
}
-
+
return true;
}
-session_module_name('user');
+session_module_name('user');
session_set_save_handler(
"adodb_sess_open",
"adodb_sess_close",
@@ -435,5 +437,3 @@ if (0) {
ADOConnection::outp( "
-- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>",false);
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/old/crypt.inc.php b/libraries/adodb/session/old/crypt.inc.php
index b99bbba55..9c347db06 100644
--- a/libraries/adodb/session/old/crypt.inc.php
+++ b/libraries/adodb/session/old/crypt.inc.php
@@ -61,4 +61,3 @@ class MD5Crypt{
}
}
-?>
\ No newline at end of file
diff --git a/libraries/adodb/session/session_schema.xml b/libraries/adodb/session/session_schema.xml
new file mode 100644
index 000000000..27e47bfee
--- /dev/null
+++ b/libraries/adodb/session/session_schema.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<schema version="0.2">
+ <table name="sessions">
+ <desc>table for ADOdb session-management</desc>
+
+ <field name="SESSKEY" type="C" size="32">
+ <descr>session key</descr>
+ <KEY/>
+ <NOTNULL/>
+ </field>
+
+ <field name="EXPIRY" type="I" size="11">
+ <descr></descr>
+ <NOTNULL/>
+ </field>
+
+ <field name="EXPIREREF" type="C" size="64">
+ <descr></descr>
+ </field>
+
+ <field name="DATA" type="XL">
+ <descr></descr>
+ <NOTNULL/>
+ </field>
+ </table>
+</schema>
diff --git a/libraries/adodb/session/session_schema2.xml b/libraries/adodb/session/session_schema2.xml
new file mode 100644
index 000000000..f0d3ec94a
--- /dev/null
+++ b/libraries/adodb/session/session_schema2.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<schema version="0.3">
+ <table name="sessions2">
+ <desc>table for ADOdb session-management</desc>
+
+ <field name="SESSKEY" type="C" size="64">
+ <descr>session key</descr>
+ <KEY/>
+ <NOTNULL/>
+ </field>
+
+
+
+ <field name="EXPIRY" type="T">
+ <descr></descr>
+ <NOTNULL/>
+ </field>
+
+ <field name="CREATED" type="T">
+ <descr></descr>
+ <NOTNULL/>
+ </field>
+
+ <field name="MODIFIED" type="T">
+ <descr></descr>
+ <NOTNULL/>
+ </field>
+
+ <field name="EXPIREREF" type="C" size="250">
+ <descr></descr>
+ </field>
+
+ <field name="SESSDATA" type="XL">
+ <descr></descr>
+ <NOTNULL/>
+ </field>
+ </table>
+</schema>
diff --git a/libraries/adodb/toexport.inc.php b/libraries/adodb/toexport.inc.php
index a1d1f1c17..94c394b8e 100644
--- a/libraries/adodb/toexport.inc.php
+++ b/libraries/adodb/toexport.inc.php
@@ -1,17 +1,19 @@
<?php
-/**
- * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+/**
+ * @version v5.20.9 21-Dec-2016
+ * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
*
* Code to export recordsets in several formats:
*
* AS VARIABLE
* $s = rs2csv($rs); # comma-separated values
* $s = rs2tab($rs); # tab delimited
- *
+ *
* TO A FILE
* $f = fopen($path,'w');
* rs2csvfile($rs,$f);
@@ -20,14 +22,14 @@
* TO STDOUT
* rs2csvout($rs);
*/
-
+
// returns a recordset as a csv string
function rs2csv(&$rs,$addtitles=true)
{
return _adodb_export($rs,',',',',false,$addtitles);
}
-// writes recordset to csv file
+// writes recordset to csv file
function rs2csvfile(&$rs,$fp,$addtitles=true)
{
_adodb_export($rs,',',',',$fp,$addtitles);
@@ -69,29 +71,31 @@ function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote =
$BUFLINES = 100;
$escquotequote = $escquote.$quote;
$s = '';
-
+
if ($addtitles) {
$fieldTypes = $rs->FieldTypesArray();
reset($fieldTypes);
+ $i = 0;
+ $elements = array();
while(list(,$o) = each($fieldTypes)) {
-
- $v = $o->name;
+
+ $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 +103,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 +111,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 +125,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/libraries/adodb/tohtml.inc.php b/libraries/adodb/tohtml.inc.php
index 43b2d59f1..d39ed2919 100644
--- a/libraries/adodb/tohtml.inc.php
+++ b/libraries/adodb/tohtml.inc.php
@@ -1,13 +1,15 @@
-<?php
+<?php
/*
- V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
+ @version v5.20.9 21-Dec-2016
+ @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
+ @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
+ Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
-
+
Some pretty-printing by Chris Oxenreider <oxenreid@state.net>
-*/
-
+*/
+
// specific code for tohtml
GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
@@ -47,17 +49,17 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
printf(ADODB_BAD_RS,'rs2html');
return false;
}
-
+
if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
//else $docnt = true;
$typearr = array();
$ncols = $rs->FieldCount();
$hdr = "<TABLE COLS=$ncols $ztabhtml><tr>\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 +72,44 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
$hdr .= "\n</tr>";
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 .= "<TR valign=top>\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 .= "<TD> </TD>\n";
- else if (!strpos($v,':')) {
- $s .= " <TD>".$rs->UserDate($v,"D d, M Y") ." </TD>\n";
+ if (strpos($v,':') !== false);
+ else {
+ if (empty($v)) {
+ $s .= "<TD> </TD>\n";
+ } else {
+ $s .= " <TD>".$rs->UserDate($v,"D d, M Y") ."</TD>\n";
+ }
+ break;
}
- break;
case 'T':
if (empty($v)) $s .= "<TD> </TD>\n";
- else $s .= " <TD>".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ." </TD>\n";
+ else $s .= " <TD>".$rs->UserTimeStamp($v,"D d, M Y, H:i:s") ."</TD>\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 .= " <TD align=right>".stripslashes((trim($v))) ." </TD>\n";
-
+ $vv = stripslashes((trim($v)));
+ if (strlen($vv) == 0) $vv .= ' ';
+ $s .= " <TD align=right>".$vv ."</TD>\n";
+
break;
/*
case 'B':
@@ -128,11 +136,11 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
$v = trim($v);
if (strlen($v) == 0) $v = ' ';
$s .= " <TD>". str_replace("\n",'<br>',stripslashes($v)) ."</TD>\n";
-
+
}
} // for
$s .= "</TR>\n\n";
-
+
$rows += 1;
if ($rows >= $gSQLMaxRows) {
$rows = "<p>Truncated at $gSQLMaxRows</p>";
@@ -140,10 +148,10 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
} // switch
$rs->MoveNext();
-
+
// additional EOF check to prevent a widow header
if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
-
+
//if (connection_aborted()) break;// not needed as PHP aborts script, unlike ASP
if ($echo) print $s . "</TABLE>\n\n";
else $html .= $s ."</TABLE>\n\n";
@@ -153,17 +161,17 @@ GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
if ($echo) print $s."</TABLE>\n\n";
else $html .= $s."</TABLE>\n\n";
-
+
if ($docnt) if ($echo) print "<H2>".$rows." Rows</H2>";
-
+
return ($echo) ? $rows : $html;
}
-
+
// pass in 2 dimensional array
function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
{
if (!$ztabhtml) $ztabhtml = 'BORDER=1';
-
+
$s = "<TABLE $ztabhtml>";//';print_r($arr);
if ($zheaderarray) {
@@ -173,11 +181,11 @@ function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
}
$s .= "\n</TR>";
}
-
+
for ($i=0; $i<sizeof($arr); $i++) {
$s .= '<TR>';
- $a = &$arr[$i];
- if (is_array($a))
+ $a = $arr[$i];
+ if (is_array($a))
for ($j=0; $j<sizeof($a); $j++) {
$val = $a[$j];
if (empty($val)) $val = ' ';
@@ -191,5 +199,3 @@ function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
$s .= '</TABLE>';
print $s;
}
-
-?>
\ No newline at end of file
diff --git a/libraries/adodb/xmlschema.dtd b/libraries/adodb/xmlschema.dtd
new file mode 100644
index 000000000..2d0b579d3
--- /dev/null
+++ b/libraries/adodb/xmlschema.dtd
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!DOCTYPE adodb_schema [
+<!ELEMENT schema (table*, sql*)>
+<!ATTLIST schema version CDATA #REQUIRED>
+<!ELEMENT table ((field+|DROP), CONSTRAINT*, descr?, index*, data*)>
+<!ELEMENT field ((NOTNULL|KEY|PRIMARY)?, (AUTO|AUTOINCREMENT)?, (DEFAULT|DEFDATE|DEFTIMESTAMP)?,
+NOQUOTE?, CONSTRAINT*, descr?)>
+<!ELEMENT data (row+)>
+<!ELEMENT row (f+)>
+<!ELEMENT f (#CDATA)>
+<!ELEMENT descr (#CDATA)>
+<!ELEMENT NOTNULL EMPTY>
+<!ELEMENT KEY EMPTY>
+<!ELEMENT PRIMARY EMPTY>
+<!ELEMENT AUTO EMPTY>
+<!ELEMENT AUTOINCREMENT EMPTY>
+<!ELEMENT DEFAULT EMPTY>
+<!ELEMENT DEFDATE EMPTY>
+<!ELEMENT DEFTIMESTAMP EMPTY>
+<!ELEMENT NOQUOTE EMPTY>
+<!ELEMENT DROP EMPTY>
+<!ELEMENT CONSTRAINT (#CDATA)>
+<!ATTLIST table name CDATA #REQUIRED platform CDATA #IMPLIED version CDATA #IMPLIED>
+<!ATTLIST field name CDATA #REQUIRED type (C|C2|X|X2|B|D|T|L|I|F|N) #REQUIRED size CDATA #IMPLIED>
+<!ATTLIST data platform CDATA #IMPLIED>
+<!ATTLIST f name CDATA #IMPLIED>
+<!ATTLIST DEFAULT VALUE CDATA #REQUIRED>
+<!ELEMENT index ((col+|DROP), CLUSTERED?, BITMAP?, UNIQUE?, FULLTEXT?, HASH?, descr?)>
+<!ELEMENT col (#CDATA)>
+<!ELEMENT CLUSTERED EMPTY>
+<!ELEMENT BITMAP EMPTY>
+<!ELEMENT UNIQUE EMPTY>
+<!ELEMENT FULLTEXT EMPTY>
+<!ELEMENT HASH EMPTY>
+<!ATTLIST index name CDATA #REQUIRED platform CDATA #IMPLIED>
+<!ELEMENT sql (query+, descr?)>
+<!ELEMENT query (#CDATA)>
+<!ATTLIST sql name CDATA #IMPLIED platform CDATA #IMPLIED, key CDATA, prefixmethod (AUTO|MANUAL|NONE) >
+] >
\ No newline at end of file
diff --git a/libraries/adodb/xmlschema03.dtd b/libraries/adodb/xmlschema03.dtd
new file mode 100644
index 000000000..97850bc7f
--- /dev/null
+++ b/libraries/adodb/xmlschema03.dtd
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!DOCTYPE adodb_schema [
+<!ELEMENT schema (table*, sql*)>
+<!ATTLIST schema version CDATA #REQUIRED>
+<!ELEMENT table (descr?, (field+|DROP), constraint*, opt*, index*, data*)>
+<!ATTLIST table name CDATA #REQUIRED platform CDATA #IMPLIED version CDATA #IMPLIED>
+<!ELEMENT field (descr?, (NOTNULL|KEY|PRIMARY)?, (AUTO|AUTOINCREMENT)?, (DEFAULT|DEFDATE|DEFTIMESTAMP)?, NOQUOTE?, UNSIGNED?, constraint*, opt*)>
+<!ATTLIST field name CDATA #REQUIRED type (C|C2|X|X2|B|D|T|L|I|F|N) #REQUIRED size CDATA #IMPLIED opts CDATA #IMPLIED>
+<!ELEMENT data (descr?, row+)>
+<!ATTLIST data platform CDATA #IMPLIED>
+<!ELEMENT row (f+)>
+<!ELEMENT f (#CDATA)>
+<!ATTLIST f name CDATA #IMPLIED>
+<!ELEMENT descr (#CDATA)>
+<!ELEMENT NOTNULL EMPTY>
+<!ELEMENT KEY EMPTY>
+<!ELEMENT PRIMARY EMPTY>
+<!ELEMENT AUTO EMPTY>
+<!ELEMENT AUTOINCREMENT EMPTY>
+<!ELEMENT DEFAULT EMPTY>
+<!ATTLIST DEFAULT value CDATA #REQUIRED>
+<!ELEMENT DEFDATE EMPTY>
+<!ELEMENT DEFTIMESTAMP EMPTY>
+<!ELEMENT NOQUOTE EMPTY>
+<!ELEMENT UNSIGNED EMPTY>
+<!ELEMENT DROP EMPTY>
+<!ELEMENT constraint (#CDATA)>
+<!ATTLIST constraint platform CDATA #IMPLIED>
+<!ELEMENT opt (#CDATA)>
+<!ATTLIST opt platform CDATA #IMPLIED>
+<!ELEMENT index ((col+|DROP), CLUSTERED?, BITMAP?, UNIQUE?, FULLTEXT?, HASH?, descr?)>
+<!ATTLIST index name CDATA #REQUIRED platform CDATA #IMPLIED>
+<!ELEMENT col (#CDATA)>
+<!ELEMENT CLUSTERED EMPTY>
+<!ELEMENT BITMAP EMPTY>
+<!ELEMENT UNIQUE EMPTY>
+<!ELEMENT FULLTEXT EMPTY>
+<!ELEMENT HASH EMPTY>
+<!ELEMENT sql (query+, descr?)>
+<!ATTLIST sql name CDATA #IMPLIED platform CDATA #IMPLIED, key CDATA, prefixmethod (AUTO|MANUAL|NONE)>
+<!ELEMENT query (#CDATA)>
+<!ATTLIST query platform CDATA #IMPLIED>
+]>
\ No newline at end of file
diff --git a/libraries/adodb/xsl/convert-0.1-0.2.xsl b/libraries/adodb/xsl/convert-0.1-0.2.xsl
index 6cd9e5bf1..5b2e3cecd 100644
--- a/libraries/adodb/xsl/convert-0.1-0.2.xsl
+++ b/libraries/adodb/xsl/convert-0.1-0.2.xsl
@@ -3,38 +3,38 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-
+
<!-- Schema -->
<xsl:template match="/">
<xsl:comment>
ADODB XMLSchema
http://adodb-xmlschema.sourceforge.net
</xsl:comment>
-
+
<xsl:element name="schema">
<xsl:attribute name="version">0.2</xsl:attribute>
-
+
<xsl:apply-templates select="schema/table|schema/sql"/>
</xsl:element>
</xsl:template>
-
+
<!-- Table -->
<xsl:template match="table">
<xsl:variable name="table_name" select="@name"/>
-
+
<xsl:element name="table">
<xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute>
-
+
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@version) > 0">
<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:choose>
<xsl:when test="count(DROP) > 0">
<xsl:element name="DROP"/>
@@ -43,23 +43,23 @@ http://adodb-xmlschema.sourceforge.net
<xsl:apply-templates select="field"/>
</xsl:otherwise>
</xsl:choose>
-
+
<xsl:apply-templates select="constraint"/>
-
+
<xsl:apply-templates select="../index[@table=$table_name]"/>
</xsl:element>
</xsl:template>
-
+
<!-- Field -->
<xsl:template match="field">
<xsl:element name="field">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-
+
<xsl:if test="string-length(@size) > 0">
<xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute>
</xsl:if>
-
+
<xsl:choose>
<xsl:when test="count(PRIMARY) > 0">
<xsl:element name="PRIMARY"/>
@@ -71,7 +71,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:element name="NOTNULL"/>
</xsl:when>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(AUTO) > 0">
<xsl:element name="AUTO"/>
@@ -80,7 +80,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:element name="AUTOINCREMENT"/>
</xsl:when>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(DEFAULT) > 0">
<xsl:element name="DEFAULT">
@@ -104,49 +104,49 @@ http://adodb-xmlschema.sourceforge.net
</xsl:element>
</xsl:when>
</xsl:choose>
-
+
<xsl:if test="count(NOQUOTE) > 0">
<xsl:element name="NOQUOTE"/>
</xsl:if>
-
+
<xsl:apply-templates select="constraint"/>
</xsl:element>
</xsl:template>
-
+
<!-- Constraint -->
<xsl:template match="constraint">
<xsl:element name="constraint">
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Index -->
<xsl:template match="index">
<xsl:element name="index">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:if test="count(CLUSTERED) > 0">
<xsl:element name="CLUSTERED"/>
</xsl:if>
-
+
<xsl:if test="count(BITMAP) > 0">
<xsl:element name="BITMAP"/>
</xsl:if>
-
+
<xsl:if test="count(UNIQUE) > 0">
<xsl:element name="UNIQUE"/>
</xsl:if>
-
+
<xsl:if test="count(FULLTEXT) > 0">
<xsl:element name="FULLTEXT"/>
</xsl:if>
-
+
<xsl:if test="count(HASH) > 0">
<xsl:element name="HASH"/>
</xsl:if>
-
+
<xsl:choose>
<xsl:when test="count(DROP) > 0">
<xsl:element name="DROP"/>
@@ -157,45 +157,45 @@ http://adodb-xmlschema.sourceforge.net
</xsl:choose>
</xsl:element>
</xsl:template>
-
+
<!-- Index Column -->
<xsl:template match="col">
<xsl:element name="col">
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- SQL QuerySet -->
<xsl:template match="sql">
<xsl:element name="sql">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@key) > 0">
<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@prefixmethod) > 0">
<xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
<xsl:apply-templates select="query"/>
</xsl:element>
</xsl:template>
-
+
<!-- Query -->
<xsl:template match="query">
<xsl:element name="query">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Description -->
<xsl:template match="descr">
<xsl:element name="descr">
diff --git a/libraries/adodb/xsl/convert-0.1-0.3.xsl b/libraries/adodb/xsl/convert-0.1-0.3.xsl
index 381aa4fe7..3202dce43 100644
--- a/libraries/adodb/xsl/convert-0.1-0.3.xsl
+++ b/libraries/adodb/xsl/convert-0.1-0.3.xsl
@@ -3,38 +3,38 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-
+
<!-- Schema -->
<xsl:template match="/">
<xsl:comment>
ADODB XMLSchema
http://adodb-xmlschema.sourceforge.net
</xsl:comment>
-
+
<xsl:element name="schema">
<xsl:attribute name="version">0.3</xsl:attribute>
-
+
<xsl:apply-templates select="schema/table|schema/sql"/>
</xsl:element>
</xsl:template>
-
+
<!-- Table -->
<xsl:template match="table">
<xsl:variable name="table_name" select="@name"/>
-
+
<xsl:element name="table">
<xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute>
-
+
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@version) > 0">
<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:choose>
<xsl:when test="count(DROP) > 0">
<xsl:element name="DROP"/>
@@ -43,23 +43,23 @@ http://adodb-xmlschema.sourceforge.net
<xsl:apply-templates select="field"/>
</xsl:otherwise>
</xsl:choose>
-
+
<xsl:apply-templates select="constraint"/>
-
+
<xsl:apply-templates select="../index[@table=$table_name]"/>
</xsl:element>
</xsl:template>
-
+
<!-- Field -->
<xsl:template match="field">
<xsl:element name="field">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-
+
<xsl:if test="string-length(@size) > 0">
<xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute>
</xsl:if>
-
+
<xsl:choose>
<xsl:when test="string-length(@opts) = 0"/>
<xsl:when test="@opts = 'UNSIGNED'">
@@ -75,7 +75,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:attribute name="opts"><xsl:value-of select="@opts"/></xsl:attribute>
</xsl:otherwise>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(PRIMARY) > 0">
<xsl:element name="PRIMARY"/>
@@ -87,7 +87,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:element name="NOTNULL"/>
</xsl:when>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(AUTO) > 0">
<xsl:element name="AUTO"/>
@@ -96,7 +96,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:element name="AUTOINCREMENT"/>
</xsl:when>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(DEFAULT) > 0">
<xsl:element name="DEFAULT">
@@ -120,49 +120,49 @@ http://adodb-xmlschema.sourceforge.net
</xsl:element>
</xsl:when>
</xsl:choose>
-
+
<xsl:if test="count(NOQUOTE) > 0">
<xsl:element name="NOQUOTE"/>
</xsl:if>
-
+
<xsl:apply-templates select="constraint"/>
</xsl:element>
</xsl:template>
-
+
<!-- Constraint -->
<xsl:template match="constraint">
<xsl:element name="constraint">
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Index -->
<xsl:template match="index">
<xsl:element name="index">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:if test="count(CLUSTERED) > 0">
<xsl:element name="CLUSTERED"/>
</xsl:if>
-
+
<xsl:if test="count(BITMAP) > 0">
<xsl:element name="BITMAP"/>
</xsl:if>
-
+
<xsl:if test="count(UNIQUE) > 0">
<xsl:element name="UNIQUE"/>
</xsl:if>
-
+
<xsl:if test="count(FULLTEXT) > 0">
<xsl:element name="FULLTEXT"/>
</xsl:if>
-
+
<xsl:if test="count(HASH) > 0">
<xsl:element name="HASH"/>
</xsl:if>
-
+
<xsl:choose>
<xsl:when test="count(DROP) > 0">
<xsl:element name="DROP"/>
@@ -173,45 +173,45 @@ http://adodb-xmlschema.sourceforge.net
</xsl:choose>
</xsl:element>
</xsl:template>
-
+
<!-- Index Column -->
<xsl:template match="col">
<xsl:element name="col">
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- SQL QuerySet -->
<xsl:template match="sql">
<xsl:element name="sql">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@key) > 0">
<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@prefixmethod) > 0">
<xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
<xsl:apply-templates select="query"/>
</xsl:element>
</xsl:template>
-
+
<!-- Query -->
<xsl:template match="query">
<xsl:element name="query">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Description -->
<xsl:template match="descr">
<xsl:element name="descr">
diff --git a/libraries/adodb/xsl/convert-0.2-0.1.xsl b/libraries/adodb/xsl/convert-0.2-0.1.xsl
index 61841b483..6398e3e55 100644
--- a/libraries/adodb/xsl/convert-0.2-0.1.xsl
+++ b/libraries/adodb/xsl/convert-0.2-0.1.xsl
@@ -3,38 +3,38 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-
+
<!-- Schema -->
<xsl:template match="/">
<xsl:comment>
ADODB XMLSchema
http://adodb-xmlschema.sourceforge.net
</xsl:comment>
-
+
<xsl:element name="schema">
<xsl:attribute name="version">0.1</xsl:attribute>
-
+
<xsl:apply-templates select="schema/table|schema/sql"/>
</xsl:element>
</xsl:template>
-
+
<!-- Table -->
<xsl:template match="table">
<xsl:variable name="table_name" select="@name"/>
-
+
<xsl:element name="table">
<xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute>
-
+
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@version) > 0">
<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:choose>
<xsl:when test="count(DROP) > 0">
<xsl:element name="DROP"/>
@@ -43,24 +43,24 @@ http://adodb-xmlschema.sourceforge.net
<xsl:apply-templates select="field"/>
</xsl:otherwise>
</xsl:choose>
-
+
<xsl:apply-templates select="constraint"/>
-
+
</xsl:element>
-
+
<xsl:apply-templates select="index"/>
</xsl:template>
-
+
<!-- Field -->
<xsl:template match="field">
<xsl:element name="field">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-
+
<xsl:if test="string-length(@size) > 0">
<xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute>
</xsl:if>
-
+
<xsl:choose>
<xsl:when test="count(PRIMARY) > 0">
<xsl:element name="PRIMARY"/>
@@ -72,7 +72,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:element name="NOTNULL"/>
</xsl:when>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(AUTO) > 0">
<xsl:element name="AUTO"/>
@@ -81,7 +81,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:element name="AUTOINCREMENT"/>
</xsl:when>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(DEFAULT) > 0">
<xsl:element name="DEFAULT">
@@ -105,50 +105,50 @@ http://adodb-xmlschema.sourceforge.net
</xsl:element>
</xsl:when>
</xsl:choose>
-
+
<xsl:if test="count(NOQUOTE) > 0">
<xsl:element name="NOQUOTE"/>
</xsl:if>
-
+
<xsl:apply-templates select="constraint"/>
</xsl:element>
</xsl:template>
-
+
<!-- Constraint -->
<xsl:template match="constraint">
<xsl:element name="constraint">
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Index -->
<xsl:template match="index">
<xsl:element name="index">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
<xsl:attribute name="table"><xsl:value-of select="../@name"/></xsl:attribute>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:if test="count(CLUSTERED) > 0">
<xsl:element name="CLUSTERED"/>
</xsl:if>
-
+
<xsl:if test="count(BITMAP) > 0">
<xsl:element name="BITMAP"/>
</xsl:if>
-
+
<xsl:if test="count(UNIQUE) > 0">
<xsl:element name="UNIQUE"/>
</xsl:if>
-
+
<xsl:if test="count(FULLTEXT) > 0">
<xsl:element name="FULLTEXT"/>
</xsl:if>
-
+
<xsl:if test="count(HASH) > 0">
<xsl:element name="HASH"/>
</xsl:if>
-
+
<xsl:choose>
<xsl:when test="count(DROP) > 0">
<xsl:element name="DROP"/>
@@ -159,45 +159,45 @@ http://adodb-xmlschema.sourceforge.net
</xsl:choose>
</xsl:element>
</xsl:template>
-
+
<!-- Index Column -->
<xsl:template match="col">
<xsl:element name="col">
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- SQL QuerySet -->
<xsl:template match="sql">
<xsl:element name="sql">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@key) > 0">
<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@prefixmethod) > 0">
<xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
<xsl:apply-templates select="query"/>
</xsl:element>
</xsl:template>
-
+
<!-- Query -->
<xsl:template match="query">
<xsl:element name="query">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Description -->
<xsl:template match="descr">
<xsl:element name="descr">
diff --git a/libraries/adodb/xsl/convert-0.2-0.3.xsl b/libraries/adodb/xsl/convert-0.2-0.3.xsl
index 26bd9e9aa..9e1f2ae34 100644
--- a/libraries/adodb/xsl/convert-0.2-0.3.xsl
+++ b/libraries/adodb/xsl/convert-0.2-0.3.xsl
@@ -3,36 +3,36 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-
+
<!-- Schema -->
<xsl:template match="/">
<xsl:comment>
ADODB XMLSchema
http://adodb-xmlschema.sourceforge.net
</xsl:comment>
-
+
<xsl:element name="schema">
<xsl:attribute name="version">0.3</xsl:attribute>
-
+
<xsl:apply-templates select="schema/table|schema/sql"/>
</xsl:element>
</xsl:template>
-
+
<!-- Table -->
<xsl:template match="table">
<xsl:element name="table">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-
+
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@version) > 0">
<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:choose>
<xsl:when test="count(DROP) > 0">
<xsl:element name="DROP"/>
@@ -41,27 +41,27 @@ http://adodb-xmlschema.sourceforge.net
<xsl:apply-templates select="field"/>
</xsl:otherwise>
</xsl:choose>
-
+
<xsl:apply-templates select="constraint"/>
-
+
<xsl:apply-templates select="opt"/>
-
+
<xsl:apply-templates select="index"/>
-
+
<xsl:apply-templates select="data"/>
</xsl:element>
</xsl:template>
-
+
<!-- Field -->
<xsl:template match="field">
<xsl:element name="field">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-
+
<xsl:if test="string-length(@size) > 0">
<xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute>
</xsl:if>
-
+
<xsl:choose>
<xsl:when test="string-length(@opts) = 0">
<xsl:if test="count(UNSIGNED) > 0">
@@ -84,9 +84,9 @@ http://adodb-xmlschema.sourceforge.net
</xsl:if>
</xsl:otherwise>
</xsl:choose>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:choose>
<xsl:when test="count(PRIMARY) > 0">
<xsl:element name="PRIMARY"/>
@@ -98,7 +98,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:element name="NOTNULL"/>
</xsl:when>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(AUTO) > 0">
<xsl:element name="AUTO"/>
@@ -107,7 +107,7 @@ http://adodb-xmlschema.sourceforge.net
<xsl:element name="AUTOINCREMENT"/>
</xsl:when>
</xsl:choose>
-
+
<xsl:choose>
<xsl:when test="count(DEFAULT) > 0">
<xsl:element name="DEFAULT">
@@ -131,66 +131,66 @@ http://adodb-xmlschema.sourceforge.net
</xsl:element>
</xsl:when>
</xsl:choose>
-
+
<xsl:if test="count(NOQUOTE) > 0">
<xsl:element name="NOQUOTE"/>
</xsl:if>
-
+
<xsl:apply-templates select="constraint"/>
-
+
<xsl:apply-templates select="opt"/>
</xsl:element>
</xsl:template>
-
+
<!-- Constraint -->
<xsl:template match="constraint">
<xsl:element name="constraint">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Opt -->
<xsl:template match="opt">
<xsl:element name="opt">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Index -->
<xsl:template match="index">
<xsl:element name="index">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:if test="count(CLUSTERED) > 0">
<xsl:element name="CLUSTERED"/>
</xsl:if>
-
+
<xsl:if test="count(BITMAP) > 0">
<xsl:element name="BITMAP"/>
</xsl:if>
-
+
<xsl:if test="count(UNIQUE) > 0">
<xsl:element name="UNIQUE"/>
</xsl:if>
-
+
<xsl:if test="count(FULLTEXT) > 0">
<xsl:element name="FULLTEXT"/>
</xsl:if>
-
+
<xsl:if test="count(HASH) > 0">
<xsl:element name="HASH"/>
</xsl:if>
-
+
<xsl:choose>
<xsl:when test="count(DROP) > 0">
<xsl:element name="DROP"/>
@@ -201,80 +201,80 @@ http://adodb-xmlschema.sourceforge.net
</xsl:choose>
</xsl:element>
</xsl:template>
-
+
<!-- Index Column -->
<xsl:template match="col">
<xsl:element name="col">
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- SQL QuerySet -->
<xsl:template match="sql">
<xsl:element name="sql">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@key) > 0">
<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@prefixmethod) > 0">
<xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:apply-templates select="query"/>
</xsl:element>
</xsl:template>
-
+
<!-- Query -->
<xsl:template match="query">
<xsl:element name="query">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Description -->
<xsl:template match="descr">
<xsl:element name="descr">
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
-
+
<!-- Data -->
<xsl:template match="data">
<xsl:element name="data">
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:apply-templates select="row"/>
</xsl:element>
</xsl:template>
-
+
<!-- Data Row -->
<xsl:template match="row">
<xsl:element name="row">
<xsl:apply-templates select="f"/>
</xsl:element>
</xsl:template>
-
+
<!-- Data Field -->
<xsl:template match="f">
<xsl:element name="f">
<xsl:if test="string-length(@name) > 0">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
</xsl:if>
-
+
<xsl:value-of select="normalize-space(text())"/>
</xsl:element>
</xsl:template>
diff --git a/libraries/adodb/xsl/remove-0.2.xsl b/libraries/adodb/xsl/remove-0.2.xsl
index 9b10a528c..c82c3ad88 100644
--- a/libraries/adodb/xsl/remove-0.2.xsl
+++ b/libraries/adodb/xsl/remove-0.2.xsl
@@ -3,48 +3,48 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-
+
<!-- Schema -->
<xsl:template match="/">
<xsl:comment>
ADODB XMLSchema
http://adodb-xmlschema.sourceforge.net
</xsl:comment>
-
+
<xsl:comment>
Uninstallation Schema
</xsl:comment>
-
+
<xsl:element name="schema">
<xsl:attribute name="version">0.2</xsl:attribute>
-
+
<xsl:apply-templates select="schema/table">
<xsl:sort select="position()" data-type="number" order="descending"/>
</xsl:apply-templates>
</xsl:element>
</xsl:template>
-
+
<!-- Table -->
<xsl:template match="table">
<xsl:if test="count(DROP) = 0">
<xsl:element name="table">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-
+
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@version) > 0">
<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:element name="DROP"/>
</xsl:element>
</xsl:if>
</xsl:template>
-
+
<!-- Description -->
<xsl:template match="descr">
<xsl:element name="descr">
diff --git a/libraries/adodb/xsl/remove-0.3.xsl b/libraries/adodb/xsl/remove-0.3.xsl
index 768e092bf..4b1cd02ee 100644
--- a/libraries/adodb/xsl/remove-0.3.xsl
+++ b/libraries/adodb/xsl/remove-0.3.xsl
@@ -3,48 +3,48 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-
+
<!-- Schema -->
<xsl:template match="/">
<xsl:comment>
ADODB XMLSchema
http://adodb-xmlschema.sourceforge.net
</xsl:comment>
-
+
<xsl:comment>
Uninstallation Schema
</xsl:comment>
-
+
<xsl:element name="schema">
<xsl:attribute name="version">0.3</xsl:attribute>
-
+
<xsl:apply-templates select="schema/table">
<xsl:sort select="position()" data-type="number" order="descending"/>
</xsl:apply-templates>
</xsl:element>
</xsl:template>
-
+
<!-- Table -->
<xsl:template match="table">
<xsl:if test="count(DROP) = 0">
<xsl:element name="table">
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-
+
<xsl:if test="string-length(@platform) > 0">
<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
</xsl:if>
-
+
<xsl:if test="string-length(@version) > 0">
<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
</xsl:if>
-
+
<xsl:apply-templates select="descr[1]"/>
-
+
<xsl:element name="DROP"/>
</xsl:element>
</xsl:if>
</xsl:template>
-
+
<!-- Description -->
<xsl:template match="descr">
<xsl:element name="descr">
--
GitLab