Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9968] trunk/lib/WikiDB/adodb
|
From: <var...@us...> - 2016-10-14 10:40:25
|
Revision: 9968
http://sourceforge.net/p/phpwiki/code/9968
Author: vargenau
Date: 2016-10-14 10:40:22 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
Update Adodb to version 5.20.7
Modified Paths:
--------------
trunk/lib/WikiDB/adodb/README.md
trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pager.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-perf.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php
trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/adodb/composer.json
trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ads.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
trunk/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
trunk/lib/WikiDB/adodb/perf/perf-db2.inc.php
trunk/lib/WikiDB/adodb/perf/perf-informix.inc.php
trunk/lib/WikiDB/adodb/perf/perf-mssql.inc.php
trunk/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/perf/perf-mysql.inc.php
trunk/lib/WikiDB/adodb/perf/perf-oci8.inc.php
trunk/lib/WikiDB/adodb/perf/perf-postgres.inc.php
trunk/lib/WikiDB/adodb/pivottable.inc.php
trunk/lib/WikiDB/adodb/rsfilter.inc.php
trunk/lib/WikiDB/adodb/server.php
trunk/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
trunk/lib/WikiDB/adodb/session/adodb-compress-gzip.php
trunk/lib/WikiDB/adodb/session/adodb-cryptsession.php
trunk/lib/WikiDB/adodb/session/adodb-cryptsession2.php
trunk/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
trunk/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
trunk/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
trunk/lib/WikiDB/adodb/session/adodb-session-clob.php
trunk/lib/WikiDB/adodb/session/adodb-session-clob2.php
trunk/lib/WikiDB/adodb/session/adodb-session.php
trunk/lib/WikiDB/adodb/session/adodb-session2.php
trunk/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
trunk/lib/WikiDB/adodb/session/old/adodb-session-clob.php
trunk/lib/WikiDB/adodb/session/old/adodb-session.php
trunk/lib/WikiDB/adodb/toexport.inc.php
trunk/lib/WikiDB/adodb/tohtml.inc.php
Added Paths:
-----------
trunk/lib/WikiDB/adodb/.mailmap
trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch
trunk/lib/WikiDB/adodb/LICENSE.md
trunk/lib/WikiDB/adodb/docs/README.md
trunk/lib/WikiDB/adodb/docs/changelog.md
trunk/lib/WikiDB/adodb/docs/changelog_v2.x.md
trunk/lib/WikiDB/adodb/docs/changelog_v3.x.md
trunk/lib/WikiDB/adodb/docs/changelog_v4+5.md
trunk/lib/WikiDB/adodb/docs/changelog_v4.x.md
trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlsrv.inc.php
trunk/lib/WikiDB/adodb/fix-202.php
trunk/lib/WikiDB/adodb/fix-226.php
trunk/lib/WikiDB/adodb/nbproject/
trunk/lib/WikiDB/adodb/nbproject/private/
trunk/lib/WikiDB/adodb/nbproject/private/config.properties
trunk/lib/WikiDB/adodb/nbproject/private/private.properties
trunk/lib/WikiDB/adodb/nbproject/private/private.xml
trunk/lib/WikiDB/adodb/nbproject/project.properties
trunk/lib/WikiDB/adodb/nbproject/project.xml
trunk/lib/WikiDB/adodb/pr265.php
trunk/lib/WikiDB/adodb/test.xml
Removed Paths:
-------------
trunk/lib/WikiDB/adodb/docs/adodb-faq.html
trunk/lib/WikiDB/adodb/docs/docs-active-record.htm
trunk/lib/WikiDB/adodb/docs/docs-adodb.htm
trunk/lib/WikiDB/adodb/docs/docs-datadict.htm
trunk/lib/WikiDB/adodb/docs/docs-oracle.htm
trunk/lib/WikiDB/adodb/docs/docs-perf.htm
trunk/lib/WikiDB/adodb/docs/docs-session.htm
trunk/lib/WikiDB/adodb/docs/docs-session.old.htm
trunk/lib/WikiDB/adodb/docs/index.html
trunk/lib/WikiDB/adodb/docs/old-changelog.htm
trunk/lib/WikiDB/adodb/docs/tips_portable_sql.htm
trunk/lib/WikiDB/adodb/docs/tute.htm
trunk/lib/WikiDB/adodb/drivers/adodb-text.inc.php
trunk/lib/WikiDB/adodb/license.txt
trunk/lib/WikiDB/adodb/tests/
Added: trunk/lib/WikiDB/adodb/.mailmap
===================================================================
--- trunk/lib/WikiDB/adodb/.mailmap (rev 0)
+++ trunk/lib/WikiDB/adodb/.mailmap 2016-10-14 10:40:22 UTC (rev 9968)
@@ -0,0 +1,4 @@
+Andreas Fernandez <a.f...@sc...> <and...@as...>
+Mike Benoit <mi...@ti...> MikeB <ip...@sn...>
+Mike Benoit <mi...@ti...> mike.benoit
+
Added: trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch
===================================================================
--- trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch (rev 0)
+++ trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch 2016-10-14 10:40:22 UTC (rev 9968)
@@ -0,0 +1,60 @@
+From 9fbb2c7751c0fdb89062a87910730ea9ccb5d04c Mon Sep 17 00:00:00 2001
+From: peterdd <dd...@li...>
+Date: Thu, 4 Aug 2016 04:10:12 +0200
+Subject: [PATCH] XML: add support for 'DESCR' tags for tables/fields
+
+Fixes #265
+
+Signed-off-by: Damien Regad <dr...@ma...>
+
+Original commits squashed; commit message reworded; updated changelog.
+---
+ adodb-xmlschema03.inc.php | 12 ++++++++++++
+ docs/changelog.md | 1 +
+ 2 files changed, 13 insertions(+)
+
+diff --git a/adodb-xmlschema03.inc.php b/adodb-xmlschema03.inc.php
+index c1ecb88..794f5e2 100644
+--- a/adodb-xmlschema03.inc.php
++++ b/adodb-xmlschema03.inc.php
+@@ -347,6 +347,14 @@ class dbTable extends dbObject {
+ */
+ function _tag_cdata( &$parser, $cdata ) {
+ switch( $this->currentElement ) {
++ // Table or field comment
++ case 'DESCR':
++ if( isset( $this->current_field ) ) {
++ $this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
++ } else {
++ $this->addTableComment( $cdata );
++ }
++ break;
+ // Table/field constraint
+ case 'CONSTRAINT':
+ if( isset( $this->current_field ) ) {
+@@ -511,6 +519,10 @@ class dbTable extends dbObject {
+ return $this->opts;
+ }
+
++ function addTableComment( $opt ) {
++ $this->opts['comment'] = $opt;
++ return $this->opts;
++ }
+
+ /**
+ * Generates the SQL that will create the table in the database
+diff --git a/docs/changelog.md b/docs/changelog.md
+index 742f4e4..1fe10f4 100644
+--- a/docs/changelog.md
++++ b/docs/changelog.md
+@@ -44,6 +44,7 @@ Older changelogs:
+ - sqlite: Fix Metataypes mapping. #177
+ - sqlite: driver did not support metaForeignKeys. #179
+ - session: add 'httponly' flag to cookie. #190
++- xml: add support for 'DESCR' tags for tables/fields. #265
+
+ ## 5.20.6 - 31-Aug-2016
+
+--
+2.7.4
+
Added: trunk/lib/WikiDB/adodb/LICENSE.md
===================================================================
--- trunk/lib/WikiDB/adodb/LICENSE.md (rev 0)
+++ trunk/lib/WikiDB/adodb/LICENSE.md 2016-10-14 10:40:22 UTC (rev 9968)
@@ -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 (jl...@na...)
+(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_
Modified: trunk/lib/WikiDB/adodb/README.md
===================================================================
--- trunk/lib/WikiDB/adodb/README.md 2016-10-14 08:43:58 UTC (rev 9967)
+++ trunk/lib/WikiDB/adodb/README.md 2016-10-14 10:40:22 UTC (rev 9968)
@@ -1,14 +1,30 @@
-ADODB Library for PHP5
+ADOdb Library for PHP5
======================
-(c) 2000-2014 John Lim (jl...@na...)
+[](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)
-Released under both BSD and GNU Lesser GPL library license.
-This means you can use it in proprietary products.
+(c) 2000-2013 John Lim (jl...@na...)
+(c) 2014 Damien Regad, Mark Newnham and the ADOdb community
-Home page: http://adodb.sourceforge.net/
+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
============
@@ -51,18 +67,14 @@
Documentation and Examples
==========================
-Refer to the `docs` directory for library 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: `docs-adodb.htm`.
- Query, update and insert records using a portable API.
-- Data dictionary docs: `docs-datadict.htm`.
- Describes how to create database tables and indexes in a portable manner.
-- Database performance monitoring docs: `docs-perf.htm`.
- Allows you to perform health checks, tune and monitor your database.
-- Database-backed session docs: `docs-session.htm`.
+- [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 `tute.htm` that contrasts ADOdb code with
-mysql code.
+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
@@ -78,9 +90,12 @@
tables are created in test.php.
-Feature Requests and Bug Reports
-================================
+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
Modified: trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php 2016-10-14 08:43:58 UTC (rev 9967)
+++ trunk/lib/WikiDB/adodb/adodb-active-record.inc.php 2016-10-14 10:40:22 UTC (rev 9968)
@@ -1,7 +1,9 @@
<?php
/*
-@version V5.20dev ??-???-2014 (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+@version v5.20.7 20-Sep-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.
@@ -52,10 +54,13 @@
foreach($_ADODB_ACTIVE_DBS as $k => $d) {
if (PHP_VERSION >= 5) {
- if ($d->db === $db) return $k;
+ if ($d->db === $db) {
+ return $k;
+ }
} else {
- if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database)
+ if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) {
return $k;
+ }
}
}
@@ -63,9 +68,10 @@
$obj->db = $db;
$obj->tables = array();
- if ($index == false) $index = sizeof($_ADODB_ACTIVE_DBS);
+ if ($index == false) {
+ $index = sizeof($_ADODB_ACTIVE_DBS);
+ }
-
$_ADODB_ACTIVE_DBS[$index] = $obj;
return sizeof($_ADODB_ACTIVE_DBS)-1;
@@ -92,7 +98,9 @@
static function UseDefaultValues($bool=null)
{
global $ADODB_ACTIVE_DEFVALS;
- if (isset($bool)) $ADODB_ACTIVE_DEFVALS = $bool;
+ if (isset($bool)) {
+ $ADODB_ACTIVE_DEFVALS = $bool;
+ }
return $ADODB_ACTIVE_DEFVALS;
}
@@ -120,14 +128,21 @@
}
if (!$table) {
- if (!empty($this->_table)) $table = $this->_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 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');
+ 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);
}
@@ -146,7 +161,9 @@
function _pluralize($table)
{
- if (!ADODB_Active_Record::$_changeNames) return $table;
+ if (!ADODB_Active_Record::$_changeNames) {
+ return $table;
+ }
$ut = strtoupper($table);
$len = strlen($table);
@@ -160,8 +177,9 @@
case 'X':
return $table.'es';
case 'H':
- if ($lastc2 == 'CH' || $lastc2 == 'SH')
+ if ($lastc2 == 'CH' || $lastc2 == 'SH') {
return $table.'es';
+ }
default:
return $table.'s';
}
@@ -172,24 +190,28 @@
function _singularize($tables)
{
- if (!ADODB_Active_Record::$_changeNames) return $table;
+ if (!ADODB_Active_Record::$_changeNames) {
+ return $table;
+ }
$ut = strtoupper($tables);
$len = strlen($tables);
- if($ut[$len-1] != 'S')
+ if($ut[$len-1] != 'S') {
return $tables; // I know...forget oxen
- if($ut[$len-2] != 'E')
+ }
+ if($ut[$len-2] != 'E') {
return substr($tables, 0, $len-1);
- switch($ut[$len-3])
- {
+ }
+ 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')
+ if($ut[$len-4] == 'C' || $ut[$len-4] == 'S') {
return substr($tables, 0, $len-2);
+ }
default:
return substr($tables, 0, $len-1); // ?
}
@@ -216,7 +238,9 @@
// 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);
+ if (!is_array($tablePKey)) {
+ $tablePKey = array($tablePKey);
+ }
$ar = new ADODB_Active_Record($table,$tablePKey);
$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
}
@@ -260,7 +284,9 @@
static function TableKeyBelongsTo($table, $tablePKey, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
{
- if (!is_array($tablePKey)) $tablePKey = array($tablePKey);
+ if (!is_array($tablePKey)) {
+ $tablePKey = array($tablePKey);
+ }
$ar = new ADOdb_Active_Record($table, $tablePKey);
$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
}
@@ -289,24 +315,34 @@
{
$extras = array();
$table = $this->TableInfo();
- if ($limit >= 0) $extras['limit'] = $limit;
- if ($offset >= 0) $extras['offset'] = $offset;
+ 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 (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]))
- {
+ if(!empty($table->_belongsTo[$name])) {
$obj = $table->_belongsTo[$name];
$columnName = $obj->foreignKey;
- if(empty($this->$columnName))
+ if(empty($this->$columnName)) {
$this->$name = null;
- else
- {
- if ($obj->parentKey) $key = $obj->parentKey;
- else $key = reset($table->keys);
+ }
+ else {
+ if ($obj->parentKey) {
+ $key = $obj->parentKey;
+ }
+ else {
+ $key = reset($table->keys);
+ }
$arrayOfOne = $obj->Find($key.'='.$this->$columnName.' '.$whereOrderBy,false,false,$extras);
if ($arrayOfOne) {
@@ -315,8 +351,7 @@
}
}
}
- if(!empty($table->_hasMany[$name]))
- {
+ if(!empty($table->_hasMany[$name])) {
$obj = $table->_hasMany[$name];
$key = reset($table->keys);
$id = @$this->$key;
@@ -325,7 +360,9 @@
$id = $db->qstr($id);
}
$objs = $obj->Find($obj->foreignKey.'='.$id. ' '.$whereOrderBy,false,false,$extras);
- if (!$objs) $objs = array();
+ if (!$objs) {
+ $objs = array();
+ }
$this->$name = $objs;
return $objs;
}
@@ -349,10 +386,12 @@
$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;
+ if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) {
+ $this->$name = $fld->default_value;
+ }
+ else {
+ $this->$name = null;
+ }
}
return;
}
@@ -368,10 +407,12 @@
// ideally, you should cache at least 32 secs
foreach($acttab->flds as $name => $fld) {
- if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
+ if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) {
$this->$name = $fld->default_value;
- else
+ }
+ else {
$this->$name = null;
+ }
}
$activedb->tables[$table] = $acttab;
@@ -387,11 +428,15 @@
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
+ if ($db->fetchMode !== false) {
+ $savem = $db->SetFetchMode(false);
+ }
$cols = $db->MetaColumns($table);
- if (isset($savem)) $db->SetFetchMode($savem);
+ if (isset($savem)) {
+ $db->SetFetchMode($savem);
+ }
$ADODB_FETCH_MODE = $save;
if (!$cols) {
@@ -403,7 +448,9 @@
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
$pkeys = $this->GetPrimaryKeys($db, $table);
@@ -420,10 +467,12 @@
case 0:
foreach($cols as $name => $fldobj) {
$name = strtolower($name);
- if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
- $this->$name = $fldobj->default_value;
- else
+ 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) {
@@ -435,10 +484,12 @@
foreach($cols as $name => $fldobj) {
$name = strtoupper($name);
- if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
- $this->$name = $fldobj->default_value;
- else
+ if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
+ $this->$name = $fldobj->default_value;
+ }
+ else {
$this->$name = null;
+ }
$attr[$name] = $fldobj;
}
@@ -450,10 +501,12 @@
foreach($cols as $name => $fldobj) {
$name = ($fldobj->name);
- if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
- $this->$name = $fldobj->default_value;
- else
+ 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) {
@@ -468,14 +521,18 @@
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;
- if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
+ if ($oldtab) {
+ $activetab->_belongsTo = $oldtab->_belongsTo;
+ $activetab->_hasMany = $oldtab->_hasMany;
+ }
}
$activedb->tables[$table] = $activetab;
}
@@ -493,17 +550,26 @@
$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;
}
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 (!$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);
+ }
+ }
}
@@ -511,18 +577,26 @@
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...
+ if ($this->_dbat < 0) {
+ return -9999; // no database connection...
+ }
$db = $this->DB();
return (int) $db->ErrorNo();
@@ -558,8 +632,11 @@
// 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();
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
+ $table = $this->TableInfo();
$where = $this->GenWhere($db, $table);
return($this->Load($where));
}
@@ -581,44 +658,47 @@
$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) {
+ # <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;
}
- # </AP>
+ # </AP>
}
- else
+ else
$keys = array_keys($row);
- # <AP>
- reset($keys);
- $this->_original = array();
+ # <AP>
+ reset($keys);
+ $this->_original = array();
foreach($table->flds as $name=>$fld) {
- $value = $row[current($keys)];
+ $value = $row[current($keys)];
$this->$name = $value;
- $this->_original[] = $value;
- next($keys);
+ $this->_original[] = $value;
+ next($keys);
}
- # </AP>
+ # </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
@@ -632,19 +712,25 @@
{
switch($t) {
case 'L':
- if (strpos($db->databaseType,'postgres') !== false) return $db->qstr($val);
+ 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 (is_null($val)) {
+ return 'null';
+ }
if (strlen($val)>0 &&
- (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) {
+ (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")
+ ) {
return $db->qstr($val);
break;
}
@@ -672,8 +758,15 @@
function _QName($n,$db=false)
{
- if (!ADODB_Active_Record::$_quoteNames) return $n;
- if (!$db) $db = $this->DB(); if (!$db) return false;
+ if (!ADODB_Active_Record::$_quoteNames) {
+ return $n;
+ }
+ if (!$db) {
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
+ }
return $db->nameQuote.$n.$db->nameQuote;
}
@@ -683,23 +776,32 @@
{
global $ADODB_FETCH_MODE;
- $db = $this->DB(); if (!$db) return false;
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
$this->_where = $where;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
- if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
+ if ($db->fetchMode !== false) {
+ $savem = $db->SetFetchMode(false);
+ }
$qry = "select * from ".$this->_table;
if($where) {
$qry .= ' WHERE '.$where;
}
- if ($lock) $qry .= $this->lockMode;
+ if ($lock) {
+ $qry .= $this->lockMode;
+ }
$row = $db->GetRow($qry,$bindarr);
- if (isset($savem)) $db->SetFetchMode($savem);
+ if (isset($savem)) {
+ $db->SetFetchMode($savem);
+ }
$ADODB_FETCH_MODE = $save;
return $this->Set($row);
@@ -714,25 +816,29 @@
# 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;
- }
+ $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;
}
@@ -741,7 +847,10 @@
// false on error
function Insert()
{
- $db = $this->DB(); if (!$db) return false;
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
$cnt = 0;
$table = $this->TableInfo();
@@ -791,7 +900,10 @@
function Delete()
{
- $db = $this->DB(); if (!$db) return false;
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
$table = $this->TableInfo();
$where = $this->GenWhere($db,$table);
@@ -804,7 +916,10 @@
// 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;
+ $db = $this->DB();
+ if (!$db || empty($this->_table)) {
+ return false;
+ }
$arr = $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr,$extra);
return $arr;
}
@@ -814,7 +929,10 @@
{
global $ADODB_ASSOC_CASE;
- $db = $this->DB(); if (!$db) return false;
+ $db = $this->DB();
+ if (!$db) {
+ return false;
+ }
$table = $this->TableInfo();
$pkey = $table->keys;
@@ -824,7 +942,9 @@
/*
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;
@@ -832,25 +952,31 @@
...
[truncated message content] |
){kind=link}
){kind=link}